dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Pass a MusicSongInfo struct instead of bare filename to music drivers.

Browse Source 
Preparation for later extending the info passed to music drivers.
This commit is contained in:
Niels Martin Hansen
2018-03-17 14:51:30 +01:00
committed by Michael Lutz
parent 1c2d29e1a3
commit f946b3da56
23 changed files with 85 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/music/os2_m.cpp
View File

@@ -12,6 +12,7 @@
#include "../stdafx.h"
#include "../openttd.h"
#include "os2_m.h"
#include "../base_media_base.h"
#define INCL_DOS
#define INCL_OS2MM
@@ -49,11 +50,13 @@ static long CDECL MidiSendCommand(const char *cmd, ...)
/** OS/2's music player's factory. */
static FMusicDriver_OS2 iFMusicDriver_OS2;
void MusicDriver_OS2::PlaySong(const char *filename)
void MusicDriver_OS2::PlaySong(const MusicSongInfo &song)
{
if (song.filetype != MTT_STANDARDMIDI) return;
MidiSendCommand("close all");
if (MidiSendCommand("open %s type sequencer alias song", filename) != 0) {
if (MidiSendCommand("open %s type sequencer alias song", song.filename) != 0) {
return;
}