From bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65 Mon Sep 17 00:00:00 2001 From: malc Date: Fri, 18 Sep 2009 11:37:39 +0400 Subject: audio: internal API change pcm_ops.run_out now takes number of live samples (which will be always greater than zero) as a second argument, every driver was calling audio_pcm_hw_get_live_out anyway with exception of fmod which used audio_pcm_hw_get_live_out2 for no good reason. Signed-off-by: malc --- audio/alsaaudio.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'audio/alsaaudio.c') diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 0174841..a4baebc 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -763,17 +763,12 @@ static void alsa_write_pending (ALSAVoiceOut *alsa) } } -static int alsa_run_out (HWVoiceOut *hw) +static int alsa_run_out (HWVoiceOut *hw, int live) { ALSAVoiceOut *alsa = (ALSAVoiceOut *) hw; - int live, decr; + int decr; snd_pcm_sframes_t avail; - live = audio_pcm_hw_get_live_out (hw); - if (!live) { - return 0; - } - avail = alsa_get_avail (alsa->handle); if (avail < 0) { dolog ("Could not get number of available playback frames\n"); -- cgit v1.1