fix up big clock aspect ratio; fix color handling in audio clocks

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index b2050996a67aff9a451ad51001392b0f881d197e..083f71b3e28c3f4c97572214d30726fc880abd96 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -37,7 +37,7 @@ namespace Gnome {
 class MidiStreamView;
 class TimeAxisView;
 
-class GhostRegion 
+class GhostRegion : public sigc::trackable
 {
 public:
        GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -52,12 +52,14 @@ public:
        guint source_track_color(unsigned char alpha = 0xff);
        bool is_automation_ghost();
 
+       /** 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*> GoingAway;
+       static PBD::Signal1<void,GhostRegion*> CatchDeletion;
 };
 
 class AudioGhostRegion : public GhostRegion {
@@ -75,31 +77,13 @@ class MidiGhostRegion : public GhostRegion {
 public:
        class Event : public sigc::trackable {
        public:
-               Event(ArdourCanvas::CanvasNoteEvent*);
-               virtual ~Event() {}
+               Event(ArdourCanvas::CanvasNoteEvent *, ArdourCanvas::Group *);
+               ~Event ();
 
-               virtual void x_changed() = 0;
                ArdourCanvas::CanvasNoteEvent* event;
-       };
-
-       class Note : public Event {
-       public:
-               Note(ArdourCanvas::CanvasNote*, ArdourCanvas::Group*);
-               ~Note();
-
-               void x_changed();
                ArdourCanvas::SimpleRect* rect;
        };
 
-       class Hit : public Event {
-       public:
-               Hit(ArdourCanvas::CanvasHit*, ArdourCanvas::Group*);
-               ~Hit();
-
-               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();
@@ -113,12 +97,18 @@ public:
        void update_range();
 
        void add_note(ArdourCanvas::CanvasNote*);
-       void add_hit(ArdourCanvas::CanvasHit*);
+       void update_note (ArdourCanvas::CanvasNote *);
+       void remove_note (ArdourCanvas::CanvasNoteEvent *);
 
        void clear_events();
 
+private:
+
+       MidiGhostRegion::Event* find_event (ArdourCanvas::CanvasNoteEvent *);
+
        typedef std::list<MidiGhostRegion::Event*> EventList;
        EventList events;
+       EventList::iterator _optimization_iterator;
 };
 
 #endif /* __ardour_gtk_ghost_region_h__ */