[vlc-commits] vout: allow unlisted values for "aspect-ratio", "crop" and "zoom"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 23 20:11:51 2014 +0300| [169ac15487273b85cd6161b90bc690f1e51c9e93] | committer: Rémi Denis-Courmont

vout: allow unlisted values for "aspect-ratio", "crop" and "zoom"

This allows setting a value that is not explicitly listed a possible
choice, and also fixes a small race condition between VLC_VAR_DELCHOICE
and VLC_VAR_ADDCHOICE cals.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=169ac15487273b85cd6161b90bc690f1e51c9e93
---

 src/video_output/vout_intf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index be8be69..89a6e44 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -178,7 +178,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
 
     /* Zoom object var */
     var_Create( p_vout, "zoom", VLC_VAR_FLOAT | VLC_VAR_ISCOMMAND |
-                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
+                VLC_VAR_DOINHERIT );
 
     text.psz_string = _("Zoom");
     var_Change( p_vout, "zoom", VLC_VAR_SETTEXT, &text, NULL );
@@ -212,7 +212,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
 
     /* Crop object var */
     var_Create( p_vout, "crop", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
-                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
+                VLC_VAR_DOINHERIT );
 
     text.psz_string = _("Crop");
     var_Change( p_vout, "crop", VLC_VAR_SETTEXT, &text, NULL );
@@ -242,7 +242,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
 
     /* Aspect-ratio object var */
     var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
-                VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
+                VLC_VAR_DOINHERIT );
 
     text.psz_string = _("Aspect ratio");
     var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL );