diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-14 00:13:27 +0000 |
| commit | 015fc7b39fab97cee1875231694adce43155ceb5 (patch) | |
| tree | 76dded18cc9441e7325af999358ab3a3235cdb1e /libs/ardour/crossfade.cc | |
| parent | 0569107ddc0d2a8df6ca0a2c8cc16ebe8f3dee99 (diff) | |
First stage of options rework.
- Split Configuration into RCConfiguration and SessionConfiguration;
the first for options which are saved to .rc files and the second
for options which are saved in a session file.
- Move some options from the old `master' Configuration object into
SessionConfiguration; this needs more refinement.
- Reflect many RCConfiguration options in an expanded Edit->Preferences
dialog; my intention is to remove the corresponding menu items
eventually.
git-svn-id: svn://localhost/ardour2/branches/3.0@5075 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/crossfade.cc')
| -rw-r--r-- | libs/ardour/crossfade.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index c258a9bf73..62169a48df 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -83,7 +83,7 @@ Crossfade::Crossfade (boost::shared_ptr<AudioRegion> in, boost::shared_ptr<Audio _anchor_point = ap; _follow_overlap = false; - _active = Config->get_xfades_active (); + _active = _session.config.get_xfades_active (); _fixed = true; initialize (); @@ -428,7 +428,7 @@ Crossfade::refresh () if (_follow_overlap) { try { - compute (_in, _out, Config->get_xfade_model()); + compute (_in, _out, _session.config.get_xfade_model()); } catch (NoCrossfadeHere& err) { |