From 2ae9df7248923c286e00dd1bf009275034137a7e Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Wed, 14 Mar 2018 15:55:40 +0100 Subject: Feature: Decoder for DOS version music This is based on reverse-engineering the TTD DOS driver for General MIDI music. --- src/music/win32_m.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/music/win32_m.cpp') diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp index 8e5adeab2..51528133b 100644 --- a/src/music/win32_m.cpp +++ b/src/music/win32_m.cpp @@ -307,12 +307,14 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW void MusicDriver_Win32::PlaySong(const MusicSongInfo &song) { - if (song.filetype != MTT_STANDARDMIDI) return; - DEBUG(driver, 2, "Win32-MIDI: PlaySong: entry"); EnterCriticalSection(&_midi.lock); - _midi.next_file.LoadFile(song.filename); + if (!_midi.next_file.LoadSong(song)) { + LeaveCriticalSection(&_midi.lock); + return; + } + _midi.next_segment.start = 0; _midi.next_segment.end = 0; _midi.next_segment.loop = false; -- cgit v1.2.3-54-g00ecf