add ability to control output format for one-touch-record feature (bug #4190)
authorKevin P. Fleming <kpfleming@digium.com>
Mon, 16 May 2005 00:43:16 +0000 (00:43 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Mon, 16 May 2005 00:43:16 +0000 (00:43 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5693 65c4cc65-6c06-0410-ace0-fbb531ad65f3

doc/README.variables
res/res_features.c

index ff5313f..3a8a7b4 100755 (executable)
@@ -562,6 +562,7 @@ ${QUEUESTATUS}              Status of the call, one of:
 ${RECORDED_FILE}       * Recorded file in record()
 ${TALK_DETECTED}       * Result from talkdetect()
 ${TOUCH_MONITOR}       The filename base to use with Touch Monitor (auto record)
+${TOUCH_MONITOR_FORMAT} The audio format to use with Touch Monitor (auto record)
 ${TXTCIDNAME}          * Result of application TXTCIDName
 ${VPB_GETDTMF}         chan_vpb
 
index 806ba02..34b4a19 100755 (executable)
@@ -417,7 +417,7 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int
 
 static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense)
 {
-       char *touch_monitor = NULL, *caller_chan_id = NULL, *callee_chan_id = NULL, *args = NULL;
+       char *touch_monitor = NULL, *caller_chan_id = NULL, *callee_chan_id = NULL, *args = NULL, *touch_format = NULL;
        int x = 0;
        size_t len;
        struct ast_channel *caller_chan = NULL, *callee_chan = NULL;
@@ -465,6 +465,10 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee
        }
 
        if (caller_chan && callee_chan) {
+               touch_format = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MONITOR_FORMAT");
+               if (!touch_format)
+                       touch_format = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MONITOR_FORMAT");
+
                touch_monitor = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MONITOR");
                if (!touch_monitor)
                        touch_monitor = pbx_builtin_getvar_helper(callee_chan, "TOUCH_MONITOR");
@@ -472,13 +476,13 @@ static int builtin_automonitor(struct ast_channel *chan, struct ast_channel *pee
                if (touch_monitor) {
                        len = strlen(touch_monitor) + 50;
                        args = alloca(len);
-                       snprintf(args, len, "WAV|auto-%ld-%s|m", time(NULL), touch_monitor);
+                       snprintf(args, len, "%s|auto-%ld-%s|m", (touch_format) ? touch_format : "WAV", time(NULL), touch_monitor);
                } else {
                        caller_chan_id = ast_strdupa(caller_chan->cid.cid_num ? caller_chan->cid.cid_num : caller_chan->name);
                        callee_chan_id = ast_strdupa(callee_chan->cid.cid_num ? callee_chan->cid.cid_num : callee_chan->name);
                        len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
                        args = alloca(len);
-                       snprintf(args, len, "WAV|auto-%ld-%s-%s|m", time(NULL), caller_chan_id, callee_chan_id);
+                       snprintf(args, len, "%s|auto-%ld-%s-%s|m", (touch_format) ? touch_format : "WAV", time(NULL), caller_chan_id, callee_chan_id);
                }
 
                for( x = 0; x < strlen(args); x++)