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/ossaudio.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'audio/ossaudio.c') diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 2e8b7bf085..9f017b467b 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -389,19 +389,14 @@ static void oss_write_pending (OSSVoiceOut *oss) } } -static int oss_run_out (HWVoiceOut *hw) +static int oss_run_out (HWVoiceOut *hw, int live) { OSSVoiceOut *oss = (OSSVoiceOut *) hw; - int err, live, decr; + int err, decr; struct audio_buf_info abinfo; struct count_info cntinfo; int bufsize; - live = audio_pcm_hw_get_live_out (hw); - if (!live) { - return 0; - } - bufsize = hw->samples << hw->info.shift; if (oss->mmapped) { -- cgit v1.2.1