- split off all music code from s_sound.cpp

src/CMakeLists.txt

@@ -1001,6 +1001,7 @@ set (PCH_SOURCES
 	sound/s_environment.cpp
 	sound/s_sndseq.cpp
 	sound/s_sound.cpp
+	sound/s_music.cpp
 	serializer.cpp
 	scriptutil.cpp
 	st_stuff.cpp

src/console/c_console.cpp

@@ -64,6 +64,7 @@
 #include "g_levellocals.h"
 #include "vm.h"
 #include "utf8.h"
+#include "s_music.h"
 
 
 #include "gi.h"
@@ -1268,6 +1269,7 @@ void C_FullConsole ()
 		gamestate = GS_FULLCONSOLE;
 		primaryLevel->Music = "";
 		S_Start ();
+		S_StartMusic();
 		P_FreeLevelData ();
 	}
 	else

src/d_main.cpp

@@ -102,6 +102,7 @@
 #include "g_cvars.h"
 #include "r_data/r_vanillatrans.h"
 #include "atterm.h"
+#include "s_music.h"
 
 EXTERN_CVAR(Bool, hud_althud)
 EXTERN_CVAR(Int, vr_mode)
@@ -1034,6 +1035,7 @@ void D_DoomLoop ()
 			// Update display, next frame, with current state.
 			I_StartTic ();
 			D_Display ();
+			S_UpdateMusic();
 			if (wantToRestart)
 			{
 				wantToRestart = false;
@@ -2459,6 +2461,7 @@ void D_DoomMain (void)
 
 		if (!batchrun) Printf ("S_Init: Setting up sound.\n");
 		S_Init ();
+		S_InitMusic();
 
 		if (!batchrun) Printf ("ST_Init: Init startup screen.\n");
 		if (!restart)
@@ -2752,6 +2755,7 @@ void D_DoomMain (void)
 		R_DeinitTranslationTables();	// some tables are initialized from outside the translation code.
 		gameinfo.~gameinfo_t();
 		new (&gameinfo) gameinfo_t;		// Reset gameinfo
+		S_ShutdownMusic();
 		S_Shutdown();					// free all channels and delete playlist
 		C_ClearAliases();				// CCMDs won't be reinitialized so these need to be deleted here
 		DestroyCVarsFlagged(CVAR_MOD);	// Delete any cvar left by mods

src/d_net.cpp

@@ -67,6 +67,7 @@
 #include "i_system.h"
 #include "vm.h"
 #include "gstrings.h"
+#include "s_music.h"
 
 EXTERN_CVAR (Int, disableautosave)
 EXTERN_CVAR (Int, autosavecount)

src/g_level.cpp

@@ -89,6 +89,7 @@
 #include "actorinlines.h"
 #include "i_time.h"
 #include "p_maputl.h"
+#include "s_music.h"
 
 void STAT_StartNewGame(const char *lev);
 void STAT_ChangeLevel(const char *newl, FLevelLocals *Level);
@@ -2221,3 +2222,10 @@ int IsPointInMap(FLevelLocals *Level, double x, double y, double z)
 	return true;
 }
 
+
+void FLevelLocals::SetMusic()
+{
+	if (cdtrack == 0 || !S_ChangeCDMusic(cdtrack, cdid))
+		S_ChangeMusic(Music, musicorder);
+}
+

src/g_levellocals.h

@@ -424,11 +424,8 @@ struct FLevelLocals
 		return thinker;
 	}
 
-	void SetMusic()
-	{
-		if (cdtrack == 0 || !S_ChangeCDMusic(cdtrack, cdid))
-			S_ChangeMusic(Music, musicorder);
-	}
+	void SetMusic();
+
 
 	TArray<vertex_t> vertexes;
 	TArray<sector_t> sectors;

src/intermission/intermission.cpp

@@ -51,6 +51,7 @@
 #include "g_levellocals.h"
 #include "utf8.h"
 #include "templates.h"
+#include "s_music.h"
 
 FIntermissionDescriptorList IntermissionDescriptors;
 
@@ -1100,4 +1101,4 @@ CCMD(measureintermissions)
 			}
 		}
 	}
-}
+}

src/p_saveg.cpp

@@ -59,6 +59,7 @@
 #include "r_sky.h"
 #include "version.h"
 #include "fragglescript/t_script.h"
+#include "s_music.h"
 
 EXTERN_CVAR(Bool, save_formatted)
 

src/p_setup.cpp

@@ -76,6 +76,7 @@
 #include "v_video.h"
 #include "fragglescript/t_script.h"
 #include "atterm.h"
+#include "s_music.h"
 
 extern AActor *SpawnMapThing (int index, FMapThing *mthing, int position);
 
@@ -407,6 +408,7 @@ void P_SetupLevel(FLevelLocals *Level, int position, bool newGame)
 
 	// Make sure all sounds are stopped before Z_FreeTags.
 	S_Start();
+	S_StartMusic();
 
 	// [RH] clear out the mid-screen message
 	C_MidPrint(nullptr, nullptr);

src/playsim/a_dynlight.cpp

@@ -989,4 +989,3 @@ void FLevelLocals::RecreateAllAttachedLights()
 		}
 	}
 }
-

src/playsim/fragglescript/t_func.cpp

@@ -51,6 +51,7 @@
 #include "scriptutil.h"
 #include "vm.h"
 #include "a_lights.h"
+#include "s_music.h"
 
 static FRandom pr_script("FScript");
 

src/playsim/fragglescript/t_load.cpp

@@ -34,6 +34,7 @@
 #include "g_levellocals.h"
 #include "xlat/xlat.h"
 #include "maploader/maploader.h"
+#include "s_music.h"
 
 class FScriptLoader
 {

src/playsim/p_acs.cpp

@@ -75,6 +75,7 @@
 #include "actorinlines.h"
 #include "types.h"
 #include "scriptutil.h"
+#include "s_music.h"
 
 	// P-codes for ACS scripts
 	enum

src/playsim/p_user.cpp

@@ -91,6 +91,7 @@
 #include "g_game.h"
 #include "v_video.h"
 #include "gstrings.h"
+#include "s_music.h"
 
 static FRandom pr_skullpop ("SkullPop");
 

src/posix/cocoa/i_main.mm

@@ -46,6 +46,7 @@
 #include "st_console.h"
 #include "version.h"
 #include "doomerrors.h"
+#include "s_music.h"
 
 
 #define ZD_UNUSED(VARIABLE) ((void)(VARIABLE))

src/sound/backend/i_sound.cpp

@@ -48,6 +48,7 @@
 #include "v_text.h"
 #include "c_cvars.h"
 #include "stats.h"
+#include "s_music.h"
 
 EXTERN_CVAR (Float, snd_sfxvolume)
 EXTERN_CVAR (Float, snd_musicvolume)

src/sound/music/i_music.cpp

@@ -47,6 +47,7 @@
 #include "stats.h"
 #include "timidity/timidity.h"
 #include "vm.h"
+#include "s_music.h"
 
 
 

src/sound/music/music_midi_base.cpp

@@ -36,6 +36,7 @@
 
 #include "v_text.h"
 #include "menu/menu.h"
+#include "s_music.h"
 
 static uint32_t	nummididevices;
 static bool		nummididevicesset;

src/sound/s_advsound.cpp

@@ -49,6 +49,7 @@
 #include "vm.h"
 #include "i_system.h"
 #include "atterm.h"
+#include "s_music.h"
 
 // MACROS ------------------------------------------------------------------