X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsound_openal.cpp;h=0cfbc279829a95978c94979d3339eb4be67332d8;hb=0413f8ad9d0c1457819f42909ee169287effe772;hp=258a5c1954c82093756e43e28e0aaac1dfc72e7a;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=dragonfireclient.git

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 258a5c195..0cfbc2798 100644
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 OpenAL support based on work by:
 Copyright (C) 2011 Sebastian 'Bahamada' Rühl
 Copyright (C) 2011 Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>
@@ -30,7 +30,7 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
 #elif defined(__APPLE__)
 	#include <OpenAL/al.h>
 	#include <OpenAL/alc.h>
-	#include <OpenAL/alext.h>
+	//#include <OpenAL/alext.h>
 #else
 	#include <AL/al.h>
 	#include <AL/alc.h>
@@ -38,10 +38,13 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
 #endif
 #include <vorbis/vorbisfile.h>
 #include "log.h"
+#include "filesys.h"
+#include "util/numeric.h" // myrand()
+#include "debug.h" // assert()
+#include "porting.h"
 #include <map>
 #include <vector>
-#include "utility.h" // myrand()
-#include "filesys.h"
+#include <fstream>
 
 #define BUFFER_SIZE 30000
 
@@ -268,6 +271,16 @@ class OpenALSoundManager: public ISoundManager
 		m_context = NULL;
 		alcCloseDevice(m_device);
 		m_device = NULL;
+
+		for (std::map<std::string, std::vector<SoundBuffer*> >::iterator i = m_buffers.begin();
+				i != m_buffers.end(); i++) {
+			for (std::vector<SoundBuffer*>::iterator iter = (*i).second.begin();
+					iter != (*i).second.end(); iter++) {
+				delete *iter;
+			}
+			(*i).second.clear();
+		}
+		m_buffers.clear();
 		infostream<<"Audio: Deinitialized."<<std::endl;
 	}