smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 06:05:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mixer-snapshots

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-04-02 15:11:14 -05:00
commit 230d211082
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/ardour/ladspa_plugin.cc
View file

@ -91,27 +91,27 @@ LadspaPlugin::init (string module_path, uint32_t index, samplecnt_t rate)
_was_activated = false;
if (!(*_module)) {
error << _("LADSPA: Unable to open module: ") << Glib::Module::get_last_error() << endmsg;
warning << _("LADSPA: Unable to open module: ") << Glib::Module::get_last_error() << endmsg;
delete _module;
throw failed_constructor();
}
if (!_module->get_symbol("ladspa_descriptor", func)) {
error << _("LADSPA: module has no descriptor function.") << endmsg;
warning << _("LADSPA: module has no descriptor function.") << endmsg;
throw failed_constructor();
}
dfunc = (LADSPA_Descriptor_Function)func;
if ((_descriptor = dfunc (index)) == 0) {
error << _("LADSPA: plugin has gone away since discovery!") << endmsg;
warning << _("LADSPA: plugin has gone away since discovery!") << endmsg;
throw failed_constructor();
}
_index = index;
if (LADSPA_IS_INPLACE_BROKEN(_descriptor->Properties)) {
error << string_compose(_("LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"), _descriptor->Name) << endmsg;
info << string_compose(_("LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"), _descriptor->Name) << endmsg;
throw failed_constructor();
}

3
libs/evoral/src/Sequence.cpp
View file

@ -949,7 +949,8 @@ Sequence<Time>::append(const Event<Time>& ev, event_id_t evid)
| (0x7F & ev.pitch_bender_lsb())),
evid);
} else if (ev.is_poly_pressure()) {
append_control_unlocked (Parameter (ev.event_type(), ev.channel(), ev.poly_note()), ev.time(), ev.poly_pressure(), evid);
const ParameterType ptype = _type_map.midi_parameter_type(ev.buffer(), ev.size());
append_control_unlocked (Parameter (ptype, ev.channel(), ev.poly_note()), ev.time(), ev.poly_pressure(), evid);
} else if (ev.is_channel_pressure()) {
const ParameterType ptype = _type_map.midi_parameter_type(ev.buffer(), ev.size());
append_control_unlocked(

1
libs/surfaces/faderport/faderport.cc
View file

@ -1199,6 +1199,7 @@ FaderPort::map_auto ()
get_button (FP_Touch).set_led_state (_output_port, false);
break;
case ARDOUR::Touch:
case ARDOUR::Latch: // XXX
get_button (FP_Read).set_led_state (_output_port, false);
get_button (FP_Write).set_led_state (_output_port, false);
get_button (FP_Touch).set_led_state (_output_port, true);

8
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -2016,6 +2016,14 @@ MackieControlProtocol::update_fader_automation_state ()
update_global_button (Button::Latch, off);
update_global_button (Button::Grp, off);
break;
case Latch:
update_global_button (Button::Read, off);
update_global_button (Button::Write, off);
update_global_button (Button::Touch, off);
update_global_button (Button::Trim, off);
update_global_button (Button::Latch, on);
update_global_button (Button::Grp, off);
break;
}
}