Changeset 6ad63e8cf411092b7888d0d08ab618650a495ba5

Timestamp:

07/01/08 18:47:35 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214930855 +0300

git-parent:

[fd78181dd3d3e6453140fc51bda50cce22eef025]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214930753 +0300

Message:

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.

Files:

• modules/gui/qt4/qt4.cpp (modified) (2 diffs)

modules/gui/qt4/qt4.cpp

@@ -468 +468 @@
-    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);
@@ -495 +498 @@
-    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,