diff --git a/src/channel.cpp b/src/channel.cpp index a7228826..b82ba886 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -109,6 +109,10 @@ qRegisterMetaType ( "CHostAddress" ); SIGNAL ( LicenceRequired ( ELicenceType ) ), SIGNAL ( LicenceRequired ( ELicenceType ) ) ); + QObject::connect ( &Protocol, + SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), + SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( &Protocol, SIGNAL ( ReqChannelLevelList ( bool ) ), this, SLOT ( OnReqChannelLevelList ( bool ) ) ); diff --git a/src/channel.h b/src/channel.h index 19506454..0db2095c 100755 --- a/src/channel.h +++ b/src/channel.h @@ -281,6 +281,7 @@ signals: void ChatTextReceived ( QString strChatText ); void ReqNetTranspProps(); void LicenceRequired ( ELicenceType eLicenceType ); + void VersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion ); void Disconnected(); void DetectedCLMessage ( CVector vecbyMesBodyData, diff --git a/src/client.cpp b/src/client.cpp index ec3c2cf2..0bf877e8 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -160,6 +160,10 @@ CClient::CClient ( const quint16 iPortNumber, SIGNAL ( LicenceRequired ( ELicenceType ) ), SIGNAL ( LicenceRequired ( ELicenceType ) ) ); + QObject::connect ( &Channel, + SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), + SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + QObject::connect ( &ConnLessProtocol, SIGNAL ( CLMessReadyForSending ( CHostAddress, CVector ) ), this, SLOT ( OnSendCLProtMessage ( CHostAddress, CVector ) ) ); diff --git a/src/client.h b/src/client.h index b019e2ef..385f931c 100755 --- a/src/client.h +++ b/src/client.h @@ -422,6 +422,7 @@ signals: void ConClientListMesReceived ( CVector vecChanInfo ); void ChatTextReceived ( QString strChatText ); void LicenceRequired ( ELicenceType eLicenceType ); + void VersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion ); void PingTimeReceived ( int iPingTime ); void CLServerListReceived ( CHostAddress InetAddr, diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index b5640479..7025f100 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -498,6 +498,10 @@ CClientDlg::CClientDlg ( CClient* pNCliP, SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector ) ), this, SLOT ( OnCLChannelLevelListReceived ( CHostAddress, CVector ) ) ); + QObject::connect ( pClient, + SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), + this, SLOT ( OnVersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) ); + #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING QObject::connect ( pClient, SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ), @@ -747,6 +751,19 @@ void CClientDlg::OnCentralServerAddressTypeChanged() ConnectDlg.RequestServerList(); } +} + +void CClientDlg::OnVersionAndOSReceived ( COSUtil::EOpSystemType eOSType, + QString strVersion ) +{ + + +// TODO the implementation of: check for version number if Pan is supported -> enable Pan controls in mixer board if version is sufficient +// TEST +qDebug() << strVersion; + + + } void CClientDlg::OnChatTextReceived ( QString strChatText ) diff --git a/src/clientdlg.h b/src/clientdlg.h index 5af19cb3..4f2b56cb 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -131,6 +131,9 @@ public slots: const int iValue ) { MainMixerBoard->SetFaderLevel ( iChannelIdx, iValue ); } + void OnVersionAndOSReceived ( COSUtil::EOpSystemType eOSType, + QString strVersion ); + #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING void OnCLVersionAndOSReceived ( CHostAddress InetAddr, COSUtil::EOpSystemType eOSType, diff --git a/src/server.cpp b/src/server.cpp index 38955a82..a514f2da 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -1213,7 +1213,7 @@ void CServer::ProcessData ( const CVector >& vecvecsData, for ( i = 0; i < ( 2 * iServerFrameSizeSamples ); i++ ) { // get the correct pan value for the current channel (left or right) - double pan = ( i % 2 == 0 ) ? dPanCoefL : dPanCoefR; + const double pan = ( i % 2 == 0 ) ? dPanCoefL : dPanCoefR; vecsOutData[i] = Double2Short ( vecsOutData[i] + vecsData[i] * dGain * pan );