diff options
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/import.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/smf_source.cc | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 3ed028ef91..90a15c9e78 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -417,14 +417,14 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, break; } } else { - info << string_compose (_("Track %1 of %2 contained no usable MIDI data"), i, source->file_path()) << endmsg; + info << string_compose (_("Track %1 of %2 contained no usable MIDI data"), i, source->num_tracks()) << endmsg; } ++s; // next source } - } catch (...) { - error << string_compose (_("MIDI file %1 was not readable (no reason available)"), source->file_path()) << endmsg; + } catch (exception& e) { + error << string_compose (_("MIDI file could not be written (best guess: %1)"), e.what()) << endmsg; } if (buf) { diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index d5c89b5ee9..d2d96247fc 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -546,7 +546,7 @@ SMFSource::mark_midi_streaming_write_completed (const Lock& lm, Evoral::Sequence _model->set_edited(false); } - Evoral::SMF::end_write (); + Evoral::SMF::end_write (_path); /* data in the file now, not removable */ @@ -726,7 +726,7 @@ SMFSource::flush_midi (const Lock& lock) ensure_disk_file (lock); - Evoral::SMF::end_write (); + Evoral::SMF::end_write (_path); /* data in the file means its no longer removable */ mark_nonremovable (); @@ -737,7 +737,6 @@ void SMFSource::set_path (const string& p) { FileSource::set_path (p); - SMF::set_path (_path); } /** Ensure that this source has some file on disk, even if it's just a SMF header */ |