summaryrefslogtreecommitdiffstats
path: root/audio/out/ao_pulse.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-09 11:45:04 +0100
committerwm4 <wm4@nowhere>2014-11-09 11:45:04 +0100
commit5db0fbd95ec8790cd1a133bb57f701c5c9f970c0 (patch)
treef7a6d9a3c7dc656107ea440c47fefef563313125 /audio/out/ao_pulse.c
parent3d7d1f3f264e55857c83b8a94aa24081ae45dd4d (diff)
downloadmpv-5db0fbd95ec8790cd1a133bb57f701c5c9f970c0.tar.bz2
mpv-5db0fbd95ec8790cd1a133bb57f701c5c9f970c0.tar.xz
audio/out: consistently use double return type for get_delay
ao_get_delay() returns double, but the get_delay callback still returned float.
Diffstat (limited to 'audio/out/ao_pulse.c')
-rw-r--r--audio/out/ao_pulse.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c
index f9fe64d84d..ae708df59e 100644
--- a/audio/out/ao_pulse.c
+++ b/audio/out/ao_pulse.c
@@ -530,7 +530,7 @@ static int get_space(struct ao *ao)
return space / ao->sstride;
}
-static float get_delay_hackfixed(struct ao *ao)
+static double get_delay_hackfixed(struct ao *ao)
{
/* This code basically does what pa_stream_get_latency() _should_
* do, but doesn't due to multiple known bugs in PulseAudio (at
@@ -585,7 +585,7 @@ static float get_delay_hackfixed(struct ao *ao)
return latency / 1e6;
}
-static float get_delay_pulse(struct ao *ao)
+static double get_delay_pulse(struct ao *ao)
{
struct priv *priv = ao->priv;
pa_usec_t latency = (pa_usec_t) -1;
@@ -603,7 +603,7 @@ static float get_delay_pulse(struct ao *ao)
}
// Return the current latency in seconds
-static float get_delay(struct ao *ao)
+static double get_delay(struct ao *ao)
{
struct priv *priv = ao->priv;
if (priv->cfg_latency_hacks) {