Revision
17275
Author
anthm
Date
2010-04-12 11:09:02 -0500 (Mon, 12 Apr 2010)

Log Message

Merge branch 'master' of git.freeswitch.org:freeswitch

Modified Paths

Property Changed

Diff

Modified: freeswitch/trunk/conf/dialplan/default.xml ( => )



Modified: freeswitch/trunk/fscomm/mainwindow.cpp
===================================================================
--- freeswitch/trunk/fscomm/mainwindow.cpp	2010-04-11 22:51:53 UTC (rev 17274)
+++ freeswitch/trunk/fscomm/mainwindow.cpp	2010-04-12 16:09:02 UTC (rev 17275)
@@ -179,10 +179,26 @@
 
 }
 
+void MainWindow::applyPreprocessors(QStringList cmds)
+{
+    if (g_FSHost.getCurrentActiveCall().isNull()) return;
+    QString uuid = g_FSHost.getCurrentActiveCall().data()->getUuid();
+    foreach(QString cmd, cmds)
+    {
+        switch_stream_handle_t stream = { 0 };
+        SWITCH_STANDARD_STREAM(stream);
+        switch_api_execute("uuid_preprocess", QString("%1 %2").arg(uuid, cmd).toAscii().data(), NULL, &stream);
+        switch_safe_free(stream.data);
+    }
+}
+
 void MainWindow::prefTriggered()
 {
     if (!preferences)
+    {
         preferences = new PrefDialog();
+        connect(preferences, SIGNAL(preprocessorsApplied(QStringList)), this, SLOT(applyPreprocessors(QStringList)));
+    }
 
     preferences->raise();
     preferences->show();

Modified: freeswitch/trunk/fscomm/mainwindow.h (17274 => 17275)


--- freeswitch/trunk/fscomm/mainwindow.h	2010-04-11 22:51:53 UTC (rev 17274)
+++ freeswitch/trunk/fscomm/mainwindow.h	2010-04-12 16:09:02 UTC (rev 17275)
@@ -85,6 +85,7 @@
     void updateCallTimers();
     void debugConsoleTriggered();
     void debugEventsTriggered();
+    void applyPreprocessors(QStringList);
 
 private:
     Ui::MainWindow *ui;

Modified: freeswitch/trunk/fscomm/preferences/prefdialog.cpp ( => )



Modified: freeswitch/trunk/fscomm/preferences/prefdialog.h
===================================================================

Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui ( => )



Modified: freeswitch/trunk/fscomm/preferences/prefportaudio.cpp
===================================================================

Modified: freeswitch/trunk/fscomm/preferences/prefportaudio.h ( => )



Modified: freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj
===================================================================

Modified: freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c ( => )



Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c
===================================================================

Modified: freeswitch/trunk/libs/freetdm/src/ftdm_threadmutex.c ( => )



Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
===================================================================
--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-11 22:51:53 UTC (rev 17274)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-12 16:09:02 UTC (rev 17275)
@@ -356,7 +356,7 @@
 	ftdm_set_string(event.calling_name, caller_data->cid_name);
 	ftdm_set_string(event.rdnis.digits, caller_data->rdnis.digits);
 	if (strlen(caller_data->rdnis.digits)) {
-			event.rdnis.digits_count = strlen(caller_data->rdnis.digits)+1;
+			event.rdnis.digits_count = (uint8_t)strlen(caller_data->rdnis.digits)+1;
 			event.rdnis.ton = caller_data->rdnis.type;
 			event.rdnis.npi = caller_data->rdnis.plan;
 	}
@@ -474,7 +474,7 @@
 	ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
 	ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
 	if (strlen(ftdmchan->caller_data.rdnis.digits)) {
-			event.rdnis.digits_count = strlen(ftdmchan->caller_data.rdnis.digits)+1;
+			event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
 			event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
 			event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
 	}

Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj ( => )



Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
===================================================================

Modified: freeswitch/trunk/libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c ( => )



Modified: freeswitch/trunk/scripts/setup-git.sh
===================================================================

Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ( => )



Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Client.pm ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Protocol.pm ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny.pm
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c
===================================================================

Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ( => )



Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs
===================================================================