Enable multiline signs

[dragonfireclient.git] / src / sound_openal.cpp

diff --git a/src/sound_openal.cpp b/src/sound_openal.cpp
index f7bce6546d73d9ba1a371ec6684bf94b5084ed0f..c78f6288fdf5e558247c1384e1fbb8f61970600f 100644 (file)
--- a/src/sound_openal.cpp
+++ b/src/sound_openal.cpp
@@ -7,16 +7,16 @@ 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,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,9 +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 <fstream>
 
 #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 "<<filepath<<" for decoding"<<std::endl;
                return NULL;
@@ -192,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;
                
@@ -246,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()
@@ -434,9 +447,18 @@ class OpenALSoundManager: public ISoundManager
        bool loadSoundData(const std::string &name,
                        const std::string &filedata)
        {
-               errorstream<<"OpenALSoundManager: Loading from filedata not"
-                               " implemented"<<std::endl;
-               return false;
+               // 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 ["<<path<<"]"<<std::endl;
+               fs::CreateAllDirs(basepath);
+               std::ofstream of(path.c_str(), std::ios::binary);
+               of.write(filedata.c_str(), filedata.size());
+               of.close();
+               return loadSoundFile(name, path);
        }
 
        void updateListener(v3f pos, v3f vel, v3f at, v3f up)
@@ -446,10 +468,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)
        {
@@ -504,6 +531,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;
 };