[vlc-commits] wasapi: remove redundant code

Rémi Denis-Courmont git at videolan.org
Thu Dec 6 09:56:55 CET 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec  6 10:56:36 2012 +0200| [c242a515123ded29a0ccb5fc9bdca79fec461cbe] | committer: Rémi Denis-Courmont

wasapi: remove redundant code

The MTA is fully taken care of by mmdevice.c.

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

 modules/audio_output/wasapi.c |   14 --------------
 1 file changed, 14 deletions(-)

diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index e03ea25..5cdeea1 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -65,18 +65,6 @@ static UINT64 GetQPC(void)
     return (d.quot * 10000000) + ((d.rem * 10000000) / freq.QuadPart);
 }
 
-static void Enter(void)
-{
-    HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED);
-    if (unlikely(FAILED(hr)))
-        abort();
-}
-
-static void Leave(void)
-{
-    CoUninitialize();
-}
-
 typedef struct aout_stream_sys
 {
     IAudioClient *client;
@@ -334,9 +322,7 @@ static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict fmt,
     void *pv;
     HRESULT hr;
 
-    Enter();
     hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_ALL, NULL, &pv);
-    Leave();
     if (FAILED(hr))
     {
         msg_Err(s, "cannot activate client (error 0x%lx)", hr);



More information about the vlc-commits mailing list