directsound: fix TimeGet returning a positive value on error

[vlc] / modules / audio_output / directsound.c

diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index 2a1a06d749cf0cc2a44e4ef2466f3d74af50fdcd..9b2536b05572f40514d6fffda28dcc08a59b969c 100644 (file)
--- 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;