X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fregion_view.cc;h=c689a15e7d3c05b7539b5c21084b59f8a073d212;hb=af2ee3c8564c7d60cadb130b8c7ad1f4cddd2216;hp=8f863a90d7aac7495b36c326e8cd0e261e07d16e;hpb=e82c997b3d021863e67ad04ab1cc9b11c1100c2d;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 8f863a90d7..c689a15e7d 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -25,6 +25,7 @@ #include #include "ardour/playlist.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "canvas/polygon.h" @@ -48,7 +49,7 @@ #include "rgb_macros.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -178,12 +179,13 @@ RegionView::init (bool wfd) _enable_display = true; } - set_height (trackview.current_height()); + /* derived class calls set_height () including RegionView::set_height() in ::init() */ + //set_height (trackview.current_height()); _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context()); - set_colors (); - + /* derived class calls set_colors () including RegionView::set_colors() in ::init() */ + //set_colors (); UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); /* XXX sync mark drag? */ @@ -523,7 +525,7 @@ RegionView::get_fill_color () const ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); char const *modname; - if (_region->opaque()) { + if (_region->opaque() && (!ARDOUR::Profile->get_mixbus() || (!_dragging && !_region->muted ()))) { modname = "opaque region base"; } else { modname = "transparent region base"; @@ -588,7 +590,6 @@ RegionView::region_renamed () set_item_name (str, this); set_name_text (str); - reset_width_dependent_items (_pixel_width); } void @@ -775,13 +776,13 @@ RegionView::update_coverage_frames (LayerDisplay d) /* the color that will be used to show parts of regions that will not be heard */ uint32_t const non_playing_color = UIConfiguration::instance().color_mod ("covered region", "covered region base"); + while (t < end) { t++; /* is this region is on top at time t? */ bool const new_me = (pl->top_unmuted_region_at (t) == _region); - /* finish off any old rect, if required */ if (cr && me != new_me) { cr->set_x1 (trackview.editor().sample_to_pixel (t - position)); @@ -802,7 +803,6 @@ RegionView::update_coverage_frames (LayerDisplay d) cr->set_fill_color (non_playing_color); } } - t = pl->find_next_region_boundary (t, 1); if (t < 0) { break; @@ -810,6 +810,8 @@ RegionView::update_coverage_frames (LayerDisplay d) me = new_me; } + t = pl->find_next_region_boundary (t, 1); + if (cr) { /* finish off the last rectangle */ cr->set_x1 (trackview.editor().sample_to_pixel (end - position)); @@ -833,7 +835,7 @@ RegionView::update_coverage_frames (LayerDisplay d) } bool -RegionView::trim_front (framepos_t new_bound, bool no_overlap) +RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { return false; @@ -844,7 +846,13 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap) framepos_t const pre_trim_first_frame = _region->first_frame(); - _region->trim_front ((framepos_t) (new_bound * speed)); + const framepos_t speed_bound = (framepos_t) (new_bound * speed); + + if (_region->position() == speed_bound) { + return false; + } + + _region->trim_front (speed_bound, sub_num); if (no_overlap) { // Get the next region on the left of this region and shrink/expand it. @@ -869,7 +877,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap) } bool -RegionView::trim_end (framepos_t new_bound, bool no_overlap) +RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { return false; @@ -880,7 +888,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap) framepos_t const pre_trim_last_frame = _region->last_frame(); - _region->trim_end ((framepos_t) (new_bound * speed)); + _region->trim_end ((framepos_t) (new_bound * speed), sub_num); if (no_overlap) { // Get the next region on the right of this region and shrink/expand it. @@ -895,7 +903,7 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap) // Only trim region on the right if the last frame has gone beyond the right region's first frame. if (region_right != 0 && (region_right->first_frame() < _region->last_frame() || regions_touching)) { - region_right->trim_front (_region->last_frame() + 1); + region_right->trim_front (_region->last_frame() + 1, sub_num); } region_changed (ARDOUR::bounds_change); @@ -935,24 +943,23 @@ RegionView::move_contents (frameoffset_t distance) * Used when inverting snap mode logic with key modifiers, or snap distance calculation. * @return Snapped frame offset from this region's position. */ -frameoffset_t +MusicFrame RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) 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; + MusicFrame frame (session_frame, 0); editor.snap_to (frame, RoundNearest, false, ensure_snap); /* if we went off the beginning of the region, snap forwards */ - if (frame < _region->position ()) { - frame = session_frame; + if (frame.frame < _region->position ()) { + frame.frame = session_frame; editor.snap_to (frame, RoundUpAlways, false, ensure_snap); } - /* back to region relative */ - return frame - _region->position(); + /* back to region relative, keeping the relevant divisor */ + return MusicFrame (frame.frame - _region->position(), frame.division); }