summary refs log tree commit diff stats
path: root/audio/sdlaudio.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/sdlaudio.c
parent3fd7f635cdd5ee13f08c6ba1b0974a17eb9c9347 (diff)
downloadfocaccia-qemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.tar.gz
focaccia-qemu-bdff253c8fb4c8a64bb4792cc161dd79ab4aaf65.zip
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/sdlaudio.c')
-rw-r--r--audio/sdlaudio.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 250c7aefa6..8e7e5cb70b 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -282,9 +282,9 @@ static int sdl_write_out (SWVoiceOut *sw, void *buf, int len)
     return audio_pcm_sw_write (sw, buf, len);
 }
 
-static int sdl_run_out (HWVoiceOut *hw)
+static int sdl_run_out (HWVoiceOut *hw, int live)
 {
-    int decr, live;
+    int decr;
     SDLVoiceOut *sdl = (SDLVoiceOut *) hw;
     SDLAudioState *s = &glob_sdl;
 
@@ -292,8 +292,6 @@ static int sdl_run_out (HWVoiceOut *hw)
         return 0;
     }
 
-    live = audio_pcm_hw_get_live_out (hw);
-
     if (sdl->decr > live) {
         ldebug ("sdl->decr %d live %d sdl->live %d\n",
                 sdl->decr,