refs #372 Adapt CContextAudio and voice sample to IAudioMixer

This commit is contained in:
Roland Winklmeier
2015-02-01 14:53:21 +01:00
committed by Klaus Basan
parent 7ba3a50e18
commit ff56d64ff2
4 changed files with 40 additions and 19 deletions

View File

@@ -19,6 +19,7 @@
#include "voice.h"
#include "voice_channel.h"
#include "audio_device.h"
#include "audio_mixer.h"
#include "input_manager.h"
#include "blackinput/keyboard.h"
#include "blackmisc/voiceroomlist.h"
@@ -166,15 +167,19 @@ namespace BlackCore
//! Connection in transition
bool inTransitionState() const;
std::unique_ptr<IVoice> m_voice; //!< underlying voice lib
CInputManager *m_inputManager = nullptr;
CInputManager::RegistrationHandle m_handlePtt;
std::unique_ptr<IVoice> m_voice; //!< underlying voice lib
std::unique_ptr<IAudioMixer> m_audioMixer;
int m_outDeviceVolume = 100;
std::unique_ptr<IVoiceChannel> m_channelCom1;
std::unique_ptr<IVoiceChannel> m_channelCom2;
std::unique_ptr<IAudioOutputDevice> m_voiceOutputDevice;
int m_outDeviceVolume = 100;
std::unique_ptr<IAudioInputDevice> m_voiceInputDevice;
};
} // namespace