*/
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
#include <fstream>
#include <inttypes.h>
#include <cstdio>
#include <errno.h>
-#include <pbd/error.h>
-#include <pbd/enumwriter.h>
-#include <midi++/names.h>
-#include <ardour/session.h>
-#include <ardour/automatable.h>
-#include <ardour/midi_track.h>
-#include <ardour/plugin_insert.h>
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
+
+#include "midi++/names.h"
+
+#include "ardour/automatable.h"
+#include "ardour/amp.h"
+#include "ardour/event_type_map.h"
+#include "ardour/midi_track.h"
+#include "ardour/panner.h"
+#include "ardour/plugin_insert.h"
+#include "ardour/session.h"
#include "i18n.h"
if (sstr.fail()) {
break;
}
- mark_automation_visible (Parameter(PluginAutomation, what), true);
+ mark_automation_visible (Evoral::Parameter(PluginAutomation, 0, what), true);
}
}
}
Glib::Mutex::Lock lm (control_lock());
- set<Parameter> tosave;
+ set<Evoral::Parameter> tosave;
controls().clear ();
_last_automation_snapshot = 0;
in >> when; if (!in) goto bad;
in >> value; if (!in) goto bad;
+ Evoral::Parameter param(PluginAutomation, 0, port);
/* FIXME: this is legacy and only used for plugin inserts? I think? */
- boost::shared_ptr<Evoral::Control> c = control (Parameter(PluginAutomation, port), true);
+ boost::shared_ptr<Evoral::Control> c = control (param, true);
c->list()->add (when, value);
- tosave.insert (Parameter(PluginAutomation, port));
+ tosave.insert (param);
}
return 0;
void
Automatable::add_control(boost::shared_ptr<Evoral::Control> ac)
{
- Parameter param = ac->parameter();
+ Evoral::Parameter param = ac->parameter();
ControlSet::add_control(ac);
_can_automate_list.insert(param);
}
void
-Automatable::what_has_visible_data(set<Parameter>& s) const
+Automatable::what_has_visible_data(set<Evoral::Parameter>& s) const
{
Glib::Mutex::Lock lm (control_lock());
- set<Parameter>::const_iterator li;
+ set<Evoral::Parameter>::const_iterator li;
for (li = _visible_controls.begin(); li != _visible_controls.end(); ++li) {
s.insert (*li);
}
string
-Automatable::describe_parameter (Parameter param)
+Automatable::describe_parameter (Evoral::Parameter param)
{
/* derived classes like PluginInsert should override this */
- if (param == Parameter(GainAutomation)) {
+ if (param == Evoral::Parameter(GainAutomation)) {
return _("Fader");
} else if (param.type() == PanAutomation) {
/* ID's are zero-based, present them as 1-based */
return (string_compose(_("Pan %1"), param.id() + 1));
} else if (param.type() == MidiCCAutomation) {
- return string_compose("CC %1 (%2) [%3]",
- param.id() + 1, midi_name(param.id()), int(param.channel()) + 1);
+ return string_compose("%2 [%3]",
+ param.id() + 1, midi_name(param.id()), int(param.channel()) + 1);
} else if (param.type() == MidiPgmChangeAutomation) {
return string_compose("Program [%1]", int(param.channel()) + 1);
} else if (param.type() == MidiPitchBenderAutomation) {
} else if (param.type() == MidiChannelPressureAutomation) {
return string_compose("Pressure [%1]", int(param.channel()) + 1);
} else {
- return param.symbol();
+ return EventTypeMap::instance().to_symbol(param);
}
}
void
-Automatable::can_automate (Parameter what)
+Automatable::can_automate (Evoral::Parameter what)
{
_can_automate_list.insert (what);
}
void
-Automatable::mark_automation_visible (Parameter what, bool yn)
+Automatable::mark_automation_visible (Evoral::Parameter what, bool yn)
{
if (yn) {
_visible_controls.insert (what);
} else {
- set<Parameter>::iterator i;
+ set<Evoral::Parameter>::iterator i;
if ((i = _visible_controls.find (what)) != _visible_controls.end()) {
_visible_controls.erase (i);
* pass that type and it will be used for the untyped AutomationList found.
*/
int
-Automatable::set_automation_state (const XMLNode& node, Parameter legacy_param)
+Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy_param)
{
Glib::Mutex::Lock lm (control_lock());
const XMLProperty* id_prop = (*niter)->property("automation-id");
- Parameter param = (id_prop ? Parameter(id_prop->value()) : legacy_param);
+ Evoral::Parameter param = (id_prop
+ ? EventTypeMap::instance().new_parameter(id_prop->value())
+ : legacy_param);
+
if (param.type() == NullAutomation) {
warning << "Automation has null type" << endl;
continue;
if (!id_prop) {
warning << "AutomationList node without automation-id property, "
- << "using default: " << legacy_param.symbol() << endmsg;
+ << "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg;
}
boost::shared_ptr<Evoral::Control> existing = control(param);
- if (existing)
+ if (existing) {
existing->set_list(al);
- else
- add_control(control_factory(param));
+ } else {
+ boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
+ add_control(newcontrol);
+ newcontrol->set_list(al);
+ }
} else {
error << "Expected AutomationList node, got '" << (*niter)->name() << endmsg;
for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
boost::shared_ptr<AutomationList> l
= boost::dynamic_pointer_cast<AutomationList>(li->second->list());
- node->add_child_nocopy (l->get_state ());
+ if (!l->empty()) {
+ node->add_child_nocopy (l->get_state ());
+ }
}
return *node;
}
void
-Automatable::set_parameter_automation_state (Parameter param, AutoState s)
+Automatable::set_parameter_automation_state (Evoral::Parameter param, AutoState s)
{
Glib::Mutex::Lock lm (control_lock());
}
AutoState
-Automatable::get_parameter_automation_state (Parameter param, bool lock)
+Automatable::get_parameter_automation_state (Evoral::Parameter param, bool lock)
{
AutoState result = Off;
}
void
-Automatable::set_parameter_automation_style (Parameter param, AutoStyle s)
+Automatable::set_parameter_automation_style (Evoral::Parameter param, AutoStyle s)
{
Glib::Mutex::Lock lm (control_lock());
}
AutoStyle
-Automatable::get_parameter_automation_style (Parameter param)
+Automatable::get_parameter_automation_style (Evoral::Parameter param)
{
Glib::Mutex::Lock lm (control_lock());
}
void
-Automatable::transport_stopped (nframes_t now)
+Automatable::transport_stopped (sframes_t now)
{
for (Controls::iterator li = controls().begin(); li != controls().end(); ++li) {
control = new MidiTrack::MidiControl((MidiTrack*)this, param);
} else if (param.type() == PluginAutomation) {
control = new PluginInsert::PluginControl((PluginInsert*)this, param);
+ } else if (param.type() == GainAutomation) {
+ control = new Amp::GainControl( X_("gaincontrol"), _a_session, (Amp*)this, param);
+ } else if (param.type() == PanAutomation) {
+ Panner* me = dynamic_cast<Panner*>(this);
+ if (me) {
+ control = new Panner::PanControllable(me->session(), X_("panner"), *me, param);
+ } else {
+ cerr << "ERROR: PanAutomation for non-Panner" << endl;
+ }
} else {
control = new AutomationControl(_a_session, param);
}
return boost::shared_ptr<Evoral::Control>(control);
}
+boost::shared_ptr<AutomationControl>
+Automatable::automation_control (const Evoral::Parameter& id, bool create)
+{
+ return boost::dynamic_pointer_cast<AutomationControl>(Evoral::ControlSet::control(id, create));
+}
+
+boost::shared_ptr<const AutomationControl>
+Automatable::automation_control (const Evoral::Parameter& id) const
+{
+ return boost::dynamic_pointer_cast<const AutomationControl>(Evoral::ControlSet::control(id));
+}
+
projects / ardour.git / blobdiff