[vlc-commits] MMDevice: only WASAPI lacks S/PDIF support so far (refs #6827)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb  5 00:04:01 2014 +0200| [30dcfdd04fa8f90231ab53f6efff302dbb3c6ad9] | committer: Rémi Denis-Courmont

MMDevice: only WASAPI lacks S/PDIF support so far (refs #6827)

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

 modules/audio_output/mmdevice.c |    6 +-----
 modules/audio_output/wasapi.c   |    4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 81225a1..429d825 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -939,10 +939,6 @@ static int Open(vlc_object_t *obj)
 {
     audio_output_t *aout = (audio_output_t *)obj;
 
-    if (!aout->b_force && var_InheritBool(aout, "spdif"))
-        /* Fallback to other plugin until pass-through is implemented */
-        return VLC_EGENERIC;
-
     aout_sys_t *sys = malloc(sizeof (*sys));
     if (unlikely(sys == NULL))
         return VLC_ENOMEM;
@@ -1047,7 +1043,7 @@ static void Close(vlc_object_t *obj)
 vlc_module_begin()
     set_shortname("MMDevice")
     set_description(N_("Windows Multimedia Device output"))
-    set_capability("audio output", /*150*/0)
+    set_capability("audio output", 150)
 #if VLC_WINSTORE_APP
     /* Pointer to the activated AudioClient* */
     add_integer("mmdevice-audioclient", 0x0, NULL, NULL, true);
diff --git a/modules/audio_output/wasapi.c b/modules/audio_output/wasapi.c
index 1bce4da..b006c8c 100644
--- a/modules/audio_output/wasapi.c
+++ b/modules/audio_output/wasapi.c
@@ -313,6 +313,10 @@ static unsigned vlc_CheckWaveOrder (const WAVEFORMATEX *restrict wf,
 static HRESULT Start(aout_stream_t *s, audio_sample_format_t *restrict fmt,
                      const GUID *sid)
 {
+    if (!s->b_force && var_InheritBool(s, "spdif"))
+        /* Fallback to other plugin until pass-through is implemented */
+        return E_NOTIMPL;
+
     aout_stream_sys_t *sys = malloc(sizeof (*sys));
     if (unlikely(sys == NULL))
         return E_OUTOFMEMORY;