Use var_InheritString for --decklink-video-connection.

[vlc] / modules / control / gestures.c

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index c4ab6c7201104f0b0b896b099783ce3e97001d42..9305cce64e12aec49895a70a16fdde4d7a65ac65 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -86,6 +86,12 @@ static void RunIntf        ( intf_thread_t *p_intf );
 #define BUTTON_LONGTEXT N_( \
     "Trigger button for mouse gestures." )
 
+#if defined (HAVE_MAEMO)
+# define BUTTON_DEFAULT "left"
+#else
+# define BUTTON_DEFAULT "right"
+#endif
+
 static const char *const button_list[] = { "left", "middle", "right" };
 static const char *const button_list_text[] =
                                    { N_("Left"), N_("Middle"), N_("Right") };
@@ -96,7 +102,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INTERFACE_CONTROL )
     add_integer( "gestures-threshold", 30, NULL,
                  THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
-    add_string( "gestures-button", "right", NULL,
+    add_string( "gestures-button", BUTTON_DEFAULT, NULL,
                 BUTTON_TEXT, BUTTON_LONGTEXT, false )
         change_string_list( button_list, button_list_text, 0 )
     set_description( N_("Mouse gestures control interface") )
@@ -124,13 +130,13 @@ int Open ( vlc_object_t *p_this )
     p_sys->p_vout = NULL;
     p_sys->b_got_gesture = false;
     p_sys->b_button_pressed = false;
-    p_sys->i_threshold = config_GetInt( p_intf, "gestures-threshold" );
+    p_sys->i_threshold = var_InheritInteger( p_intf, "gestures-threshold" );
 
     // Choose the tight button to use
-    char *psz_button = config_GetPsz( p_intf, "gestures-button" );
-    if( !strcmp( psz_button, "left" ) )
+    char *psz_button = var_InheritString( p_intf, "gestures-button" );
+    if( psz_button && !strcmp( psz_button, "left" ) )
         p_sys->i_button_mask = 1;
-    else if( !strcmp( psz_button, "middle" ) )
+    else if( psz_button && !strcmp( psz_button, "middle" ) )
         p_sys->i_button_mask = 2;
     else // psz_button == "right"
         p_sys->i_button_mask = 4;
@@ -192,13 +198,12 @@ static void RunIntf( intf_thread_t *p_intf )
          */
         if( p_sys->b_got_gesture )
         {
-            vlc_value_t val;
             int i_interval = 0;
             /* Do something */
             /* If you modify this, please try to follow this convention:
                Start with LEFT, RIGHT for playback related commands
                and UP, DOWN, for other commands */
-            playlist_t * p_playlist = pl_Hold( p_intf );
+            playlist_t * p_playlist = pl_Get( p_intf );
             switch( p_sys->i_pattern )
             {
             case LEFT:
@@ -206,11 +211,11 @@ static void RunIntf( intf_thread_t *p_intf )
                 p_input = playlist_CurrentInput( p_playlist );
                 if( p_input )
                 {
-                    i_interval = config_GetInt( p_intf , "short-jump-size" );
+                    i_interval = var_InheritInteger( p_intf , "short-jump-size" );
                     if ( i_interval > 0 )
                     {
-                        val.i_time = ( (mtime_t)( -i_interval ) * 1000000L);
-                        var_Set( p_input, "time-offset", val );
+                        mtime_t i_time = ( (mtime_t)( -i_interval ) * 1000000L);
+                        var_SetTime( p_input, "time-offset", i_time );
                     }
                     vlc_object_release( p_input );
                 }
@@ -221,11 +226,11 @@ static void RunIntf( intf_thread_t *p_intf )
                 p_input = playlist_CurrentInput( p_playlist );
                 if( p_input )
                 {
-                    i_interval = config_GetInt( p_intf , "short-jump-size" );
+                    i_interval = var_InheritInteger( p_intf , "short-jump-size" );
                     if ( i_interval > 0 )
                     {
-                        val.i_time = ( (mtime_t)( i_interval ) * 1000000L);
-                        var_Set( p_input, "time-offset", val );
+                        mtime_t i_time = ( (mtime_t)( i_interval ) * 1000000L);
+                        var_SetTime( p_input, "time-offset", i_time );
                     }
                     vlc_object_release( p_input );
                 }
@@ -258,9 +263,9 @@ static void RunIntf( intf_thread_t *p_intf )
  
                 if( p_input )
                 {
-                    var_Get( p_input, "state", &val);
-                    val.i_int = ( val.i_int != PLAYING_S ) ? PLAYING_S : PAUSE_S;
-                    var_Set( p_input, "state", val);
+                    int i_state = var_GetInteger( p_input, "state" );
+                    var_SetInteger( p_input, "state", ( i_state != PLAYING_S )
+                                                      ? PLAYING_S : PAUSE_S );
                     vlc_object_release( p_input );
                 }
                 break;
@@ -291,14 +296,14 @@ static void RunIntf( intf_thread_t *p_intf )
 
             case GESTURE(UP,RIGHT,NONE,NONE):
                 {
-                    vlc_value_t val, list, list2;
-                    int i_count, i;
+                    vlc_value_t list, list2;
+                    int i_count, i, i_audio_es;
 
                     p_input = playlist_CurrentInput( p_playlist );
                     if( !p_input )
                         break;
 
-                    var_Get( p_input, "audio-es", &val );
+                    i_audio_es = var_GetInteger( p_input, "audio-es" );
                     var_Change( p_input, "audio-es", VLC_VAR_GETCHOICES,
                                 &list, &list2 );
                     i_count = list.p_list->i_count;
@@ -310,7 +315,7 @@ static void RunIntf( intf_thread_t *p_intf )
                     }
                     for( i = 0; i < i_count; i++ )
                     {
-                        if( val.i_int == list.p_list->p_values[i].i_int )
+                        if( i_audio_es == list.p_list->p_values[i].i_int )
                             break;
                     }
                     /* value of audio-es was not in choices list */
@@ -324,21 +329,21 @@ static void RunIntf( intf_thread_t *p_intf )
                         i = 1;
                     else
                         i++;
-                    var_Set( p_input, "audio-es", list.p_list->p_values[i] );
+                    var_SetInteger( p_input, "audio-es", list.p_list->p_values[i].i_int );
                     var_FreeList( &list, &list2 );
                     vlc_object_release( p_input );
                 }
                 break;
             case GESTURE(DOWN,RIGHT,NONE,NONE):
                 {
-                    vlc_value_t val, list, list2;
-                    int i_count, i;
+                    vlc_value_t list, list2;
+                    int i_count, i, i_spu_es;
 
                     p_input = playlist_CurrentInput( p_playlist );
                     if( !p_input )
                         break;
 
-                    var_Get( p_input, "spu-es", &val );
+                    i_spu_es = var_GetInteger( p_input, "spu-es" );
 
                     var_Change( p_input, "spu-es", VLC_VAR_GETCHOICES,
                             &list, &list2 );
@@ -351,7 +356,7 @@ static void RunIntf( intf_thread_t *p_intf )
                     }
                     for( i = 0; i < i_count; i++ )
                     {
-                        if( val.i_int == list.p_list->p_values[i].i_int )
+                        if( i_spu_es == list.p_list->p_values[i].i_int )
                         {
                             break;
                         }
@@ -367,20 +372,19 @@ static void RunIntf( intf_thread_t *p_intf )
                         i = 0;
                     else
                         i++;
-                    var_Set( p_input, "spu-es", list.p_list->p_values[i] );
+                    var_SetInteger( p_input, "spu-es", list.p_list->p_values[i].i_int);
                     var_FreeList( &list, &list2 );
                     vlc_object_release( p_input );
                 }
                 break;
 
             case GESTURE(UP,LEFT,NONE,NONE):
+            {
+                bool val = var_ToggleBool( pl_Get( p_intf ), "fullscreen" );
                 if( p_sys->p_vout )
-                {
-                    var_Get( p_sys->p_vout, "fullscreen", &val );
-                    val.b_bool = !val.b_bool;
-                    var_Set( p_sys->p_vout, "fullscreen", val );
-                }
+                    var_SetBool( p_sys->p_vout, "fullscreen", val );
                 break;
+           }
 
             case GESTURE(DOWN,LEFT,NONE,NONE):
                 /* FIXME: Should close the vout!"*/
@@ -396,7 +400,6 @@ static void RunIntf( intf_thread_t *p_intf )
             p_sys->i_num_gestures = 0;
             p_sys->i_pattern = 0;
             p_sys->b_got_gesture = false;
-            pl_Release( p_intf );
         }
 
         /*
@@ -414,9 +417,7 @@ static void RunIntf( intf_thread_t *p_intf )
 
         if( p_sys->p_vout == NULL )
         {
-            playlist_t *p_playlist = pl_Hold( p_intf );
-            p_input = playlist_CurrentInput( p_playlist );
-            pl_Release( p_intf );
+            p_input = playlist_CurrentInput( pl_Get( p_intf ) );
             if( p_input )
             {
                 p_sys->p_vout = input_GetVout( p_input );
@@ -464,8 +465,8 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
 
     if( !strcmp( psz_var, "mouse-moved" ) && p_sys->b_button_pressed )
     {
-        p_sys->i_mouse_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
-        p_sys->i_mouse_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+        p_sys->i_mouse_x = newval.coords.x;
+        p_sys->i_mouse_y = newval.coords.y;
         i_horizontal = p_sys->i_mouse_x - p_sys->i_last_x;
         i_horizontal = i_horizontal / p_sys->i_threshold;
         i_vertical = p_sys->i_mouse_y - p_sys->i_last_y;
@@ -509,8 +510,8 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
         if( (newval.i_int & p_sys->i_button_mask) && !p_sys->b_button_pressed )
         {
             p_sys->b_button_pressed = true;
-            p_sys->i_last_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
-            p_sys->i_last_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+            var_GetCoords( p_sys->p_vout, "mouse-moved",
+                           &p_sys->i_last_x, &p_sys->i_last_y );
         }
         else if( !( newval.i_int & p_sys->i_button_mask ) && p_sys->b_button_pressed )
         {