X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.h;h=d11ade71ef8255b1e55da58f523b668971514621;hb=3e089ee678164440be71a90c01a77b47e5f16654;hp=ad34abf1a9e523058c72f234c208755e6c063839;hpb=70d246fbe30d24197781384fa4825f32fb0f4235;p=ardour.git

diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index ad34abf1a9..d11ade71ef 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
+    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
@@ -21,11 +21,19 @@
 #ifndef __ardour_gtk_automation_controller_h__
 #define __ardour_gtk_automation_controller_h__
 
+#ifdef YES
+#undef YES
+#endif
+#ifdef NO
+#undef NO
+#endif
+
 #include <boost/shared_ptr.hpp>
 #include <gtkmm.h>
 
 #include "gtkmm2ext/barcontroller.h"
 #include "pbd/signals.h"
+#include "evoral/Parameter.hpp"
 
 namespace ARDOUR {
 	class Session;
@@ -34,19 +42,35 @@ namespace ARDOUR {
 	class Automatable;
 }
 
+class AutomationBarController : public Gtkmm2ext::BarController {
+public:
+	AutomationBarController(boost::shared_ptr<ARDOUR::Automatable>       printer,
+	                        boost::shared_ptr<ARDOUR::AutomationControl> ac,
+	                        Gtk::Adjustment*                             adj);
+	~AutomationBarController();
+private:
+	std::string get_label (double&);
+	boost::shared_ptr<ARDOUR::Automatable>       _printer;
+	boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
+};
+
 /** A BarController which displays the value and allows control of an AutomationControl */
-class AutomationController : public Gtkmm2ext::BarController {
+class AutomationController : public Gtk::Alignment {
 public:
 	static boost::shared_ptr<AutomationController> create(
-			boost::shared_ptr<ARDOUR::Automatable> parent,
-			const Evoral::Parameter& param,
-			boost::shared_ptr<ARDOUR::AutomationControl> ac);
+		boost::shared_ptr<ARDOUR::Automatable>       parent,
+		const Evoral::Parameter&                     param,
+		const ARDOUR::ParameterDescriptor&           desc,
+		boost::shared_ptr<ARDOUR::AutomationControl> ac);
 
 	~AutomationController();
 
 	boost::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
 
+	void disable_vertical_scroll();
+
 	Gtk::Adjustment* adjustment() { return _adjustment; }
+	Gtk::Widget*     widget()     { return _widget; }
 
 	void display_effective_value();
 	void value_adjusted();
@@ -54,21 +78,28 @@ public:
 	void stop_updating ();
 
 private:
-	AutomationController (boost::shared_ptr<ARDOUR::Automatable> printer, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
-	std::string get_label (double&);
+	AutomationController (boost::shared_ptr<ARDOUR::Automatable>       printer,
+	                      boost::shared_ptr<ARDOUR::AutomationControl> ac,
+	                      Gtk::Adjustment*                             adj);
 
 	void start_touch();
 	void end_touch();
+	void toggled();
+
+	void run_note_select_dialog();
+	void set_ratio(double ratio);
+	void set_freq_beats(double beats);
+	bool on_button_release(GdkEventButton* ev);
 
 	void value_changed();
-	void automation_state_changed();
 
-	bool                                         _ignore_change;
-        boost::shared_ptr<ARDOUR::Automatable>       _printer;
+	Gtk::Widget*                                 _widget;
+	boost::shared_ptr<ARDOUR::Automatable>       _printer;
 	boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
 	Gtk::Adjustment*                             _adjustment;
 	sigc::connection                             _screen_update_connection;
 	PBD::ScopedConnection                        _changed_connection;
+	bool                                         _ignore_change;
 };