use FileSource::within_session() for peak-files

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

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 906ff4ed3ee2ad7b7a0a316a2293f3aaeab66d89..f928ee01b3c5eda0902fec5d043e8fd0840a4cd9 100644 (file)
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -163,6 +163,8 @@ Automatable::describe_parameter (Evoral::Parameter param)
 
        if (param == Evoral::Parameter(GainAutomation)) {
                return _("Fader");
+       } else if (param.type() == TrimAutomation) {
+               return _("Trim");
        } else if (param.type() == MuteAutomation) {
                return _("Mute");
        } else if (param.type() == MidiCCAutomation) {
@@ -173,8 +175,10 @@ Automatable::describe_parameter (Evoral::Parameter param)
                return string_compose("Bender [%1]", int(param.channel()) + 1);
        } else if (param.type() == MidiChannelPressureAutomation) {
                return string_compose("Pressure [%1]", int(param.channel()) + 1);
+#ifdef LV2_SUPPORT
        } else if (param.type() == PluginPropertyAutomation) {
                return string_compose("Property %1", URIMap::instance().id_to_uri(param.id()));
+#endif
        } else {
                return EventTypeMap::instance().to_symbol(param);
        }
@@ -212,7 +216,7 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le
                        const XMLProperty* id_prop = (*niter)->property("automation-id");
 
                        Evoral::Parameter param = (id_prop
-                                       ? EventTypeMap::instance().new_parameter(id_prop->value())
+                                       ? EventTypeMap::instance().from_symbol(id_prop->value())
                                        : legacy_param);
 
                        if (param.type() == NullAutomation) {
@@ -274,6 +278,7 @@ Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState
        if (c && (s != c->automation_state())) {
                c->set_automation_state (s);
                _a_session.set_dirty ();
+               AutomationStateChanged(); /* Emit signal */
        }
 }
 
@@ -399,16 +404,15 @@ Automatable::transport_stopped (framepos_t now)
 boost::shared_ptr<Evoral::Control>
 Automatable::control_factory(const Evoral::Parameter& param)
 {
-       boost::shared_ptr<AutomationList> list(new AutomationList(param));
-       Evoral::Control* control = NULL;
-       ParameterDescriptor desc(param);
+       Evoral::Control*                  control   = NULL;
+       bool                              make_list = true;
+       ParameterDescriptor               desc(param);
+       boost::shared_ptr<AutomationList> list;
        if (param.type() >= MidiCCAutomation && param.type() <= MidiChannelPressureAutomation) {
                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;
+                       make_list = false;  // No list, this is region "automation"
                }
        } else if (param.type() == PluginAutomation) {
                PluginInsert* pi = dynamic_cast<PluginInsert*>(this);
@@ -424,7 +428,9 @@ Automatable::control_factory(const Evoral::Parameter& param)
                        desc = pi->plugin(0)->get_property_descriptor(param.id());
                        if (desc.datatype != Variant::NOTHING) {
                                if (!Variant::type_is_numeric(desc.datatype)) {
-                                       list.reset();  // Can't automate non-numeric data yet
+                                       make_list = false;  // Can't automate non-numeric data yet
+                               } else {
+                                       list = boost::shared_ptr<AutomationList>(new AutomationList(param, desc));
                                }
                                control = new PluginInsert::PluginPropertyControl(pi, param, desc, list);
                        }
@@ -438,6 +444,13 @@ Automatable::control_factory(const Evoral::Parameter& param)
                } else {
                        warning << "GainAutomation for non-Amp" << endl;
                }
+       } else if (param.type() == TrimAutomation) {
+               Amp* amp = dynamic_cast<Amp*>(this);
+               if (amp) {
+                       control = new Amp::GainControl(X_("trimcontrol"), _a_session, amp, param);
+               } else {
+                       warning << "TrimAutomation for non-Amp" << endl;
+               }
        } else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) {
                Pannable* pannable = dynamic_cast<Pannable*>(this);
                if (pannable) {
@@ -447,11 +460,14 @@ Automatable::control_factory(const Evoral::Parameter& param)
                }
        }
 
+       if (make_list && !list) {
+               list = boost::shared_ptr<AutomationList>(new AutomationList(param, desc));
+       }
+
        if (!control) {
-               control = new AutomationControl(_a_session, param, desc);
+               control = new AutomationControl(_a_session, param, desc, list);
        }
 
-       control->set_list(list);
        return boost::shared_ptr<Evoral::Control>(control);
 }