mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-22 21:35:40 +08:00
In #85 the voice context will be renamed to audio context, so the CValueObject classes will be renamed to namespace Audio too. As #140 changes many CValueClasses, this crossover change is done in the same unit of work.
This commit is contained in:
@@ -67,19 +67,19 @@ namespace BlackCore
|
||||
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override;
|
||||
|
||||
//! \copydoc IContextVoice::getComVoiceRooms()
|
||||
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRooms() const override;
|
||||
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override;
|
||||
|
||||
//! \copydoc IContextVoice::getComVoiceRoomsWithAudioStatus()
|
||||
virtual BlackMisc::Voice::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
|
||||
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
|
||||
|
||||
//! \copydoc IContextVoice::getCom1VoiceRoom
|
||||
virtual BlackMisc::Voice::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override;
|
||||
virtual BlackMisc::Audio::CVoiceRoom getCom1VoiceRoom(bool withAudioStatus) const override;
|
||||
|
||||
//! \copydoc IContextVoice::getCom2VoiceRoom
|
||||
virtual BlackMisc::Voice::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override;
|
||||
virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const override;
|
||||
|
||||
//! \copydoc IContextVoice::setComVoiceRooms()
|
||||
virtual void setComVoiceRooms(const BlackMisc::Voice::CVoiceRoom &voiceRoomCom1, const BlackMisc::Voice::CVoiceRoom &voiceRoomCom2) override;
|
||||
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2) override;
|
||||
|
||||
//! \copydoc IContextVoice::getCom1RoomCallsigns()
|
||||
virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const override;
|
||||
@@ -97,13 +97,13 @@ namespace BlackCore
|
||||
virtual void leaveAllVoiceRooms() override;
|
||||
|
||||
//! \copydoc IContextVoice::getAudioDevices()
|
||||
virtual BlackMisc::Voice::CAudioDeviceList getAudioDevices() const override;
|
||||
virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const override;
|
||||
|
||||
//! \copydoc IContextVoice::getCurrentAudioDevices()
|
||||
virtual BlackMisc::Voice::CAudioDeviceList getCurrentAudioDevices() const override;
|
||||
virtual BlackMisc::Audio::CAudioDeviceList getCurrentAudioDevices() const override;
|
||||
|
||||
//! \copydoc IContextVoice::setCurrentAudioDevice()
|
||||
virtual void setCurrentAudioDevice(const BlackMisc::Voice::CAudioDevice &audioDevice) override;
|
||||
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override;
|
||||
|
||||
//! \copydoc IContextVoice::setVolumes()
|
||||
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override;
|
||||
|
||||
Reference in New Issue
Block a user