lua/intf: Fix a memleak.

[vlc] / src / control / video.c

diff --git a/src/control/video.c b/src/control/video.c
index 49783337e62f7f3970bea1b9202759bebe4defec..61ba1af6129779a2a2734baad23f02999ed70d10 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -78,8 +78,7 @@ int libvlc_get_fullscreen( libvlc_media_player_t *p_mi,
     int i_ret;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout )
-        return 0;
+    if( !p_vout ) return 0;
 
     i_ret = var_GetBool( p_vout, "fullscreen" );
 
@@ -112,10 +111,7 @@ libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
     input_thread_t *p_input_thread;
 
     /* GetVout will raise the exception for us */
-    if( !p_vout )
-    {
-        return;
-    }
+    if( !p_vout ) return;
 
     if( !psz_filepath )
     {
@@ -143,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,
@@ -229,29 +231,22 @@ 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 )
 {
     /* 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 )
-            {
-                /* tell running vout to re-parent */
-                vout_Control( p_vout , VOUT_REPARENT, d);
-                vlc_object_release( p_vout );
-            }
-            libvlc_media_player_release(p_mi);
-        }
+        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);
@@ -271,20 +266,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);
     }
 }
 
@@ -292,13 +284,14 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
                             const libvlc_rectangle_t *view, const libvlc_rectangle_t *clip,
                            libvlc_exception_t *p_e )
 {
-    if( NULL == view )
+    if( !view )
     {
         libvlc_exception_raise( p_e, "viewport is NULL" );
+        return;
     }
 
     /* if clip is NULL, then use view rectangle as clip */
-    if( NULL == clip )
+    if( !clip )
         clip = view;
 
     /* set as default for future vout instances */
@@ -311,22 +304,19 @@ void libvlc_video_set_viewport( libvlc_instance_t *p_instance,
     var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-bottom", clip->bottom );
     var_SetInteger( p_instance->p_libvlc_int, "drawable-clip-right", clip->right );
 
-    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 )
-            {
-                /* change viewport for running vout */
-                vout_Control( p_vout , VOUT_SET_VIEWPORT,
-                                   view->top, view->left, view->bottom, view->right,
-                                   clip->top, clip->left, clip->bottom, clip->right );
-                vlc_object_release( p_vout );
-            }
-            libvlc_media_player_release(p_mi);
+            /* change viewport for running vout */
+            vout_Control( p_vout , VOUT_SET_VIEWPORT,
+                               view->top, view->left, view->bottom, view->right,
+                               clip->top, clip->left, clip->bottom, clip->right );
+            vlc_object_release( p_vout );
         }
+        libvlc_media_player_release(p_mi);
     }
 }
 
@@ -407,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;