X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.h;h=d8cff83143a87c67d8e2bd9ec1ed3bcb7040a0d2;hb=8bc2bf0155740b6f77bbe917285cd13610bdcb81;hp=e8271a8ad8aa6e947b69c16518198a89a51caf70;hpb=580520b12f90251e38d94a1a5d6a199b76142b0b;p=ardour.git

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index e8271a8ad8..d8cff83143 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -21,9 +21,10 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
+#include <boost/unordered_map.hpp>
 #include "pbd/signals.h"
 
-namespace ArdourCanvas {
+namespace ArdourWaveView {
 	class WaveView;
 }
 
@@ -32,11 +33,18 @@ class Note;
 class Hit;
 class MidiStreamView;
 class TimeAxisView;
+class RegionView;
+class MidiRegionView;
 
 class GhostRegion : public sigc::trackable
 {
 public:
-	GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
+	GhostRegion(RegionView& rv,
+	            ArdourCanvas::Container* parent,
+	            TimeAxisView& tv,
+	            TimeAxisView& source_tv,
+	            double initial_unit_pos);
+
 	virtual ~GhostRegion();
 
 	virtual void set_samples_per_pixel (double) = 0;
@@ -48,40 +56,52 @@ public:
 	guint source_track_color(unsigned char alpha = 0xff);
 	bool is_automation_ghost();
 
+	RegionView& parent_rv;
 	/** 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::Container* group;
 	ArdourCanvas::Rectangle* base_rect;
-
-	static PBD::Signal1<void,GhostRegion*> CatchDeletion;
 };
 
 class AudioGhostRegion : public GhostRegion {
 public:
-	AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
+	AudioGhostRegion(RegionView& rv,
+	                 TimeAxisView& tv,
+	                 TimeAxisView& source_tv,
+	                 double initial_unit_pos);
 
 	void set_samples_per_pixel (double);
 	void set_height();
 	void set_colors();
 
-	std::vector<ArdourCanvas::WaveView*> waves;
+	std::vector<ArdourWaveView::WaveView*> waves;
 };
 
 class MidiGhostRegion : public GhostRegion {
 public:
-	class GhostEvent : public sigc::trackable {
-	  public:
-	    GhostEvent(::NoteBase *, ArdourCanvas::Group *);
-	    virtual ~GhostEvent ();
-	    
-	    NoteBase* event;
-	    ArdourCanvas::Rectangle* rect;
+	class GhostEvent : public sigc::trackable
+	{
+	public:
+		GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+		virtual ~GhostEvent ();
+
+		NoteBase* event;
+		ArdourCanvas::Item* item;
+		bool is_hit;
 	};
 
-	MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
-	MidiGhostRegion(MidiStreamView& msv, TimeAxisView& source_tv, double initial_unit_pos);
+	MidiGhostRegion(MidiRegionView& rv,
+	                TimeAxisView& tv,
+	                TimeAxisView& source_tv,
+	                double initial_unit_pos);
+
+	MidiGhostRegion(MidiRegionView& rv,
+	                MidiStreamView& msv,
+	                TimeAxisView& source_tv,
+	                double initial_unit_pos);
+
 	~MidiGhostRegion();
 
 	MidiStreamView* midi_view();
@@ -90,19 +110,27 @@ public:
 	void set_samples_per_pixel (double spu);
 	void set_colors();
 
-	void update_range();
+	void update_contents_height();
 
 	void add_note(NoteBase*);
-	void update_note (NoteBase*);
+	void update_note (GhostEvent* note);
+	void update_hit (GhostEvent* hit);
 	void remove_note (NoteBase*);
 
+	void redisplay_model();
 	void clear_events();
 
 private:
+	ArdourCanvas::Container* _note_group;
+	Gtkmm2ext::Color _outline;
+	ArdourCanvas::Rectangle* _tmp_rect;
+	ArdourCanvas::Polygon* _tmp_poly;
 
-	MidiGhostRegion::GhostEvent* find_event (NoteBase*);
+	MidiRegionView& parent_mrv;
+	typedef Evoral::Note<Evoral::Beats> NoteType;
+	MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
 
-	typedef std::list<MidiGhostRegion::GhostEvent*> EventList;
+	typedef boost::unordered_map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
 	EventList events;
 	EventList::iterator _optimization_iterator;
 };