Merge branch '1.0-bugfix'

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 9c2c1c305f3cc32163101e01d0d4233efa658d3a..4447e1773110f0c2da20a22686216d6fbcfb181b 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -381,8 +381,7 @@ static void Run( intf_thread_t *p_intf )
                         _("Audio Device: %s"),
                         list2.p_list->p_values[i].psz_string);
             }
-            var_Change( p_aout, "audio-device", VLC_VAR_FREELIST, &list,
-                        &list2 );
+            var_FreeList( &list, &list2 );
         }
         /* Input options */
         else if( p_input )
@@ -474,8 +473,7 @@ static void Run( intf_thread_t *p_intf )
                                      _("Audio track: %s"),
                                      list2.p_list->p_values[i].psz_string );
                 }
-                var_Change( p_input, "audio-es", VLC_VAR_FREELIST, &list,
-                            &list2 );
+                var_FreeList( &list, &list2 );
             }
             else if( i_action == ACTIONID_SUBTITLE_TRACK )
             {
@@ -490,8 +488,7 @@ static void Run( intf_thread_t *p_intf )
                 {
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Subtitle track: %s"), _("N/A") );
-                    var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
-                                &list2 );
+                    var_FreeList( &list, &list2 );
                     goto cleanup_and_continue;
                 }
                 for( i = 0; i < i_count; i++ )
@@ -516,8 +513,7 @@ static void Run( intf_thread_t *p_intf )
                 vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                  _("Subtitle track: %s"),
                                  list2.p_list->p_values[i].psz_string );
-                var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list,
-                            &list2 );
+                var_FreeList( &list, &list2 );
             }
             else if( i_action == ACTIONID_ASPECT_RATIO && p_vout )
             {
@@ -543,7 +539,7 @@ static void Run( intf_thread_t *p_intf )
                                      _("Aspect ratio: %s"),
                                      text_list.p_list->p_values[i].psz_string );
 
-                    var_Change( p_vout, "aspect-ratio", VLC_VAR_FREELIST, &val_list, &text_list );
+                    var_FreeList( &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -571,7 +567,7 @@ static void Run( intf_thread_t *p_intf )
                                      _("Crop: %s"),
                                      text_list.p_list->p_values[i].psz_string );
 
-                    var_Change( p_vout, "crop", VLC_VAR_FREELIST, &val_list, &text_list );
+                    var_FreeList( &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -638,7 +634,7 @@ static void Run( intf_thread_t *p_intf )
                                      _("Deinterlace mode: %s"),
                                      text_list.p_list->p_values[i].psz_string );
 
-                    var_Change( p_vout, "deinterlace", VLC_VAR_FREELIST, &val_list, &text_list );
+                    var_FreeList( &val_list, &text_list );
                 }
                 free( val.psz_string );
             }
@@ -670,7 +666,7 @@ static void Run( intf_thread_t *p_intf )
                                      _("Zoom mode: %s"),
                                 text_list.p_list->p_values[i].var.psz_name );
 
-                    var_Change( p_vout, "zoom", VLC_VAR_FREELIST, &val_list, &text_list );
+                    var_FreeList( &val_list, &text_list );
                 }
             }
             else if( i_action == ACTIONID_CROP_TOP && p_vout )
@@ -945,7 +941,7 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
     /* Special action for mouse event */
     /* FIXME: rework hotkeys handling to allow more than 1 event
      * to trigger one same action */
-    switch (newval.i_int & KEY_SPECIAL)
+    switch (newval.i_int & ~KEY_MODIFIER)
     {
         case KEY_MOUSEWHEELUP:
             i_action = (i_mode == MOUSEWHEEL_VOLUME ) ? ACTIONID_VOL_UP
@@ -966,8 +962,6 @@ static int SpecialKeyEvent( vlc_object_t *libvlc, char const *psz_var,
         case KEY_MENU:
             var_SetBool( libvlc, "intf-popupmenu", true );
             break;
-        default:
-          return VLC_SUCCESS;
     }
 
     if( i_mode == NO_MOUSEWHEEL ) return VLC_SUCCESS;