X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=d94c1fae64591a2fa30ad6c60f1491e63ade07bf;hb=d3404f36848c040820deba3dabaeedb006bd329d;hp=7ddca8b574824b101faa548dc5a9e859a47a4dca;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 7ddca8b574..d94c1fae64 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -25,15 +25,16 @@ #include #include "ardour/playlist.h" +#include "ardour/profile.h" #include "ardour/session.h" +#include "gtkmm2ext/colors.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" @@ -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; @@ -84,7 +85,6 @@ RegionView::RegionView (ArdourCanvas::Container* parent, , wait_for_data(false) , _silence_text (0) { - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other) @@ -98,8 +98,6 @@ 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), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other, boost::shared_ptr other_region) @@ -117,8 +115,6 @@ 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), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (ArdourCanvas::Container* parent, @@ -183,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? */ @@ -206,7 +203,7 @@ RegionView::~RegionView () delete *i; } - drop_silent_frames (); + drop_silent_frames (); delete editor; } @@ -223,16 +220,16 @@ RegionView::canvas_group_event (GdkEvent* event) void RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*threshold*/) { - framecnt_t shortest = max_framecnt; + framecnt_t shortest = max_framecnt; /* remove old silent frames */ - drop_silent_frames (); + drop_silent_frames (); - if (silences.empty()) { - return; - } + if (silences.empty()) { + return; + } - uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence"); + uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence"); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { @@ -253,7 +250,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr } /* Find shortest audible segment */ - framecnt_t shortest_audible = max_framecnt; + framecnt_t shortest_audible = max_framecnt; framecnt_t s = _region->start(); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { @@ -270,50 +267,50 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr shortest_audible = min (shortest_audible, dur); } - _silence_text = new ArdourCanvas::Text (group); + _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")); + _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 */ + /* both positions are relative to the region start offset in source */ - _silence_text->set_x_position (trackview.editor().sample_to_pixel (silences.front().first - _region->start()) + 10.0); - _silence_text->set_y_position (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(); + double ms = (float) shortest/_region->session().frame_rate(); - /* ms are now in seconds */ + /* ms are now in seconds */ - char const * sunits; + char const * sunits; - if (ms >= 60.0) { - sunits = _("minutes"); - ms /= 60.0; - } else if (ms < 1.0) { - sunits = _("msecs"); - ms *= 1000.0; - } else { - sunits = _("secs"); - } + if (ms >= 60.0) { + sunits = _("minutes"); + ms /= 60.0; + } else if (ms < 1.0) { + sunits = _("msecs"); + ms *= 1000.0; + } else { + sunits = _("secs"); + } string text = string_compose (ngettext ("%1 silent segment", "%1 silent segments", silences.size()), silences.size()) + ", " + string_compose (_("shortest = %1 %2"), ms, sunits); - if (shortest_audible != max_framepos) { - /* ms are now in seconds */ - double ma = (float) shortest_audible / _region->session().frame_rate(); - char const * aunits; - - if (ma >= 60.0) { - aunits = _("minutes"); - ma /= 60.0; - } else if (ma < 1.0) { - aunits = _("msecs"); - ma *= 1000.0; - } else { - aunits = _("secs"); - } + if (shortest_audible != max_framepos) { + /* ms are now in seconds */ + double ma = (float) shortest_audible / _region->session().frame_rate(); + char const * aunits; + + if (ma >= 60.0) { + aunits = _("minutes"); + ma /= 60.0; + } else if (ma < 1.0) { + aunits = _("msecs"); + ma *= 1000.0; + } else { + aunits = _("secs"); + } text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits); } @@ -325,9 +322,9 @@ void RegionView::hide_silent_frames () { for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { - (*i)->hide (); + (*i)->hide (); } - _silence_text->hide(); + _silence_text->hide(); } void @@ -336,10 +333,10 @@ RegionView::drop_silent_frames () for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { delete *i; } - _silent_frames.clear (); + _silent_frames.clear (); - delete _silence_text; - _silence_text = 0; + delete _silence_text; + _silence_text = 0; } gint @@ -380,16 +377,15 @@ RegionView::region_changed (const PropertyChange& what_changed) if (what_changed.contains (ARDOUR::Properties::name)) { region_renamed (); } + if (what_changed.contains (ARDOUR::Properties::position_lock_style)) { + region_renamed (); + } if (what_changed.contains (ARDOUR::Properties::sync_position)) { region_sync_changed (); } if (what_changed.contains (ARDOUR::Properties::locked)) { region_locked (); } - if (what_changed.contains (ARDOUR::Properties::locked)) { - /* name will show locked status */ - region_renamed (); - } } void @@ -519,7 +515,7 @@ void RegionView::set_sync_mark_color () { if (sync_mark) { - ArdourCanvas::Color c = UIConfiguration::instance().color ("sync mark"); + Gtkmm2ext::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); @@ -529,16 +525,16 @@ RegionView::set_sync_mark_color () uint32_t RegionView::get_fill_color () const { - ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); + Gtkmm2ext::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"; } - return HSV(f).mod (UIConfiguration::instance().modifier (modname)).color (); + return Gtkmm2ext::HSV(f).mod (UIConfiguration::instance().modifier (modname)).color (); } void @@ -566,21 +562,22 @@ RegionView::make_name () const std::string str; // XXX nice to have some good icons for this + if (_region->position_lock_style() == MusicTime) { + str += "\u266B"; // BEAMED EIGHTH NOTES + } if (_region->locked()) { - str += '>'; + str += "\u2629"; // CROSS OF JERUSALEM str += _region->name(); - str += '<'; } else if (_region->position_locked()) { - str += '{'; + str += "\u21B9"; // LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR str += _region->name(); - str += '}'; } else if (_region->video_locked()) { str += '['; str += _region->name(); str += ']'; } else { - str = _region->name(); + str += _region->name(); } if (_region->muted()) { @@ -597,7 +594,6 @@ RegionView::region_renamed () set_item_name (str, this); set_name_text (str); - reset_width_dependent_items (_pixel_width); } void @@ -784,13 +780,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)); @@ -811,11 +807,15 @@ 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; + } 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)); @@ -839,18 +839,19 @@ 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; } - RouteTimeAxisView& rtv = dynamic_cast (trackview); - double const speed = rtv.track()->speed (); - framepos_t const pre_trim_first_frame = _region->first_frame(); - _region->trim_front ((framepos_t) (new_bound * speed)); + if (_region->position() == new_bound) { + return false; + } + + _region->trim_front (new_bound, sub_num); if (no_overlap) { // Get the next region on the left of this region and shrink/expand it. @@ -875,18 +876,15 @@ 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; } - RouteTimeAxisView& rtv = dynamic_cast (trackview); - double const speed = rtv.track()->speed (); - framepos_t const pre_trim_last_frame = _region->last_frame(); - _region->trim_end ((framepos_t) (new_bound * speed)); + _region->trim_end (new_bound, sub_num); if (no_overlap) { // Get the next region on the right of this region and shrink/expand it. @@ -901,7 +899,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); @@ -941,24 +939,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); }