distinguish global peak-reset button from meters:

[ardour.git] / gtk2_ardour / ghostregion.cc

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index e21f77f654985b86c286730c73b8f8aab4b0879b..759ffb94d23a824823f5f8c682c5deda89559093 100644 (file)
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -18,9 +18,11 @@
 */
 
 #include "evoral/Note.hpp"
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/rectangle.h"
 #include "canvas/wave_view.h"
+#include "canvas/debug.h"
+
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
 #include "ghostregion.h"
@@ -36,18 +38,20 @@ using namespace ARDOUR;
 
 PBD::Signal1<void,GhostRegion*> GhostRegion::CatchDeletion;
 
-GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos)
+GhostRegion::GhostRegion (ArdourCanvas::Container* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos)
        : trackview (tv)
        , source_trackview (source_tv)
 {
-       group = new ArdourCanvas::Group (parent);
+       group = new ArdourCanvas::Container (parent);
+       CANVAS_DEBUG_NAME (group, "ghost region");
        group->set_position (ArdourCanvas::Duple (initial_pos, 0));
 
        base_rect = new ArdourCanvas::Rectangle (group);
+       CANVAS_DEBUG_NAME (base_rect, "ghost region rect");
        base_rect->set_x0 (0);
-       base_rect->set_y0 (0);
-       base_rect->set_y1 (trackview.current_height());
-       base_rect->set_outline_what (0);
+       base_rect->set_y0 (0.0);
+       base_rect->set_y1 (trackview.current_height() - 1.0);
+       base_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
 
        if (!is_automation_ghost()) {
                base_rect->hide();
@@ -83,8 +87,8 @@ void
 GhostRegion::set_colors ()
 {
        if (is_automation_ghost()) {
-               base_rect->set_outline_color (ARDOUR_UI::config()->canvasvar_GhostTrackBase.get());
-               base_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_GhostTrackBase.get());
+               base_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
+               base_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackBase());
        }
 }
 
@@ -107,11 +111,11 @@ AudioGhostRegion::AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, do
 
 }
 
-ovoid
-AudioGhostRegion::set_frames_per_pixel (double fpp)
+void
+AudioGhostRegion::set_samples_per_pixel (double fpp)
 {
        for (vector<WaveView*>::iterator i = waves.begin(); i != waves.end(); ++i) {
-               (*i)->set_frames_per_pixel (fpp);
+               (*i)->set_samples_per_pixel (fpp);
        }
 }
 
@@ -138,17 +142,17 @@ AudioGhostRegion::set_colors ()
        guint fill_color;
 
        if (is_automation_ghost()) {
-               fill_color = ARDOUR_UI::config()->canvasvar_GhostTrackWaveFill.get();
+               fill_color = ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveFill();
        }
        else {
                fill_color = source_track_color(200);
        }
 
        for (uint32_t n=0; n < waves.size(); ++n) {
-               waves[n]->set_outline_color (ARDOUR_UI::config()->canvasvar_GhostTrackWave.get());
+               waves[n]->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWave());
                waves[n]->set_fill_color (fill_color);
-               waves[n]->property_clip_color() = ARDOUR_UI::config()->canvasvar_GhostTrackWaveClip.get();
-               waves[n]->property_zero_color() = ARDOUR_UI::config()->canvasvar_GhostTrackZeroLine.get();
+               waves[n]->set_clip_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackWaveClip());
+               waves[n]->set_zero_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackZeroLine());
        }
 }
 
@@ -187,20 +191,21 @@ MidiGhostRegion::~MidiGhostRegion()
        clear_events ();
 }
 
-MidiGhostRegion::Event::Event (NoteBase* e, ArdourCanvas::Group* g)
+MidiGhostRegion::GhostEvent::GhostEvent (NoteBase* e, ArdourCanvas::Container* g)
        : event (e)
 {
-       rect = new ArdourCanvas::Rectangle (*g, e->x1(), e->y1(), e->x2(), e->y2());
+       rect = new ArdourCanvas::Rectangle (g, ArdourCanvas::Rect (e->x0(), e->y0(), e->x1(), e->y1()));
+       CANVAS_DEBUG_NAME (rect, "ghost note rect");
 }
 
-MidiGhostRegion::Event::~Event ()
+MidiGhostRegion::GhostEvent::~GhostEvent ()
 {
        /* event is not ours to delete */
        delete rect;
 }
 
 void
-MidiGhostRegion::set_frames_per_pixel (double /*spu*/)
+MidiGhostRegion::set_samples_per_pixel (double /*spu*/)
 {
 }
 
@@ -231,8 +236,8 @@ MidiGhostRegion::set_colors()
        GhostRegion::set_colors();
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
-               (*it)->rect->property_fill_color_rgba() = fill;
-               (*it)->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get();
+               (*it)->rect->set_fill_color (fill);
+               (*it)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
        }
 }
 
@@ -255,20 +260,20 @@ MidiGhostRegion::update_range ()
                } else {
                        (*it)->rect->show();
                        double const y = trackview.current_height() - (note_num + 1 - mv->lowest_note()) * h + 1;
-                       (*it)->rect->property_y1() = y;
-                       (*it)->rect->property_y2() = y + h;
+                       (*it)->rect->set_y0 (y);
+                       (*it)->rect->set_y1 (y + h);
                }
        }
 }
 
 void
-MidiGhostRegion::add_note(NoteBase* n)
+MidiGhostRegion::add_note (NoteBase* n)
 {
-       Event* event = new Event (n, group);
+       GhostEvent* event = new GhostEvent (n, group);
        events.push_back (event);
 
-       event->rect->property_fill_color_rgba() = source_track_color(200);
-       event->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get();
+       event->rect->set_fill_color (source_track_color(200));
+       event->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
 
        MidiStreamView* mv = midi_view();
 
@@ -279,8 +284,8 @@ MidiGhostRegion::add_note(NoteBase* n)
                        event->rect->hide();
                } else {
                        const double y = mv->note_to_y(note_num);
-                       event->rect->property_y1() = y;
-                       event->rect->property_y2() = y + mv->note_height();
+                       event->rect->set_y0 (y);
+                       event->rect->set_y1 (y + mv->note_height());
                }
        }
 }
@@ -300,9 +305,9 @@ MidiGhostRegion::clear_events()
  *  @param parent The CanvasNote from the parent MidiRegionView.
  */
 void
-MidiGhostRegion::update_note (Note* parent)
+MidiGhostRegion::update_note (NoteBase* parent)
 {
-       Event* ev = find_event (parent);
+       GhostEvent* ev = find_event (parent);
        if (!ev) {
                return;
        }
@@ -314,9 +319,9 @@ MidiGhostRegion::update_note (Note* parent)
 }
 
 void
-MidiGhostRegion::remove_note (ArdourCanvas::CanvasNoteEvent* note)
+MidiGhostRegion::remove_note (NoteBase* note)
 {
-       Event* ev = find_event (note);
+       GhostEvent* ev = find_event (note);
        if (!ev) {
                return;
        }
@@ -331,8 +336,8 @@ MidiGhostRegion::remove_note (ArdourCanvas::CanvasNoteEvent* note)
  *  @return Our Event, or 0 if not found.
  */
 
-MidiGhostRegion::Event *
-MidiGhostRegion::find_event (Note* parent)
+MidiGhostRegion::GhostEvent *
+MidiGhostRegion::find_event (NoteBase* parent)
 {
        /* we are using _optimization_iterator to speed up the common case where a caller
           is going through our notes in order.