[vlc-commits] Win32: do not map Volume keys by default

Jean-Baptiste Kempf git at videolan.org
Mon Sep 16 17:34:39 CEST 2013


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Sep 16 17:33:09 2013 +0200| [8c6c1e78ebcb534fcdfe00aa3db195f6f351d63e] | committer: Jean-Baptiste Kempf

Win32: do not map Volume keys by default

On Windows, it seems people expect volume keys to control the master
volume...
I'm not going to fight this fight with our users during support...

Ref #9373

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c6c1e78ebcb534fcdfe00aa3db195f6f351d63e
---

 src/libvlc-module.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index c638bba..6fd088d 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -2292,8 +2292,15 @@ vlc_module_begin ()
 #   define KEY_NAV_LEFT           "Left"
 #   define KEY_NAV_RIGHT          "Right"
 #   define KEY_QUIT               "Ctrl+q"
+
+#ifdef _WIN32 /* On Windows, people expect volume keys to control the master */
+#   define KEY_VOL_UP             "Ctrl+Up"
+#   define KEY_VOL_DOWN           "Ctrl+Down"
+#else
 #   define KEY_VOL_UP             "Ctrl+Up\tVolume Up"
 #   define KEY_VOL_DOWN           "Ctrl+Down\tVolume Down"
+#endif
+
 #   define KEY_VOL_MUTE           "m\tVolume Mute"
 #   define KEY_SUBDELAY_UP        "h"
 #   define KEY_SUBDELAY_DOWN      "g"



More information about the vlc-commits mailing list