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
This commit is contained in:
parent
f0250cddef
commit
70d246fbe3
@ -72,18 +72,14 @@ AutomationController::~AutomationController()
|
|||||||
|
|
||||||
boost::shared_ptr<AutomationController>
|
boost::shared_ptr<AutomationController>
|
||||||
AutomationController::create(
|
AutomationController::create(
|
||||||
boost::shared_ptr<Automatable> parent,
|
boost::shared_ptr<Automatable> printer,
|
||||||
const Evoral::Parameter& param,
|
const Evoral::Parameter& param,
|
||||||
boost::shared_ptr<AutomationControl> ac)
|
boost::shared_ptr<AutomationControl> ac)
|
||||||
{
|
{
|
||||||
Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(param.normal(), param.min(), param.max()));
|
Gtk::Adjustment* adjustment = manage (new Gtk::Adjustment (param.normal(), param.min(), param.max()));
|
||||||
if (!ac) {
|
assert (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);
|
assert(ac->parameter() == param);
|
||||||
}
|
return boost::shared_ptr<AutomationController>(new AutomationController(printer, ac, adjustment));
|
||||||
return boost::shared_ptr<AutomationController>(new AutomationController(parent, ac, adjustment));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string
|
std::string
|
||||||
|
@ -54,7 +54,7 @@ public:
|
|||||||
void stop_updating ();
|
void stop_updating ();
|
||||||
|
|
||||||
private:
|
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&);
|
std::string get_label (double&);
|
||||||
|
|
||||||
void start_touch();
|
void start_touch();
|
||||||
|
Loading…
Reference in New Issue
Block a user