set + store signal chain latency for all processors; DiskWriter sets its capture_offs...

[ardour.git] / libs / ardour / import.cc

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 36dc48e65194c8e789b425429b43a8faa101c5d4..8a2c3ad9bbbd8e164ec1a26845a676b7245a78c5 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -47,7 +47,6 @@
 
 #include "ardour/analyser.h"
 #include "ardour/ardour.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioregion.h"
 #include "ardour/import_status.h"
@@ -118,7 +117,9 @@ open_importable_source (const string& path, framecnt_t samplerate, ARDOUR::SrcQu
 }
 
 vector<string>
-Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& import_file_path, uint32_t channels)
+Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& import_file_path, uint32_t channels,
+                                    vector<string> const & smf_track_names)
+
 {
        vector<string> new_paths;
        const string basename = basename_nosuffix (import_file_path);
@@ -129,13 +130,19 @@ Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& impo
                string filepath;
 
                switch (type) {
-                 case DataType::MIDI:
-                               if (channels > 1) {
-                                       string mchn_name = string_compose ("%1-t%2", basename, n);
-                                       filepath = new_midi_source_path (mchn_name);
+               case DataType::MIDI:
+                       assert (smf_track_names.empty() || smf_track_names.size() == channels);
+                       if (channels > 1) {
+                               string mchn_name;
+                               if (smf_track_names.empty() || smf_track_names[n].empty()) {
+                                       mchn_name = string_compose ("%1-t%2", basename, n);
                                } else {
-                                       filepath = new_midi_source_path (basename);
+                                       mchn_name = string_compose ("%1-%2", basename, smf_track_names[n]);
                                }
+                               filepath = new_midi_source_path (mchn_name);
+                       } else {
+                               filepath = new_midi_source_path (basename);
+                       }
                        break;
                case DataType::AUDIO:
                        filepath = new_audio_source_path (basename, channels, n, false, false);
@@ -418,7 +425,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
                                smfs->append_event_beats(
                                        source_lock,
                                        Evoral::Event<Evoral::Beats>(
-                                               0,
+                                               Evoral::MIDI_EVENT,
                                                Evoral::Beats::ticks_at_rate(t, source->ppqn()),
                                                size,
                                                buf));
@@ -484,6 +491,7 @@ Session::import_files (ImportStatus& status)
        boost::shared_ptr<AudioFileSource> afs;
        boost::shared_ptr<SMFSource> smfs;
        uint32_t channels = 0;
+       vector<string> smf_names;
 
        status.sources.clear ();
 
@@ -508,12 +516,25 @@ Session::import_files (ImportStatus& status)
                } else {
                        try {
                                smf_reader = std::auto_ptr<Evoral::SMF>(new Evoral::SMF());
-                               smf_reader->open(*p);
+
+                               if (smf_reader->open(*p)) {
+                                       throw Evoral::SMF::FileError (*p);
+                               }
 
                                if (smf_reader->is_type0 () && status.split_midi_channels) {
                                        channels = smf_reader->channels().size();
                                } else {
                                        channels = smf_reader->num_tracks();
+                                       switch (status.midi_track_name_source) {
+                                       case SMFTrackNumber:
+                                               break;
+                                       case SMFTrackName:
+                                               smf_reader->track_names (smf_names);
+                                               break;
+                                       case SMFInstrumentName:
+                                               smf_reader->instrument_names (smf_names);
+                                               break;
+                                       }
                                }
                        } catch (...) {
                                error << _("Import: error opening MIDI file") << endmsg;
@@ -527,7 +548,7 @@ Session::import_files (ImportStatus& status)
                        continue;
                }
 
-               vector<string> new_paths = get_paths_for_new_sources (status.replace_existing_source, *p, channels);
+               vector<string> new_paths = get_paths_for_new_sources (status.replace_existing_source, *p, channels, smf_names);
                Sources newfiles;
                framepos_t natural_position = source ? source->natural_position() : 0;