Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1445 from birarda/master

Browse source 
simplify loopback trigger for injected audio, actually move to QThread
This commit is contained in:
Philip Rosedale 2014-01-03 10:43:06 -08:00
commit 94a57119f8
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/Hand.cpp
View file

@ -128,7 +128,6 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
// pass an AudioInjectorOptions struct to set position and disable loopback
AudioInjectorOptions injectorOptions;
injectorOptions.setPosition(newPosition);
injectorOptions.setShouldLoopback(false);
injectorOptions.setLoopbackAudioInterface(app->getAudio());
AudioScriptingInterface::playSound(&_catchSound, &injectorOptions);
@ -217,7 +216,6 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
// pass an AudioInjectorOptions struct to set position and disable loopback
AudioInjectorOptions injectorOptions;
injectorOptions.setPosition(ballPosition);
injectorOptions.setShouldLoopback(false);
injectorOptions.setLoopbackAudioInterface(app->getAudio());
AudioScriptingInterface::playSound(&_throwSound, &injectorOptions);

2
libraries/audio/src/AudioInjector.cpp
View file

@ -63,7 +63,7 @@ void AudioInjector::injectAudio() {
currentPacketPosition += rfcStreamUUID.size();
// pack the flag for loopback
bool loopbackFlag = _options.shouldLoopback();
bool loopbackFlag = (_options.getLoopbackAudioInterface() == NULL);
memcpy(currentPacketPosition, &loopbackFlag, sizeof(loopbackFlag));
currentPacketPosition += sizeof(loopbackFlag);

2
libraries/audio/src/AudioInjectorOptions.cpp
View file

@ -13,7 +13,6 @@ AudioInjectorOptions::AudioInjectorOptions(QObject* parent) :
_position(0.0f, 0.0f, 0.0f),
_volume(1.0f),
_orientation(glm::vec3(0.0f, 0.0f, 0.0f)),
_shouldLoopback(true),
_loopbackAudioInterface(NULL)
{
@ -23,6 +22,5 @@ AudioInjectorOptions::AudioInjectorOptions(const AudioInjectorOptions& other) {
_position = other._position;
_volume = other._volume;
_orientation = other._orientation;
_shouldLoopback = other._shouldLoopback;
_loopbackAudioInterface = other._loopbackAudioInterface;
}

4
libraries/audio/src/AudioInjectorOptions.h
View file

@ -35,9 +35,6 @@ public:
const glm::quat& getOrientation() const { return _orientation; }
void setOrientation(const glm::quat& orientation) { _orientation = orientation; }
bool shouldLoopback() const { return _shouldLoopback; }
void setShouldLoopback(bool shouldLoopback) { _shouldLoopback = shouldLoopback; }
AbstractAudioInterface* getLoopbackAudioInterface() const { return _loopbackAudioInterface; }
void setLoopbackAudioInterface(AbstractAudioInterface* loopbackAudioInterface)
{ _loopbackAudioInterface = loopbackAudioInterface; }
@ -45,7 +42,6 @@ private:
glm::vec3 _position;
float _volume;
glm::quat _orientation;
bool _shouldLoopback;
AbstractAudioInterface* _loopbackAudioInterface;
};

2
libraries/audio/src/AudioScriptingInterface.cpp
View file

@ -14,6 +14,8 @@ void AudioScriptingInterface::playSound(Sound* sound, const AudioInjectorOptions
QThread* injectorThread = new QThread();
injector->moveToThread(injectorThread);
// start injecting when the injector thread starts
connect(injectorThread, SIGNAL(started()), injector, SLOT(injectAudio()));