summaryrefslogtreecommitdiff
path: root/src/music
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2009-01-08 12:05:14 +0000
committerpeter1138 <peter1138@openttd.org>2009-01-08 12:05:14 +0000
commit8591ff41cc4597785cf4841c67a93f8ab8e006bb (patch)
treefce554a01119cd5d6c7bf58f770a96d121a41f35 /src/music
parent91866a381d3fbcb25702406a096829a8dab6861a (diff)
downloadopenttd-8591ff41cc4597785cf4841c67a93f8ab8e006bb.tar.xz
(svn r14909) -Codechange: Remove global option for the extmidi driver and make it a driver parameter with the name cmd instead. This means if you have an "extmidi = ..." line in your config you must change it to "musicdriver = extmidi:cmd=...", in the [misc] section.
Diffstat (limited to 'src/music')
-rw-r--r--src/music/extmidi.cpp13
-rw-r--r--src/music/extmidi.h1
2 files changed, 12 insertions, 2 deletions
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index cba772506..6179501a6 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -17,10 +17,18 @@
#include <sys/stat.h>
#include <errno.h>
+#ifndef EXTERNAL_PLAYER
+#define EXTERNAL_PLAYER "timidity"
+#endif
+
static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
const char* MusicDriver_ExtMidi::Start(const char* const * parm)
{
+ const char *command = GetDriverParam(parm, "cmd");
+ if (StrEmpty(command)) command = EXTERNAL_PLAYER;
+
+ this->command = strdup(command);
this->song[0] = '\0';
this->pid = -1;
return NULL;
@@ -28,6 +36,7 @@ const char* MusicDriver_ExtMidi::Start(const char* const * parm)
void MusicDriver_ExtMidi::Stop()
{
+ free(command);
this->song[0] = '\0';
this->DoStop();
}
@@ -68,9 +77,9 @@ void MusicDriver_ExtMidi::DoPlay()
d = open("/dev/null", O_RDONLY);
if (d != -1 && dup2(d, 1) != -1 && dup2(d, 2) != -1) {
#if defined(MIDI_ARG)
- execlp(msf.extmidi, "extmidi", MIDI_ARG, this->song, (char*)0);
+ execlp(this->command, "extmidi", MIDI_ARG, this->song, (char*)0);
#else
- execlp(msf.extmidi, "extmidi", this->song, (char*)0);
+ execlp(this->command, "extmidi", this->song, (char*)0);
#endif
}
_exit(1);
diff --git a/src/music/extmidi.h b/src/music/extmidi.h
index b5af27722..bae1e1b4f 100644
--- a/src/music/extmidi.h
+++ b/src/music/extmidi.h
@@ -9,6 +9,7 @@
class MusicDriver_ExtMidi: public MusicDriver {
private:
+ char *command;
char song[MAX_PATH];
pid_t pid;