update drobilla's fascistic dir-locals.el to force emacs users into whitespace submis...

[ardour.git] / gtk2_ardour / streamview.h

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 304f38894eee63df775176ccbd2a4cd6e3e687c1..24ab1182d9574789fecf1ccb823febe69be9fc52 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;
@@ -72,6 +72,10 @@ public:
 
        virtual int set_samples_per_unit (gdouble spp);
        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; }
@@ -94,7 +98,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* >&);
        void get_inverted_selectables (Selection&, std::list<Selectable* >& results);
 
        virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region>) {}
@@ -112,7 +116,10 @@ public:
                return 0;
        }
 
-       sigc::signal<void,RegionView*> RegionViewAdded;
+       void check_record_layers (boost::shared_ptr<ARDOUR::Region>, ARDOUR::framepos_t);
+       
+       sigc::signal<void, RegionView*> RegionViewAdded;
+       sigc::signal<void> RegionViewRemoved;
 
 protected:
        StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
@@ -122,7 +129,7 @@ protected:
        void         rec_enable_changed();
        void         sess_rec_enable_changed();
        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;
@@ -168,8 +175,14 @@ 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 ();
 };