diff options
| author | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-11-19 16:45:16 +0000 |
| commit | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (patch) | |
| tree | 9b30d87b6670aadce365c9b112321dd674a0bab4 /libs/ardour/source_factory.cc | |
| parent | af105afe6cde5b0088647cea7d5e4e3314f8478b (diff) | |
Merged with trunk R1141
git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/source_factory.cc')
| -rw-r--r-- | libs/ardour/source_factory.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index e9564a6193..001af609dc 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -110,7 +110,7 @@ SourceFactory::create (Session& s, const XMLNode& node) return ret; } - + return boost::shared_ptr<Source>(); } @@ -163,7 +163,6 @@ SourceFactory::create (Session& s, const XMLNode& node) boost::shared_ptr<Source> SourceFactory::createReadable (DataType type, Session& s, string idstr, AudioFileSource::Flag flags, bool announce) { -<<<<<<< .working if (type == DataType::AUDIO) { if (flags & Destructive) { boost::shared_ptr<Source> ret (new DestructiveFileSource (s, idstr, flags)); @@ -197,7 +196,7 @@ SourceFactory::createReadable (DataType type, Session& s, string idstr, AudioFil return ret; } - + return boost::shared_ptr<Source>(); } @@ -220,9 +219,6 @@ SourceFactory::createReadable (DataType type, Session& s, string idstr, AudioFil } else if (type == DataType::MIDI) { boost::shared_ptr<Source> ret (new SMFSource (s, idstr, SMFSource::Flag(0))); // FIXME: flags? - if (setup_peakfile (ret)) { - return boost::shared_ptr<Source>(); - } if (announce) { SourceCreated (ret); } @@ -239,7 +235,6 @@ boost::shared_ptr<Source> SourceFactory::createWritable (DataType type, Session& s, std::string path, bool destructive, nframes_t rate, bool announce) { /* this might throw failed_constructor(), which is OK */ - if (type == DataType::AUDIO) { if (destructive) { |