Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 1b2fb700c18e046221df0cfbccda93aa79d9c70c..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;
 }
 
@@ -76,19 +76,20 @@ 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(MidiRegionView& rv,
@@ -121,12 +122,12 @@ public:
 
 private:
        ArdourCanvas::Container* _note_group;
-       ArdourCanvas::Color _outline;
+       Gtkmm2ext::Color _outline;
        ArdourCanvas::Rectangle* _tmp_rect;
        ArdourCanvas::Polygon* _tmp_poly;
 
        MidiRegionView& parent_mrv;
-       typedef Evoral::Note<Evoral::Beats> NoteType;
+       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;