clear mixer board on disconnect
This commit is contained in:
parent
1083117626
commit
61b086d898
6 changed files with 19 additions and 0 deletions
|
@ -457,6 +457,9 @@ EGetDataStat CChannel::GetData ( CVector<uint8_t>& vecbyData )
|
||||||
// channel is just disconnected
|
// channel is just disconnected
|
||||||
eGetStatus = GS_CHAN_NOW_DISCONNECTED;
|
eGetStatus = GS_CHAN_NOW_DISCONNECTED;
|
||||||
iConTimeOut = 0; // make sure we do not have negative values
|
iConTimeOut = 0; // make sure we do not have negative values
|
||||||
|
|
||||||
|
// emit message
|
||||||
|
emit Disconnected();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -185,6 +185,7 @@ signals:
|
||||||
void ChatTextReceived ( QString strChatText );
|
void ChatTextReceived ( QString strChatText );
|
||||||
void PingReceived ( int iMs );
|
void PingReceived ( int iMs );
|
||||||
void ReqNetTranspProps();
|
void ReqNetTranspProps();
|
||||||
|
void Disconnected();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) */
|
#endif /* !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) */
|
||||||
|
|
|
@ -62,6 +62,10 @@ CClient::CClient ( const quint16 iPortNumber ) :
|
||||||
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ),
|
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ),
|
||||||
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ) );
|
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ) );
|
||||||
|
|
||||||
|
QObject::connect ( &Channel,
|
||||||
|
SIGNAL ( Disconnected() ),
|
||||||
|
SIGNAL ( Disconnected() ) );
|
||||||
|
|
||||||
QObject::connect ( &Channel, SIGNAL ( NewConnection() ),
|
QObject::connect ( &Channel, SIGNAL ( NewConnection() ),
|
||||||
this, SLOT ( OnNewConnection() ) );
|
this, SLOT ( OnNewConnection() ) );
|
||||||
|
|
||||||
|
|
|
@ -211,6 +211,7 @@ signals:
|
||||||
void ConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo );
|
void ConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo );
|
||||||
void ChatTextReceived ( QString strChatText );
|
void ChatTextReceived ( QString strChatText );
|
||||||
void PingTimeReceived ( int iPingTime );
|
void PingTimeReceived ( int iPingTime );
|
||||||
|
void Disconnected();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) */
|
#endif /* !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) */
|
||||||
|
|
|
@ -232,6 +232,9 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
|
||||||
QObject::connect ( pClient,
|
QObject::connect ( pClient,
|
||||||
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ),
|
SIGNAL ( ConClientListMesReceived ( CVector<CChannelShortInfo> ) ),
|
||||||
this, SLOT ( OnConClientListMesReceived ( CVector<CChannelShortInfo> ) ) );
|
this, SLOT ( OnConClientListMesReceived ( CVector<CChannelShortInfo> ) ) );
|
||||||
|
QObject::connect ( pClient,
|
||||||
|
SIGNAL ( Disconnected() ),
|
||||||
|
this, SLOT ( OnDisconnected() ) );
|
||||||
QObject::connect ( pClient,
|
QObject::connect ( pClient,
|
||||||
SIGNAL ( ChatTextReceived ( QString ) ),
|
SIGNAL ( ChatTextReceived ( QString ) ),
|
||||||
this, SLOT ( OnChatTextReceived ( QString ) ) );
|
this, SLOT ( OnChatTextReceived ( QString ) ) );
|
||||||
|
@ -410,6 +413,12 @@ void CLlconClientDlg::OnChatTextReceived ( QString strChatText )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CLlconClientDlg::OnDisconnected()
|
||||||
|
{
|
||||||
|
// channel is now disconnected, clear mixer board (remove all faders)
|
||||||
|
MainMixerBoard->HideAll();
|
||||||
|
}
|
||||||
|
|
||||||
void CLlconClientDlg::ShowChatWindow()
|
void CLlconClientDlg::ShowChatWindow()
|
||||||
{
|
{
|
||||||
// open chat dialog
|
// open chat dialog
|
||||||
|
|
|
@ -110,4 +110,5 @@ public slots:
|
||||||
{ pClient->SendTextMess ( strChatText ); }
|
{ pClient->SendTextMess ( strChatText ); }
|
||||||
void OnLineEditServerAddrTextChanged ( const QString sNewText );
|
void OnLineEditServerAddrTextChanged ( const QString sNewText );
|
||||||
void OnLineEditServerAddrActivated ( int index );
|
void OnLineEditServerAddrActivated ( int index );
|
||||||
|
void OnDisconnected();
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue