kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

add ability to control output format for one-touch-record feature (bug #4190)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-05-16 00:43:16 +00:00
parent 68f6db3104
commit 361109c377
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/README.variables
View File

@@ -562,6 +562,7 @@ ${QUEUESTATUS} Status of the call, one of:
${RECORDED_FILE} * Recorded file in record() ${RECORDED_FILE} * Recorded file in record()
${TALK_DETECTED} * Result from talkdetect() ${TALK_DETECTED} * Result from talkdetect()
${TOUCH_MONITOR} The filename base to use with Touch Monitor (auto record) ${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 ${TXTCIDNAME} * Result of application TXTCIDName
${VPB_GETDTMF} chan_vpb ${VPB_GETDTMF} chan_vpb

10
res/res_features.c
View File

@@ -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) 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; int x = 0;
size_t len; size_t len;
struct ast_channel *caller_chan = NULL, *callee_chan = NULL; 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) { 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"); touch_monitor = pbx_builtin_getvar_helper(caller_chan, "TOUCH_MONITOR");
if (!touch_monitor) if (!touch_monitor)
touch_monitor = pbx_builtin_getvar_helper(callee_chan, "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) { if (touch_monitor) {
len = strlen(touch_monitor) + 50; len = strlen(touch_monitor) + 50;
args = alloca(len); 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 { } else {
caller_chan_id = ast_strdupa(caller_chan->cid.cid_num ? caller_chan->cid.cid_num : caller_chan->name); 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); 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; len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = alloca(len); 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++) for( x = 0; x < strlen(args); x++)