From d60a972738d6c7cf281af70346c8042c0002484d Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Wed, 13 Sep 2006 15:00:13 +0000 Subject: [PATCH] * status returns to normal after dialout completed (new dialout possible) * dead call (e.g. unavaliable) can be dropped with '#' git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@76 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/conference/Conference.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/conference/Conference.cpp b/apps/conference/Conference.cpp index ab423d07..f4e7d74f 100644 --- a/apps/conference/Conference.cpp +++ b/apps/conference/Conference.cpp @@ -269,10 +269,9 @@ string dtmf2str(int event) } } - void ConferenceDialog::onDtmf(int event, int duration) { - DBG("ConferenceDialog::onDtmf\n"); + DBG("ConferenceDialog::onDtmf, state = %d\n", state); if(dialedout) return; @@ -319,12 +318,20 @@ void ConferenceDialog::onDtmf(int event, int duration) getLocalTag())); connectMainChannel(); + state = CS_normal; + + } else if(event == 11){ // '#' + + disconnectDialout(); + state = CS_normal; } break; case CS_dialed_out: if(event == 11){ // '#' + disconnectDialout(); + state = CS_normal; } break; @@ -385,7 +392,6 @@ void ConferenceDialog::disconnectDialout() ->postEvent(dialout_id, new DialoutConfEvent(DoConfDisconnect, getLocalTag())); - connectMainChannel(); } }