[asterisk-commits] murf: branch murf/utf8-whatif r95938 - in /team/murf/utf8-whatif: ./ apps/ ch...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jan 2 13:46:47 CST 2008
Author: murf
Date: Wed Jan 2 13:46:47 2008
New Revision: 95938
URL: http://svn.digium.com/view/asterisk?view=rev&rev=95938
Log:
Merged revisions 95864,95888,95891,95893-95894,95937 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r95864 | russell | 2008-01-02 09:20:26 -0700 (Wed, 02 Jan 2008) | 6 lines
For some odd reason, the last set of libresample build changes from Kevin did
not work for everyone, but it did for some. This set of changes makes trunk
start again for those having problems. Instead of building libresample as a
static library, it just links the object files in directly with the asterisk
binary.
................
r95888 | qwell | 2008-01-02 10:38:02 -0700 (Wed, 02 Jan 2008) | 4 lines
Update osplookup documentation to use commas instead of pipes.
Closes issue #11666, patch by Laureano.
................
r95891 | mmichelson | 2008-01-02 11:05:57 -0700 (Wed, 02 Jan 2008) | 17 lines
Merged revisions 95890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r95890 | mmichelson | 2008-01-02 11:51:22 -0600 (Wed, 02 Jan 2008) | 9 lines
A change to improve the accuracy of queue logging in the case where a member does not
answer during the specified timeout period. Prior to this change, there was a small chance
that the member name recorded in this case would be blank. Also prior to this change, if using
the ringall strategy, if no one answered the call during the specified timeout, the member name
listed in the queue log would randomly be one of the members that was rung.
(closes issue #11498, reported and tested by hloubser, patched by me)
........
................
r95893 | kpfleming | 2008-01-02 11:17:15 -0700 (Wed, 02 Jan 2008) | 2 lines
umm... this did not compile on x86-64, and could not possibly have worked on any platform as it was passing string pointers to a function expecting ints
................
r95894 | kpfleming | 2008-01-02 11:21:04 -0700 (Wed, 02 Jan 2008) | 2 lines
and now just to keep the libresample party going... if the functions from libresample are going to be in the main Asterisk binary, it makes sense for the header that defines them to be available without any special CFLAGS and to out-of-tree modules building against /usr/include/asterisk
................
r95937 | kpfleming | 2008-01-02 12:34:33 -0700 (Wed, 02 Jan 2008) | 4 lines
improve AC_C_DEFINE_CHECK to not try to evaluate the macro being checked for, but just check for its existence
finish implementation of check for Zaptel HWGAIN support
add check for Zaptel ECHOCANCEL_PARAMS support
................
Added:
team/murf/utf8-whatif/include/asterisk/libresample.h
- copied unchanged from r95937, trunk/include/asterisk/libresample.h
Modified:
team/murf/utf8-whatif/ (props changed)
team/murf/utf8-whatif/acinclude.m4
team/murf/utf8-whatif/apps/app_osplookup.c
team/murf/utf8-whatif/apps/app_queue.c
team/murf/utf8-whatif/channels/chan_zap.c
team/murf/utf8-whatif/codecs/Makefile
team/murf/utf8-whatif/codecs/codec_resample.c
team/murf/utf8-whatif/configure
team/murf/utf8-whatif/configure.ac
team/murf/utf8-whatif/include/asterisk/autoconfig.h.in
team/murf/utf8-whatif/main/Makefile
team/murf/utf8-whatif/main/translate.c
Propchange: team/murf/utf8-whatif/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/murf/utf8-whatif/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 2 13:46:47 2008
@@ -1,1 +1,1 @@
-/trunk:1-95853
+/trunk:1-95937
Modified: team/murf/utf8-whatif/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/acinclude.m4?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/acinclude.m4 (original)
+++ team/murf/utf8-whatif/acinclude.m4 Wed Jan 2 13:46:47 2008
@@ -100,7 +100,14 @@
CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_COMPILE_IFELSE(
- [ AC_LANG_PROGRAM( [#include <$3>], [int foo = $2;]) ],
+ [ AC_LANG_PROGRAM( [#include <$3>],
+ [#if defined($2)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+ ])],
[ AC_MSG_RESULT(yes)
PBX_$1=1
AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 headers.])
Modified: team/murf/utf8-whatif/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/apps/app_osplookup.c?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/apps/app_osplookup.c (original)
+++ team/murf/utf8-whatif/apps/app_osplookup.c Wed Jan 2 13:46:47 2008
@@ -1938,7 +1938,7 @@
static const char* app1= "OSPAuth";
static const char* synopsis1 = "OSP authentication";
static const char* descrip1 =
-" OSPAuth([provider[|options]]): Authenticate a SIP INVITE by OSP and sets\n"
+" OSPAuth([provider[,options]]): Authenticate a SIP INVITE by OSP and sets\n"
"the variables:\n"
" ${OSPINHANDLE}: The inbound call transaction handle\n"
" ${OSPINTIMELIMIT}: The inbound call duration limit in seconds\n"
@@ -1950,7 +1950,7 @@
static const char* app2= "OSPLookup";
static const char* synopsis2 = "Lookup destination by OSP";
static const char* descrip2 =
-" OSPLookup(exten[|provider[|options]]): Looks up an extension via OSP and sets\n"
+" OSPLookup(exten[,provider[,options]]): Looks up an extension via OSP and sets\n"
"the variables, where 'n' is the number of the result beginning with 1:\n"
" ${OSPOUTHANDLE}: The OSP Handle for anything remaining\n"
" ${OSPTECH}: The technology to use for the call\n"
@@ -1975,7 +1975,7 @@
static const char* app3 = "OSPNext";
static const char* synopsis3 = "Lookup next destination by OSP";
static const char* descrip3 =
-" OSPNext(cause[|provider[|options]]): Looks up the next OSP Destination for ${OSPOUTHANDLE}\n"
+" OSPNext(cause[,provider[,options]]): Looks up the next OSP Destination for ${OSPOUTHANDLE}\n"
"See OSPLookup for more information\n"
"\n"
"This application sets the following channel variable upon completion:\n"
@@ -1985,7 +1985,7 @@
static const char* app4 = "OSPFinish";
static const char* synopsis4 = "Record OSP entry";
static const char* descrip4 =
-" OSPFinish([status[|options]]): Records call state for ${OSPINHANDLE}, according to\n"
+" OSPFinish([status[,options]]): Records call state for ${OSPINHANDLE}, according to\n"
"status, which should be one of BUSY, CONGESTION, ANSWER, NOANSWER, or CHANUNAVAIL\n"
"or coincidentally, just what the Dial application stores in its ${DIALSTATUS}.\n"
"\n"
Modified: team/murf/utf8-whatif/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/apps/app_queue.c?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/apps/app_queue.c (original)
+++ team/murf/utf8-whatif/apps/app_queue.c Wed Jan 2 13:46:47 2008
@@ -300,10 +300,18 @@
/*! \brief We define a custom "local user" structure because we
use it not only for keeping track of what is in use but
- also for keeping track of who we're dialing. */
+ also for keeping track of who we're dialing.
+
+ There are two "links" defined in this structure, q_next and call_next.
+ q_next links ALL defined callattempt structures into a linked list. call_next is
+ a link which allows for a subset of the callattempts to be traversed. This subset
+ is used in wait_for_answer so that irrelevant callattempts are not traversed. This
+ also is helpful so that queue logs are always accurate in the case where a call to
+ a member times out, especially if using the ringall strategy. */
struct callattempt {
struct callattempt *q_next;
+ struct callattempt *call_next;
struct ast_channel *chan;
char interface[256];
int stillgoing;
@@ -2303,7 +2311,7 @@
static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed)
{
const char *queue = qe->parent->name;
- struct callattempt *o;
+ struct callattempt *o, *start = NULL, *prev = NULL;
int status;
int numbusies = prebusies;
int numnochan = 0;
@@ -2333,14 +2341,21 @@
int numlines, retry, pos = 1;
struct ast_channel *watchers[AST_MAX_WATCHERS];
watchers[0] = in;
+ start = NULL;
for (retry = 0; retry < 2; retry++) {
numlines = 0;
for (o = outgoing; o; o = o->q_next) { /* Keep track of important channels */
if (o->stillgoing) { /* Keep track of important channels */
stillgoing = 1;
- if (o->chan)
+ if (o->chan) {
watchers[pos++] = o->chan;
+ if (!start)
+ start = o;
+ else
+ prev->call_next = o;
+ prev = o;
+ }
}
numlines++;
}
@@ -2362,7 +2377,7 @@
return NULL;
}
winner = ast_waitfor_n(watchers, pos, to);
- for (o = outgoing; o; o = o->q_next) {
+ for (o = start; o; o = o->call_next) {
if (o->stillgoing && (o->chan) && (o->chan->_state == AST_STATE_UP)) {
if (!peer) {
ast_verb(3, "%s answered %s\n", o->chan->name, in->name);
@@ -2524,8 +2539,10 @@
}
ast_frfree(f);
}
- if (!*to)
- rna(orig, qe, on, membername);
+ if (!*to) {
+ for (o = start; o; o = o->call_next)
+ rna(orig, qe, o->interface, o->member->membername);
+ }
}
#ifdef HAVE_EPOLL
Modified: team/murf/utf8-whatif/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/channels/chan_zap.c?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/channels/chan_zap.c (original)
+++ team/murf/utf8-whatif/channels/chan_zap.c Wed Jan 2 13:46:47 2008
@@ -2437,8 +2437,10 @@
call_ref_id = pbx_builtin_getvar_helper(ast, "SS7_CALLREF_IDENT");
call_ref_pc = pbx_builtin_getvar_helper(ast, "SS7_CALLREF_PC");
- if (call_ref_id)
- isup_set_callref(p->ss7call, (unsigned int) call_ref_id, (unsigned int) call_ref_pc);
+ if (call_ref_id) {
+ isup_set_callref(p->ss7call, atoi(call_ref_id),
+ call_ref_pc ? atoi(call_ref_pc) : 0);
+ }
isup_iam(p->ss7->ss7, p->ss7call);
ast_setstate(ast, AST_STATE_DIALING);
Modified: team/murf/utf8-whatif/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/codecs/Makefile?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/codecs/Makefile (original)
+++ team/murf/utf8-whatif/codecs/Makefile Wed Jan 2 13:46:47 2008
@@ -54,5 +54,3 @@
@$(MAKE) -C g722 all
$(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
-
-codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
Modified: team/murf/utf8-whatif/codecs/codec_resample.c
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/codecs/codec_resample.c?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/codecs/codec_resample.c (original)
+++ team/murf/utf8-whatif/codecs/codec_resample.c Wed Jan 2 13:46:47 2008
@@ -39,8 +39,7 @@
#include "asterisk/module.h"
#include "asterisk/translate.h"
-
-#include "libresample.h"
+#include "asterisk/libresample.h"
#include "slin_resample_ex.h"
Modified: team/murf/utf8-whatif/configure
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/configure?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/configure (original)
+++ team/murf/utf8-whatif/configure Wed Jan 2 13:46:47 2008
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 95624 .
+# From configure.ac Revision: 95817 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@@ -924,6 +924,14 @@
ZAPTEL_VLDTMF_INCLUDE
ZAPTEL_VLDTMF_DIR
PBX_ZAPTEL_VLDTMF
+ZAPTEL_HWGAIN_LIB
+ZAPTEL_HWGAIN_INCLUDE
+ZAPTEL_HWGAIN_DIR
+PBX_ZAPTEL_HWGAIN
+ZAPTEL_ECHOCANPARAMS_LIB
+ZAPTEL_ECHOCANPARAMS_INCLUDE
+ZAPTEL_ECHOCANPARAMS_DIR
+PBX_ZAPTEL_ECHOCANPARAMS
SDL_LIB
SDL_INCLUDE
SDL_DIR
@@ -1614,9 +1622,14 @@
--with-z=PATH use zlib files in PATH
--with-zaptel=PATH use Zaptel files in PATH
--with-zaptel_transcode=PATH
- use Zaptel_transcode files in PATH
+ use Zaptel Transcoder Support files in PATH
--with-zaptel_vldtmf=PATH
- use Zaptel_vldtmf files in PATH
+ use Zaptel VLDTMF Support files in PATH
+ --with-zaptel_hwgain=PATH
+ use Zaptel Hardware Gain Support files in PATH
+ --with-zaptel_echocanparams=PATH
+ use Zaptel Echo Canceler Parameter Support files in
+ PATH
--with-sdl=PATH use Sdl files in PATH
--with-SDL_image=PATH use Sdl Image library files in PATH
--with-avcodec=PATH use Ffmpeg and avcodec library files in PATH
@@ -9251,7 +9264,7 @@
- ZAPTEL_TRANSCODE_DESCRIP="Zaptel_transcode"
+ ZAPTEL_TRANSCODE_DESCRIP="Zaptel Transcoder Support"
ZAPTEL_TRANSCODE_OPTION="zaptel_transcode"
# Check whether --with-zaptel_transcode was given.
@@ -9279,7 +9292,7 @@
- ZAPTEL_VLDTMF_DESCRIP="Zaptel_vldtmf"
+ ZAPTEL_VLDTMF_DESCRIP="Zaptel VLDTMF Support"
ZAPTEL_VLDTMF_OPTION="zaptel_vldtmf"
# Check whether --with-zaptel_vldtmf was given.
@@ -9301,6 +9314,62 @@
fi
PBX_ZAPTEL_VLDTMF=0
+
+
+
+
+
+
+ ZAPTEL_HWGAIN_DESCRIP="Zaptel Hardware Gain Support"
+ ZAPTEL_HWGAIN_OPTION="zaptel_hwgain"
+
+# Check whether --with-zaptel_hwgain was given.
+if test "${with_zaptel_hwgain+set}" = set; then
+ withval=$with_zaptel_hwgain;
+ case ${withval} in
+ n|no)
+ USE_ZAPTEL_HWGAIN=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL_HWGAIN"
+ ;;
+ *)
+ ZAPTEL_HWGAIN_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL_HWGAIN"
+ ;;
+ esac
+
+fi
+
+ PBX_ZAPTEL_HWGAIN=0
+
+
+
+
+
+
+ ZAPTEL_ECHOCANPARAMS_DESCRIP="Zaptel Echo Canceler Parameter Support"
+ ZAPTEL_ECHOCANPARAMS_OPTION="zaptel_echocanparams"
+
+# Check whether --with-zaptel_echocanparams was given.
+if test "${with_zaptel_echocanparams+set}" = set; then
+ withval=$with_zaptel_echocanparams;
+ case ${withval} in
+ n|no)
+ USE_ZAPTEL_ECHOCANPARAMS=no
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL_ECHOCANPARAMS"
+ ;;
+ *)
+ ZAPTEL_ECHOCANPARAMS_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} ZAPTEL_ECHOCANPARAMS"
+ ;;
+ esac
+
+fi
+
+ PBX_ZAPTEL_ECHOCANPARAMS=0
@@ -16600,7 +16669,13 @@
int
main ()
{
-int foo = PTHREAD_RWLOCK_INITIALIZER;
+#if defined(PTHREAD_RWLOCK_INITIALIZER)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -16669,7 +16744,13 @@
int
main ()
{
-int foo = PTHREAD_RWLOCK_PREFER_WRITER_NP;
+#if defined(PTHREAD_RWLOCK_PREFER_WRITER_NP)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -16738,7 +16819,13 @@
int
main ()
{
-int foo = PTHREAD_MUTEX_RECURSIVE_NP;
+#if defined(PTHREAD_MUTEX_RECURSIVE_NP)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -16807,7 +16894,13 @@
int
main ()
{
-int foo = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -17585,7 +17678,13 @@
int
main ()
{
-int foo = RTLD_NOLOAD;
+#if defined(RTLD_NOLOAD)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -17655,7 +17754,13 @@
int
main ()
{
-int foo = IP_MTU_DISCOVER;
+#if defined(IP_MTU_DISCOVER)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -33803,7 +33908,13 @@
int
main ()
{
-int foo = Fac_RESULT;
+#if defined(Fac_RESULT)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -33872,7 +33983,13 @@
int
main ()
{
-int foo = Fac_ERROR;
+#if defined(Fac_ERROR)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -44557,7 +44674,13 @@
int
main ()
{
-int foo = ZT_TONE_DTMF_BASE;
+#if defined(ZT_TONE_DTMF_BASE)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -44626,7 +44749,13 @@
int
main ()
{
-int foo = ZT_DIAL_OP_CANCEL;
+#if defined(ZT_DIAL_OP_CANCEL)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -44697,7 +44826,13 @@
int
main ()
{
-int foo = ZT_EVENT_REMOVED;
+#if defined(ZT_EVENT_REMOVED)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -44747,7 +44882,84 @@
fi
-# Check for transcode support
+# Check for echo canceler parameters support
+
+ if test "x${PBX_ZAPTEL_ECHOCANPARAMS}" != "x1" -a "${USE_ZAPTEL_ECHOCANPARAMS}" != "no"; then
+ { echo "$as_me:$LINENO: checking for ZT_ECHOCANCEL_PARAMS in zaptel/zaptel.h" >&5
+echo $ECHO_N "checking for ZT_ECHOCANCEL_PARAMS in zaptel/zaptel.h... $ECHO_C" >&6; }
+ saved_cppflags="${CPPFLAGS}"
+ if test "x${ZAPTEL_ECHOCANPARAMS_DIR}" != "x"; then
+ ZAPTEL_ECHOCANPARAMS_INCLUDE="-I${ZAPTEL_ECHOCANPARAMS_DIR}/include"
+ fi
+ CPPFLAGS="${CPPFLAGS} ${ZAPTEL_ECHOCANPARAMS_INCLUDE}"
+
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <zaptel/zaptel.h>
+int
+main ()
+{
+#if defined(ZT_ECHOCANCEL_PARAMS)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ PBX_ZAPTEL_ECHOCANPARAMS=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL_ECHOCANPARAMS 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL_ECHOCANPARAMS_VERSION
+_ACEOF
+
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ CPPFLAGS="${saved_cppflags}"
+ fi
+
+
+# Check for transcoder support
if test "x${PBX_ZAPTEL_TRANSCODE}" != "x1" -a "${USE_ZAPTEL_TRANSCODE}" != "no"; then
{ echo "$as_me:$LINENO: checking for ZT_TCOP_ALLOCATE in zaptel/zaptel.h" >&5
@@ -44768,7 +44980,13 @@
int
main ()
{
-int foo = ZT_TCOP_ALLOCATE;
+#if defined(ZT_TCOP_ALLOCATE)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -44839,7 +45057,13 @@
int
main ()
{
-int foo = ZT_SET_HWGAIN;
+#if defined(ZT_SET_HWGAIN)
+ int foo = 0;
+ #else
+ int foo = bar;
+ #endif
+ 0
+
;
return 0;
}
@@ -49072,6 +49296,14 @@
ZAPTEL_VLDTMF_INCLUDE!$ZAPTEL_VLDTMF_INCLUDE$ac_delim
ZAPTEL_VLDTMF_DIR!$ZAPTEL_VLDTMF_DIR$ac_delim
PBX_ZAPTEL_VLDTMF!$PBX_ZAPTEL_VLDTMF$ac_delim
+ZAPTEL_HWGAIN_LIB!$ZAPTEL_HWGAIN_LIB$ac_delim
+ZAPTEL_HWGAIN_INCLUDE!$ZAPTEL_HWGAIN_INCLUDE$ac_delim
+ZAPTEL_HWGAIN_DIR!$ZAPTEL_HWGAIN_DIR$ac_delim
+PBX_ZAPTEL_HWGAIN!$PBX_ZAPTEL_HWGAIN$ac_delim
+ZAPTEL_ECHOCANPARAMS_LIB!$ZAPTEL_ECHOCANPARAMS_LIB$ac_delim
+ZAPTEL_ECHOCANPARAMS_INCLUDE!$ZAPTEL_ECHOCANPARAMS_INCLUDE$ac_delim
+ZAPTEL_ECHOCANPARAMS_DIR!$ZAPTEL_ECHOCANPARAMS_DIR$ac_delim
+PBX_ZAPTEL_ECHOCANPARAMS!$PBX_ZAPTEL_ECHOCANPARAMS$ac_delim
SDL_LIB!$SDL_LIB$ac_delim
SDL_INCLUDE!$SDL_INCLUDE$ac_delim
SDL_DIR!$SDL_DIR$ac_delim
@@ -49117,7 +49349,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: team/murf/utf8-whatif/configure.ac
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/configure.ac?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/configure.ac (original)
+++ team/murf/utf8-whatif/configure.ac Wed Jan 2 13:46:47 2008
@@ -250,8 +250,10 @@
AST_EXT_LIB_SETUP([X11], [X11 support], [x11])
AST_EXT_LIB_SETUP([ZLIB], [zlib], [z])
AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel])
-AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel_transcode], [zaptel_transcode])
-AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel_vldtmf], [zaptel_vldtmf])
+AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel Transcoder Support], [zaptel_transcode])
+AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel VLDTMF Support], [zaptel_vldtmf])
+AST_EXT_LIB_SETUP([ZAPTEL_HWGAIN], [Zaptel Hardware Gain Support], [zaptel_hwgain])
+AST_EXT_LIB_SETUP([ZAPTEL_ECHOCANPARAMS], [Zaptel Echo Canceler Parameter Support], [zaptel_echocanparams])
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
@@ -1143,7 +1145,10 @@
# Check for VLDTMF support
AST_C_DEFINE_CHECK([ZAPTEL_VLDTMF], [ZT_EVENT_REMOVED], [zaptel/zaptel.h])
-# Check for transcode support
+# Check for echo canceler parameters support
+AST_C_DEFINE_CHECK([ZAPTEL_ECHOCANPARAMS], [ZT_ECHOCANCEL_PARAMS], [zaptel/zaptel.h])
+
+# Check for transcoder support
AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h])
# Check for Zaptel hwgain support
Modified: team/murf/utf8-whatif/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/include/asterisk/autoconfig.h.in?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/include/asterisk/autoconfig.h.in (original)
+++ team/murf/utf8-whatif/include/asterisk/autoconfig.h.in Wed Jan 2 13:46:47 2008
@@ -1011,6 +1011,12 @@
/* Define this to indicate the ${ZAPTEL_DESCRIP} library */
#undef HAVE_ZAPTEL
+
+/* Define if your system has the ZAPTEL_ECHOCANPARAMS headers. */
+#undef HAVE_ZAPTEL_ECHOCANPARAMS
+
+/* Define ZAPTEL_ECHOCANPARAMS headers version */
+#undef HAVE_ZAPTEL_ECHOCANPARAMS_VERSION
/* Define if your system has the ZAPTEL_HWGAIN headers. */
#undef HAVE_ZAPTEL_HWGAIN
Modified: team/murf/utf8-whatif/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/main/Makefile?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/main/Makefile (original)
+++ team/murf/utf8-whatif/main/Makefile Wed Jan 2 13:46:47 2008
@@ -17,6 +17,8 @@
include $(ASTTOPDIR)/Makefile.moddir_rules
+RESAMPLE_OBJS:=libresample/src/resample.o libresample/src/resamplesubs.o libresample/src/filterkit.o
+
OBJS= io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
@@ -27,7 +29,7 @@
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
strcompat.o threadstorage.o dial.o event.o adsistub.o audiohook.o \
- astobj2.o hashtab.o global_datastores.o unicode.o
+ astobj2.o hashtab.o global_datastores.o unicode.o $(RESAMPLE_OBJS)
# we need to link in the objects statically, not as a library, because
# otherwise modules will not have them available if none of the static
@@ -111,9 +113,6 @@
db1-ast/libdb1.a: CHECK_SUBDIR
CFLAGS="$(ASTCFLAGS)" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
-libresample/libresample.a: CHECK_SUBDIR
- $(MAKE) -f Makefile.asterisk -C libresample libresample.a
-
ast_expr2.c ast_expr2.h:
bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
@@ -129,8 +128,6 @@
rm ast_expr2.o ast_expr2f.o
channel.o: ASTCFLAGS+=$(ZAPTEL_INCLUDE)
-
-translate.o: ASTCFLAGS+=-Ilibresample/include
AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED_LDFLAGS),$(value $(dep)))
@@ -157,7 +154,7 @@
MAIN_TGT:=asterisk
endif
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS) libresample/libresample.a
+$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a minimime/libmmime.a $(AST_EMBED_LDSCRIPTS)
@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
@@ -174,4 +171,4 @@
@$(MAKE) -C db1-ast clean
@$(MAKE) -C stdtime clean
@$(MAKE) -C minimime clean
- @$(MAKE) -f Makefile.asterisk -C libresample clean
+ rm -f libresample/src/*.o
Modified: team/murf/utf8-whatif/main/translate.c
URL: http://svn.digium.com/view/asterisk/team/murf/utf8-whatif/main/translate.c?view=diff&rev=95938&r1=95937&r2=95938
==============================================================================
--- team/murf/utf8-whatif/main/translate.c (original)
+++ team/murf/utf8-whatif/main/translate.c Wed Jan 2 13:46:47 2008
@@ -39,13 +39,7 @@
#include "asterisk/cli.h"
#include "asterisk/term.h"
-#include "libresample.h"
-
#define MAX_RECALC 1000 /* max sample recalc */
-
-/* hack to ensure that the libresample code gets linked in */
-
-static attribute_unused void (*resample_hack)(void *) = resample_close;
/*! \brief the list of translators */
static AST_RWLIST_HEAD_STATIC(translators, ast_translator);
More information about the asterisk-commits
mailing list