X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsound_openal.cpp;h=df316fbf0ff6f52bc7e9cb53d7bf277e152b8391;hb=ad5ac39d8d1a8b8f6f0fe077e20bac914ddc624b;hp=e635e0fa17e840088e0aa3afa9e86b33b86dc241;hpb=db0928add3af6da67b1717933e92338f1030d5fb;p=oweals%2Fminetest.git

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index e635e0fa1..df316fbf0 100644
--- 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
 
@@ -89,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;
 }
 
@@ -116,9 +119,14 @@ SoundBuffer* loadOggFile(const std::string &filepath)
 	char array[BUFFER_SIZE]; // Local fixed size array
 	vorbis_info *pInfo;
 	OggVorbis_File oggFile;
-
+	
+	// Do a dumb-ass static string copy for old versions of ov_fopen
+	// because they expect a non-const char*
+	char nonconst[10000];
+	snprintf(nonconst, 10000, "%s", filepath.c_str());
 	// Try opening the given file
-	if(ov_fopen(filepath.c_str(), &oggFile) != 0)
+	//if(ov_fopen(filepath.c_str(), &oggFile) != 0)
+	if(ov_fopen(nonconst, &oggFile) != 0)
 	{
 		infostream<<"Audio: Error opening "<<filepath<<" for decoding"<<std::endl;
 		return NULL;
@@ -193,12 +201,14 @@ private:
 	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;
 		
@@ -247,6 +257,8 @@ public:
 		infostream<<"Audio: Initialized: OpenAL "<<alGetString(AL_VERSION)
 				<<", using "<<alcGetString(m_device, ALC_DEVICE_SPECIFIER)
 				<<std::endl;
+
+		m_is_initialized = true;
 	}
 
 	~OpenALSoundManager()
@@ -259,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;
 	}
 	
@@ -369,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)
@@ -380,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);
@@ -399,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;
@@ -412,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);
 		}
@@ -456,10 +478,15 @@ public:
 		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)
 	{
@@ -514,6 +541,10 @@ public:
 
 ISoundManager *createOpenALSoundManager(OnDemandSoundFetcher *fetcher)
 {
-	return new OpenALSoundManager(fetcher);
+	OpenALSoundManager *m = new OpenALSoundManager(fetcher);
+	if(m->m_is_initialized)
+		return m;
+	delete m;
+	return NULL;
 };