From f946b3da56b22c1fc32a9ffc9008374e4fb4f8c8 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 17 Mar 2018 14:51:30 +0100 Subject: Codechange: Pass a MusicSongInfo struct instead of bare filename to music drivers. Preparation for later extending the info passed to music drivers. --- src/music/libtimidity.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/music/libtimidity.cpp') 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 #include #include @@ -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; -- cgit v1.2.3-54-g00ecf