From 7b059965e8df745c5b45b4ec6bfbdfe1a7397642 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Mon, 16 Jan 2017 19:19:45 +0100 Subject: Adapt platforms to AudioServer refactoring Fixes compilation on Windows and likely other platforms (at least as far as AudioServer changes were concerned), though they were not tested. --- platform/server/os_server.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'platform/server/os_server.h') diff --git a/platform/server/os_server.h b/platform/server/os_server.h index f7fe586b1..2b6225c48 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -29,17 +29,13 @@ #ifndef OS_SERVER_H #define OS_SERVER_H - #include "main/input_default.h" #include "drivers/unix/os_unix.h" #include "servers/visual_server.h" #include "servers/visual/rasterizer.h" #include "servers/audio/audio_driver_dummy.h" #include "servers/physics_server.h" -#include "servers/audio/audio_server_sw.h" -#include "servers/audio/sample_manager_sw.h" -#include "servers/spatial_sound/spatial_sound_server_sw.h" -#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h" +#include "servers/audio_server.h" #include "drivers/rtaudio/audio_driver_rtaudio.h" #include "servers/physics_2d/physics_2d_server_sw.h" @@ -66,11 +62,6 @@ class OS_Server : public OS_Unix { virtual void delete_main_loop(); IP_Unix *ip_unix; - AudioServerSW *audio_server; - SampleManagerMallocSW *sample_manager; - SpatialSoundServerSW *spatial_sound_server; - SpatialSound2DServerSW *spatial_sound_2d_server; - bool force_quit; InputDefault *input; -- cgit v1.2.3-70-g09d2