Fix audio module: add NOMINMAX, include WASAPIBackend.h, add AudioClip and TransformComponent includes
This commit is contained in:
@@ -1,12 +1,13 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../IAudioBackend.h"
|
#include "../IAudioBackend.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
#define NOMINMAX
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <mmsystem.h>
|
#include <mmsystem.h>
|
||||||
#pragma comment(lib, "winmm.lib")
|
#pragma comment(lib, "winmm.lib")
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <XCEngine/Components/Component.h>
|
#include <XCEngine/Components/Component.h>
|
||||||
|
#include <XCEngine/Components/TransformComponent.h>
|
||||||
#include <XCEngine/Audio/AudioTypes.h>
|
#include <XCEngine/Audio/AudioTypes.h>
|
||||||
|
#include <XCEngine/Resources/AudioClip.h>
|
||||||
#include <XCEngine/Math/Vector3.h>
|
#include <XCEngine/Math/Vector3.h>
|
||||||
#include <XCEngine/Math/Quaternion.h>
|
#include <XCEngine/Math/Quaternion.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
namespace XCEngine {
|
namespace XCEngine {
|
||||||
namespace Resources {
|
|
||||||
class AudioClip;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace Audio {
|
namespace Audio {
|
||||||
class AudioMixer;
|
class AudioMixer;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#include <XCEngine/Audio/AudioSystem.h>
|
#include <XCEngine/Audio/AudioSystem.h>
|
||||||
|
#include <XCEngine/Audio/WASAPI/WASAPIBackend.h>
|
||||||
#include <XCEngine/Components/AudioSourceComponent.h>
|
#include <XCEngine/Components/AudioSourceComponent.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
@@ -15,7 +16,7 @@ void AudioSystem::Initialize(const AudioConfig& config) {
|
|||||||
Shutdown();
|
Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
m_backend = std::make_unique<WASAPI::WASAPIBackend>();
|
m_backend = std::make_unique<Audio::WASAPI::WASAPIBackend>();
|
||||||
if (m_backend->Initialize(config)) {
|
if (m_backend->Initialize(config)) {
|
||||||
m_backend->Start();
|
m_backend->Start();
|
||||||
std::cout << "AudioSystem initialized successfully" << std::endl;
|
std::cout << "AudioSystem initialized successfully" << std::endl;
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
|
#ifdef _WIN32
|
||||||
|
#define NOMINMAX
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <XCEngine/Audio/WASAPI/WASAPIBackend.h>
|
#include <XCEngine/Audio/WASAPI/WASAPIBackend.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
namespace XCEngine {
|
namespace XCEngine {
|
||||||
namespace Audio {
|
namespace Audio {
|
||||||
|
|||||||
Reference in New Issue
Block a user