From 5ad2df4f1f98fd3c3c2bba08ee3ecc4810be60ff Mon Sep 17 00:00:00 2001 From: Yoann Peronneau Date: Thu, 11 Dec 2003 01:36:12 +0000 Subject: [PATCH] added a 'mute' hotkey ('m') --- include/vlc_keys.h | 3 ++- modules/control/hotkeys.c | 17 ++++++++++++++++- src/libvlc.h | 7 ++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 9dcfe8e4a6..7e4aa0300a 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -2,7 +2,7 @@ * hotkeys.h: keycode defines ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: vlc_keys.h,v 1.10 2003/12/10 17:19:05 yoann Exp $ + * $Id: vlc_keys.h,v 1.11 2003/12/11 01:36:12 yoann Exp $ * * Authors: Sigmund Augdal * @@ -199,3 +199,4 @@ static inline int StringToKey( char *psz_key ) #define ACTIONID_JUMP_BACKWARD_5MIN 22 #define ACTIONID_JUMP_FORWARD_5MIN 23 #define ACTIONID_POSITION 24 +#define ACTIONID_VOL_MUTE 25 diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 3a9a172007..c0fbc8f5de 100755 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -2,7 +2,7 @@ * hotkeys.c: Hotkey handling for vlc ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: hotkeys.c,v 1.11 2003/12/10 20:56:09 yoann Exp $ + * $Id: hotkeys.c,v 1.12 2003/12/11 01:36:12 yoann Exp $ * * Authors: Sigmund Augdal * @@ -215,6 +215,21 @@ static void Run( intf_thread_t *p_intf ) sprintf( string, "Vol %d%%", i_newvol*100/AOUT_VOLUME_MAX ); vout_OSDMessage( VLC_OBJECT(p_intf), string ); } + else if( i_action == ACTIONID_VOL_MUTE ) + { + audio_volume_t i_newvol = -1; + aout_VolumeMute( p_intf, &i_newvol ); + if( i_newvol == 0 ) + { + vout_OSDMessage( VLC_OBJECT(p_intf), "Mute" ); + } + else + { + char string[9]; + sprintf( string, "Vol %d%%", i_newvol*100/AOUT_VOLUME_MAX ); + vout_OSDMessage( VLC_OBJECT(p_intf), string ); + } + } else if( i_action == ACTIONID_FULLSCREEN ) { if( p_vout ) diff --git a/src/libvlc.h b/src/libvlc.h index 561418e712..41bafcf8c8 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -2,7 +2,7 @@ * libvlc.h: main libvlc header ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.h,v 1.116 2003/12/10 17:19:05 yoann Exp $ + * $Id: libvlc.h,v 1.117 2003/12/11 01:36:12 yoann Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -580,6 +580,8 @@ static char *ppsz_language_text[] = #define VOL_UP_KEY_LONGTEXT N_("Select the key to turn up audio volume") #define VOL_DOWN_KEY_TEXT N_("Volume down") #define VOL_DOWN_KEY_LONGTEXT N_("Select the key to turn down audio volume") +#define VOL_MUTE_KEY_TEXT N_("Mute") +#define VOL_MUTE_KEY_LONGTEXT N_("Select the key to turn off audio volume") #define PLAYLIST_USAGE N_("\nPlaylist items:" \ "\n *.mpg, *.vob plain MPEG-1/2 files" \ @@ -817,6 +819,7 @@ vlc_module_begin(); add_key( "key-quit", KEY_MODIFIER_COMMAND|'q', NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-up", KEY_MODIFIER_COMMAND|KEY_UP, NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-down", KEY_MODIFIER_COMMAND|KEY_DOWN, NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-vol-mute", KEY_MODIFIER_COMMAND|'m', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); #else add_key( "key-fullscreen", 'f', NULL, FULLSCREEN_KEY_TEXT, FULLSCREEN_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-play-pause", KEY_SPACE, NULL, PLAY_PAUSE_KEY_TEXT, PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE ); @@ -842,6 +845,7 @@ vlc_module_begin(); add_key( "key-quit", KEY_MODIFIER_CTRL|'q', NULL, QUIT_KEY_TEXT, QUIT_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-up", 'a', NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-down", 'z', NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-vol-mute", 'm', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); #endif /* Usage (mainly useful for cmd line stuff) */ @@ -900,6 +904,7 @@ static struct hotkey p_hotkeys[] = { "key-fullscreen", ACTIONID_FULLSCREEN, 0 }, { "key-vol-up", ACTIONID_VOL_UP, 0 }, { "key-vol-down", ACTIONID_VOL_DOWN, 0 }, + { "key-vol-mute", ACTIONID_VOL_MUTE, 0 }, { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 }, -- 2.39.2