diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-24 18:53:44 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-24 18:53:44 +0000 |
| commit | 11b3b4996036ece6396413b6865fd5ba953ccd58 (patch) | |
| tree | 212ac94a592e8652a148ec7d6e4e0ff9a52cfca7 /channels/h323 | |
| parent | 7415f890e307692d37a553fb35c86eed38c42fb4 (diff) | |
DTMF mode is bitmask, not valued field
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43574 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
| -rw-r--r-- | channels/h323/ast_h323.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 { |