ardour/livetrax
13
0
Fork 0
Code

a-fluidsynth process events even when no sf2 is loaded.

Browse Source 
Keep track of program-changes, re-apply Bank/PGM once the
soundfont is loaded. fluidsynth itself keeps track of CCs.
This commit is contained in:
Robin Gareus 2016-12-07 19:48:52 +01:00
parent bb30d92814
commit 9a46d593cb
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
View File

@ -100,6 +100,7 @@ struct BankProgram {
typedef std::vector<BankProgram> BPList; typedef std::vector<BankProgram> BPList;
typedef std::map<int, BPList> BPMap; typedef std::map<int, BPList> BPMap;
typedef std::map<int, BankProgram> BPState;
typedef struct { typedef struct {
/* ports */ /* ports */
@ -149,6 +150,10 @@ typedef struct {
bool reinit_in_progress; // set in run, cleared in work_response bool reinit_in_progress; // set in run, cleared in work_response
bool queue_reinit; // set in restore, cleared in work_response bool queue_reinit; // set in restore, cleared in work_response
uint8_t last_bank_lsb;
uint8_t last_bank_msb;
BankProgram program_state[16];
fluid_midi_event_t* fmidi_event; fluid_midi_event_t* fmidi_event;
} AFluidSynth; } AFluidSynth;
@ -202,6 +207,14 @@ load_sf2 (AFluidSynth* self, const char* fn)
return false; return false;
} }
for (chn = 0; chn < 16; ++chn) {
if (self->program_state[chn].program < 0) {
continue;
}
fluid_synth_program_select (self->synth, chn, synth_id,
self->program_state[chn].bank, self->program_state[chn].program);
}
return true; return true;
} }
@ -341,12 +354,17 @@ instantiate (const LV2_Descriptor* descriptor,
/* initialize plugin state */ /* initialize plugin state */
pthread_mutex_init (&self->bp_lock, NULL); pthread_mutex_init (&self->bp_lock, NULL);
#ifdef LV2_EXTENDED
self->presets = BPMap(); self->presets = BPMap();
#endif
self->panic = false; self->panic = false;
self->inform_ui = false; self->inform_ui = false;
self->initialized = false; self->initialized = false;
self->reinit_in_progress = false; self->reinit_in_progress = false;
self->queue_reinit = false; self->queue_reinit = false;
for (int chn = 0; chn < 16; ++chn) {
self->program_state[chn].program = -1;
}
lv2_atom_forge_init (&self->forge, map); lv2_atom_forge_init (&self->forge, map);
@ -485,7 +503,7 @@ run (LV2_Handle instance, uint32_t n_samples)
} }
} }
} }
else if (ev->body.type == self->midi_MidiEvent && self->initialized && !self->reinit_in_progress) { else if (ev->body.type == self->midi_MidiEvent) {
if (ev->body.size > 3 || ev->time.frames >= n_samples) { if (ev->body.size > 3 || ev->time.frames >= n_samples) {
continue; continue;
} }
@ -513,6 +531,16 @@ run (LV2_Handle instance, uint32_t n_samples)
} else { } else {
fluid_midi_event_set_value (self->fmidi_event, data[2]); fluid_midi_event_set_value (self->fmidi_event, data[2]);
} }
if (0xb0 /* CC */ == fluid_midi_event_get_type (self->fmidi_event)) {
if (data[1] == 0x00) { self->last_bank_msb = data[2]; }
if (data[1] == 0x20) { self->last_bank_lsb = data[2]; }
}
}
if (ev->body.size == 2 && 0xc0 /* Pgm */ == fluid_midi_event_get_type (self->fmidi_event)) {
int chn = fluid_midi_event_get_channel (self->fmidi_event);
assert (chn >= 0 && chn < 16);
self->program_state[chn].bank = (self->last_bank_msb << 7) | self->last_bank_lsb;
self->program_state[chn].program = data[1];
} }
fluid_synth_handle_midi_event (self->synth, self->fmidi_event); fluid_synth_handle_midi_event (self->synth, self->fmidi_event);