X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.h;h=2ebd33e64e4f433503de90214c127767e910e825;hb=35a966c824a862deec9691f6b3ea665f0f8a1dd6;hp=72658f2d530eb5f66a5b982e4a845eeb1ffe2e5c;hpb=faf4e1d8e863477a13b6c3e3c04d76fbd8011c61;p=ardour.git

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 72658f2d53..2ebd33e64e 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 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
@@ -21,14 +21,13 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
-#include <sigc++/signal.h>
 #include <libgnomecanvasmm.h>
-#include <ardour/configuration.h>
+#include "pbd/signals.h"
 #include "canvas.h"
 
 namespace Gnome {
 	namespace Canvas {
-		class CanvasMidiEvent;
+		class CanvasNoteEvent;
 		class CanvasNote;
 		class CanvasHit;
 		class Diamond;
@@ -38,7 +37,7 @@ namespace Gnome {
 class MidiStreamView;
 class TimeAxisView;
 
-class GhostRegion : public sigc::trackable 
+class GhostRegion
 {
 public:
 	GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -53,12 +52,14 @@ public:
 	guint source_track_color(unsigned char alpha = 0xff);
 	bool is_automation_ghost();
 
-	sigc::signal<void,GhostRegion*> GoingAway;
-
+	/** TimeAxisView that is the AutomationTimeAxisView that we are on */
 	TimeAxisView& trackview;
+	/** TimeAxisView that we are a ghost for */
 	TimeAxisView& source_trackview;
 	ArdourCanvas::Group* group;
 	ArdourCanvas::SimpleRect* base_rect;
+
+	static PBD::Signal1<void,GhostRegion*> CatchDeletion;
 };
 
 class AudioGhostRegion : public GhostRegion {
@@ -76,11 +77,10 @@ class MidiGhostRegion : public GhostRegion {
 public:
 	class Event : public sigc::trackable {
 	public:
-		Event(ArdourCanvas::CanvasMidiEvent*);
+		Event(ArdourCanvas::CanvasNoteEvent*);
 		virtual ~Event() {}
 
-		virtual void x_changed() = 0;
-		ArdourCanvas::CanvasMidiEvent* event;
+		ArdourCanvas::CanvasNoteEvent* event;
 	};
 
 	class Note : public Event {
@@ -88,19 +88,9 @@ public:
 		Note(ArdourCanvas::CanvasNote*, ArdourCanvas::Group*);
 		~Note();
 
-		void x_changed();
 		ArdourCanvas::SimpleRect* rect;
 	};
 
-	class Hit : public Event {
-	public:
-		Hit(ArdourCanvas::CanvasHit*, ArdourCanvas::Group*);
-		~Hit();
-
-		void x_changed();
-		ArdourCanvas::Diamond* diamond;
-	};
-	
 	MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 	MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos);
 	~MidiGhostRegion();
@@ -114,12 +104,17 @@ public:
 	void update_range();
 
 	void add_note(ArdourCanvas::CanvasNote*);
-	void add_hit(ArdourCanvas::CanvasHit*);
+	void update_note (ArdourCanvas::CanvasNote *);
 
 	void clear_events();
 
+private:
+
+	MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNote *);
+
 	typedef std::list<MidiGhostRegion::Event*> EventList;
 	EventList events;
+	EventList::iterator _optimization_iterator;
 };
 
 #endif /* __ardour_gtk_ghost_region_h__ */