From ede1f7189f5e24d2f7486ed6a54eecd314be30d8 Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Mon, 5 Feb 2007 15:03:26 +0000
Subject: [PATCH] disabled DTMF detection where its not needed

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@207 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/Makefile                               | 2 ++
 apps/ann_b2b/AnnounceB2B.cpp                | 2 ++
 apps/announce_auth/AnnounceAuth.cpp         | 3 +++
 apps/announce_transfer/AnnounceTransfer.cpp | 3 +++
 apps/early_announce/EarlyAnnounce.cpp       | 3 +++
 apps/voicemail/AnswerMachine.cpp            | 3 +++
 6 files changed, 16 insertions(+)

diff --git a/apps/Makefile b/apps/Makefile
index bbc849e3..ae050005 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,4 +1,6 @@
 COREPATH ?= ../core
+.DEFAULT_GOAL := all
+
 include $(COREPATH)/../Makefile.defs
 
 exclude_modules = mp3 announce_auth
diff --git a/apps/ann_b2b/AnnounceB2B.cpp b/apps/ann_b2b/AnnounceB2B.cpp
index b80f6e8b..3904387d 100644
--- a/apps/ann_b2b/AnnounceB2B.cpp
+++ b/apps/ann_b2b/AnnounceB2B.cpp
@@ -103,6 +103,8 @@ AnnounceCallerDialog::AnnounceCallerDialog(const string& filename)
 
 void AnnounceCallerDialog::onSessionStart(const AmSipRequest& req)
 {
+    setDtmfDetectionEnabled(false);
+
     callee_addr = req.to;
     callee_uri  = req.r_uri;
 
diff --git a/apps/announce_auth/AnnounceAuth.cpp b/apps/announce_auth/AnnounceAuth.cpp
index 2d3a77e0..5764d1ca 100644
--- a/apps/announce_auth/AnnounceAuth.cpp
+++ b/apps/announce_auth/AnnounceAuth.cpp
@@ -154,6 +154,9 @@ void AnnounceAuthDialog::onSessionStart(const AmSipReply& rep)
 }
 
 void AnnounceAuthDialog::startSession(){
+    // disable DTMF detection - don't use DTMF here
+    setDtmfDetectionEnabled(false);
+
     if(wav_file.open(filename,AmAudioFile::Read))
 	throw string("AnnounceAuthDialog::onSessionStart: Cannot open file\n");
     
diff --git a/apps/announce_transfer/AnnounceTransfer.cpp b/apps/announce_transfer/AnnounceTransfer.cpp
index 39fde6f0..cab059d2 100644
--- a/apps/announce_transfer/AnnounceTransfer.cpp
+++ b/apps/announce_transfer/AnnounceTransfer.cpp
@@ -103,6 +103,9 @@ AnnounceTransferDialog::~AnnounceTransferDialog()
 
 void AnnounceTransferDialog::onSessionStart(const AmSipRequest& req)
 {
+	// disable DTMF detection - don't use DTMF here
+	setDtmfDetectionEnabled(false);
+
 	DBG("AnnounceTransferDialog::onSessionStart\n");
 	if (status == Disconnected) {
 		status = Announcing;
diff --git a/apps/early_announce/EarlyAnnounce.cpp b/apps/early_announce/EarlyAnnounce.cpp
index 2942cc03..7494a27f 100644
--- a/apps/early_announce/EarlyAnnounce.cpp
+++ b/apps/early_announce/EarlyAnnounce.cpp
@@ -129,6 +129,9 @@ EarlyAnnounceDialog::~EarlyAnnounceDialog()
 
 void EarlyAnnounceDialog::onSessionStart(const AmSipRequest& req)
 {
+    // disable DTMF detection - don't use DTMF here
+    setDtmfDetectionEnabled(false);
+
     DBG("EarlyAnnounceDialog::onSessionStart\n");
     if(wav_file.open(filename,AmAudioFile::Read))
 	throw string("EarlyAnnounceDialog::onSessionStart: Cannot open file\n");
diff --git a/apps/voicemail/AnswerMachine.cpp b/apps/voicemail/AnswerMachine.cpp
index fabd4bc1..322982a8 100644
--- a/apps/voicemail/AnswerMachine.cpp
+++ b/apps/voicemail/AnswerMachine.cpp
@@ -287,6 +287,9 @@ void AnswerMachineDialog::process(AmEvent* event)
 
 void AnswerMachineDialog::onSessionStart(const AmSipRequest& req)
 {
+    // disable DTMF detection - don't use DTMF here
+    setDtmfDetectionEnabled(false);
+
     if(a_greeting.open(announce_file.c_str(),AmAudioFile::Read) ||
        a_beep.open(add2path(AnswerMachineFactory::AnnouncePath,1, "beep.wav"),AmAudioFile::Read))
 	throw string("AnswerMachine: could not open annoucement files\n");