* Hotkey to set audio delay on the fly

* This currently sets audio-delay, which produses some ugly warning messages. The new resampling algorithm seems to behave quite well however.

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 7b5fbf004bcdc7bf33189ebbde62bd89fb4d3b92..f7b6a391a1ef0f1c41865a662c8358e7f091cbfc 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -235,4 +235,6 @@ static inline int StringToKey( char *psz_key )
 #define ACTIONID_CUBESPEED_UP          52
 #define ACTIONID_CUBESPEED_DOWN        53
 #define ACTIONID_INTF_SHOW             52
+#define ACTIONID_AUDIODELAY_UP         53
+#define ACTIONID_AUDIODELAY_DOWN       54
 

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 2a42e96eb7d3e266c7b1ebc118fb9cb469ab7cda..6d5df98012a693f74b3c65c65c5bdbba663c43c8 100755 (executable)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -321,6 +321,28 @@ static void Run( intf_thread_t *p_intf )
             vout_OSDMessage( p_intf, DEFAULT_CHAN, "Subtitle delay %i ms",
                                  (int)(i_delay/1000) );
         }
+        else if( i_action == ACTIONID_AUDIODELAY_DOWN )
+        {
+            int64_t i_delay = var_GetTime( p_input, "audio-delay" );
+
+            i_delay -= 50000;    /* 50 ms */
+
+            var_SetTime( p_input, "audio-delay", i_delay );
+            ClearChannels( p_intf, p_vout );
+            vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms",
+                                 (int)(i_delay/1000) );
+        }
+        else if( i_action == ACTIONID_AUDIODELAY_UP )
+        {
+            int64_t i_delay = var_GetTime( p_input, "audio-delay" );
+
+            i_delay += 50000;    /* 50 ms */
+
+            var_SetTime( p_input, "audio-delay", i_delay );
+            ClearChannels( p_intf, p_vout );
+            vout_OSDMessage( p_intf, DEFAULT_CHAN, "Audio delay %i ms",
+                                 (int)(i_delay/1000) );
+        }
         else if( i_action == ACTIONID_FULLSCREEN )
         {
             if( p_vout )

diff --git a/src/input/var.c b/src/input/var.c
index 4a0ab8a4cca8ea193f6a4accdedcf0435039439e..dbd7b9a068aa134c11588d4323d8b75f8895e1bc 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -694,6 +694,12 @@ static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
 {
     input_thread_t *p_input = (input_thread_t*)p_this;
 
+    /*Change i_pts_delay to make sure es are decoded in time*/
+    if (newval.i_int < 0 || oldval.i_int < 0 )
+    {
+        p_input->i_pts_delay -= newval.i_int - oldval.i_int;
+    }
+
     if( !strcmp( psz_cmd, "audio-delay" ) )
         input_ControlPush( p_input, INPUT_CONTROL_SET_AUDIO_DELAY, &newval );
     else if( !strcmp( psz_cmd, "spu-delay" ) )

diff --git a/src/libvlc.h b/src/libvlc.h
index 7bf1f489fb06c4f51f15868c4a371d6767002ae9..b7a90442e92673a80b74d86ffaaabb69fce8a922 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -750,6 +750,10 @@ static char *ppsz_align_descriptions[] =
 #define SUBDELAY_UP_KEY_LONGTEXT N_("Select the key to increase the subtitle delay.")
 #define SUBDELAY_DOWN_KEY_TEXT N_("Subtitle delay down")
 #define SUBDELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the subtitle delay.")
+#define AUDIODELAY_UP_KEY_TEXT N_("Audio delay up")
+#define AUDIODELAY_UP_KEY_LONGTEXT N_("Select the key to increase the audio delay.")
+#define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down")
+#define AUDIODELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the audio delay.")
 #define PLAY_BOOKMARK1_KEY_TEXT N_("Play playlist bookmark 1")
 #define PLAY_BOOKMARK2_KEY_TEXT N_("Play playlist bookmark 2")
 #define PLAY_BOOKMARK3_KEY_TEXT N_("Play playlist bookmark 3")
@@ -1184,6 +1188,8 @@ vlc_module_begin();
 #   define KEY_VOL_MUTE           KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m'
 #   define KEY_SUBDELAY_UP        KEY_MODIFIER_COMMAND|'k'
 #   define KEY_SUBDELAY_DOWN      KEY_MODIFIER_COMMAND|'j'
+#   define KEY_AUDIODELAY_UP      KEY_MODIFIER_COMMAND|'h'
+#   define KEY_AUDIODELAY_DOWN    KEY_MODIFIER_COMMAND|'g'
 #   define KEY_AUDIO_TRACK        'l'
 #   define KEY_SUBTITLE_TRACK     's'
 #   define KEY_INTF_SHOW          'i'
@@ -1239,6 +1245,9 @@ vlc_module_begin();
 #   define KEY_VOL_MUTE           'm'
 #   define KEY_SUBDELAY_UP        KEY_MODIFIER_CTRL|'h'
 #   define KEY_SUBDELAY_DOWN      KEY_MODIFIER_CTRL|'j'
+#   define KEY_AUDIODELAY_UP      KEY_MODIFIER_CTRL|'k'
+#   define KEY_AUDIODELAY_DOWN    KEY_MODIFIER_CTRL|'l'
+
 #   define KEY_AUDIO_TRACK        'l'
 #   define KEY_SUBTITLE_TRACK     'k'
 #   define KEY_INTF_SHOW          'i'
@@ -1323,6 +1332,10 @@ vlc_module_begin();
              SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_TRUE );
     add_key( "key-subdelay-down", KEY_SUBDELAY_DOWN, NULL,
              SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_TRUE );
+    add_key( "key-audiodelay-up", KEY_AUDIODELAY_UP, NULL,
+             AUDIODELAY_UP_KEY_TEXT, AUDIODELAY_UP_KEY_LONGTEXT, VLC_TRUE );
+    add_key( "key-audiodelay-down", KEY_AUDIODELAY_DOWN, NULL,
+             AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_DOWN_KEY_LONGTEXT, VLC_TRUE );
     add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT,
              AUDIO_TRACK_KEY_LONGTEXT, VLC_FALSE );
     add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL,
@@ -1436,6 +1449,8 @@ static struct hotkey p_hotkeys[] =
     { "key-vol-mute", ACTIONID_VOL_MUTE, 0 },
     { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0 },
     { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0 },
+    { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0 },
+    { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0 },
     { "key-audio-track", ACTIONID_AUDIO_TRACK, 0},
     { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0},
     { "key-intf-show", ACTIONID_INTF_SHOW, 0},