From f61b8b312d251f9c8dd33d03d1566fd73019bf08 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 7 Jan 2015 21:33:14 +0100
Subject: win32: request UTF-16 API variants, Vista+ APIs, and COM C macros

Put the Vista+ (_WIN32_WINNT) and the COM C (COBJMACROS) defines into
the build system, instead of defining them over and over in the code.
---
 audio/out/ao_dsound.c              | 2 +-
 audio/out/ao_wasapi.c              | 3 ---
 audio/out/ao_wasapi.h              | 3 ---
 audio/out/ao_wasapi_changenotify.c | 3 ---
 audio/out/ao_wasapi_utils.c        | 3 ---
 5 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'audio')

diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index b5d8c61bcc..825e3095df 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -228,7 +228,7 @@ static int LoadDirectSound(struct ao *ao)
     struct priv *p = ao->priv;
 
     // initialize directsound
-    p->hdsound_dll = LoadLibrary("DSOUND.DLL");
+    p->hdsound_dll = LoadLibrary(L"DSOUND.DLL");
     if (p->hdsound_dll == NULL) {
         MP_ERR(ao, "cannot load DSOUND.DLL\n");
         return 0;
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 8fb8a71fb9..1b99c4136a 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -17,9 +17,6 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define COBJMACROS 1
-#define _WIN32_WINNT 0x600
-
 #include <stdlib.h>
 #include <inttypes.h>
 #include <process.h>
diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h
index 367aae03aa..895497bffb 100755
--- a/audio/out/ao_wasapi.h
+++ b/audio/out/ao_wasapi.h
@@ -20,9 +20,6 @@
 #ifndef MP_AO_WASAPI_H_
 #define MP_AO_WASAPI_H_
 
-#define COBJMACROS 1
-#define _WIN32_WINNT 0x600
-
 #include <audioclient.h>
 #include <audiopolicy.h>
 #include <mmdeviceapi.h>
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c
index cd869c7ab5..ea7e2c6aa7 100755
--- a/audio/out/ao_wasapi_changenotify.c
+++ b/audio/out/ao_wasapi_changenotify.c
@@ -17,9 +17,6 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define COBJMACROS 1
-#define _WIN32_WINNT 0x600
-
 #include <initguid.h>
 #include <audioclient.h>
 #include <endpointvolume.h>
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 072e80e208..30f1f38ae8 100755
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -17,9 +17,6 @@
  * with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define COBJMACROS 1
-#define _WIN32_WINNT 0x600
-
 #include <math.h>
 #include <libavutil/common.h>
 #include <initguid.h>
-- 
cgit v1.2.3