kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conferencing of non-zap stuff (bug #3488)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-02 02:20:34 +00:00
parent c48522110f
commit b96ba5cae3
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/app_meetme.c
View File

@@ -904,7 +904,7 @@ zapretry:
goto zapretry;
}
f = ast_read(c);
if (!f)
if (!f)
break;
if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) {
if (confflags & CONFFLAG_MONITORTALKER) {
@@ -932,6 +932,10 @@ zapretry:
chan->name, chan->uniqueid, conf->confno, user->user_no);
}
}
if (using_pseudo) {
/* Carefully write */
careful_write(fd, f->data, f->datalen);
}
} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) {
char tmp[2];
tmp[0] = f->subclass;
@@ -1062,14 +1066,8 @@ zapretry:
if (musiconhold) {
ast_moh_start(chan, NULL);
}
} else if (using_pseudo) {
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_SLINEAR) {
/* Carefully write */
careful_write(fd, f->data, f->datalen);
} else
ast_log(LOG_WARNING, "Huh? Got a non-linear (%d) frame in the conference\n", f->subclass);
}
} else if (option_debug) {
ast_log(LOG_DEBUG, "Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",chan->name,f->frametype,f->subclass);
}
ast_frfree(f);
} else if (outfd > -1) {