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/libtimidity.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/libtimidity.cpp')
| -rw-r--r-- | src/music/libtimidity.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/music/libtimidity.cpp b/src/music/libtimidity.cpp index 93284bd83..f198280dc 100644 --- a/src/music/libtimidity.cpp +++ b/src/music/libtimidity.cpp @@ -14,6 +14,7 @@ #include "../sound_type.h" #include "../debug.h" #include "libtimidity.h" +#include "../base_media_base.h" #include <fcntl.h> #include <sys/types.h> #include <sys/wait.h> @@ -73,11 +74,13 @@ void MusicDriver_LibTimidity::Stop() mid_exit(); } -void MusicDriver_LibTimidity::PlaySong(const char *filename) +void MusicDriver_LibTimidity::PlaySong(const MusicSongInfo &song) { + if (song.filetype != MTT_STANDARDMIDI) return; + this->StopSong(); - _midi.stream = mid_istream_open_file(filename); + _midi.stream = mid_istream_open_file(song.filename); if (_midi.stream == NULL) { DEBUG(driver, 0, "Could not open music file"); return; |