Mapnode: Replace rotateAlongYAxis with improved version

[dragonfireclient.git] / src / sound_openal.cpp

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index 8d76b69e16621105b6fdb0cbb8048fa1e8721589..195775396a9589039d67b838b1d142e67e443a3b 100644 (file)
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -1,22 +1,22 @@
 /*
-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>
 Copyright (C) 2011 Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; ifnot, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -30,18 +30,21 @@ 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>
        #include <AL/alext.h>
 #endif
 #include <vorbis/vorbisfile.h>
+#include <assert.h>
 #include "log.h"
+#include "filesys.h"
+#include "util/numeric.h" // myrand()
+#include "porting.h"
 #include <map>
 #include <vector>
-#include "utility.h" // myrand()
-#include "filesys.h"
+#include <fstream>
 
 #define BUFFER_SIZE 30000
 
@@ -198,12 +201,14 @@ class OpenALSoundManager: public ISoundManager
        std::map<int, PlayingSound*> m_sounds_playing;
        v3f m_listener_pos;
 public:
+       bool m_is_initialized;
        OpenALSoundManager(OnDemandSoundFetcher *fetcher):
                m_fetcher(fetcher),
                m_device(NULL),
                m_context(NULL),
                m_can_vorbis(false),
-               m_next_id(1)
+               m_next_id(1),
+               m_is_initialized(false)
        {
                ALCenum error = ALC_NO_ERROR;
                
@@ -252,6 +257,8 @@ class OpenALSoundManager: public ISoundManager
                infostream<<"Audio: Initialized: OpenAL "<<alGetString(AL_VERSION)
                                <<", using "<<alcGetString(m_device, ALC_DEVICE_SPECIFIER)
                                <<std::endl;
+
+               m_is_initialized = true;
        }
 
        ~OpenALSoundManager()
@@ -264,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;
        }
        
@@ -374,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)
@@ -385,11 +402,11 @@ class OpenALSoundManager: public ISoundManager
                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);
@@ -404,7 +421,7 @@ class OpenALSoundManager: public ISoundManager
                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;
@@ -417,11 +434,11 @@ 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();
-                               i != del_list.end(); i++)
+                               i != del_list.end(); ++i)
                {
                        deleteSound(*i);
                }
@@ -461,10 +478,15 @@ class OpenALSoundManager: public ISoundManager
                alListener3f(AL_VELOCITY, vel.X, vel.Y, vel.Z);
                ALfloat f[6];
                f3_set(f, at);
-               f3_set(f+3, up);
+               f3_set(f+3, -up);
                alListenerfv(AL_ORIENTATION, f);
                warn_if_error(alGetError(), "updateListener");
        }
+       
+       void setListenerGain(float gain)
+       {
+               alListenerf(AL_GAIN, gain);
+       }
 
        int playSound(const std::string &name, bool loop, float volume)
        {
@@ -519,6 +541,10 @@ class OpenALSoundManager: public ISoundManager
 
 ISoundManager *createOpenALSoundManager(OnDemandSoundFetcher *fetcher)
 {
-       return new OpenALSoundManager(fetcher);
+       OpenALSoundManager *m = new OpenALSoundManager(fetcher);
+       if(m->m_is_initialized)
+               return m;
+       delete m;
+       return NULL;
 };