Changeset 12b188309df1e63cd65c7988c97d78aa857e21aa

Timestamp:

25/06/08 21:29:49 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[c4c75ec7733e6dbceff2babccc73b21e733a8f3a]

git-author:

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

Message:

Allow more than one use of the video widget

However, I suspect the Qt4 interface will break if there is more than
one video output _at_the_same_time_

Files:

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

modules/gui/qt4/qt4.cpp

@@ -334 +334 @@
-    DialogsProvider::getInstance( p_intf );
-
+    QPointer<MainInterface> *miP = NULL;
+
-    /* Create the normal interface in non-DP mode */
-    if( !p_intf->pf_show_dialog )
@@ -342 +344 @@
-        p_intf->p_sys->b_isDialogProvider = false;
-
-
+
+
-        QMutexLocker locker (&windowLock);
-        var_Set (p_intf, "window_widget", val);
@@ -404 +407 @@
-    /* And quit */
-
-windowLock.lock ();
-var_Get (p_intf, "window_widget", &val);
-if (val.p_address)
-delete (QPointer<MainInterface> *)val.p_address
-val.p_address = NULL
-var_Set (p_intf, "window_widget", val)
-windowLock.unlock();
+if (miP)
+{
+    QMutexLocker locker (&windowLock);
+val.p_address = NULL
+    var_Set (p_intf, "window_widget", val)
+    delete miP
+}
-
-    /* Destroy first the main interface because it is connected to some slots
@@ -487 +490 @@
-    msg_Dbg (obj, "requesting window...");
-    QPointer<MainInterface> *miP = (QPointer<MainInterface> *)ptrval.p_address;
-
-
-
+
-    vlc_object_release (intf);
-