X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcrossfade_view.cc;h=f77f8db44283cfb906b6f84cef307afb8da6798a;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=eed791698148bcf5334e95429bb0cc07137da2b6;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index eed7916981..f77f8db442 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,91 +15,82 @@ 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 "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; -sigc::signal CrossfadeView::GoingAway; +PBD::Signal1 CrossfadeView::CatchDeletion; -CrossfadeView::CrossfadeView (Gnome::Canvas::Group *parent, - AudioTimeAxisView &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 ("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 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group), - gnome_canvas_line_get_type(), - "fill_color_rgba", color_map[cCrossfadeLine], - "width_pixels", (guint) 1, - NULL); - - fade_out = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group), - gnome_canvas_line_get_type(), - "fill_color_rgba", color_map[cCrossfadeLine], - "width_pixels", (guint) 1, - NULL); - - set_height (get_time_axis_view().height); + fade_in = new Line (*group); + 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() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get(); + fade_out->property_width_pixels() = 1; /* no frame around the xfade or overlap rects */ - frame->set_property ("outline_what", 0); + frame->property_outline_what() = 0; /* never show the vestigial frame */ - vestigial_frame->hide(); show_vestigial = false; - gtk_object_set_data (GTK_OBJECT(group), "crossfadeview", this); - gtk_signal_connect (GTK_OBJECT(group), "event", - (GtkSignalFunc) PublicEditor::canvas_crossfade_view_event, - 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)); + 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 */ -} - -std::string -CrossfadeView::get_item_name () -{ - return "xfade"; -// return crossfade.name(); + CatchDeletion (this) ; /* EMIT_SIGNAL */ } void @@ -110,35 +101,42 @@ CrossfadeView::reset_width_dependent_items (double pixel_width) active_changed (); if (pixel_width < 5) { - gnome_canvas_item_hide (fade_in); - gnome_canvas_item_hide (fade_out); + fade_in->hide(); + fade_out->hide(); } } 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::preset_height (HeightSmall)) { + h -= NAME_HIGHLIGHT_SIZE; + } + + 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) { @@ -149,63 +147,60 @@ CrossfadeView::crossfade_changed (Change what_changed) void CrossfadeView::redraw_curves () { - GnomeCanvasPoints* 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) { - gnome_canvas_item_hide (fade_in); - gnome_canvas_item_hide (fade_out); + if (!_visible || !crossfade->active() || npoints < 3) { + fade_in->hide(); + fade_out->hide(); return; } else { - gnome_canvas_item_show (fade_in); - gnome_canvas_item_show (fade_out); - } + 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) { - points->coords[pci++] = i; - points->coords[pci++] = 2.0 + h - (h * vec[i]); + Art::Point &p = (*points)[pci++]; + p.set_x (i + 1); + p.set_y (_height - ((_height - 2) * vec[i])); } - gnome_canvas_item_set (fade_in, "points", points, NULL); + + fade_in->property_points() = *points; + + crossfade->fade_out().curve().get_vector (0, crossfade->length(), vec, npoints); - crossfade.fade_out().get_vector (0, crossfade.length(), vec, npoints); for (int i = 0, pci = 0; i < npoints; ++i) { - points->coords[pci++] = i; - points->coords[pci++] = 2.0 + h - (h * vec[i]); + Art::Point &p = (*points)[pci++]; + p.set_x (i + 1); + p.set_y (_height - ((_height - 2) * vec[i])); } - gnome_canvas_item_set (fade_out, "points", points, NULL); + + fade_out->property_points() = *points; delete [] vec; - gnome_canvas_points_unref (points); + delete points; /* XXX this is ugly, but it will have to wait till Crossfades are reimplented as regions. This puts crossfade views on top of a track, above all regions. @@ -217,15 +212,21 @@ CrossfadeView::redraw_curves () void CrossfadeView::active_changed () { - if (crossfade.active()) { - frame->set_property ("fill_color_rgba", color_map[cActiveCrossfade]); + if (crossfade->active()) { + frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get(); } else { - frame->set_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) { @@ -235,7 +236,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; @@ -261,3 +262,9 @@ CrossfadeView::fake_hide () { group->hide(); } + +void +CrossfadeView::crossfade_fades_changed () +{ + redraw_curves (); +}