diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 14:36:58 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 14:37:05 -0400 |
| commit | 0a87bbc37b5cba75853cf923acb66c7520c1b89b (patch) | |
| tree | 1524d144e3ac358a8f5f1cbbb5fbb1a705cb1eac /libs | |
| parent | e3a6ea02731f35f6011428df0374e44ff16ce616 (diff) | |
add partial support for mute automation (playback does not work, data is not recorded in the session)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/types.h | 2 | ||||
| -rw-r--r-- | libs/ardour/automatable.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/event_type_map.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 216de8bb0c..af56e12a5b 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -137,7 +137,7 @@ namespace ARDOUR { FadeInAutomation, FadeOutAutomation, EnvelopeAutomation, - RecEnableAutomation + RecEnableAutomation, }; enum AutoState { diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 84f8cd56cc..7669f22df1 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -156,6 +156,8 @@ Automatable::describe_parameter (Evoral::Parameter param) if (param == Evoral::Parameter(GainAutomation)) { return _("Fader"); + } else if (param.type() == MuteAutomation) { + return _("Mute"); } else if (param.type() == MidiCCAutomation) { return string_compose("Controller %1 [%2]", param.id(), int(param.channel()) + 1); } else if (param.type() == MidiPgmChangeAutomation) { diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc index 7cf6045d86..29a363c78b 100644 --- a/libs/ardour/event_type_map.cc +++ b/libs/ardour/event_type_map.cc @@ -163,14 +163,17 @@ EventTypeMap::new_parameter(uint32_t type, uint8_t channel, uint32_t id) const /* default 0.0 - 1.0 is fine */ break; case PluginAutomation: - case SoloAutomation: - case MuteAutomation: case FadeInAutomation: case FadeOutAutomation: case EnvelopeAutomation: max = 2.0f; normal = 1.0f; break; + case SoloAutomation: + case MuteAutomation: + max = 1.0f; + normal = 0.0f; + break; case MidiCCAutomation: case MidiPgmChangeAutomation: case MidiChannelPressureAutomation: diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 5df58ea846..bac9996dee 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -3441,6 +3441,8 @@ Route::MuteControllable::set_value (double val) return; } + cerr << " _route->mute with val = " << val << endl; + rl->push_back (r); _session.set_mute (rl, bval); } |