[asterisk-commits] dvossel: branch dvossel/hd_confbridge r311614 - in /team/dvossel/hd_confbridg...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Mar 23 16:50:18 2011
New Revision: 311614

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311614
Log:
reset talking and listening volume ConfBridge menu actions

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c
    team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c
    team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h
    team/dvossel/hd_confbridge/configs/confbridge.conf.sample

Modified: team/dvossel/hd_confbridge/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/app_confbridge.c?view=diff&rev=311614&r1=311613&r2=311614
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Wed Mar 23 16:50:18 2011
@@ -1418,6 +1418,13 @@
 		case MENU_ACTION_PLAYBACK:
 			res |= action_playback(bridge_channel, menu_action->data.playback_file);
 			break;
+
+		case MENU_ACTION_RESET_LISTENING:
+			ast_audiohook_volume_set(conference_bridge_user->chan, AST_AUDIOHOOK_DIRECTION_WRITE, 0);
+			break;
+		case MENU_ACTION_RESET_TALKING:
+			ast_audiohook_volume_set(conference_bridge_user->chan, AST_AUDIOHOOK_DIRECTION_READ, 0);
+			break;
 		case MENU_ACTION_INCREASE_LISTENING:
 			ast_audiohook_volume_adjust(conference_bridge_user->chan,
 				AST_AUDIOHOOK_DIRECTION_WRITE, 1);

Modified: team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c?view=diff&rev=311614&r1=311613&r2=311614
==============================================================================
--- team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c (original)
+++ team/dvossel/hd_confbridge/apps/confbridge/conf_config_parser.c Wed Mar 23 16:50:18 2011
@@ -536,6 +536,8 @@
 	case MENU_ACTION_DECREASE_LISTENING:
 	case MENU_ACTION_INCREASE_TALKING:
 	case MENU_ACTION_DECREASE_TALKING:
+	case MENU_ACTION_RESET_LISTENING:
+	case MENU_ACTION_RESET_TALKING:
 	case MENU_ACTION_ADMIN_TOGGLE_LOCK:
 	case MENU_ACTION_ADMIN_KICK_LAST:
 	case MENU_ACTION_LEAVE:
@@ -605,6 +607,10 @@
 		res |= add_action_to_menu_entry(menu_entry, MENU_ACTION_DECREASE_LISTENING, NULL);
 	} else if (!strcasecmp(action, "increase_talking_volume")) {
 		res |= add_action_to_menu_entry(menu_entry, MENU_ACTION_INCREASE_TALKING, NULL);
+	} else if (!strcasecmp(action, "reset_listening_volume")) {
+		res |= add_action_to_menu_entry(menu_entry, MENU_ACTION_RESET_LISTENING, NULL);
+	} else if (!strcasecmp(action, "reset_talking_volume")) {
+		res |= add_action_to_menu_entry(menu_entry, MENU_ACTION_RESET_TALKING, NULL);
 	} else if (!strcasecmp(action, "decrease_talking_volume")) {
 		res |= add_action_to_menu_entry(menu_entry, MENU_ACTION_DECREASE_TALKING, NULL);
 	} else if (!strcasecmp(action, "admin_toggle_conference_lock")) {
@@ -1041,6 +1047,12 @@
 			case MENU_ACTION_DECREASE_LISTENING:
 				ast_cli(a->fd, "decrease_listening_volume");
 				break;
+			case MENU_ACTION_RESET_LISTENING:
+				ast_cli(a->fd, "reset_listening_volume");
+				break;
+			case MENU_ACTION_RESET_TALKING:
+				ast_cli(a->fd, "reset_talking_volume");
+				break;
 			case MENU_ACTION_INCREASE_TALKING:
 				ast_cli(a->fd, "increase_talking_volume");
 				break;

Modified: team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h?view=diff&rev=311614&r1=311613&r2=311614
==============================================================================
--- team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h (original)
+++ team/dvossel/hd_confbridge/apps/confbridge/include/confbridge.h Wed Mar 23 16:50:18 2011
@@ -65,6 +65,8 @@
 	MENU_ACTION_PLAYBACK_AND_CONTINUE,
 	MENU_ACTION_INCREASE_LISTENING,
 	MENU_ACTION_DECREASE_LISTENING,
+	MENU_ACTION_RESET_LISTENING,
+	MENU_ACTION_RESET_TALKING,
 	MENU_ACTION_INCREASE_TALKING,
 	MENU_ACTION_DECREASE_TALKING,
 	MENU_ACTION_DIALPLAN_EXEC,

Modified: team/dvossel/hd_confbridge/configs/confbridge.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/configs/confbridge.conf.sample?view=diff&rev=311614&r1=311613&r2=311614
==============================================================================
--- team/dvossel/hd_confbridge/configs/confbridge.conf.sample (original)
+++ team/dvossel/hd_confbridge/configs/confbridge.conf.sample Wed Mar 23 16:50:18 2011
@@ -159,10 +159,14 @@
 ; toggle_mute      ; Toggle turning on and off mute.  Mute will make the user silent
                    ; to everyone else, but the user will still be able to listen in.
                    ; continue to collect the dtmf sequence.
+
 ; decrease_listening_volume ; Decreases the channel's listening volume.
 ; increase_listening_volume ; Increases the channel's listening volume.
-; decrease_talking_volume   ; Decreases the channel's talking volume.
-; increase_talking_volume   ; Increases the channel's talking volume.
+; reset_listening_volume    ; Reset channel's listening volume to default level.
+
+; decrease_talking_volume ; Decreases the channel's talking volume.
+; increase_talking_volume ; Icreases the channel's talking volume.
+; reset_talking_volume    ; Reset channel's talking volume to default level.
 ;
 ; dialplan_exec(context,exten,priority)  ; The dialplan_exec action allows a user
                                          ; to escape from the conference and execute