along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
#include "audio_region_view.h"
#include "utils.h"
#include "canvas_impl.h"
+#include "ardour_ui.h"
using namespace sigc;
using namespace ARDOUR;
CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
RouteTimeAxisView &tv,
- Crossfade& xf,
+ 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.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)
_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 */
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 ()
void
CrossfadeView::set_height (double height)
{
- if (height == TimeAxisView::Smaller ||
- height == TimeAxisView::Small)
- 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 ();
}
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;
}
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 tav_height = get_time_axis_view().current_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) {
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;
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;
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)
{
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;
{
group->hide();
}
+