kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 20:50:41 +00:00
Code Issues Projects Releases Wiki Activity

fix campon to play music even on first run and cancel faster

Browse Source
This commit is contained in:
Anthony Minessale 2011-07-06 16:45:25 -05:00 committed by Brian West
parent 56a82812d6
commit 9cf44f3a5e
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_channel.h
View File

@ -125,6 +125,7 @@ SWITCH_DECLARE(switch_call_cause_t) switch_channel_get_cause(_In_ switch_channel
SWITCH_DECLARE(switch_call_cause_t) switch_channel_cause_q850(switch_call_cause_t cause);
SWITCH_DECLARE(switch_call_cause_t) switch_channel_get_cause_q850(switch_channel_t *channel);
SWITCH_DECLARE(switch_call_cause_t *) switch_channel_get_cause_ptr(switch_channel_t *channel);
/*!
\brief return a cause string for a given cause

34
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -2517,6 +2517,7 @@ static void *SWITCH_THREAD_FUNC camp_music_thread(switch_thread_t *thread, void
switch_core_session_rwunlock(session);
stake->running = 0;
return NULL;
}
@ -2538,6 +2539,7 @@ SWITCH_STANDARD_APP(audio_bridge_function)
switch_threadattr_t *thd_attr = NULL;
char *camp_data = NULL;
switch_status_t status;
int camp_loops = 0;
if (zstr(data)) {
return;
@ -2607,7 +2609,6 @@ SWITCH_STANDARD_APP(audio_bridge_function)
do {
fail = 0;
status = switch_ivr_originate(NULL, &peer_session, &cause, camp_data, campon_timeout, NULL, NULL, NULL, NULL, NULL, SOF_NONE, NULL);
if (!switch_channel_ready(caller_channel)) {
fail = 1;
@ -2635,22 +2636,29 @@ SWITCH_STANDARD_APP(audio_bridge_function)
thread_started = 1;
}
if (camp_loops++) {
if (--campon_retries <= 0 || stake.do_xfer) {
camping = 0;
stake.do_xfer = 1;
break;
}
if (--campon_retries <= 0 || stake.do_xfer) {
camping = 0;
stake.do_xfer = 1;
break;
}
if (fail) {
int64_t wait = campon_sleep * 1000000;
while (stake.running && wait > 0 && switch_channel_ready(caller_channel)) {
switch_yield(100000);
wait -= 100000;
if (fail) {
int64_t wait = campon_sleep * 1000000;
while (stake.running && wait > 0 && switch_channel_ready(caller_channel)) {
switch_yield(100000);
wait -= 100000;
}
}
}
}
status = switch_ivr_originate(NULL, &peer_session,
&cause, camp_data, campon_timeout, NULL, NULL, NULL, NULL, NULL, SOF_NONE,
switch_channel_get_cause_ptr(caller_channel));
} while (camping && switch_channel_ready(caller_channel));
if (thread) {

6
src/switch_channel.c
View File

@ -181,6 +181,12 @@ SWITCH_DECLARE(switch_call_cause_t) switch_channel_get_cause(switch_channel_t *c
}
SWITCH_DECLARE(switch_call_cause_t *) switch_channel_get_cause_ptr(switch_channel_t *channel)
{
return &channel->hangup_cause;
}
struct switch_callstate_table {
const char *name;
switch_channel_callstate_t callstate;