[vlc-commits] mmdevice: do not overload the "aout" variable (fixes #18196)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr  8 16:03:10 2017 +0300| [bf1c212cb2ce19266f8d9312f5bea7bebcde6f7c] | committer: Rémi Denis-Courmont

mmdevice: do not overload the "aout" variable (fixes #18196)

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

 modules/audio_output/mmdevice.c | 11 ++++++-----
 po/POTFILES.in                  |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 1e16a4c..6712981 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mmdevice.c : Windows Multimedia Device API audio output plugin for VLC
  *****************************************************************************
- * Copyright (C) 2012-2014 Rémi Denis-Courmont
+ * Copyright (C) 2012-2017 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -1096,9 +1096,8 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         HRESULT hr;
         s->owner.device = sys->dev;
 
-        /* TODO: Do not overload the "aout" configuration item. */
-        sys->module = vlc_module_load(s, "aout stream", "$aout", false,
-                                      aout_stream_Start, s, fmt, &hr);
+        sys->module = vlc_module_load(s, "aout stream", "$mmdevice-backend",
+                                      false, aout_stream_Start, s, fmt, &hr);
         if (hr != AUDCLNT_E_DEVICE_INVALIDATED || DeviceSelectLocked(aout, NULL))
             break;
     }
@@ -1225,6 +1224,8 @@ vlc_module_begin()
     set_capability("audio output", 150)
     set_category(CAT_AUDIO)
     set_subcategory(SUBCAT_AUDIO_AOUT)
-    add_shortcut("wasapi", "directsound")
     set_callbacks(Open, Close)
+    add_module("mmdevice-backend", "aout stream", "any",
+               N_("Output back-end"), N_("Audio output back-end interface."),
+               true)
 vlc_module_end()
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2cec069..0281098 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -312,6 +312,7 @@ modules/audio_output/directsound.c
 modules/audio_output/file.c
 modules/audio_output/jack.c
 modules/audio_output/kai.c
+modules/audio_output/mmdevice.c
 modules/audio_output/opensles_android.c
 modules/audio_output/oss.c
 modules/audio_output/pulse.c