X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.cc;h=22119721ffaf4fe7e3b7819c1809c24ba18167a2;hb=e55e3fde7cec89c49e01046a2db276b2d8f30958;hp=4681a0f6c3026b85cd6ab057b9722e99d1510007;hpb=1184029638aea5fe6a53175d226371ec9214eb17;p=ardour.git diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 4681a0f6c3..22119721ff 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -29,11 +28,14 @@ #include "rgb_macros.h" #include "audio_time_axis.h" #include "public_editor.h" -#include "regionview.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; @@ -41,16 +43,16 @@ using namespace Canvas; sigc::signal CrossfadeView::GoingAway; CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, - AudioTimeAxisView &tv, - Crossfade& xf, + RouteTimeAxisView &tv, + boost::shared_ptr xf, double spu, Gdk::Color& basic_color, AudioRegionView& lview, AudioRegionView& rview) - : TimeAxisViewItem ("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(), TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowFrame)), crossfade (xf), left_view (lview), right_view (rview) @@ -60,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_y_position_and_height (0, get_time_axis_view().height); /* no frame around the xfade or overlap rects */ @@ -77,13 +79,13 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, vestigial_frame->hide(); show_vestigial = false; - - // GTK2FIX - // 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 () @@ -91,13 +93,6 @@ CrossfadeView::~CrossfadeView () GoingAway (this) ; /* EMIT_SIGNAL */ } -std::string -CrossfadeView::get_item_name () -{ - return "xfade"; -// return crossfade.name(); -} - void CrossfadeView::reset_width_dependent_items (double pixel_width) { @@ -112,13 +107,16 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) } void -CrossfadeView::set_height (double height) +CrossfadeView::set_y_position_and_height (double y, 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::hSmaller || h == TimeAxisView::hSmall) { + TimeAxisViewItem::set_y_position_and_height (y, h - 3 ); + } else { + TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 ); + } + + _y_position = y; + _height = h; redraw_curves (); } @@ -129,8 +127,12 @@ 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; + } + + if (what_changed & Crossfade::FollowOverlapChanged) { need_redraw_curves = true; } @@ -148,21 +150,24 @@ CrossfadeView::redraw_curves () Points* points; int32_t npoints; float* vec; - double h; + if (!crossfade->following_overlap()) { + /* curves should not be visible */ + fade_in->hide (); + fade_out->hide (); + return; + } + /* 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; + double const tav_height = get_time_axis_view().height; + if (tav_height == TimeAxisView::hSmaller || tav_height == TimeAxisView::hSmall) { + h = tav_height - 3.0; + } else { + h = tav_height - NAME_HIGHLIGHT_SIZE - 3.0; } if (h < 0) { @@ -170,10 +175,10 @@ CrossfadeView::redraw_curves () return; } - npoints = get_time_axis_view().editor.frame_to_pixel (crossfade.length()); + 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; @@ -185,19 +190,19 @@ 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); - p.set_y(2.0 + h - (h * vec[i])); + p.set_y(_y_position + 2.0 + h - (h * 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(_y_position + 2.0 + h - (h * vec[i])); } fade_out->property_points() = *points; @@ -215,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) { @@ -233,7 +244,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; @@ -259,3 +270,4 @@ CrossfadeView::fake_hide () { group->hide(); } +