Commit a92d3126 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

window: add string to identify fullscreen output

parent 119bbdb0
......@@ -274,14 +274,17 @@ static inline int vout_window_SetSize(vout_window_t *window,
/**
* Requests fullscreen mode.
*
* \param id nul-terminated output identifier, NULL for default
*
* \retval VLC_SUCCESS The request has been queued to the windowing system
* (that does <b>not</b> imply that the request is complete nor succesful).
* \retval VLC_EGENERIC The request could not be queued, e.g. the back-end does
* not implement toggling between fullscreen and windowed modes.
*/
static inline int vout_window_SetFullScreen(vout_window_t *window)
static inline int vout_window_SetFullScreen(vout_window_t *window,
const char *id)
{
return vout_window_Control(window, VOUT_WINDOW_SET_FULLSCREEN);
return vout_window_Control(window, VOUT_WINDOW_SET_FULLSCREEN, id);
}
/**
......
......@@ -77,7 +77,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
p_wnd->control = WindowControl;
}
if (cfg->is_fullscreen)
vout_window_SetFullScreen(p_wnd);
vout_window_SetFullScreen(p_wnd, NULL);
return VLC_SUCCESS;
}
......
......@@ -123,7 +123,7 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
}
if (cfg->is_fullscreen)
vout_window_SetFullScreen(p_wnd);
vout_window_SetFullScreen(p_wnd, NULL);
return VLC_SUCCESS;
}
......
......@@ -401,7 +401,7 @@ static int WindowOpen( vout_window_t *pWnd, const vout_window_cfg_t *cfg )
}
if (cfg->is_fullscreen)
vout_window_SetFullScreen( pWnd );
vout_window_SetFullScreen( pWnd, NULL );
return VLC_SUCCESS;
}
......
......@@ -297,7 +297,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
vout_window_ReportSize(wnd, cfg->width, cfg->height);
if (cfg->is_fullscreen)
vout_window_SetFullScreen(wnd);
vout_window_SetFullScreen(wnd, NULL);
return VLC_SUCCESS;
error:
......
......@@ -379,7 +379,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg)
wnd->control = Control;
if (cfg->is_fullscreen)
vout_window_SetFullScreen(wnd);
vout_window_SetFullScreen(wnd, NULL);
if (vlc_clone(&sys->thread, Thread, wnd, VLC_THREAD_PRIORITY_LOW))
goto error;
......
......@@ -1345,8 +1345,10 @@ static void ThreadChangeFullscreen(vout_thread_t *vout, bool fullscreen)
if (window == NULL)
return; /* splitter! */
(fullscreen ? vout_window_SetFullScreen
: vout_window_UnsetFullScreen)(window);
if (fullscreen)
vout_window_SetFullScreen(window, NULL);
else
vout_window_UnsetFullScreen(window);
}
static void ThreadChangeWindowState(vout_thread_t *vout, unsigned state)
......
Markdown is supported
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