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/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@239714 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 62e85e9f989a37caedb834b94828471dcc87381d..3877a557a560ed18321ceda02452f2891723aefb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -685,7 +685,7 @@ samples: adsi
                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" ; \

diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 025acf5926063f8c8a30155c55d2d2f544795b54..e872641618e40d8914337c3eb6a276267ba2f18b 100644 (file)
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -48,6 +48,7 @@ static char *app = "WaitForRing";
 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;
@@ -57,6 +58,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
                return 0;
        }
 
+       if (ast_opt_transmit_silence) {
+               silgen = ast_channel_start_silence_generator(chan);
+       }
+
        ms = s * 1000.0;
        while (ms > 0) {
                ms = ast_waitfor(chan, ms);
@@ -101,6 +106,10 @@ static int waitforring_exec(struct ast_channel *chan, void *data)
                }
        }
 
+       if (silgen) {
+               ast_channel_stop_silence_generator(chan, silgen);
+       }
+
        return res;
 }
 

diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index b2f9e563a0e4aa464de191301cd88eae0afe7d0a..b244838f6cdc2c47a24ddbb5a6b532a60165fe51 100644 (file)
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -167,6 +167,7 @@ static int waitfor_exec(struct ast_channel *chan, void *data, int wait_for_silen
        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 @@ static int waitfor_exec(struct ast_channel *chan, void *data, int wait_for_silen
 
        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;

diff --git a/main/channel.c b/main/channel.c
index 33b1dcd30aa80fb5c5decf51260694ef891e4796..e66b6e04529706177311b80d28ed0a57e307a30f 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1304,21 +1304,39 @@ struct ast_channel *ast_walk_channel_by_exten_locked(const struct ast_channel *c
 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 */