redraw entire MidiStreamView after scroomer drag so that everything is redrawn

[ardour.git] / gtk2_ardour / ghostregion.cc

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index caab67ef44e55ae24cc38940564d838030c3dd9e..5350a0e4597f4b3c58648a8f6514a1735f9df0d3 100644 (file)
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -21,6 +21,8 @@
 #include "canvas/group.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"
@@ -41,9 +43,11 @@ GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxi
        , source_trackview (source_tv)
 {
        group = new ArdourCanvas::Group (parent);
+       CANVAS_DEBUG_NAME (group, "ghost region group");
        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());
@@ -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());
        }
 }
 
@@ -108,10 +112,10 @@ AudioGhostRegion::AudioGhostRegion(TimeAxisView& tv, TimeAxisView& source_tv, do
 }
 
 void
-AudioGhostRegion::set_frames_per_pixel (double fpp)
+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());
        }
 }
 
@@ -191,6 +195,7 @@ MidiGhostRegion::GhostEvent::GhostEvent (NoteBase* e, ArdourCanvas::Group* g)
        : event (e)
 {
        rect = new ArdourCanvas::Rectangle (g, ArdourCanvas::Rect (e->x0(), e->y0(), e->x1(), e->y1()));
+       CANVAS_DEBUG_NAME (rect, "ghost note rect");
 }
 
 MidiGhostRegion::GhostEvent::~GhostEvent ()
@@ -200,7 +205,7 @@ MidiGhostRegion::GhostEvent::~GhostEvent ()
 }
 
 void
-MidiGhostRegion::set_frames_per_pixel (double /*spu*/)
+MidiGhostRegion::set_samples_per_pixel (double /*spu*/)
 {
 }
 
@@ -232,7 +237,7 @@ MidiGhostRegion::set_colors()
 
        for (EventList::iterator it = events.begin(); it != events.end(); ++it) {
                (*it)->rect->set_fill_color (fill);
-               (*it)->rect->set_outline_color (ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get());
+               (*it)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
        }
 }
 
@@ -268,7 +273,7 @@ MidiGhostRegion::add_note (NoteBase* n)
        events.push_back (event);
 
        event->rect->set_fill_color (source_track_color(200));
-       event->rect->set_outline_color (ARDOUR_UI::config()->canvasvar_GhostTrackMidiOutline.get());
+       event->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_GhostTrackMidiOutline());
 
        MidiStreamView* mv = midi_view();