eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove PROTMESSID_OPUS_SUPPORTED since it is not required anymore

Browse source
This commit is contained in:
Volker Fischer 2019-05-17 22:16:19 +02:00
parent 6466a4aaf7
commit 6f12d8395a
4 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/channel.cpp
View file

@ -345,13 +345,9 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor
// only the server shall act on network transport properties message // only the server shall act on network transport properties message
if ( bIsServer ) if ( bIsServer )
{ {
// #### COMPATIBILITY OLD VERSION, TO BE REMOVED #### // OPUS codec is the only supported codec right now
// 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
if ( NetworkTransportProps.eAudioCodingType != CT_OPUS ) if ( NetworkTransportProps.eAudioCodingType != CT_OPUS )
{ {
Protocol.CreateOpusSupportedMes();
return; return;
} }
@ -361,8 +357,7 @@ void CChannel::OnNetTranspPropsReceived ( CNetworkTransportProps NetworkTranspor
eAudioCompressionType = NetworkTransportProps.eAudioCodingType; eAudioCompressionType = NetworkTransportProps.eAudioCodingType;
iNumAudioChannels = NetworkTransportProps.iNumAudioChannels; iNumAudioChannels = NetworkTransportProps.iNumAudioChannels;
iNetwFrameSizeFact = NetworkTransportProps.iBlockSizeFact; iNetwFrameSizeFact = NetworkTransportProps.iBlockSizeFact;
iNetwFrameSize = iNetwFrameSize = NetworkTransportProps.iBaseNetworkPacketSize;
NetworkTransportProps.iBaseNetworkPacketSize;
MutexSocketBuf.lock(); MutexSocketBuf.lock();
{ {

12
src/protocol.cpp
View file

@ -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 CONNECTION LESS MESSAGES
------------------------ ------------------------
@ -1227,12 +1221,6 @@ bool CProtocol::EvaluateLicenceRequiredMes ( const CVector<uint8_t>& vecData )
return false; // no error return false; // no error
} }
void CProtocol::CreateOpusSupportedMes()
{
CreateAndSendMessage ( PROTMESSID_OPUS_SUPPORTED,
CVector<uint8_t> ( 0 ) );
}
// Connection less messages ---------------------------------------------------- // Connection less messages ----------------------------------------------------
void CProtocol::CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs ) void CProtocol::CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs )

3
src/protocol.h
View file

@ -53,7 +53,7 @@
#define PROTMESSID_REQ_CHANNEL_INFOS 23 // request channel infos for fader tag #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_CONN_CLIENTS_LIST 24 // channel infos for connected clients
#define PROTMESSID_CHANNEL_INFOS 25 // set channel infos #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 #define PROTMESSID_LICENCE_REQUIRED 27 // licence required
// message IDs of connection less messages (CLM) // message IDs of connection less messages (CLM)
@ -102,7 +102,6 @@ public:
void CreateNetwTranspPropsMes ( const CNetworkTransportProps& NetTrProps ); void CreateNetwTranspPropsMes ( const CNetworkTransportProps& NetTrProps );
void CreateReqNetwTranspPropsMes(); void CreateReqNetwTranspPropsMes();
void CreateLicenceRequiredMes ( const ELicenceType eLicenceType ); void CreateLicenceRequiredMes ( const ELicenceType eLicenceType );
void CreateOpusSupportedMes();
void CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs ); void CreateCLPingMes ( const CHostAddress& InetAddr, const int iMs );
void CreateCLPingWithNumClientsMes ( const CHostAddress& InetAddr, void CreateCLPingWithNumClientsMes ( const CHostAddress& InetAddr,

4
src/testbench.h
View file

@ -181,10 +181,6 @@ public slots:
Protocol.CreateReqNetwTranspPropsMes(); Protocol.CreateReqNetwTranspPropsMes();
break; break;
case 13: // PROTMESSID_OPUS_SUPPORTED
Protocol.CreateOpusSupportedMes();
break;
case 14: // PROTMESSID_CLM_PING_MS case 14: // PROTMESSID_CLM_PING_MS
Protocol.CreateCLPingMes ( CurHostAddress, Protocol.CreateCLPingMes ( CurHostAddress,
GenRandomIntInRange ( -2, 1000 ) ); GenRandomIntInRange ( -2, 1000 ) );