Commit bd350083 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

kva: assume VOUT_DISPLAY_CHANGE_FULLSCREEN is only called to set fullscreen

It's supposed to be handled in the window, not in the display module.

It's likely broken at this stage.
parent 770e4947
......@@ -162,7 +162,7 @@ enum vout_display_query {
#if defined(__OS2__)
/* Ask the module to acknowledge/refuse the fullscreen state change after
* being requested (externally or by VOUT_DISPLAY_EVENT_FULLSCREEN */
VOUT_DISPLAY_CHANGE_FULLSCREEN VLC_DEPRECATED_ENUM, /* bool fs */
VOUT_DISPLAY_CHANGE_FULLSCREEN VLC_DEPRECATED_ENUM,
/* Ask the module to acknowledge/refuse the window management state change
* after being requested externally or by VOUT_DISPLAY_WINDOW_STATE */
VOUT_DISPLAY_CHANGE_WINDOW_STATE VLC_DEPRECATED_ENUM,
......
......@@ -393,15 +393,14 @@ static void Display( vout_display_t *vd, picture_t *picture )
*****************************************************************************/
static int Control( vout_display_t *vd, int query, va_list args )
{
VLC_UNUSED(args);
vout_display_sys_t *sys = vd->sys;
switch (query)
{
case VOUT_DISPLAY_CHANGE_FULLSCREEN:
{
bool fs = va_arg(args, int);
WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE, MPFROMLONG(fs), 0 );
WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE, MPFROMLONG(true), 0 );
return VLC_SUCCESS;
}
......
......@@ -751,8 +751,7 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
#if defined(__OS2__)
if ((var_GetBool(parent, "fullscreen")
|| var_GetBool(parent, "video-wallpaper"))
&& vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN,
true) == VLC_SUCCESS)
&& vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN) == VLC_SUCCESS)
osys->cfg.is_fullscreen = true;
if (var_InheritBool(parent, "video-on-top"))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment