Fix yet another oversight for the windows icon file update

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index cf3146be4403def68c7df54b9160b8ee4daaa9f7..1b2fb700c18e046221df0cfbccda93aa79d9c70c 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -21,6 +21,7 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
+#include <boost/unordered_map.hpp>
 #include "pbd/signals.h"
 
 namespace ArdourCanvas {
@@ -33,6 +34,7 @@ class Hit;
 class MidiStreamView;
 class TimeAxisView;
 class RegionView;
+class MidiRegionView;
 
 class GhostRegion : public sigc::trackable
 {
@@ -86,14 +88,15 @@ public:
 
            NoteBase* event;
            ArdourCanvas::Item* item;
+           bool is_hit;
        };
 
-       MidiGhostRegion(RegionView& rv,
+       MidiGhostRegion(MidiRegionView& rv,
                        TimeAxisView& tv,
                        TimeAxisView& source_tv,
                        double initial_unit_pos);
 
-       MidiGhostRegion(RegionView& rv,
+       MidiGhostRegion(MidiRegionView& rv,
                        MidiStreamView& msv,
                        TimeAxisView& source_tv,
                        double initial_unit_pos);
@@ -106,22 +109,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 (Note*);
-       void update_hit (Hit*);
+       void update_note (GhostEvent* note);
+       void update_hit (GhostEvent* hit);
        void remove_note (NoteBase*);
 
+       void redisplay_model();
        void clear_events();
 
 private:
-       ArdourCanvas::Color _fill;
+       ArdourCanvas::Container* _note_group;
        ArdourCanvas::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;
 };