[vlc-devel] commit: Qt4: Remove hackish use of vout window for the FS controller. ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Jul  1 19:45:53 2008 +0300| [6ad63e8cf411092b7888d0d08ab618650a495ba5]

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ad63e8cf411092b7888d0d08ab618650a495ba5
---

 modules/gui/qt4/qt4.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 41bdd26..ae00480 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 ();