diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-09 13:13:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-09 13:13:25 +0000 |
| commit | b2802bac25db56d37751b7294c3a4a22014ff6c4 (patch) | |
| tree | 2298c3efa65045a2d7aa289bf2adb942e401137c /libs/ardour | |
| parent | 37680c0d73a26f42cb9b602263d6d4d77be3469c (diff) | |
add global option to enable/disable region fades
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3896 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 3 | ||||
| -rw-r--r-- | libs/ardour/audioregion.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 1e7ab5eab4..27056c7948 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -61,7 +61,7 @@ CONFIG_VARIABLE (bool, auto_analyse_audio, "auto-analyse-audio", false) CONFIG_VARIABLE (uint32_t, osc_port, "osc-port", 3819) CONFIG_VARIABLE (bool, use_osc, "use-osc", false) -/* crossfades */ +/* fades, crossfades */ CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade) CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true) @@ -69,6 +69,7 @@ CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015) CONFIG_VARIABLE (bool, xfades_active, "xfades-active", true) CONFIG_VARIABLE (bool, xfades_visible, "xfades-visible", true) CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs, "destructive-xfade-msecs", 2) +CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true) /* editing related */ diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 38950f3635..07965df4f3 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -557,7 +557,7 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit, if (!raw) { - if (_flags & FadeIn) { + if ((_flags & FadeIn) && Config->get_use_region_fades()) { nframes_t fade_in_length = (nframes_t) _fade_in.back()->when; @@ -579,7 +579,7 @@ AudioRegion::_read_at (const SourceList& srcs, nframes_t limit, /* fade out */ - if (_flags & FadeOut) { + if ((_flags & FadeOut) && Config->get_use_region_fades()) { /* see if some part of this read is within the fade out */ |