[vlc-devel] commit: Qt4: restore the fullscreen controller ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jun 25 22:05:44 2008 +0300| [dacad69570d71938bf412ef74b982a27e4fdaabd]

Qt4: restore the fullscreen controller

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

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 42565b8..e663d75 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -458,10 +458,6 @@ static int OpenWindow (vlc_object_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 *)
         vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
     if (intf == NULL)
@@ -492,6 +488,12 @@ static int OpenWindow (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 ();