Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Say: If SAY_DTMF_INTERRUPT is set to an ast_true value, jump on DTMF

Browse Source 
Similar to how background works, if a say application is called with
this variable set to 'true', 'yes', 'on', etc. then using DTMF while
the say action is in progress will result in the channel jumping to
that extension in the dialplan.

Review: https://reviewboard.asterisk.org/r/3011/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/97/197/1
Jonathan Rose 12 years ago
parent 67b650543c
commit ad0e70ba83
3 changed files with 108 additions and 16 deletions
Show Stats Download Patch File Download Diff File

9
CHANGES
Unescape View File

@ -21,6 +21,15 @@ ConfBridge
menus, bridge settings, and user settings that have been applied by the menus, bridge settings, and user settings that have been applied by the
CONFBRIDGE dialplan function. CONFBRIDGE dialplan function.
Say
--------------------------
* If a channel variable SAY_DTMF_INTERRUPT is present on a channel and set
to 'true' (case insensitive), then any Say application (SayNumber,
SayDigits, SayAlpha, SayAlphaCase, SayUnixTime, and SayCounted) will
anticipate DTMF. If DTMF is received, these applications will behave like
the background application and jump to the received extension once a match
is established or after a short period of inactivity.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
--- Functionality changes from Asterisk 11 to Asterisk 12 -------------------- --- Functionality changes from Asterisk 11 to Asterisk 12 --------------------
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

14
apps/app_sayunixtime.c
Unescape View File

@ -59,7 +59,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="options" required="false"> <parameter name="options" required="false">
<optionlist> <optionlist>
<option name="j"> <option name="j">
<para>Allow the calling user to dial digits to jump to that extension.</para> <para>Allow the calling user to dial digits to jump to that extension.
This option is automatically enabled if
<variable>SAY_DTMF_INTERRUPT</variable> is present on the channel and
set to 'true' (case insensitive)</para>
</option> </option>
</optionlist> </optionlist>
</parameter> </parameter>
@ -129,6 +132,7 @@ static int sayunixtime_exec(struct ast_channel *chan, const char *data)
const char * haltondigits = AST_DIGIT_NONE; const char * haltondigits = AST_DIGIT_NONE;
struct ast_flags64 opts = { 0, }; struct ast_flags64 opts = { 0, };
char *opt_args[OPT_ARG_ARRAY_SIZE]; char *opt_args[OPT_ARG_ARRAY_SIZE];
const char *interrupt_string;
if (!data) { if (!data) {
return 0; return 0;
@ -146,6 +150,14 @@ static int sayunixtime_exec(struct ast_channel *chan, const char *data)
} }
} }
/* Check if 'SAY_DTMF_INTERRUPT' is true and apply the same behavior as the j flag. */
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
haltondigits = AST_DIGIT_ANY;
}
ast_channel_unlock(chan);
ast_get_time_t(ast_strlen_zero(args.timeval) ? NULL : args.timeval, &unixtime, time(NULL), NULL); ast_get_time_t(ast_strlen_zero(args.timeval) ? NULL : args.timeval, &unixtime, time(NULL), NULL);
if (ast_channel_state(chan) != AST_STATE_UP) { if (ast_channel_state(chan) != AST_STATE_UP) {

101
main/pbx.c
Unescape View File

@ -491,8 +491,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="string" required="true" /> <parameter name="string" required="true" />
</syntax> </syntax>
<description> <description>
<para>This application will play the sounds that correspond to the letters of the <para>This application will play the sounds that correspond to the letters
given <replaceable>string</replaceable>.</para> of the given <replaceable>string</replaceable>. If the channel variable
<variable>SAY_DTMF_INTERRUPT</variable> is set to 'true' (case insensitive),
then this application will react to DTMF in the same way as
<literal>Background</literal>.</para>
</description> </description>
<see-also> <see-also>
<ref type="application">SayDigits</ref> <ref type="application">SayDigits</ref>
@ -531,7 +534,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<description> <description>
<para>This application will play the sounds that correspond to the letters of the <para>This application will play the sounds that correspond to the letters of the
given <replaceable>string</replaceable>. Optionally, a <replaceable>casetype</replaceable> may be given <replaceable>string</replaceable>. Optionally, a <replaceable>casetype</replaceable> may be
specified. This will be used for case-insensitive or case-sensitive pronunciations.</para> specified. This will be used for case-insensitive or case-sensitive pronunciations. If the channel
variable <variable>SAY_DTMF_INTERRUPT</variable> is set to 'true' (case insensitive), then this
application will react to DTMF in the same way as <literal>Background</literal>.</para>
</description> </description>
<see-also> <see-also>
<ref type="application">SayDigits</ref> <ref type="application">SayDigits</ref>
@ -550,7 +555,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</syntax> </syntax>
<description> <description>
<para>This application will play the sounds that correspond to the digits of <para>This application will play the sounds that correspond to the digits of
the given number. This will use the language that is currently set for the channel.</para> the given number. This will use the language that is currently set for the channel.
If the channel variable <variable>SAY_DTMF_INTERRUPT</variable> is set to 'true'
(case insensitive), then this application will react to DTMF in the same way as
<literal>Background</literal>.</para>
</description> </description>
<see-also> <see-also>
<ref type="application">SayAlpha</ref> <ref type="application">SayAlpha</ref>
@ -568,9 +576,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<parameter name="gender" /> <parameter name="gender" />
</syntax> </syntax>
<description> <description>
<para>This application will play the sounds that correspond to the given <replaceable>digits</replaceable>. <para>This application will play the sounds that correspond to the given
Optionally, a <replaceable>gender</replaceable> may be specified. This will use the language that is currently <replaceable>digits</replaceable>. Optionally, a <replaceable>gender</replaceable> may be
set for the channel. See the CHANNEL() function for more information on setting the language for the channel.</para> specified. This will use the language that is currently set for the channel. See the CHANNEL()
function for more information on setting the language for the channel. If the channel variable
<variable>SAY_DTMF_INTERRUPT</variable> is set to 'true' (case insensitive), then this
application will react to DTMF in the same way as <literal>Background</literal>.</para>
</description> </description>
<see-also> <see-also>
<ref type="application">SayAlpha</ref> <ref type="application">SayAlpha</ref>
@ -588,7 +599,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
</syntax> </syntax>
<description> <description>
<para>This application will play the sounds from the phonetic alphabet that correspond to the <para>This application will play the sounds from the phonetic alphabet that correspond to the
letters in the given <replaceable>string</replaceable>.</para> letters in the given <replaceable>string</replaceable>. If the channel variable
<variable>SAY_DTMF_INTERRUPT</variable> is set to 'true' (case insensitive), then this
application will react to DTMF in the same way as <literal>Background</literal>.</para>
</description> </description>
<see-also> <see-also>
<ref type="application">SayAlpha</ref> <ref type="application">SayAlpha</ref>
@ -11288,7 +11301,18 @@ static int pbx_builtin_saynumber(struct ast_channel *chan, const char *data)
{ {
char tmp[256]; char tmp[256];
char *number = tmp; char *number = tmp;
int number_val;
char *options; char *options;
int res;
int interrupt = 0;
const char *interrupt_string;
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
interrupt = 1;
}
ast_channel_unlock(chan);
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SayNumber requires an argument (number)\n"); ast_log(LOG_WARNING, "SayNumber requires an argument (number)\n");
@ -11296,6 +11320,12 @@ static int pbx_builtin_saynumber(struct ast_channel *chan, const char *data)
} }
ast_copy_string(tmp, data, sizeof(tmp)); ast_copy_string(tmp, data, sizeof(tmp));
strsep(&number, ","); strsep(&number, ",");
if (sscanf(tmp, "%d", &number_val) != 1) {
ast_log(LOG_WARNING, "argument '%s' to SayNumber could not be parsed as a number.\n", tmp);
return 0;
}
options = strsep(&number, ","); options = strsep(&number, ",");
if (options) { if (options) {
if ( strcasecmp(options, "f") && strcasecmp(options, "m") && if ( strcasecmp(options, "f") && strcasecmp(options, "m") &&
@ -11305,19 +11335,32 @@ static int pbx_builtin_saynumber(struct ast_channel *chan, const char *data)
} }
} }
if (ast_say_number(chan, atoi(tmp), "", ast_channel_language(chan), options)) { res = ast_say_number(chan, number_val, interrupt ? AST_DIGIT_ANY : "", ast_channel_language(chan), options);
if (res < 0) {
ast_log(LOG_WARNING, "We were unable to say the number %s, is it too large?\n", tmp); ast_log(LOG_WARNING, "We were unable to say the number %s, is it too large?\n", tmp);
} }
return 0; return interrupt ? res : 0;
} }
static int pbx_builtin_saydigits(struct ast_channel *chan, const char *data) static int pbx_builtin_saydigits(struct ast_channel *chan, const char *data)
{ {
int res = 0; int res = 0;
int interrupt = 0;
const char *interrupt_string;
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
interrupt = 1;
}
ast_channel_unlock(chan);
if (data) {
res = ast_say_digit_str(chan, data, interrupt ? AST_DIGIT_ANY : "", ast_channel_language(chan));
}
if (data)
res = ast_say_digit_str(chan, data, "", ast_channel_language(chan));
return res; return res;
} }
@ -11326,11 +11369,21 @@ static int pbx_builtin_saycharacters_case(struct ast_channel *chan, const char *
int res = 0; int res = 0;
int sensitivity = 0; int sensitivity = 0;
char *parse; char *parse;
int interrupt = 0;
const char *interrupt_string;
AST_DECLARE_APP_ARGS(args, AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(options); AST_APP_ARG(options);
AST_APP_ARG(characters); AST_APP_ARG(characters);
); );
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
interrupt = 1;
}
ast_channel_unlock(chan);
if (ast_strlen_zero(data)) { if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "SayAlphaCase requires two arguments (options, characters)\n"); ast_log(LOG_WARNING, "SayAlphaCase requires two arguments (options, characters)\n");
return 0; return 0;
@ -11362,7 +11415,7 @@ static int pbx_builtin_saycharacters_case(struct ast_channel *chan, const char *
return 0; return 0;
} }
res = ast_say_character_str(chan, args.characters, "", ast_channel_language(chan), sensitivity); res = ast_say_character_str(chan, args.characters, interrupt ? AST_DIGIT_ANY : "", ast_channel_language(chan), sensitivity);
return res; return res;
} }
@ -11370,9 +11423,18 @@ static int pbx_builtin_saycharacters_case(struct ast_channel *chan, const char *
static int pbx_builtin_saycharacters(struct ast_channel *chan, const char *data) static int pbx_builtin_saycharacters(struct ast_channel *chan, const char *data)
{ {
int res = 0; int res = 0;
int interrupt = 0;
const char *interrupt_string;
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
interrupt = 1;
}
ast_channel_unlock(chan);
if (data) { if (data) {
res = ast_say_character_str(chan, data, "", ast_channel_language(chan), AST_SAY_CASE_NONE); res = ast_say_character_str(chan, data, interrupt ? AST_DIGIT_ANY : "", ast_channel_language(chan), AST_SAY_CASE_NONE);
} }
return res; return res;
@ -11381,9 +11443,18 @@ static int pbx_builtin_saycharacters(struct ast_channel *chan, const char *data)
static int pbx_builtin_sayphonetic(struct ast_channel *chan, const char *data) static int pbx_builtin_sayphonetic(struct ast_channel *chan, const char *data)
{ {
int res = 0; int res = 0;
int interrupt = 0;
const char *interrupt_string;
ast_channel_lock(chan);
interrupt_string = pbx_builtin_getvar_helper(chan, "SAY_DTMF_INTERRUPT");
if (ast_true(interrupt_string)) {
interrupt = 1;
}
ast_channel_unlock(chan);
if (data) if (data)
res = ast_say_phonetic_str(chan, data, "", ast_channel_language(chan)); res = ast_say_phonetic_str(chan, data, interrupt ? AST_DIGIT_ANY : "", ast_channel_language(chan));
return res; return res;
} }

Write Preview
Loading…
Cancel
Save