summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Alc/ALc.c5
-rw-r--r--Alc/backends/coreaudio.c9
-rw-r--r--Alc/backends/dsound.c9
-rw-r--r--Alc/backends/loopback.c9
-rw-r--r--Alc/backends/mmdevapi.c9
-rw-r--r--Alc/backends/null.c10
-rw-r--r--Alc/backends/opensl.c9
-rw-r--r--Alc/backends/oss.c9
-rw-r--r--Alc/backends/portaudio.c9
-rw-r--r--Alc/backends/sndio.c9
-rw-r--r--Alc/backends/solaris.c9
-rw-r--r--Alc/backends/wave.c10
-rw-r--r--Alc/backends/winmm.c9
-rw-r--r--OpenAL32/Include/alMain.h1
14 files changed, 18 insertions, 98 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 9b04de13..60ae3d7a 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1267,6 +1267,11 @@ void ALCdevice_UnlockDefault(ALCdevice *device)
{
LeaveCriticalSection(&device->Mutex);
}
+ALint64 ALCdevice_GetLatencyDefault(ALCdevice *device)
+{
+ (void)device;
+ return 0;
+}
/* SetDefaultWFXChannelOrder
*
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c
index c3a67c81..a1ba325a 100644
--- a/Alc/backends/coreaudio.c
+++ b/Alc/backends/coreaudio.c
@@ -663,13 +663,6 @@ static ALCuint ca_available_samples(ALCdevice *device)
}
-static ALint64 ca_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs ca_funcs = {
ca_open_playback,
ca_close_playback,
@@ -684,7 +677,7 @@ static const BackendFuncs ca_funcs = {
ca_available_samples,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- ca_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_ca_init(BackendFuncs *func_list)
diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c
index e38bf30f..9bb9b2bc 100644
--- a/Alc/backends/dsound.c
+++ b/Alc/backends/dsound.c
@@ -935,13 +935,6 @@ done:
}
-static ALint64 DSoundGetLatency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs DSoundFuncs = {
DSoundOpenPlayback,
DSoundClosePlayback,
@@ -956,7 +949,7 @@ static const BackendFuncs DSoundFuncs = {
DSoundAvailableSamples,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- DSoundGetLatency
+ ALCdevice_GetLatencyDefault
};
diff --git a/Alc/backends/loopback.c b/Alc/backends/loopback.c
index 2597a392..4019d5d7 100644
--- a/Alc/backends/loopback.c
+++ b/Alc/backends/loopback.c
@@ -55,13 +55,6 @@ static void loopback_stop_playback(ALCdevice *device)
}
-static ALint64 loopback_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs loopback_funcs = {
loopback_open_playback,
loopback_close_playback,
@@ -76,7 +69,7 @@ static const BackendFuncs loopback_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- loopback_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_loopback_init(BackendFuncs *func_list)
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index 4fa933ac..8c86b2ca 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -937,13 +937,6 @@ static void MMDevApiStopPlayback(ALCdevice *device)
}
-static ALint64 MMDevApiGetLatency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs MMDevApiFuncs = {
MMDevApiOpenPlayback,
MMDevApiClosePlayback,
@@ -958,7 +951,7 @@ static const BackendFuncs MMDevApiFuncs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- MMDevApiGetLatency
+ ALCdevice_GetLatencyDefault
};
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index 8ae9479c..6c6ce0d0 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -129,14 +129,6 @@ static void null_stop_playback(ALCdevice *device)
}
-static ALint64 null_get_latency(ALCdevice *device)
-{
- /* FIXME: Time until next update + "safe" offset */
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs null_funcs = {
null_open_playback,
null_close_playback,
@@ -151,7 +143,7 @@ static const BackendFuncs null_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- null_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_null_init(BackendFuncs *func_list)
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c
index 14d0061b..8d8ee72d 100644
--- a/Alc/backends/opensl.c
+++ b/Alc/backends/opensl.c
@@ -401,13 +401,6 @@ static void opensl_stop_playback(ALCdevice *Device)
}
-static ALint64 opensl_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs opensl_funcs = {
opensl_open_playback,
opensl_close_playback,
@@ -422,7 +415,7 @@ static const BackendFuncs opensl_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- opensl_get_latency
+ ALCdevice_GetLatencyDefault
};
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c
index 02150a8b..ba4345f4 100644
--- a/Alc/backends/oss.c
+++ b/Alc/backends/oss.c
@@ -476,13 +476,6 @@ static ALCuint oss_available_samples(ALCdevice *Device)
}
-static ALint64 oss_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs oss_funcs = {
oss_open_playback,
oss_close_playback,
@@ -497,7 +490,7 @@ static const BackendFuncs oss_funcs = {
oss_available_samples,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- oss_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_oss_init(BackendFuncs *func_list)
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index e55f6842..8d64189c 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -419,13 +419,6 @@ static ALCuint pa_available_samples(ALCdevice *device)
}
-static ALint64 pa_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs pa_funcs = {
pa_open_playback,
pa_close_playback,
@@ -440,7 +433,7 @@ static const BackendFuncs pa_funcs = {
pa_available_samples,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- pa_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_pa_init(BackendFuncs *func_list)
diff --git a/Alc/backends/sndio.c b/Alc/backends/sndio.c
index 4698d5e3..56dd9253 100644
--- a/Alc/backends/sndio.c
+++ b/Alc/backends/sndio.c
@@ -252,13 +252,6 @@ static void sndio_stop_playback(ALCdevice *device)
}
-static ALint64 sndio_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs sndio_funcs = {
sndio_open_playback,
sndio_close_playback,
@@ -273,7 +266,7 @@ static const BackendFuncs sndio_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- sndio_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_sndio_init(BackendFuncs *func_list)
diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c
index 8d31104e..18c5ec01 100644
--- a/Alc/backends/solaris.c
+++ b/Alc/backends/solaris.c
@@ -236,13 +236,6 @@ static void solaris_stop_playback(ALCdevice *device)
}
-static ALint64 solaris_get_latency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs solaris_funcs = {
solaris_open_playback,
solaris_close_playback,
@@ -257,7 +250,7 @@ static const BackendFuncs solaris_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- solaris_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_solaris_init(BackendFuncs *func_list)
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index 7d28fab0..fe3817af 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -322,14 +322,6 @@ static void wave_stop_playback(ALCdevice *device)
}
-static ALint64 wave_get_latency(ALCdevice *device)
-{
- /* FIXME: time until next update + "safe" offset */
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs wave_funcs = {
wave_open_playback,
wave_close_playback,
@@ -344,7 +336,7 @@ static const BackendFuncs wave_funcs = {
NULL,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- wave_get_latency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alc_wave_init(BackendFuncs *func_list)
diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
index 13012d81..c7bf4ded 100644
--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
@@ -705,13 +705,6 @@ static ALCuint WinMMAvailableSamples(ALCdevice *Device)
}
-static ALint64 WinMMGetLatency(ALCdevice *device)
-{
- (void)device;
- return 0;
-}
-
-
static const BackendFuncs WinMMFuncs = {
WinMMOpenPlayback,
WinMMClosePlayback,
@@ -726,7 +719,7 @@ static const BackendFuncs WinMMFuncs = {
WinMMAvailableSamples,
ALCdevice_LockDefault,
ALCdevice_UnlockDefault,
- WinMMGetLatency
+ ALCdevice_GetLatencyDefault
};
ALCboolean alcWinMMInit(BackendFuncs *FuncList)
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 8ff792d0..ef8b8cb7 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -710,6 +710,7 @@ void AppendCaptureDeviceList(const ALCchar *name);
void ALCdevice_LockDefault(ALCdevice *device);
void ALCdevice_UnlockDefault(ALCdevice *device);
+ALint64 ALCdevice_GetLatencyDefault(ALCdevice *device);
static __inline void LockContext(ALCcontext *context)
{ ALCdevice_Lock(context->Device); }