add funcs

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7100 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 40ccb7db57c2af9945416045d57e13f3c792bff0..146690f2050b0b14fff3e71434d55dd2c33ac6ba 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -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(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,
                                                                                                                                                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(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

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 2e7b25c142eabe57736a801a04cd75d93123c20a..78e1cd61d3fd153d3e9d2a4f66ba716aa3d75752 100644 (file)
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -414,8 +414,7 @@ SWITCH_STANDARD_APP(fifo_function)
 
                 if (switch_channel_test_flag(other_channel, CF_TAGGED)) {
                     switch_channel_clear_flag(other_channel, CF_CONTROLLED);
-                    switch_channel_set_flag(other_channel, CF_STOP_BROADCAST);
-                    switch_channel_set_flag(other_channel, CF_BREAK);
+                    switch_channel_stop_broadcast(other_channel);
                     switch_core_session_kill_channel(other_session, SWITCH_SIG_BREAK);
                     while (switch_channel_test_flag(other_channel, CF_TAGGED)) {
                         status = switch_core_session_read_frame(session, &read_frame, -1, 0);

diff --git a/src/switch_channel.c b/src/switch_channel.c
index e2bdb129f3d65f545b11907afa336e03771c4a78..0672560d4e3803fd12dad5e9d8d9c53f0532d14d 100644 (file)
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -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_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_set_flag(channel, CF_BREAK);
-       switch_set_flag(channel, CF_STOP_BROADCAST);
+       switch_channel_stop_broadcast(channel);
        
        if (channel->state < CS_HANGUP) {
                switch_event_t *event;

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 236741ae107d16d54a16e95acae0bc4ea4516daa..a415ecb6b9cf4efc4f666529d306bc45a50e0ba5 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -222,8 +222,7 @@ static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
  end:
 
        switch_core_session_kill_channel(session_b, SWITCH_SIG_BREAK);
-       switch_channel_set_flag(chan_b, CF_STOP_BROADCAST);
-       switch_channel_set_flag(chan_b, CF_BREAK);
+       switch_channel_stop_broadcast(chan_b);
        switch_core_session_reset(session_a);
        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));