X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=a1ebe2cc2a9fefee42be4f64d65bcae4a9f7e64b;hb=b5148d93d5a9e6949f82f8685cab50cb772f2b9d;hp=16a637d674263e842846c4b6caf5618cb474988f;hpb=458c588e2c7dfe7c0e62647fb5e0d0c06cdf8f04;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 16a637d674..a1ebe2cc2a 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001, 2006 Paul Davis 
+    Copyright (C) 2001, 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,7 +22,9 @@
 #include <list>
 #include <cmath>
 
-#include <ardour/location.h>
+#include "pbd/signals.h"
+
+#include "ardour/location.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "canvas.h"
@@ -42,11 +44,10 @@ namespace ARDOUR {
 
 struct RecBoxInfo {
 	ArdourCanvas::SimpleRect* rectangle;
-	nframes_t            start;
-	nframes_t            length;
+	nframes_t                 start;
+	nframes_t                 length;
 };
 
-class PublicEditor;
 class Selectable;
 class RouteTimeAxisView;
 class RegionView;
@@ -54,7 +55,7 @@ class RegionSelection;
 class CrossfadeView;
 class Selection;
 
-class StreamView : public sigc::trackable
+class StreamView : public sigc::trackable, public PBD::ScopedConnectionList
 {
 public:
 	virtual ~StreamView ();
@@ -86,28 +87,36 @@ public:
 	Gdk::Color get_region_color () const { return region_color; }
 	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 start, nframes_t end, list<Selectable* >&);
-	void get_inverted_selectables (Selection&, list<Selectable* >& results);
+	void get_selectables (nframes_t, nframes_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 (boost::weak_ptr<ARDOUR::Region>);
 
-	virtual void update_contents_metrics(boost::shared_ptr<ARDOUR::Region> r) {}
-	void add_region_view (boost::shared_ptr<ARDOUR::Region>);
 	void region_layered (RegionView*);
 	virtual void update_contents_height ();
-	
+
 	virtual void redisplay_diskstream () = 0;
 	double child_height () const;
 	ARDOUR::layer_t layers () const { return _layers; }
-	
+
+	virtual RegionView* create_region_view (boost::shared_ptr<ARDOUR::Region>, bool, bool) {
+		return 0;
+	}
+
 	sigc::signal<void,RegionView*> RegionViewAdded;
+	sigc::signal<void> HeightChanged;
 
 protected:
 	StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
-	
-//private: (FIXME?)
 
 	void         transport_changed();
 	void         transport_looped();
@@ -115,22 +124,19 @@ protected:
 	void         sess_rec_enable_changed();
 	virtual void setup_rec_box () = 0;
 	void         update_rec_box ();
-	//virtual void update_rec_regions () = 0;
-	
-	virtual RegionView* add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves, bool recording = false) = 0;
+
+	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         remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)
 
 	void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
 	virtual void undisplay_diskstream ();
 	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>);
-	
+
+	virtual void playlist_switched (boost::weak_ptr<ARDOUR::Diskstream>);
+	virtual void playlist_layered (boost::weak_ptr<ARDOUR::Diskstream>);
+
 	virtual void color_handler () = 0;
 
 	RouteTimeAxisView&        _trackview;
@@ -139,33 +145,33 @@ protected:
 	ArdourCanvas::Group*      canvas_group;
 	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
-	typedef list<RegionView* > RegionViewList;
+	typedef std::list<RegionView* > RegionViewList;
 	RegionViewList  region_views;
 
 	double _samples_per_unit;
 
 	sigc::connection       screen_update_connection;
-	vector<RecBoxInfo>     rec_rects;
-	list< std::pair<boost::shared_ptr<ARDOUR::Region>,RegionView* > > rec_regions;
+	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
 
-	vector<sigc::connection> playlist_connections;
-	sigc::connection         playlist_change_connection;
+	PBD::ScopedConnectionList playlist_connections;
+	PBD::ScopedConnection playlist_switched_connection;
 
 	ARDOUR::layer_t _layers;
+	LayerDisplay    _layer_display;
+
 	double height;
-	LayerDisplay _layer_display;
 
-	list<sigc::connection> rec_data_ready_connections;
-	jack_nframes_t         last_rec_data_frame;
+	PBD::ScopedConnectionList rec_data_ready_connections;
+	nframes_t                 last_rec_data_frame;
 
 private:
-
 	void update_coverage_frames ();
 };