From 5f93192aa3a17cfa047f217e7798f50f52be15db Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 16 Feb 2011 19:34:11 +0000 Subject: 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 --- gtk2_ardour/automation_controller.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/automation_controller.cc') diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 75239f7f80..25887d8160 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -41,13 +41,15 @@ using namespace ARDOUR; using namespace Gtk; -AutomationController::AutomationController(boost::shared_ptr owner, boost::shared_ptr ac, Adjustment* adj) +AutomationController::AutomationController(boost::shared_ptr printer, boost::shared_ptr 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 -- cgit v1.2.3