diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 13:34:47 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 13:45:17 -0400 |
| commit | 027d0efc2d949d7d5b1bb83560d17ffca5ba60d5 (patch) | |
| tree | a9e63ef246e13730e68fdd2954af20a82f4176a8 /libs/ardour/source_factory.cc | |
| parent | 1a25672239d66ac53f91f0bcbed1955f0c959931 (diff) | |
catch various libsmf errors rethrown as exceptions
Diffstat (limited to 'libs/ardour/source_factory.cc')
| -rw-r--r-- | libs/ardour/source_factory.cc | 62 |
1 files changed, 36 insertions, 26 deletions
diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index e211564408..8be55a8986 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -220,15 +220,18 @@ SourceFactory::create (Session& s, const XMLNode& node, bool defer_peaks) } } } else if (type == DataType::MIDI) { - boost::shared_ptr<SMFSource> src (new SMFSource (s, node)); - Source::Lock lock(src->mutex()); - src->load_model (lock, true); + try { + boost::shared_ptr<SMFSource> src (new SMFSource (s, node)); + Source::Lock lock(src->mutex()); + src->load_model (lock, true); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (src, "Source"); + // boost_debug_shared_ptr_mark_interesting (src, "Source"); #endif - src->check_for_analysis_data_on_disk (); - SourceCreated (src); - return src; + src->check_for_analysis_data_on_disk (); + SourceCreated (src); + return src; + } catch (...) { + } } return boost::shared_ptr<Source>(); @@ -289,18 +292,21 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, } else if (type == DataType::MIDI) { - boost::shared_ptr<SMFSource> src (new SMFSource (s, path)); - Source::Lock lock(src->mutex()); - src->load_model (lock, true); + try { + boost::shared_ptr<SMFSource> src (new SMFSource (s, path)); + Source::Lock lock(src->mutex()); + src->load_model (lock, true); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (src, "Source"); + // boost_debug_shared_ptr_mark_interesting (src, "Source"); #endif - if (announce) { - SourceCreated (src); - } + if (announce) { + SourceCreated (src); + } - return src; + return src; + } catch (...) { + } } @@ -339,22 +345,27 @@ SourceFactory::createWritable (DataType type, Session& s, const std::string& pat } else if (type == DataType::MIDI) { // XXX writable flags should belong to MidiSource too - boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags)); - assert (src->writable ()); + try { + boost::shared_ptr<SMFSource> src (new SMFSource (s, path, SndFileSource::default_writable_flags)); + + assert (src->writable ()); - Source::Lock lock(src->mutex()); - src->load_model (lock, true); + Source::Lock lock(src->mutex()); + src->load_model (lock, true); #ifdef BOOST_SP_ENABLE_DEBUG_HOOKS - // boost_debug_shared_ptr_mark_interesting (src, "Source"); + // boost_debug_shared_ptr_mark_interesting (src, "Source"); #endif - // no analysis data - this is a new file + // no analysis data - this is a new file - if (announce) { - SourceCreated (src); - } - return src; + if (announce) { + SourceCreated (src); + } + + return src; + } catch (...) { + } } return boost::shared_ptr<Source> (); @@ -455,4 +466,3 @@ SourceFactory::createFromPlaylist (DataType type, Session& s, boost::shared_ptr< return boost::shared_ptr<Source>(); } - |