diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-10-26 15:43:49 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-10-26 15:43:49 -0400 |
| commit | ceecbf2f4f6c44f1abb47e926a9f6552c7776c51 (patch) | |
| tree | 04d15a4a267429ced2a40bc02b202a5901b644eb /libs/ardour/import.cc | |
| parent | 8a0839f3327b4e8b4f4c5a626c08bcd4dfdeeee5 (diff) | |
switch from std::auto_ptr<> (deprecated) to boost::scoped_ptr<>
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index d06496f684..4c740c4d31 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -38,6 +38,7 @@ #include <glibmm.h> #include <boost/scoped_array.hpp> +#include <boost/scoped_ptr.hpp> #include <boost/shared_array.hpp> #include "pbd/basename.h" @@ -500,8 +501,9 @@ Session::import_files (ImportStatus& status) ++p) { boost::shared_ptr<ImportableSource> source; - std::auto_ptr<Evoral::SMF> smf_reader; + const DataType type = SMFSource::safe_midi_file_extension (*p) ? DataType::MIDI : DataType::AUDIO; + boost::scoped_ptr<Evoral::SMF> smf_reader; if (type == DataType::AUDIO) { try { @@ -515,7 +517,7 @@ Session::import_files (ImportStatus& status) } else { try { - smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF()); + smf_reader.reset (new Evoral::SMF()); if (smf_reader->open(*p)) { throw Evoral::SMF::FileError (*p); @@ -577,7 +579,7 @@ Session::import_files (ImportStatus& status) status.doing_what = compose_status_message (*p, source->samplerate(), sample_rate(), status.current, status.total); write_audio_data_to_new_files (source.get(), status, newfiles); - } else if (smf_reader.get()) { // midi + } else if (smf_reader) { // midi status.doing_what = string_compose(_("Loading MIDI file %1"), *p); write_midi_data_to_new_files (smf_reader.get(), status, newfiles, status.split_midi_channels); } |