X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=c689a15e7d3c05b7539b5c21084b59f8a073d212;hb=244313f43fc3178fb8f58b01fc6ba125115062ad;hp=ac16a28bf4a2d5b5a6644ba54970a07dbda2adf5;hpb=c0b59854ff2feb3e727c8014e7f30cbc00b22497;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index ac16a28bf4..c689a15e7d 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -26,20 +25,21 @@ #include #include "ardour/playlist.h" -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" +#include "ardour/profile.h" #include "ardour/session.h" -#include "ardour_ui.h" -#include "global_signals.h" -#include "canvas-noevent-text.h" +#include "canvas/polygon.h" +#include "canvas/debug.h" +#include "canvas/pixbuf.h" +#include "canvas/text.h" +#include "canvas/line.h" +#include "canvas/utils.h" +#include "canvas/colors.h" + #include "streamview.h" #include "region_view.h" #include "automation_region_view.h" #include "route_time_axis.h" -#include "simplerect.h" -#include "simpleline.h" -#include "waveview.h" #include "public_editor.h" #include "region_editor.h" #include "ghostregion.h" @@ -49,10 +49,11 @@ #include "rgb_macros.h" #include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; using namespace Gtk; @@ -62,15 +63,16 @@ static const int32_t sync_mark_width = 9; PBD::Signal1 RegionView::RegionViewGoingAway; -RegionView::RegionView (ArdourCanvas::Group* parent, +RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, boost::shared_ptr r, double spu, - Gdk::Color const & basic_color, - bool automation) + uint32_t basic_color, + bool automation) : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation, - TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText| - TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame)) + (automation ? TimeAxisViewItem::ShowFrame : + TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText| + TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame))) , _region (r) , sync_mark(0) , sync_line(0) @@ -81,19 +83,14 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) - , _silence_text (0) - , _region_relative_time_converter(r->session().tempo_map(), r->position()) - , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) + , _silence_text (0) { - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other) : sigc::trackable(other) , TimeAxisViewItem (other) - , _silence_text (0) - , _region_relative_time_converter(other.region_relative_time_converter()) - , _source_relative_time_converter(other.source_relative_time_converter()) + , _silence_text (0) { /* derived concrete type will call init () */ @@ -101,16 +98,12 @@ RegionView::RegionView (const RegionView& other) current_visible_sync_position = other.current_visible_sync_position; valid = false; _pixel_width = other._pixel_width; - - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other, boost::shared_ptr other_region) : sigc::trackable(other) , TimeAxisViewItem (other) - , _silence_text (0) - , _region_relative_time_converter(other_region->session().tempo_map(), other_region->position()) - , _source_relative_time_converter(other_region->session().tempo_map(), other_region->position() - other_region->start()) + , _silence_text (0) { /* this is a pseudo-copy constructor used when dragging regions around on the canvas. @@ -122,17 +115,15 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr other current_visible_sync_position = other.current_visible_sync_position; valid = false; _pixel_width = other._pixel_width; - - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); } -RegionView::RegionView (ArdourCanvas::Group* parent, - TimeAxisView& tv, +RegionView::RegionView (ArdourCanvas::Container* parent, + TimeAxisView& tv, boost::shared_ptr r, - double spu, - Gdk::Color const & basic_color, - bool recording, - TimeAxisViewItem::Visibility visibility) + double spu, + uint32_t basic_color, + bool recording, + TimeAxisViewItem::Visibility visibility) : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, false, visibility) , _region (r) , sync_mark(0) @@ -144,14 +135,12 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _pixel_width(1.0) , in_destructor(false) , wait_for_data(false) - , _silence_text (0) - , _region_relative_time_converter(r->session().tempo_map(), r->position()) - , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) + , _silence_text (0) { } void -RegionView::init (Gdk::Color const & basic_color, bool wfd) +RegionView::init (bool wfd) { editor = 0; valid = true; @@ -162,45 +151,42 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) sync_mark = 0; sync_line = 0; - compute_colors (basic_color); - if (name_highlight) { name_highlight->set_data ("regionview", this); - name_highlight->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); + name_highlight->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); + } - if (frame_handle_start) { - frame_handle_start->set_data ("regionview", this); - frame_handle_start->set_data ("isleft", (void*) 1); - frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); - frame_handle_start->raise_to_top(); - } + if (frame_handle_start) { + frame_handle_start->set_data ("regionview", this); + frame_handle_start->set_data ("isleft", (void*) 1); + frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); + frame_handle_start->raise_to_top(); + } - if (frame_handle_end) { - frame_handle_end->set_data ("regionview", this); - frame_handle_end->set_data ("isleft", (void*) 0); - frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); - frame_handle_end->raise_to_top(); - } + if (frame_handle_end) { + frame_handle_end->set_data ("regionview", this); + frame_handle_end->set_data ("isleft", (void*) 0); + frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + frame_handle_end->raise_to_top(); } - if (name_pixbuf) { - name_pixbuf->set_data ("regionview", this); - name_pixbuf->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_pixbuf, this)); + if (name_text) { + name_text->set_data ("regionview", this); + name_text->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_text, this)); } if (wfd) { _enable_display = true; } - set_height (trackview.current_height()); - - _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context()); + /* derived class calls set_height () including RegionView::set_height() in ::init() */ + //set_height (trackview.current_height()); - group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); + _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context()); - set_colors (); - - ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); + /* 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? */ } @@ -213,7 +199,7 @@ RegionView::~RegionView () delete *g; } - for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { delete *i; } @@ -222,6 +208,15 @@ RegionView::~RegionView () delete editor; } +bool +RegionView::canvas_group_event (GdkEvent* event) +{ + if (!in_destructor) { + return trackview.editor().canvas_region_view_event (event, group, this); + } + return false; +} + void RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/) { @@ -234,21 +229,22 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr return; } - uint32_t const color = ARDOUR_UI::config()->canvasvar_Silence.get(); + uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence"); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { - ArdourCanvas::SimpleRect* cr = new ArdourCanvas::SimpleRect (*group); + ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group); + cr->set_ignore_events (true); _silent_frames.push_back (cr); /* coordinates for the rect are relative to the regionview origin */ - cr->property_x1() = trackview.editor().frame_to_pixel (i->first - _region->start()); - cr->property_x2() = trackview.editor().frame_to_pixel (i->second - _region->start()); - cr->property_y1() = 1; - cr->property_y2() = _height - 2; - cr->property_outline_pixels() = 0; - cr->property_fill_color_rgba () = color; + cr->set_x0 (trackview.editor().sample_to_pixel (i->first - _region->start())); + cr->set_x1 (trackview.editor().sample_to_pixel (i->second - _region->start())); + cr->set_y0 (1); + cr->set_y1 (_height - 2); + cr->set_outline (false); + cr->set_fill_color (color); shortest = min (shortest, i->second - i->first); } @@ -271,15 +267,15 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr shortest_audible = min (shortest_audible, dur); } - _silence_text = new ArdourCanvas::NoEventText (*group); - _silence_text->property_font_desc() = get_font_for_style (N_("SilenceText")); - _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get(); - _silence_text->property_anchor() = ANCHOR_NW; + _silence_text = new ArdourCanvas::Text (group); + _silence_text->set_ignore_events (true); + _silence_text->set_font_description (get_font_for_style (N_("SilenceText"))); + _silence_text->set_color (UIConfiguration::instance().color ("silence text")); /* both positions are relative to the region start offset in source */ - _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0; - _silence_text->property_y() = 20.0; + _silence_text->set_x_position (trackview.editor().sample_to_pixel (silences.front().first - _region->start()) + 10.0); + _silence_text->set_y_position (20.0); double ms = (float) shortest/_region->session().frame_rate(); @@ -319,13 +315,13 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits); } - _silence_text->property_text() = text.c_str (); + _silence_text->set (text); } void RegionView::hide_silent_frames () { - for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { (*i)->hide (); } _silence_text->hide(); @@ -334,7 +330,7 @@ RegionView::hide_silent_frames () void RegionView::drop_silent_frames () { - for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { delete *i; } _silent_frames.clear (); @@ -403,11 +399,6 @@ RegionView::region_resized (const PropertyChange& what_changed) if (what_changed.contains (ARDOUR::Properties::position)) { set_position (_region->position(), 0); - _region_relative_time_converter.set_origin_b (_region->position()); - } - - if (what_changed.contains (ARDOUR::Properties::start) || what_changed.contains (ARDOUR::Properties::position)) { - _source_relative_time_converter.set_origin_b (_region->position() - _region->start()); } PropertyChange s_and_l; @@ -418,7 +409,7 @@ RegionView::region_resized (const PropertyChange& what_changed) set_duration (_region->length(), 0); - unit_length = _region->length() / samples_per_unit; + unit_length = _region->length() / samples_per_pixel; for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { @@ -476,7 +467,7 @@ RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored) if (delta) { for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->group->move (delta, 0.0); + (*i)->group->move (ArdourCanvas::Duple (delta, 0.0)); } } @@ -484,13 +475,13 @@ RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored) } void -RegionView::set_samples_per_unit (gdouble spu) +RegionView::set_samples_per_pixel (double fpp) { - TimeAxisViewItem::set_samples_per_unit (spu); + TimeAxisViewItem::set_samples_per_pixel (fpp); for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_samples_per_unit (spu); - (*i)->set_duration (_region->length() / samples_per_unit); + (*i)->set_samples_per_pixel (fpp); + (*i)->set_duration (_region->length() / fpp); } region_sync_changed (); @@ -504,7 +495,7 @@ RegionView::set_duration (framecnt_t frames, void *src) } for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_duration (_region->length() / samples_per_unit); + (*i)->set_duration (_region->length() / samples_per_pixel); } return true; @@ -514,35 +505,33 @@ void RegionView::set_colors () { TimeAxisViewItem::set_colors (); - - if (sync_mark) { - sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour - sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour - } + set_sync_mark_color (); } void -RegionView::set_frame_color () +RegionView::set_sync_mark_color () { - if (_region->opaque()) { - fill_opacity = 130; - } else { - fill_opacity = 60; + if (sync_mark) { + ArdourCanvas::Color c = UIConfiguration::instance().color ("sync mark"); + sync_mark->set_fill_color (c); + sync_mark->set_outline_color (c); + sync_line->set_outline_color (c); } - - TimeAxisViewItem::set_frame_color (); } -void -RegionView::fake_set_opaque (bool yn) +uint32_t +RegionView::get_fill_color () const { - if (yn) { - fill_opacity = 130; - } else { - fill_opacity = 60; - } + ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); + char const *modname; - set_frame_color (); + if (_region->opaque() && (!ARDOUR::Profile->get_mixbus() || (!_dragging && !_region->muted ()))) { + modname = "opaque region base"; + } else { + modname = "transparent region base"; + } + + return HSV(f).mod (UIConfiguration::instance().modifier (modname)).color (); } void @@ -579,6 +568,10 @@ RegionView::make_name () const str += '{'; str += _region->name(); str += '}'; + } else if (_region->video_locked()) { + str += '['; + str += _region->name(); + str += ']'; } else { str = _region->name(); } @@ -597,7 +590,6 @@ RegionView::region_renamed () set_item_name (str, this); set_name_text (str); - reset_width_dependent_items (_pixel_width); } void @@ -621,15 +613,15 @@ RegionView::region_sync_changed () /* points set below */ - sync_mark = new ArdourCanvas::Polygon (*group); - sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour + sync_mark = new ArdourCanvas::Polygon (group); + CANVAS_DEBUG_NAME (sync_mark, string_compose ("sync mark for %1", get_item_name())); + sync_line = new ArdourCanvas::Line (group); + CANVAS_DEBUG_NAME (sync_line, string_compose ("sync mark for %1", get_item_name())); - sync_line = new ArdourCanvas::Line (*group); - sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour - sync_line->property_width_pixels() = 1; + set_sync_mark_color (); } - /* this has to handle both a genuine change of position, a change of samples_per_unit, + /* this has to handle both a genuine change of position, a change of samples_per_pixel and a change in the bounds of the _region-> */ @@ -657,19 +649,15 @@ RegionView::region_sync_changed () //points = sync_mark->property_points().get_value(); - double offset = sync_offset / samples_per_unit; - points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); - points.push_back (Gnome::Art::Point (offset + ((sync_mark_width-1)/2), 1)); - points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1)); - points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); - sync_mark->property_points().set_value (points); + double offset = sync_offset / samples_per_pixel; + points.push_back (ArdourCanvas::Duple (offset - ((sync_mark_width-1)/2), 1)); + points.push_back (ArdourCanvas::Duple (offset + ((sync_mark_width-1)/2), 1)); + points.push_back (ArdourCanvas::Duple (offset, sync_mark_width - 1)); + points.push_back (ArdourCanvas::Duple (offset - ((sync_mark_width-1)/2), 1)); + sync_mark->set (points); sync_mark->show (); - points.clear (); - points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); - - sync_line->property_points().set_value (points); + sync_line->set (ArdourCanvas::Duple (offset, 0), ArdourCanvas::Duple (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); sync_line->show (); } } @@ -682,12 +670,23 @@ RegionView::move (double x_delta, double y_delta) return; } - get_canvas_group()->move (x_delta, y_delta); + /* items will not prevent Item::move() moving + * them to a negative x-axis coordinate, which + * is legal, but we don't want that here. + */ + + ArdourCanvas::Item *item = get_canvas_group (); + + if (item->position().x + x_delta < 0) { + x_delta = -item->position().x; /* move it to zero */ + } + + item->move (ArdourCanvas::Duple (x_delta, y_delta)); /* note: ghosts never leave their tracks so y_delta for them is always zero */ for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->group->move (x_delta, 0.0); + (*i)->group->move (ArdourCanvas::Duple (x_delta, 0.0)); } } @@ -717,12 +716,6 @@ RegionView::remove_ghost (GhostRegion* ghost) } } -uint32_t -RegionView::get_fill_color () -{ - return fill_color; -} - void RegionView::set_height (double h) { @@ -733,19 +726,20 @@ RegionView::set_height (double h) int sync_dir; framecnt_t sync_offset; sync_offset = _region->sync_offset (sync_dir); - double offset = sync_offset / samples_per_unit; + double offset = sync_offset / samples_per_pixel; - points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, h - NAME_HIGHLIGHT_SIZE)); - sync_line->property_points().set_value (points); + sync_line->set ( + ArdourCanvas::Duple (offset, 0), + ArdourCanvas::Duple (offset, h - NAME_HIGHLIGHT_SIZE) + ); } - for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { - (*i)->property_y2() = h + 1; + for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { + (*i)->set_y1 (h + 1); } - for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { - (*i)->property_y2() = h + 1; + for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { + (*i)->set_y1 (h + 1); } } @@ -756,7 +750,7 @@ void RegionView::update_coverage_frames (LayerDisplay d) { /* remove old coverage frames */ - for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { delete *i; } @@ -776,11 +770,12 @@ RegionView::update_coverage_frames (LayerDisplay d) framepos_t t = position; framepos_t const end = _region->last_frame (); - ArdourCanvas::SimpleRect* cr = 0; + ArdourCanvas::Rectangle* 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 = UIConfiguration::instance().color_mod ("covered region", "covered region base"); + while (t < end) { @@ -788,35 +783,38 @@ RegionView::update_coverage_frames (LayerDisplay d) /* 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->property_x2() = trackview.editor().frame_to_pixel (t - position); + cr->set_x1 (trackview.editor().sample_to_pixel (t - position)); } /* start off any new rect, if required */ if (cr == 0 || me != new_me) { - cr = new ArdourCanvas::SimpleRect (*group); + cr = new ArdourCanvas::Rectangle (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; + cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); + cr->set_y0 (1); + cr->set_y1 (_height + 1); + cr->set_outline (false); + cr->set_ignore_events (true); if (new_me) { - alpha /= 2; + cr->set_fill_color (UINT_RGBA_CHANGE_A (non_playing_color, 0)); + } else { + cr->set_fill_color (non_playing_color); } - cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (color, alpha); } - t = pl->find_next_region_boundary (t, 1); + if (t < 0) { + break; + } me = new_me; } + t = pl->find_next_region_boundary (t, 1); + if (cr) { /* finish off the last rectangle */ - cr->property_x2() = trackview.editor().frame_to_pixel (end - position); + cr->set_x1 (trackview.editor().sample_to_pixel (end - position)); } if (frame_handle_start) { @@ -831,16 +829,16 @@ RegionView::update_coverage_frames (LayerDisplay d) name_highlight->raise_to_top (); } - if (name_pixbuf) { - name_pixbuf->raise_to_top (); + if (name_text) { + name_text->raise_to_top (); } } -void -RegionView::trim_front (framepos_t new_bound, bool no_overlap) +bool +RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -848,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. @@ -868,13 +872,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 -RegionView::trim_end (framepos_t new_bound, bool no_overlap) +bool +RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -882,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. @@ -897,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); @@ -905,6 +911,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 } @@ -920,57 +928,38 @@ RegionView::thaw_after_trim () void -RegionView::trim_contents (framepos_t frame_delta, bool left_direction, bool swap_direction) +RegionView::move_contents (frameoffset_t distance) { if (_region->locked()) { return; } - - framepos_t new_bound; - - RouteTimeAxisView& rtv = dynamic_cast (trackview); - double const speed = rtv.track()->speed (); - - if (left_direction) { - if (swap_direction) { - new_bound = (framepos_t) (_region->position() / speed) + frame_delta; - } else { - new_bound = (framepos_t) (_region->position() / speed) - frame_delta; - } - } else { - if (swap_direction) { - new_bound = (framepos_t) (_region->position() / speed) - frame_delta; - } else { - new_bound = (framepos_t) (_region->position() / speed) + frame_delta; - } - } - - _region->trim_start ((framepos_t) (new_bound * speed)); + _region->move_start (distance); 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. + * @param ensure_snap whether to ignore snap_mode (in the case of SnapOff) and magnetic snap. + * Used when inverting snap mode logic with key modifiers, or snap distance calculation. * @return Snapped frame offset from this region's position. */ -frameoffset_t -RegionView::snap_frame_to_frame (frameoffset_t x) const +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; - editor.snap_to (frame, 0); + 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; - editor.snap_to (frame, 1); + 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); }