From a61e214c9a2fcc966c439b77cc72099f44b15863 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 3 Jan 2014 10:16:59 -0800
Subject: [PATCH] simplify loopback trigger for injected audio

---
 interface/src/avatar/Hand.cpp                | 2 --
 libraries/audio/src/AudioInjector.cpp        | 2 +-
 libraries/audio/src/AudioInjectorOptions.cpp | 2 --
 libraries/audio/src/AudioInjectorOptions.h   | 4 ----
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 6bedfdba2a..9b75b78b46 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -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);
diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 51b289c91d..c7ca388139 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -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);
         
diff --git a/libraries/audio/src/AudioInjectorOptions.cpp b/libraries/audio/src/AudioInjectorOptions.cpp
index 17307890ce..30e8c3e490 100644
--- a/libraries/audio/src/AudioInjectorOptions.cpp
+++ b/libraries/audio/src/AudioInjectorOptions.cpp
@@ -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;
 }
\ No newline at end of file
diff --git a/libraries/audio/src/AudioInjectorOptions.h b/libraries/audio/src/AudioInjectorOptions.h
index 0f4fa39ef7..7da0c9f2a0 100644
--- a/libraries/audio/src/AudioInjectorOptions.h
+++ b/libraries/audio/src/AudioInjectorOptions.h
@@ -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;
 };