X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fopenal_wrapper.cpp;h=b59706581288660a97125d563f30e6a35c13a47a;hb=ff29f47f799d99cec7c2a6aa2cf818da2b931fc5;hp=79be832f787dec547c6e23058216dca763e0e21e;hpb=e08a65d1b8613dfbe0f48a7d868c5b0459b411a6;p=lugaru.git

diff --git a/Source/openal_wrapper.cpp b/Source/openal_wrapper.cpp
index 79be832..b597065 100644
--- a/Source/openal_wrapper.cpp
+++ b/Source/openal_wrapper.cpp
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru 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 (at your option) any later version.
+Lugaru 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
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru 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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdio.h>
@@ -26,75 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Quaternions.h"
 #include "openal_wrapper.h"
 #include "Sounds.h"
+#include "Game.h"
 
 // NOTE:
 // FMOD uses a Left Handed Coordinate system, OpenAL uses a Right Handed
 //  one...so we just need to flip the sign on the Z axis when appropriate.
 
-#define DYNAMIC_LOAD_OPENAL 0
-
-#if DYNAMIC_LOAD_OPENAL
-
-#include <dlfcn.h>
-
-#define AL_FUNC(t,ret,fn,params,call,rt) \
-    extern "C" { \
-        static ret ALAPIENTRY (*p##fn) params = NULL; \
-        ret ALAPIENTRY fn params { rt p##fn call; } \
-    }
-#include "alstubs.h"
-#undef AL_FUNC
-
-static void *aldlhandle = NULL;
-
-static bool lookup_alsym(const char *funcname, void **func, const char *libname)
-{
-    if (!aldlhandle)
-        return false;
-
-    *func = dlsym(aldlhandle, funcname);
-    if (*func == NULL) {
-        fprintf(stderr, "Failed to find OpenAL symbol \"%s\" in \"%s\"\n",
-                funcname, libname);
-        return false;
-    }
-    return true;
-}
-
-static void unload_alsyms(void)
-{
-#define AL_FUNC(t,ret,fn,params,call,rt) p##fn = NULL;
-#include "alstubs.h"
-#undef AL_FUNC
-    if (aldlhandle) {
-        dlclose(aldlhandle);
-        aldlhandle = NULL;
-    }
-}
-
-static bool lookup_all_alsyms(const char *libname)
-{
-    if (!aldlhandle) {
-        if ( (aldlhandle = dlopen(libname, RTLD_GLOBAL | RTLD_NOW)) == NULL )
-            return false;
-    }
-
-    bool retval = true;
-#define AL_FUNC(t,ret,fn,params,call,rt) \
-        if (!lookup_alsym(#fn, (void **) &p##fn, libname)) retval = false;
-#include "alstubs.h"
-#undef AL_FUNC
-
-    if (!retval)
-        unload_alsyms();
-
-    return retval;
-}
-#else
-#define lookup_all_alsyms(x) (true)
-#define unload_alsyms()
-#endif
-
 typedef struct {
     ALuint sid;
     OPENAL_SAMPLE *sample;
@@ -200,13 +136,6 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in
     if (flags != 0)  // unsupported.
         return false;
 
-    if (!lookup_all_alsyms("./openal.so")) { // !!! FIXME: linux specific lib name
-        if (!lookup_all_alsyms("openal.so.1")) { // !!! FIXME: linux specific lib name
-            if (!lookup_all_alsyms("openal.so"))  // !!! FIXME: linux specific lib name
-                return false;
-        }
-    }
-
     ALCdevice *dev = alcOpenDevice(NULL);
     if (!dev)
         return false;
@@ -221,8 +150,7 @@ AL_API signed char OPENAL_Init(int mixrate, int maxsoftwarechannels, unsigned in
     alcMakeContextCurrent(ctx);
     alcProcessContext(ctx);
 
-    bool cmdline(const char * cmd);
-    if (cmdline("openalinfo")) {
+    if (commandLineOptions[OPENALINFO]) {
         printf("AL_VENDOR: %s\n", (char *) alGetString(AL_VENDOR));
         printf("AL_RENDERER: %s\n", (char *) alGetString(AL_RENDERER));
         printf("AL_VERSION: %s\n", (char *) alGetString(AL_VERSION));
@@ -262,7 +190,6 @@ AL_API void OPENAL_Close()
     delete[] impl_channels;
     impl_channels = NULL;
 
-    unload_alsyms();
     initialized = false;
 }
 
@@ -448,7 +375,6 @@ AL_API OPENAL_SAMPLE *OPENAL_Sample_Load(int index, const char *name_or_data, un
         return NULL;  // this is all the game does...
 
     OPENAL_SAMPLE *retval = NULL;
-    ALuint bufferName = 0;
     ALenum format = AL_NONE;
     ALsizei size = 0;
     ALuint frequency = 0;
@@ -602,11 +528,6 @@ AL_API signed char OPENAL_StopSound(int channel)
     return true;
 }
 
-AL_API void OPENAL_Stream_Close(OPENAL_STREAM *stream)
-{
-    OPENAL_Sample_Free((OPENAL_SAMPLE *) stream);
-}
-
 static OPENAL_SAMPLE *OPENAL_Stream_GetSample(OPENAL_STREAM *stream)
 {
     if (!initialized)