flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-10-17 01:41:35 +02:00
parent 79f8e1b959
commit f236b54084
4 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,31 +138,33 @@ namespace BlackCore
QMutexLocker lock(&m_mutexConnection);
// async connection
m_connection->connectTo(cid, password, callsign, client, { this, [ = ](bool authenticated)
m_connection->connectTo(cid, password, callsign, client,
{
// this is the callback when the connection has been established
const QVector<StationDto> aliasedStations = m_connection->getAllAliasedStations();
this->setAliasedStations(aliasedStations); // threadsafe
this->onTimerUpdate();
// const bool isConnected = this->isConnected(); // threadsafe
if (authenticated)
this, [ = ](bool authenticated)
{
// restart timer, normally it should be started already, paranoia
// as I run in "my thread" starting timer should be OK
// this is the callback when the connection has been established
const QVector<StationDto> aliasedStations = m_connection->getAllAliasedStations();
this->setAliasedStations(aliasedStations); // threadsafe
this->onTimerUpdate();
// const bool isConnected = this->isConnected(); // threadsafe
if (authenticated)
{
QMutexLocker lock(&m_mutex);
if (m_voiceServerTimer) { m_voiceServerTimer->start(PositionUpdatesMs); }
// restart timer, normally it should be started already, paranoia
// as I run in "my thread" starting timer should be OK
{
QMutexLocker lock(&m_mutex);
if (m_voiceServerTimer) { m_voiceServerTimer->start(PositionUpdatesMs); }
}
emit this->connectionStatusChanged(Connected);
}
else
{
emit this->connectionStatusChanged(Disconnected);
}
emit this->connectionStatusChanged(Connected);
}
else
{
emit this->connectionStatusChanged(Disconnected);
}
}
});
});
}
}
@@ -298,7 +300,6 @@ namespace BlackCore
this->setReceiveAudio(false); // threadsafe
// stop input/output
{
QMutexLocker lock{&m_mutex};
m_input->stop();

2
src/blackcore/db/databasewriter.cpp
View File

@@ -95,7 +95,7 @@ namespace BlackCore
request.setRawHeader(QByteArray("swift-extrainfo"), eInfo);
const int logId = m_writeLog.addPendingUrl(url);
m_pendingModelPublishReply = sApp->postToNetwork(request, logId, multiPart, { this, &CDatabaseWriter::postedModelsResponse});
m_modelReplyPendingSince = QDateTime::currentMSecsSinceEpoch();
m_modelReplyPendingSince = QDateTime::currentMSecsSinceEpoch();
return msgs;
}

6
src/blackmisc/directoryutils.cpp
View File

@@ -51,6 +51,12 @@ namespace BlackMisc
return pDir;
}
const QString &CDirectoryUtils::audioPluginDirectory()
{
static const QString pDir(CFileUtils::appendFilePaths(binDirectory(), "audio"));
return pDir;
}
const QString &CDirectoryUtils::getXSwiftBusBuildDirectory()
{
if (!CBuildConfig::isLocalDeveloperDebugBuild())

4
src/blackmisc/directoryutils.h
View File

@@ -43,6 +43,10 @@ namespace BlackMisc
//! Plugins directory
static const QString &pluginsDirectory();
//! Audio plugins directory for Qt audio
//! \remark contains the audio plugins
static const QString &audioPluginDirectory();
//! The build directory
//! \remark if is a local build
static const QString &getXSwiftBusBuildDirectory();