flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #77 Break dependency of worker on identifiable

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-08-27 18:12:43 +01:00
parent 89659fdeaa
commit 479210957a
15 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -57,6 +57,7 @@ namespace BlackCore
CAfvClient::CAfvClient(const QString &apiServer, QObject *owner) :
CContinuousWorker(owner, "CAfvClient"),
CIdentifiable("CAfvClient"),
m_connection(new CClientConnection(apiServer, this)),
m_input(new CInput(SampleRate, this)),
m_output(new COutput(this)),

2
src/blackcore/afv/clients/afvclient.h
View File

@@ -45,7 +45,7 @@ namespace BlackCore
namespace Clients
{
//! AFV client
class BLACKCORE_EXPORT CAfvClient final : public BlackMisc::CContinuousWorker
class BLACKCORE_EXPORT CAfvClient final : public BlackMisc::CContinuousWorker, public BlackMisc::CIdentifiable
{
Q_OBJECT

20
src/blackcore/context/contextapplicationimpl.cpp
View File

@@ -130,19 +130,12 @@ namespace BlackCore
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << application; }
CIdentifier identifier(application);
identifier.setCurrentUtcTime();
if (!m_registeredApplications.contains(identifier))
if (!m_registeredApplications.contains(application))
{
m_registeredApplications.push_back(identifier);
m_registeredApplications.push_back(application);
emit this->registrationChanged();
emit this->hotkeyActionsRegistered(sApp->getInputManager()->allAvailableActions(), {});
}
else
{
m_registeredApplications.replace(application, identifier);
}
this->cleanupRegisteredApplications();
return application;
@@ -158,15 +151,16 @@ namespace BlackCore
void CContextApplication::cleanupRegisteredApplications()
{
static const int outdatedMs = qRound(1.5 * PingIdentifiersMs);
m_registeredApplications.removeOlderThanNowMinusOffset(outdatedMs);
//static const int outdatedMs = qRound(1.5 * PingIdentifiersMs);
//m_registeredApplications.removeOlderThanNowMinusOffset(outdatedMs);
}
CIdentifierList CContextApplication::getRegisteredApplications() const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
static const int outdatedMs = qRound(1.5 * PingIdentifiersMs);
return m_registeredApplications.findAfterNowMinusOffset(outdatedMs);
//static const int outdatedMs = qRound(1.5 * PingIdentifiersMs);
//return m_registeredApplications.findAfterNowMinusOffset(outdatedMs);
return m_registeredApplications;
}
CIdentifier CContextApplication::getApplicationIdentifier() const