aboutsummaryrefslogtreecommitdiff
path: root/audio/fmodaudio.c
diff options
context:
space:
mode:
authormalc <av1474@comtv.ru>2009-09-18 11:37:39 +0400
committermalc <av1474@comtv.ru>2009-09-18 14:04:36 +0400
commitbdff253c8fb4c8a64bb4792cc161dd79ab4aaf65 (patch)
tree8e12d54b246e2787a7b1bd3b0e50d236910a05a0 /audio/fmodaudio.c
parent3fd7f635cdd5ee13f08c6ba1b0974a17eb9c9347 (diff)
downloadqemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.zip
qemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.tar.gz
qemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.tar.bz2
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 <av1474@comtv.ru>
Diffstat (limited to 'audio/fmodaudio.c')
-rw-r--r--audio/fmodaudio.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c
index e852e9e..7f08e14 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;
}