Apply patch from mantis 2761 from tinram to add padding and make a string translatable.

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 579b6e55940678bb5a1409981dfdeb92dd4c5050..98329ee77bd74e03e72e2d3772d28651d9a71003 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -24,12 +24,12 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
-#include <ardour/region.h>
+#include "ardour/region.h"
+#include "ardour/beats_frames_converter.h"
 
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "waveview.h"
 #include "canvas.h"
 
 class TimeAxisView;
@@ -45,20 +45,19 @@ class RegionView : public TimeAxisViewItem
                    TimeAxisView&        time_view,
                    boost::shared_ptr<ARDOUR::Region> region,
                    double               samples_per_unit,
-                   Gdk::Color&          basic_color);
+                   Gdk::Color const &   basic_color);
 
        RegionView (const RegionView& other);
        RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
 
        ~RegionView ();
        
-       virtual void init (Gdk::Color& base_color, bool wait_for_data);
+       virtual void init (Gdk::Color const & base_color, bool wait_for_data);
     
        boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
        
        bool is_valid() const    { return valid; }
 
-
        void set_valid (bool yn) { valid = yn; }
        
        virtual void set_height (double);
@@ -88,6 +87,7 @@ class RegionView : public TimeAxisViewItem
        virtual void exited () {}
 
        void enable_display(bool yn) { _enable_display = yn; }
+       void update_coverage_frames (LayerDisplay);
        
        static sigc::signal<void,RegionView*> RegionViewGoingAway;
        
@@ -99,8 +99,8 @@ class RegionView : public TimeAxisViewItem
     RegionView (ArdourCanvas::Group *, 
                TimeAxisView&,
                boost::shared_ptr<ARDOUR::Region>,
-               double      samples_per_unit,
-               Gdk::Color& basic_color,
+               double samples_per_unit,
+               Gdk::Color const & basic_color,
                bool recording,
                TimeAxisViewItem::Visibility);
     
@@ -108,7 +108,6 @@ class RegionView : public TimeAxisViewItem
     virtual void region_muted ();
     void         region_locked ();
     void         region_opacity ();
-    void         region_layered ();
     virtual void region_renamed ();
     void         region_sync_changed ();
 
@@ -118,7 +117,6 @@ class RegionView : public TimeAxisViewItem
     void        lock_toggle ();
 
     virtual void set_colors ();
-    virtual void compute_colors (Gdk::Color&);
     virtual void set_frame_color ();
     virtual void reset_width_dependent_items (double pixel_width);
 
@@ -131,7 +129,7 @@ class RegionView : public TimeAxisViewItem
 
     RegionEditor* editor;
 
-    vector<ControlPoint *> control_points;
+    std::vector<ControlPoint *> control_points;
     double current_visible_sync_position;
 
     bool    valid; ///< see StreamView::redisplay_diskstream() 
@@ -143,10 +141,15 @@ class RegionView : public TimeAxisViewItem
     bool             wait_for_data;
     sigc::connection data_ready_connection;
     
-    vector<GhostRegion*> ghosts;
-       
-       typedef std::map<const ARDOUR::Parameter, boost::shared_ptr<AutomationRegionView> > AutomationChildren;
-       AutomationChildren _automation_children;
+    std::vector<GhostRegion*> ghosts;
+
+       /** a list of rectangles which are used in stacked display mode to colour
+           different bits of regions according to whether or not they are the one
+           that will be played at any given time.
+       */
+       std::list<ArdourCanvas::SimpleRect*> _coverage_frames;
+
+       ARDOUR::BeatsFramesConverter _time_converter;
 };
 
 #endif /* __gtk_ardour_region_view_h__ */