Author: sayer
Date: 2008-12-08 20:11:36 +0100 (Mon, 08 Dec 2008)
New Revision: 1184
Modified:
trunk/core/AmDtmfDetector.cpp
trunk/core/AmDtmfDetector.h
Log:
support for older spandsp version (e.g. 0.0.2 from debian etch)
Modified: trunk/core/AmDtmfDetector.cpp
===================================================================
--- trunk/core/AmDtmfDetector.cpp 2008-12-08 18:37:29 UTC (rev 1183)
+++ trunk/core/AmDtmfDetector.cpp 2008-12-08 19:11:36 UTC (rev 1184)
@@ -651,10 +651,17 @@
return size;
}
+#ifndef HAVE_OLD_SPANDSP_CALLBACK
void AmSpanDSPInbandDtmfDetector::tone_report_func(void *user_data, int code,
int level, int delay) {
AmSpanDSPInbandDtmfDetector* o = (AmSpanDSPInbandDtmfDetector*)user_data;
o->tone_report_f(code, level, delay);
}
+#else
+void AmSpanDSPInbandDtmfDetector::tone_report_func(void *user_data, int code) {
+ AmSpanDSPInbandDtmfDetector* o = (AmSpanDSPInbandDtmfDetector*)user_data;
+ o->tone_report_f(code, 0, 0);
+}
+#endif
void AmSpanDSPInbandDtmfDetector::tone_report_f(int code, int level, int
delay) {
// DBG("spandsp reports tone %c, %d, %d\n", code, level, delay);
Modified: trunk/core/AmDtmfDetector.h
===================================================================
--- trunk/core/AmDtmfDetector.h 2008-12-08 18:37:29 UTC (rev 1183)
+++ trunk/core/AmDtmfDetector.h 2008-12-08 19:11:36 UTC (rev 1184)
@@ -269,7 +269,12 @@
int m_lastCode;
dtmf_rx_state_t rx_state;
- static void tone_report_func(void *user_data, int code, int level, int
delay);
+ static void tone_report_func(void *user_data, int code
+#ifndef HAVE_OLD_SPANDSP_CALLBACK
+ , int level, int delay
+#endif
+ );
+
void tone_report_f(int code, int level, int delay);
int char2int(char code);
/* static void dtmf_rx_callback(void* user_data, const char* digits, int
len); */
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
