[vlc-devel] commit: libvlc_video: Suppress playlist existence checks. (Pierre d' Herbemont )
git version control
git at videolan.org
Fri Jun 13 15:19:48 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Fri Jun 13 15:16:55 2008 +0200| [9b2aec79b1cab65b78581819e13410421116a253]
libvlc_video: Suppress playlist existence checks.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b2aec79b1cab65b78581819e13410421116a253
---
src/control/video.c | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/control/video.c b/src/control/video.c
index 88aa643..af01ebf 100644
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -235,20 +235,17 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d
/* set as default for future vout instances */
var_SetInteger(p_instance->p_libvlc_int, "drawable", (int)d);
- if( libvlc_playlist_isplaying(p_instance, p_e) )
+ libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
+ if( p_mi )
{
- libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
- if( p_mi )
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
+ if( p_vout )
{
- vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( p_vout )
- {
- /* tell running vout to re-parent */
- vout_Control( p_vout , VOUT_REPARENT, d);
- vlc_object_release( p_vout );
- }
- libvlc_media_player_release(p_mi);
+ /* tell running vout to re-parent */
+ vout_Control( p_vout , VOUT_REPARENT, d);
+ vlc_object_release( p_vout );
}
+ libvlc_media_player_release(p_mi);
}
}
@@ -271,20 +268,17 @@ void libvlc_video_set_size( libvlc_instance_t *p_instance, int width, int height
config_PutInt(p_instance->p_libvlc_int, "width", width);
config_PutInt(p_instance->p_libvlc_int, "height", height);
- if( libvlc_playlist_isplaying(p_instance, p_e) )
+ libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
+ if( p_mi )
{
- libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
- if( p_mi )
+ vout_thread_t *p_vout = GetVout( p_mi, p_e );
+ if( p_vout )
{
- vout_thread_t *p_vout = GetVout( p_mi, p_e );
- if( p_vout )
- {
- /* tell running vout to re-size */
- vout_Control( p_vout , VOUT_SET_SIZE, width, height);
- vlc_object_release( p_vout );
- }
- libvlc_media_player_release(p_mi);
+ /* tell running vout to re-size */
+ vout_Control( p_vout , VOUT_SET_SIZE, width, height);
+ vlc_object_release( p_vout );
}
+ libvlc_media_player_release(p_mi);
}
}
More information about the vlc-devel
mailing list