revert device selection logic

src/main.c

@@ -537,11 +537,6 @@ usage()
 	printf("-sf2 <SoundFont filename>\n");
 	printf("\tInitialize MIDI synth with the specified SoundFont.\n");
 	printf("\tThe -midicard option must be specified along with this option.\n");
-	printf("-midi-in <device name/id>\n");
-	printf("\tConnect a specific system MIDI device to the virtualized MIDI card.\n");
-	printf("\tIf -midicard is set but this option is not, all MIDI input devices\n");
-	printf("\tare connected.\n");
-	printf("\tThe -midicard option must be specified along with this option.\n");
 #ifdef TRACE
 	printf("-trace [<address>]\n");
 	printf("\tPrint instruction trace. Optionally, a trigger address\n");
@@ -668,15 +663,6 @@ main(int argc, char **argv)
 			sf2_path = argv[0];
 			argc--;
 			argv++;
-		} else if (!strcmp(argv[0], "-midi-in")) {
-			argc--;
-			argv++;
-			if (!argc || argv[0][0] == '-') {
-				usage();
-			}
-			fs_midi_input_device = argv[0];
-			argc--;
-			argv++;
 		} else if (!strcmp(argv[0], "-run")) {
 			argc--;
 			argv++;

src/midi.c

@@ -127,7 +127,6 @@ struct midi_serial_regs
 
 struct midi_serial_regs mregs[2];
 static bool serial_midi_mutexes_initialized = false;
-const char *fs_midi_input_device;
 
 void midi_serial_iir_check(uint8_t sel);
 
@@ -269,15 +268,7 @@ void midi_init()
     dl_fluid_settings_setnum(fl_settings, "synth.sample-rate", 
     AUDIO_SAMPLERATE);
     dl_fluid_settings_setstr(fl_settings, "midi.portname", "Commander X16 Emulator");
-    if (fs_midi_input_device) {
-        dl_fluid_settings_setstr(fl_settings, "midi.winmidi.device", fs_midi_input_device);
-        dl_fluid_settings_setstr(fl_settings, "midi.alsa_seq.device", fs_midi_input_device);
-        dl_fluid_settings_setint(fl_settings, "midi.autoconnect", 0);
-    } else {
-        dl_fluid_settings_setstr(fl_settings, "midi.winmidi.device", "default");
-        dl_fluid_settings_setstr(fl_settings, "midi.alsa_seq.device", "default");
-        dl_fluid_settings_setint(fl_settings, "midi.autoconnect", 1);
-    }
+    dl_fluid_settings_setint(fl_settings, "midi.autoconnect", 1);
     fl_synth = dl_new_fluid_synth(fl_settings);
     fl_mdriver = dl_new_fluid_midi_driver(fl_settings, handle_midi_event, &mregs[0]);
 

src/midi.h

@@ -42,4 +42,3 @@ void midi_load_sf2(uint8_t* filename);
 void midi_synth_render(int16_t* buf, int len);
 bool midi_serial_irq(void);
 
-extern const char *fs_midi_input_device;