mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-21 04:45:31 +08:00
refs #935, add log. categories for vatlib
This commit is contained in:
committed by
Mathew Sutcliffe
parent
f2d89bf56c
commit
d475246941
@@ -12,6 +12,8 @@
|
|||||||
#include "blackconfig/buildconfig.h"
|
#include "blackconfig/buildconfig.h"
|
||||||
#include "blackcore/application.h"
|
#include "blackcore/application.h"
|
||||||
#include "blackcore/vatsim/networkvatlib.h"
|
#include "blackcore/vatsim/networkvatlib.h"
|
||||||
|
#include "blackmisc/simulation/aircraftmodel.h"
|
||||||
|
#include "blackmisc/simulation/simulatedaircraft.h"
|
||||||
#include "blackmisc/aviation/aircraftsituation.h"
|
#include "blackmisc/aviation/aircraftsituation.h"
|
||||||
#include "blackmisc/aviation/altitude.h"
|
#include "blackmisc/aviation/altitude.h"
|
||||||
#include "blackmisc/aviation/comsystem.h"
|
#include "blackmisc/aviation/comsystem.h"
|
||||||
@@ -20,12 +22,9 @@
|
|||||||
#include "blackmisc/aviation/informationmessage.h"
|
#include "blackmisc/aviation/informationmessage.h"
|
||||||
#include "blackmisc/aviation/livery.h"
|
#include "blackmisc/aviation/livery.h"
|
||||||
#include "blackmisc/aviation/transponder.h"
|
#include "blackmisc/aviation/transponder.h"
|
||||||
#include "blackmisc/compare.h"
|
|
||||||
#include "blackmisc/geo/coordinategeodetic.h"
|
#include "blackmisc/geo/coordinategeodetic.h"
|
||||||
#include "blackmisc/geo/latitude.h"
|
#include "blackmisc/geo/latitude.h"
|
||||||
#include "blackmisc/geo/longitude.h"
|
#include "blackmisc/geo/longitude.h"
|
||||||
#include "blackmisc/json.h"
|
|
||||||
#include "blackmisc/logmessage.h"
|
|
||||||
#include "blackmisc/network/network.h"
|
#include "blackmisc/network/network.h"
|
||||||
#include "blackmisc/network/textmessage.h"
|
#include "blackmisc/network/textmessage.h"
|
||||||
#include "blackmisc/network/user.h"
|
#include "blackmisc/network/user.h"
|
||||||
@@ -35,8 +34,10 @@
|
|||||||
#include "blackmisc/pq/speed.h"
|
#include "blackmisc/pq/speed.h"
|
||||||
#include "blackmisc/pq/time.h"
|
#include "blackmisc/pq/time.h"
|
||||||
#include "blackmisc/pq/units.h"
|
#include "blackmisc/pq/units.h"
|
||||||
#include "blackmisc/simulation/aircraftmodel.h"
|
#include "blackmisc/compare.h"
|
||||||
#include "blackmisc/simulation/simulatedaircraft.h"
|
#include "blackmisc/json.h"
|
||||||
|
#include "blackmisc/logmessage.h"
|
||||||
|
#include "blackmisc/logcategory.h"
|
||||||
#include "blackmisc/statusmessage.h"
|
#include "blackmisc/statusmessage.h"
|
||||||
#include "vatlib/vatlib.h"
|
#include "vatlib/vatlib.h"
|
||||||
|
|
||||||
@@ -73,6 +74,12 @@ namespace BlackCore
|
|||||||
{
|
{
|
||||||
namespace Vatsim
|
namespace Vatsim
|
||||||
{
|
{
|
||||||
|
const CLogCategoryList &CNetworkVatlib::getLogCategories()
|
||||||
|
{
|
||||||
|
static const CLogCategoryList cats({ CLogCategory::vatsimSpecific(), CLogCategory::network() });
|
||||||
|
return cats;
|
||||||
|
}
|
||||||
|
|
||||||
CNetworkVatlib::CNetworkVatlib(IOwnAircraftProvider *ownAircraft, QObject *parent)
|
CNetworkVatlib::CNetworkVatlib(IOwnAircraftProvider *ownAircraft, QObject *parent)
|
||||||
: INetwork(parent), COwnAircraftAware(ownAircraft),
|
: INetwork(parent), COwnAircraftAware(ownAircraft),
|
||||||
m_loginMode(LoginNormal),
|
m_loginMode(LoginNormal),
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
#include "blackcore/network.h"
|
#include "blackcore/network.h"
|
||||||
#include "blackcore/vatsim/vatsimsettings.h"
|
#include "blackcore/vatsim/vatsimsettings.h"
|
||||||
#include "blackcore/tokenbucket.h"
|
#include "blackcore/tokenbucket.h"
|
||||||
|
#include "blackmisc/simulation/ownaircraftprovider.h"
|
||||||
|
#include "blackmisc/simulation/simulatorplugininfo.h"
|
||||||
#include "blackmisc/aviation/aircrafticaocode.h"
|
#include "blackmisc/aviation/aircrafticaocode.h"
|
||||||
#include "blackmisc/aviation/aircraftparts.h"
|
#include "blackmisc/aviation/aircraftparts.h"
|
||||||
#include "blackmisc/aviation/airlineicaocode.h"
|
#include "blackmisc/aviation/airlineicaocode.h"
|
||||||
@@ -25,8 +27,6 @@
|
|||||||
#include "blackmisc/network/server.h"
|
#include "blackmisc/network/server.h"
|
||||||
#include "blackmisc/network/textmessagelist.h"
|
#include "blackmisc/network/textmessagelist.h"
|
||||||
#include "blackmisc/settingscache.h"
|
#include "blackmisc/settingscache.h"
|
||||||
#include "blackmisc/simulation/ownaircraftprovider.h"
|
|
||||||
#include "blackmisc/simulation/simulatorplugininfo.h"
|
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <vatlib/vatlib.h>
|
#include <vatlib/vatlib.h>
|
||||||
@@ -61,6 +61,9 @@ namespace BlackCore
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
//! Log. categories
|
||||||
|
static const BlackMisc::CLogCategoryList &getLogCategories();
|
||||||
|
|
||||||
//! Constructor
|
//! Constructor
|
||||||
CNetworkVatlib(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent = nullptr);
|
CNetworkVatlib(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraft, QObject *parent = nullptr);
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,12 @@ namespace BlackCore
|
|||||||
{
|
{
|
||||||
namespace Vatsim
|
namespace Vatsim
|
||||||
{
|
{
|
||||||
|
const CLogCategoryList &CVoiceVatlib::getLogCategories()
|
||||||
|
{
|
||||||
|
static const CLogCategoryList cats({ CLogCategory::vatsimSpecific(), CLogCategory::network() });
|
||||||
|
return cats;
|
||||||
|
}
|
||||||
|
|
||||||
CVoiceVatlib::CVoiceVatlib(QObject *parent) :
|
CVoiceVatlib::CVoiceVatlib(QObject *parent) :
|
||||||
IVoice(parent),
|
IVoice(parent),
|
||||||
m_audioService(Vat_CreateAudioService()),
|
m_audioService(Vat_CreateAudioService()),
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#include "blackcore/audiomixer.h"
|
#include "blackcore/audiomixer.h"
|
||||||
#include "blackcore/blackcoreexport.h"
|
#include "blackcore/blackcoreexport.h"
|
||||||
#include "blackcore/voice.h"
|
#include "blackcore/voice.h"
|
||||||
|
#include "blackmisc/logcategorylist.h"
|
||||||
#include <vatlib/vatlib.h>
|
#include <vatlib/vatlib.h>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
@@ -48,6 +48,8 @@ namespace BlackCore
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
//! Log. categories
|
||||||
|
static const BlackMisc::CLogCategoryList &getLogCategories();
|
||||||
|
|
||||||
//! Default constructor
|
//! Default constructor
|
||||||
CVoiceVatlib(QObject *parent = nullptr);
|
CVoiceVatlib(QObject *parent = nullptr);
|
||||||
|
|||||||
Reference in New Issue
Block a user