summaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2013-11-02 12:01:58 -0700
committerChris Robinson <[email protected]>2013-11-02 12:01:58 -0700
commit7142e3828f4f6083484c9aa2f0fe1b67f64265d6 (patch)
treeb9442d31bb0c6cd8c938c00477eb807a9585b315 /OpenAL32
parent426429279b576a8b2be0daa2ce2483388f972d95 (diff)
Rename alcGetLatency to ALCdevice_GetLatency
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/Include/alMain.h8
-rw-r--r--OpenAL32/alSource.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 93679824..de6f2613 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -307,8 +307,7 @@ enum DevFmtChannels {
ALuint BytesFromDevFmt(enum DevFmtType type);
ALuint ChannelsFromDevFmt(enum DevFmtChannels chans);
-static inline ALuint FrameSizeFromDevFmt(enum DevFmtChannels chans,
- enum DevFmtType type)
+static inline ALuint FrameSizeFromDevFmt(enum DevFmtChannels chans, enum DevFmtType type)
{
return ChannelsFromDevFmt(chans) * BytesFromDevFmt(type);
}
@@ -436,9 +435,6 @@ struct ALCdevice_struct
#define MIXER_THREAD_NAME "alsoft-mixer"
-ALint64 alcGetLatency(ALCdevice *device);
-
-
static inline struct ALbuffer *LookupBuffer(ALCdevice *device, ALuint id)
{ return (struct ALbuffer*)LookupUIntMapKey(&device->BufferMap, id); }
static inline struct ALeffect *LookupEffect(ALCdevice *device, ALuint id)
@@ -514,6 +510,8 @@ ALint64 ALCdevice_GetLatencyDefault(ALCdevice *device);
void ALCdevice_Lock(ALCdevice *device);
void ALCdevice_Unlock(ALCdevice *device);
+ALint64 ALCdevice_GetLatency(ALCdevice *device);
+
void LockContext(ALCcontext *context);
void UnlockContext(ALCcontext *context);
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index e017ff62..cae60cc2 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -947,7 +947,7 @@ static ALboolean GetSourcedv(const ALsource *Source, ALCcontext *Context, SrcFlo
case AL_SEC_OFFSET_LATENCY_SOFT:
LockContext(Context);
values[0] = GetSourceSecOffset(Source);
- values[1] = (ALdouble)alcGetLatency(Context->Device) /
+ values[1] = (ALdouble)ALCdevice_GetLatency(Context->Device) /
1000000000.0;
UnlockContext(Context);
return AL_TRUE;
@@ -1133,7 +1133,7 @@ static ALboolean GetSourcei64v(const ALsource *Source, ALCcontext *Context, SrcI
case AL_SAMPLE_OFFSET_LATENCY_SOFT:
LockContext(Context);
values[0] = GetSourceOffset(Source);
- values[1] = alcGetLatency(Context->Device);
+ values[1] = ALCdevice_GetLatency(Context->Device);
UnlockContext(Context);
return AL_TRUE;