X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=394edc120a8c1012acca348b7b6edaec9bfe61e1;hb=fc1e7dbb55939c708ce572d3a5c2518ea926a682;hp=d4604b265d5985a3fcb398c96cbc7ebd555be0e0;hpb=4260d0ca0e476011e7f2f1df9bf30c4bc20e1434;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index d4604b265d..394edc120a 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -37,7 +36,6 @@ #include "canvas/colors.h" #include "ardour_ui.h" -#include "global_signals.h" #include "streamview.h" #include "region_view.h" #include "automation_region_view.h" @@ -65,12 +63,12 @@ static const int32_t sync_mark_width = 9; PBD::Signal1 RegionView::RegionViewGoingAway; -RegionView::RegionView (ArdourCanvas::Container* parent, +RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, boost::shared_ptr r, double spu, uint32_t basic_color, - bool automation) + bool automation) : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), false, automation, (automation ? TimeAxisViewItem::ShowFrame : TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText| @@ -85,9 +83,7 @@ RegionView::RegionView (ArdourCanvas::Container* 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), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } @@ -95,9 +91,7 @@ RegionView::RegionView (ArdourCanvas::Container* parent, 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 () */ @@ -112,9 +106,7 @@ RegionView::RegionView (const RegionView& other) 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. @@ -130,13 +122,13 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr other GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } -RegionView::RegionView (ArdourCanvas::Container* parent, - TimeAxisView& tv, +RegionView::RegionView (ArdourCanvas::Container* parent, + TimeAxisView& tv, boost::shared_ptr r, - double spu, - uint32_t 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) @@ -148,9 +140,7 @@ RegionView::RegionView (ArdourCanvas::Container* 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) { } @@ -200,7 +190,7 @@ RegionView::init (bool wfd) set_colors (); - ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); + UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); /* XXX sync mark drag? */ } @@ -225,7 +215,10 @@ RegionView::~RegionView () bool RegionView::canvas_group_event (GdkEvent* event) { - return trackview.editor().canvas_region_view_event (event, group, this); + if (!in_destructor) { + return trackview.editor().canvas_region_view_event (event, group, this); + } + return false; } void @@ -240,11 +233,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr return; } - uint32_t const color = ARDOUR_UI::config()->get_Silence(); + uint32_t const color = ARDOUR_UI::config()->color_mod ("silence", "silence"); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { - ArdourCanvas::Rectangle* cr = new ArdourCanvas::TimeRectangle (group); + ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group); cr->set_ignore_events (true); _silent_frames.push_back (cr); @@ -281,7 +274,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr _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 (ARDOUR_UI::config()->get_SilenceText()); + _silence_text->set_color (ARDOUR_UI::config()->color ("silence text")); /* both positions are relative to the region start offset in source */ @@ -414,11 +407,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; @@ -521,34 +509,37 @@ RegionView::set_duration (framecnt_t frames, void *src) return true; } -uint32_t -RegionView::fill_opacity () const -{ - if (!_region->opaque()) { - return 60; - } - - uint32_t normal_tavi_opacity = TimeAxisViewItem::fill_opacity (); - - return normal_tavi_opacity; -} - void RegionView::set_colors () { TimeAxisViewItem::set_colors (); + set_sync_mark_color (); +} +void +RegionView::set_sync_mark_color () +{ if (sync_mark) { - /* XXX: make these colours themable */ - sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); - sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); + ArdourCanvas::Color c = ARDOUR_UI::config()->color ("sync mark"); + sync_mark->set_fill_color (c); + sync_mark->set_outline_color (c); + sync_line->set_outline_color (c); } } -void -RegionView::set_frame_color () +uint32_t +RegionView::get_fill_color () const { - TimeAxisViewItem::set_frame_color (); + ArdourCanvas::Color f = TimeAxisViewItem::get_fill_color(); + char const *modname; + + if (_region->opaque()) { + modname = "opaque region base"; + } else { + modname = "transparent region base"; + } + + return HSV(f).mod (ARDOUR_UI::config()->modifier (modname)).color (); } void @@ -633,11 +624,10 @@ RegionView::region_sync_changed () sync_mark = new ArdourCanvas::Polygon (group); CANVAS_DEBUG_NAME (sync_mark, string_compose ("sync mark for %1", get_item_name())); - sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour - sync_line = new ArdourCanvas::Line (group); CANVAS_DEBUG_NAME (sync_line, string_compose ("sync mark for %1", get_item_name())); - sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour + + set_sync_mark_color (); } /* this has to handle both a genuine change of position, a change of samples_per_pixel @@ -793,7 +783,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 const non_playing_color = ARDOUR_UI::config()->get_CoveredRegion (); + uint32_t const non_playing_color = ARDOUR_UI::config()->color_mod ("covered region", "covered region base"); while (t < end) { @@ -809,7 +799,7 @@ RegionView::update_coverage_frames (LayerDisplay d) /* start off any new rect, if required */ if (cr == 0 || me != new_me) { - cr = new ArdourCanvas::TimeRectangle (group); + cr = new ArdourCanvas::Rectangle (group); _coverage_frames.push_back (cr); cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); cr->set_y0 (1); @@ -948,10 +938,12 @@ RegionView::move_contents (frameoffset_t distance) /** 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 +RegionView::snap_frame_to_frame (frameoffset_t x, bool ensure_snap) const { PublicEditor& editor = trackview.editor(); @@ -960,12 +952,12 @@ RegionView::snap_frame_to_frame (frameoffset_t x) const /* try a snap in either direction */ framepos_t frame = session_frame; - editor.snap_to (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); + editor.snap_to (frame, RoundUpAlways, false, ensure_snap); } /* back to region relative */