VOUT_CLOSE is unsafe and pointless. Do not use it.

If an interface exits "early" it should reparent (although reparenting
is no safer). Otherwise, the core will ensure that the video output was
safely closed before it terminates the interface.

diff --git a/modules/gui/maemo/maemo.c b/modules/gui/maemo/maemo.c
index 069006298db70711299c949f4e9821c5b8e572de..82c6a1d8d406b23c2e360b6c451bcc94f9a76972 100644 (file)
--- a/modules/gui/maemo/maemo.c
+++ b/modules/gui/maemo/maemo.c
@@ -254,8 +254,7 @@ static void Run( intf_thread_t *p_intf )
 
     if( p_vout )
     {
-        if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
-            vout_Control( p_vout, VOUT_REPARENT, 0 );
+        vout_Control( p_vout, VOUT_REPARENT, 0 );
         vlc_object_release( p_vout );
     }
 

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index f52f8de1ea26b3b3e52f290c109ad006b04ed720..bc86792f2fd563779823b1ca9caad91e732ac6fc 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -203,8 +203,7 @@ void VlcProc::registerVoutWindow( void *pVoutWindow )
     // Reparent the vout window
     if( m_pVout )
     {
-        if( vout_Control( m_pVout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
-            vout_Control( m_pVout, VOUT_CLOSE );
+        vout_Control( m_pVout, VOUT_REPARENT, 0 );
     }
 }
 
@@ -219,8 +218,7 @@ void VlcProc::dropVout()
 {
     if( m_pVout )
     {
-        if( vout_Control( m_pVout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
-            vout_Control( m_pVout, VOUT_CLOSE );
+        vout_Control( m_pVout, VOUT_REPARENT, 0 );
         m_pVout = NULL;
     }
 }