Index: apps/app_meetme.c =================================================================== --- apps/app_meetme.c (revision 26564) +++ apps/app_meetme.c (working copy) @@ -2286,11 +2286,10 @@ user = cnf->firstuser; while(user) { user->adminflags |= ADMINFLAG_KICKME; - if (user->nextuser) { + if (user->nextuser) user = user->nextuser; - } else { + else break; - } } break; case 101: /* e: Eject last user*/ @@ -2309,20 +2308,18 @@ "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 */ user = cnf->firstuser; - while(user) { + while (user) { if (user && !(user->userflags & CONFFLAG_ADMIN)) user->adminflags |= ADMINFLAG_MUTED; - if (user->nextuser) { + if (user->nextuser) user = user->nextuser; - } else { + else break; - } } break; case 109: /* m: Unmute */ @@ -2333,30 +2330,106 @@ "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 */ user = cnf->firstuser; while(user) { - if (user && (user-> adminflags & ADMINFLAG_MUTED)) { + if (user && (user-> adminflags & ADMINFLAG_MUTED)) user->adminflags ^= ADMINFLAG_MUTED; - } - if (user->nextuser) { + if (user->nextuser) user = user->nextuser; - } else { + else break; - } } break; case 107: /* k: Kick user */ - if (user) { + if (user) user->adminflags |= ADMINFLAG_KICKME; - } else { + else ast_log(LOG_NOTICE, "Specified User not found!"); + break; + case 118: /* v: Lower all users listen volume */ + user = cnf->firstuser; + while(user) { + tweak_listen_volume(user, VOL_DOWN); + if (user->nextuser) + user = user->nextuser; + else + break; } break; + case 86: /* V: Raise all users listen volume */ + user = cnf->firstuser; + while (user) { + tweak_listen_volume(user, VOL_UP); + if (user->nextuser) + user = user->nextuser; + else + break; + } + break; + case 115: /* s: Lower all users speaking volume */ + user = cnf->firstuser; + while (user) { + tweak_talk_volume(user, VOL_DOWN); + if (user->nextuser) + user = user->nextuser; + else + break; + } + break; + case 83: /* S: Raise all users speaking volume */ + user = cnf->firstuser; + while (user) { + tweak_talk_volume(user, VOL_UP); + if (user->nextuser) + user = user->nextuser; + else + break; + } + break; + case 82: /* R: Reset all volume levels */ + user = cnf->firstuser; + while (user) { + reset_volumes(user); + if (user->nextuser) + user = user->nextuser; + else + break; + } + 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; } } else { ast_log(LOG_NOTICE, "Conference Number not found\n");