#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"
sigc::signal<void,CrossfadeView*> CrossfadeView::GoingAway;
CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent,
- AudioTimeAxisView &tv,
+ RouteTimeAxisView &tv,
Crossfade& xf,
double spu,
Gdk::Color& basic_color,
CrossfadeView::~CrossfadeView ()
{
- GoingAway (this) ; /* EMIT_SIGNAL */
+ GoingAway (this) ; /* EMIT_SIGNAL */
}
void
void
CrossfadeView::set_height (double height)
{
- if (height == TimeAxisView::Smaller ||
- height == TimeAxisView::Small)
+ if (height == TimeAxisView::hSmaller ||
+ height == TimeAxisView::hSmall)
TimeAxisViewItem::set_height (height - 3 );
else
TimeAxisViewItem::set_height (height - NAME_HIGHLIGHT_SIZE - 3 );
set_duration (crossfade.overlap_length(), this);
need_redraw_curves = true;
}
+
+ if (what_changed & Crossfade::FollowOverlapChanged) {
+ need_redraw_curves = true;
+ }
if (what_changed & Crossfade::ActiveChanged) {
/* calls 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 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) {
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;