ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Paul Davis 2015-05-06 14:23:30 -04:00
parent 26b0201c69
commit 14ffde884f
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/canvas/wscript
View File

@ -1,4 +1,4 @@
vxu#!/usr/bin/env python #!/usr/bin/env python
from waflib.extras import autowaf as autowaf from waflib.extras import autowaf as autowaf
from waflib import Options from waflib import Options
from waflib import TaskGen from waflib import TaskGen

14
libs/canvas/xfade_curve.cc
View File

@ -30,13 +30,19 @@ using namespace ArdourCanvas;
using std::min; using std::min;
using std::max; 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) XFadeCurve::XFadeCurve (Canvas* c)
: Item (c) : Item (c)
, points_per_segment (32) , points_per_segment (32)
, _xfadeposition (Start) , _xfadeposition (Start)
, _outline_color (0x000000ff) , _outline_color (0x000000ff)
, _fill_color (0x22448880) , _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) , _xfadeposition (pos)
, _outline_color (0x000000ff) , _outline_color (0x000000ff)
, _fill_color (0x22448880) , _fill_color (0x22448880)
, show_background_fade (true) , show_background_fade (show_bg_fades)
{ {
} }
@ -56,7 +62,7 @@ XFadeCurve::XFadeCurve (Item* parent)
, _xfadeposition (Start) , _xfadeposition (Start)
, _outline_color (0x000000ff) , _outline_color (0x000000ff)
, _fill_color (0x22448880) , _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) , _xfadeposition (pos)
, _outline_color (0x000000ff) , _outline_color (0x000000ff)
, _fill_color (0x22448880) , _fill_color (0x22448880)
, show_background_fade (true) , show_background_fade (show_bg_fades)
{ {
} }