From 7d36af88400e68831c56cf0f528f07594ed8aca9 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 11 Apr 2020 18:25:23 +0200
Subject: [PATCH] - put things in their proper place.

---
 src/sound/music/music.cpp | 1 +
 src/sound/music/s_music.h | 2 --
 src/sound/s_advsound.cpp  | 1 -
 src/sound/s_doomsound.cpp | 1 +
 src/sound/s_sound.h       | 4 ++++
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/sound/music/music.cpp b/src/sound/music/music.cpp
index 6e8a03724..8a385b291 100644
--- a/src/sound/music/music.cpp
+++ b/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)
 {
diff --git a/src/sound/music/s_music.h b/src/sound/music/s_music.h
index 81cbc6a9e..4138dc7da 100644
--- a/src/sound/music/s_music.h
+++ b/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;
 
diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp
index 7c00768b2..ed18c432d 100644
--- a/src/sound/s_advsound.cpp
+++ b/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 --------------------------------------------
 
diff --git a/src/sound/s_doomsound.cpp b/src/sound/s_doomsound.cpp
index 695c36a09..29ef2625d 100644
--- a/src/sound/s_doomsound.cpp
+++ b/src/sound/s_doomsound.cpp
@@ -97,6 +97,7 @@ public:
 	void PrintSoundList();
 };
 
+
 //==========================================================================
 //
 // LookupMusic
diff --git a/src/sound/s_sound.h b/src/sound/s_sound.h
index b82195849..c12b276c5 100644
--- a/src/sound/s_sound.h
+++ b/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.