update

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

diff --git a/src/mod/mod_bridgecall/mod_bridgecall.c b/src/mod/mod_bridgecall/mod_bridgecall.c
index 5ce63aaff71f602c0fc98af5bc4f871b2a3541f5..9ebf6a1757f0ec17aa5acbffa4bde89a7e2ce5a1 100644 (file)
--- a/src/mod/mod_bridgecall/mod_bridgecall.c
+++ b/src/mod/mod_bridgecall/mod_bridgecall.c
@@ -76,11 +76,11 @@ static void *audio_bridge_thread(switch_thread *thread, void *obj)
                }
                if (switch_core_session_read_frame(session_a, &read_frame, -1) == SWITCH_STATUS_SUCCESS && read_frame->datalen) {
                        if (switch_core_session_write_frame(session_b, read_frame, -1) != SWITCH_STATUS_SUCCESS) {
-                               switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Frame.... %d Bubye!\n", read_frame->datalen);
+                               switch_console_printf(SWITCH_CHANNEL_CONSOLE, "write: Bad Frame.... %d Bubye!\n", read_frame->datalen);
                                data->running = -1;
                        }
                } else {                        
-                       switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Frame....Bubye!\n");
+                       switch_console_printf(SWITCH_CHANNEL_CONSOLE, "read: Bad Frame.... %d Bubye!\n", read_frame->datalen);
                        data->running = -1;
                }  
        }

diff --git a/src/mod/mod_iaxchan/mod_iaxchan.c b/src/mod/mod_iaxchan/mod_iaxchan.c
index c0254a6ddd52401c4716fb7c9e08d5179c591411..524d16ff567e562747c8984035b08c10af0bfb31 100644 (file)
--- a/src/mod/mod_iaxchan/mod_iaxchan.c
+++ b/src/mod/mod_iaxchan/mod_iaxchan.c
@@ -602,7 +602,7 @@ static switch_status channel_read_frame(switch_core_session *session, switch_fra
                        if (switch_test_flag(tech_pvt, TFLAG_IO)) {
                                switch_clear_flag(tech_pvt, TFLAG_VOICE);
                                if(!tech_pvt->read_frame.datalen) {
-                                       break;
+                                       continue;
                                }
                                                
                                *frame = &tech_pvt->read_frame;

diff --git a/src/mod/mod_portaudio/mod_portaudio.c b/src/mod/mod_portaudio/mod_portaudio.c
index 3c960058139394c93e9508bdc1557769e0fdb2d3..04241c30ba313e34c64094b4c0f80cf47e9cce62 100644 (file)
--- a/src/mod/mod_portaudio/mod_portaudio.c
+++ b/src/mod/mod_portaudio/mod_portaudio.c
@@ -416,12 +416,12 @@ static switch_status channel_write_frame(switch_core_session *session, switch_fr
                return SWITCH_STATUS_FALSE;
        }
 
-       switch_mutex_lock(globals.device_lock);
+       //switch_mutex_lock(globals.device_lock);
        if (tech_pvt->audio_out) {
                WriteAudioStream(tech_pvt->audio_out, (short *)frame->data, (int)(frame->datalen / sizeof(SAMPLE)));
                status = SWITCH_STATUS_SUCCESS;
        }
-       switch_mutex_unlock(globals.device_lock);
+       //switch_mutex_unlock(globals.device_lock);
 
        return status;