[PATCH 2/2] dsound: Add support for loading openal, try X
Maarten Lankhorst
m.b.lankhorst at gmail.com
Wed Dec 9 05:01:28 CST 2009
---
configure.ac | 15 ++-
dlls/dsound/Makefile.in | 1 +
dlls/dsound/dsound_main.c | 242 ++++++++++++++++++++++++++++++++++++++++++
dlls/dsound/dsound_private.h | 217 +++++++++++++++++++++++++++++++++++++-
dlls/openal32/Makefile.in | 2 +-
include/config.h.in | 6 +
6 files changed, 475 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index e5ff544..d93e1d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -633,8 +633,9 @@ case $host_os in
fi
if test "$ac_cv_header_OpenAL_al_h" = "yes"
then
- AC_SUBST(LIBOPENAL,"-framework OpenAL")
- ac_cv_lib_openal_alGetSource3i=yes
+ AC_SUBST(FRAMEWORK_OPENAL,"-framework OpenAL")
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])
+ ac_cv_lib_openal=yes
fi
if test "$ac_cv_header_IOKit_hid_IOHIDLib_h" = "yes"
then
@@ -1432,11 +1433,13 @@ test "x$ac_cv_lib_mpg123_mpg123_feed" = xyes || enable_winemp3_acm=${enable_wine
dnl **** Check for OpenAL 1.1 ****
if test "$ac_cv_header_AL_al_h" = "yes"
then
- AC_CHECK_LIB(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")])
+ WINE_CHECK_SONAME(openal,alGetSource3i,[AC_SUBST(LIBOPENAL,"-lopenal")
+ ac_cv_lib_openal=yes
+ AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,)
fi
-WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal_alGetSource3i" != xyes],
- [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.])
-test "x$ac_cv_lib_openal_alGetSource3i" = xyes || enable_openal32=${enable_openal32:-no}
+WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes],
+ [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported, and DirectSound will not be available.])
+test "x$ac_cv_lib_openal" = xyes || enable_openal32=${enable_openal32:-no}
dnl **** Check for libkstat ****
if test "$ac_cv_header_kstat_h" = "yes"
diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
index bbac7f9..34e4c7f 100644
--- a/dlls/dsound/Makefile.in
+++ b/dlls/dsound/Makefile.in
@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = dsound.dll
IMPORTLIB = dsound
IMPORTS = dxguid uuid winmm ole32 advapi32 kernel32 ntdll
+EXTRALIBS = @FRAMEWORK_OPENAL@
C_SRCS = \
buffer.c \
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 3fcabdb..71047d8 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -32,7 +32,10 @@
* Remove DS_HEL_FRAGS and use mixer fragment length for it
*/
+#include "config.h"
+#include "wine/port.h"
#include <stdarg.h>
+#include "wine/library.h"
#define COBJMACROS
#define NONAMELESSSTRUCT
@@ -61,6 +64,238 @@ DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS];
GUID DSOUND_renderer_guid = { 0xbd6dd71a,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };
GUID DSOUND_capture_guid = { 0xbd6dd71b,0x3deb,0x11d1, {0xb1,0x71,0x00,0xc0,0x4f,0xc2,0x00,0x00} };
+#ifdef HAVE_OPENAL
+
+static CRITICAL_SECTION_DEBUG openal_crst_debug =
+{
+ 0, 0, &openal_crst,
+ { &openal_crst_debug.ProcessLocksList,
+ &openal_crst_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": openal_crst_debug") }
+};
+CRITICAL_SECTION openal_crst = { &openal_crst_debug, -1, 0, 0, 0, 0 };
+
+static void *openal_handle = RTLD_DEFAULT;
+int openal_loaded = 0;
+#ifdef SONAME_LIBOPENAL
+LPALCCREATECONTEXT palcCreateContext = NULL;
+LPALCMAKECONTEXTCURRENT palcMakeContextCurrent = NULL;
+LPALCPROCESSCONTEXT palcProcessContext = NULL;
+LPALCSUSPENDCONTEXT palcSuspendContext = NULL;
+LPALCDESTROYCONTEXT palcDestroyContext = NULL;
+LPALCGETCURRENTCONTEXT palcGetCurrentContext = NULL;
+LPALCGETCONTEXTSDEVICE palcGetContextsDevice = NULL;
+LPALCOPENDEVICE palcOpenDevice = NULL;
+LPALCCLOSEDEVICE palcCloseDevice = NULL;
+LPALCGETERROR palcGetError = NULL;
+LPALCISEXTENSIONPRESENT palcIsExtensionPresent = NULL;
+LPALCGETPROCADDRESS palcGetProcAddress = NULL;
+LPALCGETENUMVALUE palcGetEnumValue = NULL;
+LPALCGETSTRING palcGetString = NULL;
+LPALCGETINTEGERV palcGetIntegerv = NULL;
+LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice = NULL;
+LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice = NULL;
+LPALCCAPTURESTART palcCaptureStart = NULL;
+LPALCCAPTURESTOP palcCaptureStop = NULL;
+LPALCCAPTURESAMPLES palcCaptureSamples = NULL;
+LPALENABLE palEnable = NULL;
+LPALDISABLE palDisable = NULL;
+LPALISENABLED palIsEnabled = NULL;
+LPALGETSTRING palGetString = NULL;
+LPALGETBOOLEANV palGetBooleanv = NULL;
+LPALGETINTEGERV palGetIntegerv = NULL;
+LPALGETFLOATV palGetFloatv = NULL;
+LPALGETDOUBLEV palGetDoublev = NULL;
+LPALGETBOOLEAN palGetBoolean = NULL;
+LPALGETINTEGER palGetInteger = NULL;
+LPALGETFLOAT palGetFloat = NULL;
+LPALGETDOUBLE palGetDouble = NULL;
+LPALGETERROR palGetError = NULL;
+LPALISEXTENSIONPRESENT palIsExtensionPresent = NULL;
+LPALGETPROCADDRESS palGetProcAddress = NULL;
+LPALGETENUMVALUE palGetEnumValue = NULL;
+LPALLISTENERF palListenerf = NULL;
+LPALLISTENER3F palListener3f = NULL;
+LPALLISTENERFV palListenerfv = NULL;
+LPALLISTENERI palListeneri = NULL;
+LPALLISTENER3I palListener3i = NULL;
+LPALLISTENERIV palListeneriv = NULL;
+LPALGETLISTENERF palGetListenerf = NULL;
+LPALGETLISTENER3F palGetListener3f = NULL;
+LPALGETLISTENERFV palGetListenerfv = NULL;
+LPALGETLISTENERI palGetListeneri = NULL;
+LPALGETLISTENER3I palGetListener3i = NULL;
+LPALGETLISTENERIV palGetListeneriv = NULL;
+LPALGENSOURCES palGenSources = NULL;
+LPALDELETESOURCES palDeleteSources = NULL;
+LPALISSOURCE palIsSource = NULL;
+LPALSOURCEF palSourcef = NULL;
+LPALSOURCE3F palSource3f = NULL;
+LPALSOURCEFV palSourcefv = NULL;
+LPALSOURCEI palSourcei = NULL;
+LPALSOURCE3I palSource3i = NULL;
+LPALSOURCEIV palSourceiv = NULL;
+LPALGETSOURCEF palGetSourcef = NULL;
+LPALGETSOURCE3F palGetSource3f = NULL;
+LPALGETSOURCEFV palGetSourcefv = NULL;
+LPALGETSOURCEI palGetSourcei = NULL;
+LPALGETSOURCE3I palGetSource3i = NULL;
+LPALGETSOURCEIV palGetSourceiv = NULL;
+LPALSOURCEPLAYV palSourcePlayv = NULL;
+LPALSOURCESTOPV palSourceStopv = NULL;
+LPALSOURCEREWINDV palSourceRewindv = NULL;
+LPALSOURCEPAUSEV palSourcePausev = NULL;
+LPALSOURCEPLAY palSourcePlay = NULL;
+LPALSOURCESTOP palSourceStop = NULL;
+LPALSOURCEREWIND palSourceRewind = NULL;
+LPALSOURCEPAUSE palSourcePause = NULL;
+LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers = NULL;
+LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers = NULL;
+LPALGENBUFFERS palGenBuffers = NULL;
+LPALDELETEBUFFERS palDeleteBuffers = NULL;
+LPALISBUFFER palIsBuffer = NULL;
+LPALBUFFERF palBufferf = NULL;
+LPALBUFFER3F palBuffer3f = NULL;
+LPALBUFFERFV palBufferfv = NULL;
+LPALBUFFERI palBufferi = NULL;
+LPALBUFFER3I palBuffer3i = NULL;
+LPALBUFFERIV palBufferiv = NULL;
+LPALGETBUFFERF palGetBufferf = NULL;
+LPALGETBUFFER3F palGetBuffer3f = NULL;
+LPALGETBUFFERFV palGetBufferfv = NULL;
+LPALGETBUFFERI palGetBufferi = NULL;
+LPALGETBUFFER3I palGetBuffer3i = NULL;
+LPALGETBUFFERIV palGetBufferiv = NULL;
+LPALBUFFERDATA palBufferData = NULL;
+LPALDOPPLERFACTOR palDopplerFactor = NULL;
+LPALDOPPLERVELOCITY palDopplerVelocity = NULL;
+LPALDISTANCEMODEL palDistanceModel = NULL;
+LPALSPEEDOFSOUND palSpeedOfSound = NULL;
+#endif
+
+static void load_libopenal(void)
+{
+ DWORD failed = 0;
+
+#ifdef SONAME_LIBOPENAL
+ char error[128];
+ openal_handle = wine_dlopen(SONAME_LIBOPENAL, RTLD_NOW, error, sizeof(error));
+ if (!openal_handle)
+ ERR("Couldn't load " SONAME_LIBOPENAL ": %s\n", error);
+#define LOAD_FUNCPTR(f) \
+ if((p##f = wine_dlsym(openal_handle, #f, NULL, 0)) == NULL) { \
+ ERR("Couldn't lookup %s in libopenal\n", #f); \
+ failed = 1; \
+ }
+
+ LOAD_FUNCPTR(alcCreateContext);
+ LOAD_FUNCPTR(alcMakeContextCurrent);
+ LOAD_FUNCPTR(alcProcessContext);
+ LOAD_FUNCPTR(alcSuspendContext);
+ LOAD_FUNCPTR(alcDestroyContext);
+ LOAD_FUNCPTR(alcGetCurrentContext);
+ LOAD_FUNCPTR(alcGetContextsDevice);
+ LOAD_FUNCPTR(alcOpenDevice);
+ LOAD_FUNCPTR(alcCloseDevice);
+ LOAD_FUNCPTR(alcGetError);
+ LOAD_FUNCPTR(alcIsExtensionPresent);
+ LOAD_FUNCPTR(alcGetProcAddress);
+ LOAD_FUNCPTR(alcGetEnumValue);
+ LOAD_FUNCPTR(alcGetString);
+ LOAD_FUNCPTR(alcGetIntegerv);
+ LOAD_FUNCPTR(alcCaptureOpenDevice);
+ LOAD_FUNCPTR(alcCaptureCloseDevice);
+ LOAD_FUNCPTR(alcCaptureStart);
+ LOAD_FUNCPTR(alcCaptureStop);
+ LOAD_FUNCPTR(alcCaptureSamples);
+ LOAD_FUNCPTR(alEnable);
+ LOAD_FUNCPTR(alDisable);
+ LOAD_FUNCPTR(alIsEnabled);
+ LOAD_FUNCPTR(alGetString);
+ LOAD_FUNCPTR(alGetBooleanv);
+ LOAD_FUNCPTR(alGetIntegerv);
+ LOAD_FUNCPTR(alGetFloatv);
+ LOAD_FUNCPTR(alGetDoublev);
+ LOAD_FUNCPTR(alGetBoolean);
+ LOAD_FUNCPTR(alGetInteger);
+ LOAD_FUNCPTR(alGetFloat);
+ LOAD_FUNCPTR(alGetDouble);
+ LOAD_FUNCPTR(alGetError);
+ LOAD_FUNCPTR(alIsExtensionPresent);
+ LOAD_FUNCPTR(alGetProcAddress);
+ LOAD_FUNCPTR(alGetEnumValue);
+ LOAD_FUNCPTR(alListenerf);
+ LOAD_FUNCPTR(alListener3f);
+ LOAD_FUNCPTR(alListenerfv);
+ LOAD_FUNCPTR(alListeneri);
+ LOAD_FUNCPTR(alListener3i);
+ LOAD_FUNCPTR(alListeneriv);
+ LOAD_FUNCPTR(alGetListenerf);
+ LOAD_FUNCPTR(alGetListener3f);
+ LOAD_FUNCPTR(alGetListenerfv);
+ LOAD_FUNCPTR(alGetListeneri);
+ LOAD_FUNCPTR(alGetListener3i);
+ LOAD_FUNCPTR(alGetListeneriv);
+ LOAD_FUNCPTR(alGenSources);
+ LOAD_FUNCPTR(alDeleteSources);
+ LOAD_FUNCPTR(alIsSource);
+ LOAD_FUNCPTR(alSourcef);
+ LOAD_FUNCPTR(alSource3f);
+ LOAD_FUNCPTR(alSourcefv);
+ LOAD_FUNCPTR(alSourcei);
+ LOAD_FUNCPTR(alSource3i);
+ LOAD_FUNCPTR(alSourceiv);
+ LOAD_FUNCPTR(alGetSourcef);
+ LOAD_FUNCPTR(alGetSource3f);
+ LOAD_FUNCPTR(alGetSourcefv);
+ LOAD_FUNCPTR(alGetSourcei);
+ LOAD_FUNCPTR(alGetSource3i);
+ LOAD_FUNCPTR(alGetSourceiv);
+ LOAD_FUNCPTR(alSourcePlayv);
+ LOAD_FUNCPTR(alSourceStopv);
+ LOAD_FUNCPTR(alSourceRewindv);
+ LOAD_FUNCPTR(alSourcePausev);
+ LOAD_FUNCPTR(alSourcePlay);
+ LOAD_FUNCPTR(alSourceStop);
+ LOAD_FUNCPTR(alSourceRewind);
+ LOAD_FUNCPTR(alSourcePause);
+ LOAD_FUNCPTR(alSourceQueueBuffers);
+ LOAD_FUNCPTR(alSourceUnqueueBuffers);
+ LOAD_FUNCPTR(alGenBuffers);
+ LOAD_FUNCPTR(alDeleteBuffers);
+ LOAD_FUNCPTR(alIsBuffer);
+ LOAD_FUNCPTR(alBufferf);
+ LOAD_FUNCPTR(alBuffer3f);
+ LOAD_FUNCPTR(alBufferfv);
+ LOAD_FUNCPTR(alBufferi);
+ LOAD_FUNCPTR(alBuffer3i);
+ LOAD_FUNCPTR(alBufferiv);
+ LOAD_FUNCPTR(alGetBufferf);
+ LOAD_FUNCPTR(alGetBuffer3f);
+ LOAD_FUNCPTR(alGetBufferfv);
+ LOAD_FUNCPTR(alGetBufferi);
+ LOAD_FUNCPTR(alGetBuffer3i);
+ LOAD_FUNCPTR(alGetBufferiv);
+ LOAD_FUNCPTR(alBufferData);
+ LOAD_FUNCPTR(alDopplerFactor);
+ LOAD_FUNCPTR(alDopplerVelocity);
+ LOAD_FUNCPTR(alDistanceModel);
+ LOAD_FUNCPTR(alSpeedOfSound);
+#undef LOAD_FUNCPTR
+#endif
+ if (failed)
+ {
+ WARN("Unloading openal\n");
+ if (openal_handle != RTLD_DEFAULT)
+ wine_dlclose(openal_handle, NULL, 0);
+ openal_handle = NULL;
+ }
+ else
+ openal_loaded = 1;
+}
+
+#endif /*HAVE_OPENAL*/
+
HRESULT mmErr(UINT err)
{
switch(err) {
@@ -665,6 +900,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
TRACE("DLL_PROCESS_ATTACH\n");
+#ifdef HAVE_OPENAL
+ load_libopenal();
+#endif /*HAVE_OPENAL*/
for (i = 0; i < MAXWAVEDRIVERS; i++) {
DSOUND_renderer[i] = NULL;
DSOUND_capture[i] = NULL;
@@ -675,6 +913,10 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
TRACE("DLL_PROCESS_DETACH\n");
+#ifdef SONAME_LIBOPENAL
+ if (openal_handle)
+ wine_dlclose(openal_handle, NULL, 0);
+#endif /*SONAME_LIBOPENAL*/
break;
default:
TRACE("UNKNOWN REASON\n");
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index 33c2f98..daa509d 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -22,8 +22,223 @@
/* Linux does not support better timing than 10ms */
#define DS_TIME_RES 2 /* Resolution of multimedia timer */
#define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */
-
+/* Default refresh count, can be overridden */
+#define FAKE_REFRESH_COUNT (1000/DS_TIME_DEL/2)
+
#include "wine/list.h"
+
+#ifdef HAVE_OPENAL
+
+#ifdef HAVE_AL_AL_H
+#include <AL/al.h>
+#include <AL/alc.h>
+#elif defined(HAVE_OPENAL_AL_H)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+#else
+#error No OpenAL headers found?
+#endif
+
+/* All openal functions */
+extern int openal_loaded;
+#ifdef SONAME_LIBOPENAL
+extern LPALCCREATECONTEXT palcCreateContext;
+extern LPALCMAKECONTEXTCURRENT palcMakeContextCurrent;
+extern LPALCPROCESSCONTEXT palcProcessContext;
+extern LPALCSUSPENDCONTEXT palcSuspendContext;
+extern LPALCDESTROYCONTEXT palcDestroyContext;
+extern LPALCGETCURRENTCONTEXT palcGetCurrentContext;
+extern LPALCGETCONTEXTSDEVICE palcGetContextsDevice;
+extern LPALCOPENDEVICE palcOpenDevice;
+extern LPALCCLOSEDEVICE palcCloseDevice;
+extern LPALCGETERROR palcGetError;
+extern LPALCISEXTENSIONPRESENT palcIsExtensionPresent;
+extern LPALCGETPROCADDRESS palcGetProcAddress;
+extern LPALCGETENUMVALUE palcGetEnumValue;
+extern LPALCGETSTRING palcGetString;
+extern LPALCGETINTEGERV palcGetIntegerv;
+extern LPALCCAPTUREOPENDEVICE palcCaptureOpenDevice;
+extern LPALCCAPTURECLOSEDEVICE palcCaptureCloseDevice;
+extern LPALCCAPTURESTART palcCaptureStart;
+extern LPALCCAPTURESTOP palcCaptureStop;
+extern LPALCCAPTURESAMPLES palcCaptureSamples;
+extern LPALENABLE palEnable;
+extern LPALDISABLE palDisable;
+extern LPALISENABLED palIsEnabled;
+extern LPALGETSTRING palGetString;
+extern LPALGETBOOLEANV palGetBooleanv;
+extern LPALGETINTEGERV palGetIntegerv;
+extern LPALGETFLOATV palGetFloatv;
+extern LPALGETDOUBLEV palGetDoublev;
+extern LPALGETBOOLEAN palGetBoolean;
+extern LPALGETINTEGER palGetInteger;
+extern LPALGETFLOAT palGetFloat;
+extern LPALGETDOUBLE palGetDouble;
+extern LPALGETERROR palGetError;
+extern LPALISEXTENSIONPRESENT palIsExtensionPresent;
+extern LPALGETPROCADDRESS palGetProcAddress;
+extern LPALGETENUMVALUE palGetEnumValue;
+extern LPALLISTENERF palListenerf;
+extern LPALLISTENER3F palListener3f;
+extern LPALLISTENERFV palListenerfv;
+extern LPALLISTENERI palListeneri;
+extern LPALLISTENER3I palListener3i;
+extern LPALLISTENERIV palListeneriv;
+extern LPALGETLISTENERF palGetListenerf;
+extern LPALGETLISTENER3F palGetListener3f;
+extern LPALGETLISTENERFV palGetListenerfv;
+extern LPALGETLISTENERI palGetListeneri;
+extern LPALGETLISTENER3I palGetListener3i;
+extern LPALGETLISTENERIV palGetListeneriv;
+extern LPALGENSOURCES palGenSources;
+extern LPALDELETESOURCES palDeleteSources;
+extern LPALISSOURCE palIsSource;
+extern LPALSOURCEF palSourcef;
+extern LPALSOURCE3F palSource3f;
+extern LPALSOURCEFV palSourcefv;
+extern LPALSOURCEI palSourcei;
+extern LPALSOURCE3I palSource3i;
+extern LPALSOURCEIV palSourceiv;
+extern LPALGETSOURCEF palGetSourcef;
+extern LPALGETSOURCE3F palGetSource3f;
+extern LPALGETSOURCEFV palGetSourcefv;
+extern LPALGETSOURCEI palGetSourcei;
+extern LPALGETSOURCE3I palGetSource3i;
+extern LPALGETSOURCEIV palGetSourceiv;
+extern LPALSOURCEPLAYV palSourcePlayv;
+extern LPALSOURCESTOPV palSourceStopv;
+extern LPALSOURCEREWINDV palSourceRewindv;
+extern LPALSOURCEPAUSEV palSourcePausev;
+extern LPALSOURCEPLAY palSourcePlay;
+extern LPALSOURCESTOP palSourceStop;
+extern LPALSOURCEREWIND palSourceRewind;
+extern LPALSOURCEPAUSE palSourcePause;
+extern LPALSOURCEQUEUEBUFFERS palSourceQueueBuffers;
+extern LPALSOURCEUNQUEUEBUFFERS palSourceUnqueueBuffers;
+extern LPALGENBUFFERS palGenBuffers;
+extern LPALDELETEBUFFERS palDeleteBuffers;
+extern LPALISBUFFER palIsBuffer;
+extern LPALBUFFERF palBufferf;
+extern LPALBUFFER3F palBuffer3f;
+extern LPALBUFFERFV palBufferfv;
+extern LPALBUFFERI palBufferi;
+extern LPALBUFFER3I palBuffer3i;
+extern LPALBUFFERIV palBufferiv;
+extern LPALGETBUFFERF palGetBufferf;
+extern LPALGETBUFFER3F palGetBuffer3f;
+extern LPALGETBUFFERFV palGetBufferfv;
+extern LPALGETBUFFERI palGetBufferi;
+extern LPALGETBUFFER3I palGetBuffer3i;
+extern LPALGETBUFFERIV palGetBufferiv;
+extern LPALBUFFERDATA palBufferData;
+extern LPALDOPPLERFACTOR palDopplerFactor;
+extern LPALDOPPLERVELOCITY palDopplerVelocity;
+extern LPALDISTANCEMODEL palDistanceModel;
+extern LPALSPEEDOFSOUND palSpeedOfSound;
+#else
+#define palcCreateContext alcCreateContext
+#define palcMakeContextCurrent alcMakeContextCurrent
+#define palcProcessContext alcProcessContext
+#define palcSuspendContext alcSuspendContext
+#define palcDestroyContext alcDestroyContext
+#define palcGetCurrentContext alcGetCurrentContext
+#define palcGetContextsDevice alcGetContextsDevice
+#define palcOpenDevice alcOpenDevice
+#define palcCloseDevice alcCloseDevice
+#define palcGetError alcGetError
+#define palcIsExtensionPresent alcIsExtensionPresent
+#define palcGetProcAddress alcGetProcAddress
+#define palcGetEnumValue alcGetEnumValue
+#define palcGetString alcGetString
+#define palcGetIntegerv alcGetIntegerv
+#define palcCaptureOpenDevice alcCaptureOpenDevice
+#define palcCaptureCloseDevice alcCaptureCloseDevice
+#define palcCaptureStart alcCaptureStart
+#define palcCaptureStop alcCaptureStop
+#define palcCaptureSamples alcCaptureSamples
+#define palEnable alEnable
+#define palDisable alDisable
+#define palIsEnabled alIsEnabled
+#define palGetString alGetString
+#define palGetBooleanv alGetBooleanv
+#define palGetIntegerv alGetIntegerv
+#define palGetFloatv alGetFloatv
+#define palGetDoublev alGetDoublev
+#define palGetBoolean alGetBoolean
+#define palGetInteger alGetInteger
+#define palGetFloat alGetFloat
+#define palGetDouble alGetDouble
+#define palGetError alGetError
+#define palIsExtensionPresent alIsExtensionPresent
+#define palGetProcAddress alGetProcAddress
+#define palGetEnumValue alGetEnumValue
+#define palListenerf alListenerf
+#define palListener3f alListener3f
+#define palListenerfv alListenerfv
+#define palListeneri alListeneri
+#define palListener3i alListener3i
+#define palListeneriv alListeneriv
+#define palGetListenerf alGetListenerf
+#define palGetListener3f alGetListener3f
+#define palGetListenerfv alGetListenerfv
+#define palGetListeneri alGetListeneri
+#define palGetListener3i alGetListener3i
+#define palGetListeneriv alGetListeneriv
+#define palGenSources alGenSources
+#define palDeleteSources alDeleteSources
+#define palIsSource alIsSource
+#define palSourcef alSourcef
+#define palSource3f alSource3f
+#define palSourcefv alSourcefv
+#define palSourcei alSourcei
+#define palSource3i alSource3i
+#define palSourceiv alSourceiv
+#define palGetSourcef alGetSourcef
+#define palGetSource3f alGetSource3f
+#define palGetSourcefv alGetSourcefv
+#define palGetSourcei alGetSourcei
+#define palGetSource3i alGetSource3i
+#define palGetSourceiv alGetSourceiv
+#define palSourcePlayv alSourcePlayv
+#define palSourceStopv alSourceStopv
+#define palSourceRewindv alSourceRewindv
+#define palSourcePausev alSourcePausev
+#define palSourcePlay alSourcePlay
+#define palSourceStop alSourceStop
+#define palSourceRewind alSourceRewind
+#define palSourcePause alSourcePause
+#define palSourceQueueBuffers alSourceQueueBuffers
+#define palSourceUnqueueBuffers alSourceUnqueueBuffers
+#define palGenBuffers alGenBuffers
+#define palDeleteBuffers alDeleteBuffers
+#define palIsBuffer alIsBuffer
+#define palBufferf alBufferf
+#define palBuffer3f alBuffer3f
+#define palBufferfv alBufferfv
+#define palBufferi alBufferi
+#define palBuffer3i alBuffer3i
+#define palBufferiv alBufferiv
+#define palGetBufferf alGetBufferf
+#define palGetBuffer3f alGetBuffer3f
+#define palGetBufferfv alGetBufferfv
+#define palGetBufferi alGetBufferi
+#define palGetBuffer3i alGetBuffer3i
+#define palGetBufferiv alGetBufferiv
+#define palBufferData alBufferData
+#define palDopplerFactor alDopplerFactor
+#define palDopplerVelocity alDopplerVelocity
+#define palDistanceModel alDistanceModel
+#define palSpeedOfSound alSpeedOfSound
+#endif
+
+#include <math.h>
+#include "wingdi.h"
+#include "mmreg.h"
+
+/* OpenAL only allows for 1 single access to the device at the same time */
+extern CRITICAL_SECTION openal_crst;
+
+#endif
/* direct sound hardware acceleration levels */
#define DS_HW_ACCEL_FULL 0 /* default on Windows 98 */
diff --git a/dlls/openal32/Makefile.in b/dlls/openal32/Makefile.in
index b237706..9c2ac8f 100644
--- a/dlls/openal32/Makefile.in
+++ b/dlls/openal32/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = openal32.dll
IMPORTS = kernel32 ntdll
-EXTRALIBS = @LIBOPENAL@
+EXTRALIBS = @LIBOPENAL@ @FRAMEWORK_OPENAL@
C_SRCS = \
openal.c
diff --git a/include/config.h.in b/include/config.h.in
index 7a77d1f..cb4c61d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -558,6 +558,9 @@
/* Define if mkdir takes only one argument */
#undef HAVE_ONE_ARG_MKDIR
+/* Define to 1 if OpenAL is available */
+#undef HAVE_OPENAL
+
/* Define to 1 if you have the <OpenAL/al.h> header file. */
#undef HAVE_OPENAL_AL_H
@@ -1185,6 +1188,9 @@
/* Define to the soname of the libodbc library. */
#undef SONAME_LIBODBC
+/* Define to the soname of the libopenal library. */
+#undef SONAME_LIBOPENAL
+
/* Define to the soname of the libpng library. */
#undef SONAME_LIBPNG
--
1.6.5.3
More information about the wine-patches
mailing list