X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fghostregion.h;h=85b6d96ed143ba2b9260c691fb2103f1f5c04cdb;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=384127150aa457cebffa201bb93546eb481980e1;hpb=aaea166135ace01709f7e0be64f40be80f4107ec;p=ardour.git

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 384127150a..85b6d96ed1 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -36,10 +36,10 @@ class TimeAxisView;
 class GhostRegion : public sigc::trackable
 {
 public:
-	GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
+	GhostRegion(ArdourCanvas::Container* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 	virtual ~GhostRegion();
 
-	virtual void set_frames_per_pixel (double) = 0;
+	virtual void set_samples_per_pixel (double) = 0;
 	virtual void set_height();
 	virtual void set_colors();
 
@@ -52,7 +52,7 @@ public:
 	TimeAxisView& trackview;
 	/** TimeAxisView that we are a ghost for */
 	TimeAxisView& source_trackview;
-	ArdourCanvas::Group* group;
+	ArdourCanvas::Container* group;
 	ArdourCanvas::Rectangle* base_rect;
 
 	static PBD::Signal1<void,GhostRegion*> CatchDeletion;
@@ -62,7 +62,7 @@ class AudioGhostRegion : public GhostRegion {
 public:
 	AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 
-	void set_frames_per_pixel (double);
+	void set_samples_per_pixel (double);
 	void set_height();
 	void set_colors();
 
@@ -72,12 +72,12 @@ public:
 class MidiGhostRegion : public GhostRegion {
 public:
 	class GhostEvent : public sigc::trackable {
-	public:
-	    GhostEvent(::NoteBase *, ArdourCanvas::Group *);
-	    virtual ~GhostEvent () {}
-
-		NoteBase* event;
-		ArdourCanvas::Rectangle* rect;
+	  public:
+	    GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+	    virtual ~GhostEvent ();
+	    
+	    NoteBase* event;
+	    ArdourCanvas::Rectangle* rect;
 	};
 
 	MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -87,20 +87,20 @@ public:
 	MidiStreamView* midi_view();
 
 	void set_height();
-	void set_frames_per_pixel (double spu);
+	void set_samples_per_pixel (double spu);
 	void set_colors();
 
 	void update_range();
 
-	void add_note(Note*);
-	void update_note (Note*);
-	void remove_note (Note*);
+	void add_note(NoteBase*);
+	void update_note (NoteBase*);
+	void remove_note (NoteBase*);
 
 	void clear_events();
 
 private:
 
-	MidiGhostRegion::Event* find_event (Note*);
+	MidiGhostRegion::GhostEvent* find_event (NoteBase*);
 
 	typedef std::list<MidiGhostRegion::GhostEvent*> EventList;
 	EventList events;