diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-25 17:42:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-01-25 17:42:19 +0000 |
| commit | 5ee3e58718f65ef9eb62a1b90d424dac68e770ff (patch) | |
| tree | 10c4b9215d32e108878141124b07f6320f7d70e3 /libs/ardour/source_factory.cc | |
| parent | 1c61d4007a2fb3b6ea1a84ced86338cb65a66363 (diff) | |
fix import/embed of multichannel audiofiles, as per #1433
git-svn-id: svn://localhost/ardour2/trunk@1386 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/source_factory.cc')
| -rw-r--r-- | libs/ardour/source_factory.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 9b8382c39f..2cbd7624be 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -97,12 +97,12 @@ SourceFactory::create (Session& s, const XMLNode& node) #ifdef HAVE_COREAUDIO boost::shared_ptr<Source> -SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag flags, bool announce) +SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce) { if (!(flags & Destructive)) { try { - boost::shared_ptr<Source> ret (new CoreAudioSource (s, idstr, flags)); + boost::shared_ptr<Source> ret (new CoreAudioSource (s, path, chn, flags)); if (setup_peakfile (ret)) { return boost::shared_ptr<Source>(); } @@ -113,7 +113,7 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f } catch (failed_constructor& err) { - boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); + boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags)); if (setup_peakfile (ret)) { return boost::shared_ptr<Source>(); } @@ -125,7 +125,7 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f } else { - boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); + boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags)); if (setup_peakfile (ret)) { return boost::shared_ptr<Source>(); } @@ -141,9 +141,9 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f #else boost::shared_ptr<Source> -SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag flags, bool announce) +SourceFactory::createReadable (Session& s, string path, int chn, AudioFileSource::Flag flags, bool announce) { - boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); + boost::shared_ptr<Source> ret (new SndFileSource (s, path, chn, flags)); if (setup_peakfile (ret)) { return boost::shared_ptr<Source>(); |