kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add global mute/unmute (bug #2601)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-10-11 15:40:24 +00:00
parent da6ca93454
commit 73617495d2
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
apps/app_meetme.c
View File

@@ -92,6 +92,8 @@ static char *descrip3 =
" 'l' -- Unlock conference\n" " 'l' -- Unlock conference\n"
" 'M' -- Mute conference\n" " 'M' -- Mute conference\n"
" 'm' -- Unmute conference\n" " 'm' -- Unmute conference\n"
" 'N' -- Mute entire conference (except admin)\n"
" 'n' -- Unmute entire conference (except admin)\n"
""; "";
STANDARD_LOCAL_USER; STANDARD_LOCAL_USER;
@@ -340,13 +342,21 @@ static int conf_cmd(int fd, int argc, char **argv) {
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
if (strcmp(argv[1], "mute") == 0) { if (strcmp(argv[1], "mute") == 0) {
/* Mute */ /* Mute */
if (strcmp(argv[3], "all") == 0) {
strncat(cmdline, "|N", sizeof(cmdline) - strlen(cmdline) - 1);
} else {
strncat(cmdline, "|M|", sizeof(cmdline) - strlen(cmdline) - 1); strncat(cmdline, "|M|", sizeof(cmdline) - strlen(cmdline) - 1);
strncat(cmdline, argv[3], sizeof(cmdline) - strlen(cmdline) - 1); strncat(cmdline, argv[3], sizeof(cmdline) - strlen(cmdline) - 1);
}
} else { } else {
/* Unmute */ /* Unmute */
if (strcmp(argv[3], "all") == 0) {
strncat(cmdline, "|n", sizeof(cmdline) - strlen(cmdline) - 1);
} else {
strncat(cmdline, "|m|", sizeof(cmdline) - strlen(cmdline) - 1); strncat(cmdline, "|m|", sizeof(cmdline) - strlen(cmdline) - 1);
strncat(cmdline, argv[3], sizeof(cmdline) - strlen(cmdline) - 1); strncat(cmdline, argv[3], sizeof(cmdline) - strlen(cmdline) - 1);
} }
}
} else if (strcmp(argv[1], "kick") == 0) { } else if (strcmp(argv[1], "kick") == 0) {
if (argc < 4) if (argc < 4)
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
@@ -379,7 +389,7 @@ static int conf_cmd(int fd, int argc, char **argv) {
/* Show all the users */ /* Show all the users */
user = cnf->firstuser; user = cnf->firstuser;
while(user) { while(user) {
ast_cli(fd, "User #: %i Channel: %s %s %s\n", user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)" : "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "" ); ast_cli(fd, "User #: %i Channel: %s %s %s %s\n", user->user_no, user->chan->name, (user->userflags & CONFFLAG_ADMIN) ? "(Admin)" : "", (user->userflags & CONFFLAG_MONITOR) ? "(Listen only)" : "", (user->adminflags & ADMINFLAG_MUTED) ? "(Admn Muted)" : "" );
user = user->nextuser; user = user->nextuser;
} }
return RESULT_SUCCESS; return RESULT_SUCCESS;
@@ -425,7 +435,7 @@ static char *complete_confcmd(char *line, char *word, int pos, int state) {
} else if (pos == 3) { } else if (pos == 3) {
/* User Number || Conf Command option*/ /* User Number || Conf Command option*/
if (strstr(line, "mute") || strstr(line, "kick")) { if (strstr(line, "mute") || strstr(line, "kick")) {
if ((state == 0) && (strstr(line, "kick")) && !(strncasecmp(word, "all", strlen(word)))) { if ((state == 0) && (strstr(line, "kick") || strstr(line,"mute")) && !(strncasecmp(word, "all", strlen(word)))) {
return strdup("all"); return strdup("all");
} }
which++; which++;
@@ -1492,6 +1502,18 @@ static int admin_exec(struct ast_channel *chan, void *data) {
ast_log(LOG_NOTICE, "Specified User not found!"); ast_log(LOG_NOTICE, "Specified User not found!");
} }
break; break;
case 78: /* N: Mute all users */
user = cnf->firstuser;
while(user) {
if (user && !(user->userflags & CONFFLAG_ADMIN))
user->adminflags |= ADMINFLAG_MUTED;
if (user->nextuser) {
user = user->nextuser;
} else {
break;
}
}
break;
case 109: /* m: Unmute */ case 109: /* m: Unmute */
if (user && (user->adminflags & ADMINFLAG_MUTED)) { if (user && (user->adminflags & ADMINFLAG_MUTED)) {
user->adminflags ^= ADMINFLAG_MUTED; user->adminflags ^= ADMINFLAG_MUTED;
@@ -1499,6 +1521,19 @@ static int admin_exec(struct ast_channel *chan, void *data) {
ast_log(LOG_NOTICE, "Specified User not found or he muted himself!"); ast_log(LOG_NOTICE, "Specified User not found or he muted himself!");
} }
break; break;
case 110: /* n: Unmute all users */
user = cnf->firstuser;
while(user) {
if (user && (user-> adminflags & ADMINFLAG_MUTED)) {
user->adminflags ^= ADMINFLAG_MUTED;
}
if (user->nextuser) {
user = user->nextuser;
} else {
break;
}
}
break;
case 107: /* k: Kick user */ case 107: /* k: Kick user */
if (user) { if (user) {
user->adminflags |= ADMINFLAG_KICKME; user->adminflags |= ADMINFLAG_KICKME;