fix crash when opening MIDI controller automation tracks, caused by addition of "owner" field to an AutomationController, used to print values. Renamed "owner" to "printer" and required it to be non-null

git-svn-id: svn://localhost/ardour2/branches/3.0@8874 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-16 19:34:11 +00:00
parent fbbddf78c9
commit 5f93192aa3
4 changed files with 14 additions and 5 deletions

View file

@ -41,13 +41,15 @@
using namespace ARDOUR;
using namespace Gtk;
AutomationController::AutomationController(boost::shared_ptr<Automatable> owner, boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
AutomationController::AutomationController(boost::shared_ptr<Automatable> printer, boost::shared_ptr<AutomationControl> ac, Adjustment* adj)
: BarController (*adj, ac)
, _ignore_change(false)
, _owner (owner)
, _printer (printer)
, _controllable(ac)
, _adjustment(adj)
{
assert (_printer);
set_name (X_("PluginSlider")); // FIXME: get yer own name!
set_style (BarController::LeftToRight);
set_use_parent (true);
@ -88,7 +90,7 @@ std::string
AutomationController::get_label (double& xpos)
{
xpos = 0.5;
return _owner->value_as_string (_controllable);
return _printer->value_as_string (_controllable);
}
void