Reinstate command line option to hide splash screen.

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index c29c206470efdb8ed70d36da9abceebd4d7223ef..349b380d9f645378e04b466a25c4082312a53e19 100644 (file)
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -43,9 +43,9 @@ namespace ARDOUR {
 }
 
 struct RecBoxInfo {
-       ArdourCanvas::SimpleRect* rectangle;
-       nframes_t                 start;
-       nframes_t                 length;
+       ArdourCanvas::SimpleRect*  rectangle;
+       framepos_t                 start;
+       ARDOUR::framecnt_t         length;
 };
 
 class Selectable;
@@ -74,6 +74,9 @@ public:
        gdouble     get_samples_per_unit () { return _samples_per_unit; }
        virtual void horizontal_position_changed () {}
 
+        virtual void enter_internal_edit_mode ();
+        virtual void leave_internal_edit_mode ();
+
        void set_layer_display (LayerDisplay);
        LayerDisplay layer_display () const { return _layer_display; }
 
@@ -86,7 +89,7 @@ public:
        };
 
        Gdk::Color get_region_color () const { return region_color; }
-       void       apply_color (Gdk::Color&, ColorTarget t);
+       void       apply_color (Gdk::Color, ColorTarget t);
 
        uint32_t     num_selected_regionviews () const;
 
@@ -113,7 +116,12 @@ public:
                return 0;
        }
 
-       sigc::signal<void,RegionView*> RegionViewAdded;
+       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;
 
 protected:
        StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
@@ -135,7 +143,6 @@ protected:
        void         layer_regions ();
 
        virtual void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
-       virtual void playlist_layered (boost::weak_ptr<ARDOUR::Track>);
 
        virtual void color_handler () = 0;
 
@@ -169,7 +176,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 ();