Add fast-forward and rewind to voicemail

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 82150d9..0a95e5d 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1471,7 +1471,7 @@ forward_message(struct ast_channel *chan, struct ast_config *cfg, char *dir, int
 #define WAITFILE(file) do { \
        if (ast_streamfile(chan, file, chan->language)) \
                ast_log(LOG_WARNING, "Unable to play message %s\n", file); \
-       d = ast_waitstream(chan, AST_DIGIT_ANY); \
+       d = ast_waitstream_fr(chan, AST_DIGIT_ANY, "#", "*"); \
        if (!d) { \
                repeats = 0; \
                goto instructions; \

diff --git a/file.c b/file.c
index a2e1efb..fc4972c 100755 (executable)
--- a/file.c
+++ b/file.c
@@ -659,6 +659,65 @@ char ast_waitstream(struct ast_channel *c, char *breakon)
        return (c->_softhangup ? -1 : 0);
 }
 
+char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind)
+{
+       int res;
+       struct ast_frame *fr;
+       while(c->stream) {
+               res = ast_sched_wait(c->sched);
+               if (res < 0) {
+                       ast_closestream(c->stream);
+                       break;
+               }
+               res = ast_waitfor(c, res);
+               if (res < 0) {
+                       ast_log(LOG_WARNING, "Select failed (%s)\n", strerror(errno));
+                       return res;
+               } else
+               if (res > 0) {
+                       fr = ast_read(c);
+                       if (!fr) {
+#if 0
+                               ast_log(LOG_DEBUG, "Got hung up\n");
+#endif
+                               return -1;
+                       }
+                       
+                       switch(fr->frametype) {
+                       case AST_FRAME_DTMF:
+                               res = fr->subclass;
+                               if (strchr(forward,res)) {
+                                       ast_stream_fastforward(c->stream, 3000);
+                               } else if (strchr(rewind,res)) {
+                                       ast_stream_rewind(c->stream, 3000);
+                               } else if (strchr(breakon, res)) {
+                                       ast_frfree(fr);
+                                       return res;
+                               }                                       
+                               break;
+                       case AST_FRAME_CONTROL:
+                               switch(fr->subclass) {
+                               case AST_CONTROL_HANGUP:
+                                       ast_frfree(fr);
+                                       return -1;
+                               case AST_CONTROL_RINGING:
+                               case AST_CONTROL_ANSWER:
+                                       /* Unimportant */
+                                       break;
+                               default:
+                                       ast_log(LOG_WARNING, "Unexpected control subclass '%d'\n", fr->subclass);
+                               }
+                       }
+                       /* Ignore */
+                       ast_frfree(fr);
+               } else
+                       ast_sched_runq(c->sched);
+       
+               
+       }
+       return (c->_softhangup ? -1 : 0);
+}
+
 char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int cmdfd)
 {
        int res;

diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index e7f1982..45b947b 100755 (executable)
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -123,6 +123,18 @@ int ast_filecopy(char *oldname, char *newname, char *fmt);
  */
 char ast_waitstream(struct ast_channel *c, char *breakon);
 
+//! Same as waitstream but allows stream to be forwarded or rewound
+/*!
+ * \param c channel to waitstram on
+ * \param breakon string of DTMF digits to break upon
+ * \param forward DTMF digit to fast forward upon
+ * \param rewind DTMF digit to rewind upon
+ * Begins playback of a stream...
+ * Wait for a stream to stop or for any one of a given digit to arrive,  Returns 0 
+ * if the stream finishes, the character if it was interrupted, and -1 on error 
+ */
+char ast_waitstream_fr(struct ast_channel *c, char *breakon, char *forward, char *rewind);
+
 /* Same as waitstream, but with audio output to fd and monitored fd checking.  Returns
    1 if monfd is ready for reading */
 char ast_waitstream_full(struct ast_channel *c, char *breakon, int audiofd, int monfd);