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 ffe6a075d761475a3ff01746aa9bf285233a2b47..61b361210bb8964b4b0a3787f50cc92ca28f7cd1 100644 (file)
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     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
@@ -20,7 +20,12 @@
 #ifndef __ardour_gtk_region_gain_line_h__
 #define __ardour_gtk_region_gain_line_h__
 
-#include <ardour/ardour.h>
+#include "ardour/ardour.h"
+
+#ifdef interface
+#undef interface
+#endif
+
 #include <libgnomecanvasmm.h>
 
 #include "automation_line.h"
@@ -35,19 +40,14 @@ class AudioRegionView;
 class AudioRegionGainLine : public AutomationLine
 {
   public:
-  AudioRegionGainLine (const string & name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
-       
-       void view_to_model_y (double&);
-       void model_to_view_y (double&);
+       AudioRegionGainLine (const std::string & name, AudioRegionView&, ArdourCanvas::Group& parent, boost::shared_ptr<ARDOUR::AutomationList>);
 
-       void start_drag (ControlPoint*, nframes_t x, float fraction);
-       void end_drag (ControlPoint*);
+        void start_drag_single (ControlPoint*, double, float);
+        void end_drag (bool with_push, uint32_t final_index);
 
        void remove_point (ControlPoint&);
 
-
-  private:
-       ARDOUR::Session& session;
+private:
        AudioRegionView& rv;
 };