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/fmodaudio.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'audio/fmodaudio.c') diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c index e852e9e430..7f08e14718 100644 --- a/audio/fmodaudio.c +++ b/audio/fmodaudio.c @@ -224,22 +224,15 @@ static int fmod_lock_sample ( return 0; } -static int fmod_run_out (HWVoiceOut *hw) +static int fmod_run_out (HWVoiceOut *hw, int live) { FMODVoiceOut *fmd = (FMODVoiceOut *) hw; - int live, decr; + int decr; void *p1 = 0, *p2 = 0; unsigned int blen1 = 0, blen2 = 0; unsigned int len1 = 0, len2 = 0; - int nb_live; - live = audio_pcm_hw_get_live_out2 (hw, &nb_live); - if (!live) { - return 0; - } - - if (!hw->pending_disable && nb_live) { - ldebug ("live=%d nb_live=%d\n", live, nb_live); + if (!hw->pending_disable) { return 0; } -- cgit v1.2.3-55-g7522