Changeset - r1584:b5fd953db0ea
[Not reviewed]
master
0 4 0
pasky - 20 years ago 2005-03-27 15:42:25
pasky@openttd.org
(svn r2088) - Fix: [ 1155158 ] Make extmidi command a config option in addition to the compile-time MIDI switch. Patch by macbaine.
4 files changed with 11 insertions and 7 deletions:
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -62,7 +62,8 @@
 
# RELEASE: this will be the released version number. It replaces all places
 
#          where it normally would print the revision number
 
# MIDI: if set, it will use it as custom path to midi player.
 
#  If unset, it will use the hardcoded path in the c code
 
#       If unset, it will use the hardcoded path in the c code
 
#       This can still be overriden by the music.extmidi openttd.cfg option.
 
# WITH_NETWORK: enable networking
 
# DEDICATED: allows compilation on UNIX without SDL. Useful for dedicated servers
 
#
extmidi.c
Show inline comments
 
@@ -4,6 +4,7 @@
 

	
 
#include "ttd.h"
 
#include "hal.h"
 
#include "sound.h"
 
#include <sys/types.h>
 
#include <sys/wait.h>
 
#include <unistd.h>
 
@@ -11,10 +12,6 @@
 
#include <sys/stat.h>
 
#include <errno.h>
 

	
 
#ifndef EXTERNAL_PLAYER
 
#define EXTERNAL_PLAYER "timidity"
 
#endif
 

	
 
static pid_t _pid;
 

	
 
static void extmidi_kill(void)
 
@@ -50,9 +47,9 @@ static void extmidi_play_song(const char
 

	
 
	if (_pid == 0) {
 
		#if defined(MIDI_ARG)
 
			execlp(EXTERNAL_PLAYER, "extmidi", MIDI_ARG, filename, NULL);
 
			execlp(msf.extmidi, "extmidi", MIDI_ARG, filename, NULL);
 
		#else
 
			execlp(EXTERNAL_PLAYER, "extmidi", filename, NULL);
 
			execlp(msf.extmidi, "extmidi", filename, NULL);
 
		#endif
 
		fprintf(stderr, "extmidi: couldn't execl: %s\n", strerror(errno));
 
		exit(0);
settings.c
Show inline comments
 
@@ -716,6 +716,10 @@ static void save_setting_desc(IniFile *i
 
// TTD specific INI stuff
 
//***************************
 

	
 
#ifndef EXTERNAL_PLAYER
 
#define EXTERNAL_PLAYER "timidity"
 
#endif
 

	
 
static const SettingDesc music_settings[] = {
 
	{"playlist",	SDT_UINT8,	(void*)0,			&msf.playlist, NULL},
 
	{"music_vol", SDT_UINT8,	(void*)128,		&msf.music_vol, NULL},
 
@@ -724,6 +728,7 @@ static const SettingDesc music_settings[
 
	{"custom_2",	SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_2) << 16, NULL, &msf.custom_2, NULL},
 
	{"playing",		SDT_BOOL,		(void*)true,	&msf.btn_down, NULL},
 
	{"shuffle",		SDT_BOOL,		(void*)false, &msf.shuffle, NULL},
 
	{"extmidi",   SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL},
 
	{NULL,				0,					NULL,					NULL,																NULL}
 
};
 

	
sound.h
Show inline comments
 
@@ -9,6 +9,7 @@ typedef struct MusicFileSettings {
 
	byte custom_2[33];
 
	bool btn_down;
 
	bool shuffle;
 
	char extmidi[80];
 
} MusicFileSettings;
 

	
 
VARDEF byte _music_wnd_cursong;
0 comments (0 inline, 0 general)