From 45ccb012972989fcb8baa04bc676bc1ad19f8345 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 18 Aug 2014 21:05:03 -0700
Subject: [PATCH] Update options position and orientation correctly in the
 AudioInjector

---
 libraries/audio/src/AudioInjector.cpp        | 14 ++++++++++++--
 libraries/audio/src/AudioInjector.h          |  1 +
 libraries/audio/src/AudioInjectorOptions.cpp |  9 ++++++++-
 libraries/audio/src/AudioInjectorOptions.h   |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index e5c1230832..114ab1c95c 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -27,7 +27,6 @@ AudioInjector::AudioInjector(QObject* parent) :
     _options(),
     _shouldStop(false)
 {
-    
 }
 
 AudioInjector::AudioInjector(Sound* sound, const AudioInjectorOptions& injectorOptions) :
@@ -35,7 +34,10 @@ AudioInjector::AudioInjector(Sound* sound, const AudioInjectorOptions& injectorO
     _options(injectorOptions),
     _shouldStop(false)
 {
-    
+}
+
+void AudioInjector::setOptions(AudioInjectorOptions& options) {
+    _options = options;
 }
 
 const uchar MAX_INJECTOR_VOLUME = 0xFF;
@@ -73,9 +75,11 @@ void AudioInjector::injectAudio() {
         packetStream << loopbackFlag;
         
         // pack the position for injected audio
+        int positionOptionOffset = injectAudioPacket.size();
         packetStream.writeRawData(reinterpret_cast<const char*>(&_options.getPosition()), sizeof(_options.getPosition()));
         
         // pack our orientation for injected audio
+        int orientationOptionOffset = injectAudioPacket.size();
         packetStream.writeRawData(reinterpret_cast<const char*>(&_options.getOrientation()), sizeof(_options.getOrientation()));
         
         // pack zero for radius
@@ -101,6 +105,12 @@ void AudioInjector::injectAudio() {
             
             int bytesToCopy = std::min(NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL,
                                        soundByteArray.size() - currentSendPosition);
+            memcpy(injectAudioPacket.data() + positionOptionOffset,
+                   &_options.getPosition(),
+                   sizeof(_options.getPosition()));
+            memcpy(injectAudioPacket.data() + orientationOptionOffset,
+                   &_options.getOrientation(),
+                   sizeof(_options.getOrientation()));
             
             // resize the QByteArray to the right size
             injectAudioPacket.resize(numPreAudioDataBytes + bytesToCopy);
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index 08fe544255..966a4dd1cf 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -29,6 +29,7 @@ public:
 public slots:
     void injectAudio();
     void stop() { _shouldStop = true; }
+    void setOptions(AudioInjectorOptions& options);
 signals:
     void finished();
 private:
diff --git a/libraries/audio/src/AudioInjectorOptions.cpp b/libraries/audio/src/AudioInjectorOptions.cpp
index 49f1571c98..01aa43a0cd 100644
--- a/libraries/audio/src/AudioInjectorOptions.cpp
+++ b/libraries/audio/src/AudioInjectorOptions.cpp
@@ -19,7 +19,6 @@ AudioInjectorOptions::AudioInjectorOptions(QObject* parent) :
     _orientation(glm::vec3(0.0f, 0.0f, 0.0f)),
     _loopbackAudioInterface(NULL)
 {
-    
 }
 
 AudioInjectorOptions::AudioInjectorOptions(const AudioInjectorOptions& other) {
@@ -29,3 +28,11 @@ AudioInjectorOptions::AudioInjectorOptions(const AudioInjectorOptions& other) {
     _orientation = other._orientation;
     _loopbackAudioInterface = other._loopbackAudioInterface;
 }
+
+void AudioInjectorOptions::operator=(const AudioInjectorOptions& other) {
+    _position = other._position;
+    _volume = other._volume;
+    _loop = other._loop;
+    _orientation = other._orientation;
+    _loopbackAudioInterface = other._loopbackAudioInterface;
+}
\ No newline at end of file
diff --git a/libraries/audio/src/AudioInjectorOptions.h b/libraries/audio/src/AudioInjectorOptions.h
index 35575414d5..64936e4bc9 100644
--- a/libraries/audio/src/AudioInjectorOptions.h
+++ b/libraries/audio/src/AudioInjectorOptions.h
@@ -30,6 +30,7 @@ class AudioInjectorOptions : public QObject {
 public:
     AudioInjectorOptions(QObject* parent = 0);
     AudioInjectorOptions(const AudioInjectorOptions& other);
+    void operator=(const AudioInjectorOptions& other);
     
     const glm::vec3& getPosition() const { return _position; }
     void setPosition(const glm::vec3& position) { _position = position; }