flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-24 16:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #472 Removed static_cast<int> for enums in blackcore, no longer needed.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-27 18:39:41 +01:00
parent d13e863218
commit a6d17efc31
37 changed files with 99 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/airspace_analyzer.cpp
View File

@@ -48,9 +48,7 @@ namespace BlackCore
Q_ASSERT(c);
// network
// If I do not explicitly set Qt::QueuedConnection here, I get a warning message when such a signal is sent:
// "INetwork::NetworkConenctionStatus is not registered" (similar to https://forum.qt.io/topic/27083/signal-slot-between-threads-qt-5/9)
c = connect(network, &INetwork::connectionStatusChanged, this, &CAirspaceAnalyzer::ps_onConnectionStatusChanged, Qt::QueuedConnection);
c = connect(network, &INetwork::connectionStatusChanged, this, &CAirspaceAnalyzer::ps_onConnectionStatusChanged);
Q_ASSERT(c);
Q_UNUSED(c);

5
src/blackcore/blackcorefreefunctions.cpp
View File

@@ -16,8 +16,9 @@ namespace BlackCore
{
void registerMetadata()
{
qRegisterMetaType<IVoiceChannel::ConnectionStatus>();
qRegisterMetaType<BlackCore::INetwork::ConnectionStatus>();
qDBusRegisterMetaType<BlackCore::IVoiceChannel::ConnectionStatus>();
qDBusRegisterMetaType<BlackCore::INetwork::ConnectionStatus>();
qDBusRegisterMetaType<BlackCore::INetwork::LoginMode>();
qRegisterMetaType<BlackCore::CWebReaderFlags::WebReaderFlag>();
qRegisterMetaType<BlackCore::CWebReaderFlags::WebReader>();
qDBusRegisterMetaType<BlackCore::CLogSubscriptionHash>();

17
src/blackcore/context_audio.h
View File

@@ -14,6 +14,7 @@
#include "blackcoreexport.h"
#include "blackcore/context.h"
#include "blackmisc/notificationsounds.h"
#include "blackmisc/identifier.h"
#include "blackmisc/genericdbusinterface.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
@@ -48,14 +49,6 @@ namespace BlackCore
IContextAudio(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {}
public:
//! ComUnit number
enum ComUnit
{
Com1,
Com2
};
//! Interface name
static const QString &InterfaceName()
{
@@ -109,7 +102,7 @@ namespace BlackCore
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const = 0;
//! Get voice room per com unit
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(int comUnit, bool withAudioStatus) const = 0;
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnit, bool withAudioStatus) const = 0;
//! Set voice rooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0;
@@ -121,10 +114,10 @@ namespace BlackCore
virtual void leaveAllVoiceRooms() = 0;
//! Room user callsigns
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnit) const = 0;
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0;
//! Room users
virtual BlackMisc::Network::CUserList getRoomUsers(int comUnit) const = 0;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0;
//! Audio devices
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const = 0;
@@ -155,7 +148,7 @@ namespace BlackCore
//! Play notification sound
//! \param notification CSoundGenerator::Notification
//! \param considerSettings consider settings (notification on/off), false means settings ignored
virtual void playNotification(uint notification, bool considerSettings) const = 0;
virtual void playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const = 0;
//! Enable audio loopback
virtual void enableAudioLoopback(bool enable = true) = 0;

8
src/blackcore/context_audio_empty.h
View File

@@ -45,7 +45,7 @@ namespace BlackCore
}
//! \copydoc IContextAudio::getVoiceRoom
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(int comUnitValue, bool withAudioStatus) const override
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override
{
Q_UNUSED(comUnitValue);
Q_UNUSED(withAudioStatus);
@@ -68,7 +68,7 @@ namespace BlackCore
}
//! \copydoc IContextAudio::getRoomCallsigns()
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
{
Q_UNUSED(comUnitValue);
logEmptyContextWarning(Q_FUNC_INFO);
@@ -76,7 +76,7 @@ namespace BlackCore
}
//! \copydoc IContextAudio::getRoomUsers()
virtual BlackMisc::Network::CUserList getRoomUsers(int comUnitValue) const override
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
{
Q_UNUSED(comUnitValue);
logEmptyContextWarning(Q_FUNC_INFO);
@@ -146,7 +146,7 @@ namespace BlackCore
}
//! \copydoc IContextAudio::playNotification()
virtual void playNotification(uint notification, bool considerSettings) const override
virtual void playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const override
{
Q_UNUSED(notification);
Q_UNUSED(considerSettings);

34
src/blackcore/context_audio_impl.cpp
View File

@@ -96,12 +96,12 @@ namespace BlackCore
/*
* Voice rooms for COM
*/
CVoiceRoom CContextAudio::getVoiceRoom(int comUnitValue, bool withAudioStatus) const
CVoiceRoom CContextAudio::getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << withAudioStatus;
auto voiceChannel = m_voiceChannelMapping.value(static_cast<ComUnit>(comUnitValue));
auto voiceChannel = m_voiceChannelMapping.value(comUnitValue);
if (voiceChannel)
return voiceChannel->getVoiceRoom();
@@ -118,7 +118,7 @@ namespace BlackCore
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
CVoiceRoomList voiceRoomList;
auto voiceChannelCom1 = m_voiceChannelMapping.value(Com1);
auto voiceChannelCom1 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
if (voiceChannelCom1)
{
CVoiceRoom room = voiceChannelCom1->getVoiceRoom();
@@ -129,7 +129,7 @@ namespace BlackCore
voiceRoomList.push_back(CVoiceRoom());
}
auto voiceChannelCom2 = m_voiceChannelMapping.value(Com2);
auto voiceChannelCom2 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com2);
if (voiceChannelCom2)
{
CVoiceRoom room = voiceChannelCom2->getVoiceRoom();
@@ -296,10 +296,10 @@ namespace BlackCore
// changed rooms? But only compare on "URL", not status as connected etc.
if (currentRoomCom1.getVoiceRoomUrl() != newRoomCom1.getVoiceRoomUrl())
{
auto oldVoiceChannel = m_voiceChannelMapping.value(Com1);
auto oldVoiceChannel = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
if (oldVoiceChannel)
{
m_voiceChannelMapping.remove(Com1);
m_voiceChannelMapping.remove(BlackMisc::Aviation::CComSystem::Com1);
// If the voice channel is not used by anybody else
if (!m_voiceChannelMapping.values().contains(oldVoiceChannel))
@@ -318,7 +318,7 @@ namespace BlackCore
auto newVoiceChannel = getVoiceChannelBy(newRoomCom1);
newVoiceChannel->setOwnAircraftCallsign(ownCallsign);
bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel);
m_voiceChannelMapping.insert(Com1, newVoiceChannel);
m_voiceChannelMapping.insert(BlackMisc::Aviation::CComSystem::Com1, newVoiceChannel);
// If the voice channel is not used by anybody else
if (!inUse)
@@ -336,10 +336,10 @@ namespace BlackCore
// changed rooms? But only compare on "URL", not status as connected etc.
if (currentRoomCom2.getVoiceRoomUrl() != newRoomCom2.getVoiceRoomUrl())
{
auto oldVoiceChannel = m_voiceChannelMapping.value(Com2);
auto oldVoiceChannel = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com2);
if (oldVoiceChannel)
{
m_voiceChannelMapping.remove(Com2);
m_voiceChannelMapping.remove(BlackMisc::Aviation::CComSystem::Com2);
// If the voice channel is not used by anybody else
if (!m_voiceChannelMapping.values().contains(oldVoiceChannel))
@@ -358,7 +358,7 @@ namespace BlackCore
auto newVoiceChannel = getVoiceChannelBy(newRoomCom2);
newVoiceChannel->setOwnAircraftCallsign(ownCallsign);
bool inUse = m_voiceChannelMapping.values().contains(newVoiceChannel);
m_voiceChannelMapping.insert(Com2, newVoiceChannel);
m_voiceChannelMapping.insert(BlackMisc::Aviation::CComSystem::Com2, newVoiceChannel);
// If the voice channel is not used by anybody else
if (!inUse)
@@ -384,26 +384,25 @@ namespace BlackCore
if (m_channel2) { m_channel2->setOwnAircraftCallsign(callsign); }
}
CCallsignSet CContextAudio::getRoomCallsigns(int comUnitValue) const
CCallsignSet CContextAudio::getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
auto voiceChannel = m_voiceChannelMapping.value(static_cast<ComUnit>(comUnitValue));
auto voiceChannel = m_voiceChannelMapping.value(comUnitValue);
if (voiceChannel)
return voiceChannel->getVoiceRoomCallsigns();
else
return CCallsignSet();
}
Network::CUserList CContextAudio::getRoomUsers(int comUnitValue) const
Network::CUserList CContextAudio::getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const
{
Q_ASSERT(this->m_voice);
Q_ASSERT(this->getRuntime());
if (!this->getRuntime()->getIContextNetwork()) return Network::CUserList();
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
auto comUnit = static_cast<ComUnit>(comUnitValue);
return this->getIContextNetwork()->getUsersForCallsigns(this->getRoomCallsigns(comUnit));
}
@@ -421,19 +420,18 @@ namespace BlackCore
/*
* Notification
*/
void CContextAudio::playNotification(uint notification, bool considerSettings) const
void CContextAudio::playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << notification;
auto notificationSound = static_cast<BlackSound::CNotificationSounds::Notification>(notification);
if (considerSettings)
{
Q_ASSERT(this->getIContextSettings());
bool play = this->getIContextSettings()->getAudioSettings().getNotificationFlag(notificationSound);
bool play = this->getIContextSettings()->getAudioSettings().getNotificationFlag(notification);
if (!play) return;
}
BlackSound::CSoundGenerator::playNotificationSound(90, notificationSound);
BlackSound::CSoundGenerator::playNotificationSound(90, notification);
}
/*

10
src/blackcore/context_audio_impl.h
View File

@@ -56,7 +56,7 @@ namespace BlackCore
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
//! \copydoc IContextAudio::getVoiceRoom
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(int comUnitValue, bool withAudioStatus) const override;
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override;
//! \copydoc IContextAudio::setComVoiceRooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override;
@@ -65,10 +65,10 @@ namespace BlackCore
virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc IContextAudio::getRoomCallsigns()
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override;
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
//! \copydoc IContextAudio::getRoomUsers()
virtual BlackMisc::Network::CUserList getRoomUsers(int comUnitValue) const override;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
//! \copydoc IContextAudio::leaveAllVoiceRooms
virtual void leaveAllVoiceRooms() override;
@@ -98,7 +98,7 @@ namespace BlackCore
virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) const override;
//! \copydoc IContextAudio::playNotification()
virtual void playNotification(uint notification, bool considerSettings) const override;
virtual void playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const override;
//! \copydoc IContextAudio::enableAudioLoopback()
virtual void enableAudioLoopback(bool enable = true) override;
@@ -167,7 +167,7 @@ namespace BlackCore
std::unique_ptr<IAudioInputDevice> m_voiceInputDevice;
QList<QSharedPointer<IVoiceChannel>> m_unusedVoiceChannels;
QHash<ComUnit, QSharedPointer<IVoiceChannel>> m_voiceChannelMapping;
QHash<BlackMisc::Aviation::CComSystem::ComUnit, QSharedPointer<IVoiceChannel>> m_voiceChannelMapping;
};
} // namespace

8
src/blackcore/context_audio_proxy.cpp
View File

@@ -61,7 +61,7 @@ namespace BlackCore
/*
* COM1 callsigns
*/
BlackMisc::Aviation::CCallsignSet CContextAudioProxy::getRoomCallsigns(int comUnitValue) const
BlackMisc::Aviation::CCallsignSet CContextAudioProxy::getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignSet>(QLatin1Literal("getRoomCallsigns"), comUnitValue);
}
@@ -69,7 +69,7 @@ namespace BlackCore
/*
* COM1 users
*/
BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(int comUnitValue) const
BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1Literal("getRoomUsers"), comUnitValue);
}
@@ -117,7 +117,7 @@ namespace BlackCore
/*
* Voice room
*/
CVoiceRoom CContextAudioProxy::getVoiceRoom(int comUnitValue, bool withAudioStatus) const
CVoiceRoom CContextAudioProxy::getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1Literal("getVoiceRoom"), comUnitValue, withAudioStatus);
}
@@ -149,7 +149,7 @@ namespace BlackCore
/*
* Notification sound
*/
void CContextAudioProxy::playNotification(uint notification, bool considerSettings) const
void CContextAudioProxy::playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const
{
this->m_dBusInterface->callDBus(QLatin1Literal("playNotification"), notification, considerSettings);
}

8
src/blackcore/context_audio_proxy.h
View File

@@ -58,7 +58,7 @@ namespace BlackCore
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
//! \copydoc IContextAudio::getVoiceRoom
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(int comUnitValue, bool withAudioStatus) const override;
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override;
//! \copydoc IContextAudio::setComVoiceRooms()
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) override;
@@ -67,10 +67,10 @@ namespace BlackCore
virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) override;
//! \copydoc IContextAudio::getRoomCallsigns()
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(int comUnitValue) const override;
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
//! \copydoc IContextAudio::getRoomUsers()
virtual BlackMisc::Network::CUserList getRoomUsers(int comUnitValue) const override;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
//! \copydoc IContextAudio::leaveAllVoiceRooms
virtual void leaveAllVoiceRooms() override;
@@ -100,7 +100,7 @@ namespace BlackCore
virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) const override;
//! \copydoc IContextAudio::playNotification
virtual void playNotification(uint notification, bool considerSettings) const override;
virtual void playNotification(BlackSound::CNotificationSounds::Notification notification, bool considerSettings) const override;
//! \copydoc IContextAudio::enableAudioLoopback()
virtual void enableAudioLoopback(bool enable = true) override;

9
src/blackcore/context_network.h
View File

@@ -118,11 +118,7 @@ namespace BlackCore
void connectionTerminated();
//! Connection status changed
//! \param from old status
//! \param to new status
//! \remarks If I use the enum, adaptor / interface are not created correctly
//! \see INetwork::ConnectionStatus
void connectionStatusChanged(int from, int to);
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Text messages received (also private chat messages, rfaio channel messages)
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &textMessages);
@@ -199,8 +195,7 @@ namespace BlackCore
//! Connect to Network
//! \return messages generated during connecting
//! \see INetwork::LoginMode
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, int loginMode) = 0;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode loginMode) = 0;
//! Server which is connected, if not connected empty default object.
virtual BlackMisc::Network::CServer getConnectedServer() const = 0;

2
src/blackcore/context_network_empty.h
View File

@@ -82,7 +82,7 @@ namespace BlackCore
}
//! \copydoc IContextNetwork::connectToNetwork
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, int mode) override
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override
{
Q_UNUSED(mode);
Q_UNUSED(server);

3
src/blackcore/context_network_impl.cpp
View File

@@ -143,7 +143,7 @@ namespace BlackCore
if (this->m_airspace) { this->m_airspace->gracefulShutdown(); }
}
CStatusMessage CContextNetwork::connectToNetwork(const CServer &server, int loginMode)
CStatusMessage CContextNetwork::connectToNetwork(const CServer &server, INetwork::LoginMode mode)
{
if (this->isDebugEnabled()) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
QString msg;
@@ -171,7 +171,6 @@ namespace BlackCore
{
this->m_currentStatus = INetwork::Connecting; // as semaphore we are going to connect
this->m_airspace->setConnected(true);
INetwork::LoginMode mode = static_cast<INetwork::LoginMode>(loginMode);
this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser());
const CSimulatedAircraft ownAircraft(this->ownAircraft());
this->m_network->presetServer(server);

2
src/blackcore/context_network_impl.h
View File

@@ -139,7 +139,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::connectToNetwork()
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, int mode) override;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override;
//! \copydoc IContextNetwork::getConnectedServer
virtual BlackMisc::Network::CServer getConnectedServer() const override;

4
src/blackcore/context_network_proxy.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackCore
void CContextNetworkProxy::relaySignals(const QString &serviceName, QDBusConnection &connection)
{
bool s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"connectionStatusChanged", this, SIGNAL(connectionStatusChanged(int, int)));
"connectionStatusChanged", this, SIGNAL(connectionStatusChanged(BlackCore::INetwork::ConnectionStatus, BlackCore::INetwork::ConnectionStatus)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
"changedAtcStationsBooked", this, SIGNAL(changedAtcStationsBooked()));
@@ -225,7 +225,7 @@ namespace BlackCore
this->m_dBusInterface->callDBus(QLatin1Literal("testAddAircraftParts"), callsign, parts, incremental);
}
CStatusMessage CContextNetworkProxy::connectToNetwork(const CServer &server, int loginMode)
CStatusMessage CContextNetworkProxy::connectToNetwork(const CServer &server, INetwork::LoginMode loginMode)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1Literal("connectToNetwork"), server, loginMode);
}

2
src/blackcore/context_network_proxy.h
View File

@@ -76,7 +76,7 @@ namespace BlackCore
virtual BlackMisc::Aviation::CAtcStation getOnlineStationForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
//! \copydoc IContextNetwork::connectToNetwork
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, int mode) override;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode mode) override;
//! \copydoc IContextNetwork::disconnectFromNetwork()
virtual BlackMisc::CStatusMessage disconnectFromNetwork() override;

2
src/blackcore/context_ownaircraft.h
View File

@@ -92,7 +92,7 @@ namespace BlackCore
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0;
//! Tune in a com frequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) = 0;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) = 0;
//! Set current pilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) = 0;

3
src/blackcore/context_ownaircraft_impl.cpp
View File

@@ -187,9 +187,8 @@ namespace BlackCore
return changed;
}
bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const CIdentifier &originator)
bool CContextOwnAircraft::updateActiveComFrequency(const CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit unit, const CIdentifier &originator)
{
CComSystem::ComUnit unit = static_cast<CComSystem::ComUnit>(comUnit);
if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return false; }
if (!CComSystem::isValidComFrequency(frequency)) { return false; }
CComSystem com1, com2;

2
src/blackcore/context_ownaircraft_impl.h
View File

@@ -94,7 +94,7 @@ namespace BlackCore
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IContextOwnAircraft::updateComFrequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) override;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IContextOwnAircraft::updatePilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override;

2
src/blackcore/context_ownaircraft_proxy.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateCockpit"), com1, com2, transponder, originator);
}
bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, int comUnit, const CIdentifier &originator)
bool CContextOwnAircraftProxy::updateActiveComFrequency(const PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const CIdentifier &originator)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1Literal("updateActiveComFrequency"), frequency, comUnit, originator);
}

2
src/blackcore/context_ownaircraft_proxy.h
View File

@@ -44,7 +44,7 @@ namespace BlackCore
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IContextOwnAircraft::updateComFrequency
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const BlackMisc::CIdentifier &originator) override;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
//! \copydoc IContextOwnAircraft::updatePilot
virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override;

5
src/blackcore/network.h
View File

@@ -181,7 +181,7 @@ namespace BlackCore
* Select a login mode before connecting.
* \pre Network must be disconnected when calling this function.
*/
virtual void presetLoginMode(LoginMode mode) = 0;
virtual void presetLoginMode(BlackCore::INetwork::LoginMode mode) = 0;
/*!
* Set simulator info before connecting.
@@ -462,7 +462,7 @@ namespace BlackCore
/*!
* The status of our connection has changed.
*/
void connectionStatusChanged(ConnectionStatus oldStatus, ConnectionStatus newStatus);
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus oldStatus, BlackCore::INetwork::ConnectionStatus newStatus);
/*!
* We received a reply to one of our pings.
@@ -538,5 +538,6 @@ namespace BlackCore
} // namespace
Q_DECLARE_METATYPE(BlackCore::INetwork::ConnectionStatus)
Q_DECLARE_METATYPE(BlackCore::INetwork::LoginMode)
#endif // guard

8
src/blackgui/components/aircraftcomponent.cpp
View File

@@ -117,12 +117,10 @@ namespace BlackGui
this->tabBar()->setTabText(ap, aps);
}
void CAircraftComponent::ps_connectionStatusChanged(int from, int to)
void CAircraftComponent::ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus fromStatus = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus toStatus = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(fromStatus);
if (INetwork::isDisconnectedStatus(toStatus))
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
{
this->ui->tvp_AircraftInRange->clear();
}

3
src/blackgui/components/aircraftcomponent.h
View File

@@ -16,6 +16,7 @@
#include "blackgui/components/enableforruntime.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackcore/network.h"
#include <QTabWidget>
#include <QScopedPointer>
@@ -72,7 +73,7 @@ namespace BlackGui
void ps_onRowCountChanged(int count, bool withFilter);
//! Connection status has been changed
void ps_connectionStatusChanged(int from, int to);
void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Highlight in simulator
void ps_onMenuHighlightInSimulator(const BlackMisc::Simulation::CSimulatedAircraft &aircraft);

10
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -200,12 +200,10 @@ namespace BlackGui
this->m_timestampBookedStationsChanged = QDateTime::currentDateTimeUtc();
}
void CAtcStationComponent::ps_connectionStatusChanged(uint from, uint to)
void CAtcStationComponent::ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus fromStatus = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus toStatus = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(fromStatus);
if (INetwork::isDisconnectedStatus(toStatus))
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
{
this->ui->tvp_AtcStationsOnline->clear();
this->updateTreeView();
@@ -255,7 +253,7 @@ namespace BlackGui
{
if (unit != CComSystem::Com1 && unit != CComSystem::Com2) { return; }
if (!CComSystem::isValidComFrequency(frequency)) { return; }
this->getIContextOwnAircraft()->updateActiveComFrequency(frequency, static_cast<int>(unit), identifier());
this->getIContextOwnAircraft()->updateActiveComFrequency(frequency, unit, identifier());
}
void CAtcStationComponent::updateTreeView()

3
src/blackgui/components/atcstationcomponent.h
View File

@@ -16,6 +16,7 @@
#include "blackgui/components/enableforruntime.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackcore/network.h"
#include "blackmisc/identifiable.h"
#include "blackmisc/aviation/atcstation.h"
#include <QTabWidget>
@@ -94,7 +95,7 @@ namespace BlackGui
void ps_changedAtcStationsOnline();
//! Connection status has been changed
void ps_connectionStatusChanged(uint from, uint to);
void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Request dummy ATC online stations
void ps_testCreateDummyOnlineAtcStations(int number);

2
src/blackgui/components/enableforruntime.cpp
View File

@@ -118,7 +118,7 @@ namespace BlackGui
void CEnableForRuntime::playNotifcationSound(BlackSound::CNotificationSounds::Notification notification) const
{
if (!this->getIContextAudio()) return;
this->getIContextAudio()->playNotification(static_cast<uint>(notification), true);
this->getIContextAudio()->playNotification(notification, true);
}
}
}

8
src/blackgui/components/infobarstatuscomponent.cpp
View File

@@ -133,13 +133,11 @@ namespace BlackGui
}
}
void CInfoBarStatusComponent::ps_onNetworkConnectionChanged(int from, int to)
void CInfoBarStatusComponent::ps_onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus fromStatus = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus toStatus = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(fromStatus);
Q_UNUSED(from);
switch (toStatus)
switch (to)
{
case INetwork::Disconnected:
case INetwork::DisconnectedError:

3
src/blackgui/components/infobarstatuscomponent.h
View File

@@ -14,6 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "enableforruntime.h"
#include "blackcore/network.h"
#include "../led.h"
#include <QFrame>
#include <QScopedPointer>
@@ -58,7 +59,7 @@ namespace BlackGui
void ps_onSimulatorStatusChanged(int status);
//! Network connection has been changed
void ps_onNetworkConnectionChanged(int from, int to);
void ps_onNetworkConnectionChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Context menu requested
void ps_customAudioContextMenuRequested(const QPoint &position);

2
src/blackgui/components/logincomponent.cpp
View File

@@ -244,7 +244,7 @@ namespace BlackGui
this->getIContextOwnAircraft()->updateOwnAircraftPilot(currentServer.getUser());
// Login
msg = this->getIContextNetwork()->connectToNetwork(currentServer, static_cast<uint>(mode));
msg = this->getIContextNetwork()->connectToNetwork(currentServer, mode);
}
else
{

9
src/blackgui/components/mainkeypadareacomponent.cpp
View File

@@ -133,15 +133,12 @@ namespace BlackGui
}
}
void CMainKeypadAreaComponent::ps_connectionStatusChanged(uint from, uint to)
void CMainKeypadAreaComponent::ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus statusFrom = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus statusTo = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(statusFrom);
Q_UNUSED(from);
// Connected button
if (statusTo == INetwork::Connected)
if (to == INetwork::Connected)
{
this->ui->pb_Connect->setText("Disconnect");
this->ui->pb_Connect->setStyleSheet("background-color: green");

3
src/blackgui/components/mainkeypadareacomponent.h
View File

@@ -15,6 +15,7 @@
#include "blackgui/blackguiexport.h"
#include "maininfoareacomponent.h"
#include "enableforruntime.h"
#include "blackcore/network.h"
#include "blackmisc/identifier.h"
#include <QFrame>
@@ -76,7 +77,7 @@ namespace BlackGui
void ps_buttonSelected();
//! \copydoc BlackCore::IContextNetwork::connectionStatusChanged
void ps_connectionStatusChanged(uint from, uint to);
void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Command line entered
void ps_commandEntered();

8
src/blackgui/components/mappingcomponent.cpp
View File

@@ -330,12 +330,10 @@ namespace BlackGui
Q_UNUSED(aircraft);
}
void CMappingComponent::ps_onConnectionStatusChanged(uint from, uint to)
void CMappingComponent::ps_onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus fromStatus = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus toStatus = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(fromStatus);
if (INetwork::isDisconnectedStatus(toStatus))
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
{
this->ui->tvp_SimulatedAircraft->clear();
}

3
src/blackgui/components/mappingcomponent.h
View File

@@ -17,6 +17,7 @@
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackgui/views/checkboxdelegate.h"
#include "blackcore/network.h"
#include "blackmisc/identifier.h"
#include "blackmisc/simulation/simulatedaircraft.h"
#include "blackmisc/simulation/aircraftmodellist.h"
@@ -104,7 +105,7 @@ namespace BlackGui
void ps_onFastPositionUpdatesEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator);
//! Connection status has been changed
void ps_onConnectionStatusChanged(uint from, uint to);
void ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//! Simulator has handled airspace snapshot
void ps_onAirspaceSnapshotHandled();

8
src/blackgui/components/usercomponent.cpp
View File

@@ -91,12 +91,10 @@ namespace BlackGui
this->tabBar()->setTabText(ic, c);
}
void CUserComponent::ps_connectionStatusChanged(uint from, uint to)
void CUserComponent::ps_connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
{
INetwork::ConnectionStatus fromStatus = static_cast<INetwork::ConnectionStatus>(from);
INetwork::ConnectionStatus toStatus = static_cast<INetwork::ConnectionStatus>(to);
Q_UNUSED(fromStatus);
if (INetwork::isDisconnectedStatus(toStatus))
Q_UNUSED(from);
if (INetwork::isDisconnectedStatus(to))
{
this->ui->tvp_AllUsers->clear();
this->ui->tvp_Clients->clear();

4
src/blackgui/components/usercomponent.h
View File

@@ -16,7 +16,7 @@
#include "blackgui/components/enableforruntime.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/updatetimer.h"
#include "blackcore/network.h"
#include <QTabWidget>
#include <QTimer>
#include <QScopedPointer>
@@ -67,7 +67,7 @@ namespace BlackGui
void ps_onCountChanged(int count, bool withFilter);
//! Connection status
void ps_connectionStatusChanged(uint from, uint to);
void ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
private:
QScopedPointer<Ui::CUserComponent> ui;

8
src/blackgui/components/voiceroomscomponent.cpp
View File

@@ -82,7 +82,7 @@ namespace BlackGui
if (room1.isConnected())
{
this->ui->le_CockpitVoiceRoomCom1->setStyleSheet("background: green");
if (this->getIContextAudio()) this->ui->tvp_CockpitVoiceRoom1->updateContainer(this->getIContextAudio()->getRoomUsers(IContextAudio::Com1));
if (this->getIContextAudio()) this->ui->tvp_CockpitVoiceRoom1->updateContainer(this->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com1));
}
else
{
@@ -111,7 +111,7 @@ namespace BlackGui
CNotificationSounds::Notification sound = connected ?
CNotificationSounds::NotificationVoiceRoomJoined :
CNotificationSounds::NotificationVoiceRoomLeft;
this->getIContextAudio()->playNotification(static_cast<uint>(sound), true);
this->getIContextAudio()->playNotification(sound, true);
}
}
}
@@ -121,7 +121,7 @@ namespace BlackGui
if (!this->getIContextAudio()) { return; }
if (!this->ui->le_CockpitVoiceRoomCom1->text().trimmed().isEmpty())
{
this->ui->tvp_CockpitVoiceRoom1->updateContainer(this->getIContextAudio()->getRoomUsers(IContextAudio::Com1));
this->ui->tvp_CockpitVoiceRoom1->updateContainer(this->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com1));
}
else
{
@@ -130,7 +130,7 @@ namespace BlackGui
if (!this->ui->le_CockpitVoiceRoomCom2->text().trimmed().isEmpty())
{
this->ui->tvp_CockpitVoiceRoom2->updateContainer(this->getIContextAudio()->getRoomUsers(IContextAudio::Com2));
this->ui->tvp_CockpitVoiceRoom2->updateContainer(this->getIContextAudio()->getRoomUsers(BlackMisc::Aviation::CComSystem::Com2));
}
else
{

7
src/swiftgui_standard/swiftguistd.cpp
View File

@@ -266,14 +266,13 @@ void SwiftGuiStd::ps_onConnectionTerminated()
this->updateGuiStatusInformation();
}
void SwiftGuiStd::ps_onConnectionStatusChanged(int from, int to)
void SwiftGuiStd::ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
{
Q_UNUSED(from);
this->updateGuiStatusInformation();
INetwork::ConnectionStatus newStatus = static_cast<INetwork::ConnectionStatus>(to);
// sounds
switch (newStatus)
switch (to)
{
case INetwork::Connected:
this->playNotifcationSound(BlackSound::CNotificationSounds::NotificationLogin);
@@ -418,5 +417,5 @@ void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notific
{
if (!this->m_contextAudioAvailable) { return; }
if (!this->ui->comp_MainInfoArea->getSettingsComponent()->playNotificationSounds()) { return; }
this->getIContextAudio()->playNotification(static_cast<uint>(notification), true);
this->getIContextAudio()->playNotification(notification, true);
}

2
src/swiftgui_standard/swiftguistd.h
View File

@@ -202,7 +202,7 @@ private slots:
//! Connection status changed
//! \param from old status, as int so it is compliant with DBus
//! \param to new status, as int so it is compliant with DBus
void ps_onConnectionStatusChanged(int from, int to);
void ps_onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
//
// GUI related slots