Changeset 8fa65a4d5895a0cf3e6567dcf1115189580a7439

Timestamp:

28/06/08 21:52:16 (3 months ago)

Author:

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

git-committer:

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

git-parent:

[7ca46db5b0de9a4f15de790990303cc46b496e24]

git-author:

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

Message:

Qt4: weak reference the video output...

...so we don't try to vout_Control() it after it's been destroyed.
We cannot yield the video output for real either, as it would prevent
it from being destroyed once it is not needed anymore.

Files:

• modules/gui/qt4/components/interface_widgets.cpp (modified) (5 diffs)

modules/gui/qt4/components/interface_widgets.cpp

@@ -61 +61 @@
-{
-    /* Init */
-p_vout = NULL
+i_vout = 0
-    hide(); setMinimumSize( 16, 16 );
-    videoSize.rwidth() = -1;
@@ -98 +98 @@
-VideoWidget::~VideoWidget()
-{
+    vout_thread_t *p_vout = i_vout
+        ? (vout_thread_t *)vlc_object_get( i_vout ) : NULL;
+
-    if( p_vout )
-    {
@@ -110 +113 @@
-                vout_Control( p_vout, VOUT_CLOSE );
-        }
+        vlc_object_release( p_vout );
-    }
-}
@@ -121 +125 @@
-    msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
-    emit askVideoWidgetToShow( *pi_width, *pi_height );
-p
+i
-    {
-        msg_Dbg( p_intf, "embedded video already in use" );
-        return NULL;
-    }
-p_vout = p_nvout
+i_vout = p_nvout->i_object_id
-    msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() );
-    return ( void* )winId();
@@ -146 +150 @@
-{
-    msg_Dbg( p_intf, "Video is not needed anymore" );
-p_vout = NULL
+i_vout = 0
-    videoSize.rwidth() = 0;
-    videoSize.rheight() = 0;