X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fautomatable.cc;h=f85bc83e8549a49e78ce806cb4edc444ee5cc2fd;hb=d53d9b01abd5f2000554846c44c791b82f30dc00;hp=0538c84cc5917a6d74ef1c8291fce0af17aec7b5;hpb=767c0238a34ef4acc4d345e88cd5ddb0c8a8e421;p=ardour.git diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 0538c84cc5..f85bc83e85 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -17,10 +17,10 @@ */ -#include #include #include +#include "pbd/gstdio_compat.h" #include #include "pbd/error.h" @@ -28,6 +28,7 @@ #include "ardour/amp.h" #include "ardour/automatable.h" #include "ardour/event_type_map.h" +#include "ardour/gain_control.h" #include "ardour/midi_track.h" #include "ardour/pan_controllable.h" #include "ardour/pannable.h" @@ -66,7 +67,7 @@ Automatable::~Automatable () { { Glib::Threads::Mutex::Lock lm (_control_lock); - + for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) { boost::dynamic_pointer_cast(li->second)->drop_references (); } @@ -76,7 +77,7 @@ Automatable::~Automatable () int Automatable::old_set_automation_state (const XMLNode& node) { - const XMLProperty *prop; + XMLProperty const * prop; if ((prop = node.property ("path")) != 0) { load_automation (prop->value()); @@ -98,7 +99,8 @@ Automatable::load_automation (const string& path) fullpath = _a_session.automation_dir(); fullpath += path; } - ifstream in (fullpath.c_str()); + + FILE * in = g_fopen (fullpath.c_str (), "rb"); if (!in) { warning << string_compose(_("cannot open %2 to load automation data (%3)") @@ -110,14 +112,17 @@ Automatable::load_automation (const string& path) set tosave; controls().clear (); - while (in) { + while (!feof(in)) { double when; double value; uint32_t port; - in >> port; if (!in) break; - in >> when; if (!in) goto bad; - in >> value; if (!in) goto bad; + if (3 != fscanf (in, "%d %lf %lf", &port, &when, &value)) { + if (feof(in)) { + break; + } + goto bad; + } Evoral::Parameter param(PluginAutomation, 0, port); /* FIXME: this is legacy and only used for plugin inserts? I think? */ @@ -125,12 +130,14 @@ Automatable::load_automation (const string& path) c->list()->add (when, value); tosave.insert (param); } + ::fclose (in); return 0; bad: error << string_compose(_("cannot load automation data from %2"), fullpath) << endmsg; controls().clear (); + ::fclose (in); return -1; } @@ -163,6 +170,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 +182,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); } @@ -209,7 +220,7 @@ Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter le if ((*niter)->name() == "AutomationList") { - const XMLProperty* id_prop = (*niter)->property("automation-id"); + XMLProperty const * id_prop = (*niter)->property("automation-id"); Evoral::Parameter param = (id_prop ? EventTypeMap::instance().from_symbol(id_prop->value()) @@ -274,6 +285,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 */ } } @@ -283,7 +295,7 @@ Automatable::get_parameter_automation_state (Evoral::Parameter param) AutoState result = Off; boost::shared_ptr c = automation_control(param); - + if (c) { result = c->automation_state(); } @@ -383,16 +395,21 @@ Automatable::transport_stopped (framepos_t now) when the transport is re-started, a touch will magically be happening without it ever have being started in the usual way. */ + const bool list_did_write = !l->in_new_write_pass (); + l->stop_touch (true, now); - l->write_pass_finished (now, Config->get_automation_thinning_factor()); - if (l->automation_playback()) { - c->set_value(c->list()->eval(now)); - } + c->commit_transaction (list_did_write); - if (l->automation_state() == Write) { + l->write_pass_finished (now, Config->get_automation_thinning_factor ()); + + if (l->automation_state () == Write) { l->set_automation_state (Touch); } + + if (l->automation_playback ()) { + c->set_value_unchecked (c->list ()->eval (now)); + } } } @@ -408,8 +425,6 @@ Automatable::control_factory(const Evoral::Parameter& param) if (mt) { control = new MidiTrack::MidiControl(mt, param); make_list = false; // No list, this is region "automation" - } else { - warning << "MidiCCAutomation for non-MidiTrack" << endl; } } else if (param.type() == PluginAutomation) { PluginInsert* pi = dynamic_cast(this); @@ -435,12 +450,9 @@ Automatable::control_factory(const Evoral::Parameter& param) warning << "PluginPropertyAutomation for non-Plugin" << endl; } } else if (param.type() == GainAutomation) { - Amp* amp = dynamic_cast(this); - if (amp) { - control = new Amp::GainControl(X_("gaincontrol"), _a_session, amp, param); - } else { - warning << "GainAutomation for non-Amp" << endl; - } + control = new GainControl(_a_session, param); + } else if (param.type() == TrimAutomation) { + control = new GainControl(_a_session, param); } else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) { Pannable* pannable = dynamic_cast(this); if (pannable) { @@ -485,3 +497,42 @@ Automatable::value_as_string (boost::shared_ptr ac) const { return ARDOUR::value_as_string(ac->desc(), ac->get_value()); } + +bool +Automatable::find_next_event (double now, double end, Evoral::ControlEvent& next_event, bool only_active) const +{ + Controls::const_iterator li; + + next_event.when = std::numeric_limits::max(); + + for (li = _controls.begin(); li != _controls.end(); ++li) { + boost::shared_ptr c + = boost::dynamic_pointer_cast(li->second); + + if (only_active && (!c || !c->automation_playback())) { + continue; + } + + Evoral::ControlList::const_iterator i; + boost::shared_ptr alist (li->second->list()); + Evoral::ControlEvent cp (now, 0.0f); + if (!alist) { + continue; + } + + for (i = lower_bound (alist->begin(), alist->end(), &cp, Evoral::ControlList::time_comparator); + i != alist->end() && (*i)->when < end; ++i) { + if ((*i)->when > now) { + break; + } + } + + if (i != alist->end() && (*i)->when < end) { + if ((*i)->when < next_event.when) { + next_event.when = (*i)->when; + } + } + } + + return next_event.when != std::numeric_limits::max(); +}