Changeset 8c6064c922a385a981ed1e9140ba676047e93363

Timestamp:

25/06/08 20:39:16 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[cdad38197173431b485f22583ef0ceb692dca45c]

git-author:

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

Message:

Qt4 window: use a proper condition variable instead of msleep()

Files:

• modules/gui/qt4/main_interface.cpp (modified) (1 diff)
• modules/gui/qt4/qt4.cpp (modified) (6 diffs)

modules/gui/qt4/main_interface.cpp

@@ -438 +438 @@
-        videoWidget = new VideoWidget( p_intf );
-        mainLayout->insertWidget( 0, videoWidget, 10 );
-
-        var_Create( p_intf, "window_widget", VLC_VAR_ADDRESS );
-        vlc_value_t val;
-        val.p_address = this;
-        var_Set( p_intf, "window_widget", val );
-    }
-

modules/gui/qt4/qt4.cpp

@@ -30 +30 @@
-#include <QTranslator>
-#include <QDate>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QWaitCondition>
-
-#include "qt4.hpp"
@@ -242 +245 @@
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-
+    var_Create( p_this, "window_widget", VLC_VAR_ADDRESS );
-    return VLC_SUCCESS;
-}
@@ -292 +296 @@
-}
-
+static QMutex windowLock;
+static QWaitCondition windowWait;
+
-static void Init( intf_thread_t *p_intf )
-{
+    vlc_value_t val;
-    char dummy[] = "";
-    char *argv[] = { dummy };
@@ -332 +340 @@
-        p_mi->show(); */
-        p_intf->p_sys->b_isDialogProvider = false;
+
+        val.p_address = p_intf->p_sys->p_mi;
+        QMutexLocker locker (&windowLock);
+        var_Set (p_intf, "window_widget", val);
+        windowWait.wakeAll ();
-    }
-    else
@@ -390 +403 @@
-    /* And quit */
-
+    QMutexLocker locker (&windowLock);
+    val.p_address = NULL;
+    var_Set (p_intf, "window_widget", val);
-    /* Destroy first the main interface because it is connected to some slots
-       in the MainInputManager */
@@ -456 +472 @@
-    var_Create (intf, "window_widget", VLC_VAR_ADDRESS);
-
-
-
-
-
+
+
+
-    msg_Dbg (obj, "waiting for interface...");
-do
+for (;;)
-    {
-        var_Get (intf, "window_widget", &ptrval);
-/* FIXME A condition variable would be way more appropriate. */
-msleep (INTF_IDLE_SLEEP)
-} while (ptrval.p_address == NULL
-
-
+if (ptrval.p_address != NULL)
+    break
+    windowWait.wait (&windowLock
+
+
-    MainInterface *mi = (MainInterface *)ptrval.p_address;
+    msg_Dbg (obj, "requesting window (%p)...", mi);
-
-    wnd->handle = mi->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
-                                    &wnd->width, &wnd->height);
-vlc_mutex_unlock ((vlc_mutex_t *)lockval.p_address
+windowLock.unlock (
-    wnd->control = ControlWindow;
-    wnd->p_private = intf;