From: Rémi Denis-Courmont <rdenis@simphalempin.com>
Date: Tue, 1 Jul 2008 16:45:53 +0000 (+0300)
Subject: Qt4: Remove hackish use of vout window for the FS controller.
X-Git-Tag: 0.9.0-test1~7
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6ad63e8cf411092b7888d0d08ab618650a495ba5;p=vlc

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.
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 41bdd26d39..ae004801e1 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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 ();