diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-06 14:23:30 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:10 -0400 |
commit | 14ffde884fe3bb2521b2e44998804f5169760aa2 (patch) | |
tree | bf03de0db90a5d36f113a87c0e10a38e0dc194bf | |
parent | 26b0201c692bd2eda76f8b1ede1e61e54d75255d (diff) |
conditionalize background fades depending on whether this is a tracks or other build
-rw-r--r-- | libs/canvas/wscript | 2 | ||||
-rw-r--r-- | libs/canvas/xfade_curve.cc | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libs/canvas/wscript b/libs/canvas/wscript index 0152868d7d..67d26ea381 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -1,4 +1,4 @@ -vxu#!/usr/bin/env python +#!/usr/bin/env python from waflib.extras import autowaf as autowaf from waflib import Options from waflib import TaskGen diff --git a/libs/canvas/xfade_curve.cc b/libs/canvas/xfade_curve.cc index d82e6ab973..0d7d7a5245 100644 --- a/libs/canvas/xfade_curve.cc +++ b/libs/canvas/xfade_curve.cc @@ -30,13 +30,19 @@ using namespace ArdourCanvas; using std::min; using std::max; +#ifdef USE_TRACKS_CODE_FEATURES +static const bool show_bg_fades = false; +#else +static const bool show_bg_fades = true; +#endif + XFadeCurve::XFadeCurve (Canvas* c) : Item (c) , points_per_segment (32) , _xfadeposition (Start) , _outline_color (0x000000ff) , _fill_color (0x22448880) - , show_background_fade (true) + , show_background_fade (show_bg_fades) { } @@ -46,7 +52,7 @@ XFadeCurve::XFadeCurve (Canvas* c, XFadePosition pos) , _xfadeposition (pos) , _outline_color (0x000000ff) , _fill_color (0x22448880) - , show_background_fade (true) + , show_background_fade (show_bg_fades) { } @@ -56,7 +62,7 @@ XFadeCurve::XFadeCurve (Item* parent) , _xfadeposition (Start) , _outline_color (0x000000ff) , _fill_color (0x22448880) - , show_background_fade (true) + , show_background_fade (show_bg_fades) { } @@ -66,7 +72,7 @@ XFadeCurve::XFadeCurve (Item* parent, XFadePosition pos) , _xfadeposition (pos) , _outline_color (0x000000ff) , _fill_color (0x22448880) - , show_background_fade (true) + , show_background_fade (show_bg_fades) { } |