as discussed^Wmonologued on the mailing list.
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 ) );
}
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 );
}
void VlcProc::dropVout()
{
- if( m_pVout )
- {
- vout_Control( m_pVout, VOUT_REPARENT, 0 );
- m_pVout = NULL;
- }
+ assert( !m_pVout );
}
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
- vout_thread_t *p_vout = NULL;
p_mi->drawable.xid = drawable;
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 );
}
*
* $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>
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 )