From 4ce19e144833d93ed4cb03d836ebb7aa67063093 Mon Sep 17 00:00:00 2001 From: Kenix3 Date: Wed, 3 Aug 2022 20:04:29 -0400 Subject: [PATCH] LUS Cleanup: Only including the correct audio player header file. --- libultraship/libultraship/AudioPlayer.h | 9 +++++++++ libultraship/libultraship/Window.cpp | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libultraship/libultraship/AudioPlayer.h b/libultraship/libultraship/AudioPlayer.h index 346239624be..739531c5114 100644 --- a/libultraship/libultraship/AudioPlayer.h +++ b/libultraship/libultraship/AudioPlayer.h @@ -1,5 +1,14 @@ #pragma once #include "stdint.h" +#ifndef _MSC_VER +#include "SDLAudioPlayer.h" +#endif +#ifdef _MSC_VER +#include "WasapiAudioPlayer.h" +#endif +#ifdef __APPLE__ +#include "PulseAudioPlayer.h" +#endif namespace Ship { class AudioPlayer { diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp index d3bdee369b7..86e1e12e01d 100644 --- a/libultraship/libultraship/Window.cpp +++ b/libultraship/libultraship/Window.cpp @@ -12,8 +12,6 @@ #include "AudioPlayer.h" #include "Hooks.h" #include "UltraController.h" -#include "WasapiAudioPlayer.h" -#include "PulseAudioPlayer.h" #include "Lib/Fast3D/gfx_pc.h" #include "Lib/Fast3D/gfx_sdl.h" #include "Lib/Fast3D/gfx_opengl.h"