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)
{
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)
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())
{
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())
{

View File

@@ -80,6 +80,18 @@ namespace BlackCore
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,
IOwnAircraftProvider *ownAircraftProvider,
IRemoteAircraftProvider *remoteAircraftProvider,

View File

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