From 1d014358ee05ab16c7350442ff4b3e337c85b3d5 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Fri, 19 Sep 2014 17:06:03 -0700
Subject: [PATCH] Added possibility to change AudioInjector position

---
 libraries/audio/src/AudioInjector.cpp | 21 +++++++++++----------
 libraries/audio/src/AudioInjector.h   |  5 +++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 17b082f07a..f6dd7fa058 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -25,7 +25,8 @@ AudioInjector::AudioInjector(QObject* parent) :
     QObject(parent),
     _sound(NULL),
     _options(),
-    _shouldStop(false)
+    _shouldStop(false),
+    _currentSendPosition(0)
 {
 }
 
@@ -95,17 +96,17 @@ void AudioInjector::injectAudio() {
         timer.start();
         int nextFrame = 0;
         
-        int currentSendPosition = 0;
+        _currentSendPosition = 0;
         
         int numPreAudioDataBytes = injectAudioPacket.size();
         bool shouldLoop = _options.getLoop();
         
         // loop to send off our audio in NETWORK_BUFFER_LENGTH_SAMPLES_PER_CHANNEL byte chunks
         quint16 outgoingInjectedAudioSequenceNumber = 0;
-        while (currentSendPosition < soundByteArray.size() && !_shouldStop) {
+        while (_currentSendPosition < soundByteArray.size() && !_shouldStop) {
             
             int bytesToCopy = std::min(NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL,
-                                       soundByteArray.size() - currentSendPosition);
+                                       soundByteArray.size() - _currentSendPosition);
             memcpy(injectAudioPacket.data() + positionOptionOffset,
                    &_options.getPosition(),
                    sizeof(_options.getPosition()));
@@ -120,7 +121,7 @@ void AudioInjector::injectAudio() {
             memcpy(injectAudioPacket.data() + numPreSequenceNumberBytes, &outgoingInjectedAudioSequenceNumber, sizeof(quint16));
             
             // copy the next NETWORK_BUFFER_LENGTH_BYTES_PER_CHANNEL bytes to the packet
-            memcpy(injectAudioPacket.data() + numPreAudioDataBytes, soundByteArray.data() + currentSendPosition, bytesToCopy);
+            memcpy(injectAudioPacket.data() + numPreAudioDataBytes, soundByteArray.data() + _currentSendPosition, bytesToCopy);
             
             // grab our audio mixer from the NodeList, if it exists
             NodeList* nodeList = NodeList::getInstance();
@@ -130,22 +131,22 @@ void AudioInjector::injectAudio() {
             nodeList->writeDatagram(injectAudioPacket, audioMixer);
             outgoingInjectedAudioSequenceNumber++;
             
-            currentSendPosition += bytesToCopy;
+            _currentSendPosition += bytesToCopy;
             
             // send two packets before the first sleep so the mixer can start playback right away
             
-            if (currentSendPosition != bytesToCopy && currentSendPosition < soundByteArray.size()) {
+            if (_currentSendPosition != bytesToCopy && _currentSendPosition < soundByteArray.size()) {
                 // not the first packet and not done
                 // sleep for the appropriate time
                 int usecToSleep = (++nextFrame * BUFFER_SEND_INTERVAL_USECS) - timer.nsecsElapsed() / 1000;
                 
                 if (usecToSleep > 0) {
                     usleep(usecToSleep);
-                }
+                } 
             }
 
-            if (shouldLoop && currentSendPosition == soundByteArray.size()) {
-                currentSendPosition = 0;
+            if (shouldLoop && _currentSendPosition >= soundByteArray.size()) {
+                _currentSendPosition = 0;
             }
         }
     }
diff --git a/libraries/audio/src/AudioInjector.h b/libraries/audio/src/AudioInjector.h
index 966a4dd1cf..7f52cb3a29 100644
--- a/libraries/audio/src/AudioInjector.h
+++ b/libraries/audio/src/AudioInjector.h
@@ -26,16 +26,21 @@ class AudioInjector : public QObject {
 public:
     AudioInjector(QObject* parent);
     AudioInjector(Sound* sound, const AudioInjectorOptions& injectorOptions);
+    
+    int getCurrentSendPosition() const { return _currentSendPosition; }
 public slots:
     void injectAudio();
     void stop() { _shouldStop = true; }
     void setOptions(AudioInjectorOptions& options);
+    void setCurrentSendPosition(int currentSendPosition) { _currentSendPosition = currentSendPosition; }
 signals:
     void finished();
 private:
     Sound* _sound;
     AudioInjectorOptions _options;
     bool _shouldStop;
+    int _currentSendPosition;
+    
 };
 
 Q_DECLARE_METATYPE(AudioInjector*)