leaks in case of http connection failure

[vlc] / modules / video_output / sdl.c

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 17efea735d8245989381a556b3ebb6e84de73187..ac19b285905b9388cf81d8177d4b978912e1bfe7 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -408,9 +408,7 @@ static int Manage( vout_thread_t *p_vout )
                 val.i_int = p_vout->fmt_in.i_visible_height;
 
             var_Set( p_vout, "mouse-y", val );
-
-            val.b_bool = true;
-            var_Set( p_vout, "mouse-moved", val );
+            var_SetBool( p_vout, "mouse-moved", true );
 
             if( p_vout->p_sys->b_cursor )
             {
@@ -436,11 +434,8 @@ static int Manage( vout_thread_t *p_vout )
                     val.i_int &= ~1;
                     var_Set( p_vout, "mouse-button-down", val );
 
-                    val.b_bool = true;
-                    var_Set( p_vout, "mouse-clicked", val );
-
-                    val.b_bool = false;
-                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+                    var_SetBool( p_vout, "mouse-clicked", true );
+                    var_SetBool( p_vout->p_libvlc, "intf-popupmenu", false );
                 }
                 break;
 
@@ -450,7 +445,6 @@ static int Manage( vout_thread_t *p_vout )
                     val.i_int &= ~2;
                     var_Set( p_vout, "mouse-button-down", val );
 
-                    vlc_value_t val;
                     var_Get( p_vout->p_libvlc, "intf-show", &val );
                     val.b_bool = !val.b_bool;
                     var_Set( p_vout->p_libvlc, "intf-show", val );
@@ -459,21 +453,11 @@ static int Manage( vout_thread_t *p_vout )
 
             case SDL_BUTTON_RIGHT:
                 {
-                    intf_thread_t *p_intf;
-
                     var_Get( p_vout, "mouse-button-down", &val );
                     val.i_int &= ~4;
                     var_Set( p_vout, "mouse-button-down", val );
-                    p_intf = vlc_object_find( p_vout, VLC_OBJECT_INTF,
-                                                      FIND_ANYWHERE );
-                    if( p_intf )
-                    {
-                        p_intf->b_menu_change = 1;
-                        vlc_object_release( p_intf );
-                    }
-
-                    val.b_bool = true;
-                    var_Set( p_vout->p_libvlc, "intf-popupmenu", val );
+
+                    var_SetBool( p_vout->p_libvlc, "intf-popupmenu", true );
                 }
                 break;
             }
@@ -587,6 +571,28 @@ static int Manage( vout_thread_t *p_vout )
         p_vout->i_changes |= VOUT_SIZE_CHANGE;
     }
 
+    /* autoscale toggle */
+    if( p_vout->i_changes & VOUT_SCALE_CHANGE )
+    {
+        p_vout->i_changes &= ~VOUT_SCALE_CHANGE;
+
+        p_vout->b_autoscale = var_GetBool( p_vout, "autoscale" );
+        p_vout->i_zoom = (int) ZOOM_FP_FACTOR;
+
+        p_vout->i_changes |= VOUT_SIZE_CHANGE;
+    }
+
+    /* scaling factor (if no-autoscale) */
+    if( p_vout->i_changes & VOUT_ZOOM_CHANGE )
+    {
+        p_vout->i_changes &= ~VOUT_ZOOM_CHANGE;
+
+        p_vout->b_autoscale = false;
+        p_vout->i_zoom = (int)( ZOOM_FP_FACTOR * var_GetFloat( p_vout, "scale" ) );
+
+        p_vout->i_changes |= VOUT_SIZE_CHANGE;
+    }
+
     /* Crop or Aspect Ratio Changes */
     if( p_vout->i_changes & VOUT_CROP_CHANGE ||
         p_vout->i_changes & VOUT_ASPECT_CHANGE )