[vlc-commits] mmdevice: IMMDevice is really only used in desktop builds

Rémi Denis-Courmont git at videolan.org
Sat Feb 1 16:59:54 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb  1 17:58:58 2014 +0200| [9b5fbb1298fbf70eaccfaf7a5ae593eeda50216a] | committer: Rémi Denis-Courmont

mmdevice: IMMDevice is really only used in desktop builds

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

 modules/audio_output/mmdevice.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index e0ad99d..f4cecb5 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -74,10 +74,10 @@ static wchar_t default_device[1] = L"";
 struct aout_sys_t
 {
     aout_stream_t *stream; /**< Underlying audio output stream */
-    IMMDevice *dev; /**< Selected output device, NULL if none */
 #if !VLC_WINSTORE_APP
     audio_output_t *aout;
     IMMDeviceEnumerator *it; /**< Device enumerator, NULL when exiting */
+    IMMDevice *dev; /**< Selected output device, NULL if none */
 
     struct IMMNotificationClient device_events;
     struct IAudioSessionEvents session_events;
@@ -874,7 +874,11 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
     if (unlikely(s == NULL))
         return -1;
 
+#if !VLC_WINSTORE_APP
     s->owner.device = sys->dev;
+#else
+    s->owner.device = sys->client;
+#endif
     s->owner.activate = ActivateDevice;
 
     EnterMTA();



More information about the vlc-commits mailing list