diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-16 19:41:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-16 19:41:53 +0000 |
| commit | 70d246fbe30d24197781384fa4825f32fb0f4235 (patch) | |
| tree | 5b96d16a3898a195214be689c0dcaa0f1544fd52 /gtk2_ardour/automation_controller.cc | |
| parent | f0250cddef5eb4968729437e29c3f1f9883f6351 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/automation_controller.cc')
| -rw-r--r-- | gtk2_ardour/automation_controller.cc | 14 |
1 files changed, 5 insertions, 9 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 |