X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=3312fc392950c7244d6d728541921ce772eba3c0;hb=552e995297d7706790ed2dfaab75749e914ad317;hp=6cd0bc3a3e4ae06976fc6d7ab3f84f687a18a1ba;hpb=beb5e3e777b0e92e8dde7ee12c324b32c679ff63;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 6cd0bc3a3e..3312fc3929 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -18,7 +18,6 @@ */ #include -#include #include #include @@ -34,9 +33,8 @@ #include "canvas/text.h" #include "canvas/line.h" #include "canvas/utils.h" +#include "canvas/colors.h" -#include "ardour_ui.h" -#include "global_signals.h" #include "streamview.h" #include "region_view.h" #include "automation_region_view.h" @@ -64,12 +62,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| @@ -84,19 +82,14 @@ 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()); } 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 () */ @@ -104,16 +97,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), boost::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. @@ -125,17 +114,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), 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) @@ -147,9 +134,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) { } @@ -169,14 +154,14 @@ RegionView::init (bool wfd) name_highlight->set_data ("regionview", 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->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); @@ -199,7 +184,7 @@ RegionView::init (bool wfd) set_colors (); - ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); /* XXX sync mark drag? */ } @@ -224,7 +209,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 @@ -239,7 +227,7 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr return; } - uint32_t const color = ARDOUR_UI::config()->get_canvasvar_Silence(); + uint32_t const color = UIConfiguration::instance().color_mod ("silence", "silence"); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { @@ -280,7 +268,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_canvasvar_SilenceText()); + _silence_text->set_color (UIConfiguration::instance().color ("silence text")); /* both positions are relative to the region start offset in source */ @@ -413,11 +401,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; @@ -520,34 +503,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 = UIConfiguration::instance().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 (UIConfiguration::instance().modifier (modname)).color (); } void @@ -632,11 +618,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 @@ -675,7 +660,7 @@ RegionView::region_sync_changed () sync_mark->set (points); sync_mark->show (); - sync_line->set (ArdourCanvas::Duple (offset, 0), ArdourCanvas::Duple (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE - 1)); + sync_line->set (ArdourCanvas::Duple (offset, 0), ArdourCanvas::Duple (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); sync_line->show (); } } @@ -694,7 +679,7 @@ RegionView::move (double x_delta, double y_delta) */ ArdourCanvas::Item *item = get_canvas_group (); - + if (item->position().x + x_delta < 0) { x_delta = -item->position().x; /* move it to zero */ } @@ -748,18 +733,16 @@ RegionView::set_height (double h) sync_line->set ( ArdourCanvas::Duple (offset, 0), - ArdourCanvas::Duple (offset, h - NAME_HIGHLIGHT_SIZE - 1) + ArdourCanvas::Duple (offset, h - NAME_HIGHLIGHT_SIZE) ); } for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { - (*i)->set_y0 (1); - (*i)->set_y1 (h); + (*i)->set_y1 (h + 1); } for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { - (*i)->set_y0 (1); - (*i)->set_y1 (h); + (*i)->set_y1 (h + 1); } } @@ -794,7 +777,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_canvasvar_CoveredRegion (); + uint32_t const non_playing_color = UIConfiguration::instance().color_mod ("covered region", "covered region base"); while (t < end) { @@ -814,7 +797,7 @@ RegionView::update_coverage_frames (LayerDisplay d) _coverage_frames.push_back (cr); cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); cr->set_y0 (1); - cr->set_y1 (_height); + cr->set_y1 (_height + 1); cr->set_outline (false); cr->set_ignore_events (true); if (new_me) { @@ -949,10 +932,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(); @@ -961,12 +946,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 */