From 736644de05555d9e5b9771a63f35ba28e0b228ff Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 20 Feb 2014 12:31:40 +0100
Subject: [PATCH] Revert "#1041 in progress: decode first sample batch right in
 OpenAL_SoundStream::play()"

This reverts commit 51fb9f65ea5086433fa0d1db12197b133a9b27fd.
---
 apps/openmw/mwsound/openal_output.cpp | 45 ++++++++++++++-------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 58566225b..7563ad015 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -172,6 +172,7 @@ class OpenAL_SoundStream : public Sound
     DecoderPtr mDecoder;
 
     volatile bool mIsFinished;
+    volatile bool mIsInitialBatchEnqueued;
 
     void updateAll(bool local);
 
@@ -264,7 +265,7 @@ private:
 
 OpenAL_SoundStream::OpenAL_SoundStream(OpenAL_Output &output, ALuint src, DecoderPtr decoder, float basevol, float pitch, int flags)
   : Sound(Ogre::Vector3(0.0f), 1.0f, basevol, pitch, 1.0f, 1000.0f, flags)
-  , mOutput(output), mSource(src), mSamplesQueued(0), mDecoder(decoder), mIsFinished(true)
+  , mOutput(output), mSource(src), mSamplesQueued(0), mDecoder(decoder), mIsFinished(true), mIsInitialBatchEnqueued(false)
 {
     throwALerror();
 
@@ -315,26 +316,8 @@ void OpenAL_SoundStream::play()
     alSourcei(mSource, AL_BUFFER, 0);
     throwALerror();
     mSamplesQueued = 0;
-
-    std::vector<char> data(mBufferSize);
-
-    bool finished = false;
-    for(ALuint i = 0;i < sNumBuffers && !finished;i++)
-    {
-        size_t got = mDecoder->read(&data[0], data.size());
-        finished = (got < data.size());
-        if(got > 0)
-        {
-            ALuint bufid = mBuffers[i];
-            alBufferData(bufid, mFormat, &data[0], got, mSampleRate);
-            alSourceQueueBuffers(mSource, 1, &bufid);
-            throwALerror();
-            mSamplesQueued += getBufferSampleCount(bufid);
-        }
-    }
-
-    mIsFinished = finished;
-    alSourcePlay(mSource);
+    mIsFinished = false;
+    mIsInitialBatchEnqueued = false;
     mOutput.mStreamThread->add(this);
 }
 
@@ -342,6 +325,7 @@ void OpenAL_SoundStream::stop()
 {
     mOutput.mStreamThread->remove(this);
     mIsFinished = true;
+    mIsInitialBatchEnqueued = false;
 
     alSourceStop(mSource);
     alSourcei(mSource, AL_BUFFER, 0);
@@ -454,6 +438,24 @@ bool OpenAL_SoundStream::process()
             } while(processed > 0);
             throwALerror();
         }
+        else if (!mIsInitialBatchEnqueued) { // nothing enqueued yet
+            std::vector<char> data(mBufferSize);
+
+            for(ALuint i = 0;i < sNumBuffers && !finished;i++)
+            {
+                size_t got = mDecoder->read(&data[0], data.size());
+                finished = (got < data.size());
+                if(got > 0)
+                {
+                    ALuint bufid = mBuffers[i];
+                    alBufferData(bufid, mFormat, &data[0], got, mSampleRate);
+                    alSourceQueueBuffers(mSource, 1, &bufid);
+                    throwALerror();
+                    mSamplesQueued += getBufferSampleCount(bufid);
+                }
+            }
+            mIsInitialBatchEnqueued = true;
+        }
 
         if(state != AL_PLAYING && state != AL_PAUSED)
         {
@@ -471,6 +473,7 @@ bool OpenAL_SoundStream::process()
         std::cout<< "Error updating stream \""<<mDecoder->getName()<<"\"" <<std::endl;
         mSamplesQueued = 0;
         mIsFinished = true;
+        mIsInitialBatchEnqueued = false;
     }
     return !mIsFinished;
 }