X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.cc;h=d553514c811878ee312796b7cd20c731cda0513a;hb=19e97d1d64e8aa6d87d79d1f6332065992e5e027;hp=e03c8ed478da2cda5ae81bdb6ccfd3301160bf7c;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index e03c8ed478..d553514c81 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -25,6 +25,8 @@ #include "canvas-simplerect.h" #include "canvas-curve.h" #include "crossfade_view.h" +#include "global_signals.h" +#include "gui_thread.h" #include "rgb_macros.h" #include "audio_time_axis.h" #include "public_editor.h" @@ -33,14 +35,13 @@ #include "canvas_impl.h" #include "ardour_ui.h" -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Editing; using namespace Gnome; using namespace Canvas; -sigc::signal CrossfadeView::GoingAway; +PBD::Signal1 CrossfadeView::CatchDeletion; CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, @@ -52,11 +53,11 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), - xf->length(), false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), + xf->length(), false, false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), crossfade (xf), left_view (lview), - right_view (rview) - + right_view (rview), + _all_in_view (false) { _valid = true; _visible = true; @@ -69,28 +70,29 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; - set_height (get_time_axis_view().current_height()); - /* no frame around the xfade or overlap rects */ frame->property_outline_what() = 0; /* never show the vestigial frame */ - vestigial_frame->hide(); show_vestigial = false; - group->signal_event().connect (bind (mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); + group->signal_event().connect (sigc::bind (sigc::mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); - crossfade_changed (Change (~0)); + PropertyChange all_crossfade_properties; + all_crossfade_properties.add (ARDOUR::Properties::active); + all_crossfade_properties.add (ARDOUR::Properties::follow_overlap); + crossfade_changed (all_crossfade_properties); - crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed)); - ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler)); + crossfade->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&CrossfadeView::crossfade_changed, this, _1), gui_context()); + crossfade->FadesChanged.connect (*this, invalidator (*this), ui_bind (&CrossfadeView::crossfade_fades_changed, this), gui_context()); + ColorsChanged.connect (sigc::mem_fun (*this, &CrossfadeView::color_handler)); } CrossfadeView::~CrossfadeView () { - GoingAway (this) ; /* EMIT_SIGNAL */ + CatchDeletion (this) ; /* EMIT_SIGNAL */ } void @@ -107,27 +109,23 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) } void -CrossfadeView::set_height (double height) +CrossfadeView::set_height (double h) { - double h = 0; - if (height <= TimeAxisView::hSmaller) { - h = height - 3; - } else { - h = height - NAME_HIGHLIGHT_SIZE - 3; + if (h > TimeAxisView::preset_height (HeightSmall)) { + h -= NAME_HIGHLIGHT_SIZE; } TimeAxisViewItem::set_height (h); - _height = h; redraw_curves (); } void -CrossfadeView::crossfade_changed (Change what_changed) +CrossfadeView::crossfade_changed (const PropertyChange& what_changed) { bool need_redraw_curves = false; - if (what_changed & BoundsChanged) { + if (what_changed.contains (ARDOUR::bounds_change)) { set_position (crossfade->position(), this); set_duration (crossfade->length(), this); @@ -136,11 +134,11 @@ CrossfadeView::crossfade_changed (Change what_changed) need_redraw_curves = false; } - if (what_changed & Crossfade::FollowOverlapChanged) { + if (what_changed.contains (ARDOUR::Properties::follow_overlap)) { need_redraw_curves = true; } - if (what_changed & Crossfade::ActiveChanged) { + if (what_changed.contains (ARDOUR::Properties::active)) { /* calls redraw_curves */ active_changed (); } else if (need_redraw_curves) { @@ -148,13 +146,12 @@ CrossfadeView::crossfade_changed (Change what_changed) } } +/** Set up our fade_in and fade_out curves to contain points for the currently visible portion + * of the crossfade. + */ void CrossfadeView::redraw_curves () { - Points* points; - int32_t npoints; - float* vec; - if (!crossfade->following_overlap()) { /* curves should not be visible */ fade_in->hide (); @@ -167,8 +164,21 @@ CrossfadeView::redraw_curves () return; } - npoints = get_time_axis_view().editor().frame_to_pixel (crossfade->length()); - // npoints = std::min (gdk_screen_width(), npoints); + PublicEditor& editor = get_time_axis_view().editor (); + + framepos_t const editor_left = editor.leftmost_position (); + framepos_t const editor_right = editor_left + editor.current_page_frames (); + framepos_t const xfade_left = crossfade->position (); + framepos_t const xfade_right = xfade_left + crossfade->length (); + + /* Work out the range of our frames that are visible */ + framepos_t const min_frames = std::max (editor_left, xfade_left); + framepos_t const max_frames = std::min (editor_right, xfade_right); + + _all_in_view = (editor_left <= xfade_left && editor_right >= xfade_right); + + /* Hence the number of points that we will render */ + int32_t const npoints = editor.frame_to_pixel (max_frames - min_frames); if (!_visible || !crossfade->active() || npoints < 3) { fade_in->hide(); @@ -179,24 +189,33 @@ CrossfadeView::redraw_curves () fade_out->show(); } - points = get_canvas_points ("xfade edit redraw", npoints); - vec = new float[npoints]; + Points* points = get_canvas_points ("xfade edit redraw", npoints); + float* vec = new float[npoints]; + + crossfade->fade_in().curve().get_vector (min_frames - crossfade->position(), max_frames - crossfade->position(), vec, npoints); - crossfade->fade_in().curve().get_vector (0, crossfade->length(), vec, npoints); + /* Work out the offset from the start of the crossfade to the visible part, in pixels */ + double xoff = 0; + if (crossfade->position() < editor.leftmost_position()) { + xoff = editor.frame_to_pixel (min_frames) - editor.frame_to_pixel (crossfade->position ()); + } for (int i = 0, pci = 0; i < npoints; ++i) { Art::Point &p = (*points)[pci++]; - p.set_x(i); - p.set_y(2.0 + _height - (_height * vec[i])); + p.set_x (xoff + i + 1); + p.set_y (_height - ((_height - 2) * vec[i])); } + fade_in->property_points() = *points; - crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints); + crossfade->fade_out().curve().get_vector (min_frames - crossfade->position(), max_frames - crossfade->position(), vec, npoints); + for (int i = 0, pci = 0; i < npoints; ++i) { Art::Point &p = (*points)[pci++]; - p.set_x(i); - p.set_y(2.0 + _height - (_height * vec[i])); + p.set_x (xoff + i + 1); + p.set_y (_height - ((_height - 2) * vec[i])); } + fade_out->property_points() = *points; delete [] vec; @@ -247,8 +266,9 @@ CrossfadeView::upper_regionview () const void CrossfadeView::show () { - group->show(); _visible = true; + group->show(); + redraw_curves (); } void @@ -264,3 +284,22 @@ CrossfadeView::fake_hide () group->hide(); } +void +CrossfadeView::crossfade_fades_changed () +{ + redraw_curves (); +} + +void +CrossfadeView::horizontal_position_changed () +{ + /* If the crossfade curves are entirely within the editor's visible space, there is + no need to redraw them here as they will be completely drawn (as distinct from + the other case where the horizontal position change will uncover `undrawn' + sections). + */ + + if (!_all_in_view) { + redraw_curves (); + } +}