smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

Undo more incorrect sample/frame replacements

Browse source
This commit is contained in:
Robin Gareus 2019-04-08 03:46:02 +02:00
parent 889bd35f4f
commit 46f0b75e12
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
9 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
View file

@ -133,7 +133,7 @@ typedef struct {
LV2_Log_Logger logger;
LV2_Worker_Schedule* schedule;
LV2_Atom_Forge forge;
LV2_Atom_Forge_Frame sample;
LV2_Atom_Forge_Frame frame;
#ifdef LV2_EXTENDED
LV2_Midnam* midnam;
@ -243,15 +243,15 @@ inform_ui (AFluidSynth* self)
return;
}
LV2_Atom_Forge_Frame sample;
LV2_Atom_Forge_Frame frame;
lv2_atom_forge_frame_time (&self->forge, 0);
x_forge_object (&self->forge, &sample, 1, self->patch_Set);
x_forge_object (&self->forge, &frame, 1, self->patch_Set);
lv2_atom_forge_property_head (&self->forge, self->patch_property, 0);
lv2_atom_forge_urid (&self->forge, self->afs_sf2file);
lv2_atom_forge_property_head (&self->forge, self->patch_value, 0);
lv2_atom_forge_path (&self->forge, self->current_sf2_file_path, strlen (self->current_sf2_file_path));
lv2_atom_forge_pop (&self->forge, &sample);
lv2_atom_forge_pop (&self->forge, &frame);
}
static float
@ -420,7 +420,7 @@ run (LV2_Handle instance, uint32_t n_samples)
const uint32_t capacity = self->notify->atom.size;
lv2_atom_forge_set_buffer (&self->forge, (uint8_t*)self->notify, capacity);
lv2_atom_forge_sequence_head (&self->forge, &self->sample, 0);
lv2_atom_forge_sequence_head (&self->forge, &self->frame, 0);
if (!self->initialized || self->reinit_in_progress) {
memset (self->p_ports[FS_PORT_OUT_L], 0, n_samples * sizeof (float));
@ -569,10 +569,10 @@ run (LV2_Handle instance, uint32_t n_samples)
self->inform_ui = false;
/* emit stateChanged */
LV2_Atom_Forge_Frame sample;
LV2_Atom_Forge_Frame frame;
lv2_atom_forge_frame_time(&self->forge, 0);
x_forge_object(&self->forge, &sample, 1, self->state_Changed);
lv2_atom_forge_pop(&self->forge, &sample);
x_forge_object(&self->forge, &frame, 1, self->state_Changed);
lv2_atom_forge_pop(&self->forge, &frame);
/* send .sf2 filename */
inform_ui (self);