flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-08 21:05:34 +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

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