merge with master

[ardour.git] / gtk2_ardour / region_gain_line.h

diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 0f163722876574f313f2f15c57272e76b8cc0980..61b361210bb8964b4b0a3787f50cc92ca28f7cd1 100644 (file)
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -22,6 +22,10 @@
 
 #include "ardour/ardour.h"
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <libgnomecanvasmm.h>
 
 #include "automation_line.h"
@@ -38,12 +42,12 @@ class AudioRegionGainLine : public AutomationLine
   public:
        AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
 
-       void start_drag_single (ControlPoint*, nframes_t x, float fraction);
-       void end_drag ();
+        void start_drag_single (ControlPoint*, double, float);
+        void end_drag (bool with_push, uint32_t final_index);
 
        void remove_point (ControlPoint&);
 
-  private:
+private:
        AudioRegionView& rv;
 };