Commit 6ad63e8c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Qt4: Remove hackish use of vout window for the FS controller.

This fixes #1651. We can hopefully get a proper patch for the FS
controller.
parent fd78181d
......@@ -467,6 +467,9 @@ static int WindowOpen (vlc_object_t *obj)
{
vout_window_t *wnd = (vout_window_t *)obj;
if (config_GetInt (obj, "embedded-video") <= 0)
return VLC_EGENERIC;
intf_thread_t *intf = (intf_thread_t *)
vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
if (intf == NULL)
......@@ -495,12 +498,6 @@ static int WindowOpen (vlc_object_t *obj)
if (miP->isNull ())
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->width, &wnd->height);
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