X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.h;h=083f71b3e28c3f4c97572214d30726fc880abd96;hb=5d509146c815bee46e8d1ede78c7e4445f346db8;hp=a4e4b893f1eb65aa5f8e9fbb6fe7656864bdd305;hpb=c75b17e3bab17b852ab69868bbfdffd7ad1f73bf;p=ardour.git

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index a4e4b893f1..083f71b3e2 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -37,7 +37,7 @@ namespace Gnome {
 class MidiStreamView;
 class TimeAxisView;
 
-class GhostRegion
+class GhostRegion : public sigc::trackable
 {
 public:
 	GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -77,28 +77,13 @@ class MidiGhostRegion : public GhostRegion {
 public:
 	class Event : public sigc::trackable {
 	public:
-		Event(ArdourCanvas::CanvasNoteEvent*);
-		virtual ~Event() {}
+		Event(ArdourCanvas::CanvasNoteEvent *, ArdourCanvas::Group *);
+		~Event ();
 
 		ArdourCanvas::CanvasNoteEvent* event;
-	};
-
-	class Note : public Event {
-	public:
-		Note(ArdourCanvas::CanvasNote*, ArdourCanvas::Group*);
-		~Note();
-
 		ArdourCanvas::SimpleRect* rect;
 	};
 
-	class Hit : public Event {
-	public:
-		Hit(ArdourCanvas::CanvasHit*, ArdourCanvas::Group*);
-		~Hit();
-
-		ArdourCanvas::Diamond* diamond;
-	};
-
 	MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 	MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos);
 	~MidiGhostRegion();
@@ -112,14 +97,14 @@ public:
 	void update_range();
 
 	void add_note(ArdourCanvas::CanvasNote*);
-	void add_hit(ArdourCanvas::CanvasHit*);
 	void update_note (ArdourCanvas::CanvasNote *);
+	void remove_note (ArdourCanvas::CanvasNoteEvent *);
 
 	void clear_events();
 
 private:
 
-	MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNote *);
+	MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNoteEvent *);
 
 	typedef std::list<MidiGhostRegion::Event*> EventList;
 	EventList events;