midi ghost region fill colour is per event. don't store it. ensure _outline is set.

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 8b9f0d10931073d905569f2795c4c90cfc1f48ee..a46ab8fe111825ecc656312b160935aafc4fd4ea 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,29 +21,31 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
-#include <sigc++/signal.h>
-#include <libgnomecanvasmm.h>
-#include "canvas.h"
-
-namespace Gnome {
-       namespace Canvas {
-               class CanvasNoteEvent;
-               class CanvasNote;
-               class CanvasHit;
-               class Diamond;
-       }
+#include "pbd/signals.h"
+
+namespace ArdourCanvas {
+       class WaveView;
 }
 
+class NoteBase;
+class Note;
+class Hit;
 class MidiStreamView;
 class TimeAxisView;
+class RegionView;
 
-class GhostRegion : public sigc::trackable 
+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,19 +54,23 @@ public:
        guint source_track_color(unsigned char alpha = 0xff);
        bool is_automation_ghost();
 
-       sigc::signal<void,GhostRegion*> GoingAway;
-
+       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;
+       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();
 
@@ -73,52 +79,50 @@ public:
 
 class MidiGhostRegion : public GhostRegion {
 public:
-       class Event : public sigc::trackable {
-       public:
-               Event(ArdourCanvas::CanvasNoteEvent*);
-               virtual ~Event() {}
+       class GhostEvent : public sigc::trackable {
+         public:
+           GhostEvent(::NoteBase *, ArdourCanvas::Container *);
+           virtual ~GhostEvent ();
 
-               virtual void x_changed() = 0;
-               ArdourCanvas::CanvasNoteEvent* event;
+           NoteBase* event;
+           ArdourCanvas::Item* item;
        };
 
-       class Note : public Event {
-       public:
-               Note(ArdourCanvas::CanvasNote*, ArdourCanvas::Group*);
-               ~Note();
-
-               void x_changed();
-               ArdourCanvas::SimpleRect* rect;
-       };
+       MidiGhostRegion(RegionView& rv,
+                       TimeAxisView& tv,
+                       TimeAxisView& source_tv,
+                       double initial_unit_pos);
 
-       class Hit : public Event {
-       public:
-               Hit(ArdourCanvas::CanvasHit*, ArdourCanvas::Group*);
-               ~Hit();
+       MidiGhostRegion(RegionView& rv,
+                       MidiStreamView& msv,
+                       TimeAxisView& source_tv,
+                       double initial_unit_pos);
 
-               void x_changed();
-               ArdourCanvas::Diamond* diamond;
-       };
-       
-       MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
-       MidiGhostRegion(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 add_note(ArdourCanvas::CanvasNote*);
-       void add_hit(ArdourCanvas::CanvasHit*);
+       void add_note(NoteBase*);
+       void update_note (Note*);
+       void update_hit (Hit*);
+       void remove_note (NoteBase*);
 
        void clear_events();
 
-       typedef std::list<MidiGhostRegion::Event*> EventList;
+private:
+       ArdourCanvas::Color _outline;
+
+       MidiGhostRegion::GhostEvent* find_event (NoteBase*);
+
+       typedef std::list<MidiGhostRegion::GhostEvent*> EventList;
        EventList events;
+       EventList::iterator _optimization_iterator;
 };
 
 #endif /* __ardour_gtk_ghost_region_h__ */