mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-20 14:18:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

wasapi: Remove obsolete ifdefs for older MinGW

Browse source 
We no longer ship that ancient MinGW toolchain, and it's causing build
errors with MSYS2 now:
https://gitlab.freedesktop.org/slomo/gstreamer/-/jobs/46866129

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5155>
This commit is contained in:
Nirbheek Chauhan 2023-08-08 16:00:02 +05:30 committed by GStreamer Marge Bot
parent 4b18d240e6
commit b7dcca4c98
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-bad/sys/wasapi/gstwasapiutil.c
View file

@ -27,26 +27,14 @@
* initguid.h must be included in the C file before mmdeviceapi.h * initguid.h must be included in the C file before mmdeviceapi.h
* which is included in gstwasapiutil.h. * which is included in gstwasapiutil.h.
*/ */
#ifdef _MSC_VER
#include <initguid.h> #include <initguid.h>
#endif
#include "gstwasapiutil.h" #include "gstwasapiutil.h"
#include "gstwasapidevice.h" #include "gstwasapidevice.h"
GST_DEBUG_CATEGORY_EXTERN (gst_wasapi_debug); GST_DEBUG_CATEGORY_EXTERN (gst_wasapi_debug);
#define GST_CAT_DEFAULT gst_wasapi_debug #define GST_CAT_DEFAULT gst_wasapi_debug
/* This was only added to MinGW in ~2015 and our Cerbero toolchain is too old */
#if defined(_MSC_VER)
#include <functiondiscoverykeys_devpkey.h> #include <functiondiscoverykeys_devpkey.h>
#elif !defined(PKEY_Device_FriendlyName)
#include <initguid.h>
#include <propkey.h>
DEFINE_PROPERTYKEY (PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80,
0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);
DEFINE_PROPERTYKEY (PKEY_AudioEngine_DeviceFormat, 0xf19f064d, 0x82c, 0x4e27,
0xbc, 0x73, 0x68, 0x82, 0xa1, 0xbb, 0x8e, 0x4c, 0);
#endif
/* __uuidof is only available in C++, so we hard-code the GUID values for all /* __uuidof is only available in C++, so we hard-code the GUID values for all
* these. This is ok because these are ABI. */ * these. This is ok because these are ABI. */