/*
- 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
#include <algorithm>
-#include <ardour/region.h>
+#include "ardour/region.h"
#include <gtkmm2ext/doi.h>
#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<void,CrossfadeView*> CrossfadeView::GoingAway;
+PBD::Signal1<void,CrossfadeView*> CrossfadeView::CatchDeletion;
-CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
- RouteTimeAxisView &tv,
- boost::shared_ptr<Crossfade> xf,
+CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
+ RouteTimeAxisView &tv,
+ boost::shared_ptr<Crossfade> xf,
double spu,
Gdk::Color& basic_color,
AudioRegionView& lview,
AudioRegionView& rview)
-
- : TimeAxisViewItem ("xfade" /*xf.name()*/, *parent, tv, spu, basic_color, xf->position(),
- xf->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() = Config->canvasvar_CrossfadeLine.get();
+ 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() = Config->canvasvar_CrossfadeLine.get();
+ fade_out->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_CrossfadeLine.get();
fade_out->property_width_pixels() = 1;
-
- set_y_position_and_height (0, 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));
- ColorsChanged.connect (mem_fun (*this, &CrossfadeView::color_handler));
+ 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
}
void
-CrossfadeView::set_y_position_and_height (double y, double h)
+CrossfadeView::set_height (double h)
{
- if (h == TimeAxisView::hSmaller || h == TimeAxisView::hSmall) {
- TimeAxisViewItem::set_y_position_and_height (y, h - 3 );
+ if (h <= TimeAxisView::preset_height (HeightSmall)) {
+ h -= 3.0;
} else {
- TimeAxisViewItem::set_y_position_and_height (y, h - NAME_HIGHLIGHT_SIZE - 3 );
+ h -= NAME_HIGHLIGHT_SIZE + 3.0;
}
- _y_position = y;
- _height = h;
+ 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) {
+ if (what_changed.contains (ARDOUR::bounds_change)) {
set_position (crossfade->position(), this);
set_duration (crossfade->length(), this);
- need_redraw_curves = true;
+
+ /* 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 & 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) {
void
CrossfadeView::redraw_curves ()
{
- Points* points;
+ Points* points;
int32_t npoints;
float* vec;
- double h;
if (!crossfade->following_overlap()) {
/* curves should not be visible */
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.
- */
- 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) {
+ 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) {
fade_in->hide();
} else {
fade_in->show();
fade_out->show();
- }
+ }
points = get_canvas_points ("xfade edit redraw", npoints);
vec = new float[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(_y_position + 2.0 + h - (h * vec[i]));
+ p.set_y(2.0 + _height - (_height * vec[i]));
}
+
fade_in->property_points() = *points;
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(_y_position + 2.0 + h - (h * vec[i]));
+ p.set_y(2.0 + _height - (_height * vec[i]));
}
+
fade_out->property_points() = *points;
delete [] vec;
CrossfadeView::active_changed ()
{
if (crossfade->active()) {
- frame->property_fill_color_rgba() = Config->canvasvar_ActiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_ActiveCrossfade.get();
} else {
- frame->property_fill_color_rgba() = Config->canvasvar_InactiveCrossfade.get();
+ frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_InactiveCrossfade.get();
}
redraw_curves ();
{
group->hide();
}
-
projects / ardour.git / blobdiff