Remove invalid VOUT_REPARENT uses

as discussed^Wmonologued on the mailing list.

diff --git a/modules/gui/maemo/maemo.c b/modules/gui/maemo/maemo.c
index 96e6080be03ad25bd05e8bd93c19f315aedb6dcd..4d2234c2cf232d6dea11f58730ebb6fa3727d15d 100644 (file)
--- a/modules/gui/maemo/maemo.c
+++ b/modules/gui/maemo/maemo.c
@@ -249,15 +249,7 @@ static void Run( intf_thread_t *p_intf )
     var_DelCallback( p_intf->p_sys->p_playlist, "activity",
                      activity_cb, p_intf );
 
-    // Asking the vout to close
-    vout_thread_t *p_vout = p_intf->p_sys->p_vout;
-
-    if( p_vout )
-    {
-        vout_Control( p_vout, VOUT_REPARENT, 0 );
-        vlc_object_release( p_vout );
-    }
-
+    assert( !p_intf->p_sys->p_vout ); /* too late */
     gtk_object_destroy( GTK_OBJECT( window ) );
 }
 

diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index a124845650ab7f0e57e6eb72a5d63f6bc126999f..2d8abeaa7c109c4b03bf622545957fdbbec9a3f3 100644 (file)
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -196,15 +196,12 @@ VlcProc::~VlcProc()
     var_DelCallback( getIntf(), "skin-to-load", onSkinToLoad, this );
 }
 
+#include <assert.h>
 
 void VlcProc::registerVoutWindow( void *pVoutWindow )
 {
     m_handleSet.insert( pVoutWindow );
-    // Reparent the vout window
-    if( m_pVout )
-    {
-        vout_Control( m_pVout, VOUT_REPARENT, 0 );
-    }
+    assert( !m_pVout );
 }
 
 
@@ -216,11 +213,7 @@ void VlcProc::unregisterVoutWindow( void *pVoutWindow )
 
 void VlcProc::dropVout()
 {
-    if( m_pVout )
-    {
-        vout_Control( m_pVout, VOUT_REPARENT, 0 );
-        m_pVout = NULL;
-    }
+    assert( !m_pVout );
 }
 
 

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 66fe1f31e10e8c7c727dd72d6afa06c4962a86f4..3e9c15e063b012f237ba7ee7025f80c87b300c58 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -764,7 +764,6 @@ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi,
                                        libvlc_exception_t *p_e )
 {
     input_thread_t *p_input_thread;
-    vout_thread_t *p_vout = NULL;
 
     p_mi->drawable.xid = drawable;
 
@@ -779,12 +778,6 @@ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi,
         return;
     }
 
-    p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD );
-    if( p_vout )
-    {
-        vout_Control( p_vout , VOUT_REPARENT, drawable);
-        vlc_object_release( p_vout );
-    }
     vlc_object_release( p_input_thread );
 }
 

diff --git a/src/control/video.c b/src/control/video.c
index ba1ae88cb3379e773fc2fd493b82827482cd4b41..68e19d60d9e09c1ce5c7d95cba8f7167fae1e0e7 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -5,7 +5,7 @@
  *
  * $Id$
  *
- * Authors: Cl�ent Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *          Filippo Carone <littlejohn@videolan.org>
  *          Jean-Paul Saman <jpsaman _at_ m2x _dot_ nl>
  *          Damien Fouilleul <damienf a_t videolan dot org>
@@ -190,14 +190,9 @@ int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
 int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d,
                            libvlc_exception_t *p_e )
 {
-    vout_thread_t *p_vout = GetVout( p_mi, p_e );
-
-    if( p_vout )
-    {
-        vout_Control( p_vout , VOUT_REPARENT, d);
-        vlc_object_release( p_vout );
-    }
-    return 0;
+    (void) p_mi; (void) d;
+    libvlc_exception_raise(p_e, "Reparenting not supported");
+    return -1;
 }
 
 void libvlc_video_resize( libvlc_media_player_t *p_mi, int width, int height, libvlc_exception_t *p_e )