[svn-commits] dvossel: branch dvossel/hd_confbridge r311735 - in /team/dvossel/hd_confbridg...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Mar 28 11:41:25 2011
New Revision: 311735

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311735
Log:
Fixes bug with 'startmuted' option and introduces admin sample menu in config

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c
    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=311735&r1=311734&r2=311735
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Mon Mar 28 11:41:25 2011
@@ -629,7 +629,10 @@
 			if (other_conference_bridge_user == conference_bridge_user) {
 				continue;
 			}
-			other_conference_bridge_user->features.mute = 0;
+			/* only unmute them if they are not supposed to start muted */
+			if (!ast_test_flag(&other_conference_bridge_user->u_profile, USER_OPT_STARTMUTED)) {
+				other_conference_bridge_user->features.mute = 0;
+			}
 		}
 
 	} else {

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=311735&r1=311734&r2=311735
==============================================================================
--- team/dvossel/hd_confbridge/configs/confbridge.conf.sample (original)
+++ team/dvossel/hd_confbridge/configs/confbridge.conf.sample Mon Mar 28 11:41:25 2011
@@ -245,11 +245,18 @@
 type=menu
 *=playback_and_continue(conf-usermenu)
 *1=toggle_mute
+*4=decrease_listening_volume
+*6=increase_listening_volume
+*7=decrease_talking_volume
+*9=increase_talking_volume
+
+[sample_admin_menu]
+type=menu
+*=playback_and_continue(conf-adminmenu)
+*1=toggle_mute
 *2=admin_toggle_conference_lock ; only applied to admin users
 *3=admin_kick_last              ; only applied to admin users
 *4=decrease_listening_volume
 *6=increase_listening_volume
 *7=decrease_talking_volume
 *9=increase_talking_volume
-
-