Merge branch 'windows' of git.ardour.org:ardour/ardour into windows

[ardour.git] / gtk2_ardour / automation_controller.h

diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h
index 7d925b6cd838402deeddc0966c686a8ded3d3fa9..29635c848869d2bed9ae98f5f3c955a78c61c541 100644 (file)
--- 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;
@@ -54,14 +62,13 @@ public:
        void stop_updating ();
 
 private:
-       AutomationController (boost::shared_ptr<ARDOUR::Automatable> parent, 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();
 
        void value_changed();
-       void automation_state_changed();
 
        bool                                         _ignore_change;
         boost::shared_ptr<ARDOUR::Automatable>       _printer;