X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsound_openal.cpp;h=195775396a9589039d67b838b1d142e67e443a3b;hb=d4938554818aa71aceb0d360f33c6cfd42f67008;hp=4f056888b0dd56035843cdbbafabf89e1a82d500;hpb=8c2f3bb378640c921a0ad40c4577687b0c7c37f3;p=minetest.git diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp index 4f056888b..195775396 100644 --- a/src/sound_openal.cpp +++ b/src/sound_openal.cpp @@ -1,46 +1,50 @@ /* -Minetest-c55 -Copyright (C) 2012 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola OpenAL support based on work by: Copyright (C) 2011 Sebastian 'Bahamada' Rühl Copyright (C) 2011 Cyriaque 'Cisoun' Skrapits Copyright (C) 2011 Giuseppe Bilotta 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. */ #include "sound_openal.h" -#if defined(_MSC_VER) +#if defined(_WIN32) #include #include - #include + //#include #elif defined(__APPLE__) #include #include - #include + //#include #else #include #include #include #endif #include +#include #include "log.h" +#include "filesys.h" +#include "util/numeric.h" // myrand() +#include "porting.h" #include #include -#include "utility.h" // myrand() +#include #define BUFFER_SIZE 30000 @@ -115,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 "< 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; @@ -246,6 +257,8 @@ class OpenALSoundManager: public ISoundManager infostream<<"Audio: Initialized: OpenAL "< >::iterator i = m_buffers.begin(); + i != m_buffers.end(); ++i) { + for (std::vector::iterator iter = (*i).second.begin(); + iter != (*i).second.end(); ++iter) { + delete *iter; + } + (*i).second.clear(); + } + m_buffers.clear(); infostream<<"Audio: Deinitialized."< &filedata) - { - errorstream<<"OpenALSoundManager: Loading from filedata not" - " implemented"< paths; - std::set > datas; + std::set datas; m_fetcher->fetchSounds(name, paths, datas); for(std::set::iterator i = paths.begin(); - i != paths.end(); i++){ - loadSound(name, *i); + i != paths.end(); ++i){ + loadSoundFile(name, *i); } - for(std::set >::iterator i = datas.begin(); - i != datas.end(); i++){ - loadSound(name, *i); + for(std::set::iterator i = datas.begin(); + i != datas.end(); ++i){ + loadSoundData(name, *i); } return getBuffer(name); } @@ -414,7 +421,7 @@ class OpenALSoundManager: public ISoundManager std::set del_list; for(std::map::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; @@ -427,11 +434,11 @@ class OpenALSoundManager: public ISoundManager } } } - if(del_list.size() != 0) + if(!del_list.empty()) verbosestream<<"OpenALSoundManager::maintain(): deleting " <::iterator i = del_list.begin(); - i != del_list.end(); i++) + i != del_list.end(); ++i) { deleteSound(*i); } @@ -439,6 +446,31 @@ class OpenALSoundManager: public ISoundManager /* Interface */ + bool loadSoundFile(const std::string &name, + const std::string &filepath) + { + SoundBuffer *buf = loadOggFile(filepath); + if(buf) + addBuffer(name, buf); + return false; + } + bool loadSoundData(const std::string &name, + const std::string &filedata) + { + // The vorbis API sucks; just write it to a file and use vorbisfile + // TODO: Actually load it directly from memory + std::string basepath = porting::path_user + DIR_DELIM + "cache" + + DIR_DELIM + "tmp"; + std::string path = basepath + DIR_DELIM + "tmp.ogg"; + verbosestream<<"OpenALSoundManager::loadSoundData(): Writing " + <<"temporary file to ["<::iterator i = + m_sounds_playing.find(id); + if(i == m_sounds_playing.end()) + return; + PlayingSound *sound = i->second; + + alSourcei(sound->source_id, AL_SOURCE_RELATIVE, false); + alSource3f(sound->source_id, AL_POSITION, pos.X, pos.Y, pos.Z); + alSource3f(sound->source_id, AL_VELOCITY, 0, 0, 0); + alSourcef(sound->source_id, AL_REFERENCE_DISTANCE, 30.0); + } }; ISoundManager *createOpenALSoundManager(OnDemandSoundFetcher *fetcher) { - return new OpenALSoundManager(fetcher); + OpenALSoundManager *m = new OpenALSoundManager(fetcher); + if(m->m_is_initialized) + return m; + delete m; + return NULL; };