X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=431b1d75e79d8ef299f9f024ad0dc408fff2d1b5;hb=7ba9223f9f43e1624f6d9b86534519a5f30f976c;hp=e86e500ed93ff6d12308e5c8db4b289a749c5aee;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index e86e500ed9..431b1d75e7 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -34,7 +34,7 @@ #include #include -#include +#include "pbd/gstdio_compat.h" #include #include @@ -67,7 +67,7 @@ #include "ardour/caimportable.h" #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -118,7 +118,9 @@ open_importable_source (const string& path, framecnt_t samplerate, ARDOUR::SrcQu } vector -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 const & smf_track_names) + { vector new_paths; const string basename = basename_nosuffix (import_file_path); @@ -129,8 +131,19 @@ Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& impo string filepath; switch (type) { - case DataType::MIDI: - filepath = new_midi_source_path (basename); + 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 { + 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); @@ -229,6 +242,9 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, const framecnt_t nframes = ResampledImportableSource::blocksize; boost::shared_ptr afs; uint32_t channels = source->channels(); + if (channels == 0) { + return; + } boost::scoped_array data(new float[nframes * channels]); vector > channel_data; @@ -257,14 +273,14 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, uint32_t read_count = 0; while (!status.cancel) { - framecnt_t const nread = source->read (data.get(), nframes); + framecnt_t const nread = source->read (data.get(), nframes * channels); if (nread == 0) { break; } - peak = compute_peak (data.get(), nread, peak); + peak = compute_peak (data.get(), nread * channels, peak); - read_count += nread; + read_count += nread / channels; status.progress = 0.5 * read_count / (source->ratio() * source->length() * channels); } @@ -286,7 +302,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, uint32_t x; uint32_t chn; - if ((nread = source->read (data.get(), nframes)) == 0) { + if ((nread = source->read (data.get(), nframes * channels)) == 0) { #ifdef PLATFORM_WINDOWS /* Flush the data once we've finished importing the file. Windows can */ /* cache the data for very long periods of time (perhaps not writing */ @@ -330,24 +346,40 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, static void write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, - vector >& newfiles) + vector >& 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 () && split_type0; + const std::set& chn = source->channels (); - assert (newfiles.size() == source->num_tracks()); + if (type0) { + num_tracks = source->channels().size(); + } else { + num_tracks = source->num_tracks(); + } + assert (newfiles.size() == num_tracks); try { vector >::iterator s = newfiles.begin(); + std::set::const_iterator cur_chan = chn.begin(); - for (unsigned i = 1; i <= source->num_tracks(); ++i) { + for (unsigned i = 1; i <= num_tracks; ++i) { boost::shared_ptr smfs = boost::dynamic_pointer_cast (*s); - smfs->drop_model (); - source->seek_to_track (i); + Glib::Threads::Mutex::Lock source_lock(smfs->mutex()); + + smfs->drop_model (source_lock); + if (type0) { + source->seek_to_start (); + } else { + source->seek_to_track (i); + } uint64_t t = 0; uint32_t delta_t = 0; @@ -375,16 +407,29 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, continue; } + // type-0 files separate by channel + if (type0) { + uint8_t type = buf[0] & 0xf0; + uint8_t chan = buf[0] & 0x0f; + if (type >= 0x80 && type <= 0xE0) { + if (chan != *cur_chan) { + continue; + } + } + } + if (first) { - smfs->mark_streaming_write_started (); + smfs->mark_streaming_write_started (source_lock); first = false; } - smfs->append_event_unlocked_beats( - Evoral::Event(0, - (double)t / (double)source->ppqn(), - size, - buf)); + smfs->append_event_beats( + source_lock, + Evoral::Event( + Evoral::MIDI_EVENT, + Evoral::Beats::ticks_at_rate(t, source->ppqn()), + size, + buf)); if (status.progress < 0.99) { status.progress += 0.01; @@ -395,24 +440,27 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, /* we wrote something */ - const framepos_t pos = 0; - const double length_beats = ceil(t / (double)source->ppqn()); + const framepos_t pos = 0; + const Evoral::Beats length_beats = Evoral::Beats::ticks_at_rate(t, source->ppqn()); BeatsFramesConverter converter(smfs->session().tempo_map(), pos); - smfs->update_length(pos + converter.to(length_beats)); - smfs->mark_streaming_write_completed (); + smfs->update_length(pos + converter.to(length_beats.round_up_to_beat())); + smfs->mark_streaming_write_completed (source_lock); if (status.cancel) { break; } } else { - warning << 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, num_tracks) << endmsg; } ++s; // next source + if (type0) { + ++cur_chan; + } } - } 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) { @@ -425,6 +473,8 @@ remove_file_source (boost::shared_ptr source) { boost::shared_ptr fs = boost::dynamic_pointer_cast (source); + fs->DropReferences (); + if (fs) { ::g_unlink (fs->path().c_str()); } @@ -442,10 +492,11 @@ Session::import_files (ImportStatus& status) boost::shared_ptr afs; boost::shared_ptr smfs; uint32_t channels = 0; + vector smf_names; status.sources.clear (); - for (vector::iterator p = status.paths.begin(); + for (vector::const_iterator p = status.paths.begin(); p != status.paths.end() && !status.cancel; ++p) { @@ -466,21 +517,39 @@ Session::import_files (ImportStatus& status) } else { try { smf_reader = std::auto_ptr(new Evoral::SMF()); - smf_reader->open(*p); - channels = smf_reader->num_tracks(); + + 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; status.done = status.cancel = true; return; } } - + if (channels == 0) { error << _("Import: file contains no channels.") << endmsg; continue; } - vector new_paths = get_paths_for_new_sources (status.replace_existing_source, *p, channels); + vector 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; @@ -511,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; @@ -539,7 +608,7 @@ Session::import_files (ImportStatus& status) Analyser::queue_source_for_analysis (boost::static_pointer_cast(*x), false); } } - + /* imported, copied files cannot be written or removed */ @@ -577,7 +646,7 @@ Session::import_files (ImportStatus& status) } catch (...) { error << _("Failed to remove some files after failed/cancelled import operation") << endmsg; } - + } status.done = true;