clean up some typos

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9921 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-10-09 23:37:26 +00:00
parent 356e10c02f
commit a6a2d37c07
4 changed files with 5 additions and 5 deletions

View File

@ -706,7 +706,7 @@ SWITCH_STANDARD_APP(set_function)
expanded = switch_channel_expand_variables(channel, val); expanded = switch_channel_expand_variables(channel, val);
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, expanded ? expanded : "UNDEF"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF");
switch_channel_set_variable(channel, var, expanded); switch_channel_set_variable(channel, var, expanded);
if (expanded && expanded != val) { if (expanded && expanded != val) {

View File

@ -409,7 +409,7 @@ static switch_status_t sofia_answer_channel(switch_core_session_t *session)
} }
} }
} else { } else {
if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) {
switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION);
if (is_proxy) { if (is_proxy) {

View File

@ -1459,7 +1459,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready(switch_ch
switch_event_t *event; switch_event_t *event;
if (!switch_channel_test_flag(channel, CF_RING_READY)) { if (!switch_channel_test_flag(channel, CF_RING_READY)) {
switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
switch_channel_set_flag(channel, CF_RING_READY); switch_channel_set_flag(channel, CF_RING_READY);
if (channel->caller_profile && channel->caller_profile->times) { if (channel->caller_profile && channel->caller_profile->times) {
switch_mutex_lock(channel->profile_mutex); switch_mutex_lock(channel->profile_mutex);
@ -1493,7 +1493,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_pre_answered(switch_
{ {
switch_event_t *event; switch_event_t *event;
switch_channel_mark_ring_ready(channel); switch_channel_perform_mark_ring_ready(channel, file, func, line);
if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { if (!switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
const char *uuid; const char *uuid;

View File

@ -456,7 +456,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_answer(switch_core_session_t
} }
olen = mlen; olen = mlen;
if (ringback.fh->resampler) { if (ringback.fh->resampler && ringback.fh->resampler->rfactor > 1) {
olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor);
} }
switch_core_file_read(ringback.fh, write_frame.data, &olen); switch_core_file_read(ringback.fh, write_frame.data, &olen);