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 ea278e417554cd42101f298c7d9df1bef46234dc..825a286360f50c4ccb9c0eda06845e404a4fa283 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -75,8 +75,15 @@ class ItemCounts;
 class RouteTimeAxisView : public RouteUI, public TimeAxisView
 {
 public:
-       RouteTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
-       virtual ~RouteTimeAxisView ();
+       RouteTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas);
+       virtual ~RouteTimeAxisView ();
+
+       std::string name()  const;
+       Gdk::Color color () const;
+       bool marked_for_display () const;
+       bool set_marked_for_display (bool);
+
+       boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
 
        void set_route (boost::shared_ptr<ARDOUR::Route>);
 
@@ -84,7 +91,7 @@ public:
        void set_button_names ();
 
        void set_samples_per_pixel (double);
-       void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
+       void set_height (uint32_t h, TrackHeightMode m = OnlySelf);
        void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
        void hide_timestretch ();
        void selection_click (GdkEventButton*);
@@ -100,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*);
@@ -131,7 +138,6 @@ public:
        boost::shared_ptr<AutomationTimeAxisView> automation_child(Evoral::Parameter param);
        virtual Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
 
-       std::string         name() const;
        StreamView*         view() const { return _view; }
        ARDOUR::RouteGroup* route_group() const;
        boost::shared_ptr<ARDOUR::Playlist> playlist() const;
@@ -177,7 +183,7 @@ protected:
 
        void update_diskstream_display ();
 
-       gint route_group_click  (GdkEventButton *);
+       bool route_group_click  (GdkEventButton *);
 
        void processors_changed (ARDOUR::RouteProcessorChange);
 
@@ -207,7 +213,7 @@ protected:
 
        void take_name_changed (void *src);
        void route_property_changed (const PBD::PropertyChange&);
-       void name_entry_changed ();
+       bool name_entry_changed (std::string const&);
 
        void blink_rec_display (bool onoff);
 
@@ -221,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);
@@ -239,12 +245,14 @@ protected:
        void color_handler ();
        void region_view_added (RegionView*);
        void create_gain_automation_child (const Evoral::Parameter &, bool);
+       void create_trim_automation_child (const Evoral::Parameter &, bool);
        void create_mute_automation_child (const Evoral::Parameter &, bool);
        void setup_processor_menu_and_curves ();
        void route_color_changed ();
         bool can_edit_name() const;
 
        boost::shared_ptr<AutomationTimeAxisView> gain_track;
+       boost::shared_ptr<AutomationTimeAxisView> trim_track;
        boost::shared_ptr<AutomationTimeAxisView> mute_track;
 
        StreamView*           _view;
@@ -306,6 +314,7 @@ protected:
 
 protected:
        void update_gain_track_visibility ();
+       void update_trim_track_visibility ();
        void update_mute_track_visibility ();
        void update_pan_track_visibility ();
 
@@ -316,6 +325,7 @@ protected:
        void ensure_pan_views (bool show = true);
 
        Gtk::CheckMenuItem* gain_automation_item;
+       Gtk::CheckMenuItem* trim_automation_item;
        Gtk::CheckMenuItem* mute_automation_item;
        std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
        Gtk::CheckMenuItem* pan_automation_item;
@@ -329,4 +339,3 @@ private:
 };
 
 #endif /* __ardour_route_time_axis_h__ */
-