conditionalize background fades depending on whether this is a tracks or other build

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 0152868d7d06c5c26701aab562f5c6460869bc55..67d26ea3810665ebcf8c23a7966d7fdd443da61b 100644 (file)
--- 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 d82e6ab973d80e44c5a4fe8984e7046436949480..0d7d7a5245b76075ee5a8b009729036bdefdea02 100644 (file)
--- 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)
 {
 }