Merge Mike's announcement enhancements

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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 9125e04379f42334c0c7aea6dcd838b22c1055c9..10ba7f8a881e41205c5ed34908f51c8483dcc351 100755 (executable)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -418,6 +418,7 @@ static int dial_exec(struct ast_channel *chan, void *data)
        char *stack,*var;
        int play_to_caller=0,play_to_callee=0;
        int playargs=0;
+       int digit = 0;
 
        if (!data) {
                ast_log(LOG_WARNING, "Dial requires an argument (technology1/number1&technology2/number2...|optional timeout|options)\n");
@@ -837,11 +838,16 @@ static int dial_exec(struct ast_channel *chan, void *data)
                        // Now Stream the File
                        if (!res)
                                res = ast_streamfile(peer,announcemsg,peer->language);
-                       if (!res)
-                               res = ast_waitstream(peer,"");
-                       
+                       if (!res) {
+                               digit = ast_waitstream(peer, AST_DIGIT_ANY); 
+                       }
                        // Ok, done. stop autoservice
                        res = ast_autoservice_stop(chan);
+                       if (digit > 0 && !res)
+                               res = ast_senddigit(chan, digit); 
+                       else
+                               res = digit;
+
                } else
                        res = 0;
 

diff --git a/channel.c b/channel.c
index b9097eee350123b231f979df99b438cd8c60feab..8d23fca78af9966a14fc20906d9d784c9e8ee5b1 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -1431,6 +1431,11 @@ static int do_senddigit(struct ast_channel *chan, char digit)
        return 0;
 }
 
+int ast_senddigit(struct ast_channel *chan, char digit)
+{
+  return do_senddigit(chan, digit);
+}
+
 int ast_prod(struct ast_channel *chan)
 {
        struct ast_frame a = { AST_FRAME_VOICE };

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index c6c3e2461785c144eb4b4c8a3d2e2e9ba8f5f7f2..e420a198261fe7378b3545ea0924ac093f5dcf5b 100755 (executable)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -614,6 +614,9 @@ int ast_sendtext(struct ast_channel *chan, char *text);
  * Read a char of text from a channel
  * Returns 0 on success, -1 on failure
  */
+
+int ast_senddigit(struct ast_channel *chan, char digit);
+
 int ast_recvchar(struct ast_channel *chan, int timeout);
 
 //! Browse channels in use