X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=f49bc8725911196a314cfa5ba3a1c211e3a77ac6;hb=ffa2c2cf4069b12d2c981e6d1c8cbef6a8e163a2;hp=d28dc371330c0d333d8838dec152876b36d4065d;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index d28dc37133..f49bc87259 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -35,17 +35,17 @@ namespace Gdk {
 
 namespace ARDOUR {
 	class Route;
-	class Diskstream;
 	class Crossfade;
 	class PeakData;
 	class Region;
 	class Source;
+	class Track;
 }
 
 struct RecBoxInfo {
-	ArdourCanvas::SimpleRect* rectangle;
-	nframes_t                 start;
-	nframes_t                 length;
+	ArdourCanvas::SimpleRect*  rectangle;
+	framepos_t                 start;
+	ARDOUR::framecnt_t         length;
 };
 
 class Selectable;
@@ -72,12 +72,16 @@ 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; }
 
 	ArdourCanvas::Group* background_group() { return _background_group; }
-	ArdourCanvas::Group* canvas_item() { return canvas_group; }
+	ArdourCanvas::Group* canvas_item() { return _canvas_group; }
 
 	enum ColorTarget {
 		RegionColor,
@@ -85,24 +89,26 @@ 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;
 
 	RegionView*  find_view (boost::shared_ptr<const ARDOUR::Region>);
 	void         foreach_regionview (sigc::slot<void,RegionView*> slot);
+	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>) {}
 
-	void add_region_view_weak (boost::weak_ptr<ARDOUR::Region> r);
-	void add_region_view (boost::shared_ptr<ARDOUR::Region>);
+	void add_region_view (boost::weak_ptr<ARDOUR::Region>);
 
 	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; }
 
@@ -110,39 +116,41 @@ 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;
 
 protected:
-	StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
+	StreamView (RouteTimeAxisView&, ArdourCanvas::Group* background_group = 0, ArdourCanvas::Group* canvas_group = 0);
 
 	void         transport_changed();
 	void         transport_looped();
 	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;
 	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_changed_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-	virtual void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
-	virtual void playlist_modified_weak (boost::weak_ptr<ARDOUR::Diskstream>);
-	virtual void playlist_modified (boost::shared_ptr<ARDOUR::Diskstream>);
+	void playlist_switched (boost::weak_ptr<ARDOUR::Track>);
 
 	virtual void color_handler () = 0;
 
 	RouteTimeAxisView&        _trackview;
+	bool                      owns_background_group;
 	bool                      owns_canvas_group;
 	ArdourCanvas::Group*      _background_group;
-	ArdourCanvas::Group*      canvas_group;
+	ArdourCanvas::Group*      _canvas_group;
 	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
 	typedef std::list<RegionView* > RegionViewList;
@@ -155,13 +163,12 @@ protected:
 	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
 
 	PBD::ScopedConnectionList playlist_connections;
-	PBD::ScopedConnection playlist_change_connection;
+	PBD::ScopedConnection playlist_switched_connection;
 
 	ARDOUR::layer_t _layers;
 	LayerDisplay    _layer_display;
@@ -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 ();