X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=49b47332ae1239e2e9171f434355d42d129163b6;hb=37937d9c698e5fe9ce0f1857f3256dead43f3ebc;hp=37ddb45917bd30e198aa3f9bd075f36da4d083b6;hpb=b9c94f6dbf7c2385d295be9109f99664c84e28ff;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 37ddb45917..49b47332ae 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -33,6 +33,8 @@ #include "canvas/pixbuf.h" #include "canvas/text.h" #include "canvas/line.h" +#include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour_ui.h" #include "global_signals.h" @@ -53,6 +55,7 @@ using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; using namespace Gtk; @@ -62,15 +65,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, + 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) @@ -126,11 +130,11 @@ 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::Group* parent, +RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, boost::shared_ptr r, double spu, - Gdk::Color const & basic_color, + uint32_t basic_color, bool recording, TimeAxisViewItem::Visibility visibility) : TimeAxisViewItem (r->name(), *parent, tv, spu, basic_color, r->position(), r->length(), recording, false, visibility) @@ -151,7 +155,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, } void -RegionView::init (Gdk::Color const & basic_color, bool wfd) +RegionView::init (bool wfd) { editor = 0; valid = true; @@ -162,25 +166,23 @@ 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->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); - 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 (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->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_text) { @@ -196,8 +198,6 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context()); - group->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); - set_colors (); ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler)); @@ -222,6 +222,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,11 +243,11 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr return; } - uint32_t const color = ARDOUR_UI::config()->get_canvasvar_Silence(); + uint32_t const color = ARDOUR_UI::config()->get_Silence(); for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { - ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group); + ArdourCanvas::Rectangle* cr = new ArdourCanvas::TimeRectangle (group); cr->set_ignore_events (true); _silent_frames.push_back (cr); @@ -275,7 +284,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 (ARDOUR_UI::config()->get_SilenceText()); /* both positions are relative to the region start offset in source */ @@ -515,6 +524,18 @@ 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 () { @@ -522,35 +543,17 @@ RegionView::set_colors () if (sync_mark) { /* XXX: make these colours themable */ - sync_mark->set_fill_color (RGBA_TO_UINT (0, 255, 0, 255)); - sync_line->set_outline_color (RGBA_TO_UINT (0, 255, 0, 255)); + 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)); } } void RegionView::set_frame_color () { - if (_region->opaque()) { - fill_opacity = 130; - } else { - fill_opacity = 60; - } - TimeAxisViewItem::set_frame_color (); } -void -RegionView::fake_set_opaque (bool yn) -{ - if (yn) { - fill_opacity = 130; - } else { - fill_opacity = 60; - } - - set_frame_color (); -} - void RegionView::show_region_editor () { @@ -632,10 +635,12 @@ RegionView::region_sync_changed () /* points set below */ sync_mark = new ArdourCanvas::Polygon (group); - sync_mark->set_fill_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour + 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); - sync_line->set_outline_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour + 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 } /* this has to handle both a genuine change of position, a change of samples_per_pixel @@ -687,7 +692,18 @@ RegionView::move (double x_delta, double y_delta) return; } - get_canvas_group()->move (ArdourCanvas::Duple (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 */ @@ -722,12 +738,6 @@ RegionView::remove_ghost (GhostRegion* ghost) } } -uint32_t -RegionView::get_fill_color () -{ - return fill_color; -} - void RegionView::set_height (double h) { @@ -786,7 +796,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 = ARDOUR_UI::config()->get_CoveredRegion (); while (t < end) { @@ -802,7 +812,7 @@ RegionView::update_coverage_frames (LayerDisplay d) /* start off any new rect, if required */ if (cr == 0 || me != new_me) { - cr = new ArdourCanvas::Rectangle (group); + cr = new ArdourCanvas::TimeRectangle (group); _coverage_frames.push_back (cr); cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); cr->set_y0 (1); @@ -930,32 +940,12 @@ 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)); } @@ -973,12 +963,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); /* 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); } /* back to region relative */