Fix connection status issue (#2519) #3364
+154
−118
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,6 @@ | |
| /* Implementation *************************************************************/ | ||
| CClient::CClient ( const quint16 iPortNumber, | ||
| const quint16 iQosNumber, | ||
| const QString& strMIDISetup, | ||
| const bool bNoAutoJackConnect, | ||
| const QString& strNClientName, | ||
|
|
@@ -184,13 +183,6 @@ CClient::CClient ( const quint16 iPortNumber, | |
| // start the socket (it is important to start the socket after all | ||
| // initializations and connections) | ||
| Socket.Start(); | ||
ann0see marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| CClient::~CClient() | ||
|
|
@@ -337,7 +329,7 @@ void CClient::CreateServerJitterBufferMessage() | |
| void CClient::OnCLPingReceived ( CHostAddress InetAddr, int iMs ) | ||
| { | ||
| // make sure we are running and the server address is correct | ||
| if ( Channel.IsEnabled() && ( InetAddr == Channel.GetAddress() ) ) | ||
|
There was a problem hiding this comment. This isn't about the channel being enabled. It's about whether the client is running. It's a different intent. There was a problem hiding this comment. I think the initial PR confused active channel and active client: #2550 (comment) This difference needs documentation. IMO: Add (like for JSON-RPC) respective technical documentation before the respective methods. As end goal: Write them for every function, for now: Write docs while changing. |
||
| { | ||
| // take care of wrap arounds (if wrapping, do not use result) | ||
| const int iCurDiff = EvaluatePingMessage ( iMs ); | ||
|
|
@@ -773,11 +765,8 @@ void CClient::OnHandledSignal ( int sigNum ) | |
| { | ||
| case SIGINT: | ||
| case SIGTERM: | ||
| // if connected, terminate connection | ||
| Disconnect(); | ||
|
|
||
| // this should trigger OnAboutToQuit | ||
| QCoreApplication::instance()->exit(); | ||
|
|
@@ -876,18 +865,13 @@ void CClient::Start() | |
|
|
||
| void CClient::Stop() | ||
| { | ||
| // start disconnection | ||
| // Channel.Disconnect() should automatically disable Channel as soon as disconnected. | ||
| // Note that this only works if sound is active! | ||
|
There was a problem hiding this comment. So why make the changes here? There was a problem hiding this comment. I believe it's mainly moving around the Channel.Disconnect() and Sound.Stop() code around. This may be the actual bug fix? |
||
| Channel.Disconnect(); | ||
|
|
||
| QTime DieTime = QTime::currentTime().addMSecs ( 500 ); | ||
| while ( ( QTime::currentTime() < DieTime ) && Channel.IsEnabled() ) | ||
| { | ||
| // exclude user input events because if we use AllEvents, it happens | ||
| // that if the user initiates a connection and disconnection quickly | ||
|
|
@@ -896,6 +880,19 @@ void CClient::Stop() | |
| QCoreApplication::processEvents ( QEventLoop::ExcludeUserInputEvents, 100 ); | ||
| } | ||
|
|
||
| // Now stop the audio interface | ||
| Sound.Stop(); | ||
|
|
||
| // in case we timed out, log warning and make sure Channel is disabled | ||
| if ( Channel.IsEnabled() ) | ||
| { | ||
| //### TODO: BEGIN ###// | ||
| // Add error logging | ||
| //### TODO: END ###// | ||
|
|
||
| Channel.SetEnable ( false ); | ||
| } | ||
|
|
||
| // Send disconnect message to server (Since we disable our protocol | ||
| // receive mechanism with the next command, we do not evaluate any | ||
| // respond from the server, therefore we just hope that the message | ||
|
|
@@ -908,6 +905,46 @@ void CClient::Stop() | |
| SignalLevelMeter.Reset(); | ||
| } | ||
|
|
||
| bool CClient::Connect ( QString strServerAddress, QString strServerName ) | ||
ann0see marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| if ( !Channel.IsEnabled() ) | ||
| { | ||
| // Set server address and connect if valid address was supplied | ||
| if ( SetServerAddr ( strServerAddress ) ) | ||
| { | ||
|
|
||
| Start(); | ||
|
|
||
| emit Connecting ( strServerName ); | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| bool CClient::Disconnect() | ||
| { | ||
| if ( Channel.IsEnabled() ) | ||
| { | ||
| Stop(); | ||
|
|
||
| emit Disconnected(); | ||
|
|
||
| return true; | ||
| } | ||
| else | ||
| { | ||
| // make sure sound is stopped too | ||
| Sound.Stop(); | ||
|
|
||
| emit Disconnected(); | ||
|
|
||
| return false; | ||
| } | ||
| } | ||
|
|
||
| void CClient::Init() | ||
| { | ||
| // check if possible frame size factors are supported | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,7 +110,6 @@ class CClient : public QObject | |
| public: | ||
| CClient ( const quint16 iPortNumber, | ||
| const quint16 iQosNumber, | ||
| const QString& strMIDISetup, | ||
| const bool bNoAutoJackConnect, | ||
| const QString& strNClientName, | ||
|
|
@@ -121,8 +120,11 @@ class CClient : public QObject | |
|
|
||
| void Start(); | ||
| void Stop(); | ||
| bool Connect ( QString strServerAddress, QString strServerName ); | ||
|
There was a problem hiding this comment. It does make sense to introduce an easy to call Connect() and Disconnect() method IMO, so this is good. There was a problem hiding this comment. Having these in There was a problem hiding this comment. Agree. That's issue #3367 |
||
| bool Disconnect(); | ||
|
|
||
| bool IsRunning() { return Sound.IsRunning(); } | ||
| bool IsCallbackEntered() const { return Sound.IsCallbackEntered(); } // For OnTimerCheckAudioDeviceOk only | ||
|
There was a problem hiding this comment. Reverted naming. May need some in depth review and discussion. |
||
| bool SetServerAddr ( QString strNAddr ); | ||
|
|
||
| double GetLevelForMeterdBLeft() { return SignalLevelMeter.GetLevelForMeterdBLeftOrMono(); } | ||
|
|
@@ -427,6 +429,7 @@ protected slots: | |
|
|
||
| void CLChannelLevelListReceived ( CHostAddress InetAddr, CVector<uint16_t> vecLevelList ); | ||
|
|
||
| void Connecting ( QString strServerName ); | ||
|
|
||
| void Disconnected(); | ||
| void SoundDeviceChanged ( QString strError ); | ||
| void ControllerInFaderLevel ( int iChannelIdx, int iValue ); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why isn't this done when the disconnect actually happens, rather than here? Like in line 645? Is this just duplicated? Or is there a reason for it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there's a reason for it.
It's probably trying to ensure that bDisconnectAndDisable is representing the client being in process of disconnecting?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't see what job it's doing that setting
iConTimeOutto 1 doesn't already do. It still needsiConTimeOutset to 1, too, so it just adds complexity rather than removing it, without improving readability either.