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/dsoundaudio.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'audio/dsoundaudio.c') diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index f89f39aa08..5b255acd02 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -658,13 +658,13 @@ static int dsound_write (SWVoiceOut *sw, void *buf, int len) return audio_pcm_sw_write (sw, buf, len); } -static int dsound_run_out (HWVoiceOut *hw) +static int dsound_run_out (HWVoiceOut *hw, int live) { int err; HRESULT hr; DSoundVoiceOut *ds = (DSoundVoiceOut *) hw; LPDIRECTSOUNDBUFFER dsb = ds->dsound_buffer; - int live, len, hwshift; + int len, hwshift; DWORD blen1, blen2; DWORD len1, len2; DWORD decr; @@ -680,8 +680,6 @@ static int dsound_run_out (HWVoiceOut *hw) hwshift = hw->info.shift; bufsize = hw->samples << hwshift; - live = audio_pcm_hw_get_live_out (hw); - hr = IDirectSoundBuffer_GetCurrentPosition ( dsb, &ppos, -- cgit v1.2.1