Fix memleaks: Fill in the destructor of simple preference.

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index f0ff7e0b809b5b867bd6ef3f94d42841ad6565e8..61ba1af6129779a2a2734baad23f02999ed70d10 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -139,25 +139,31 @@ libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
 int libvlc_video_get_height( libvlc_media_player_t *p_mi,
                              libvlc_exception_t *p_e )
 {
+    int height;
+
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    if( !p_vout )
-        return 0;
+    if( !p_vout ) return 0;
+
+    height = p_vout->i_window_height;
 
     vlc_object_release( p_vout );
 
-    return p_vout->i_window_height;
+    return height;
 }
 
 int libvlc_video_get_width( libvlc_media_player_t *p_mi,
                             libvlc_exception_t *p_e )
 {
+    int width;
+
     vout_thread_t *p_vout = GetVout( p_mi, p_e );
-    if( !p_vout )
-        return 0;
+    if( !p_vout ) return 0;
+
+    width = p_vout->i_window_width;
 
     vlc_object_release( p_vout );
 
-    return p_vout->i_window_width;
+    return width;
 }
 
 int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
@@ -225,6 +231,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
 
 /* global video settings */
 
+/* Deprecated use libvlc_media_player_set_drawable() */
 void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
                               libvlc_exception_t *p_e )
 {
@@ -234,17 +241,12 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d
     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 )
-        {
-            /* tell running vout to re-parent */
-            vout_Control( p_vout , VOUT_REPARENT, d);
-            vlc_object_release( p_vout );
-        }
+        libvlc_media_player_set_drawable( p_mi, d, p_e );
         libvlc_media_player_release(p_mi);
     }
 }
 
+/* Deprecated use libvlc_media_player_get_drawable() */
 libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
 {
     VLC_UNUSED(p_e);
@@ -395,7 +397,7 @@ void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
     for( i = 0; i < val_list.p_list->i_count; i++ )
     {
         vlc_value_t val = val_list.p_list->p_values[i];
-        if( i_spu == i )
+        if( i_spu == val.i_int )
         {
             vlc_value_t new_val;