[vlc-commits] aout: fix mismatched aout stream stop prototypes

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jul 17 21:40:19 2019 +0300| [186ab773044995a8967767699cf4ab6ffc709960] | committer: Rémi Denis-Courmont

aout: fix mismatched aout stream stop prototypes

- WASAPI assumed a void return,
- DirectSound assumed a HRESULT return,
- MMDevice ignored the return.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=186ab773044995a8967767699cf4ab6ffc709960
---

 modules/audio_output/directsound.c | 7 ++-----
 modules/audio_output/mmdevice.h    | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index 02d8ad2e5e..fe8ca09ef3 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -575,13 +575,10 @@ static HRESULT Stop( aout_stream_sys_t *p_sys )
     return DS_OK;
 }
 
-static HRESULT StreamStop( aout_stream_t *s )
+static void StreamStop( aout_stream_t *s )
 {
-    HRESULT hr;
-
-    hr = Stop( s->sys );
+    Stop( s->sys );
     free( s->sys );
-    return hr;
 }
 
 static void OutputStop( audio_output_t *aout )
diff --git a/modules/audio_output/mmdevice.h b/modules/audio_output/mmdevice.h
index ef2bb0ebd4..4d34d20b3d 100644
--- a/modules/audio_output/mmdevice.h
+++ b/modules/audio_output/mmdevice.h
@@ -36,7 +36,7 @@ struct aout_stream
     struct vlc_object_t obj;
     void *sys;
 
-    HRESULT (*stop)(aout_stream_t *);
+    void (*stop)(aout_stream_t *);
     HRESULT (*time_get)(aout_stream_t *, vlc_tick_t *);
     HRESULT (*play)(aout_stream_t *, block_t *);
     HRESULT (*pause)(aout_stream_t *, bool);
@@ -61,9 +61,9 @@ typedef HRESULT (*aout_stream_start_t)(aout_stream_t *s,
 /**
  * Destroys an audio output stream.
  */
-static inline HRESULT aout_stream_Stop(aout_stream_t *s)
+static inline void aout_stream_Stop(aout_stream_t *s)
 {
-    return (s->stop)(s);
+    (s->stop)(s);
 }
 
 static inline HRESULT aout_stream_TimeGet(aout_stream_t *s, vlc_tick_t *delay)