- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4751 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: anthm Date: Fri Mar 23 12:34:13 2007 New Revision: 4751 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fixes Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Mar 23 12:34:13 2007 @@ -735,7 +735,7 @@ if (conference->fnode->leadin) { conference->fnode->leadin--; } else { - ready++; + file_sample_len = samples; if (conference->fnode->type == NODE_TYPE_SPEECH) { switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = conference->rate; @@ -758,34 +758,40 @@ } } has_file_data = 1; + ready++; } else { has_file_data = 0; } if (conference->async_fnode) { - switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); - - if (file_sample_len <= 0) { - conference->async_fnode->done++; + /* Lead in time */ + if (conference->async_fnode->leadin) { + conference->async_fnode->leadin--; } else { - if (has_file_data) { - switch_size_t x; - for (x = 0; x < file_sample_len; x++) { - int32_t z; - int16_t *bptr, *muxed; - - muxed = (int16_t *) file_frame; - bptr = (int16_t *) async_file_frame; - z = muxed[x] + bptr[x]; - switch_normalize_to_16bit(z); - muxed[x] = (int16_t)z; - } + file_sample_len = samples; + switch_core_file_read(&conference->async_fnode->fh, async_file_frame, &file_sample_len); + if (file_sample_len <= 0) { + conference->async_fnode->done++; } else { - memcpy(file_frame, async_file_frame, file_sample_len * 2); - has_file_data = 1; + if (has_file_data) { + switch_size_t x; + for (x = 0; x < file_sample_len; x++) { + int32_t z; + int16_t *bptr, *muxed; + + muxed = (int16_t *) file_frame; + bptr = (int16_t *) async_file_frame; + z = muxed[x] + bptr[x]; + switch_normalize_to_16bit(z); + muxed[x] = (int16_t)z; + } + } else { + memcpy(file_frame, async_file_frame, file_sample_len * 2); + has_file_data = 1; + ready++; + } } } - } if (ready) { @@ -833,22 +839,22 @@ if (imember->read > imember->len) { imember->len = imember->read; } - + bptr = (int16_t *) imember->frame; muxed = (int16_t *) omember->mux_frame; - + for (x = 0; x < imember->read / 2; x++) { int32_t z = muxed[x] + bptr[x]; switch_normalize_to_16bit(z); muxed[x] = (int16_t)z; } - + ready++; } } } - + /* Go back and write each member his dedicated copy of the audio frame that does not contain his own audio. */ for (imember = conference->members; imember; imember = imember->next) { if (switch_test_flag(imember, MFLAG_RUNNING)) { @@ -1958,7 +1964,7 @@ } } - if (!strncasecmp(file, "say:", 4)) { + if (!async && !strncasecmp(file, "say:", 4)) { status = conference_say(conference, file + 4, leadin); goto done; } @@ -1969,10 +1975,12 @@ goto done; } file = dfile; - } else { + } else if (!async) { status = conference_say(conference, file, leadin); goto done; - } + } else { + goto done; + } } /* Setup a memory pool to use. */ @@ -2017,8 +2025,10 @@ conference->async_fnode = fnode; if (nptr) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&conference->fnode->sh, &flags); + switch_memory_pool_t *pool; + switch_core_file_close(&nptr->fh); + pool = nptr->pool; + switch_core_destroy_memory_pool(&pool); } } else {

1 0

[commit] r4750 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: anthm Date: Fri Mar 23 11:53:46 2007 New Revision: 4750 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: o crap Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Fri Mar 23 11:53:46 2007 @@ -3,7 +3,7 @@ #XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la #dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +XMLRPCLAS = $(XMLRPC_DIR)/src/*.o XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la

1 0

[commit] r4749 - in freeswitch/trunk: . build/config src/mod/event_handlers/mod_cdr
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Fri Mar 23 02:08:17 2007 New Revision: 4749 Added: freeswitch/trunk/build/config/ax_lib_mysql.m4 freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Removed: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Modified: freeswitch/trunk/acinclude.m4 freeswitch/trunk/configure.in Log: add proper autoconf checks for mysql client and convert mod_cdr to automake makefile so that we can use AM_CONDITIONALS for the mysqlcdr build selection Modified: freeswitch/trunk/acinclude.m4 ============================================================================== --- freeswitch/trunk/acinclude.m4 (original) +++ freeswitch/trunk/acinclude.m4 Fri Mar 23 02:08:17 2007 @@ -4,5 +4,6 @@ m4_include([build/config/ax_check_compiler_flags.m4]) m4_include([build/config/ac_gcc_archflag.m4]) m4_include([build/config/ac_gcc_x86_cpuid.m4]) +m4_include([build/config/ax_lib_mysql.m4]) m4_include([libs/apr/build/apr_common.m4]) m4_include([libs/curl/docs/libcurl/libcurl.m4]) Added: freeswitch/trunk/build/config/ax_lib_mysql.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/ax_lib_mysql.m4 Fri Mar 23 02:08:17 2007 @@ -0,0 +1,148 @@ +##### http://autoconf-archive.cryp.to/ax_lib_mysql.html +# +# SYNOPSIS +# +# AX_LIB_MYSQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of MySQL client library +# of particular version or newer. +# +# AX_LIB_MYSQL macro takes only one argument which is optional. If +# there is no required version passed, then macro does not run +# version test. +# +# The --with-mysql option takes one of three possible values: +# +# no - do not check for MySQL client library +# +# yes - do check for MySQL library in standard locations +# (mysql_config should be in the PATH) +# +# path - complete path to mysql_config utility, use this option if +# mysql_config can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(MYSQL_CFLAGS) +# AC_SUBST(MYSQL_LDFLAGS) +# AC_SUBST(MYSQL_VERSION) +# +# And sets: +# +# HAVE_MYSQL +# +# LAST MODIFICATION +# +# 2006-07-16 +# +# COPYLEFT +# +# Copyright (c) 2006 Mateusz Loskot <mateusz(a)loskot.net> +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + +AC_DEFUN([AX_LIB_MYSQL], +[ + AC_ARG_WITH([mysql], + AC_HELP_STRING([--with-mysql=@<:@ARG@:>@], + [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] + ), + [ + if test "$withval" = "no"; then + want_mysql="no" + elif test "$withval" = "yes"; then + want_mysql="yes" + else + want_mysql="yes" + MYSQL_CONFIG="$withval" + fi + ], + [want_mysql="yes"] + ) + + MYSQL_CFLAGS="" + MYSQL_LDFLAGS="" + MYSQL_VERSION="" + + dnl + dnl Check MySQL libraries (libpq) + dnl + + if test "$want_mysql" = "yes"; then + + if test -z "$MYSQL_CONFIG" -o test; then + AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no]) + fi + + if test "$MYSQL_CONFIG" != "no"; then + AC_MSG_CHECKING([for MySQL libraries]) + + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" + MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" + + MYSQL_VERSION=`$MYSQL_CONFIG --version` + + AC_DEFINE([HAVE_MYSQL], [1], + [Define to 1 if MySQL libraries are available]) + + found_mysql="yes" + AC_MSG_RESULT([yes]) + else + found_mysql="no" + AC_MSG_RESULT([no]) + fi + fi + + dnl + dnl Check if required version of MySQL is available + dnl + + + mysql_version_req=ifelse([$1], [], [], [$1]) + + if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then + + AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) + + dnl Decompose required version string of MySQL + dnl and calculate its number representation + mysql_version_req_major=`expr $mysql_version_req : '$[[0-9]]*$'` + mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.$[[0-9]]*$'` + mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.$[[0-9]]*$'` + if test "x$mysql_version_req_micro" = "x"; then + mysql_version_req_micro="0" + fi + + mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \ + \+ $mysql_version_req_minor \* 1000 \ + \+ $mysql_version_req_micro` + + dnl Decompose version string of installed MySQL + dnl and calculate its number representation + mysql_version_major=`expr $MYSQL_VERSION : '$[[0-9]]*$'` + mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.$[[0-9]]*$'` + mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.$[[0-9]]*$'` + if test "x$mysql_version_micro" = "x"; then + mysql_version_micro="0" + fi + + mysql_version_number=`expr $mysql_version_major \* 1000000 \ + \+ $mysql_version_minor \* 1000 \ + \+ $mysql_version_micro` + + mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number` + if test "$mysql_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + + AC_SUBST([MYSQL_VERSION]) + AC_SUBST([MYSQL_CFLAGS]) + AC_SUBST([MYSQL_LDFLAGS]) +]) Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Fri Mar 23 02:08:17 2007 @@ -291,11 +291,16 @@ AC_ARG_ENABLE(crash-protection, [ --enable-crash-protection Compile with CRASH Protection],,[enable_crash_prot="no"]) +#AX_LIB_MYSQL([MINIMUM-VERSION]) +AX_LIB_MYSQL + AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"]) +AM_CONDITIONAL([HAVE_MYSQL],[test "$have_mysql" = "yes"]) AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile + src/mod/event_handlers/mod_cdr/Makefile src/include/switch_am_config.h build/getlib.sh build/modmake.rules]) Added: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile.am Fri Mar 23 02:08:17 2007 @@ -0,0 +1,49 @@ +#we should set all these vars from configure, no reason to have these in each Makefile.am +LIBTOOL=`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;` +AM_MAKEFLAGS=`test -n "$(VERBOSE)" || echo -s` +LINK_OUTPUT_REDIR=> $(MODNAME).log || error="yes" ; \ + if test -n "$(VERBOSE)" -o "$$error" = "yes"; then \ + cat $(MODNAME).log ; \ + fi ;\ + if test "$$error" = "yes"; then \ + exit 1 ;\ + fi + +moddir=$(prefix)/mod + + + +MODNAME=mod_cdr +mod_LTLIBRARIES = mod_cdr.la +mod_cdr_la_SOURCES = mod_cdr.cpp cdrcontainer.cpp basecdr.cpp baseregistry.cpp pddcdr.cpp csvcdr.cpp xmlcdr.cpp sqlitecdr.cpp +mod_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_la_LIBADD=$(switch_builddir)/libfreeswitch.la +mod_cdr_la_LDFLAGS=-module -avoid-version -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) + +#Build mysqlcdr if we have mysql client +if HAVE_MYSQL +mod_cdr_la_CFLAGS += -DMYSQL +mod_cdr_la_LDFLAGS += -lmysql-client +mod_cdr_la_SOURCES += mysqlcdr.cpp +endif + +#mod_cdr_la_CFLAGS += -DSWITCH_QUEUE_ENHANCED +#mod_cdr_la_LDFLAGS += -lcurl + +#Override link target so we can control the output + +$(MODNAME).la: $(mod_cdr_la_OBJECTS) $(mod_cdr_la_DEPENDENCIES) + @echo Creating $(MODNAME).$(DYNAMIC_LIB_EXTEN)... + @$(CXXLINK) -rpath $(moddir) $(mod_cdr_la_LDFLAGS) $(mod_cdr_la_OBJECTS) $(mod_cdr_la_LIBADD) $(LIBS) $(LINK_OUTPUT_REDIR) + +#Override the linstall target so we just install the .so/.dylib + +install-data-am: $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN) + +$(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la + @echo installing $(MODNAME).$(DYNAMIC_LIB_EXTEN) + @if [ -f .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) ] ; then \ + $(LIBTOOL) --mode=install $(INSTALL) .libs/$(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + else \ + $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null ; \ + fi

1 0

[commit] r4748 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Thu Mar 22 23:45:08 2007 New Revision: 4748 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Log: keep odbc from installing every time Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Thu Mar 22 23:45:08 2007 @@ -25,4 +25,4 @@ $(INST_ODBCLA): $(UNINST_ODBCLA) cd $(ODBC_DIR) && $(MAKE) install - + @$(TOUCH_TARGET)

1 0

[commit] r4747 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: anthm Date: Thu Mar 22 23:09:03 2007 New Revision: 4747 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Log: temporary workaround for seg Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c Thu Mar 22 23:09:03 2007 @@ -259,6 +259,10 @@ msg = self->tp_msg; ai = msg_addrinfo(msg); + + if (!ai) + return -1; + from = (su_sockaddr_t *)ai->ai_addr, fromlen = (socklen_t)(ai->ai_addrlen); n = su_vrecv(self->tp_socket, iovec, veclen, 0, from, &fromlen);

1 0

[commit] r4746 - freeswitch/trunk
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Thu Mar 22 20:39:55 2007 New Revision: 4746 Modified: freeswitch/trunk/Makefile.am Log: still trying Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Mar 22 20:39:55 2007 @@ -97,7 +97,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDFLAGS = $(AM_LDFLAGS) +freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool

1 0

[commit] r4745 - freeswitch/trunk
by Freeswitch SVN 23 Mar '07

23 Mar '07

Author: mikej Date: Thu Mar 22 20:31:08 2007 New Revision: 4745 Modified: freeswitch/trunk/Makefile.am Log: still trying Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Mar 22 20:31:08 2007 @@ -97,6 +97,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) +freeswitch_LDFLAGS = $(AM_LDFLAGS) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool

1 0

[commit] r4744 - freeswitch/trunk
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 19:20:23 2007 New Revision: 4744 Modified: freeswitch/trunk/Makefile.am Log: tweak deps Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Mar 22 19:20:23 2007 @@ -93,8 +93,8 @@ CLEANFILES = src/include/switch_version.h BUILT_SOURCES = src/include/switch_version.h -bin_PROGRAMS = freeswitch -freeswitch_SOURCES = src/switch.c +bin_PROGRAMS = freeswitch +freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la @@ -112,11 +112,6 @@ @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \ $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \ fi - @if [ -f .libs/$(NAME) ] ; then \ - $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \ - else \ - $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\ - fi .version: touch .version

1 0

[commit] r4743 - freeswitch/trunk
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 19:04:12 2007 New Revision: 4743 Modified: freeswitch/trunk/Makefile.am Log: tweak deps Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Thu Mar 22 19:04:12 2007 @@ -97,7 +97,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h freeswitch_CFLAGS = $(AM_CFLAGS) -freeswitch_LDADD = ${MOD_LINK} libs/apr/libapr-1.la +freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool

1 0

[commit] r4742 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 18:44:05 2007 New Revision: 4742 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile Log: work around broken libshout not linking -speex when it needs to Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Thu Mar 22 18:44:05 2007 @@ -12,6 +12,8 @@ LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) + +LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o LOCAL_OBJS=$(MP3OBJS)

1 0