mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 17:38:59 +00:00
use steve's g711 (thanks steve), chage the conditional mutex based on paul T's input (thanks paul) and take the yield away on switch_yield and just sleep
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2663 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -566,7 +566,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_set_state(switch_c
|
||||
channel->name,
|
||||
state_names[last_state],
|
||||
state_names[state]);
|
||||
switch_mutex_lock(channel->flag_mutex);
|
||||
channel->state = state;
|
||||
switch_mutex_unlock(channel->flag_mutex);
|
||||
|
||||
if (state == CS_HANGUP && channel->hangup_cause == SWITCH_CAUSE_UNALLOCATED) {
|
||||
channel->hangup_cause = SWITCH_CAUSE_NORMAL_CLEARING;
|
||||
@@ -859,8 +861,9 @@ SWITCH_DECLARE(switch_channel_state_t) switch_channel_perform_hangup(switch_chan
|
||||
if (channel->state < CS_HANGUP) {
|
||||
switch_event_t *event;
|
||||
switch_channel_state_t last_state = channel->state;
|
||||
|
||||
switch_mutex_lock(channel->flag_mutex);
|
||||
channel->state = CS_HANGUP;
|
||||
switch_mutex_unlock(channel->flag_mutex);
|
||||
channel->hangup_cause = hangup_cause;
|
||||
switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n",
|
||||
channel->name,
|
||||
|
Reference in New Issue
Block a user