From f50e402e92a8fb17b89f50d3671f806c65818a67 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Jul 2019 16:07:18 +0200 Subject: [PATCH] - sorted sound backend code into subdirectories. --- src/CMakeLists.txt | 21 ++++++++++++------- src/p_conversation.cpp | 2 +- src/sound/{ => backend}/efx.h | 0 src/sound/{ => backend}/i_sound.cpp | 0 src/sound/{ => backend}/i_sound.h | 0 src/sound/{ => backend}/i_soundinternal.h | 0 src/sound/{ => backend}/mpg123_decoder.cpp | 0 src/sound/{ => backend}/mpg123_decoder.h | 0 src/sound/{ => backend}/mpgload.h | 0 src/sound/{ => backend}/oalload.h | 0 src/sound/{ => backend}/oalsound.cpp | 0 src/sound/{ => backend}/oalsound.h | 0 src/sound/{ => backend}/sndfile_decoder.cpp | 0 src/sound/{ => backend}/sndfile_decoder.h | 0 src/sound/{ => backend}/sndload.h | 0 src/sound/i_midi_win32.h | 14 ------------- .../mididevices/music_win_mididevice.cpp | 4 +++- src/sound/{ => music}/i_music.cpp | 0 src/sound/{ => music}/i_music.h | 0 src/sound/{ => music}/i_musicinterns.h | 0 src/sound/{ => music}/i_soundfont.cpp | 0 src/sound/{ => music}/i_soundfont.h | 0 src/sound/{ => music}/mus2midi.h | 2 +- src/sound/{ => music}/music_midi_base.cpp | 8 ++++--- src/win32/i_specialpaths.cpp | 2 +- tools/CMakeLists.txt | 1 + 26 files changed, 25 insertions(+), 29 deletions(-) rename src/sound/{ => backend}/efx.h (100%) rename src/sound/{ => backend}/i_sound.cpp (100%) rename src/sound/{ => backend}/i_sound.h (100%) rename src/sound/{ => backend}/i_soundinternal.h (100%) rename src/sound/{ => backend}/mpg123_decoder.cpp (100%) rename src/sound/{ => backend}/mpg123_decoder.h (100%) rename src/sound/{ => backend}/mpgload.h (100%) rename src/sound/{ => backend}/oalload.h (100%) rename src/sound/{ => backend}/oalsound.cpp (100%) rename src/sound/{ => backend}/oalsound.h (100%) rename src/sound/{ => backend}/sndfile_decoder.cpp (100%) rename src/sound/{ => backend}/sndfile_decoder.h (100%) rename src/sound/{ => backend}/sndload.h (100%) delete mode 100644 src/sound/i_midi_win32.h rename src/sound/{ => music}/i_music.cpp (100%) rename src/sound/{ => music}/i_music.h (100%) rename src/sound/{ => music}/i_musicinterns.h (100%) rename src/sound/{ => music}/i_soundfont.cpp (100%) rename src/sound/{ => music}/i_soundfont.h (100%) rename src/sound/{ => music}/mus2midi.h (99%) rename src/sound/{ => music}/music_midi_base.cpp (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5f138d4cf..81aadd430 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -675,7 +675,10 @@ file( GLOB HEADER_FILES intermission/*.h maploader/*.h menu/*.h + sound/*.h sound/adlmidi/*.h* + sound/backend/*.h* + sound/music/*.h* sound/opnmidi/*.h* sound/oplsynth/*.h sound/oplsynth/dosbox/*.h @@ -689,7 +692,6 @@ file( GLOB HEADER_FILES utility/sfmt/*.h utility/math./*h utility/*.h - sound/*.h scripting/*.h scripting/backend/*.h scripting/decorate/*.h @@ -847,10 +849,10 @@ set( FASTMATH_SOURCES rendering/swrenderer/r_swscene.cpp rendering/polyrenderer/poly_all.cpp sound/oplsynth/opl_mus_player.cpp - sound/mpg123_decoder.cpp - sound/music_midi_base.cpp - sound/oalsound.cpp - sound/sndfile_decoder.cpp + sound/backend/mpg123_decoder.cpp + sound/music/music_midi_base.cpp + sound/backend/oalsound.cpp + sound/backend/sndfile_decoder.cpp sound/timiditypp/fft4g.cpp sound/timiditypp/reverb.cpp gamedata/textures/hires/hqnx/init.cpp @@ -1219,9 +1221,9 @@ set (PCH_SOURCES scripting/zscript/zcc_compile.cpp scripting/zscript/zcc_parser.cpp utility/sfmt/SFMT.cpp - sound/i_music.cpp - sound/i_sound.cpp - sound/i_soundfont.cpp + sound/music/i_music.cpp + sound/music/i_soundfont.cpp + sound/backend/i_sound.cpp sound/mididevices/music_adlmidi_mididevice.cpp sound/mididevices/music_opldumper_mididevice.cpp sound/mididevices/music_opl_mididevice.cpp @@ -1388,6 +1390,8 @@ include_directories( . rendering rendering/2d sound + sound/music + sound/backend sound/oplsynth sound/timidity sound/wildmidi @@ -1492,6 +1496,7 @@ 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\\ADL MIDI" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/adlmidi/.+") source_group("Audio Files\\OPN MIDI" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/opnmidi/.+") source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+") diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 58fd6f3d4..a8cdf3f29 100644 --- a/src/p_conversation.cpp +++ b/src/p_conversation.cpp @@ -43,7 +43,7 @@ #include "a_keys.h" #include "p_enemy.h" #include "gstrings.h" -#include "sound/i_music.h" +#include "i_music.h" #include "p_setup.h" #include "d_net.h" #include "d_event.h" diff --git a/src/sound/efx.h b/src/sound/backend/efx.h similarity index 100% rename from src/sound/efx.h rename to src/sound/backend/efx.h diff --git a/src/sound/i_sound.cpp b/src/sound/backend/i_sound.cpp similarity index 100% rename from src/sound/i_sound.cpp rename to src/sound/backend/i_sound.cpp diff --git a/src/sound/i_sound.h b/src/sound/backend/i_sound.h similarity index 100% rename from src/sound/i_sound.h rename to src/sound/backend/i_sound.h diff --git a/src/sound/i_soundinternal.h b/src/sound/backend/i_soundinternal.h similarity index 100% rename from src/sound/i_soundinternal.h rename to src/sound/backend/i_soundinternal.h diff --git a/src/sound/mpg123_decoder.cpp b/src/sound/backend/mpg123_decoder.cpp similarity index 100% rename from src/sound/mpg123_decoder.cpp rename to src/sound/backend/mpg123_decoder.cpp diff --git a/src/sound/mpg123_decoder.h b/src/sound/backend/mpg123_decoder.h similarity index 100% rename from src/sound/mpg123_decoder.h rename to src/sound/backend/mpg123_decoder.h diff --git a/src/sound/mpgload.h b/src/sound/backend/mpgload.h similarity index 100% rename from src/sound/mpgload.h rename to src/sound/backend/mpgload.h diff --git a/src/sound/oalload.h b/src/sound/backend/oalload.h similarity index 100% rename from src/sound/oalload.h rename to src/sound/backend/oalload.h diff --git a/src/sound/oalsound.cpp b/src/sound/backend/oalsound.cpp similarity index 100% rename from src/sound/oalsound.cpp rename to src/sound/backend/oalsound.cpp diff --git a/src/sound/oalsound.h b/src/sound/backend/oalsound.h similarity index 100% rename from src/sound/oalsound.h rename to src/sound/backend/oalsound.h diff --git a/src/sound/sndfile_decoder.cpp b/src/sound/backend/sndfile_decoder.cpp similarity index 100% rename from src/sound/sndfile_decoder.cpp rename to src/sound/backend/sndfile_decoder.cpp diff --git a/src/sound/sndfile_decoder.h b/src/sound/backend/sndfile_decoder.h similarity index 100% rename from src/sound/sndfile_decoder.h rename to src/sound/backend/sndfile_decoder.h diff --git a/src/sound/sndload.h b/src/sound/backend/sndload.h similarity index 100% rename from src/sound/sndload.h rename to src/sound/backend/sndload.h diff --git a/src/sound/i_midi_win32.h b/src/sound/i_midi_win32.h deleted file mode 100644 index 1c7193081..000000000 --- a/src/sound/i_midi_win32.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0400 -#undef _WIN32_WINNT -#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0400 -#endif -#include -#include -#else -#define FALSE 0 -#define TRUE 1 -#endif diff --git a/src/sound/mididevices/music_win_mididevice.cpp b/src/sound/mididevices/music_win_mididevice.cpp index 71ddb4efc..94c8a0b36 100644 --- a/src/sound/mididevices/music_win_mididevice.cpp +++ b/src/sound/mididevices/music_win_mididevice.cpp @@ -34,7 +34,9 @@ #ifdef _WIN32 -#include "i_midi_win32.h" +#define WIN32_LEAN_AND_MEAN +#include +#include // HEADER FILES ------------------------------------------------------------ diff --git a/src/sound/i_music.cpp b/src/sound/music/i_music.cpp similarity index 100% rename from src/sound/i_music.cpp rename to src/sound/music/i_music.cpp diff --git a/src/sound/i_music.h b/src/sound/music/i_music.h similarity index 100% rename from src/sound/i_music.h rename to src/sound/music/i_music.h diff --git a/src/sound/i_musicinterns.h b/src/sound/music/i_musicinterns.h similarity index 100% rename from src/sound/i_musicinterns.h rename to src/sound/music/i_musicinterns.h diff --git a/src/sound/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp similarity index 100% rename from src/sound/i_soundfont.cpp rename to src/sound/music/i_soundfont.cpp diff --git a/src/sound/i_soundfont.h b/src/sound/music/i_soundfont.h similarity index 100% rename from src/sound/i_soundfont.h rename to src/sound/music/i_soundfont.h diff --git a/src/sound/mus2midi.h b/src/sound/music/mus2midi.h similarity index 99% rename from src/sound/mus2midi.h rename to src/sound/music/mus2midi.h index 7b61f9e85..d083fe8c3 100644 --- a/src/sound/mus2midi.h +++ b/src/sound/music/mus2midi.h @@ -39,7 +39,7 @@ #endif #include -#include "doomtype.h" +#include #define MIDI_SYSEX ((uint8_t)0xF0) // SysEx begin #define MIDI_SYSEXEND ((uint8_t)0xF7) // SysEx end diff --git a/src/sound/music_midi_base.cpp b/src/sound/music/music_midi_base.cpp similarity index 98% rename from src/sound/music_midi_base.cpp rename to src/sound/music/music_midi_base.cpp index bd7fa1c02..7a3071fdf 100644 --- a/src/sound/music_midi_base.cpp +++ b/src/sound/music/music_midi_base.cpp @@ -31,9 +31,6 @@ ** */ -#include "i_midi_win32.h" - - #include "i_musicinterns.h" #include "c_dispatch.h" @@ -105,6 +102,11 @@ void MIDIDeviceChanged(int newdev, bool force) #define DEF_MIDIDEV -5 #ifdef _WIN32 + +#define WIN32_LEAN_AND_MEAN +#include +#include + unsigned mididevice; CUSTOM_CVAR (Int, snd_mididevice, DEF_MIDIDEV, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) diff --git a/src/win32/i_specialpaths.cpp b/src/win32/i_specialpaths.cpp index dcc1ab6d9..c354fe965 100644 --- a/src/win32/i_specialpaths.cpp +++ b/src/win32/i_specialpaths.cpp @@ -33,7 +33,7 @@ ** */ -#define _WIN32_WINNT 0x0601 +#define _WIN32_WINNT 0x0600 #include #include #include diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 2a0dfecbc..d9d35fd5a 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,5 +1,6 @@ cmake_minimum_required( VERSION 2.8.7 ) +add_subdirectory( re2c ) add_subdirectory( lemon ) add_subdirectory( updaterevision ) add_subdirectory( zipdir )