Index: music/fluidsynth_midi.cc
===================================================================
--- music/fluidsynth_midi.cc	(revision 0)
+++ music/fluidsynth_midi.cc	(working copy)
@@ -0,0 +1,169 @@
+/*
+ * fluidsynth_midi.cc
+ *
+ * Copyright (c) 1997 - 2011 Hansjörg Malthaner and
+ *        the simutrans development team
+ *
+ * This file is part of the Simutrans project under the artistic license.
+ * (see license.txt)
+ */
+
+#include <fluidsynth.h>
+
+#include "../dataobj/umgebung.h"
+#include "../utils/plainstring.h"
+#include "music.h"
+
+static int         midi_number = -1;
+static plainstring midi_filenames[MAX_MIDI];
+
+static fluid_settings_t* settings;
+static fluid_synth_t* synth;
+static fluid_player_t* player;
+static fluid_audio_driver_t* adriver;
+
+
+/**
+ * MIDI initialisation routines
+ */
+bool dr_init_midi(void)
+{
+	int sfont_id;
+
+	if(  !(settings = new_fluid_settings())  ) {
+		printf("FluidSynth: MIDI settings failed.\n");
+		return false;
+	}
+
+	if(  !umgebung_t::fluidsynth_driver.empty()  ) {
+		printf("FluidSynth: set driver: %s",umgebung_t::fluidsynth_driver.c_str());
+		if(  fluid_settings_setstr(settings, "audio.driver", umgebung_t::fluidsynth_driver.c_str()) != 1) {
+			printf(" - Failed.\n");
+			return false;
+		}
+		printf(".\n");
+	}
+
+	if(  !(synth = new_fluid_synth(settings))  ) {
+		printf("FluidSynth: synth setup failed.\n");
+		return false;
+	}
+
+	if(  !(adriver = new_fluid_audio_driver(settings,synth))  ) {
+		printf("FluidSynth: audio driver setup failed.\n");
+		return false;
+	}
+
+	if(  !fluid_is_soundfont(umgebung_t::soundfont_filename.c_str())  ) {
+		printf("FluidSynth: %s is not a soundfont.\n", umgebung_t::soundfont_filename.c_str());
+		return false;
+	}
+	sfont_id = fluid_synth_sfload(synth, umgebung_t::soundfont_filename.c_str(), 1);
+	if(  sfont_id == FLUID_FAILED  ) {
+		printf("FluidSynth: %s soundfont load failed.\n", umgebung_t::soundfont_filename.c_str());
+		return false;
+	}
+	printf("FluidSynth: loaded soundfont: %s.\n", umgebung_t::soundfont_filename.c_str());
+
+	//if all is fine, return true
+	return true;
+}
+
+
+/**
+ * Sets MIDI playback volume
+ */
+void dr_set_midi_volume(int vol)
+{
+	if(  fluid_settings_setnum(settings, "synth.gain", 0.8 * vol / 256.0) != 1  ) {
+		printf("FluidSynth: set volume failed.\n");
+	}
+}
+
+
+/**
+ * Checks MIDI file, adds to playlist
+ */
+int dr_load_midi(const char * filename)
+{
+	if(  midi_number<MAX_MIDI-1  ) {
+		const int i = midi_number+1;
+
+		if(  i>=0  &&  i<MAX_MIDI  &&  fluid_is_midifile(filename)  ) {
+			midi_number = i;
+			midi_filenames[i] = filename;
+		}
+	}
+	return midi_number;
+}
+
+/**
+ * Plays a MIDI file
+ */
+void dr_play_midi(int key)
+{
+	if(  dr_midi_pos() !=  -1  ) {
+		dr_stop_midi();
+	}
+
+	if(  !(player = new_fluid_player(synth))  ) {
+		printf("FluidSynth: MIDI player setup failed.\n");
+		return;
+	}
+
+	if(  fluid_player_add(player, midi_filenames[key]) != FLUID_OK  ) {
+		printf("FluidSynth: %s MIDI file load failed.\n", midi_filenames[key].c_str());
+		return;
+	}
+	if(  fluid_player_play(player) != FLUID_OK  ) {
+		printf("FluidSynth: MIDI player start failed.\n");
+		return;
+	}
+}
+
+
+/**
+ * Stops playing MIDI file
+ */
+void dr_stop_midi(void)
+{
+	if(  !player  ) {
+		return;
+	}
+
+	fluid_player_stop(player);
+	if(  fluid_player_join(player) != FLUID_OK  ) {
+		printf("FluidSynth: player join failed.\n");
+	}
+	delete_fluid_player(player);
+	player = NULL;
+	fluid_synth_all_notes_off(synth,-1);
+}
+
+
+/**
+ * Returns the midi_pos variable <- doesn't actually do this
+ * Simutrans only needs to know whether file has finished (so that it can start the next music)
+ * Returns -1 if current music has finished, else 0
+ */
+long dr_midi_pos(void)
+{
+	if(  !player  ||  fluid_player_get_status(player) != FLUID_PLAYER_PLAYING  ) {
+		return -1;
+	}
+	return 0;
+}
+
+
+/**
+ * Midi shutdown/cleanup
+ */
+void dr_destroy_midi(void)
+{
+	dr_stop_midi();
+	delete_fluid_audio_driver(adriver);
+	delete_fluid_synth(synth);
+	delete_fluid_settings(settings);
+	midi_number = -1;
+}
+
Index: simutrans/config/simuconf.tab
===================================================================
--- simutrans/config/simuconf.tab	(revision 5067)
+++ simutrans/config/simuconf.tab	(working copy)
@@ -505,6 +505,14 @@
 
 #################################system stuff#################################
 
+# FluidSynth MIDI settings
+#   audio drivers - jack, alsa, oss, pulseaudio, coreaudio, dsound, portaudio, sndman, dart, file 
+#   leave blank to use system default     
+#fluidsynth_driver = dsound
+
+#   SoundFont2 to use
+#soundfont_filename = /usr/share/sounds/sf2/RealFont_2_3.SF2
+
 # compress savegames?
 # "binary" means uncompressed, "zipped" means compressed
 # other options are "xml" and "xml_zipped"
Index: Makefile
===================================================================
--- Makefile	(revision 5067)
+++ Makefile	(working copy)
@@ -34,33 +34,26 @@
   LIBS += -lz -lnet -lbz2
 endif
 
-ifeq ($(OSTYPE),haiku)
-  LIBS += -lz -lnetwork -lbz2
+ifeq ($(OSTYPE),cygwin)
+  SOURCES += simsys_w32_png.cc
+  CFLAGS += -I/usr/include/mingw -mwin32
+  CCFLAGS += -I/usr/include/mingw -mwin32
+  LDFLAGS += -mno-cygwin
+  LIBS   += -lgdi32 -lwinmm -lwsock32 -lz -lbz2
 endif
 
 ifeq ($(OSTYPE),freebsd)
   LIBS += -lz -lbz2
 endif
 
-ifeq ($(OSTYPE),mac)
-  CFLAGS  += -DUSE_HW
-  CCFLAGS += -Os -fast
-  LIBS    += -lz -lbz2
+ifeq ($(OSTYPE),haiku)
+  LIBS += -lz -lnetwork -lbz2
 endif
 
 ifeq ($(OSTYPE),linux)
   LIBS += -lz -lbz2
 endif
 
-
-ifeq ($(OSTYPE),cygwin)
-  SOURCES += simsys_w32_png.cc
-  CFLAGS += -I/usr/include/mingw -mwin32
-  CCFLAGS += -I/usr/include/mingw -mwin32
-  LDFLAGS += -mno-cygwin
-  LIBS   += -lgdi32 -lwinmm -lwsock32 -lz -lbz2
-endif
-
 ifeq ($(OSTYPE),mingw)
   CC ?= gcc
   SOURCES += simsys_w32_png.cc
@@ -74,6 +67,13 @@
   LIBS += -lmingw32 -lgdi32 -lwinmm -lwsock32 -lz -lbz2
 endif
 
+ifeq ($(OSTYPE),mac)
+  CFLAGS  += -DUSE_HW
+  CCFLAGS += -Os -fast
+  LIBS    += -lz -lbz2
+endif
+
+
 ifeq ($(OSTYPE),mingw)
   SOURCES += clipboard_w32.cc
 else
@@ -85,7 +85,7 @@
 
 
 ifneq ($(OPTIMISE),)
-    CFLAGS += -O3 -fno-schedule-insns
+  CFLAGS += -O3 -fno-schedule-insns
   ifneq ($(OSTYPE),mac)
     ifneq ($(OSTYPE),haiku)
       ifneq ($(OSTYPE),amiga)
@@ -390,7 +390,13 @@
 
 ifeq ($(BACKEND),gdi)
   SOURCES += simsys_w.cc
-  SOURCES += music/w32_midi.cc
+  ifneq ($(USE_FLUIDSYNTH_MIDI),)
+    SOURCES += music/fluidsynth_midi.cc
+    LIBS    += -lfluidsynth
+    CFLAGS  += -DUSE_FLUIDSYNTH_MIDI
+  else
+    SOURCES += music/w32_midi.cc
+  endif
   SOURCES += sound/win32_sound.cc
 endif
 
@@ -405,10 +411,20 @@
     LIBS    += -framework Foundation -framework QTKit
   else
     SOURCES  += sound/sdl_sound.cc
-    ifeq ($(findstring $(OSTYPE), cygwin mingw),)
+    ifeq ($(findstring $(OSTYPE), cygwin mingw linux),)
       SOURCES += music/no_midi.cc
     else
-      SOURCES += music/w32_midi.cc
+       ifneq ($(USE_FLUIDSYNTH_MIDI),)
+         SOURCES += music/fluidsynth_midi.cc
+         LIBS    += -lfluidsynth
+         CFLAGS  += -DUSE_FLUIDSYNTH_MIDI
+       else
+         ifeq ($(OSTYPE),linux)
+           SOURCES += music/no_midi.cc
+         else
+           SOURCES += music/w32_midi.cc
+         endif
+       endif
     endif
   endif
   ifeq ($(SDL_CONFIG),)
Index: config.template
===================================================================
--- config.template	(revision 5067)
+++ config.template	(working copy)
@@ -23,6 +23,8 @@
 #OSTYPE = mingw
 #OSTYPE = mac
 
+#USE_FLUIDSYNTH_MIDI = 1 # Uses FluidSynth for MIDI playback if available
+
 #DEBUG = 3    # Level 1-3, higher number means more debug-friendly, see Makefile
 #OPTIMISE = 1 # Add umpteen optimisation flags
 #PROFILE = 1  # Enable profiling
Index: dataobj/umgebung.cc
===================================================================
--- dataobj/umgebung.cc	(revision 5067)
+++ dataobj/umgebung.cc	(working copy)
@@ -46,6 +46,11 @@
 bool umgebung_t::shuffle_midi = true;
 sint16 umgebung_t::window_snap_distance = 8;
 
+#ifdef USE_FLUIDSYNTH_MIDI
+std::string umgebung_t::fluidsynth_driver;
+std::string umgebung_t::soundfont_filename;
+#endif
+
 // only used internally => do not touch further
 bool umgebung_t::quit_simutrans = false;
 
Index: dataobj/umgebung.h
===================================================================
--- dataobj/umgebung.h	(revision 5067)
+++ dataobj/umgebung.h	(working copy)
@@ -287,6 +287,12 @@
 	static sint16 global_volume, midi_volume;
 	static bool mute_sound, mute_midi, shuffle_midi;
 
+	// FluidSynth MIDI parameters
+#ifdef USE_FLUIDSYNTH_MIDI
+	static std::string fluidsynth_driver;
+	static std::string soundfont_filename;
+#endif
+
 	static bool left_to_right_graphs;
 
 	// how to highlight topped (untopped windows)
Index: dataobj/einstellungen.cc
===================================================================
--- dataobj/einstellungen.cc	(revision 5067)
+++ dataobj/einstellungen.cc	(working copy)
@@ -1187,6 +1187,16 @@
 	// Default pak file path
 	objfilename = ltrim(contents.get_string("pak_file_path", "" ) );
 
+	// FluidSynth MIDI parameters
+#ifdef USE_FLUIDSYNTH_MIDI
+	if(  *contents.get("fluidsynth_driver")  ) {
+		umgebung_t::fluidsynth_driver = ltrim(contents.get("fluidsynth_driver"));
+	}
+	if(  *contents.get("soundfont_filename")  ) {
+		umgebung_t::soundfont_filename = ltrim(contents.get("soundfont_filename"));
+	}
+#endif
+
 	printf("Reading simuconf.tab successful!\n" );
 
 	simuconf.close( );