(svn r2088) - Fix: [ 1155158 ] Make extmidi command a config option in addition to the compile-time MIDI switch. Patch by macbaine.

1 files changed, 3 insertions, 6 deletions

diff --git a/extmidi.c b/extmidi.c
index a03d4cf48..7f48969c1 100644
--- a/extmidi.c
+++ b/extmidi.c
@@ -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 *filename)
 
 	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);