More consistent verbose cursor label style for PC flags.

[ardour.git] / gtk2_ardour / region_view.cc

diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index df264529347ca1cbb997669aefabfd753ef75f47..8ea84409ccc1ab75b7f20793fcf396b56c8aa63e 100644 (file)
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -26,14 +26,12 @@
 #include <gtkmm2ext/gtk_ui.h>
 
 #include "ardour/playlist.h"
-#include "ardour/audioregion.h"
-#include "ardour/audiosource.h"
-#include "ardour/audio_diskstream.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"
@@ -86,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)
@@ -103,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)
@@ -124,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,
@@ -195,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));
 
@@ -224,7 +222,7 @@ RegionView::~RegionView ()
 }
 
 void
-RegionView::set_silent_frames (const AudioIntervalResult& silences, double threshold)
+RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/)
 {
         framecnt_t shortest = max_framecnt;
 
@@ -239,7 +237,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double thres
 
        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,8 +778,8 @@ RegionView::update_coverage_frames (LayerDisplay d)
        ArdourCanvas::SimpleRect* cr = 0;
        bool me = false;
 
-       uint32_t const color = frame->property_fill_color_rgba ();
-       uint32_t const base_alpha = UINT_RGBA_A (color);
+       /* the color that will be used to show parts of regions that will not be heard */
+       uint32_t const non_playing_color = ARDOUR_UI::config()->canvasvar_CoveredRegion.get ();
 
        while (t < end) {
 
@@ -797,18 +795,17 @@ 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;
                        cr->property_y2() = _height + 1;
                        cr->property_outline_pixels() = 0;
-                       /* areas that will be played get a lower alpha */
-                       uint32_t alpha = base_alpha;
                        if (new_me) {
-                               alpha /= 2;
+                               cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (non_playing_color, 0);
+                       } else {
+                               cr->property_fill_color_rgba () = non_playing_color;
                        }
-                       cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (color, alpha);
                }
 
                t = pl->find_next_region_boundary (t, 1);
@@ -837,11 +834,11 @@ RegionView::update_coverage_frames (LayerDisplay d)
        }
 }
 
-void
+bool
 RegionView::trim_front (framepos_t new_bound, bool no_overlap)
 {
        if (_region->locked()) {
-               return;
+               return false;
        }
 
        RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
@@ -869,13 +866,15 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap)
        }
 
        region_changed (ARDOUR::bounds_change);
+
+       return (pre_trim_first_frame != _region->first_frame());  //return true if we actually changed something
 }
 
-void
+bool
 RegionView::trim_end (framepos_t new_bound, bool no_overlap)
 {
        if (_region->locked()) {
-               return;
+               return false;
        }
 
        RouteTimeAxisView& rtv = dynamic_cast<RouteTimeAxisView&> (trackview);
@@ -906,6 +905,8 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap)
        } else {
                region_changed (PropertyChange (ARDOUR::Properties::length));
        }
+
+       return (pre_trim_last_frame != _region->last_frame());  //return true if we actually changed something
 }
 
 
@@ -950,3 +951,28 @@ RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swa
        region_changed (PropertyChange (ARDOUR::Properties::start));
 }
 
+/** Snap a frame offset within our region using the current snap settings.
+ *  @param x Frame offset from this region's position.
+ *  @return Snapped frame offset from this region's position.
+ */
+frameoffset_t
+RegionView::snap_frame_to_frame (frameoffset_t x) const
+{
+       PublicEditor& editor = trackview.editor();
+
+       /* x is region relative, convert it to global absolute frames */
+       framepos_t const session_frame = x + _region->position();
+
+       /* try a snap in either direction */
+       framepos_t frame = session_frame;
+       editor.snap_to (frame, 0);
+
+       /* if we went off the beginning of the region, snap forwards */
+       if (frame < _region->position ()) {
+               frame = session_frame;
+               editor.snap_to (frame, 1);
+       }
+
+       /* back to region relative */
+       return frame - _region->position();
+}