tweak logic for region coloring, particularly when muted

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 384127150aa457cebffa201bb93546eb481980e1..e8271a8ad8aa6e947b69c16518198a89a51caf70 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -39,7 +39,7 @@ public:
        GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
        virtual ~GhostRegion();
 
-       virtual void set_frames_per_pixel (double) = 0;
+       virtual void set_samples_per_pixel (double) = 0;
        virtual void set_height();
        virtual void set_colors();
 
@@ -62,7 +62,7 @@ class AudioGhostRegion : public GhostRegion {
 public:
        AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
 
-       void set_frames_per_pixel (double);
+       void set_samples_per_pixel (double);
        void set_height();
        void set_colors();
 
@@ -72,12 +72,12 @@ public:
 class MidiGhostRegion : public GhostRegion {
 public:
        class GhostEvent : public sigc::trackable {
-       public:
+         public:
            GhostEvent(::NoteBase *, ArdourCanvas::Group *);
-           virtual ~GhostEvent () {}
-
-               NoteBase* event;
-               ArdourCanvas::Rectangle* rect;
+           virtual ~GhostEvent ();
+           
+           NoteBase* event;
+           ArdourCanvas::Rectangle* rect;
        };
 
        MidiGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos);
@@ -87,20 +87,20 @@ public:
        MidiStreamView* midi_view();
 
        void set_height();
-       void set_frames_per_pixel (double spu);
+       void set_samples_per_pixel (double spu);
        void set_colors();
 
        void update_range();
 
-       void add_note(Note*);
-       void update_note (Note*);
-       void remove_note (Note*);
+       void add_note(NoteBase*);
+       void update_note (NoteBase*);
+       void remove_note (NoteBase*);
 
        void clear_events();
 
 private:
 
-       MidiGhostRegion::Event* find_event (Note*);
+       MidiGhostRegion::GhostEvent* find_event (NoteBase*);
 
        typedef std::list<MidiGhostRegion::GhostEvent*> EventList;
        EventList events;