diff options
| author | Niels Martin Hansen <nielsm@indvikleren.dk> | 2018-03-17 14:51:30 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2018-06-05 22:58:35 +0200 |
| commit | f946b3da56b22c1fc32a9ffc9008374e4fb4f8c8 (patch) | |
| tree | 3d8b2b0cf0e3931d2e38cce4b822f5b082d0cb92 /src/music/dmusic.cpp | |
| parent | 1c2d29e1a3b5afdf3933f4cc743dda35c3ebb5fb (diff) | |
| download | openttd-f946b3da56b22c1fc32a9ffc9008374e4fb4f8c8.tar.xz | |
Codechange: Pass a MusicSongInfo struct instead of bare filename to music drivers.
Preparation for later extending the info passed to music drivers.
Diffstat (limited to 'src/music/dmusic.cpp')
| -rw-r--r-- | src/music/dmusic.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp index 934bb9fe2..b874924f2 100644 --- a/src/music/dmusic.cpp +++ b/src/music/dmusic.cpp @@ -21,6 +21,7 @@ #include "../core/mem_func.hpp" #include "../thread/thread.h" #include "../fileio_func.h" +#include "../base_media_base.h" #include "dmusic.h" #include "midifile.hpp" #include "midi.h" @@ -1225,11 +1226,13 @@ void MusicDriver_DMusic::Stop() } -void MusicDriver_DMusic::PlaySong(const char *filename) +void MusicDriver_DMusic::PlaySong(const MusicSongInfo &song) { + if (song.filetype != MTT_STANDARDMIDI) return; + ThreadMutexLocker lock(_thread_mutex); - _playback.next_file.LoadFile(filename); + _playback.next_file.LoadFile(song.filename); _playback.next_segment.start = 0; _playback.next_segment.end = 0; _playback.next_segment.loop = false; |