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

receive version info message from new server (function to use the information is still missing)

Browse source
This commit is contained in:
Volker Fischer 2020-05-18 21:28:49 +02:00
parent 7dbd2c89d1
commit 5b7ccfcdc2
7 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/channel.cpp
View file

@ -109,6 +109,10 @@ qRegisterMetaType<CHostAddress> ( "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 ) ) );

1
src/channel.h
View file

@ -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<uint8_t> vecbyMesBodyData,

4
src/client.cpp
View file

@ -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<uint8_t> ) ),
this, SLOT ( OnSendCLProtMessage ( CHostAddress, CVector<uint8_t> ) ) );

1
src/client.h
View file

@ -422,6 +422,7 @@ signals:
void ConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo );
void ChatTextReceived ( QString strChatText );
void LicenceRequired ( ELicenceType eLicenceType );
void VersionAndOSReceived ( COSUtil::EOpSystemType eOSType, QString strVersion );
void PingTimeReceived ( int iPingTime );
void CLServerListReceived ( CHostAddress InetAddr,

17
src/clientdlg.cpp
View file

@ -498,6 +498,10 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ),
this, SLOT ( OnCLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ) );
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 )

3
src/clientdlg.h
View file

@ -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,

2
src/server.cpp
View file

@ -1213,7 +1213,7 @@ void CServer::ProcessData ( const CVector<CVector<int16_t> >& 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 );