gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(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.

Browse Source
This commit is contained in:
peter1138 2009-01-08 12:05:14 +00:00
parent 45f1d83bc7
commit 020dbb180a
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/music/extmidi.cpp
View File

@ -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);

1
src/music/extmidi.h
View File

@ -9,6 +9,7 @@
class MusicDriver_ExtMidi: public MusicDriver {
private:
char *command;
char song[MAX_PATH];
pid_t pid;

5
src/settings.cpp
View File

@ -1127,10 +1127,6 @@ static int32 UpdateRconPassword(int32 p1)
/* End - Callback Functions */
#ifndef EXTERNAL_PLAYER
#define EXTERNAL_PLAYER "timidity"
#endif
static const SettingDesc _music_settings[] = {
SDT_VAR(MusicFileSettings, playlist, SLE_UINT8, S, 0, 0, 0, 5, 1, STR_NULL, NULL),
SDT_VAR(MusicFileSettings, music_vol, SLE_UINT8, S, 0, 127, 0, 127, 1, STR_NULL, NULL),
@ -1139,7 +1135,6 @@ static const SettingDesc _music_settings[] = {
SDT_LIST(MusicFileSettings, custom_2, SLE_UINT8, S, 0, NULL, STR_NULL, NULL),
SDT_BOOL(MusicFileSettings, playing, S, 0, true, STR_NULL, NULL),
SDT_BOOL(MusicFileSettings, shuffle, S, 0, false, STR_NULL, NULL),
SDT_STR(MusicFileSettings, extmidi, SLE_STRB, S, 0, EXTERNAL_PLAYER, STR_NULL, NULL),
SDT_END()
};

1
src/sound_type.h
View File

@ -15,7 +15,6 @@ struct MusicFileSettings {
byte custom_2[33];
bool playing;
bool shuffle;
char extmidi[80];
};
struct FileEntry {