X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.cc;h=63c2115b87427842865f217bf9985fdec173d538;hb=ce3ca76f96eb97f6d52fe065e6a2800efcbbc0cd;hp=42a1a47227b4c0b6049b9d9c421e9c8bb12367a1;hpb=22e41063d5b0c4c80eab3e3a375b734ca7d76169;p=ardour.git diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 42a1a47227..63c2115b87 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -15,12 +15,11 @@ 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" @@ -32,6 +31,7 @@ #include "audio_region_view.h" #include "utils.h" #include "canvas_impl.h" +#include "ardour_ui.h" using namespace sigc; using namespace ARDOUR; @@ -44,15 +44,15 @@ sigc::signal CrossfadeView::GoingAway; CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, - Crossfade& xf, + 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) @@ -62,14 +62,14 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, _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); + set_height (get_time_axis_view().current_height()); /* no frame around the xfade or overlap rects */ @@ -80,11 +80,12 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, 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 (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)); + crossfade->StateChanged.connect (mem_fun(*this, &CrossfadeView::crossfade_changed)); + ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler)); } CrossfadeView::~CrossfadeView () @@ -108,11 +109,11 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) void CrossfadeView::set_height (double height) { - if (height == TimeAxisView::hSmaller || - height == TimeAxisView::hSmall) - TimeAxisViewItem::set_height (height - 3 ); - else + if (height <= TimeAxisView::hSmaller) { + TimeAxisViewItem::set_height (height - 3); + } else { TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 ); + } redraw_curves (); } @@ -123,8 +124,8 @@ CrossfadeView::crossfade_changed (Change what_changed) bool need_redraw_curves = false; if (what_changed & BoundsChanged) { - set_position (crossfade.position(), this); - set_duration (crossfade.overlap_length(), this); + set_position (crossfade->position(), this); + set_duration (crossfade->length(), this); need_redraw_curves = true; } @@ -148,7 +149,7 @@ CrossfadeView::redraw_curves () float* vec; double h; - if (!crossfade.following_overlap()) { + if (!crossfade->following_overlap()) { /* curves should not be visible */ fade_in->hide (); fade_out->hide (); @@ -159,7 +160,8 @@ CrossfadeView::redraw_curves () 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. */ - double tav_height = get_time_axis_view().height; + + double tav_height = get_time_axis_view().current_height(); if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) { h = tav_height - 3.0; @@ -172,10 +174,10 @@ CrossfadeView::redraw_curves () 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; @@ -187,7 +189,8 @@ CrossfadeView::redraw_curves () 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); @@ -195,7 +198,7 @@ CrossfadeView::redraw_curves () } 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); @@ -217,15 +220,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) { @@ -261,3 +270,4 @@ CrossfadeView::fake_hide () { group->hide(); } +