ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

add bind meta on A-D and refactor

Browse Source
This commit is contained in:
Anthony Minessale
2011-01-05 17:53:27 -06:00
parent 96ac90adce
commit 27869d7a26
11 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/applications/mod_dptools/mod_dptools.c
+3 -3
View File
@@ -389,7 +389,7 @@ SWITCH_STANDARD_APP(dtmf_unbind_function)
int kval = 0;
if (key) {
kval = atoi(key);
kval = switch_dtmftoi(key);
}
switch_ivr_unbind_dtmf_meta_session(session, kval);
@@ -405,7 +405,7 @@ SWITCH_STANDARD_APP(dtmf_bind_function)
if (!zstr(data) && (lbuf = switch_core_session_strdup(session, data))
&& (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) == 4) {
int kval = atoi(argv[0]);
int kval = switch_dtmftoi(argv[0]);
switch_bind_flag_t bind_flags = 0;
if (strchr(argv[1], 'a')) {
@@ -2531,7 +2531,7 @@ SWITCH_STANDARD_APP(audio_bridge_function)
camp_data = (char *) data;
}
if (!(moh = switch_channel_get_variable(caller_channel, "hold_music"))) {
if (!(moh = switch_channel_get_variable(caller_channel, SWITCH_HOLD_MUSIC_VARIABLE))) {
moh = switch_channel_get_variable(caller_channel, "campon_hold_music");
}
src/mod/applications/mod_fifo/mod_fifo.c
+2 -2
View File
@@ -397,12 +397,12 @@ static switch_status_t on_dtmf(switch_core_session_t *session, void *input, swit
const char *moh_a = NULL, *moh_b = NULL;
if (!(moh_b = switch_channel_get_variable(bchan, "fifo_music"))) {
moh_b = switch_channel_get_variable(bchan, "hold_music");
moh_b = switch_channel_get_variable(bchan, SWITCH_HOLD_MUSIC_VARIABLE);
}
if (!(moh_a = switch_channel_get_variable(channel, "fifo_hold_music"))) {
if (!(moh_a = switch_channel_get_variable(channel, "fifo_music"))) {
moh_a = switch_channel_get_variable(channel, "hold_music");
moh_a = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE);
}
}
src/mod/applications/mod_spy/mod_spy.c
+1 -1
View File
@@ -83,7 +83,7 @@ static switch_status_t spy_on_exchange_media(switch_core_session_t *session)
static switch_status_t spy_on_park(switch_core_session_t *session)
{
switch_channel_t *channel = switch_core_session_get_channel(session);
const char *moh = switch_channel_get_variable(channel, "hold_music");
const char *moh = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE);
while (switch_channel_ready(channel) && switch_channel_get_state(channel) == CS_PARK) {
if (moh) {
src/mod/applications/mod_valet_parking/mod_valet_parking.c
+1 -1
View File
@@ -234,7 +234,7 @@ SWITCH_STANDARD_APP(valet_parking_function)
}
if (!(tmp = switch_channel_get_variable(channel, "valet_hold_music"))) {
tmp = switch_channel_get_variable(channel, "hold_music");
tmp = switch_channel_get_variable(channel, SWITCH_HOLD_MUSIC_VARIABLE);
}
if (tmp)
music = tmp;
src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+1 -1
View File
@@ -1512,7 +1512,7 @@ static switch_status_t load_config(int reload_type)
hotline = val;
} else if (!strcasecmp(var, "dial_regex")) {
dial_regex = val;
} else if (!strcasecmp(var, "hold_music")) {
} else if (!strcasecmp(var, SWITCH_HOLD_MUSIC_VARIABLE)) {
hold_music = val;
} else if (!strcasecmp(var, "fail_dial_regex")) {
fail_dial_regex = val;