- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12665 - freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: silik0n Date: Wed Mar 18 21:34:55 2009 New Revision: 12665 Log: unscrew a couple of events hitting the wrong methods, fix non-working refresh buttons Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Modified: freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml (original) +++ freeswitch/trunk/scripts/contrib/swk/flex/amf-test1/src/main.mxml Wed Mar 18 21:34:55 2009 @@ -4,6 +4,7 @@ <mx:Script> <![CDATA[ + import mx.events.DragEvent; import flash.utils.Timer; import flash.events.TimerEvent; @@ -127,7 +128,7 @@ public function dgChangeDomainUserVars(event:DataGridEvent):void { var _rowIndex:Number=event.rowIndex; var _columnIndex:Number= event.columnIndex; - freeswitch.updateDirDomainUserParam(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); + freeswitch.updateDirDomainUserVars(dgDomainUserVars.selectedItem.uid, dgDomainUserVars.selectedItem.name, TextInput(event.currentTarget.itemEditorInstance).text); freeswitch.getDirUser(dgDomainUsers.selectedItem.uid); } @@ -149,6 +150,11 @@ Alert.show('You must have a domain Selected', 'Invalid Domain', mx.controls.Alert.OK); } } + + public function nonMemberDrop(event:DragEvent):void { + Alert.show('Dropped UID?', '-' + '-' +'-', mx.controls.Alert.OK); + } + ]]> </mx:Script> @@ -286,7 +292,7 @@ <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh Domain" right="10" top="10" height="22"/> + <mx:Button label="Refresh Domain" right="10" top="10" height="22" click="freeswitch.getDirDomain(gridDomainsDomain.selectedItem.uid);"/> <mx:Button label="Add Parameter" left="139" bottom="10" click="addDomainParam()"/> <mx:Button label="Add Variable" bottom="10" right="183" width="99" click="addDomainVar()"/> <mx:Label text="Parameter" bottom="60" left="10"/> @@ -338,7 +344,7 @@ <mx:DataGridColumn headerText="Data" dataField="value"/> </mx:columns> </mx:DataGrid> - <mx:Button label="Refresh User" right="10" top="8" height="22"/> + <mx:Button label="Refresh User" right="10" top="8" height="22" click="freeswitch.getDirUser(dgDomainUsers.selectedItem.uid)"/> <mx:Button label="Add Parameter" left="139" bottom="10" click="addDomainUserParam()"/> <mx:Button label="Delete Param" bottom="10" left="26" click="dgDeleteDomainUserParam();"/> <mx:Button label="Add Variable" bottom="10" right="183" width="99" click="addDomainUserVar()"/> @@ -368,21 +374,21 @@ <mx:Button label="Refresh Domains" horizontalCenter="0" bottom="10" click="freeswitch.getDirDomains()"/> </mx:Canvas> <mx:Canvas width="80%" height="100%"> - <mx:DataGrid width="45%" left="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" + <mx:DataGrid id="dgGroupMembers" width="45%" left="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.members}" dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> <mx:columns> <mx:DataGridColumn headerText="Member" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> - <mx:DataGrid width="45%" right="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" - dragEnabled="true" dragMoveEnabled="true" dropEnabled="true"> + <mx:DataGrid id="dgGroupNonMembers" width="45%" right="10" top="38" bottom="70" dataProvider="{freeswitch.getDirGroup.lastResult.nonmembers}" + dragEnabled="true" dragMoveEnabled="true" dropEnabled="true" dragDrop="nonMemberDrop(event);"> <mx:columns> <mx:DataGridColumn headerText="Available to Join" dataField="usersUsername"/> </mx:columns> </mx:DataGrid> <mx:Button label="Refresh" click="freeswitch.getDirGroup(dgDirGroups.selectedItem.uid)" right="10" width="71" top="10" height="22"/> - <mx:Label text="New Group" bottom="42" left="10" width="63"/> - <mx:TextInput bottom="40" id="textNewGroup" left="81" width="256"/> + <mx:Label text="New Group" bottom="42" left="10" width="81"/> + <mx:TextInput bottom="40" id="textNewGroup" left="99" width="256"/> <mx:Button label="Create Group" bottom="10" click="doGroupAdd();" left="81" width="101"/> <mx:Label text="UID:" top="10" left="10"/> <mx:Label text="{dgDirGroups.selectedItem.uid}" id="groupUID" top="10" left="49"/>

1 0

[commit] r12664 - freeswitch/trunk/scripts/contrib/swk/sql
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: silik0n Date: Wed Mar 18 21:31:03 2009 New Revision: 12664 Log: consistancy Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Modified: freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql (original) +++ freeswitch/trunk/scripts/contrib/swk/sql/shipment.mysql.sql Wed Mar 18 21:31:03 2009 @@ -243,13 +243,13 @@ DROP TABLE IF EXISTS `users`; CREATE TABLE `users` ( `uid` int(11) NOT NULL auto_increment, - `domain_uid` int(11) NOT NULL, + `domains_uid` int(11) NOT NULL, `username` varchar(64) NOT NULL, `mailbox` varchar(64) default NULL, `cidr` varchar(32) default NULL, `enabled` tinyint(1) NOT NULL default '1', PRIMARY KEY (`uid`), - KEY `domain_uid` (`domain_uid`,`username`,`mailbox`) + KEY `domain_uid` (`domains_uid`,`username`,`mailbox`) ) ENGINE=MyISAM AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; --

1 0

[commit] r12663 - freeswitch/trunk/scripts/contrib/swk/php/xml_curl
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: silik0n Date: Wed Mar 18 20:55:58 2009 New Revision: 12663 Log: fix user groups Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Wed Mar 18 20:55:58 2009 @@ -142,6 +142,13 @@ return $results; } + public function getDirGroupsByDomianUidByUserUid($domain_uid, $user_uid){ + $query = sprintf("select a.uid as groupUid, a.name as groupName, b.uid as usersUid from groups as a, group_members as b where a.uid = b.groups_uid and b.domains_uid = %s and b.users_uid = %s", $domain_uid, $user_uid) ; + $stmt = $this->dbh->query($query); + $results = $stmt->fetchAll(); + return $results; + } + } /* For Emacs: * Local Variables: Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/directory.php Wed Mar 18 20:55:58 2009 @@ -19,6 +19,7 @@ $key_value="192.168.1.140"; $user="1000"; */ + if ($section == "directory" && $tag_name == "domain" && $key_name == "name") { $db_domain = $fsd->getDirDomainbyName($key_value); } else { @@ -31,7 +32,7 @@ $db_user_settings = $fsd->getDirUser($db_user['uid']); -$db_groups = $fsd->getDirGroups($db_domain['uid']); +$db_groups = $fsd->getDirGroupsByDomianUidByUserUid($db_domain['uid'], $db_user['uid']); printf(" <?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"); printf(" <document type=\"freeswitch/xml\">\n"); @@ -54,18 +55,14 @@ printf(" </user>\n"); printf(" </users>\n"); printf(" </group>\n"); -/* This is Broken need to talk to someone about this part... maybe I should load this at boot time instead foreach($db_groups as $db_group){ - $db_members = $fsd->getDirGroup($db_group['uid']); - printf(" <group name=\"%s\">\n", $db_group['name']); + printf(" <group name=\"%s\">\n", $db_group['groupName']); printf(" <users>\n"); - foreach($db_members['members'] as $db_member){ - printf(" <user id=\"%s\" type=\"pointer\"/>\n", $db_member['usersUsername']); - } + printf(" <user id=\"%s\" type=\"pointer\"/>\n", $user); printf(" </users>\n"); printf(" </group>\n"); } -*/ + printf(" </groups>\n"); printf(" </domain>\n"); printf(" </section>\n");

1 0

[commit] r12662 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Mar '09

19 Mar '09

Author: brian Date: Wed Mar 18 20:06:21 2009 New Revision: 12662 Log: bracketless if's are not allowed doh Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 18 20:06:21 2009 @@ -624,10 +624,11 @@ SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max) { - if (rtp_session->missed_count >= max) + if (rtp_session->missed_count >= max) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", - rtp_session->missed_count, max, rtp_session->missed_count); + "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", + rtp_session->missed_count, max, rtp_session->missed_count); + } rtp_session->max_missed_packets = max; }

1 0

[commit] r12661 - freeswitch/trunk/scripts/contrib/swk/php/esl_cdr
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: silik0n Date: Wed Mar 18 18:39:48 2009 New Revision: 12661 Log: mysql schema for this script Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql Added: freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/swk/php/esl_cdr/esl_cdr.mysql.sql Wed Mar 18 18:39:48 2009 @@ -0,0 +1,33 @@ +CREATE TABLE IF NOT EXISTS `cdr` ( + `uuid` varchar(100) NOT NULL, + `acctcode` varchar(100) NOT NULL, + `ani` varchar(100) NOT NULL, + `e164_ani` varchar(100) NOT NULL, + `dnis` varchar(100) NOT NULL, + `e164_dnis` varchar(100) NOT NULL, + `translated_dnis` varchar(100) NOT NULL, + `src_host` varchar(100) NOT NULL, + `read_codec` varchar(100) NOT NULL, + `write_codec` varchar(100) NOT NULL, + `clid_name` varchar(100) NOT NULL, + `clid_number` varchar(100) NOT NULL, + `src_sdp` varchar(100) NOT NULL, + `dest_sdp` varchar(100) NOT NULL, + `originate_disposition` varchar(100) NOT NULL, + `bridge_to_uuid` varchar(100) NOT NULL, + `endpoint_disposition` varchar(100) NOT NULL, + `sip_hangup_disposition` varchar(100) NOT NULL, + `term_cause` varchar(100) NOT NULL, + `hangup_cause` varchar(100) NOT NULL, + `start_stamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `answer_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `progress_media_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `end_stamp` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `duration` int(11) NOT NULL, + `billsec` int(11) NOT NULL, + `progress_mediasec` int(11) NOT NULL, + `billmin` varchar(100) NOT NULL, + `carrier_id` varchar(100) NOT NULL, + `cust_cost` varchar(100) NOT NULL, + `carrier_cost` varchar(100) NOT NULL +)

1 0

[commit] r12660 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 15:36:30 2009 New Revision: 12660 Log: FSRTP-1 Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Mar 18 15:36:30 2009 @@ -624,6 +624,11 @@ SWITCH_DECLARE(void) switch_rtp_set_max_missed_packets(switch_rtp_t *rtp_session, uint32_t max) { + if (rtp_session->missed_count >= max) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "new max missed packets(%d->%d) greater than current missed packets(%d). RTP will timeout.\n", + rtp_session->missed_count, max, rtp_session->missed_count); + rtp_session->max_missed_packets = max; }

1 0

[commit] r12659 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 14:17:31 2009 New Revision: 12659 Log: add undocumented features to the config file example someone wiki this please Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed Mar 18 14:17:31 2009 @@ -124,6 +124,10 @@   +  +  +  +

1 0

[commit] r12658 - in freeswitch/trunk: conf/autoload_configs src/mod/languages/mod_python
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 13:56:36 2009 New Revision: 12658 Log: MODLANG-105 Modified: freeswitch/trunk/conf/autoload_configs/python.conf.xml freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Modified: freeswitch/trunk/conf/autoload_configs/python.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/python.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/python.conf.xml Wed Mar 18 13:56:36 2009 @@ -4,13 +4,13 @@   -  -  +  +  </settings> </configuration> Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Wed Mar 18 13:56:36 2009 @@ -388,6 +388,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n"); + globals.pool = pool; + if (!Py_IsInitialized()) { // initialize python system @@ -408,7 +410,6 @@ PyEval_ReleaseLock(); } - globals.pool = pool; do_config(); /* connect my internal structure to the blank pointer passed to me */

1 0

[commit] r12657 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: brian Date: Wed Mar 18 13:54:16 2009 New Revision: 12657 Log: MODENDP-201 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Mar 18 13:54:16 2009 @@ -1737,7 +1737,7 @@ nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); } - nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contact_str), NUTAG_WITH_THIS(nua), + nua_respond(nh, SIP_202_ACCEPTED, SIPTAG_CONTACT_STR(contactstr), NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EXPIRES_STR(exp_delta_str), TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END());

1 0

[commit] r12656 - freeswitch/trunk/patches
by FreeSWITCH SVN 18 Mar '09

18 Mar '09

Author: anthm Date: Wed Mar 18 13:45:39 2009 New Revision: 12656 Log: add Added: freeswitch/trunk/patches/pa.diff Added: freeswitch/trunk/patches/pa.diff ============================================================================== --- (empty file) +++ freeswitch/trunk/patches/pa.diff Wed Mar 18 13:45:39 2009 @@ -0,0 +1,254 @@ +Index: src/mod/endpoints/mod_portaudio/mod_portaudio.c +=================================================================== +--- src/mod/endpoints/mod_portaudio/mod_portaudio.c (revision 12655) ++++ src/mod/endpoints/mod_portaudio/mod_portaudio.c (working copy) +@@ -124,7 +124,8 @@ + private_t *call_list; + int ring_interval; + GFLAGS flags; +- switch_timer_t timer; ++ switch_timer_t read_timer; ++ switch_timer_t write_timer; + switch_timer_t hold_timer; + int dual_streams; + time_t deactivate_timer; +@@ -249,7 +250,7 @@ + } + + while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { +- switch_size_t olen = globals.timer.samples; ++ switch_size_t olen = globals.read_timer.samples; + + if (switch_micro_time_now() - last >= waitsec) { + char buf[512]; +@@ -268,7 +269,7 @@ + } + + if (ring_file) { +- if (switch_core_timer_next(&globals.timer) != SWITCH_STATUS_SUCCESS) { ++ if (switch_core_timer_next(&globals.read_timer) != SWITCH_STATUS_SUCCESS) { + switch_core_file_close(&fh); + break; + } +@@ -279,7 +280,7 @@ + } + + if (globals.ring_stream) { +- WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); ++ WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.write_timer); + } + } else { + switch_yield(10000); +@@ -355,10 +356,14 @@ + switch_core_codec_destroy(&globals.write_codec); + } + +- if (globals.timer.timer_interface) { +- switch_core_timer_destroy(&globals.timer); ++ if (globals.read_timer.timer_interface) { ++ switch_core_timer_destroy(&globals.read_timer); + } + ++ if (globals.write_timer.timer_interface) { ++ switch_core_timer_destroy(&globals.write_timer); ++ } ++ + if (globals.hold_timer.timer_interface) { + switch_core_timer_destroy(&globals.hold_timer); + } +@@ -597,14 +602,13 @@ + + switch_mutex_lock(globals.device_lock); + samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, +- globals.read_codec.implementation->samples_per_packet, &globals.timer); ++ globals.read_codec.implementation->samples_per_packet, &globals.read_timer); + switch_mutex_unlock(globals.device_lock); + + if (samples) { + globals.read_frame.datalen = samples * 2; + globals.read_frame.samples = samples; + +- //switch_core_timer_check(&globals.timer, SWITCH_TRUE); + *frame = &globals.read_frame; + + if (!switch_test_flag((&globals), GFLAG_MOUTH)) { +@@ -649,7 +653,7 @@ + + if (globals.audio_stream) { + if (switch_test_flag((&globals), GFLAG_EAR)) { +- WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.timer); ++ WriteAudioStream(globals.audio_stream, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)), &globals.write_timer); + } + status = SWITCH_STATUS_SUCCESS; + } +@@ -1278,10 +1282,14 @@ + destroy_codecs(); + } + +- if (globals.timer.timer_interface) { +- switch_core_timer_sync(&globals.timer); ++ if (globals.read_timer.timer_interface) { ++ switch_core_timer_sync(&globals.read_timer); + } + ++ if (globals.write_timer.timer_interface) { ++ switch_core_timer_sync(&globals.write_timer); ++ } ++ + if (globals.audio_stream) { + return SWITCH_STATUS_SUCCESS; + } +@@ -1310,8 +1318,8 @@ + } + } + +- if (!globals.timer.timer_interface) { +- if (switch_core_timer_init(&globals.timer, ++ if (!globals.read_timer.timer_interface) { ++ if (switch_core_timer_init(&globals.read_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, + module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); +@@ -1321,6 +1329,19 @@ + } + } + ++ ++ if (!globals.write_timer.timer_interface) { ++ if (switch_core_timer_init(&globals.write_timer, ++ globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, ++ module_pool) != SWITCH_STATUS_SUCCESS) { ++ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); ++ switch_core_codec_destroy(&globals.read_codec); ++ switch_core_codec_destroy(&globals.write_codec); ++ switch_core_timer_destroy(&globals.read_timer); ++ return SWITCH_STATUS_FALSE; ++ } ++ } ++ + if (!globals.hold_timer.timer_interface) { + if (switch_core_timer_init(&globals.hold_timer, + globals.timer_name, codec_ms, globals.read_codec.implementation->samples_per_packet, +@@ -1328,7 +1349,8 @@ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup hold timer failed!\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); +- switch_core_timer_destroy(&globals.timer); ++ switch_core_timer_destroy(&globals.read_timer); ++ switch_core_timer_destroy(&globals.write_timer); + return SWITCH_STATUS_FALSE; + } + } +@@ -1366,7 +1388,8 @@ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open audio device\n"); + switch_core_codec_destroy(&globals.read_codec); + switch_core_codec_destroy(&globals.write_codec); +- switch_core_timer_destroy(&globals.timer); ++ switch_core_timer_destroy(&globals.read_timer); ++ switch_core_timer_destroy(&globals.write_timer); + switch_core_timer_destroy(&globals.hold_timer); + return SWITCH_STATUS_FALSE; + } +@@ -1963,8 +1986,8 @@ + playfile, seconds, samples, globals.read_codec.implementation->actual_samples_per_second); + + while (switch_core_file_read(&fh, abuf, &olen) == SWITCH_STATUS_SUCCESS) { +- WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.timer); +- switch_core_timer_next(&globals.timer); ++ WriteAudioStream(globals.audio_stream, abuf, (long) olen, &globals.read_timer); ++ switch_core_timer_next(&globals.read_timer); + samples -= (int) olen; + if (samples <= 0) { + break; +@@ -1993,8 +2016,8 @@ + int i; + for(i = 0; i < 400; i++) { + if ((samples = ReadAudioStream(globals.audio_stream, globals.read_frame.data, +- globals.read_codec.implementation->samples_per_packet, &globals.timer))) { +- WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.timer); ++ globals.read_codec.implementation->samples_per_packet, &globals.read_timer))) { ++ WriteAudioStream(globals.audio_stream, globals.read_frame.data, (long) samples, &globals.write_timer); + success = 1; + } + switch_yield(10000); +Index: src/mod/endpoints/mod_portaudio/pablio.c +=================================================================== +--- src/mod/endpoints/mod_portaudio/pablio.c (revision 12655) ++++ src/mod/endpoints/mod_portaudio/pablio.c (working copy) +@@ -146,17 +146,15 @@ + char *p = (char *) data; + long numBytes = aStream->bytesPerFrame * numFrames; + +- while (numBytes > 0) { +- bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); +- numBytes -= bytesWritten; +- p += bytesWritten; +- if (numBytes > 0) { +- if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { +- PaUtil_FlushRingBuffer(&aStream->outFIFO); +- return 0; +- } +- switch_cond_next(); +- } ++ switch_core_timer_next(timer); ++ ++ bytesWritten = PaUtil_WriteRingBuffer(&aStream->outFIFO, p, numBytes); ++ numBytes -= bytesWritten; ++ p += bytesWritten; ++ ++ if (numBytes > 0) { ++ PaUtil_FlushRingBuffer(&aStream->outFIFO); ++ return 0; + } + return numFrames; + } +@@ -171,32 +169,28 @@ + char *p = (char *) data; + long avail, totalBytes = 0, neededBytes = aStream->bytesPerFrame * numFrames; + +- for (;;) { +- avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); ++ switch_core_timer_next(timer); ++ ++ avail = PaUtil_GetRingBufferReadAvailable(&aStream->inFIFO); + +- if (switch_core_timer_check(timer, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) { +- break; +- } ++ if (avail >= neededBytes * 6) { ++ PaUtil_FlushRingBuffer(&aStream->inFIFO); ++ avail = 0; ++ } + +- if (avail >= neededBytes * 6) { +- PaUtil_FlushRingBuffer(&aStream->inFIFO); +- avail = 0; +- } ++ bytesRead = 0; + +- bytesRead = 0; +- +- if (totalBytes < neededBytes && avail >= neededBytes) { +- bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); +- totalBytes += bytesRead; +- } +- +- if (bytesRead) { +- p += bytesRead; +- } else { +- switch_cond_next(); +- } ++ if (totalBytes < neededBytes && avail >= neededBytes) { ++ bytesRead = PaUtil_ReadRingBuffer(&aStream->inFIFO, p, neededBytes); ++ totalBytes += bytesRead; + } + ++ if (bytesRead) { ++ p += bytesRead; ++ } else { ++ switch_cond_next(); ++ } ++ + return totalBytes / aStream->bytesPerFrame; + } +

1 0