diff --git a/src/channel.cpp b/src/channel.cpp index 92938102..3db4807d 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -345,13 +345,9 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor // only the server shall act on network transport properties message if ( bIsServer ) { -// #### COMPATIBILITY OLD VERSION, TO BE REMOVED #### - // if old CELT codec is used, inform the client that the new OPUS codec - // is required since we refuse the complete network transport properties - // if the audio coding type is set to CELT + // OPUS codec is the only supported codec right now if ( NetworkTransportProps.eAudioCodingType != CT_OPUS ) { - Protocol.CreateOpusSupportedMes(); return; } @@ -361,8 +357,7 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor eAudioCompressionType = NetworkTransportProps.eAudioCodingType; iNumAudioChannels = NetworkTransportProps.iNumAudioChannels; iNetwFrameSizeFact = NetworkTransportProps.iBlockSizeFact; - iNetwFrameSize = - NetworkTransportProps.iBaseNetworkPacketSize; + iNetwFrameSize = NetworkTransportProps.iBaseNetworkPacketSize; MutexSocketBuf.lock(); { diff --git a/src/protocol.cpp b/src/protocol.cpp index bbf1639c..5b834fc3 100755 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -154,12 +154,6 @@ MESSAGES (with connection) +---------------------+ -// #### COMPATIBILITY OLD VERSION, TO BE REMOVED #### -- PROTMESSID_OPUS_SUPPORTED: Informs that OPUS codec is supported - - note: does not have any data -> n = 0 - - CONNECTION LESS MESSAGES ------------------------ @@ -1227,12 +1221,6 @@ bool CProtocol::EvaluateLicenceRequiredMes ( const CVector& vecData ) return false; // no error } -void CProtocol::CreateOpusSupportedMes() -{ - CreateAndSendMessage ( PROTMESSID_OPUS_SUPPORTED, - CVector ( 0 ) ); -} - // Connection less messages ---------------------------------------------------- void CProtocol::CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs ) diff --git a/src/protocol.h b/src/protocol.h index 20c93e10..23a5b134 100755 --- a/src/protocol.h +++ b/src/protocol.h @@ -53,7 +53,7 @@ #define PROTMESSID_REQ_CHANNEL_INFOS 23 // request channel infos for fader tag #define PROTMESSID_CONN_CLIENTS_LIST 24 // channel infos for connected clients #define PROTMESSID_CHANNEL_INFOS 25 // set channel infos -#define PROTMESSID_OPUS_SUPPORTED 26 // tells that OPUS codec is supported +#define PROTMESSID_OPUS_SUPPORTED 26 // OLD (not used anymore) #define PROTMESSID_LICENCE_REQUIRED 27 // licence required // message IDs of connection less messages (CLM) @@ -102,7 +102,6 @@ public: void CreateNetwTranspPropsMes ( const CNetworkTransportProps& NetTrProps ); void CreateReqNetwTranspPropsMes(); void CreateLicenceRequiredMes ( const ELicenceType eLicenceType ); - void CreateOpusSupportedMes(); void CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs ); void CreateCLPingWithNumClientsMes ( const CHostAddress& InetAddr, diff --git a/src/testbench.h b/src/testbench.h index b3905f8d..e13b3435 100755 --- a/src/testbench.h +++ b/src/testbench.h @@ -181,10 +181,6 @@ public slots: Protocol.CreateReqNetwTranspPropsMes(); break; - case 13: // PROTMESSID_OPUS_SUPPORTED - Protocol.CreateOpusSupportedMes(); - break; - case 14: // PROTMESSID_CLM_PING_MS Protocol.CreateCLPingMes ( CurHostAddress, GenRandomIntInRange ( -2, 1000 ) );