[asterisk-commits] dvossel: branch 1.6.1 r239714 - in /branches/1.6.1: ./ apps/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jan 13 10:38:36 CST 2010
Author: dvossel
Date: Wed Jan 13 10:38:31 2010
New Revision: 239714
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239714
Log:
Merged revisions 239712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines
add silence gen to wait apps
asterisk.conf's 'transmit_silence' option existed before
this patch, but was limited to only generating silence
while recording and sending DTMF. Now enabling the
transmit_silence option generates silence during wait
times as well.
To achieve this, ast_safe_sleep has been modified to
generate silence anytime no other generators are present
and transmit_silence is enabled. Wait apps not using
ast_safe_sleep now generate silence when transmit_silence
is enabled as well.
(closes issue #16524)
Reported by: kobaz
(closes issue #16523)
Reported by: kobaz
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/456/
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/Makefile
branches/1.6.1/apps/app_waitforring.c
branches/1.6.1/apps/app_waitforsilence.c
branches/1.6.1/main/channel.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=239714&r1=239713&r2=239714
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Wed Jan 13 10:38:31 2010
@@ -685,7 +685,7 @@
echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
- echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \
+ echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is waiting, being recorded, or DTMF is being generated" ; \
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
Modified: branches/1.6.1/apps/app_waitforring.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_waitforring.c?view=diff&rev=239714&r1=239713&r2=239714
==============================================================================
--- branches/1.6.1/apps/app_waitforring.c (original)
+++ branches/1.6.1/apps/app_waitforring.c Wed Jan 13 10:38:31 2010
@@ -48,6 +48,7 @@
static int waitforring_exec(struct ast_channel *chan, void *data)
{
struct ast_frame *f;
+ struct ast_silence_generator *silgen = NULL;
int res = 0;
double s;
int ms;
@@ -55,6 +56,10 @@
if (!data || (sscanf(data, "%30lg", &s) != 1)) {
ast_log(LOG_WARNING, "WaitForRing requires an argument (minimum seconds)\n");
return 0;
+ }
+
+ if (ast_opt_transmit_silence) {
+ silgen = ast_channel_start_silence_generator(chan);
}
ms = s * 1000.0;
@@ -101,6 +106,10 @@
}
}
+ if (silgen) {
+ ast_channel_stop_silence_generator(chan, silgen);
+ }
+
return res;
}
Modified: branches/1.6.1/apps/app_waitforsilence.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_waitforsilence.c?view=diff&rev=239714&r1=239713&r2=239714
==============================================================================
--- branches/1.6.1/apps/app_waitforsilence.c (original)
+++ branches/1.6.1/apps/app_waitforsilence.c Wed Jan 13 10:38:31 2010
@@ -167,6 +167,7 @@
int timeout = 0;
int iterations = 1, i;
time_t waitstart;
+ struct ast_silence_generator *silgen = NULL;
if (chan->_state != AST_STATE_UP) {
res = ast_answer(chan); /* Answer the channel */
@@ -180,11 +181,19 @@
ast_verb(3, "Waiting %d time(s) for %d ms silence with %d timeout\n", iterations, timereqd, timeout);
+ if (ast_opt_transmit_silence) {
+ silgen = ast_channel_start_silence_generator(chan);
+ }
time(&waitstart);
res = 1;
for (i=0; (i<iterations) && (res == 1); i++) {
res = do_waiting(chan, timereqd, waitstart, timeout, wait_for_silence);
}
+ if (silgen) {
+ ast_channel_stop_silence_generator(chan, silgen);
+ }
+
+
if (res > 0)
res = 0;
return res;
Modified: branches/1.6.1/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/channel.c?view=diff&rev=239714&r1=239713&r2=239714
==============================================================================
--- branches/1.6.1/main/channel.c (original)
+++ branches/1.6.1/main/channel.c Wed Jan 13 10:38:31 2010
@@ -1304,21 +1304,39 @@
int ast_safe_sleep_conditional(struct ast_channel *chan, int ms, int (*cond)(void*), void *data)
{
struct ast_frame *f;
+ struct ast_silence_generator *silgen = NULL;
+ int res = 0;
+
+ /* If no other generator is present, start silencegen while waiting */
+ if (ast_opt_transmit_silence && !chan->generatordata) {
+ silgen = ast_channel_start_silence_generator(chan);
+ }
while (ms > 0) {
- if (cond && ((*cond)(data) == 0))
- return 0;
+ if (cond && ((*cond)(data) == 0)) {
+ break;
+ }
ms = ast_waitfor(chan, ms);
- if (ms < 0)
- return -1;
+ if (ms < 0) {
+ res = -1;
+ break;
+ }
if (ms > 0) {
f = ast_read(chan);
- if (!f)
- return -1;
+ if (!f) {
+ res = -1;
+ break;
+ }
ast_frfree(f);
}
}
- return 0;
+
+ /* stop silgen if present */
+ if (silgen) {
+ ast_channel_stop_silence_generator(chan, silgen);
+ }
+
+ return res;
}
/*! \brief Wait, look for hangups */
More information about the asterisk-commits
mailing list