From 70d246fbe30d24197781384fa4825f32fb0f4235 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 16 Feb 2011 19:41:53 +0000
Subject: [PATCH] change some parameter names to make things a bit clearer,and
 require that an AutomationControllable is passed in to
 AutomationController::create() rather than being willing to create it

git-svn-id: svn://localhost/ardour2/branches/3.0@8876 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/automation_controller.cc | 14 +++++---------
 gtk2_ardour/automation_controller.h  |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 25887d8160..212c8e9ade 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -72,18 +72,14 @@ AutomationController::~AutomationController()
 
 boost::shared_ptr<AutomationController>
 AutomationController::create(
-		boost::shared_ptr<Automatable> parent,
+		boost::shared_ptr<Automatable> printer,
 		const Evoral::Parameter& param,
 		boost::shared_ptr<AutomationControl> ac)
 {
-	Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(param.normal(), param.min(), param.max()));
-	if (!ac) {
-		PBD::warning << "Creating AutomationController for " << EventTypeMap::instance().to_symbol(param) << endmsg;
-		ac = boost::dynamic_pointer_cast<AutomationControl>(parent->control_factory(param));
-	} else {
-		assert(ac->parameter() == param);
-	}
-	return boost::shared_ptr<AutomationController>(new AutomationController(parent, ac, adjustment));
+	Gtk::Adjustment* adjustment = manage (new Gtk::Adjustment (param.normal(), param.min(), param.max()));
+        assert (ac);
+        assert(ac->parameter() == param);
+	return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
 }
 
 std::string
diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 7d925b6cd8..ad34abf1a9 100644
--- a/gtk2_ardour/automation_controller.h
+++ b/gtk2_ardour/automation_controller.h
@@ -54,7 +54,7 @@ public:
 	void stop_updating ();
 
 private:
-	AutomationController (boost::shared_ptr<ARDOUR::Automatable> parent, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
+	AutomationController (boost::shared_ptr<ARDOUR::Automatable> printer, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
 	std::string get_label (double&);
 
 	void start_touch();