mirror of https://github.com/mpv-player/mpv
messed ordering of switch branches, 10l for Ivan
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15152 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
7b1bd09dbc
commit
26fb4f06af
|
@ -1365,9 +1365,6 @@ static uint32_t control(uint32_t request, void *data, ... )
|
||||||
return VO_TRUE;
|
return VO_TRUE;
|
||||||
case VOCTRL_FULLSCREEN:
|
case VOCTRL_FULLSCREEN:
|
||||||
vo_x11_fullscreen();
|
vo_x11_fullscreen();
|
||||||
case VOCTRL_GET_PANSCAN:
|
|
||||||
if ( !vo_config_count || !vo_fs ) return VO_FALSE;
|
|
||||||
return VO_TRUE;
|
|
||||||
// indended, fallthrough to update panscan on fullscreen/windowed switch
|
// indended, fallthrough to update panscan on fullscreen/windowed switch
|
||||||
case VOCTRL_SET_PANSCAN:
|
case VOCTRL_SET_PANSCAN:
|
||||||
if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) )
|
if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) )
|
||||||
|
@ -1382,7 +1379,9 @@ static uint32_t control(uint32_t request, void *data, ... )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return VO_TRUE;
|
return VO_TRUE;
|
||||||
|
case VOCTRL_GET_PANSCAN:
|
||||||
|
if ( !vo_config_count || !vo_fs ) return VO_FALSE;
|
||||||
|
return VO_TRUE;
|
||||||
case VOCTRL_SET_EQUALIZER:
|
case VOCTRL_SET_EQUALIZER:
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
Loading…
Reference in New Issue