Revert "Revert "patch for waflib internals to allow tarball to be created even when...

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index e24bd638a6cfe282afaeb1b06e0c25ee6cacaa0c..825a286360f50c4ccb9c0eda06845e404a4fa283 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -83,10 +83,9 @@ public:
        bool marked_for_display () const;
        bool set_marked_for_display (bool);
 
-       void set_route (boost::shared_ptr<ARDOUR::Route>);
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
 
-       boost::shared_ptr<ARDOUR::Stripable> stripable() const;
-       ARDOUR::PresentationInfo const & presentation_info () const;
+       void set_route (boost::shared_ptr<ARDOUR::Route>);
 
        void show_selection (TimeSelection&);
        void set_button_names ();
@@ -108,7 +107,7 @@ public:
 
        /* Editing operations */
        void cut_copy_clear (Selection&, Editing::CutCopyOp);
-       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx);
+       bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
        RegionView* combine_regions ();
        void uncombine_regions ();
        void uncombine_region (RegionView*);
@@ -184,7 +183,7 @@ protected:
 
        void update_diskstream_display ();
 
-       gint route_group_click  (GdkEventButton *);
+       bool route_group_click  (GdkEventButton *);
 
        void processors_changed (ARDOUR::RouteProcessorChange);
 
@@ -228,13 +227,13 @@ protected:
 
        void set_align_choice (Gtk::RadioMenuItem*, ARDOUR::AlignChoice, bool apply_to_selection = false);
 
-       void         playlist_click ();
+       bool         playlist_click (GdkEventButton *);
        void         show_playlist_selector ();
        void         playlist_changed ();
 
        void rename_current_playlist ();
 
-       void         automation_click ();
+       bool         automation_click (GdkEventButton *);
 
        virtual void show_all_automation (bool apply_to_selection = false);
        virtual void show_existing_automation (bool apply_to_selection = false);