X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=431b1d75e79d8ef299f9f024ad0dc408fff2d1b5;hb=7ba9223f9f43e1624f6d9b86534519a5f30f976c;hp=2fae8bd5a772de5509150316ef1921d78ee3c9c2;hpb=1aafc169559d6c389e87229daf1b0ae85a5e2daf;p=ardour.git

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 2fae8bd5a7..431b1d75e7 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -118,7 +118,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 +131,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);
@@ -338,14 +346,15 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
 
 static void
 write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status,
-                              vector<boost::shared_ptr<Source> >& newfiles)
+                              vector<boost::shared_ptr<Source> >& newfiles,
+                              bool split_type0)
 {
 	uint32_t buf_size = 4;
 	uint8_t* buf      = (uint8_t*) malloc (buf_size);
 
 	status.progress = 0.0f;
 	uint16_t num_tracks;
-	bool type0 = source->is_type0 ();
+	bool type0 = source->is_type0 () && split_type0;
 	const std::set<uint8_t>& chn = source->channels ();
 
 	if (type0) {
@@ -417,7 +426,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));
@@ -483,6 +492,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 ();
 
@@ -507,12 +517,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->is_type0 ()) {
+				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;
@@ -526,7 +549,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;
 
@@ -557,7 +580,7 @@ Session::import_files (ImportStatus& status)
 			write_audio_data_to_new_files (source.get(), status, newfiles);
 		} else if (smf_reader.get()) { // midi
 			status.doing_what = string_compose(_("Loading MIDI file %1"), *p);
-			write_midi_data_to_new_files (smf_reader.get(), status, newfiles);
+			write_midi_data_to_new_files (smf_reader.get(), status, newfiles, status.split_midi_channels);
 		}
 
 		++status.current;