Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index aa4ec8b2f32b8cfd944cdb186a66070da00ef8ab..5c57289151b0ffdd8f4336d21535f250913fc3b1 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -24,7 +24,7 @@
 #include <boost/unordered_map.hpp>
 #include "pbd/signals.h"
 
-namespace ArdourCanvas {
+namespace ArdourWaveView {
        class WaveView;
 }
 
@@ -34,6 +34,7 @@ class Hit;
 class MidiStreamView;
 class TimeAxisView;
 class RegionView;
+class MidiRegionView;
 
 class GhostRegion : public sigc::trackable
 {
@@ -75,27 +76,28 @@ public:
        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::Container *);
-           virtual ~GhostEvent ();
-
-           NoteBase* event;
-           ArdourCanvas::Item* item;
-           bool is_hit;
+       class GhostEvent : public sigc::trackable
+       {
+       public:
+               GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+               virtual ~GhostEvent ();
+
+               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);
@@ -111,19 +113,21 @@ public:
        void update_contents_height();
 
        void add_note(NoteBase*);
-       void update_note (Note* note,  bool hide);
-       void update_hit (Hit* hit, bool hide);
+       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;
-       ArdourCanvas::Color _outline;
+       Gtkmm2ext::Color _outline;
        ArdourCanvas::Rectangle* _tmp_rect;
        ArdourCanvas::Polygon* _tmp_poly;
 
-       typedef Evoral::Note<Evoral::Beats> NoteType;
+       MidiRegionView& parent_mrv;
+       typedef Evoral::Note<Temporal::Beats> NoteType;
        MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
 
        typedef boost::unordered_map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;