kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-13 02:37:22 +00:00
Code Issues Projects Releases Wiki Activity

timer mojo (cont)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4150 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-02-07 19:01:07 +00:00
parent 66feec2da5
commit e216bbe095
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mod/applications/mod_conference/mod_conference.c
View File

@ -510,13 +510,13 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
// anounce the total number of members in the conference // anounce the total number of members in the conference
if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { if (conference->count >= conference->anounce_count && conference->anounce_count > 1) {
snprintf(msg, sizeof(msg), "There are %d callers", conference->count); snprintf(msg, sizeof(msg), "There are %d callers", conference->count);
conference_member_say(member, msg, 0); conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
} else if (conference->count == 1) { } else if (conference->count == 1) {
if (conference->alone_sound) { if (conference->alone_sound) {
conference_play_file(conference, conference->alone_sound, 0, switch_core_session_get_channel(member->session)); conference_play_file(conference, conference->alone_sound, CONF_DEFAULT_LEADIN, switch_core_session_get_channel(member->session));
} else { } else {
snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count); snprintf(msg, sizeof(msg), "You are currently the only person in this conference.", conference->count);
conference_member_say(member, msg, 0); conference_member_say(member, msg, CONF_DEFAULT_LEADIN);
} }
} }
@ -1555,6 +1555,7 @@ static void conference_loop_output(conference_member_t *member)
/* handle file and TTS frames */ /* handle file and TTS frames */
if (member->fnode) { if (member->fnode) {
switch_mutex_lock(member->flag_mutex);
/* if we are done, clean it up */ /* if we are done, clean it up */
if (member->fnode->done) { if (member->fnode->done) {
conference_file_node_t *fnode; conference_file_node_t *fnode;
@ -1567,15 +1568,13 @@ static void conference_loop_output(conference_member_t *member)
switch_core_file_close(&member->fnode->fh); switch_core_file_close(&member->fnode->fh);
} }
switch_mutex_lock(member->flag_mutex);
fnode = member->fnode; fnode = member->fnode;
member->fnode = member->fnode->next; member->fnode = member->fnode->next;
switch_mutex_unlock(member->flag_mutex);
pool = fnode->pool; pool = fnode->pool;
fnode = NULL; fnode = NULL;
switch_core_destroy_memory_pool(&pool); switch_core_destroy_memory_pool(&pool);
} else { } else {
/* skip this frame until leadin time has expired */ /* skip this frame until leadin time has expired */
if (member->fnode->leadin) { if (member->fnode->leadin) {
@ -1618,6 +1617,7 @@ static void conference_loop_output(conference_member_t *member)
} }
} }
} }
switch_mutex_unlock(member->flag_mutex);
} else { /* send the conferecne frame to the call leg */ } else { /* send the conferecne frame to the call leg */
switch_buffer_t *use_buffer = NULL; switch_buffer_t *use_buffer = NULL;
uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer); uint32_t mux_used = (uint32_t)switch_buffer_inuse(member->mux_buffer);
@ -2055,6 +2055,7 @@ static switch_status_t conference_member_say(conference_member_t *member, char *
fnode->type = NODE_TYPE_SPEECH; fnode->type = NODE_TYPE_SPEECH;
fnode->leadin = leadin; fnode->leadin = leadin;
fnode->pool = pool;
memset(&fnode->sh, 0, sizeof(fnode->sh)); memset(&fnode->sh, 0, sizeof(fnode->sh));
if (switch_core_speech_open(&fnode->sh, if (switch_core_speech_open(&fnode->sh,
@ -2062,13 +2063,11 @@ static switch_status_t conference_member_say(conference_member_t *member, char *
conference->tts_voice, conference->tts_voice,
conference->rate, conference->rate,
&flags, &flags,
conference->pool) != SWITCH_STATUS_SUCCESS) { fnode->pool) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
fnode->pool = pool;
/* Queue the node */ /* Queue the node */
switch_mutex_lock(member->flag_mutex); switch_mutex_lock(member->flag_mutex);
for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next); for (nptr = member->fnode; nptr && nptr->next; nptr = nptr->next);

8
src/mod/timers/mod_softtimer/mod_softtimer.c
View File

@ -95,7 +95,13 @@ static inline switch_status_t timer_next(switch_timer_t *timer)
uint64_t diff; uint64_t diff;
if ((diff = (private_info->reference - TIMER_MATRIX[timer->interval].tick))) { if ((diff = (private_info->reference - TIMER_MATRIX[timer->interval].tick))) {
switch_yield(diff * 1000); if (diff == timer->interval) {
switch_yield(diff * 500);
} else {
switch_yield(1000);
}
} else {
break;
} }
} }
timer->samplecount += timer->samples; timer->samplecount += timer->samples;

3
src/switch_rtp.c
View File

@ -781,8 +781,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
if (status == SWITCH_STATUS_BREAK || bytes == 0) { if (status == SWITCH_STATUS_BREAK || bytes == 0) {
if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) { if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DATAWAIT)) {
switch_yield(diff * 500);
switch_yield(diff * 1000);
continue; continue;
} }
return 0; return 0;