SunRed/SpaceCadetPinball
1
0
Fork 0
mirror of https://github.com/k4zmu2a/SpaceCadetPinball.git synced 2024-11-24 01:40:18 +01:00
Code Issues Releases Activity

midi: added support for FULLTILT16 music.

Browse source
This commit is contained in:
Muzychenko Andrey 2021-09-30 08:51:48 +03:00
parent 03deda2f9d
commit a281000308
2 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
SpaceCadetPinball/midi.cpp
View file

@ -54,14 +54,14 @@ int midi::music_init()
if (pb::FullTiltMode) if (pb::FullTiltMode)
{ {
track1 = load_track("TABA1.MDS", true); track1 = load_track("TABA1");
track2 = load_track("TABA2.MDS", true); track2 = load_track("TABA2");
track3 = load_track("TABA3.MDS", true); track3 = load_track("TABA3");
} }
else else
{ {
// 3DPB has only one music track. PINBALL2.MID is a bitmap font, in the same format as PB_MSGFT.bin // 3DPB has only one music track. PINBALL2.MID is a bitmap font, in the same format as PB_MSGFT.bin
track1 = load_track("PINBALL.MID", false); track1 = load_track("PINBALL");
} }
if (!track2) if (!track2)
@ -86,11 +86,9 @@ void midi::music_shutdown()
delete LoadedTracks; delete LoadedTracks;
} }
Mix_Music* midi::load_track(std::string fileName, bool isMds) Mix_Music* midi::load_track(std::string fileName)
{ {
Mix_Music* audio; Mix_Music* audio = nullptr;
auto origFile = fileName;
if (pb::FullTiltMode) if (pb::FullTiltMode)
{ {
// FT sounds are in SOUND subfolder // FT sounds are in SOUND subfolder
@ -98,16 +96,29 @@ Mix_Music* midi::load_track(std::string fileName, bool isMds)
fileName.insert(0, "SOUND"); fileName.insert(0, "SOUND");
} }
auto filePath = pinball::make_path_name(fileName); // FT has music in two formats, depending on version: MIDI in 16bit, MIDS in 32bit.
if (isMds) // 3DPB music is MIDI only.
auto basePath = pinball::make_path_name(fileName);
for (int i = 0; i <= 1 && !audio; i++)
{
if (i == 0)
{
auto filePath = basePath + ".MID";
auto fileHandle = fopen(filePath.c_str(), "rb");
if (fileHandle)
{
fclose(fileHandle);
audio = Mix_LoadMUS(filePath.c_str());
}
}
else
{
auto midi = MdsToMidi(basePath + ".MDS");
if (midi)
{ {
auto midi = MdsToMidi(filePath);
if (!midi)
return nullptr;
// Dump converted MIDI file // Dump converted MIDI file
/*origFile += ".midi"; /*auto filePath = basePath + ".midi";
FILE* fileHandle = fopen(origFile.c_str(), "wb"); FILE* fileHandle = fopen(filePath.c_str(), "wb");
fwrite(midi->data(), 1, midi->size(), fileHandle); fwrite(midi->data(), 1, midi->size(), fileHandle);
fclose(fileHandle);*/ fclose(fileHandle);*/
@ -115,9 +126,7 @@ Mix_Music* midi::load_track(std::string fileName, bool isMds)
audio = Mix_LoadMUS_RW(rw, 1); // This call seems to leak memory no matter what. audio = Mix_LoadMUS_RW(rw, 1); // This call seems to leak memory no matter what.
delete midi; delete midi;
} }
else }
{
audio = Mix_LoadMUS(filePath.c_str());
} }
if (!audio) if (!audio)

2
SpaceCadetPinball/midi.h
View file

@ -95,7 +95,7 @@ private:
static objlist_class<Mix_Music>* LoadedTracks; static objlist_class<Mix_Music>* LoadedTracks;
static Mix_Music *track1, *track2, *track3, *active_track, *NextTrack; static Mix_Music *track1, *track2, *track3, *active_track, *NextTrack;
static bool SetNextTrackFlag; static bool SetNextTrackFlag;
static Mix_Music* load_track(std::string fileName, bool isMds); static Mix_Music* load_track(std::string fileName);
static bool play_track(Mix_Music* midi); static bool play_track(Mix_Music* midi);
static std::vector<uint8_t>* MdsToMidi(std::string file); static std::vector<uint8_t>* MdsToMidi(std::string file);
}; };