retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed check for asterisk 1.6 beta versions and adapted to 

changes in asterisk trunk.
This commit is contained in:
MelwareDE 2008-04-05 20:44:02 +00:00
parent b3932bd8fa
commit c3304ad188
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chan_capi.c
View File

@ -1955,10 +1955,17 @@ static struct ast_channel *capi_new(struct capi_pvt *i, int state)
if (i->doDTMF > 0) {
i->vad = ast_dsp_new();
#ifdef CC_AST_HAS_DSP_SET_DIGITMODE
ast_dsp_set_features(i->vad, DSP_FEATURE_DIGIT_DETECT);
if (i->doDTMF > 1) {
ast_dsp_set_digitmode(i->vad, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_RELAXDTMF);
}
#else
ast_dsp_set_features(i->vad, DSP_FEATURE_DTMF_DETECT);
if (i->doDTMF > 1) {
ast_dsp_digitmode(i->vad, DSP_DIGITMODE_DTMF | DSP_DIGITMODE_RELAXDTMF);
}
#endif
}
CC_CHANNEL_PVT(tmp) = i;

34
create_config.sh
View File

@ -27,6 +27,7 @@ if [ ! -d "$INCLUDEDIR" ]; then
fi
echo -n "Checking Asterisk version... "
AVERSIONNUM=`sed -n '/.*ASTERISK_VERSION_NUM /s/^.*ASTERISK_VERSION_NUM //p' $INCLUDEDIR/version.h`
AVERSION=`sed -n '/.*ASTERISK_VERSION /s/^.*ASTERISK_VERSION //p' $INCLUDEDIR/version.h`
AVERSION=`echo $AVERSION | sed 's/\"//g'`
if [ "$AVERSION" = "" ]; then
@ -43,24 +44,31 @@ echo "#ifndef CHAN_CAPI_CONFIG_H" >>$CONFIGFILE
echo "#define CHAN_CAPI_CONFIG_H" >>$CONFIGFILE
echo >>$CONFIGFILE
if grep -q "ASTERISK_VERSION_NUM .*104" $INCLUDEDIR/version.h; then
echo "#define CC_AST_HAS_VERSION_1_4" >>$CONFIGFILE
echo " * found Asterisk version 1.4"
VER=1_4
else
if grep -q "ASTERISK_VERSION_NUM 99999" $INCLUDEDIR/version.h; then
case "$AVERSIONNUM" in
106*)
echo "#define CC_AST_HAS_VERSION_1_6" >>$CONFIGFILE
echo " * found Asterisk version 1.6"
VER=1_6
;;
104*)
echo "#define CC_AST_HAS_VERSION_1_4" >>$CONFIGFILE
echo " * found Asterisk version 1.4"
VER=1_4
;;
99999)
echo "#define CC_AST_HAS_VERSION_1_4" >>$CONFIGFILE
echo " * assuming Asterisk version 1.4"
VER=1_4
else
;;
*)
if [ "$VER" = "1_6" ]; then
echo "#define CC_AST_HAS_VERSION_1_6" >>$CONFIGFILE
echo " * assuming Asterisk version 1.6"
else
echo "#undef CC_AST_HAS_VERSION_1_4" >>$CONFIGFILE
fi
fi
fi
;;
esac
check_two_and_four()
{
@ -135,6 +143,14 @@ check_version_onesix()
echo "#define CC_AST_HAS_EXT_CHAN_ALLOC" >>$CONFIGFILE
echo "#define CC_AST_HAS_EXT2_CHAN_ALLOC" >>$CONFIGFILE
echo "#define CC_AST_HAS_SEND_DIGIT_END_DURATION" >>$CONFIGFILE
if grep -q "int ast_dsp_set_digitmode" $INCLUDEDIR/dsp.h; then
echo "#define CC_AST_HAS_DSP_SET_DIGITMODE" >>$CONFIGFILE
echo " * found new 'ast_dsp_set_digitmode' function"
else
echo "#undef CC_AST_HAS_DSP_SET_DIGITMODE" >>$CONFIGFILE
echo " * no new 'ast_dsp_set_digitmode' function"
fi
}
case $VER in