From 11b3b4996036ece6396413b6865fd5ba953ccd58 Mon Sep 17 00:00:00 2001 From: pcadach Date: Sun, 24 Sep 2006 18:53:44 +0000 Subject: DTMF mode is bitmask, not valued field git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43574 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/h323/ast_h323.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'channels/h323') diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index 63b1f1859..cc0211974 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -1204,7 +1204,7 @@ void MyH323Connection::SendUserInputTone(char tone, unsigned duration, unsigned void MyH323Connection::OnUserInputTone(char tone, unsigned duration, unsigned logicalChannel, unsigned rtpTimestamp) { - if (dtmfMode == H323_DTMF_RFC2833) { + if ((dtmfMode & H323_DTMF_RFC2833)) { if (h323debug) { cout << "\t-- Received user input tone (" << tone << ") from remote" << endl; } @@ -1299,7 +1299,7 @@ BOOL MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCa if (cap != NULL) { RTP_DataFrame::PayloadTypes pt = ((H323_UserInputCapability*)cap)->GetPayloadType(); on_set_rfc2833_payload(GetCallReference(), (const char *)GetCallToken(), (int)pt); - if ((dtmfMode == H323_DTMF_RFC2833) && (sendUserInputMode == SendUserInputAsTone)) + if ((dtmfMode & H323_DTMF_RFC2833) && (sendUserInputMode == SendUserInputAsTone)) sendUserInputMode = SendUserInputAsInlineRFC2833; if (h323debug) { cout << "\t-- Inbound RFC2833 on payload " << pt << endl; @@ -1514,7 +1514,7 @@ void MyH323Connection::SetCapabilities(int cap, int dtmf_mode, void *_prefs, int lastcap++; dtmfMode = dtmf_mode; - if (dtmf_mode == H323_DTMF_INBAND) { + if ((dtmfMode & H323_DTMF_INBAND)) { localCapabilities.SetCapability(0, lastcap, new H323_UserInputCapability(H323_UserInputCapability::BasicString)); sendUserInputMode = SendUserInputAsString; } else { -- cgit v1.2.3