diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-21 11:03:14 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-22 11:58:31 -0500 |
| commit | 9e5b7db89f381c70232fab35dc21fd885863f998 (patch) | |
| tree | 2300e2211267c9e09f06e4948965d86b5a7bf3fa /libs/ardour/midi_track.cc | |
| parent | eee07ac351cbdc5ade3d8ceed5de2df7f19a6217 (diff) | |
first compiling, mostly working version of group controls changes
Diffstat (limited to 'libs/ardour/midi_track.cc')
| -rw-r--r-- | libs/ardour/midi_track.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 69d10c44e0..d3653dc929 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -103,23 +103,23 @@ MidiTrack::create_diskstream () void -MidiTrack::set_record_enabled (bool yn, void *src) +MidiTrack::set_record_enabled (bool yn, Controllable::GroupControlDisposition group_override) { if (_step_editing) { return; } - Track::set_record_enabled (yn, src); + Track::set_record_enabled (yn, group_override); } void -MidiTrack::set_record_safe (bool yn, void *src) +MidiTrack::set_record_safe (bool yn, Controllable::GroupControlDisposition group_override) { if (_step_editing) { /* REQUIRES REVIEW */ return; } - Track::set_record_safe (yn, src); + Track::set_record_safe (yn, group_override); } void @@ -725,15 +725,22 @@ MidiTrack::set_parameter_automation_state (Evoral::Parameter param, AutoState st } void -MidiTrack::MidiControl::set_value (double val, PBD::Controllable::GroupControlDisposition /* group_override */) +MidiTrack::MidiControl::set_value (double val, PBD::Controllable::GroupControlDisposition group_override) { if (writable()) { - set_value_unchecked (val); + _set_value (val, group_override); } } void -MidiTrack::MidiControl::set_value_unchecked(double val) +MidiTrack::MidiControl::set_value_unchecked (double val) +{ + /* used only by automation playback */ + _set_value (val, Controllable::NoGroup); +} + +void +MidiTrack::MidiControl::_set_value (double val, PBD::Controllable::GroupControlDisposition group_override) { const Evoral::Parameter ¶meter = _list ? _list->parameter() : Control::parameter(); const Evoral::ParameterDescriptor &desc = EventTypeMap::instance().descriptor(parameter); @@ -790,7 +797,7 @@ MidiTrack::MidiControl::set_value_unchecked(double val) _route->write_immediate_event(size, ev); } - AutomationControl::set_value(val, Controllable::NoGroup); + AutomationControl::set_value(val, group_override); } void |