Renamed "deinterlace" into "deinterlace-mode" at the core level.

[vlc] / modules / control / hotkeys.c

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 817fd0a6284100fd924df150c7820752c904fa30..1f536d3c83c8a5cc0cb30ea78b7b4cc65cc43994 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -38,7 +38,7 @@
 #include <vlc_aout.h>
 #include <vlc_osd.h>
 #include <vlc_playlist.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
 #include "math.h"
 
 #define CHANNELS_NUMBER 4
@@ -181,7 +181,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_UP:
         {
             audio_volume_t i_newvol;
-            aout_VolumeUp( p_intf, 1, &i_newvol );
+            aout_VolumeUp( p_playlist, 1, &i_newvol );
             DisplayVolume( p_intf, p_vout, i_newvol );
             break;
         }
@@ -189,7 +189,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_DOWN:
         {
             audio_volume_t i_newvol;
-            aout_VolumeDown( p_intf, 1, &i_newvol );
+            aout_VolumeDown( p_playlist, 1, &i_newvol );
             DisplayVolume( p_intf, p_vout, i_newvol );
             break;
         }
@@ -197,7 +197,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         case ACTIONID_VOL_MUTE:
         {
             audio_volume_t i_newvol = -1;
-            aout_VolumeMute( p_intf, &i_newvol );
+            aout_ToggleMute( p_playlist, &i_newvol );
             if( p_vout )
             {
                 if( i_newvol == 0 )
@@ -231,8 +231,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         {
             vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
                                        : VLC_OBJECT(p_playlist);
-            bool b = var_GetBool( obj, "fullscreen" );
-            var_SetBool( obj, "fullscreen", !b );
+            var_ToggleBool( obj, "fullscreen" );
             break;
         }
 
@@ -265,8 +264,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
         {   /* FIXME: this is invalid if not using DirectX output!!! */
             vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
                                        : VLC_OBJECT(p_playlist);
-            bool b = var_GetBool( obj, "directx-wallpaper" );
-            var_SetBool( obj, "directx-wallpaper", !b );
+            var_ToggleBool( obj, "directx-wallpaper" );
         }
 #endif
 
@@ -287,8 +285,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
 
         case ACTIONID_RANDOM:
         {
-            bool b = var_GetBool( p_playlist, "random" );
-            var_SetBool( p_playlist, "random", !b );
+            var_ToggleBool( p_playlist, "random" );
         }
 
         case ACTIONID_PLAY_PAUSE:
@@ -598,8 +595,8 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
             else if( i_action == ACTIONID_DEINTERLACE && p_vout )
             {
                 vlc_value_t val={0}, val_list, text_list;
-                var_Get( p_vout, "deinterlace", &val );
-                if( var_Change( p_vout, "deinterlace", VLC_VAR_GETLIST,
+                var_Get( p_vout, "deinterlace-mode", &val );
+                if( var_Change( p_vout, "deinterlace-mode", VLC_VAR_GETLIST,
                                 &val_list, &text_list ) >= 0 )
                 {
                     int i;
@@ -613,7 +610,7 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
                         }
                     }
                     if( i == val_list.p_list->i_count ) i = 0;
-                    var_SetString( p_vout, "deinterlace",
+                    var_SetString( p_vout, "deinterlace-mode",
                                    val_list.p_list->p_values[i].psz_string );
                     vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                      _("Deinterlace mode: %s"),
@@ -689,19 +686,19 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
             }
             else if( i_action == ACTIONID_FRAME_NEXT )
             {
-                var_SetVoid( p_input, "frame-next" );
+                var_TriggerCallback( p_input, "frame-next" );
                 vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                  "%s", _("Next frame") );
             }
             else if( i_action == ACTIONID_FASTER )
             {
-                var_SetVoid( p_input, "rate-faster" );
+                var_TriggerCallback( p_input, "rate-faster" );
                 vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                  "%s", _("Faster") );
             }
             else if( i_action == ACTIONID_SLOWER )
             {
-                var_SetVoid( p_input, "rate-slower" );
+                var_TriggerCallback( p_input, "rate-slower" );
                 vout_OSDMessage( VLC_OBJECT(p_input), DEFAULT_CHAN,
                                  "%s", _("Slower") );
             }
@@ -754,13 +751,13 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
             }
             /* Only makes sense with DVD */
             else if( i_action == ACTIONID_TITLE_PREV )
-                var_SetVoid( p_input, "prev-title" );
+                var_TriggerCallback( p_input, "prev-title" );
             else if( i_action == ACTIONID_TITLE_NEXT )
-                var_SetVoid( p_input, "next-title" );
+                var_TriggerCallback( p_input, "next-title" );
             else if( i_action == ACTIONID_CHAPTER_PREV )
-                var_SetVoid( p_input, "prev-chapter" );
+                var_TriggerCallback( p_input, "prev-chapter" );
             else if( i_action == ACTIONID_CHAPTER_NEXT )
-                var_SetVoid( p_input, "next-chapter" );
+                var_TriggerCallback( p_input, "next-chapter" );
             else if( i_action == ACTIONID_DISC_MENU )
                 var_SetInteger( p_input, "title  0", 2 );