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

Merge "main/app.c: Transmit Silence on ControlPlayback pause"

Browse Source
This commit is contained in:
Joshua Colp
2016-11-21 04:46:37 -06:00
committed by Gerrit Code Review
parent 120a4999f0 e822a50f86
commit 84e508c999
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/app.c
View File

@@ -1071,6 +1071,7 @@ static int control_streamfile(struct ast_channel *chan,
int res; int res;
long pause_restart_point = 0; long pause_restart_point = 0;
long offset = 0; long offset = 0;
struct ast_silence_generator *silgen = NULL;
if (!file) { if (!file) {
return -1; return -1;
@@ -1161,6 +1162,10 @@ static int control_streamfile(struct ast_channel *chan,
if ((suspend && strchr(suspend, res)) || res == AST_CONTROL_STREAM_SUSPEND) { if ((suspend && strchr(suspend, res)) || res == AST_CONTROL_STREAM_SUSPEND) {
pause_restart_point = ast_tellstream(ast_channel_stream(chan)); pause_restart_point = ast_tellstream(ast_channel_stream(chan));
if (ast_opt_transmit_silence) {
silgen = ast_channel_start_silence_generator(chan);
}
ast_test_suite_event_notify("PLAYBACK","Channel: %s\r\n" ast_test_suite_event_notify("PLAYBACK","Channel: %s\r\n"
"Control: %s\r\n", "Control: %s\r\n",
ast_channel_name(chan), ast_channel_name(chan),
@@ -1174,6 +1179,11 @@ static int control_streamfile(struct ast_channel *chan,
break; break;
} }
} }
if (silgen) {
ast_channel_stop_silence_generator(chan, silgen);
silgen = NULL;
}
if ((suspend && (res == *suspend)) || res == AST_CONTROL_STREAM_SUSPEND) { if ((suspend && (res == *suspend)) || res == AST_CONTROL_STREAM_SUSPEND) {
res = 0; res = 0;
ast_test_suite_event_notify("PLAYBACK","Channel: %s\r\n" ast_test_suite_event_notify("PLAYBACK","Channel: %s\r\n"