This commit is contained in:
dborth 2009-02-20 09:36:05 +00:00
parent 931f7553b0
commit fde5171e0c
2 changed files with 11 additions and 11 deletions

View File

@ -167,16 +167,22 @@ int main(int argc, char *argv[])
#endif #endif
#ifdef HW_RVL #ifdef HW_RVL
DI_Close();
DI_Init(); // first DI_Init(); // first
#endif #endif
InitDeviceThread(); InitDeviceThread();
VIDEO_Init();
// Initialise controllers
PAD_Init(); PAD_Init();
#ifdef HW_RVL #ifdef HW_RVL
WPAD_Init(); WPAD_Init();
#endif
InitialiseVideo();
ResetVideo_Menu (); // change to menu video mode
#ifdef HW_RVL
// read wiimote accelerometer and IR data // read wiimote accelerometer and IR data
WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR); WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
WPAD_SetVRes(WPAD_CHAN_ALL,640,480); WPAD_SetVRes(WPAD_CHAN_ALL,640,480);
@ -187,11 +193,6 @@ int main(int argc, char *argv[])
SYS_SetResetCallback(ResetCB); SYS_SetResetCallback(ResetCB);
#endif #endif
int selectedMenu = -1;
InitialiseVideo();
ResetVideo_Menu (); // change to menu video mode
// Initialise freetype font system // Initialise freetype font system
if (FT_Init ()) if (FT_Init ())
{ {
@ -222,6 +223,8 @@ int main(int argc, char *argv[])
if(argc > 0 && argv[0] != NULL) if(argc > 0 && argv[0] != NULL)
CreateAppPath(argv[0]); CreateAppPath(argv[0]);
int selectedMenu = -1;
// Load preferences // Load preferences
if(!LoadPrefs()) if(!LoadPrefs())
{ {

View File

@ -269,9 +269,6 @@ UpdatePadsCB ()
****************************************************************************/ ****************************************************************************/
void InitialiseVideo () void InitialiseVideo ()
{ {
/*** Start VIDEO Subsystem ***/
VIDEO_Init();
vmode = VIDEO_GetPreferredMode(NULL); vmode = VIDEO_GetPreferredMode(NULL);
switch (vmode->viTVMode >> 2) switch (vmode->viTVMode >> 2)