Improved MIDI configuration, device helper update

Author: FrodeSolheim

ChangeLog

@@ -1,5 +1,6 @@
 Version 4.0.x:
 
+* New options midi_in_device, midi_out_device, midi_mt32_device.
 * Read Data/Devs/Controllers/gamecontrollerdb.txt.
 * Updated libslirp to version 4.6.1.
 * Device helper is updated to work with new hotplug functionality in

docs/faq/linux-keyboard-sticky-keys.md

@@ -0,0 +1,2 @@
+FIXME: Check if sticky keys (or what the're called) is still an issue for full
+keyboard emulation and document if so.

docs/midi.md

@@ -34,6 +34,16 @@ On Windows, yet another name is used:
 But double-check that the device name is correct for yor system. See the
 section "Finding the MIDI device name".
 
+For FS-UAE 4.0.XXX FIXME:
+
+Alternatively, you can split the option into two:
+
+    serial_port = mt32:
+    mt32_device = Mt-32 Synth Emulator
+
+You can also in many cases drop specifying `mt32_device`. In this case, FS-UAE
+will try the following devices depending on platform: "Standard" (Linux), "Mt32EmuPort" (macOS), "Mt-32 Synth Emulator" (Windows).
+
 ## Linux
 
 You can run `acconnect -o` to give a listing of ALSA MIDI sequencer names.
@@ -47,29 +57,65 @@ Example output while having both fluidsynth and munt/mt32 running:
         0 'Standard
 
 The names you need to use with the `serial_port` option _with this exact setup_
-is 'Synth input port (11883:0)' and 'Standard'.
+is 'Synth input port (11883:0)' and 'Standard'. You might want to rename the
+port name of FluidSynth. See the "FluidSynth" section for more information.
 
 Note, you can now also use `fs-uae-device-helper list-portmidi-devices` to find
 the device names.
 
-## Fluidsynth
+## FluidSynth
+
+The default FluidSynth sequencer name on Linux includes the process PID, which
+will change each time FluidSynth is started. It is a good idea to run
+FluidSynth with a static name, for example `--portname=FluidSynth`:
 
-The default fluidsynth sequencer name on Linux includes the process PID, which
-will change each time fluidsynth is started. It is a good idea to run
-fluidsynth with a static name, for example `--portname=Fluidsynth`:
+    fluidsynth -a alsa -m alsa_seq -l -i -s --portname=FluidSynth \
+    /usr/share/sounds/sf2/FluidR3_GM.sf2
 
-    fluidsynth -a alsa -m alsa_seq -l -i /usr/share/sounds/sf2/FluidR3_GM.sf2 \
-        -s --portname=Fluidsynth
+In this case, the device will always remain the same, and you can then use the
+option `serial_port = midi:FluidSynth` and it will work across reboots.
 
-You can then use the option `serial_port = midi:Fluidsynth`.
+On macOS, a relatively easy way to get fluidsynth installed is to install it
+via Homebrew:
+
+    brew install fluidsynth
+
+You need a soundfount as well. A good choice is FluidR3_GM.sf2.
+FIXME: Download link for FluidR3_GM.zip on fs-uae.net
+
+    fluidsynth -l -i -s --portname=FluidSynth FluidR3_GM.sf2
 
 ## Suggestions for future improvements
 
 Split midi device name out from the serial port option? `serial_port_type` ?
 
-    serial_port_type = serial|midi|midi-mt32 ?
+    serial_port_type = serial|midi|mt32 ?
     midi_device = xxx ?
-    midi_mt32_device = yyy ?
+    mt32_device = yyy ?
+
+Maybe also allow `midi_device = fluidsynth` and dynamically try to deduce the
+port name ("Synth input port" on Linux, etc). Even more, with midi_device
+missing, perhaps try to default to FluidSynth on Linux (if found), the default
+software midi sequencer on Windows, and (???) on macOS?
+
+### Package FluidSynth as a plugin?
+
+Maybe include as Utilities/FluidSynth? Soundfonts can be included in the
+FluidSynth package.
+
+### Notes
+
+Default device names (process numbers are examples):
+
+Fluidsynth:
+
+    Linux: Synth input port (547769:0)
+    macOS: FluidSynth virtual port (17220)
+
+MT32Emu-qt:
+
+    Linux: Standard
+    macOS: Mt32EmuPort
 
 ## Credits
 

docs/options/fullscreen

@@ -1,4 +1,4 @@
-Description: "Start FS-UAE in fullscreen mode"
+Description: "Start emulator in fullscreen mode"
 Default: 0
 Example: 1
 Type: boolean

docs/options/fullscreen_mode

@@ -1,4 +1,4 @@
-Summary: "Fullscreen Mode"
+Summary: "Fullscreen mode"
 Default: desktop
 Example: fullscreen
 Type: Choice
@@ -8,6 +8,5 @@ the fake fullscreen support (a borderless window the size of the current
 display will be created instead of switching to real fullscreen).
 
 Value: fullscreen ("Fullscreen") - Classic fullscreen mode (SDL_FULLSCREEN)
-Value: desktop ("Fullscreen Desktop") - New fullscreen mode (SDL_FULLSCREEN_DESKTOP)
-Value: window ("Fullscreen Window") - Frameless window with same size as desktop
-
+Value: desktop ("Fullscreen desktop") - New fullscreen mode (SDL_FULLSCREEN_DESKTOP)
+Value: window ("Fullscreen window") - Frameless window with same size as desktop

fsdeps/packages/portmidi

@@ -45,7 +45,7 @@ index 4919b78..c329001 100644
  set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused")
  
 -set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE)
-+set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE)
++# set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE)
  
  PROJECT(portmidi)
  

libfsemu/src/ml/input.c

@@ -73,6 +73,10 @@ int fs_ml_post_event(fs_ml_event* event)
 
 char *fs_ml_input_fix_joystick_name(const char *name, int upper)
 {
+    if (name == NULL) {
+        return g_strdup("NULL");
+    }
+
     char *n, *temp;
     n = g_strdup(name);
     g_strstrip(n);