From 9847614871e861c216425b95a8300dba37b0f6e6 Mon Sep 17 00:00:00 2001 From: grm Date: Sun, 2 Mar 2025 13:53:54 +0200 Subject: Also improve midi and add tt for templating --- src/midi.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'src/midi.c') diff --git a/src/midi.c b/src/midi.c index 429e9df..a015de4 100644 --- a/src/midi.c +++ b/src/midi.c @@ -161,22 +161,14 @@ init_midi(midi_t *m, synth_t *synth) printf("midi devs: %d\n", Pm_CountDevices()); const PmDeviceInfo *info; - int i, c=0; + int i=0; for (i = 0; i < Pm_CountDevices(); i++) { info = Pm_GetDeviceInfo(i); if (!info->input) { continue; } printf("%d: %s [input: %d output: %d opened: %d is_virt:%d] (interf: %s) -- %d\n", i, info->name, info->input, info->output, info->opened, info->is_virtual, info->interf, Pm_GetDefaultInputDeviceID()); - if (synth->midi_device_id == c) { - break; - } - c++; - //if (!strcmp("MPK225 MIDI", info->name) && !info->input) break; - //if (!strcmp("MPK225 Port A", info->name) && info->input == 1) break; - //if (!strcmp("CH345 MIDI 1", info->name) && info->input == 1) break; - //if (!strcmp("Midi Through Port-0", info->name) && info->input == 1) break; - //if (!strcmp("DigitalKBD MIDI 1", info->name) && info->input == 1) break; + if (!strcmp(synth->midi_device.name, info->name) && !info->input) break; } Pt_Start(1, midiCallback, m); @@ -190,6 +182,7 @@ init_midi(midi_t *m, synth_t *synth) enable = 1; } +// unused int get_midi_device_id(const char * name) { @@ -211,23 +204,20 @@ get_midi_device_id(const char * name) char * get_midi_devices() { - //Pm_Initialize(); int i; char *ret = (char *)malloc(sizeof(char) * 4096); - strcpy(ret, ""); + strcpy(ret, "Select Midi Device;"); const PmDeviceInfo *info; for (i = 0; i < Pm_CountDevices(); i++) { info = Pm_GetDeviceInfo(i); if (!info->input) { continue; } - printf("!!!!!!!!!!!!!!!!!!!!!!!!! ==> %s ========\n", info->name); strcat(ret, info->name); strcat(ret, ";"); } ret[strlen(ret) - 1] = '\0'; - //Pm_Terminate(); - + return ret; } -- cgit v1.2.3