refs #409 Move FS specific methods into FSX and FS9 driver

The reason for this change is, that the information these methods provide
are similar for FS9 and FSX, but the content is different.
This commit is contained in:
Roland Winklmeier
2015-05-08 14:03:41 +02:00
parent ddb02608e0
commit 74b6bb9756
4 changed files with 49 additions and 0 deletions

View File

@@ -300,6 +300,21 @@ namespace BlackSimPlugin
}
}
QString CSimulatorFs9::aircraftObjectsDir()
{
QString dir = CFsCommonUtil::fs9AircraftDirFromRegistry();
if (!dir.isEmpty()) { return dir; }
return "C:/Flight Simulator 9/Aircraft";
}
const QStringList &CSimulatorFs9::excludeDirectories()
{
static const QStringList exclude
{
};
return exclude;
}
CSimulatorFs9Listener::CSimulatorFs9Listener(QObject *parent) :
BlackCore::ISimulatorListener(parent),
m_timer(new QTimer(this))

View File

@@ -107,6 +107,13 @@ namespace BlackSimPlugin
void disconnectAllClients();
//! Aircraft object directory
//! \todo Read from settings if registry fails
static QString aircraftObjectsDir();
//! Do not include the following directories for FS
static const QStringList &excludeDirectories();
QHash<BlackMisc::Aviation::CCallsign, QPointer<CFs9Client>> m_hashFs9Clients;
QMetaObject::Connection m_connectionHostMessages;
int m_dispatchTimerId = -1;

View File

@@ -852,6 +852,26 @@ namespace BlackSimPlugin
}
}
QString CSimulatorFsx::simObjectsDir()
{
QString dir = CFsCommonUtil::fsxSimObjectsDirFromRegistry();
if (!dir.isEmpty()) { return dir; }
return "P:/FlightSimulatorX (MSI)/SimObjects";
// "p:/temp/SimObjects"
}
const QStringList &CSimulatorFsx::excludeDirectories()
{
static const QStringList exclude
{
"SimObjects/Animals",
"SimObjects/Misc",
"SimObjects/GroundVehicles",
"SimObjects/Boats"
};
return exclude;
}
CSimulatorFsxListener::CSimulatorFsxListener(QObject *parent) : ISimulatorListener(parent),
m_timer(new QTimer(this))
{

View File

@@ -185,6 +185,13 @@ namespace BlackSimPlugin
//! Sync time with user's computer
void synchronizeTime(const BlackMisc::PhysicalQuantities::CTime &zuluTimeSim, const BlackMisc::PhysicalQuantities::CTime &localTimeSim);
//! SimObjects directory
//! \todo Read from settings if registry fails
static QString simObjectsDir();
//! Do not include the following directories for FS
static const QStringList &excludeDirectories();
static const int SkipUpdateCyclesForCockpit = 10; //!< skip x cycles before updating cockpit again
bool m_simConnected = false; //!< Is simulator connected?
bool m_simSimulating = false; //!< Simulator running?