X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_controller.h;h=12b31f6d86a067cafa4b7f937b53189dd3685062;hb=e59b28de09729c29083fdbb4b2886482d37e0ad5;hp=7d925b6cd838402deeddc0966c686a8ded3d3fa9;hpb=5f93192aa3a17cfa047f217e7798f50f52be15db;p=ardour.git

diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 7d925b6cd8..12b31f6d86 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,54 +21,87 @@
 #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 <gtkmm/alignment.h>
+
 #include "pbd/signals.h"
+#include "evoral/Parameter.hpp"
+#include "widgets/barcontroller.h"
 
 namespace ARDOUR {
 	class Session;
 	class AutomationList;
 	class AutomationControl;
-	class Automatable;
 }
 
+namespace Gtk {
+	class Adjustment;
+	class Widget;
+}
+
+class AutomationBarController : public ArdourWidgets::BarController {
+public:
+	AutomationBarController(boost::shared_ptr<ARDOUR::AutomationControl> ac,
+	                        Gtk::Adjustment*                             adj);
+	~AutomationBarController();
+private:
+	std::string get_label (double&);
+	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);
+	static boost::shared_ptr<AutomationController> create (
+		const Evoral::Parameter&                     param,
+		const ARDOUR::ParameterDescriptor&           desc,
+		boost::shared_ptr<ARDOUR::AutomationControl> ac,
+		bool                                         use_knob = false);
 
 	~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 display_effective_value ();
+	void automation_state_changed ();
 	void value_adjusted();
 
 	void stop_updating ();
 
 private:
-	AutomationController (boost::shared_ptr<ARDOUR::Automatable> parent, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
-	std::string get_label (double&);
+	AutomationController (boost::shared_ptr<ARDOUR::AutomationControl> ac,
+	                      Gtk::Adjustment*                             adj,
+	                      bool                                         use_knob);
 
 	void start_touch();
 	void end_touch();
+	bool button_press(GdkEventButton*);
+	bool button_release(GdkEventButton*);
 
-	void value_changed();
-	void automation_state_changed();
+	void run_note_select_dialog();
+	void set_ratio(double ratio);
+	void set_freq_beats(double beats);
+	bool on_button_release(GdkEventButton* ev);
 
-	bool                                         _ignore_change;
-        boost::shared_ptr<ARDOUR::Automatable>       _printer;
+	Gtk::Widget*                                 _widget;
 	boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
 	Gtk::Adjustment*                             _adjustment;
 	sigc::connection                             _screen_update_connection;
-	PBD::ScopedConnection                        _changed_connection;
+	PBD::ScopedConnectionList                    _changed_connections;
+	bool                                         _ignore_change;
 };