- put things in their proper place.

src/sound/music/music.cpp

@@ -64,6 +64,7 @@ static FPlayList PlayList;
 float	relative_volume = 1.f;
 float	saved_relative_volume = 1.0f;	// this could be used to implement an ACS FadeMusic function
 MusicVolumeMap MusicVolumes;
+MidiDeviceMap MidiDevices;
 
 static FileReader DefaultOpenMusic(const char* fn)
 {

src/sound/music/s_music.h

@@ -56,11 +56,9 @@ struct MidiDeviceSetting
 	FString args;
 };
 
-typedef TMap<FName, FName> MusicAliasMap;
 typedef TMap<FName, MidiDeviceSetting> MidiDeviceMap;
 typedef TMap<FName, float> MusicVolumeMap;
 
-extern MusicAliasMap MusicAliases;
 extern MidiDeviceMap MidiDevices;
 extern MusicVolumeMap MusicVolumes;
 

src/sound/s_advsound.cpp

@@ -159,7 +159,6 @@ struct FSavedPlayerSoundInfo
 
 // This specifies whether Timidity or Windows playback is preferred for a certain song (only useful for Windows.)
 MusicAliasMap MusicAliases;
-MidiDeviceMap MidiDevices;
 
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 

src/sound/s_doomsound.cpp

@@ -97,6 +97,7 @@ public:
 	void PrintSoundList();
 };
 
+
 //==========================================================================
 //
 // LookupMusic

src/sound/s_sound.h

@@ -37,10 +37,14 @@ struct FLevelLocals;
 
 #include "s_soundinternal.h"
 #include "s_doomsound.h"
+#include "name.h"
+#include "tarray.h"
 
 // Per level startup code.
 // Kills playing sounds at start of level and starts new music.
 //
+typedef TMap<FName, FName> MusicAliasMap;
+extern MusicAliasMap MusicAliases;
 
 // Called after a level is loaded. Ensures that most sounds are loaded.