[gamecube] fixed progressive video mode setting not being properly restored on startup

This commit is contained in:
ekeeke31 2012-04-09 09:09:59 +00:00
parent 868f14dc44
commit 2dd6e86c1c
2 changed files with 7 additions and 11 deletions

View File

@ -128,12 +128,6 @@ void legal ()
/* switch user progressive mode configuration */ /* switch user progressive mode configuration */
config.v_prog ^= 1; config.v_prog ^= 1;
if (VIDEO_HaveComponentCable())
{
/* switch video mode only if component cable has been detected */
vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
}
/* play sound to inform user then enter main menu */ /* play sound to inform user then enter main menu */
ASND_Pause(0); ASND_Pause(0);
int voice = ASND_GetFirstUnusedVoice(); int voice = ASND_GetFirstUnusedVoice();

View File

@ -1384,6 +1384,13 @@ void gx_video_Stop(void)
#ifdef HW_RVL #ifdef HW_RVL
VIDEO_SetTrapFilter(1); VIDEO_SetTrapFilter(1);
VIDEO_SetGamma(VI_GM_1_0); VIDEO_SetGamma(VI_GM_1_0);
#else
/* support for progressive mode (480p) if component cable has been detected */
if (VIDEO_HaveComponentCable())
{
/* switch into configured video mode */
vmode = config.v_prog ? &TVNtsc480Prog : &TVNtsc480IntDf;
}
#endif #endif
/* adjust TV width */ /* adjust TV width */
@ -1684,11 +1691,6 @@ void gx_video_Init(void)
TV60hz_240p.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_NON_INTERLACE); TV60hz_240p.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_NON_INTERLACE);
TV60hz_240i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE); TV60hz_240i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE);
TV60hz_480i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE); TV60hz_480i.viTVMode = VI_TVMODE(vmode->viTVMode >> 2, VI_INTERLACE);
#ifndef HW_RVL
/* force 480p on GameCube if Component Cable is detected & progressiev mode is selected */
if (VIDEO_HaveComponentCable() && config.v_prog) vmode = &TVNtsc480Prog;
#endif
break; break;
} }