Add LuaSecureRandom

[oweals/minetest.git] / src / sound_openal.cpp

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index c78f6288fdf5e558247c1384e1fbb8f61970600f..df316fbf0ff6f52bc7e9cb53d7bf277e152b8391 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>
@@ -37,10 +37,10 @@ with this program; ifnot, write to the Free Software Foundation, Inc.,
        #include <AL/alext.h>
 #endif
 #include <vorbis/vorbisfile.h>
+#include <assert.h>
 #include "log.h"
 #include "filesys.h"
 #include "util/numeric.h" // myrand()
-#include "debug.h" // assert()
 #include "porting.h"
 #include <map>
 #include <vector>
@@ -92,7 +92,7 @@ static ALenum warn_if_error(ALenum err, const char *desc)
 {
        if(err == AL_NO_ERROR)
                return err;
-       errorstream<<"WARNING: "<<desc<<": "<<alErrorString(err)<<std::endl;
+       warningstream<<desc<<": "<<alErrorString(err)<<std::endl;
        return err;
 }
 
@@ -271,6 +271,16 @@ public:
                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;
        }
        
@@ -381,7 +391,7 @@ public:
        }
 
        /* 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)
@@ -392,11 +402,11 @@ public:
                std::set<std::string> datas;
                m_fetcher->fetchSounds(name, paths, datas);
                for(std::set<std::string>::iterator i = paths.begin();
-                               i != paths.end(); i++){
+                               i != paths.end(); ++i){
                        loadSoundFile(name, *i);
                }
                for(std::set<std::string>::iterator i = datas.begin();
-                               i != datas.end(); i++){
+                               i != datas.end(); ++i){
                        loadSoundData(name, *i);
                }
                return getBuffer(name);
@@ -411,7 +421,7 @@ public:
                std::set<int> del_list;
                for(std::map<int, PlayingSound*>::iterator
                                i = m_sounds_playing.begin();
-                               i != m_sounds_playing.end(); i++)
+                               i != m_sounds_playing.end(); ++i)
                {
                        int id = i->first;
                        PlayingSound *sound = i->second;
@@ -424,11 +434,11 @@ public:
                                }
                        }
                }
-               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();
-                               i != del_list.end(); i++)
+                               i != del_list.end(); ++i)
                {
                        deleteSound(*i);
                }