diff options
| -rw-r--r-- | Alc/ALc.c | 8 | ||||
| -rw-r--r-- | OpenAL32/alBuffer.cpp | 5 |
2 files changed, 8 insertions, 5 deletions
@@ -1566,6 +1566,14 @@ void SetDefaultChannelOrder(ALCdevice *device) extern inline ALint GetChannelIndex(const enum Channel names[MAX_OUTPUT_CHANNELS], enum Channel chan); extern inline ALint GetChannelIdxByName(const RealMixParams *real, enum Channel chan); +/* NOTE: These shouldn't really be here, but C++ (alBuffer.cpp) won't turn + * these extern inline declarations into callable functions. + */ +extern inline void LockBufferList(ALCdevice *device); +extern inline void UnlockBufferList(ALCdevice *device); +extern inline ALsizei FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserFmtType type); +extern inline ALsizei FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type); + /* ALCcontext_DeferUpdates * diff --git a/OpenAL32/alBuffer.cpp b/OpenAL32/alBuffer.cpp index 25fe2d65..74f108e5 100644 --- a/OpenAL32/alBuffer.cpp +++ b/OpenAL32/alBuffer.cpp @@ -39,11 +39,6 @@ #include "sample_cvt.h" -extern inline void LockBufferList(ALCdevice *device); -extern inline void UnlockBufferList(ALCdevice *device); -extern inline ALsizei FrameSizeFromUserFmt(enum UserFmtChannels chans, enum UserFmtType type); -extern inline ALsizei FrameSizeFromFmt(enum FmtChannels chans, enum FmtType type); - static ALbuffer *AllocBuffer(ALCcontext *context); static void FreeBuffer(ALCdevice *device, ALbuffer *buffer); static const ALchar *NameFromUserFmtType(enum UserFmtType type); |