From 85c106d5ddeaa5de8084c06a83f0b982568c81e3 Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Fri, 20 Mar 2026 20:48:09 +0800 Subject: [PATCH] Fix audio module: add NOMINMAX, include WASAPIBackend.h, add AudioClip and TransformComponent includes --- engine/include/XCEngine/Audio/WASAPI/WASAPIBackend.h | 3 ++- engine/include/XCEngine/Components/AudioSourceComponent.h | 7 +++---- engine/src/Audio/AudioSystem.cpp | 3 ++- engine/src/Audio/WASAPI/WASAPIBackend.cpp | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/engine/include/XCEngine/Audio/WASAPI/WASAPIBackend.h b/engine/include/XCEngine/Audio/WASAPI/WASAPIBackend.h index c7b48eba..e1f626aa 100644 --- a/engine/include/XCEngine/Audio/WASAPI/WASAPIBackend.h +++ b/engine/include/XCEngine/Audio/WASAPI/WASAPIBackend.h @@ -1,12 +1,13 @@ #pragma once -#include "../../IAudioBackend.h" +#include "../IAudioBackend.h" #include #include #include #include #ifdef _WIN32 +#define NOMINMAX #include #include #pragma comment(lib, "winmm.lib") diff --git a/engine/include/XCEngine/Components/AudioSourceComponent.h b/engine/include/XCEngine/Components/AudioSourceComponent.h index 7e800a61..decb3ec9 100644 --- a/engine/include/XCEngine/Components/AudioSourceComponent.h +++ b/engine/include/XCEngine/Components/AudioSourceComponent.h @@ -1,17 +1,16 @@ #pragma once #include +#include #include +#include #include #include #include #include +#include namespace XCEngine { -namespace Resources { -class AudioClip; -} - namespace Audio { class AudioMixer; } diff --git a/engine/src/Audio/AudioSystem.cpp b/engine/src/Audio/AudioSystem.cpp index c75f4bf2..059db290 100644 --- a/engine/src/Audio/AudioSystem.cpp +++ b/engine/src/Audio/AudioSystem.cpp @@ -1,4 +1,5 @@ #include +#include #include #include @@ -15,7 +16,7 @@ void AudioSystem::Initialize(const AudioConfig& config) { Shutdown(); } - m_backend = std::make_unique(); + m_backend = std::make_unique(); if (m_backend->Initialize(config)) { m_backend->Start(); std::cout << "AudioSystem initialized successfully" << std::endl; diff --git a/engine/src/Audio/WASAPI/WASAPIBackend.cpp b/engine/src/Audio/WASAPI/WASAPIBackend.cpp index 2aa5ee6c..19963d49 100644 --- a/engine/src/Audio/WASAPI/WASAPIBackend.cpp +++ b/engine/src/Audio/WASAPI/WASAPIBackend.cpp @@ -1,5 +1,10 @@ +#ifdef _WIN32 +#define NOMINMAX +#endif + #include #include +#include namespace XCEngine { namespace Audio {