From 973b5faf25405e2e6ac94c5682844b6169e976de Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 12 Dec 2012 01:32:16 -0800
Subject: [PATCH] Keep track of all allocated sources

---
 apps/openmw/mwsound/openal_output.cpp | 12 ++++++------
 apps/openmw/mwsound/openal_output.hpp |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 1e862d77ad..abd63590ff 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -504,8 +504,9 @@ void OpenAL_Output::init(const std::string &devname)
             ALuint src = 0;
             alGenSources(1, &src);
             throwALerror();
-            mFreeSources.push_back(src);
+            mSources.push_back(src);
         }
+        mFreeSources.insert(mFreeSources.begin(), mSources.begin(), mSources.end());
     }
     catch(std::exception &e)
     {
@@ -521,11 +522,10 @@ void OpenAL_Output::deinit()
 {
     mStreamThread->removeAll();
 
-    while(!mFreeSources.empty())
-    {
-        alDeleteSources(1, &mFreeSources.front());
-        mFreeSources.pop_front();
-    }
+    mFreeSources.clear();
+    if(mSources.size() > 0)
+        alDeleteSources(mSources.size(), &mSources[0]);
+    mSources.clear();
 
     mBufferRefs.clear();
     mUnusedBuffers.clear();
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index fecffa5752..4177c6385d 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -21,6 +21,9 @@ namespace MWSound
         ALCdevice *mDevice;
         ALCcontext *mContext;
 
+        typedef std::vector<ALuint> IDVec;
+        IDVec mSources;
+
         typedef std::deque<ALuint> IDDq;
         IDDq mFreeSources;
         IDDq mUnusedBuffers;