diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-30 14:02:26 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-30 14:02:26 -0400 |
commit | b691d4bf04b46059c09e144e34fc58504926ef06 (patch) | |
tree | fca444144590883ef1b3b6b77da1c85104b51429 /gtk2_ardour | |
parent | 864ce8f0d1aaefdbf7cb582b9ed34d669e81c468 (diff) |
fix up some confusion with filesources' _origin and _file_is_new members. if _origin is set, it means that the file is "external" to the session (aka "embedded") and for some purposes this is more significant than _file_is_new. rename SourceFactory::createReadable() to ::createExternal() to more clearly indicate its purpose; remove never-supplied "origin" argument from SourceFactor::createWritable(). Fixes problems caused by 864ce8f0
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 3a120c709f..31ccdb7a53 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -612,7 +612,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile, if ((s = _session->source_by_path_and_channel (path, n)) == 0) { source = boost::dynamic_pointer_cast<AudioFileSource> ( - SourceFactory::createReadable (DataType::AUDIO, *_session, + SourceFactory::createExternal (DataType::AUDIO, *_session, path, n, (mode == ImportAsTapeTrack ? Source::Destructive diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 78e7674042..877a39e773 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -274,7 +274,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region) try { fs = boost::dynamic_pointer_cast<AudioFileSource> ( SourceFactory::createWritable (DataType::AUDIO, *_session, - path, string(), true, + path, true, false, _session->frame_rate())); } @@ -413,7 +413,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list try { fs = boost::dynamic_pointer_cast<AudioFileSource> ( SourceFactory::createWritable (DataType::AUDIO, *_session, - path, string(), true, + path, true, false, _session->frame_rate())); } diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 20c2875d9c..3383cf3ff9 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -340,9 +340,9 @@ SoundFileBox::audition () for (int n = 0; n < sf_info.channels; ++n) { try { afs = boost::dynamic_pointer_cast<AudioFileSource> ( - SourceFactory::createReadable (DataType::AUDIO, *_session, - path, n, Source::Flag (0), false)); - + SourceFactory::createExternal (DataType::AUDIO, *_session, + path, n, Source::Flag (0), false)); + srclist.push_back(afs); } catch (failed_constructor& err) { |