From a13c7bd053fffedb4c14180abf9347c27f8472c4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 18:30:22 +0200 Subject: [PATCH] - moved sound code to "common". --- src/CMakeLists.txt | 16 +++++++++------- src/{sound/backend => common/audio/sound}/efx.h | 0 .../backend => common/audio/sound}/i_sound.cpp | 0 .../backend => common/audio/sound}/i_sound.h | 0 .../audio/sound}/i_soundinternal.h | 0 .../backend => common/audio/sound}/oalload.h | 0 .../backend => common/audio/sound}/oalsound.cpp | 0 .../backend => common/audio/sound}/oalsound.h | 0 src/{ => common/audio}/sound/s_environment.cpp | 0 src/{ => common/audio}/sound/s_sound.cpp | 0 src/{ => common/audio}/sound/s_soundinternal.h | 0 src/{ => common/audio}/sound/thirdparty/al.h | 0 src/{ => common/audio}/sound/thirdparty/alc.h | 0 src/{ => common/audio}/sound/thirdparty/alext.h | 0 14 files changed, 9 insertions(+), 7 deletions(-) rename src/{sound/backend => common/audio/sound}/efx.h (100%) rename src/{sound/backend => common/audio/sound}/i_sound.cpp (100%) rename src/{sound/backend => common/audio/sound}/i_sound.h (100%) rename src/{sound/backend => common/audio/sound}/i_soundinternal.h (100%) rename src/{sound/backend => common/audio/sound}/oalload.h (100%) rename src/{sound/backend => common/audio/sound}/oalsound.cpp (100%) rename src/{sound/backend => common/audio/sound}/oalsound.h (100%) rename src/{ => common/audio}/sound/s_environment.cpp (100%) rename src/{ => common/audio}/sound/s_sound.cpp (100%) rename src/{ => common/audio}/sound/s_soundinternal.h (100%) rename src/{ => common/audio}/sound/thirdparty/al.h (100%) rename src/{ => common/audio}/sound/thirdparty/alc.h (100%) rename src/{ => common/audio}/sound/thirdparty/alext.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 227eddbb84..f1756109a6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -609,6 +609,8 @@ file( GLOB HEADER_FILES win32/*.h r_data/*.h r_data/models/*.h + common/audio/sound/thirdparty/*.h + common/audio/sound/*.h common/audio/music/*.h* common/console/*.h common/utility/*.h @@ -624,7 +626,6 @@ file( GLOB HEADER_FILES scripting/zscript/*.h scripting/vm/*.h sound/midisources/*.h - sound/thirdparty/*.h rendering/*.h rendering/2d/*.h rendering/swrenderer/*.h @@ -757,7 +758,6 @@ set( FASTMATH_SOURCES rendering/swrenderer/r_all.cpp rendering/swrenderer/r_swscene.cpp rendering/polyrenderer/poly_all.cpp - sound/backend/oalsound.cpp gamedata/textures/hires/hqnx/init.cpp gamedata/textures/hires/hqnx/hq2x.cpp gamedata/textures/hires/hqnx/hq3x.cpp @@ -878,11 +878,9 @@ set (PCH_SOURCES rendering/r_sky.cpp rendering/r_videoscale.cpp sound/s_advsound.cpp - sound/s_environment.cpp sound/s_reverbedit.cpp sound/s_sndseq.cpp sound/s_doomsound.cpp - sound/s_sound.cpp serializer.cpp scriptutil.cpp st_stuff.cpp @@ -1095,11 +1093,14 @@ set (PCH_SOURCES scripting/zscript/ast.cpp scripting/zscript/zcc_compile.cpp scripting/zscript/zcc_parser.cpp - sound/backend/i_sound.cpp rendering/swrenderer/textures/r_swtexture.cpp rendering/swrenderer/textures/warptexture.cpp rendering/swrenderer/textures/swcanvastexture.cpp events.cpp + common/audio/sound/i_sound.cpp + common/audio/sound/oalsound.cpp + common/audio/sound/s_environment.cpp + common/audio/sound/s_sound.cpp common/audio/music/music_midi_base.cpp common/audio/music/music.cpp common/audio/music/i_music.cpp @@ -1227,6 +1228,7 @@ endif() target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa lzma ${ZMUSIC_LIBRARIES} ) include_directories( . + common/audio/sound common/audio/music common/thirdparty common/filesystem @@ -1355,8 +1357,6 @@ install(TARGETS zdoom COMPONENT "Game executable") source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/.+") -source_group("Audio Files\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/backend/.+") -source_group("Audio Files\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/thirdparty/.+") source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+") source_group("Game Data\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/fonts/.+") source_group("Game Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/textures/.+") @@ -1431,6 +1431,8 @@ source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sc source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+") source_group("Common" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+") source_group("Common\\Audio" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/.+") +source_group("Common\\Audio\\Sound" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/sound/.+") +source_group("Common\\Audio\\Sound\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/sound/thirdparty/.+") source_group("Common\\Audio\\Music" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/audio/music.+") source_group("Common\\Console" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/console/.+") source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/utility/.+") diff --git a/src/sound/backend/efx.h b/src/common/audio/sound/efx.h similarity index 100% rename from src/sound/backend/efx.h rename to src/common/audio/sound/efx.h diff --git a/src/sound/backend/i_sound.cpp b/src/common/audio/sound/i_sound.cpp similarity index 100% rename from src/sound/backend/i_sound.cpp rename to src/common/audio/sound/i_sound.cpp diff --git a/src/sound/backend/i_sound.h b/src/common/audio/sound/i_sound.h similarity index 100% rename from src/sound/backend/i_sound.h rename to src/common/audio/sound/i_sound.h diff --git a/src/sound/backend/i_soundinternal.h b/src/common/audio/sound/i_soundinternal.h similarity index 100% rename from src/sound/backend/i_soundinternal.h rename to src/common/audio/sound/i_soundinternal.h diff --git a/src/sound/backend/oalload.h b/src/common/audio/sound/oalload.h similarity index 100% rename from src/sound/backend/oalload.h rename to src/common/audio/sound/oalload.h diff --git a/src/sound/backend/oalsound.cpp b/src/common/audio/sound/oalsound.cpp similarity index 100% rename from src/sound/backend/oalsound.cpp rename to src/common/audio/sound/oalsound.cpp diff --git a/src/sound/backend/oalsound.h b/src/common/audio/sound/oalsound.h similarity index 100% rename from src/sound/backend/oalsound.h rename to src/common/audio/sound/oalsound.h diff --git a/src/sound/s_environment.cpp b/src/common/audio/sound/s_environment.cpp similarity index 100% rename from src/sound/s_environment.cpp rename to src/common/audio/sound/s_environment.cpp diff --git a/src/sound/s_sound.cpp b/src/common/audio/sound/s_sound.cpp similarity index 100% rename from src/sound/s_sound.cpp rename to src/common/audio/sound/s_sound.cpp diff --git a/src/sound/s_soundinternal.h b/src/common/audio/sound/s_soundinternal.h similarity index 100% rename from src/sound/s_soundinternal.h rename to src/common/audio/sound/s_soundinternal.h diff --git a/src/sound/thirdparty/al.h b/src/common/audio/sound/thirdparty/al.h similarity index 100% rename from src/sound/thirdparty/al.h rename to src/common/audio/sound/thirdparty/al.h diff --git a/src/sound/thirdparty/alc.h b/src/common/audio/sound/thirdparty/alc.h similarity index 100% rename from src/sound/thirdparty/alc.h rename to src/common/audio/sound/thirdparty/alc.h diff --git a/src/sound/thirdparty/alext.h b/src/common/audio/sound/thirdparty/alext.h similarity index 100% rename from src/sound/thirdparty/alext.h rename to src/common/audio/sound/thirdparty/alext.h