[asterisk-commits] branch jcollie/bug7131 r29007 - /team/jcollie/bug7131/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: jcollie
Date: Fri May 19 22:10:01 2006
New Revision: 29007

URL: http://svn.digium.com/view/asterisk?rev=29007&view=rev
Log:
Apply updated patch from bug 7131.

Modified:
    team/jcollie/bug7131/apps/app_meetme.c

Modified: team/jcollie/bug7131/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jcollie/bug7131/apps/app_meetme.c?rev=29007&r1=29006&r2=29007&view=diff
==============================================================================
--- team/jcollie/bug7131/apps/app_meetme.c (original)
+++ team/jcollie/bug7131/apps/app_meetme.c Fri May 19 22:10:01 2006
@@ -2254,9 +2254,8 @@
 						"Meetme: %s\r\n"
 						"Usernum: %d\r\n",
 						cnf->confno, user->user_no);
-				} else {
+				} else
 					ast_log(LOG_NOTICE, "Specified User not found!\n");
-				}
 				break;
 			case 78: /* N: Mute all users */
 				AST_LIST_TRAVERSE(&cnf->userlist, user, list) {
@@ -2272,9 +2271,8 @@
 						"Meetme: %s\r\n"
 						"Usernum: %d\r\n",
 						cnf->confno, user->user_no);
-				} else {
+				} else
 					ast_log(LOG_NOTICE, "Specified User not found or he muted himself!\n");
-				}
 				break;
 			case 110: /* n: Unmute all users */
 				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
@@ -2284,6 +2282,56 @@
 				if (user)
 					user->adminflags |= ADMINFLAG_KICKME;
 				else
+					ast_log(LOG_NOTICE, "Specified User not found!");
+				break;
+			case 118: /* v: Lower all users listen volume */
+				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
+					tweak_listen_volume(user, VOL_DOWN);
+				break;
+			case 86: /* V: Raise all users listen volume */
+				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
+					tweak_listen_volume(user, VOL_UP);
+				break;
+			case 115: /* s: Lower all users speaking volume */
+				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
+					tweak_talk_volume(user, VOL_DOWN);
+				break;
+			case 83: /* S: Raise all users speaking volume */
+				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
+					tweak_talk_volume(user, VOL_UP);
+				break;
+			case 82: /* R: Reset all volume levels */
+				AST_LIST_TRAVERSE(&cnf->userlist, user, list)
+					reset_volumes(user);
+				break;
+			case 114: /* r: Reset user's volume level */
+				if (user)
+					reset_volumes(user);
+				else
+					ast_log(LOG_NOTICE, "Specified User not found!");
+				break;
+			case 85: /* U: Raise user's listen volume */
+				if (user)
+					tweak_listen_volume(user, VOL_UP);
+				else
+					ast_log(LOG_NOTICE, "Specified User not found!");
+				break;
+			case 117: /* u: Lower user's listen volume */
+				if (user)
+					tweak_listen_volume(user, VOL_DOWN);
+				else
+					ast_log(LOG_NOTICE, "Specified User not found!");
+				break;
+			case 84: /* T: Raise user's talk volume */
+				if (user)
+					tweak_talk_volume(user, VOL_UP);
+				else
+					ast_log(LOG_NOTICE, "Specified User not found!");
+				break;
+			case 116: /* t: Lower user's talk volume */
+				if (user) 
+					tweak_talk_volume(user, VOL_DOWN);
+				else 
 					ast_log(LOG_NOTICE, "Specified User not found!");
 				break;
 			}