Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 083f71b3e28c3f4c97572214d30726fc880abd96..5c57289151b0ffdd8f4336d21535f250913fc3b1 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -21,29 +21,33 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
-#include <libgnomecanvasmm.h>
+#include <boost/unordered_map.hpp>
 #include "pbd/signals.h"
-#include "canvas.h"
-
-namespace Gnome {
-       namespace Canvas {
-               class CanvasNoteEvent;
-               class CanvasNote;
-               class CanvasHit;
-               class Diamond;
-       }
+
+namespace ArdourWaveView {
+       class WaveView;
 }
 
+class NoteBase;
+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_unit(double spu) = 0;
+       virtual void set_samples_per_pixel (double) = 0;
        virtual void set_height();
        virtual void set_colors();
 
@@ -52,61 +56,81 @@ 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::SimpleRect* base_rect;
-
-       static PBD::Signal1<void,GhostRegion*> CatchDeletion;
+       ArdourCanvas::Container* group;
+       ArdourCanvas::Rectangle* base_rect;
 };
 
 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_unit(double spu);
+       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 Event : public sigc::trackable {
+       class GhostEvent : public sigc::trackable
+       {
        public:
-               Event(ArdourCanvas::CanvasNoteEvent *, ArdourCanvas::Group *);
-               ~Event ();
+               GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+               virtual ~GhostEvent ();
 
-               ArdourCanvas::CanvasNoteEvent* event;
-               ArdourCanvas::SimpleRect* rect;
+               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();
 
        void set_height();
-       void set_samples_per_unit(double spu);
+       void set_samples_per_pixel (double spu);
        void set_colors();
 
-       void update_range();
+       void update_contents_height();
 
-       void add_note(ArdourCanvas::CanvasNote*);
-       void update_note (ArdourCanvas::CanvasNote *);
-       void remove_note (ArdourCanvas::CanvasNoteEvent *);
+       void add_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::Event* find_event (ArdourCanvas::CanvasNoteEvent *);
+       MidiRegionView& parent_mrv;
+       typedef Evoral::Note<Temporal::Beats> NoteType;
+       MidiGhostRegion::GhostEvent* find_event (boost::shared_ptr<NoteType>);
 
-       typedef std::list<MidiGhostRegion::Event*> EventList;
+       typedef boost::unordered_map<boost::shared_ptr<NoteType>, MidiGhostRegion::GhostEvent* > EventList;
        EventList events;
        EventList::iterator _optimization_iterator;
 };