- put things in their proper place.

This commit is contained in:
Christoph Oelckers 2020-04-11 18:25:23 +02:00
parent 00bbc48e70
commit 7d36af8840
5 changed files with 6 additions and 3 deletions

View file

@ -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)
{

View file

@ -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;

View file

@ -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 --------------------------------------------

View file

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

View file

@ -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.