Changeset 0aebd65691ffa6427f13500adc65f5fc1fd8f8d0

Timestamp:

27/03/08 07:20:32 (7 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1206598832 -0700

git-parent:

[83a70bc8bd87420e8a4e8be713ac048ab218b09c]

git-author:

Dylan <dyudaken@gmail.com> 1206361610 +0200

Message:

Add Hotkey to cycle through audio devices

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

Files:

• include/vlc_keys.h (modified) (1 diff)
• modules/control/hotkeys.c (modified) (1 diff)
• src/libvlc-module.c (modified) (4 diffs)

include/vlc_keys.h

@@ -335 +335 @@
-#define ACTIONID_ZOOM_ORIGINAL         94
-#define ACTIONID_ZOOM_DOUBLE           95
-
+
+
-#endif

modules/control/hotkeys.c

@@ -505 +505 @@
-                                 list2.p_list->p_values[i].psz_string );
-            }
+            else if( i_action == ACTIONID_AUDIODEVICE_CYCLE && p_vout)
+            {
+                vlc_value_t val, list, list2;
+                int i_count, i;
+                aout_instance_t *p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+                var_Get( p_aout, "audio-device", &val );
+                var_Change( p_aout, "audio-device", VLC_VAR_GETCHOICES,&list, &list2 );
+                i_count = list.p_list->i_count;
+                if( i_count <= 1 )
+                {
+                    continue;
+                }
+                for( i = 1; i < i_count; i )
+                {
+                    if( val.i_int == list.p_list->p_values[i].i_int )
+                    {
+                        break;
+                    }
+                }
+                if( i == i_count )
+                {
+                    msg_Warn( p_aout,
+                              "invalid current audio device, selecting 0" );
+                    var_Set( p_aout, "audio-device",
+                             list.p_list->p_values[1] );
+                    i = 1;
+           
+                }
+                else if( i == i_count -1 )
+                {
+                    var_Set( p_aout, "audio-device",
+                             list.p_list->p_values[0] );
+                    i = 0;
+           
+                }
+                else
+                {
+                    var_Set( p_aout, "audio-device",
+                             list.p_list->p_values[i1] );
+                    i;
+        
+                }
+                vout_OSDMessage( VLC_OBJECT(p_input), 
+                                 DEFAULT_CHAN,
+                                 _("Audio Device: %s"),
+                                 list2.p_list->p_values[i].psz_string );
+       
+            }
-            else if( i_action == ACTIONID_SUBTITLE_TRACK )
-            {

src/libvlc-module.c

@@ -1357 +1357 @@
-        "Selecting current widget performs the associated action.")
-
+#define AUDI_DEVICE_CYCLE_KEY_TEXT N_("Cycle through audio devices")
+#define AUDI_DEVICE_CYCLE_KEY_LONGTEXT N_("Cycle through available audio devices")
-const char vlc_usage[] = N_(
-    "Usage: %s [options] [stream] ..."
@@ -2193 +2195 @@
-#   define KEY_MENU_DOWN          KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_DOWN
-#   define KEY_MENU_SELECT        KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_ENTER
+#   define KEY_AUDIODEVICE_CYCLE  KEY_MODIFIER_ALT|'a'
-#endif
-
@@ -2273 +2276 @@
-    add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT,
-             AUDIO_TRACK_KEY_LONGTEXT, VLC_FALSE );
+    add_key( "key-audiodevice-cycle", KEY_STOP, NULL, AUDI_DEVICE_CYCLE_KEY_TEXT,
+             AUDI_DEVICE_CYCLE_KEY_LONGTEXT, VLC_FALSE );
-    add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL,
-             SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, VLC_FALSE );
@@ -2606 +2611 @@
-    { "key-menu-down", ACTIONID_MENU_DOWN, 0, 0, 0, 0 },
-    { "key-menu-select", ACTIONID_MENU_SELECT, 0, 0, 0, 0 },
+    { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, 0, 0, 0, 0 },
-    { NULL, 0, 0, 0, 0, 0 }
-};