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

refs #372 Adapt CContextAudio and voice sample to IAudioMixer

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
samples/voiceclient/client.cpp
View File

@@ -11,7 +11,7 @@
using namespace BlackMisc::Audio;
using namespace BlackMisc::Aviation;
using namespace BlackCore;
/*
* Client
@@ -24,15 +24,19 @@ Client::Client(QObject *parent) :
m_channelCom1 = m_voice->createVoiceChannel();
m_inputDevice = m_voice->createInputDevice();
m_outputDevice = m_voice->createOutputDevice();
m_audioMixer = m_voice->createAudioMixer();
m_voice->connectChannelOutputDevice(m_channelCom1.get(), m_outputDevice.get());
m_voice->connectVoice(m_inputDevice.get(), m_audioMixer.get(), IAudioMixer::InputMicrophone);
m_voice->connectVoice(m_channelCom1.data(), m_audioMixer.get(), IAudioMixer::InputVoiceChannel1);
m_voice->connectVoice(m_audioMixer.get(), IAudioMixer::OutputOutputDevice1, m_outputDevice.get());
m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputOutputDevice1);
using namespace BlackCore;
connect(m_channelCom1.get(), &IVoiceChannel::connectionStatusChanged, this, &Client::connectionStatusChanged);
connect(m_channelCom1.get(), &IVoiceChannel::audioStarted, this, &Client::audioStartedStream);
connect(m_channelCom1.get(), &IVoiceChannel::audioStopped, this, &Client::audioStoppedStream);
connect(m_channelCom1.get(), &IVoiceChannel::userJoinedRoom, this, &Client::userJoinedRoom);
connect(m_channelCom1.get(), &IVoiceChannel::userLeftRoom, this, &Client::userLeftRoom);
connect(m_channelCom1.data(), &IVoiceChannel::connectionStatusChanged, this, &Client::connectionStatusChanged);
connect(m_channelCom1.data(), &IVoiceChannel::audioStarted, this, &Client::audioStartedStream);
connect(m_channelCom1.data(), &IVoiceChannel::audioStopped, this, &Client::audioStoppedStream);
connect(m_channelCom1.data(), &IVoiceChannel::userJoinedRoom, this, &Client::userJoinedRoom);
connect(m_channelCom1.data(), &IVoiceChannel::userLeftRoom, this, &Client::userLeftRoom);
using namespace std::placeholders;
m_commands["help"] = std::bind(&Client::help, this, _1);
@@ -167,7 +171,7 @@ void Client::enableLoopbackCmd(QTextStream &/*args*/)
{
m_stdout << endl;
m_stdout << "Enabling audio loopback." << endl;
m_voice->enableAudioLoopback(m_inputDevice.get(), m_outputDevice.get());
m_audioMixer->makeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputOutputDevice1);
printLinePrefix();
}
@@ -175,7 +179,7 @@ void Client::disableLoopbackCmd(QTextStream &/*args*/)
{
m_stdout << endl;
m_stdout << "Disabling audio loopback." << endl;
m_voice->enableAudioLoopback(m_inputDevice.get(), nullptr);
m_audioMixer->removeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputOutputDevice1);
printLinePrefix();
}

5
samples/voiceclient/client.h
View File

@@ -8,6 +8,7 @@
#include "blackcore/voice.h"
#include "blackcore/voice_channel.h"
#include "blackcore/audio_mixer.h"
#include <QObject>
#include <QPointer>
@@ -15,6 +16,7 @@
#include <QMap>
#include <QThread>
#include <QTextStream>
#include <QSharedPointer>
class Client : public QObject
{
@@ -62,7 +64,8 @@ private:
BlackCore::IVoice *m_voice;
std::unique_ptr<BlackCore::IAudioInputDevice> m_inputDevice;
std::unique_ptr<BlackCore::IAudioOutputDevice> m_outputDevice;
std::unique_ptr<BlackCore::IVoiceChannel> m_channelCom1;
std::unique_ptr<BlackCore::IAudioMixer> m_audioMixer;
QSharedPointer<BlackCore::IVoiceChannel> m_channelCom1;
QTextStream m_stdout;
};