Revision
17249
Author
math.parent
Date
2010-04-08 13:52:30 -0500 (Thu, 08 Apr 2010)

Log Message

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

Modified Paths

Property Changed

Diff

Modified: freeswitch/trunk/.gitignore ( => )



Modified: freeswitch/trunk/Makefile.am
===================================================================

Modified: freeswitch/trunk/fscomm/.gitignore ( => )



Modified: freeswitch/trunk/fscomm/FSComm.pro
===================================================================

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



Modified: freeswitch/trunk/fscomm/call.h
===================================================================

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



Modified: freeswitch/trunk/fscomm/channel.h
===================================================================

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



Modified: freeswitch/trunk/fscomm/debugtools/consolewindow.cpp
===================================================================

Modified: freeswitch/trunk/fscomm/debugtools/consolewindow.h ( => )



Modified: freeswitch/trunk/fscomm/debugtools/consolewindow.ui
===================================================================

Modified: freeswitch/trunk/fscomm/debugtools/sortfilterproxymodel.cpp ( => )



Modified: freeswitch/trunk/fscomm/debugtools/sortfilterproxymodel.h
===================================================================

Modified: freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp ( => )



Modified: freeswitch/trunk/fscomm/debugtools/statedebugdialog.h
===================================================================

Modified: freeswitch/trunk/fscomm/debugtools/statedebugdialog.ui ( => )



Modified: freeswitch/trunk/fscomm/fshost.cpp
===================================================================

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



Modified: freeswitch/trunk/fscomm/mainwindow.cpp
===================================================================

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



Modified: freeswitch/trunk/fscomm/mainwindow.ui
===================================================================

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



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

Modified: freeswitch/trunk/fscomm/widgets/codecwidget.cpp ( => )



Modified: freeswitch/trunk/fscomm/widgets/codecwidget.h
===================================================================

Modified: freeswitch/trunk/fscomm/widgets/codecwidget.ui ( => )



Modified: freeswitch/trunk/libs/.gitignore
===================================================================

Modified: freeswitch/trunk/libs/freetdm/Makefile.am ( => )



Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c
===================================================================

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_isdn/ftmod_isdn.c ( => )



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

Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17248 => 17249)


--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-08 18:49:56 UTC (rev 17248)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-04-08 18:52:30 UTC (rev 17249)
@@ -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 = (uint8_t)strlen(caller_data->rdnis.digits)+1;
+			event.rdnis.digits_count = 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 = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
+			event.rdnis.digits_count = 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_sangoma_boost/sangoma_boost_interface.h ( => )



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

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



Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h
===================================================================
--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h	2010-04-08 18:49:56 UTC (rev 17248)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h	2010-04-08 18:52:30 UTC (rev 17249)
@@ -605,8 +605,8 @@
 	ftdm_hash_t *variable_hash;
 	unsigned char rx_cas_bits;
 	uint32_t pre_buffer_size;
-	unsigned char rxgain_table[FTDM_GAINS_TABLE_SIZE];
-	unsigned char txgain_table[FTDM_GAINS_TABLE_SIZE];
+	uint8_t rxgain_table[FTDM_GAINS_TABLE_SIZE];
+	uint8_t txgain_table[FTDM_GAINS_TABLE_SIZE];
 	float rxgain;
 	float txgain;
 };

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



Modified: freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h
===================================================================
--- freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h	2010-04-08 18:49:56 UTC (rev 17248)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h	2010-04-08 18:52:30 UTC (rev 17249)
@@ -40,8 +40,8 @@
 #define FTDM_TYPES_H
 #include "fsk.h"
 
-#define FTDM_INVALID_SOCKET -1
 #ifdef WIN32
+#define FTDM_INVALID_SOCKET INVALID_HANDLE_VALUE
 #include <windows.h>
 typedef HANDLE ftdm_socket_t;
 typedef unsigned __int64 uint64_t;
@@ -55,6 +55,7 @@
 typedef intptr_t ftdm_ssize_t;
 typedef int ftdm_filehandle_t;
 #else
+#define FTDM_INVALID_SOCKET -1
 #include <stdint.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>

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



Modified: freeswitch/trunk/libs/openzap/src/zap_threadmutex.c
===================================================================

Modified: freeswitch/trunk/libs/unimrcp/.gitignore ( => )



Modified: freeswitch/trunk/scripts/check-gitignore.sh
===================================================================

Modified: freeswitch/trunk/scripts/perl/multicast/recv.pl ( => )



Modified: freeswitch/trunk/scripts/perl/multicast/send.pl
===================================================================

Modified: freeswitch/trunk/scripts/tagscript.sh ( => )



Modified: freeswitch/trunk/src/.gitignore
===================================================================

Modified: freeswitch/trunk/src/include/switch_apr.h ( => )



Modified: freeswitch/trunk/src/include/switch_channel.h
===================================================================

Modified: freeswitch/trunk/src/mod/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c
===================================================================

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



Modified: freeswitch/trunk/src/mod/applications/mod_distributor/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/applications/mod_snapshot/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_vmd/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/asr_tts/mod_tts_commandline/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_gsmopen/.gitignore
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/Makefile.am ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/alsa/dummy.c
===================================================================

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



Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/skypopen.h
===================================================================

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



Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
===================================================================

Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_test/.gitignore ( => )



Modified: freeswitch/trunk/src/switch_apr.c
===================================================================

Modified: freeswitch/trunk/src/switch_channel.c ( => )



Modified: freeswitch/trunk/src/switch_console.c
===================================================================

Modified: freeswitch/trunk/src/switch_core_session.c ( => )



Modified: freeswitch/trunk/src/switch_pcm.c
===================================================================