kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-14 04:54:49 +00:00
Code Issues Projects Releases Wiki Activity

add funcs

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7100 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-05 20:44:54 +00:00
parent 698b1b1b56
commit 3975fa3265
4 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/switch_channel.h
View File

@ -75,6 +75,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_get_running_state(switch_c
SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel); SWITCH_DECLARE(uint8_t) switch_channel_ready(switch_channel_t *channel);
SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state); SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, switch_channel_t *other_channel, switch_channel_state_t want_state);
SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to);
SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel, SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_channel_t *channel,
const char *file, const char *func, int line, switch_channel_state_t state); const char *file, const char *func, int line, switch_channel_state_t state);
@ -469,6 +470,8 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix); SWITCH_DECLARE(char *) switch_channel_build_param_string(switch_channel_t *channel, switch_caller_profile_t *caller_profile, const char *prefix);
SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel); SWITCH_DECLARE(switch_status_t) switch_channel_set_timestamps(switch_channel_t *channel);
#define switch_channel_stop_broadcast(_channel) switch_channel_set_flag(_channel, CF_BREAK | CF_STOP_BROADCAST)
/** @} */ /** @} */
SWITCH_END_EXTERN_C SWITCH_END_EXTERN_C

3
src/mod/applications/mod_fifo/mod_fifo.c
View File

@ -414,8 +414,7 @@ SWITCH_STANDARD_APP(fifo_function)
if (switch_channel_test_flag(other_channel, CF_TAGGED)) { if (switch_channel_test_flag(other_channel, CF_TAGGED)) {
switch_channel_clear_flag(other_channel, CF_CONTROLLED); switch_channel_clear_flag(other_channel, CF_CONTROLLED);
switch_channel_set_flag(other_channel, CF_STOP_BROADCAST); switch_channel_stop_broadcast(other_channel);
switch_channel_set_flag(other_channel, CF_BREAK);
switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK); switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK);
while (switch_channel_test_flag(other_channel, CF_TAGGED)) { while (switch_channel_test_flag(other_channel, CF_TAGGED)) {
status = switch_core_session_read_frame(session, &read_frame, -1, 0); status = switch_core_session_read_frame(session, &read_frame, -1, 0);

20
src/switch_channel.c
View File

@ -550,6 +550,23 @@ SWITCH_DECLARE(void) switch_channel_wait_for_state(switch_channel_t *channel, sw
} }
} }
SWITCH_DECLARE(switch_status_t) switch_channel_wait_for_flag(switch_channel_t *channel, switch_channel_flag_t want_flag, uint32_t to)
{
if (to) {
to++;
}
while(!switch_test_flag(channel, want_flag)) {
switch_yield(1000);
if (to && !--to) {
return SWITCH_STATUS_TIMEOUT;
}
}
return SWITCH_STATUS_SUCCESS;
}
SWITCH_DECLARE(void) switch_channel_set_flag(switch_channel_t *channel, switch_channel_flag_t flags) SWITCH_DECLARE(void) switch_channel_set_flag(switch_channel_t *channel, switch_channel_flag_t flags)
{ {
switch_assert(channel != NULL); switch_assert(channel != NULL);
@ -1223,8 +1240,7 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
switch_mutex_unlock(channel->profile_mutex); switch_mutex_unlock(channel->profile_mutex);
} }
switch_set_flag(channel, CF_BREAK); switch_channel_stop_broadcast(channel);
switch_set_flag(channel, CF_STOP_BROADCAST);
if (channel->state < CS_HANGUP) { if (channel->state < CS_HANGUP) {
switch_event_t *event; switch_event_t *event;

3
src/switch_ivr_bridge.c
View File

@ -222,8 +222,7 @@ static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
end: end:
switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK); switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK);
switch_channel_set_flag(chan_b, CF_STOP_BROADCAST); switch_channel_stop_broadcast(chan_b);
switch_channel_set_flag(chan_b, CF_BREAK);
switch_core_session_reset(session_a); switch_core_session_reset(session_a);
switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(chan_a, SWITCH_BRIDGE_VARIABLE, NULL);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a));