Log.category for FSD and minor style changes

This commit is contained in:
Klaus Basan
2019-12-31 13:49:29 +01:00
committed by Mat Sutcliffe
parent 0777d048c6
commit f8e8318902
6 changed files with 38 additions and 5 deletions

View File

@@ -236,7 +236,10 @@ namespace BlackCore
if (m_voiceClient) if (m_voiceClient)
{ {
m_voiceClient->startAudio(); m_voiceClient->startAudio();
this->connectAudioWithNetworkCredentials(); const bool connected = this->connectAudioWithNetworkCredentials();
Q_UNUSED(connected)
// one reason for not connecting is NOT using the VATSIM ecosystem
} }
} }
@@ -564,10 +567,13 @@ namespace BlackCore
Q_UNUSED(from) Q_UNUSED(from)
BLACK_VERIFY_X(this->getIContextNetwork(), Q_FUNC_INFO, "Missing network context"); BLACK_VERIFY_X(this->getIContextNetwork(), Q_FUNC_INFO, "Missing network context");
// we only change network connection of AFC client here // we only change network connection of AFV client here
if (to.isConnected() && this->getIContextNetwork()) if (to.isConnected() && this->getIContextNetwork())
{ {
this->connectAudioWithNetworkCredentials(); const bool connected = this->connectAudioWithNetworkCredentials();
Q_UNUSED(connected)
// one reason for not connecting is NOT using the VATSIM ecosystem
} }
else if (to.isDisconnected()) else if (to.isDisconnected())
{ {

View File

@@ -80,6 +80,18 @@ namespace BlackCore
return escaped; return escaped;
} }
const CLogCategoryList &CFSDClient::getLogCategories()
{
static const CLogCategoryList cats = []
{
CLogCategoryList cl = CContinuousWorker::getLogCategories();
cl.push_back(CLogCategory::network());
cl.push_back(CLogCategory::fsd());
return cl;
}();
return cats;
}
CFSDClient::CFSDClient(IClientProvider *clientProvider, CFSDClient::CFSDClient(IClientProvider *clientProvider,
IOwnAircraftProvider *ownAircraftProvider, IOwnAircraftProvider *ownAircraftProvider,
IRemoteAircraftProvider *remoteAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider,

View File

@@ -82,6 +82,9 @@ namespace BlackCore
Q_INTERFACES(BlackMisc::Network::IEcosystemProvider) Q_INTERFACES(BlackMisc::Network::IEcosystemProvider)
public: public:
//! Categories
static const BlackMisc::CLogCategoryList &getLogCategories();
//! Ctor //! Ctor
CFSDClient(BlackMisc::Network::IClientProvider *clientProvider, CFSDClient(BlackMisc::Network::IClientProvider *clientProvider,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,

View File

@@ -52,7 +52,10 @@ namespace BlackGui
sGui->getCContextAudioBase()->afvClient()->startAudio(); sGui->getCContextAudioBase()->afvClient()->startAudio();
if (sGui->getIContextNetwork()->isConnected()) if (sGui->getIContextNetwork()->isConnected())
{ {
sGui->getCContextAudioBase()->connectAudioWithNetworkCredentials(); const bool connected = sGui->getCContextAudioBase()->connectAudioWithNetworkCredentials();
Q_UNUSED(connected)
// one reason for not connecting is NOT using the VATSIM ecosystem
} }
} }

View File

@@ -270,6 +270,13 @@ namespace BlackMisc
return cat; return cat;
} }
//! FSD specific
static const CLogCategory &fsd()
{
static const CLogCategory cat { "swift.fsd" };
return cat;
}
//! Aviation specific //! Aviation specific
static const CLogCategory &aviation() static const CLogCategory &aviation()
{ {
@@ -294,6 +301,7 @@ namespace BlackMisc
download(), download(),
driver(), driver(),
flightPlan(), flightPlan(),
fsd(),
guiComponent(), guiComponent(),
interpolator(), interpolator(),
json(), json(),

View File

@@ -31,6 +31,7 @@ namespace BlackMisc
{ "downloading data", exactMatch(CLogCategory::download()) }, { "downloading data", exactMatch(CLogCategory::download()) },
{ "driver", exactMatch(CLogCategory::driver()) }, { "driver", exactMatch(CLogCategory::driver()) },
{ "flight plan", exactMatch(CLogCategory::flightPlan()) }, { "flight plan", exactMatch(CLogCategory::flightPlan()) },
{ "FSD", exactMatch(CLogCategory::fsd()) },
{ "interpolator", exactMatch(CLogCategory::interpolator()) }, { "interpolator", exactMatch(CLogCategory::interpolator()) },
{ "JSON (conversion)", exactMatch(CLogCategory::json()) }, { "JSON (conversion)", exactMatch(CLogCategory::json()) },
{ "model cache", exactMatch(CLogCategory::modelCache()) }, { "model cache", exactMatch(CLogCategory::modelCache()) },
@@ -321,7 +322,7 @@ namespace BlackMisc
QString CLogPattern::convertToQString(bool i18n) const QString CLogPattern::convertToQString(bool i18n) const
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n)
QString strategy; QString strategy;
QString categories = m_strings.values().join("|"); // clazy:exclude=container-anti-pattern QString categories = m_strings.values().join("|"); // clazy:exclude=container-anti-pattern
switch (m_strategy) switch (m_strategy)