From d6c49ed5af03a28e470bab4223cc6d8e2b157993 Mon Sep 17 00:00:00 2001 From: Robert Konrad Date: Tue, 26 Mar 2024 23:11:20 +0100 Subject: [PATCH] Remove the WINRT defines in favor of WINDOWSAPP --- .../Sources/kinc/backend/WASAPI.winrt.cpp | 12 ++++++------ Sources/kinc/global.h | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Backends/Audio2/WASAPI_WinRT/Sources/kinc/backend/WASAPI.winrt.cpp b/Backends/Audio2/WASAPI_WinRT/Sources/kinc/backend/WASAPI.winrt.cpp index e97e672b7..c3dff53ce 100644 --- a/Backends/Audio2/WASAPI_WinRT/Sources/kinc/backend/WASAPI.winrt.cpp +++ b/Backends/Audio2/WASAPI_WinRT/Sources/kinc/backend/WASAPI.winrt.cpp @@ -9,13 +9,13 @@ #include #include #include -#ifdef KINC_WINRT +#ifdef KINC_WINDOWSAPP #include #endif #include #include -#ifdef KINC_WINRT +#ifdef KINC_WINDOWSAPP using namespace ::Microsoft::WRL; using namespace Windows::Media::Devices; using namespace Windows::Storage::Streams; @@ -55,7 +55,7 @@ namespace { bool initDefaultDevice(); void audioThread(LPVOID); -#ifdef KINC_WINRT +#ifdef KINC_WINDOWSAPP class AudioRenderer : public RuntimeClass, FtmBase, IActivateAudioInterfaceCompletionHandler> { public: STDMETHOD(ActivateCompleted)(IActivateAudioInterfaceAsyncOperation *operation) { @@ -75,7 +75,7 @@ namespace { #endif bool initDefaultDevice() { -#ifdef KINC_WINRT +#ifdef KINC_WINDOWSAPP HRESULT hr = S_OK; #else if (renderClient != NULL) { @@ -248,7 +248,7 @@ namespace { } // namespace -#ifndef KINC_WINRT +#ifndef KINC_WINDOWSAPP extern "C" void kinc_windows_co_initialize(void); #endif @@ -272,7 +272,7 @@ void kinc_a2_init() { audioProcessingDoneEvent = CreateEvent(0, FALSE, FALSE, 0); kinc_affirm(audioProcessingDoneEvent != 0); -#ifdef KINC_WINRT +#ifdef KINC_WINDOWSAPP renderer = Make(); IActivateAudioInterfaceAsyncOperation *asyncOp; diff --git a/Sources/kinc/global.h b/Sources/kinc/global.h index 495043c72..166f69a5b 100644 --- a/Sources/kinc/global.h +++ b/Sources/kinc/global.h @@ -35,7 +35,6 @@ #if defined(KINC_WINDOWSAPP) #define KINC_WINDOWSAPP -#define KINC_WINRT #else