Fix restore of fader automation from 2.X sessions.

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 93cb7eced3a4355072b1a1b100e7348e7d02df7a..f01aa508ae0acbb2aa70ec3139eb9f0b03a76f0b 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -177,8 +177,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /* editing operations */
 
-       virtual bool cut_copy_clear (Selection&, Editing::CutCopyOp) { return false; }
-       virtual bool paste (nframes_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
+       virtual void cut_copy_clear (Selection&, Editing::CutCopyOp) {}
+       virtual bool paste (ARDOUR::framepos_t, float /*times*/, Selection&, size_t /*nth*/) { return false; }
 
        virtual void set_selected_regionviews (RegionSelection&) {}
        virtual void set_selected_points (PointSelection&) {}
@@ -189,7 +189,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        void order_selection_trims (ArdourCanvas::Item *item, bool put_start_on_top);
 
-       virtual void get_selectables (nframes_t start, nframes_t end, double top, double bot, std::list<Selectable*>& results);
+       virtual void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable*>&);
        virtual void get_inverted_selectables (Selection&, std::list<Selectable *>& results);
 
        void add_ghost (RegionView*);
@@ -206,12 +206,13 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        /* call this on the parent */
 
-       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter /*param*/) { return 0; }
+       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter, int) { return 0; }
 
        virtual LayerDisplay layer_display () const { return Overlaid; }
        virtual StreamView* view () const { return 0; }
 
        typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
+       Children get_child_list ();
 
        SelectionRect* get_selection_rect(uint32_t id);