kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43891 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43891 | file | 2006-09-28 12:13:55 -0400 (Thu, 28 Sep 2006) | 2 lines

Stop the stream after waitstream returns so that our formats get restored. (issue #7370 reported by kryptolus)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-09-28 16:17:36 +00:00
parent f1ebcc8e34
commit a30a5f2f09
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_meetme.c
View File

@@ -1152,6 +1152,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (conf->users == 2) {
if (!ast_streamfile(chan,"conf-onlyone",chan->language)) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan);
if (res > 0)
keepplaying=0;
else if (res == -1)
@@ -1160,6 +1161,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} else {
if (!ast_streamfile(chan, "conf-thereare", chan->language)) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan);
if (res > 0)
keepplaying=0;
else if (res == -1)
@@ -1174,6 +1176,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
}
if (keepplaying && !ast_streamfile(chan, "conf-otherinparty", chan->language)) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan);
if (res > 0)
keepplaying=0;
else if (res == -1)
@@ -2356,8 +2359,10 @@ static int conf_exec(struct ast_channel *chan, void *data)
break;
} else {
/* Pin invalid */
if (!ast_streamfile(chan, "conf-invalidpin", chan->language))
if (!ast_streamfile(chan, "conf-invalidpin", chan->language)) {
res = ast_waitstream(chan, AST_DIGIT_ANY);
ast_stopstream(chan);
}
else {
ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
break;