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

using Qt5 connections instead of the old Qt4 ones (just a subset converted right now, more TODO)

Browse source
This commit is contained in:
Volker Fischer 2020-06-06 17:19:25 +02:00
parent 33073658c6
commit 0e2185ae01
5 changed files with 180 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/audiomixerboard.cpp
View file

@ -174,18 +174,17 @@ CChannelFader::CChannelFader ( QWidget* pNW,
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
QObject::connect ( pFader, SIGNAL ( valueChanged ( int ) ), QObject::connect ( pFader, &QSlider::valueChanged,
this, SLOT ( OnLevelValueChanged ( int ) ) ); this, &CChannelFader::OnLevelValueChanged );
QObject::connect ( pPan, SIGNAL ( valueChanged ( int ) ), QObject::connect ( pPan, &QDial::valueChanged,
this, SLOT ( OnPanValueChanged ( int ) ) ); this, &CChannelFader::OnPanValueChanged );
QObject::connect ( pcbMute, SIGNAL ( stateChanged ( int ) ), QObject::connect ( pcbMute, &QCheckBox::stateChanged,
this, SLOT ( OnMuteStateChanged ( int ) ) ); this, &CChannelFader::OnMuteStateChanged );
QObject::connect ( pcbSolo, QObject::connect ( pcbSolo, &QCheckBox::stateChanged,
SIGNAL ( stateChanged ( int ) ), this, &CChannelFader::soloStateChanged );
SIGNAL ( soloStateChanged ( int ) ) );
} }
void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign ) void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )

82
src/channel.cpp
View file

@ -60,70 +60,56 @@ CChannel::CChannel ( const bool bNIsServer ) :
qRegisterMetaType<CVector<uint8_t> > ( "CVector<uint8_t>" ); qRegisterMetaType<CVector<uint8_t> > ( "CVector<uint8_t>" );
qRegisterMetaType<CHostAddress> ( "CHostAddress" ); qRegisterMetaType<CHostAddress> ( "CHostAddress" );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::MessReadyForSending,
SIGNAL ( MessReadyForSending ( CVector<uint8_t> ) ), this, &CChannel::OnSendProtMessage );
this, SLOT ( OnSendProtMessage ( CVector<uint8_t> ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ChangeJittBufSize,
SIGNAL ( ChangeJittBufSize ( int ) ), this, &CChannel::OnJittBufSizeChange );
this, SLOT ( OnJittBufSizeChange ( int ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ReqJittBufSize,
SIGNAL ( ReqJittBufSize() ), this, &CChannel::ReqJittBufSize );
SIGNAL ( ReqJittBufSize() ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ReqChanInfo,
SIGNAL ( ReqChanInfo() ), this, &CChannel::ReqChanInfo );
SIGNAL ( ReqChanInfo() ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ReqConnClientsList,
SIGNAL ( ReqConnClientsList() ), this, &CChannel::ReqConnClientsList );
SIGNAL ( ReqConnClientsList() ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ConClientListMesReceived,
SIGNAL ( ConClientListMesReceived ( CVector<CChannelInfo> ) ), this, &CChannel::ConClientListMesReceived );
SIGNAL ( ConClientListMesReceived ( CVector<CChannelInfo> ) ) );
QObject::connect ( &Protocol, SIGNAL ( ChangeChanGain ( int, double ) ), QObject::connect ( &Protocol, &CProtocol::ChangeChanGain,
this, SLOT ( OnChangeChanGain ( int, double ) ) ); this, &CChannel::OnChangeChanGain );
QObject::connect ( &Protocol, SIGNAL ( ChangeChanPan ( int, double ) ), QObject::connect ( &Protocol, &CProtocol::ChangeChanPan,
this, SLOT ( OnChangeChanPan ( int, double ) ) ); this, &CChannel::OnChangeChanPan );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ClientIDReceived,
SIGNAL ( ClientIDReceived ( int ) ), this, &CChannel::ClientIDReceived );
SIGNAL ( ClientIDReceived ( int ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::MuteStateHasChangedReceived,
SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), this, &CChannel::MuteStateHasChangedReceived );
SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ) );
QObject::connect ( &Protocol, SIGNAL ( ChangeChanInfo ( CChannelCoreInfo ) ), QObject::connect ( &Protocol, &CProtocol::ChangeChanInfo,
this, SLOT ( OnChangeChanInfo ( CChannelCoreInfo ) ) ); this, &CChannel::OnChangeChanInfo );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ChatTextReceived,
SIGNAL ( ChatTextReceived ( QString ) ), this, &CChannel::ChatTextReceived );
SIGNAL ( ChatTextReceived ( QString ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::NetTranspPropsReceived,
SIGNAL ( NetTranspPropsReceived ( CNetworkTransportProps ) ), this, &CChannel::OnNetTranspPropsReceived );
this, SLOT ( OnNetTranspPropsReceived ( CNetworkTransportProps ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ReqNetTranspProps,
SIGNAL ( ReqNetTranspProps() ), this, &CChannel::OnReqNetTranspProps );
this, SLOT ( OnReqNetTranspProps() ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::LicenceRequired,
SIGNAL ( LicenceRequired ( ELicenceType ) ), this, &CChannel::LicenceRequired );
SIGNAL ( LicenceRequired ( ELicenceType ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::VersionAndOSReceived,
SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), this, &CChannel::VersionAndOSReceived );
SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) );
QObject::connect ( &Protocol, QObject::connect ( &Protocol, &CProtocol::ReqChannelLevelList,
SIGNAL ( ReqChannelLevelList ( bool ) ), this, &CChannel::OnReqChannelLevelList );
this, SLOT ( OnReqChannelLevelList ( bool ) ) );
} }
bool CChannel::ProtocolIsEnabled() bool CChannel::ProtocolIsEnabled()

13
src/chatdlg.cpp
View file

@ -54,15 +54,14 @@ CChatDlg::CChatDlg ( QWidget* parent, Qt::WindowFlags f ) :
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
QObject::connect ( edtLocalInputText, QObject::connect ( edtLocalInputText, &QLineEdit::textChanged,
SIGNAL ( textChanged ( const QString& ) ), this, &CChatDlg::OnLocalInputTextTextChanged );
this, SLOT ( OnLocalInputTextTextChanged ( const QString& ) ) );
QObject::connect ( edtLocalInputText, SIGNAL ( returnPressed() ), QObject::connect ( edtLocalInputText, &QLineEdit::returnPressed,
this, SLOT ( OnLocalInputTextReturnPressed() ) ); this, &CChatDlg::OnLocalInputTextReturnPressed );
QObject::connect ( butClear, SIGNAL ( pressed() ), QObject::connect ( butClear, &QPushButton::pressed,
this, SLOT ( OnClearPressed() ) ); this, &CChatDlg::OnClearPressed );
} }
void CChatDlg::OnLocalInputTextTextChanged ( const QString& strNewText ) void CChatDlg::OnLocalInputTextTextChanged ( const QString& strNewText )

119
src/client.cpp
View file

@ -126,102 +126,83 @@ CClient::CClient ( const quint16 iPortNumber,
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
// connections for the protocol mechanism // connections for the protocol mechanism
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::MessReadyForSending,
SIGNAL ( MessReadyForSending ( CVector<uint8_t> ) ), this, &CClient::OnSendProtMessage );
this, SLOT ( OnSendProtMessage ( CVector<uint8_t> ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::DetectedCLMessage,
SIGNAL ( DetectedCLMessage ( CVector<uint8_t>, int, CHostAddress ) ), this, &CClient::OnDetectedCLMessage );
this, SLOT ( OnDetectedCLMessage ( CVector<uint8_t>, int, CHostAddress ) ) );
QObject::connect ( &Channel, SIGNAL ( ReqJittBufSize() ), QObject::connect ( &Channel, &CChannel::ReqJittBufSize,
this, SLOT ( OnReqJittBufSize() ) ); this, &CClient::OnReqJittBufSize );
QObject::connect ( &Channel, SIGNAL ( JittBufSizeChanged ( int ) ), QObject::connect ( &Channel, &CChannel::JittBufSizeChanged,
this, SLOT ( OnJittBufSizeChanged ( int ) ) ); this, &CClient::OnJittBufSizeChanged );
QObject::connect ( &Channel, SIGNAL ( ReqChanInfo() ), QObject::connect ( &Channel, &CChannel::ReqChanInfo,
this, SLOT ( OnReqChanInfo() ) ); this, &CClient::OnReqChanInfo );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::ConClientListMesReceived,
SIGNAL ( ConClientListMesReceived ( CVector<CChannelInfo> ) ), this, &CClient::ConClientListMesReceived );
SIGNAL ( ConClientListMesReceived ( CVector<CChannelInfo> ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::Disconnected,
SIGNAL ( Disconnected() ), this, &CClient::Disconnected );
SIGNAL ( Disconnected() ) );
QObject::connect ( &Channel, SIGNAL ( NewConnection() ), QObject::connect ( &Channel, &CChannel::NewConnection,
this, SLOT ( OnNewConnection() ) ); this, &CClient::OnNewConnection );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::ChatTextReceived,
SIGNAL ( ChatTextReceived ( QString ) ), this, &CClient::ChatTextReceived );
SIGNAL ( ChatTextReceived ( QString ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::ClientIDReceived,
SIGNAL ( ClientIDReceived ( int ) ), this, &CClient::ClientIDReceived );
SIGNAL ( ClientIDReceived ( int ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::MuteStateHasChangedReceived,
SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), this, &CClient::MuteStateHasChangedReceived );
SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::LicenceRequired,
SIGNAL ( LicenceRequired ( ELicenceType ) ), this, &CClient::LicenceRequired );
SIGNAL ( LicenceRequired ( ELicenceType ) ) );
QObject::connect ( &Channel, QObject::connect ( &Channel, &CChannel::VersionAndOSReceived,
SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), this, &CClient::VersionAndOSReceived );
SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLMessReadyForSending,
SIGNAL ( CLMessReadyForSending ( CHostAddress, CVector<uint8_t> ) ), this, &CClient::OnSendCLProtMessage );
this, SLOT ( OnSendCLProtMessage ( CHostAddress, CVector<uint8_t> ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLServerListReceived,
SIGNAL ( CLServerListReceived ( CHostAddress, CVector<CServerInfo> ) ), this, &CClient::CLServerListReceived );
SIGNAL ( CLServerListReceived ( CHostAddress, CVector<CServerInfo> ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLConnClientsListMesReceived,
SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector<CChannelInfo> ) ), this, &CClient::CLConnClientsListMesReceived );
SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector<CChannelInfo> ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLPingReceived,
SIGNAL ( CLPingReceived ( CHostAddress, int ) ), this, &CClient::OnCLPingReceived );
this, SLOT ( OnCLPingReceived ( CHostAddress, int ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLPingWithNumClientsReceived,
SIGNAL ( CLPingWithNumClientsReceived ( CHostAddress, int, int ) ), this, &CClient::OnCLPingWithNumClientsReceived );
this, SLOT ( OnCLPingWithNumClientsReceived ( CHostAddress, int, int ) ) );
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLDisconnection ,
SIGNAL ( CLDisconnection ( CHostAddress ) ), this, &CClient::OnCLDisconnection );
this, SLOT ( OnCLDisconnection ( CHostAddress ) ) );
#ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLVersionAndOSReceived,
SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ), this, &CClient::CLVersionAndOSReceived );
SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ) );
#endif #endif
QObject::connect ( &ConnLessProtocol, QObject::connect ( &ConnLessProtocol, &CProtocol::CLChannelLevelListReceived,
SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ), this, &CClient::CLChannelLevelListReceived );
SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ) );
// other // other
QObject::connect ( &Sound, SIGNAL ( ReinitRequest ( int ) ), QObject::connect ( &Sound, &CSound::ReinitRequest,
this, SLOT ( OnSndCrdReinitRequest ( int ) ) ); this, &CClient::OnSndCrdReinitRequest );
QObject::connect ( &Sound, QObject::connect ( &Sound, &CSound::ControllerInFaderLevel,
SIGNAL ( ControllerInFaderLevel ( int, int ) ), this, &CClient::ControllerInFaderLevel );
SIGNAL ( ControllerInFaderLevel ( int, int ) ) );
QObject::connect ( &Socket, SIGNAL ( InvalidPacketReceived ( CHostAddress ) ), QObject::connect ( &Socket, &CHighPrioSocket::InvalidPacketReceived,
this, SLOT ( OnInvalidPacketReceived ( CHostAddress ) ) ); this, &CClient::OnInvalidPacketReceived );
QObject::connect ( pSignalHandler, QObject::connect ( pSignalHandler, &CSignalHandler::HandledSignal,
SIGNAL ( HandledSignal ( int ) ), this, &CClient::OnHandledSignal );
this, SLOT ( OnHandledSignal ( int ) ) );
// start the socket (it is important to start the socket after all // start the socket (it is important to start the socket after all

179
src/clientdlg.cpp
View file

@ -402,158 +402,143 @@ CClientDlg::CClientDlg ( CClient* pNCliP,
// Connections ------------------------------------------------------------- // Connections -------------------------------------------------------------
// push buttons // push buttons
QObject::connect ( butConnect, SIGNAL ( clicked() ), QObject::connect ( butConnect, &QPushButton::clicked,
this, SLOT ( OnConnectDisconBut() ) ); this, &CClientDlg::OnConnectDisconBut );
// check boxes // check boxes
QObject::connect ( chbSettings, SIGNAL ( stateChanged ( int ) ), QObject::connect ( chbSettings, &QCheckBox::stateChanged,
this, SLOT ( OnSettingsStateChanged ( int ) ) ); this, &CClientDlg::OnSettingsStateChanged );
QObject::connect ( chbChat, SIGNAL ( stateChanged ( int ) ), QObject::connect ( chbChat, &QCheckBox::stateChanged,
this, SLOT ( OnChatStateChanged ( int ) ) ); this, &CClientDlg::OnChatStateChanged );
QObject::connect ( chbLocalMute, SIGNAL ( stateChanged ( int ) ), QObject::connect ( chbLocalMute, &QCheckBox::stateChanged,
this, SLOT ( OnLocalMuteStateChanged ( int ) ) ); this, &CClientDlg::OnLocalMuteStateChanged );
// timers // timers
QObject::connect ( &TimerSigMet, SIGNAL ( timeout() ), QObject::connect ( &TimerSigMet, &QTimer::timeout,
this, SLOT ( OnTimerSigMet() ) ); this, &CClientDlg::OnTimerSigMet );
QObject::connect ( &TimerBuffersLED, SIGNAL ( timeout() ), QObject::connect ( &TimerBuffersLED, &QTimer::timeout,
this, SLOT ( OnTimerBuffersLED() ) ); this, &CClientDlg::OnTimerBuffersLED );
QObject::connect ( &TimerStatus, SIGNAL ( timeout() ), QObject::connect ( &TimerStatus, &QTimer::timeout,
this, SLOT ( OnTimerStatus() ) ); this, &CClientDlg::OnTimerStatus );
QObject::connect ( &TimerPing, SIGNAL ( timeout() ), QObject::connect ( &TimerPing, &QTimer::timeout,
this, SLOT ( OnTimerPing() ) ); this, &CClientDlg::OnTimerPing );
// sliders // sliders
QObject::connect ( sldAudioPan, SIGNAL ( valueChanged ( int ) ), QObject::connect ( sldAudioPan, &QSlider::valueChanged,
this, SLOT ( OnAudioPanValueChanged ( int ) ) ); this, &CClientDlg::OnAudioPanValueChanged );
QObject::connect ( sldAudioReverb, SIGNAL ( valueChanged ( int ) ), QObject::connect ( sldAudioReverb, &QSlider::valueChanged,
this, SLOT ( OnAudioReverbValueChanged ( int ) ) ); this, &CClientDlg::OnAudioReverbValueChanged );
// radio buttons // radio buttons
QObject::connect ( rbtReverbSelL, SIGNAL ( clicked() ), QObject::connect ( rbtReverbSelL, &QRadioButton::clicked,
this, SLOT ( OnReverbSelLClicked() ) ); this, &CClientDlg::OnReverbSelLClicked );
QObject::connect ( rbtReverbSelR, SIGNAL ( clicked() ), QObject::connect ( rbtReverbSelR, &QRadioButton::clicked,
this, SLOT ( OnReverbSelRClicked() ) ); this, &CClientDlg::OnReverbSelRClicked );
// other // other
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::ConClientListMesReceived,
SIGNAL ( ConClientListMesReceived ( CVector<CChannelInfo> ) ), this, &CClientDlg::OnConClientListMesReceived );
this, SLOT ( OnConClientListMesReceived ( CVector<CChannelInfo> ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::Disconnected,
SIGNAL ( Disconnected() ), this, &CClientDlg::OnDisconnected );
this, SLOT ( OnDisconnected() ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CentralServerAddressTypeChanged,
SIGNAL ( CentralServerAddressTypeChanged() ), this, &CClientDlg::OnCentralServerAddressTypeChanged );
this, SLOT ( OnCentralServerAddressTypeChanged() ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::ChatTextReceived,
SIGNAL ( ChatTextReceived ( QString ) ), this, &CClientDlg::OnChatTextReceived );
this, SLOT ( OnChatTextReceived ( QString ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::ClientIDReceived,
SIGNAL ( ClientIDReceived ( int ) ), this, &CClientDlg::OnClientIDReceived );
this, SLOT ( OnClientIDReceived ( int ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::MuteStateHasChangedReceived,
SIGNAL ( MuteStateHasChangedReceived ( int, bool ) ), this, &CClientDlg::OnMuteStateHasChangedReceived );
this, SLOT ( OnMuteStateHasChangedReceived ( int, bool ) ) );
// This connection is a special case. On receiving a licence required message via the // This connection is a special case. On receiving a licence required message via the
// protocol, a modal licence dialog is opened. Since this blocks the thread, we need // protocol, a modal licence dialog is opened. Since this blocks the thread, we need
// a queued connection to make sure the core protocol mechanism is not blocked, too. // a queued connection to make sure the core protocol mechanism is not blocked, too.
qRegisterMetaType<ELicenceType> ( "ELicenceType" ); qRegisterMetaType<ELicenceType> ( "ELicenceType" );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::LicenceRequired,
SIGNAL ( LicenceRequired ( ELicenceType ) ), this, &CClientDlg::OnLicenceRequired, Qt::QueuedConnection );
this, SLOT ( OnLicenceRequired ( ELicenceType ) ), Qt::QueuedConnection );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::PingTimeReceived,
SIGNAL ( PingTimeReceived ( int ) ), this, &CClientDlg::OnPingTimeResult );
this, SLOT ( OnPingTimeResult ( int ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CLServerListReceived,
SIGNAL ( CLServerListReceived ( CHostAddress, CVector<CServerInfo> ) ), this, &CClientDlg::OnCLServerListReceived );
this, SLOT ( OnCLServerListReceived ( CHostAddress, CVector<CServerInfo> ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CLConnClientsListMesReceived,
SIGNAL ( CLConnClientsListMesReceived ( CHostAddress, CVector<CChannelInfo> ) ), this, &CClientDlg::OnCLConnClientsListMesReceived );
this, SLOT ( OnCLConnClientsListMesReceived ( CHostAddress, CVector<CChannelInfo> ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CLPingTimeWithNumClientsReceived,
SIGNAL ( CLPingTimeWithNumClientsReceived ( CHostAddress, int, int ) ), this, &CClientDlg::OnCLPingTimeWithNumClientsReceived );
this, SLOT ( OnCLPingTimeWithNumClientsReceived ( CHostAddress, int, int ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::ControllerInFaderLevel,
SIGNAL ( ControllerInFaderLevel ( int, int ) ), this, &CClientDlg::OnControllerInFaderLevel );
this, SLOT ( OnControllerInFaderLevel ( int, int ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CLChannelLevelListReceived,
SIGNAL ( CLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ), this, &CClientDlg::OnCLChannelLevelListReceived );
this, SLOT ( OnCLChannelLevelListReceived ( CHostAddress, CVector<uint16_t> ) ) );
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::VersionAndOSReceived,
SIGNAL ( VersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ), this, &CClientDlg::OnVersionAndOSReceived );
this, SLOT ( OnVersionAndOSReceived ( COSUtil::EOpSystemType, QString ) ) );
#ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING #ifdef ENABLE_CLIENT_VERSION_AND_OS_DEBUGGING
QObject::connect ( pClient, QObject::connect ( pClient, &CClient::CLVersionAndOSReceived,
SIGNAL ( CLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ), this, &CClientDlg::OnCLVersionAndOSReceived );
this, SLOT ( OnCLVersionAndOSReceived ( CHostAddress, COSUtil::EOpSystemType, QString ) ) );
#endif #endif
QObject::connect ( QCoreApplication::instance(), SIGNAL ( aboutToQuit() ), QObject::connect ( QCoreApplication::instance(), &QCoreApplication::aboutToQuit,
this, SLOT ( OnAboutToQuit() ) ); this, &CClientDlg::OnAboutToQuit );
QObject::connect ( &ClientSettingsDlg, SIGNAL ( GUIDesignChanged() ), QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::GUIDesignChanged,
this, SLOT ( OnGUIDesignChanged() ) ); this, &CClientDlg::OnGUIDesignChanged );
QObject::connect ( &ClientSettingsDlg, SIGNAL ( DisplayChannelLevelsChanged() ), QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::DisplayChannelLevelsChanged,
this, SLOT ( OnDisplayChannelLevelsChanged() ) ); this, &CClientDlg::OnDisplayChannelLevelsChanged );
QObject::connect ( &ClientSettingsDlg, SIGNAL ( AudioChannelsChanged() ), QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::AudioChannelsChanged,
this, SLOT ( OnAudioChannelsChanged() ) ); this, &CClientDlg::OnAudioChannelsChanged );
QObject::connect ( &ClientSettingsDlg, SIGNAL ( NewClientLevelChanged() ), QObject::connect ( &ClientSettingsDlg, &CClientSettingsDlg::NewClientLevelChanged,
this, SLOT ( OnNewClientLevelChanged() ) ); this, &CClientDlg::OnNewClientLevelChanged );
QObject::connect ( MainMixerBoard, SIGNAL ( ChangeChanGain ( int, double, bool ) ), QObject::connect ( MainMixerBoard, &CAudioMixerBoard::ChangeChanGain,
this, SLOT ( OnChangeChanGain ( int, double, bool ) ) ); this, &CClientDlg::OnChangeChanGain );
QObject::connect ( MainMixerBoard, SIGNAL ( ChangeChanPan ( int, double ) ), QObject::connect ( MainMixerBoard, &CAudioMixerBoard::ChangeChanPan,
this, SLOT ( OnChangeChanPan ( int, double ) ) ); this, &CClientDlg::OnChangeChanPan );
QObject::connect ( MainMixerBoard, SIGNAL ( NumClientsChanged ( int ) ), QObject::connect ( MainMixerBoard, &CAudioMixerBoard::NumClientsChanged,
this, SLOT ( OnNumClientsChanged ( int ) ) ); this, &CClientDlg::OnNumClientsChanged );
QObject::connect ( &ChatDlg, SIGNAL ( NewLocalInputText ( QString ) ), QObject::connect ( &ChatDlg, &CChatDlg::NewLocalInputText,
this, SLOT ( OnNewLocalInputText ( QString ) ) ); this, &CClientDlg::OnNewLocalInputText );
QObject::connect ( &ConnectDlg, SIGNAL ( ReqServerListQuery ( CHostAddress ) ), QObject::connect ( &ConnectDlg, &CConnectDlg::ReqServerListQuery,
this, SLOT ( OnReqServerListQuery ( CHostAddress ) ) ); this, &CClientDlg::OnReqServerListQuery );
// note that this connection must be a queued connection, otherwise the server list ping // note that this connection must be a queued connection, otherwise the server list ping
// times are not accurate and the client list may not be retrieved for all servers listed // times are not accurate and the client list may not be retrieved for all servers listed
// (it seems the sendto() function needs to be called from different threads to fire the // (it seems the sendto() function needs to be called from different threads to fire the
// packet immediately and do not collect packets before transmitting) // packet immediately and do not collect packets before transmitting)
QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListPingMes ( CHostAddress ) ), QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListPingMes,
this, SLOT ( OnCreateCLServerListPingMes ( CHostAddress ) ), Qt::QueuedConnection ); this, &CClientDlg::OnCreateCLServerListPingMes, Qt::QueuedConnection );
QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListReqVerAndOSMes ( CHostAddress ) ), QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListReqVerAndOSMes,
this, SLOT ( OnCreateCLServerListReqVerAndOSMes ( CHostAddress ) ) ); this, &CClientDlg::OnCreateCLServerListReqVerAndOSMes );
QObject::connect ( &ConnectDlg, SIGNAL ( CreateCLServerListReqConnClientsListMes ( CHostAddress ) ), QObject::connect ( &ConnectDlg, &CConnectDlg::CreateCLServerListReqConnClientsListMes,
this, SLOT ( OnCreateCLServerListReqConnClientsListMes ( CHostAddress ) ) ); this, &CClientDlg::OnCreateCLServerListReqConnClientsListMes );
QObject::connect ( &ConnectDlg, SIGNAL ( accepted() ), QObject::connect ( &ConnectDlg, &CConnectDlg::accepted,
this, SLOT ( OnConnectDlgAccepted() ) ); this, &CClientDlg::OnConnectDlgAccepted );
// Initializations which have to be done after the signals are connected --- // Initializations which have to be done after the signals are connected ---