Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / automation_streamview.h

diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h
index 8afacd79cfa10e171bb5de61d2a6b67db74db809..d058f0243451638314559facf7450c2d81a88c67 100644 (file)
--- a/gtk2_ardour/automation_streamview.h
+++ b/gtk2_ardour/automation_streamview.h
@@ -24,7 +24,6 @@
 
 #include "ardour/location.h"
 #include "enums.h"
-#include "simplerect.h"
 #include "streamview.h"
 #include "time_axis_view_item.h"
 #include "route_time_axis.h"
@@ -61,10 +60,11 @@ class AutomationStreamView : public StreamView
 
        void clear ();
 
-       void get_selectables (nframes_t, nframes_t, double, double, std::list<Selectable*> &);
+       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*> &);
        void set_selected_points (PointSelection &);
 
        std::list<boost::shared_ptr<AutomationLine> > get_lines () const;
+       boost::shared_ptr<AutomationLine> paste_line (ARDOUR::framepos_t);
 
   private:
        void setup_rec_box ();
@@ -74,8 +74,6 @@ class AutomationStreamView : public StreamView
 
        void color_handler ();
 
-       boost::shared_ptr<AutomationController> _controller;
-
        AutomationTimeAxisView& _automation_view;
        /** automation state that should be applied when this view gets its first RegionView */
        ARDOUR::AutoState _pending_automation_state;