Move object+range button up with the rest of the tool buttons (bringing edit toolbar...

[ardour.git] / gtk2_ardour / region_view.h

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index fea5cd95883dcb6eb4e182bc331b9da59e6e6650..9a663eac02171b72feb2de16e38f8f990d2c2e03 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001-2006 Paul Davis 
+    Copyright (C) 2001-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "waveview.h"
 #include "canvas.h"
 
 class TimeAxisView;
@@ -42,69 +41,69 @@ class AutomationRegionView;
 class RegionView : public TimeAxisViewItem
 {
   public:
-       RegionView (ArdourCanvas::Group* parent, 
+       RegionView (ArdourCanvas::Group* parent,
                    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);
        virtual void set_samples_per_unit (double);
-       virtual bool set_duration (nframes_t, void*);
-       
+       virtual bool set_duration (nframes64_t, void*);
+
        void move (double xdelta, double ydelta);
-       
+
        void raise_to_top ();
        void lower_to_bottom ();
 
-       bool set_position(nframes_t pos, void* src, double* delta = 0);
+       bool set_position(nframes64_t pos, void* src, double* delta = 0);
        void fake_set_opaque (bool yn);
-       
+
        virtual void show_region_editor () {}
        virtual void hide_region_editor();
-       
+
        virtual void region_changed (ARDOUR::Change);
-       
+
        virtual GhostRegion* add_ghost (TimeAxisView&) = 0;
        void remove_ghost_in (TimeAxisView&);
        void remove_ghost (GhostRegion*);
-       
+
        uint32_t get_fill_color ();
 
        virtual void entered () {}
        virtual void exited () {}
 
        void enable_display(bool yn) { _enable_display = yn; }
-       void update_coverage_frames (LayerDisplay);
-       
-       static sigc::signal<void,RegionView*> RegionViewGoingAway;
-       
+       virtual void update_coverage_frames (LayerDisplay);
+
+       static PBD::Signal1<void,RegionView*> RegionViewGoingAway;
+
   protected:
-       
+
        /** Allows derived types to specify their visibility requirements
      * to the TimeAxisViewItem parent class
      */
-    RegionView (ArdourCanvas::Group *, 
+    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);
-    
+
     virtual void region_resized (ARDOUR::Change);
     virtual void region_muted ();
     void         region_locked ();
@@ -118,31 +117,30 @@ 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);
 
     virtual void color_handler () {}
-       
+
     boost::shared_ptr<ARDOUR::Region> _region;
-    
-    ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position 
-    ArdourCanvas::Line* sync_line; ///< polgyon for sync position 
+
+    ArdourCanvas::Polygon* sync_mark; ///< polgyon for sync position
+    ArdourCanvas::Line* sync_line; ///< polgyon for sync position
 
     RegionEditor* editor;
 
     std::vector<ControlPoint *> control_points;
     double current_visible_sync_position;
 
-    bool    valid; ///< see StreamView::redisplay_diskstream() 
-    bool    _enable_display; ///< see StreamView::redisplay_diskstream() 
+    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;
-    sigc::connection data_ready_connection;
-    
+    PBD::ScopedConnection data_ready_connection;
+
     std::vector<GhostRegion*> ghosts;
 
        /** a list of rectangles which are used in stacked display mode to colour