Skip to content

V
vlc-2-2
Commit dacad695 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: restore the fullscreen controller

parent 1512cf1a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/gui/qt4/qt4.cpp
View file @ dacad695
...@@ -458,10 +458,6 @@ static int OpenWindow (vlc_object_t *obj) ...@@ -458,10 +458,6 @@ static int OpenWindow (vlc_object_t *obj)
{ {
vout_window_t *wnd = (vout_window_t *)obj; vout_window_t *wnd = (vout_window_t *)obj;
/* TODO: should probably be in the libvlc core instead: */
if (!config_GetInt (obj, "embedded-video"))
return VLC_EGENERIC;
intf_thread_t *intf = (intf_thread_t *) intf_thread_t *intf = (intf_thread_t *)
vlc_object_find_name (obj, "qt4", FIND_ANYWHERE); vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
if (intf == NULL) if (intf == NULL)
...@@ -492,6 +488,12 @@ static int OpenWindow (vlc_object_t *obj) ...@@ -492,6 +488,12 @@ static int OpenWindow (vlc_object_t *obj)
if (miP->isNull ()) if (miP->isNull ())
return VLC_EGENERIC; return VLC_EGENERIC;
if (config_GetInt (obj, "embedded-video") <= 0)
{
(*miP)->requestNotEmbeddedVideo (wnd->vout);
return VLC_EGENERIC;
}
wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y, wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
&wnd->width, &wnd->height); &wnd->width, &wnd->height);
windowLock.unlock (); windowLock.unlock ();
......
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