X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.cc;h=2854de9a782e865e8bb9995fe26769a0e4f1e8be;hb=e33d4553b2b333c30835b00741fc5c1fd0e2b36d;hp=087af25e7317e9a59e172eaabe4eb7c4a8ca819a;hpb=6f4a92f740b2fd75794489ce58f9348f8adf6bf4;p=ardour.git diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 087af25e73..2854de9a78 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,81 +15,81 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include -#include +#include "ardour/region.h" #include #include "canvas-simplerect.h" #include "canvas-curve.h" #include "crossfade_view.h" +#include "gui_thread.h" #include "rgb_macros.h" #include "audio_time_axis.h" #include "public_editor.h" #include "audio_region_view.h" #include "utils.h" #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, - Crossfade& xf, +CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, + RouteTimeAxisView &tv, + boost::shared_ptr xf, double spu, Gdk::Color& basic_color, AudioRegionView& lview, AudioRegionView& rview) - - : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf.position(), - xf.overlap_length(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), + + : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(), + xf->length(), false, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), crossfade (xf), left_view (lview), - right_view (rview) - + right_view (rview) { _valid = true; _visible = true; fade_in = new Line (*group); - fade_in->property_fill_color_rgba() = color_map[cCrossfadeLine]; + fade_in->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_in->property_width_pixels() = 1; fade_out = new Line (*group); - fade_out->property_fill_color_rgba() = color_map[cCrossfadeLine]; + fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); fade_out->property_width_pixels() = 1; - - set_height (get_time_axis_view().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)); - - crossfade_changed (Change (~0)); - crossfade.StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed)); + group->signal_event().connect (sigc::bind (sigc::mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); + + 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->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&CrossfadeView::crossfade_changed, this, _1), gui_context()); + ColorsChanged.connect (sigc::mem_fun (*this, &CrossfadeView::color_handler)); } CrossfadeView::~CrossfadeView () { - GoingAway (this) ; /* EMIT_SIGNAL */ + CatchDeletion (this) ; /* EMIT_SIGNAL */ } void @@ -106,29 +106,38 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) } void -CrossfadeView::set_height (double height) +CrossfadeView::set_height (double h) { - if (height == TimeAxisView::Smaller || - height == TimeAxisView::Small) - TimeAxisViewItem::set_height (height - 3 ); - else - TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 ); + if (h <= TimeAxisView::hSmall) { + h -= 3.0; + } else { + h -= NAME_HIGHLIGHT_SIZE + 3.0; + } + + TimeAxisViewItem::set_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) { - set_position (crossfade.position(), this); - set_duration (crossfade.overlap_length(), this); + if (what_changed.contains (ARDOUR::bounds_change)) { + set_position (crossfade->position(), this); + set_duration (crossfade->length(), this); + + /* set_duration will call reset_width_dependent_items which in turn will call redraw_curves via active_changed, + so no need for us to call it */ + need_redraw_curves = false; + } + + 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) { @@ -139,60 +148,55 @@ CrossfadeView::crossfade_changed (Change what_changed) void CrossfadeView::redraw_curves () { - Points* points; + Points* points; int32_t npoints; float* vec; - - double h; - - /* - At "height - 3.0" the bottom of the crossfade touches the name highlight or the bottom of the track (if the - track is either Small or Smaller. - */ - switch(get_time_axis_view().height) { - case TimeAxisView::Smaller: - case TimeAxisView::Small: - h = get_time_axis_view().height - 3.0; - break; - - default: - h = get_time_axis_view().height - NAME_HIGHLIGHT_SIZE - 3.0; + + if (!crossfade->following_overlap()) { + /* curves should not be visible */ + fade_in->hide (); + fade_out->hide (); + return; } - if (h < 0) { + if (_height < 0) { /* no space allocated yet */ return; } - npoints = get_time_axis_view().editor.frame_to_pixel (crossfade.length()); - npoints = std::min (gdk_screen_width(), npoints); + npoints = get_time_axis_view().editor().frame_to_pixel (crossfade->length()); + // npoints = std::min (gdk_screen_width(), npoints); - if (!_visible || !crossfade.active() || npoints < 3) { + if (!_visible || !crossfade->active() || npoints < 3) { fade_in->hide(); fade_out->hide(); return; } else { fade_in->show(); fade_out->show(); - } + } points = get_canvas_points ("xfade edit redraw", npoints); vec = new float[npoints]; - crossfade.fade_in().get_vector (0, crossfade.length(), vec, npoints); + crossfade->fade_in().curve().get_vector (0, crossfade->length(), 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 + h - (h * vec[i])); + p.set_y(2.0 + _height - (_height * vec[i])); } + fade_in->property_points() = *points; - crossfade.fade_out().get_vector (0, crossfade.length(), vec, npoints); + crossfade->fade_out().curve().get_vector (0, crossfade->length(), 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 + h - (h * vec[i])); + p.set_y(2.0 + _height - (_height * vec[i])); } + fade_out->property_points() = *points; delete [] vec; @@ -209,15 +213,21 @@ CrossfadeView::redraw_curves () void CrossfadeView::active_changed () { - if (crossfade.active()) { - frame->property_fill_color_rgba() = color_map[cActiveCrossfade]; + if (crossfade->active()) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get(); } else { - frame->property_fill_color_rgba() = color_map[cInactiveCrossfade]; + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get(); } redraw_curves (); } +void +CrossfadeView::color_handler () +{ + active_changed (); +} + void CrossfadeView::set_valid (bool yn) { @@ -227,7 +237,7 @@ CrossfadeView::set_valid (bool yn) AudioRegionView& CrossfadeView::upper_regionview () const { - if (left_view.region().layer() > right_view.region().layer()) { + if (left_view.region()->layer() > right_view.region()->layer()) { return left_view; } else { return right_view;