Remove the WINRT defines in favor of WINDOWSAPP

Kode · Mar 26, 2024 · d6c49ed · d6c49ed
1 parent 7995c46
commit d6c49ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -9,13 +9,13 @@
 #include <AudioClient.h>
 #include <Windows.h>
 #include <initguid.h>
-#ifdef KINC_WINRT
+#ifdef KINC_WINDOWSAPP
 #include <mfapi.h>
 #endif
 #include <mmdeviceapi.h>
 #include <wrl/implements.h>
 
-#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<RuntimeClassFlags<ClassicCom>, 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<AudioRenderer>();
 
 	IActivateAudioInterfaceAsyncOperation *asyncOp;

diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ @@
     #if defined(KINC_WINDOWSAPP)
     #define KINC_WINDOWSAPP
-    #define KINC_WINRT
     #else
@@ Expand Down @@