a reverb is a reverb is a reverb

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index d39e75b759de7215dada75cf2b4696f7b174e1fe..7fad731dc26cd82e6814af7875c162ade9212f9b 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -85,6 +85,8 @@ class RegionView : public TimeAxisViewItem
 
        virtual void region_changed (const PBD::PropertyChange&);
 
+       uint32_t get_fill_color () const;
+
        virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
        void remove_ghost_in (TimeAxisView&);
        void remove_ghost (GhostRegion*);
@@ -100,12 +102,12 @@ class RegionView : public TimeAxisViewItem
        /** Called when a front trim is about to begin */
        virtual void trim_front_starting () {}
 
-       bool trim_front (framepos_t, bool);
+       bool trim_front (framepos_t, bool, const int32_t sub_num);
 
        /** Called when a start trim has finished */
        virtual void trim_front_ending () {}
 
-       bool trim_end (framepos_t, bool);
+       bool trim_end (framepos_t, bool, const int32_t sub_num);
         void move_contents (ARDOUR::frameoffset_t);
        virtual void thaw_after_trim ();
 
@@ -119,8 +121,8 @@ class RegionView : public TimeAxisViewItem
                }
        };
 
-       ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t) const;
-       
+       ARDOUR::frameoffset_t snap_frame_to_frame (ARDOUR::frameoffset_t, bool ensure_snap = false) const;
+
   protected:
 
        /** Allows derived types to specify their visibility requirements
@@ -149,11 +151,9 @@ class RegionView : public TimeAxisViewItem
        void        lock_toggle ();
 
        virtual void set_colors ();
-       virtual void set_frame_color ();
+       virtual void set_sync_mark_color ();
        virtual void reset_width_dependent_items (double pixel_width);
 
-       uint32_t fill_opacity () const;
-
        virtual void color_handler () {}
 
        boost::shared_ptr<ARDOUR::Region> _region;