foxygit / doom Log in
commit 2c50992b689dad64fe7ff03104ee7cbfd066eb40
Author:     Turo Lamminen <turol@iki.fi>
AuthorDate: Thu Sep 8 15:25:32 2022 +0300
Commit:     Turo Lamminen <turol@iki.fi>
CommitDate: Fri Sep 30 13:01:53 2022 +0300

    sound: Move a lot of extern declarations to i_sound.h
---
 src/i_sound.c | 22 ----------------------
 src/i_sound.h | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/i_sound.c b/src/i_sound.c
index 79febab1..cd2691e3 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -66,28 +66,6 @@ static boolean music_packs_active = false;
 // depending on whether the current track is substituted.
 static music_module_t *active_music_module;

-// Sound modules
-
-extern void I_InitTimidityConfig(void);
-extern sound_module_t sound_sdl_module;
-extern sound_module_t sound_pcsound_module;
-extern music_module_t music_sdl_module;
-extern music_module_t music_opl_module;
-extern music_module_t music_pack_module;
-
-// For OPL module:
-
-extern int opl_io_port;
-
-// For native music module:
-
-extern char *music_pack_path;
-extern char *fluidsynth_sf_path;
-extern char *timidity_cfg_path;
-#ifdef _WIN32
-extern int winmm_reverb_level;
-extern int winmm_chorus_level;
-#endif

 // DOS-specific options: These are unused but should be maintained
 // so that the config file can be shared between chocolate
diff --git a/src/i_sound.h b/src/i_sound.h
index 7a416231..58abb4c3 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -250,6 +250,29 @@ typedef enum {
 void I_SetOPLDriverVer(opl_driver_ver_t ver);
 void I_OPL_DevMessages(char *, size_t);

+// Sound modules
+
+extern void I_InitTimidityConfig(void);
+extern sound_module_t sound_sdl_module;
+extern sound_module_t sound_pcsound_module;
+extern music_module_t music_sdl_module;
+extern music_module_t music_opl_module;
+extern music_module_t music_pack_module;
+
+// For OPL module:
+
+extern int opl_io_port;
+
+// For native music module:
+
+extern char *music_pack_path;
+extern char *fluidsynth_sf_path;
+extern char *timidity_cfg_path;
+#ifdef _WIN32
+extern int winmm_reverb_level;
+extern int winmm_chorus_level;
+#endif
+

 #ifdef _WIN32
 extern char *winmm_midi_device;