diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-17 02:04:30 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2005-12-17 02:04:30 +0000 |
| commit | 51be44f5b34ffe5032414266787aca1aa8213316 (patch) | |
| tree | 55ab2c637dfc5ed17fbd0b48c512de387b2041e0 /zaptel.h | |
| parent | 5c705fd2ffc223e3557a4e959b3db941422b3017 (diff) | |
Merged revisions 865 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r865 | kpfleming | 2005-12-16 20:04:05 -0600 (Fri, 16 Dec 2005) | 3 lines
add version and echo canceller selection reporting when zaptel module is loaded
make 'update' target work like the Asterisk one and report conflicts
........
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@866 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'zaptel.h')
| -rw-r--r-- | zaptel.h | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -151,21 +151,34 @@ #define RING_DEBOUNCE_TIME 2000 /* 2000 ms ring debounce time */ +#ifdef AGGRESSIVE_SUPPRESSOR +#define ZAPTEL_ECHO_AGGRESSIVE " (aggressive)" +#else +#define ZAPTEL_ECHO_AGGRESSIVE +#endif + #ifdef __KERNEL__ /* Echo cancellation */ #if defined(ECHO_CAN_STEVE) +#define ZAPTEL_ECHO_CANCELLER "STEVE" #include "sec.h" #elif defined(ECHO_CAN_STEVE2) +#define ZAPTEL_ECHO_CANCELLER "STEVE2" #include "sec-2.h" #elif defined(ECHO_CAN_MARK) +#define ZAPTEL_ECHO_CANCELLER "MARK" #include "mec.h" #elif defined(ECHO_CAN_MARK2) +#define ZAPTEL_ECHO_CANCELLER "MARK2" #include "mec2.h" #elif defined(ECHO_CAN_KB1) +#define ZAPTEL_ECHO_CANCELLER "KB1" #include "kb1ec.h" #elif defined(ECHO_CAN_MG2) +#define ZAPTEL_ECHO_CANCELLER "MG2" #include "mg2ec.h" #else +#define ZAPTEL_ECHO_CANCELLER "MARK3" #include "mec3.h" #endif #endif |