From 936279b55ad908e031d450d377afa8e09feea296 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 19 Mar 2015 12:08:12 +0000 Subject: [PATCH] directsound: fix TimeGet returning a positive value on error Fixes #14186 a positive HRESULT means it succeeded. Signed-off-by: Jean-Baptiste Kempf --- modules/audio_output/directsound.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c index 2a1a06d749..9b2536b055 100644 --- a/modules/audio_output/directsound.c +++ b/modules/audio_output/directsound.c @@ -148,8 +148,10 @@ static HRESULT TimeGet( aout_stream_sys_t *sys, mtime_t *delay ) mtime_t size; hr = IDirectSoundBuffer_GetStatus( sys->p_dsbuffer, &status ); - if(hr != DS_OK || !(status & DSBSTATUS_PLAYING)) - return 1; + if( hr != DS_OK ) + return hr; + if( !(status & DSBSTATUS_PLAYING) ) + return DSERR_INVALIDCALL ; hr = IDirectSoundBuffer_GetCurrentPosition( sys->p_dsbuffer, &read, NULL ); if( hr != DS_OK ) @@ -160,7 +162,7 @@ static HRESULT TimeGet( aout_stream_sys_t *sys, mtime_t *delay ) /* GetCurrentPosition cannot be trusted if the return doesn't change * Just return an error */ if( size == 0 ) - return 1; + return DSERR_GENERIC ; else if( size < 0 ) size += DS_BUF_SIZE; -- 2.39.2