Slovenian translation update by Matej Urbančič

[vlc] / src / video_output / vout_intf.c

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 71b45eec15f780d3ec5b04e6b67863b5e1b81e4e..7460763f5e582dc75eeac21912c57e7bd154b5a1 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -140,7 +140,6 @@ void vout_ReleaseWindow( vout_thread_t *p_vout, void *dummy )
     assert (wnd->module);
     module_Unneed (wnd, wnd->module);
 
-    vlc_object_detach (wnd);
     vlc_object_release (wnd);
     (void)dummy;
 }
@@ -177,16 +176,16 @@ static const struct
     const char *psz_label;
 } p_crop_values[] = {
     { "", N_("Default") },
-    { "1:1", "1:1" },
-    { "4:3", "4:3" },
-    { "16:9", "16:9" },
     { "16:10", "16:10" },
-    { "5:4", "5:4" },
-    { "5:3", "5:3" },
-    { "1.85:1", "1.85:1" },
+    { "16:9", "16:9" },
+    { "185:100", "1.85:1" },
     { "221:100", "2.21:1" },
     { "235:100", "2.35:1" },
     { "239:100", "2.39:1" },
+    { "5:3", "5:3" },
+    { "4:3", "4:3" },
+    { "5:4", "5:4" },
+    { "1:1", "1:1" },
     { NULL, NULL } };
 
 static const struct
@@ -1127,23 +1126,25 @@ static int AspectCallback( vlc_object_t *p_this, char const *psz_cmd,
              i_aspect_num, i_aspect_den,
              p_vout->fmt_in.i_sar_num, p_vout->fmt_in.i_sar_den );
 
-    var_Get( p_vout, "crop", &val );
-    return CropCallback( p_this, "crop", val, val, 0 );
+    if( var_Get( p_vout, "crop", &val ) )
+        return VLC_EGENERIC;
+
+    int i_ret = CropCallback( p_this, "crop", val, val, 0 );
+    free( val.psz_string );
+    return i_ret;
 }
 
 static int OnTopCallback( vlc_object_t *p_this, char const *psz_cmd,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    playlist_t *p_playlist = pl_Yield( p_this );
     vout_Control( p_vout, VOUT_SET_STAY_ON_TOP, newval.b_bool );
     (void)psz_cmd; (void)oldval; (void)p_data;
 
-    /* Modify playlist as well because the vout might have to be restarted */
-    var_Create( p_playlist, "video-on-top", VLC_VAR_BOOL );
-    var_Set( p_playlist, "video-on-top", newval );
+    /* Modify libvlc as well because the vout might have to be restarted */
+    var_Create( p_vout->p_libvlc, "video-on-top", VLC_VAR_BOOL );
+    var_Set( p_vout->p_libvlc, "video-on-top", newval );
 
-    pl_Release( p_this );
     return VLC_SUCCESS;
 }
 
@@ -1152,15 +1153,13 @@ static int FullscreenCallback( vlc_object_t *p_this, char const *psz_cmd,
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     vlc_value_t val;
-    playlist_t *p_playlist = pl_Yield( p_this );
     (void)psz_cmd; (void)oldval; (void)p_data;
 
     p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
 
-    /* Modify playlist as well because the vout might have to be restarted */
-    var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL );
-    var_Set( p_playlist, "fullscreen", newval );
-    pl_Release( p_playlist );
+    /* Modify libvlc as well because the vout might have to be restarted */
+    var_Create( p_vout->p_libvlc, "fullscreen", VLC_VAR_BOOL );
+    var_Set( p_vout->p_libvlc, "fullscreen", newval );
 
     val.b_bool = true;
     var_Set( p_vout, "intf-change", val );