diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-03 02:41:56 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-03 02:41:56 +0000 |
| commit | 45d35d0732e18501762dc7c9bc87b519c2590447 (patch) | |
| tree | 7d7a9b3ec7b0d06075f5a49bca2667b9266e2d44 /libs/ardour/session_state.cc | |
| parent | c6468d181f28654b90a9e5686a662f6696c130f5 (diff) | |
move all destructive functionality into SndFileSource as a mode, and drop DestructiveFileSource; make ardour save changes to destructive-xfade-msecs
git-svn-id: svn://localhost/ardour2/trunk@1065 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index d9c82f546b..603d3a5c2d 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -185,7 +185,7 @@ Session::first_stage_init (string fullpath, string snapshot_name) /* default short fade = 15ms */ Crossfade::set_short_xfade_length ((nframes_t) floor (Config->get_short_xfade_seconds() * frame_rate())); - DestructiveFileSource::setup_standard_crossfades (frame_rate()); + SndFileSource::setup_standard_crossfades (frame_rate()); last_mmc_step.tv_sec = 0; last_mmc_step.tv_usec = 0; @@ -838,13 +838,12 @@ Session::state(bool full_state) boost::shared_ptr<AudioFileSource> fs; if ((fs = boost::dynamic_pointer_cast<AudioFileSource> (siter->second)) != 0) { - boost::shared_ptr<DestructiveFileSource> dfs = boost::dynamic_pointer_cast<DestructiveFileSource> (fs); /* destructive file sources are OK if they are empty, because we will re-use them every time. */ - if (!dfs) { + if (!fs->destructive()) { if (fs->length() == 0) { continue; } |