Author: anthm Date: Fri May 25 23:27:02 2007 New Revision: 5221 Modified: freeswitch/trunk/src/include/switch.h freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_ivr_play_say.c Log: small fixes Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Fri May 25 23:27:02 2007 @@ -52,8 +52,10 @@ #define FREESWITCH_ITAD "543" #define __EXTENSIONS__ 1 #ifndef MACOSX +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 600 #endif +#endif #include <stdlib.h> #include <stdio.h> #include <stdarg.h> Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Fri May 25 23:27:02 2007 @@ -260,6 +260,7 @@ assert(buffer->data != NULL); buffer->used = 0; + buffer->actually_used = 0; buffer->head = buffer->data; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri May 25 23:27:02 2007 @@ -830,7 +830,6 @@ status = SWITCH_STATUS_SUCCESS; continue; } else if (status != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -851,6 +850,7 @@ switch_yield(10000); } status = switch_core_session_read_frame(session, &read_frame, -1, 0); + if (!SWITCH_READ_ACCEPTABLE(status)) { break; } @@ -1042,7 +1042,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1124,7 +1123,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; } @@ -1145,7 +1143,6 @@ write_frame.timestamp = timer->samplecount; } if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Bad Write\n"); done = 1; break; }