Skip to content

main: initialize the keyboard from within the video module #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mardy wants to merge 1 commit into
base: ogc-sdl-2.28
Choose a base branch
from
+3 −2
Open

main: initialize the keyboard from within the video module #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/wii/SDL_wii_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <fat.h>
#include <ogc/usbmouse.h>
#include <ogcsys.h>
#include <wiikeyboard/keyboard.h>
#include <wiiuse/wpad.h>

static void ShutdownCB()
Expand Down Expand Up @@ -73,7 +72,6 @@ int main(int argc, char *argv[])
WPAD_SetVRes(WPAD_CHAN_ALL, 640, 480);

MOUSE_Init();
KEYBOARD_Init(NULL);
fatInitDefault();

/* Call the user's main function. Make sure that argv contains at least one
Expand Down
3 changes: 3 additions & 0 deletions src/video/ogc/SDL_ogcvideo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include <ogc/gx.h>
#include <ogc/system.h>
#include <ogc/video.h>
#include <wiikeyboard/keyboard.h>

#include <opengx.h>

Expand Down Expand Up @@ -315,6 +316,8 @@ int OGC_VideoInit(_THIS)

#ifdef __wii__
OGC_InitMouse(_this);
/* OGC_PumpEvents reads the keyboard, so we need to initialize it here */
KEYBOARD_Init(NULL);
#endif
return 0;
}
Expand Down
Loading