merge from 2.0-ongoing @ 3581

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index e5822715cae15dc887874c5f5129f26a67fc07d0..579b6e55940678bb5a1409981dfdeb92dd4c5050 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -48,6 +48,7 @@ class RegionView : public TimeAxisViewItem
                    Gdk::Color&          basic_color);
 
        RegionView (const RegionView& other);
+       RegionView (const RegionView& other, boost::shared_ptr<ARDOUR::Region> other_region);
 
        ~RegionView ();
        
@@ -77,8 +78,9 @@ class RegionView : public TimeAxisViewItem
        
        virtual void region_changed (ARDOUR::Change);
        
-       virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
-       void                 remove_ghost (GhostRegion*);
+       virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
+       void remove_ghost_in (TimeAxisView&);
+       void remove_ghost (GhostRegion*);
        
        uint32_t get_fill_color ();
 
@@ -88,7 +90,6 @@ class RegionView : public TimeAxisViewItem
        void enable_display(bool yn) { _enable_display = yn; }
        
        static sigc::signal<void,RegionView*> RegionViewGoingAway;
-       sigc::signal<void>                    GoingAway;
        
   protected:
        
@@ -100,6 +101,7 @@ class RegionView : public TimeAxisViewItem
                boost::shared_ptr<ARDOUR::Region>,
                double      samples_per_unit,
                Gdk::Color& basic_color,
+               bool recording,
                TimeAxisViewItem::Visibility);
     
     virtual void region_resized (ARDOUR::Change);
@@ -135,6 +137,7 @@ class RegionView : public TimeAxisViewItem
     bool    valid; ///< see StreamView::redisplay_diskstream() 
     bool    _enable_display; ///< see StreamView::redisplay_diskstream() 
     double  _pixel_width;
+    double  _height;
     bool    in_destructor;
     
     bool             wait_for_data;