Fix ExportFormatSpecification copy-c'tor

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index e7608cb02ca79db26de6f11ce4587f453bcd6622..850bdaea3bab17fdc0664570d7b12bbaa31fc1fb 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -42,13 +42,13 @@ namespace ARDOUR {
 
 namespace ArdourCanvas {
        class Rectangle;
-       class Group;
+       class Container;
 }
 
 struct RecBoxInfo {
        ArdourCanvas::Rectangle*   rectangle;
-       framepos_t                 start;
-       ARDOUR::framecnt_t         length;
+       samplepos_t                 start;
+       ARDOUR::samplecnt_t         length;
 };
 
 class Selectable;
@@ -76,21 +76,20 @@ public:
        virtual int set_samples_per_pixel (double);
        gdouble     get_samples_per_pixel () const { return _samples_per_pixel; }
 
-        virtual void enter_internal_edit_mode ();
-        virtual void leave_internal_edit_mode ();
-
-       void set_layer_display (LayerDisplay);
+       virtual void set_layer_display (LayerDisplay);
+       virtual bool can_change_layer_display() const { return true; }
        LayerDisplay layer_display () const { return _layer_display; }
 
-       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;
 
@@ -99,7 +98,7 @@ public:
        void         foreach_selected_regionview (sigc::slot<void,RegionView*> slot);
 
        void set_selected_regionviews (RegionSelection&);
-       void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list<Selectable* >&);
+       void get_selectables (ARDOUR::samplepos_t, ARDOUR::samplepos_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>) {}
@@ -117,22 +116,23 @@ public:
                return 0;
        }
 
-       void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
+       void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::samplepos_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* canvas_group = 0);
+       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(samplepos_t sample_pos, double width);
        virtual void setup_rec_box () = 0;
        virtual void update_rec_box ();
 
@@ -150,8 +150,8 @@ protected:
        virtual void color_handler () = 0;
 
        RouteTimeAxisView&        _trackview;
-       ArdourCanvas::Group*      _canvas_group;
-       ArdourCanvas::Rectangle*   canvas_rect; /* frame around the whole thing */
+       ArdourCanvas::Container*      _canvas_group;
+       ArdourCanvas::Rectangle*   canvas_rect; /* sample around the whole thing */
 
        typedef std::list<RegionView* > RegionViewList;
        RegionViewList  region_views;
@@ -164,8 +164,8 @@ protected:
        bool                   rec_updating;
        bool                   rec_active;
 
-       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;
@@ -176,16 +176,16 @@ protected:
        double height;
 
        PBD::ScopedConnectionList rec_data_ready_connections;
-       framepos_t                last_rec_data_frame;
+       samplepos_t                last_rec_data_sample;
 
        /* When recording, the session time at which a new layer must be created for the region
-          being recorded, or max_framepos if not applicable.
+          being recorded, or max_samplepos if not applicable.
        */
-       framepos_t _new_rec_layer_time;
+       samplepos_t _new_rec_layer_time;
        void setup_new_rec_layer_time (boost::shared_ptr<ARDOUR::Region>);
 
 private:
-       void update_coverage_frames ();
+       void update_coverage_samples ();
 };
 
 #endif /* __ardour_streamview_h__ */