Merge branch 'master' of https://github.com/chocolate-doom/chocolate-…

…doom
fabiangreffrath · Oct 5, 2022 · 9d200c4 · 9d200c4
2 parents b9fac62 + 847056a
commit 9d200c4
Showing 8 changed files with 36 additions and 37 deletions.
diff --git a/src/i_sound.c b/src/i_sound.c
@@ -66,29 +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 opl_driver_ver_t opl_drv_ver;
-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
@@ -250,6 +250,29 @@ typedef enum {
 void I_SetOPLDriverVer(opl_driver_ver_t ver);
 void I_OPL_DevMessages(char *, size_t);
 
+// Sound modules
+
+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;

diff --git a/src/setup/display.c b/src/setup/display.c
@@ -30,7 +30,6 @@
 
 #define WINDOW_HELP_URL "https://www.chocolate-doom.org/setup-display"
 
-extern void RestartTextscreen(void);
 
 typedef struct
 {

diff --git a/src/setup/joystick.h b/src/setup/joystick.h
@@ -15,7 +15,13 @@
 #ifndef SETUP_JOYSTICK_H
 #define SETUP_JOYSTICK_H
 
+
+#include "i_joystick.h"
+
+
 extern int joystick_index;
+extern int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS];
+
 
 void ConfigJoystick(void *widget, void *user_data);
 void BindJoystickVariables(void);

diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
@@ -281,7 +281,6 @@ static void InitConfig(void)
 
 static void SetIcon(void)
 {
-    extern SDL_Window *TXT_SDLWindow;
     SDL_Surface *surface;
 
     surface = SDL_CreateRGBSurfaceFrom((void *) setup_icon_data, setup_icon_w,
@@ -332,14 +331,6 @@ static void InitTextscreen(void)
     SetWindowTitle();
 }
 
-// Restart the textscreen library.  Used when the video_driver variable
-// is changed.
-
-void RestartTextscreen(void)
-{
-    TXT_Shutdown();
-    InitTextscreen();
-}
 
 // 
 // Initialize and run the textscreen GUI.

diff --git a/src/setup/sound.c b/src/setup/sound.c
@@ -74,9 +74,9 @@ static int show_talk = 0;
 int use_libsamplerate = 1;
 float libsamplerate_scale = 0.65;
 
-static char *music_pack_path = NULL;
-static char *timidity_cfg_path = NULL;
-static char *fluidsynth_sf_path = NULL;
+char *music_pack_path = NULL;
+char *timidity_cfg_path = NULL;
+char *fluidsynth_sf_path = NULL;
 static char *gus_patch_path = NULL;
 static int gus_ram_kb = 1024;
 #ifdef _WIN32

diff --git a/src/setup/txt_joybinput.c b/src/setup/txt_joybinput.c
@@ -35,7 +35,6 @@
 
 #define JOYSTICK_INPUT_WIDTH 10
 
-extern int joystick_physical_buttons[NUM_VIRTUAL_BUTTONS];
 
 // Joystick button variables.
 // The ordering of this array is important. We will always try to map

diff --git a/textscreen/txt_sdl.h b/textscreen/txt_sdl.h
@@ -37,5 +37,9 @@ typedef int (*TxtSDLEventCallbackFunc)(SDL_Event *event, void *user_data);
 
 void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data);
 
+
+extern SDL_Window *TXT_SDLWindow;
+
+
 #endif /* #ifndef TXT_SDL_H */
Original file line number	Diff line number	Diff line change
		@@ -37,5 +37,9 @@ typedef int (TxtSDLEventCallbackFunc)(SDL_Event event, void *user_data);

		void TXT_SDL_SetEventCallback(TxtSDLEventCallbackFunc callback, void *user_data);


		extern SDL_Window *TXT_SDLWindow;


		#endif /* #ifndef TXT_SDL_H */