ardour/livetrax
13
0
Fork 0
Code

Catch errors instead of testing for nullptr

Browse Source
This commit is contained in:
Robin Gareus 2021-07-10 17:47:18 +02:00
parent cbbcdb4fe6
commit 0d8ee3e847
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
session_utils/fix_bbtppq.cc
View File

@ -94,10 +94,9 @@ ensure_per_region_source (Session* session, boost::shared_ptr<MidiRegion> region
*/ */
if (Glib::file_test (newsrc_path, Glib::FILE_TEST_EXISTS)) { if (Glib::file_test (newsrc_path, Glib::FILE_TEST_EXISTS)) {
Source::Flag flags = Source::Flag (Source::Writable | Source::CanRename); Source::Flag flags = Source::Flag (Source::Writable | Source::CanRename);
newsrc = boost::dynamic_pointer_cast<MidiSource>( try {
SourceFactory::createExternal(DataType::MIDI, *session, newsrc = boost::dynamic_pointer_cast<MidiSource> (SourceFactory::createExternal (DataType::MIDI, *session, newsrc_path, 1, flags));
newsrc_path, 1, flags)); } catch (failed_constructor& err) {
if (!newsrc) {
cout << UTILNAME << ":" << endl cout << UTILNAME << ":" << endl
<< " An error occurred creating external source from " << newsrc_path << " exiting." << endl; << " An error occurred creating external source from " << newsrc_path << " exiting." << endl;
session_fail (session); session_fail (session);
@ -120,9 +119,9 @@ ensure_per_region_source (Session* session, boost::shared_ptr<MidiRegion> region
<< " for region " << region->name() << endl; << " for region " << region->name() << endl;
} else { } else {
try {
newsrc = boost::dynamic_pointer_cast<MidiSource> (SourceFactory::createWritable (DataType::MIDI, *session, newsrc_path, session->sample_rate())); newsrc = boost::dynamic_pointer_cast<MidiSource> (SourceFactory::createWritable (DataType::MIDI, *session, newsrc_path, session->sample_rate()));
} catch (failed_constructor& err) {
if (!newsrc) {
cout << UTILNAME << ":" << endl cout << UTILNAME << ":" << endl
<< " An error occurred creating writeable source " << newsrc_path << " exiting." << endl; << " An error occurred creating writeable source " << newsrc_path << " exiting." << endl;
session_fail (session); session_fail (session);
@ -157,11 +156,9 @@ ensure_per_source_source (Session* session, boost::shared_ptr<MidiRegion> region
/* flags are ignored for external MIDI source */ /* flags are ignored for external MIDI source */
Source::Flag flags = Source::Flag (Source::Writable | Source::CanRename); Source::Flag flags = Source::Flag (Source::Writable | Source::CanRename);
newsrc = boost::dynamic_pointer_cast<MidiSource>( try {
SourceFactory::createExternal(DataType::MIDI, *session, newsrc = boost::dynamic_pointer_cast<MidiSource> (SourceFactory::createExternal (DataType::MIDI, *session, newsrc_path, 1, flags));
newsrc_path, 1, flags)); } catch (failed_constructor& err) {
if (!newsrc) {
cout << UTILNAME << ":" << endl cout << UTILNAME << ":" << endl
<< " An error occurred creating external source from " << newsrc_path << " exiting." << endl; << " An error occurred creating external source from " << newsrc_path << " exiting." << endl;
session_fail (session); session_fail (session);
@ -173,9 +170,9 @@ ensure_per_source_source (Session* session, boost::shared_ptr<MidiRegion> region
<< " for source " << region->midi_source(0)->name() << endl; << " for source " << region->midi_source(0)->name() << endl;
} else { } else {
newsrc = boost::dynamic_pointer_cast<MidiSource>( try {
SourceFactory::createWritable(DataType::MIDI, *session, newsrc_path, session->sample_rate())); newsrc = boost::dynamic_pointer_cast<MidiSource> (SourceFactory::createWritable (DataType::MIDI, *session, newsrc_path, session->sample_rate()));
if (!newsrc) { } catch (failed_constructor& err) {
cout << UTILNAME << ":" << endl cout << UTILNAME << ":" << endl
<<" An error occurred creating writeable source " << newsrc_path << " exiting." << endl; <<" An error occurred creating writeable source " << newsrc_path << " exiting." << endl;
session_fail (session); session_fail (session);