diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc
index b7669ebdd9..3d0c149f4b 100644
--- a/gtk2_ardour/curvetest.cc
+++ b/gtk2_ardour/curvetest.cc
@@ -36,7 +36,7 @@ curvetest (string filename)
 	stringstream line;
 	//Evoral::Parameter param(GainAutomation, -1.0, +1.0, 0.0);
 	Evoral::Parameter param(GainAutomation);
-	AutomationList al (param, Temporal::AudioTime);
+	AutomationList al (param, Temporal::TimeDomainProvider (Temporal::AudioTime));
 	double minx = DBL_MAX;
 	double maxx = DBL_MIN;
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 9e509813c5..442fc17623 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4673,7 +4673,7 @@ Editor::cut_copy_points (Editing::CutCopyOp op, timepos_t const & earliest_time)
 		   ControlList for each of our source lists to put the cut buffer data in.
 		*/
 		for (Lists::iterator i = lists.begin(); i != lists.end(); ++i) {
-			i->second.copy = i->first->create (i->first->parameter (), i->first->descriptor(), i->first->time_domain());
+			i->second.copy = i->first->create (i->first->parameter (), i->first->descriptor(), *i->first);
 		}
 
 		/* Add all selected points to the relevant copy ControlLists */
diff --git a/gtk2_ardour/midi_cut_buffer.cc b/gtk2_ardour/midi_cut_buffer.cc
index f14262b3ad..9c5837a232 100644
--- a/gtk2_ardour/midi_cut_buffer.cc
+++ b/gtk2_ardour/midi_cut_buffer.cc
@@ -22,7 +22,7 @@
 using namespace ARDOUR;
 
 MidiCutBuffer::MidiCutBuffer (Session* s)
-	: AutomatableSequence<Temporal::Beats> (*s, Temporal::BeatTime)
+	: AutomatableSequence<Temporal::Beats> (*s, Temporal::TimeDomainProvider (Temporal::BeatTime))
 {
 
 }
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 5d7d64cc18..576faa56b7 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -3479,7 +3479,7 @@ Mixer_UI::add_favorite_processor (ARDOUR::PluginPresetPtr ppp, ProcessorPosition
 		}
 
 		Route::ProcessorStreams err;
-		std::shared_ptr<Processor> processor (new PluginInsert (*_session, rt->time_domain(), p));
+		std::shared_ptr<Processor> processor (new PluginInsert (*_session, *rt, p));
 
 		switch (pos) {
 			case AddTop:
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 3d2decae0f..8534d41d91 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -2082,7 +2082,7 @@ ProcessorBox::_drop_plugin_preset (Gtk::SelectionData const &data, Route::Proces
 				p->load_preset (ppp->_preset);
 			}
 
-			std::shared_ptr<Processor> processor (new PluginInsert (*_session, _route->time_domain(), p));
+			std::shared_ptr<Processor> processor (new PluginInsert (*_session, *_route, p));
 			if (Config->get_new_plugins_active ()) {
 				processor->enable (true);
 			}
@@ -2105,7 +2105,7 @@ ProcessorBox::_drop_plugin (Gtk::SelectionData const &data, Route::ProcessorList
 			if (!p) {
 				continue;
 			}
-			std::shared_ptr<Processor> processor (new PluginInsert (*_session, _route->time_domain(), p));
+			std::shared_ptr<Processor> processor (new PluginInsert (*_session, *_route, p));
 			if (Config->get_new_plugins_active ()) {
 				processor->enable (true);
 			}
@@ -2788,7 +2788,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
 {
 	for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) {
 
-		std::shared_ptr<Processor> processor (new PluginInsert (*_session, _route->time_domain(), *p));
+		std::shared_ptr<Processor> processor (new PluginInsert (*_session, *_route, *p));
 
 		Route::ProcessorStreams err_streams;
 
@@ -3769,7 +3769,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, std::shared_ptr<P
 				/* XXX its a bit limiting to assume that everything else
 				   is a plugin.
 				*/
-				p.reset (new PluginInsert (*_session, _route->time_domain()));
+				p.reset (new PluginInsert (*_session, *_route));
 				/* we can't use RAII Stateful::ForceIDRegeneration
 				 * because that'd void copying the state and wrongly bump
 				 * the state-version counter.