From 3b7edae7c3858d83b548c0c140b847d596bb45f5 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 18 Dec 2012 05:19:32 -0800
Subject: [PATCH] Don't hold a list of all sound sources

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

diff --git a/apps/openmw/mwsound/openal_output.cpp b/apps/openmw/mwsound/openal_output.cpp
index 406c1bcca..67008e2bc 100644
--- a/apps/openmw/mwsound/openal_output.cpp
+++ b/apps/openmw/mwsound/openal_output.cpp
@@ -637,9 +637,8 @@ void OpenAL_Output::init(const std::string &devname)
             ALuint src = 0;
             alGenSources(1, &src);
             throwALerror();
-            mSources.push_back(src);
+            mFreeSources.push_back(src);
         }
-        mFreeSources.insert(mFreeSources.begin(), mSources.begin(), mSources.end());
     }
     catch(std::exception &e)
     {
@@ -655,11 +654,9 @@ void OpenAL_Output::deinit()
 {
     mStreamThread->removeAll();
 
-    std::cerr<< "There are "<<mActiveSounds.size()<<" active sources at close" <<std::endl;
+    for(size_t i = 0;i < mFreeSources.size();i++)
+        alDeleteSources(1, &mFreeSources[i]);
     mFreeSources.clear();
-    if(mSources.size() > 0)
-        alDeleteSources(mSources.size(), &mSources[0]);
-    mSources.clear();
 
     mBufferRefs.clear();
     mUnusedBuffers.clear();
@@ -893,7 +890,7 @@ void OpenAL_Output::updateListener(const Ogre::Vector3 &pos, const Ogre::Vector3
 
 void OpenAL_Output::pauseSounds(int types)
 {
-    IDVec sources;
+    std::vector<ALuint> sources;
     SoundVec::const_iterator iter = mActiveSounds.begin();
     while(iter != mActiveSounds.end())
     {
@@ -912,12 +909,15 @@ void OpenAL_Output::pauseSounds(int types)
         iter++;
     }
     if(sources.size() > 0)
+    {
         alSourcePausev(sources.size(), &sources[0]);
+        throwALerror();
+    }
 }
 
 void OpenAL_Output::resumeSounds(int types)
 {
-    IDVec sources;
+    std::vector<ALuint> sources;
     SoundVec::const_iterator iter = mActiveSounds.begin();
     while(iter != mActiveSounds.end())
     {
@@ -936,7 +936,10 @@ void OpenAL_Output::resumeSounds(int types)
         iter++;
     }
     if(sources.size() > 0)
+    {
         alSourcePlayv(sources.size(), &sources[0]);
+        throwALerror();
+    }
 }
 
 
diff --git a/apps/openmw/mwsound/openal_output.hpp b/apps/openmw/mwsound/openal_output.hpp
index ce35f4e68..e240a8b01 100644
--- a/apps/openmw/mwsound/openal_output.hpp
+++ b/apps/openmw/mwsound/openal_output.hpp
@@ -21,9 +21,6 @@ namespace MWSound
         ALCdevice *mDevice;
         ALCcontext *mContext;
 
-        typedef std::vector<ALuint> IDVec;
-        IDVec mSources;
-
         typedef std::deque<ALuint> IDDq;
         IDDq mFreeSources;
         IDDq mUnusedBuffers;