X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=657bfa90448ff23324526a54831b11e87d485fec;hb=40a6f878a945d96e51839d036992521dd5883e05;hp=5a0e10974f9a8c3f472c9123629c24ca403aad99;hpb=ee1477f9b65107673e581a4d0598dbb1ccbfb89a;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 5a0e10974f..657bfa9044 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -44,8 +44,8 @@ namespace ARDOUR {
 
 struct RecBoxInfo {
 	ArdourCanvas::SimpleRect* rectangle;
-	jack_nframes_t            start;
-	jack_nframes_t            length;
+	nframes_t            start;
+	nframes_t            length;
 };
 
 class PublicEditor;
@@ -83,14 +83,14 @@ public:
 	Gdk::Color get_region_color () const { return region_color; }
 	void       apply_color (Gdk::Color&, ColorTarget t);
 
-	RegionView*  find_view (const ARDOUR::Region&);
+	RegionView*  find_view (boost::shared_ptr<const ARDOUR::Region>);
 	void         foreach_regionview (sigc::slot<void,RegionView*> slot);
 
 	void set_selected_regionviews (RegionSelection&);
-	void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
+	void get_selectables (nframes_t start, nframes_t end, list<Selectable* >&);
 	void get_inverted_selectables (Selection&, list<Selectable* >& results);
 
-	void add_region_view (ARDOUR::Region*);
+	void add_region_view (boost::shared_ptr<ARDOUR::Region>);
 	void region_layered (RegionView*);
 	
 	sigc::signal<void,RegionView*> RegionViewAdded;
@@ -107,17 +107,16 @@ protected:
 	void         update_rec_box ();
 	virtual void update_rec_regions () = 0;
 	
-	virtual void add_region_view_internal (ARDOUR::Region*, bool wait_for_waves) = 0;
-	virtual void remove_region_view (ARDOUR::Region* );
-	void         remove_rec_region (ARDOUR::Region*);
+	virtual void add_region_view_internal (boost::shared_ptr<ARDOUR::Region>, bool wait_for_waves) = 0;
+	virtual void remove_region_view (boost::weak_ptr<ARDOUR::Region> );
+	//void         remove_rec_region (boost::shared_ptr<ARDOUR::Region>); (unused)
 
-	void         display_diskstream (ARDOUR::Diskstream* );
+	void         display_diskstream (boost::shared_ptr<ARDOUR::Diskstream>);
 	virtual void undisplay_diskstream ();
 	virtual void redisplay_diskstream () = 0;
 	void         diskstream_changed ();
 	
-	void         playlist_state_changed (ARDOUR::Change);
-	virtual void playlist_changed (ARDOUR::Diskstream* );
+	virtual void playlist_changed (boost::shared_ptr<ARDOUR::Diskstream>);
 	virtual void playlist_modified ();
 	
 	virtual void color_handler (ColorID, uint32_t) = 0;
@@ -134,7 +133,7 @@ protected:
 
 	sigc::connection       screen_update_connection;
 	vector<RecBoxInfo>     rec_rects;
-	list<ARDOUR::Region* > rec_regions;
+	list<boost::shared_ptr<ARDOUR::Region> > rec_regions;
 	bool                   rec_updating;
 	bool                   rec_active;
 	bool                   use_rec_regions;