X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.h;h=bb1c0d443c0de0cef48b4a5811425855c34c8b04;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=8a244113c4056d5e65becd37fba700f565a9f76d;hpb=b942d3613e9679a1ffc5ad5ff0a6491cac1fa853;p=ardour.git

diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 8a244113c4..bb1c0d443c 100644
--- a/gtk2_ardour/automation_controller.h
+++ b/gtk2_ardour/automation_controller.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2007 Paul Davis 
-    Author: Dave Robillard
+    Copyright (C) 2007 Paul Davis
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,9 @@
 
 #include <boost/shared_ptr.hpp>
 #include <gtkmm.h>
-#include <gtkmm2ext/barcontroller.h>
+
+#include "gtkmm2ext/barcontroller.h"
+#include "pbd/signals.h"
 
 namespace ARDOUR {
 	class Session;
@@ -32,26 +34,29 @@ namespace ARDOUR {
 	class Automatable;
 }
 
-
+/** A BarController which displays the value and allows control of an AutomationControl */
 class AutomationController : public Gtkmm2ext::BarController {
 public:
 	static boost::shared_ptr<AutomationController> create(
 			boost::shared_ptr<ARDOUR::Automatable> parent,
-			boost::shared_ptr<ARDOUR::AutomationList> al,
+			const Evoral::Parameter& param,
 			boost::shared_ptr<ARDOUR::AutomationControl> ac);
 
 	~AutomationController();
-	
+
 	boost::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
 
 	Gtk::Adjustment* adjustment() { return _adjustment; }
-	
-	void update_label(char* label, int label_len);
+
 	void display_effective_value();
 	void value_adjusted();
 
+	void stop_updating ();
+
 private:
-	AutomationController(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();
 	void end_touch();
 
@@ -59,9 +64,11 @@ private:
 	void automation_state_changed();
 
 	bool                                         _ignore_change;
+        boost::shared_ptr<ARDOUR::Automatable>       _printer;
 	boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
 	Gtk::Adjustment*                             _adjustment;
 	sigc::connection                             _screen_update_connection;
+	PBD::ScopedConnection                        _changed_connection;
 };