Revision
17227
Author
gmaruzz
Date
2010-04-06 10:55:58 -0500 (Tue, 06 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/build/swigall.sh ( => )



Modified: freeswitch/trunk/configure.in
===================================================================

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/fshost.cpp
===================================================================

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



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

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/apr-util/test/data/.empty ( => )



Modified: freeswitch/trunk/libs/esl/java/classes/.empty
===================================================================

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



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

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



Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c
===================================================================
--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c	2010-04-06 16:04:46 UTC (rev 17226)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c	2010-04-06 15:55:58 UTC (rev 17227)
@@ -660,10 +660,10 @@
 
 #define FTDM_SLINEAR_MAX_VALUE 32767
 #define FTDM_SLINEAR_MIN_VALUE -32767
-static void reset_gain_table(uint8_t *gain_table, float new_gain, ftdm_codec_t codec_gain)
+static void reset_gain_table(unsigned char *gain_table, float new_gain, ftdm_codec_t codec_gain)
 {
 	/* sample value */
-	uint8_t sv = 0;
+	unsigned char sv = 0;
 	/* linear gain factor */
 	float lingain = 0;
 	/* linear value for each table sample */

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 ( => )



Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h
===================================================================
--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h	2010-04-06 16:04:46 UTC (rev 17226)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h	2010-04-06 15:55:58 UTC (rev 17227)
@@ -605,8 +605,8 @@
 	ftdm_hash_t *variable_hash;
 	unsigned char rx_cas_bits;
 	uint32_t pre_buffer_size;
-	uint8_t rxgain_table[FTDM_GAINS_TABLE_SIZE];
-	uint8_t txgain_table[FTDM_GAINS_TABLE_SIZE];
+	unsigned char rxgain_table[FTDM_GAINS_TABLE_SIZE];
+	unsigned char 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-06 16:04:46 UTC (rev 17226)
+++ freeswitch/trunk/libs/freetdm/src/include/ftdm_types.h	2010-04-06 15:55:58 UTC (rev 17227)
@@ -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,7 +55,6 @@
 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/js/nsprpub/include/.empty ( => )



Modified: freeswitch/trunk/libs/js/nsprpub/macbuild/.empty
===================================================================

Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty ( => )



Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
===================================================================

Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty ( => )



Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
===================================================================

Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty ( => )



Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
===================================================================

Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty ( => )



Modified: freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty
===================================================================

Modified: freeswitch/trunk/libs/portaudio/doc/html/.empty ( => )



Modified: freeswitch/trunk/libs/sofia-sip/configure.ac
===================================================================

Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am ( => )



Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am
===================================================================

Modified: freeswitch/trunk/libs/sqlite/art/tmp/.empty ( => )



Modified: freeswitch/trunk/libs/sqlite/notes/.empty
===================================================================

Modified: freeswitch/trunk/libs/sqlite/src/ex/.empty ( => )



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

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_distributor/.gitignore ( => )



Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am
===================================================================

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_portaudio/Makefile.am ( => )



Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Makefile.am
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.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_api.c
===================================================================

Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_api.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/skinny_tables.c
===================================================================

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



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

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



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/mod/formats/mod_portaudio_stream/Makefile.am
===================================================================

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



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

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



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
===================================================================

Modified: freeswitch/trunk/web/etc/.empty ( => )



Modified: freeswitch/trunk/web/planet/.empty
===================================================================