ignore negative value locates and MMC locate commands

[ardour.git] / libs / ardour / automatable.cc

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 84f8cd56cca540948a29b93998d29a72e5d3fb29..8629722889de2fe5d86a65140893146237addcbe 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -137,16 +137,20 @@ Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
        Evoral::Parameter param = ac->parameter();
 
        boost::shared_ptr<AutomationList> al = boost::dynamic_pointer_cast<AutomationList> (ac->list ());
-       assert (al);
 
-       al->automation_state_changed.connect_same_thread (
-               _list_connections, boost::bind (&Automatable::automation_list_automation_state_changed, this, ac->parameter(), _1)
-               );
+       if (al) {
+               al->automation_state_changed.connect_same_thread (
+                       _list_connections,
+                       boost::bind (&Automatable::automation_list_automation_state_changed,
+                                    this, ac->parameter(), _1));
+       }
 
        ControlSet::add_control (ac);
        _can_automate_list.insert (param);
 
-       automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up
+       if (al) {
+               automation_list_automation_state_changed (param, al->automation_state ()); // sync everything up
+       }
 }
 
 string
@@ -156,6 +160,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) {
@@ -392,6 +398,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
                MidiTrack* mt = dynamic_cast<MidiTrack*>(this);
                if (mt) {
                        control = new MidiTrack::MidiControl(mt, param);
+                       list.reset();  // No list, this is region "automation"
                } else {
                        warning << "MidiCCAutomation for non-MidiTrack" << endl;
                }