NO-OP whitespace

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index a1ebe2cc2a9fefee42be4f64d65bcae4a9f7e64b..8a56040afb321ad945a70c49b64a1710950b1dc7 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,26 +26,29 @@
 
 #include "ardour/location.h"
 #include "enums.h"
-#include "simplerect.h"
-#include "canvas.h"
 
 namespace Gdk {
        class Color;
 }
 
 namespace ARDOUR {
-       class Route;
-       class Diskstream;
        class Crossfade;
-       class PeakData;
        class Region;
+       class Route;
        class Source;
+       class Track;
+       struct PeakData;
+}
+
+namespace ArdourCanvas {
+       class Rectangle;
+       class Container;
 }
 
 struct RecBoxInfo {
-       ArdourCanvas::SimpleRect* rectangle;
-       nframes_t                 start;
-       nframes_t                 length;
+       ArdourCanvas::Rectangle*   rectangle;
+       framepos_t                 start;
+       ARDOUR::framecnt_t         length;
 };
 
 class Selectable;
@@ -70,22 +73,22 @@ public:
        int set_position (gdouble x, gdouble y);
        virtual int set_height (double);
 
-       virtual int set_samples_per_unit (gdouble spp);
-       gdouble     get_samples_per_unit () { return _samples_per_unit; }
+       virtual int set_samples_per_pixel (double);
+       gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
        void set_layer_display (LayerDisplay);
        LayerDisplay layer_display () const { return _layer_display; }
 
-       ArdourCanvas::Group* background_group() { return _background_group; }
-       ArdourCanvas::Group* canvas_item() { return canvas_group; }
+       ArdourCanvas::Container* canvas_item() { return _canvas_group; }
 
        enum ColorTarget {
                RegionColor,
                StreamBaseColor
        };
 
-       Gdk::Color get_region_color () const { return region_color; }
-       void       apply_color (Gdk::Color&, ColorTarget t);
+       uint32_t get_region_color () const { return region_color; }
+       void     apply_color (uint32_t, ColorTarget t);
+       void     apply_color (Gdk::Color const &, ColorTarget t);
 
        uint32_t     num_selected_regionviews () const;
 
@@ -94,7 +97,7 @@ public:
        void         foreach_selected_regionview (sigc::slot<void,RegionView*> slot);
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (nframes_t, nframes_t, double, double, std::list<Selectable* >&);
+       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&, bool within = false);
        void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
        virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
@@ -104,7 +107,7 @@ public:
        void region_layered (RegionView*);
        virtual void update_contents_height ();
 
-       virtual void redisplay_diskstream () = 0;
+       virtual void redisplay_track () = 0;
        double child_height () const;
        ARDOUR::layer_t layers () const { return _layers; }
 
@@ -112,53 +115,56 @@ public:
                return 0;
        }
 
-       sigc::signal<void,RegionView*> RegionViewAdded;
-       sigc::signal<void> HeightChanged;
+       void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
+
+       virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
+
+       sigc::signal<void, RegionView*> RegionViewAdded;
+       sigc::signal<void> RegionViewRemoved;
+       /** Emitted when the height of regions has changed */
+       sigc::signal<void> ContentsHeightChanged;
 
 protected:
-       StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
+       StreamView (RouteTimeAxisView&, ArdourCanvas::Container* canvas_group = 0);
 
        void         transport_changed();
        void         transport_looped();
        void         rec_enable_changed();
        void         sess_rec_enable_changed();
+       void         create_rec_box(framepos_t frame_pos, double width);
        virtual void setup_rec_box () = 0;
-       void         update_rec_box ();
+       virtual void update_rec_box ();
 
        virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>,
                      bool wait_for_waves, bool recording = false) = 0;
        virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
 
-       void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
-       virtual void undisplay_diskstream ();
+       void         display_track (boost::shared_ptr<ARDOUR::Track>);
+       virtual void undisplay_track ();
        void         diskstream_changed ();
        void         layer_regions ();
 
-       virtual void playlist_switched (boost::weak_ptr<ARDOUR::Diskstream>);
-       virtual void playlist_layered (boost::weak_ptr<ARDOUR::Diskstream>);
+       void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
        virtual void color_handler () = 0;
 
        RouteTimeAxisView&        _trackview;
-       bool                      owns_canvas_group;
-       ArdourCanvas::Group*      _background_group;
-       ArdourCanvas::Group*      canvas_group;
-       ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
+       ArdourCanvas::Container*      _canvas_group;
+       ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
 
        typedef std::list<RegionView* > RegionViewList;
        RegionViewList  region_views;
 
-       double _samples_per_unit;
+       double _samples_per_pixel;
 
        sigc::connection       screen_update_connection;
        std::vector<RecBoxInfo>     rec_rects;
        std::list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
        bool                   rec_updating;
        bool                   rec_active;
-       bool                   use_rec_regions;
 
-       Gdk::Color region_color;      ///< Contained region color
-       uint32_t   stream_base_color; ///< Background color
+       uint32_t region_color;      ///< Contained region color
+       uint32_t stream_base_color; ///< Background color
 
        PBD::ScopedConnectionList playlist_connections;
        PBD::ScopedConnection playlist_switched_connection;
@@ -169,7 +175,13 @@ protected:
        double height;
 
        PBD::ScopedConnectionList rec_data_ready_connections;
-       nframes_t                 last_rec_data_frame;
+       framepos_t                last_rec_data_frame;
+
+       /* When recording, the session time at which a new layer must be created for the region
+          being recorded, or max_framepos if not applicable.
+       */
+       framepos_t _new_rec_layer_time;
+       void setup_new_rec_layer_time (boost::shared_ptr<ARDOUR::Region>);
 
 private:
        void update_coverage_frames ();