Revert "Update Russian translation"

[minetest.git] / src / sound_openal.cpp

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 258a5c1954c82093756e43e28e0aaac1dfc72e7a..b2b424a19301f6c1b1c34f116bb0da3e0e939d61 100644 (file)
--- 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;
        }
        
@@ -378,7 +391,7 @@ class OpenALSoundManager: public ISoundManager
        }
 
        /* If buffer does not exist, consult the fetcher */
-       SoundBuffer* getFetchBuffer(const std::string name)
+       SoundBuffer* getFetchBuffer(const std::string &name)
        {
                SoundBuffer *buf = getBuffer(name);
                if(buf)
@@ -421,7 +434,7 @@ class OpenALSoundManager: public ISoundManager
                                }
                        }
                }
-               if(del_list.size() != 0)
+               if(!del_list.empty())
                        verbosestream<<"OpenALSoundManager::maintain(): deleting "
                                        <<del_list.size()<<" playing sounds"<<std::endl;
                for(std::set<int>::iterator i = del_list.begin();