notably modify the design and logic of the startup dialog, so that we can handle...

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 4db77f030dee75bddc5011506d76e3c820cd40c8..312666c18a7a0965f0f60b1d56300082d4197493 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -26,13 +26,12 @@
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/playlist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
 #include "ardour/session.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
 #include "canvas-noevent-text.h"
+#include "canvas-noevent-rect.h"
 #include "streamview.h"
 #include "region_view.h"
 #include "automation_region_view.h"
@@ -85,7 +84,7 @@ RegionView::RegionView (ArdourCanvas::Group*              parent,
        , _region_relative_time_converter(r->session().tempo_map(), r->position())
        , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start())
 {
-       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other)
@@ -102,7 +101,7 @@ RegionView::RegionView (const RegionView& other)
        valid = false;
        _pixel_width = other._pixel_width;
 
-       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
@@ -123,7 +122,7 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other
        valid = false;
        _pixel_width = other._pixel_width;
 
-       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context());
+       GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context());
 }
 
 RegionView::RegionView (ArdourCanvas::Group*         parent,
@@ -194,7 +193,7 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd)
 
        set_height (trackview.current_height());
 
-       _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context());
+       _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context());
 
        group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this));
 
@@ -238,7 +237,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr
 
        for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) {
 
-               ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group);
+               ArdourCanvas::SimpleRect* cr = new ArdourCanvas::NoEventSimpleRect (*group);
                _silent_frames.push_back (cr);
 
                /* coordinates for the rect are relative to the regionview origin */
@@ -780,7 +779,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
        bool me = false;
 
        /* the color that will be used to show parts of regions that will not be heard */
-       uint32_t non_playing_color = RGBA_TO_UINT (32, 32, 32, 192);
+       uint32_t const non_playing_color = ARDOUR_UI::config()->canvasvar_CoveredRegion.get ();
 
        while (t < end) {
 
@@ -796,7 +795,7 @@ RegionView::update_coverage_frames (LayerDisplay d)
 
                /* start off any new rect, if required */
                if (cr == 0 || me != new_me) {
-                       cr = new ArdourCanvas::SimpleRect (*group);
+                       cr = new ArdourCanvas::NoEventSimpleRect (*group);
                        _coverage_frames.push_back (cr);
                        cr->property_x1() = trackview.editor().frame_to_pixel (t - position);
                        cr->property_y1() = 1;