X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=4c740c4d31d7a3449660c240da858c913f472fed;hb=5fcea5833df6f8562126683521f3c2ad6cb9f1e9;hp=90a15c9e78defd73ae21151d2bbcc754aa673812;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 90a15c9e78..4c740c4d31 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -34,10 +34,11 @@ #include #include -#include +#include "pbd/gstdio_compat.h" #include #include +#include #include #include "pbd/basename.h" @@ -47,7 +48,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" @@ -67,14 +67,14 @@ #include "ardour/caimportable.h" #endif -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; static boost::shared_ptr -open_importable_source (const string& path, framecnt_t samplerate, ARDOUR::SrcQuality quality) +open_importable_source (const string& path, samplecnt_t samplerate, ARDOUR::SrcQuality quality) { /* try libsndfile first, because it can get BWF info from .wav, which ExtAudioFile cannot. We don't necessarily need that information in an ImportableSource, but it keeps the @@ -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,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); @@ -176,7 +184,7 @@ static bool create_mono_sources_for_writing (const vector& new_paths, Session& sess, uint32_t samplerate, vector >& newfiles, - framepos_t timeline_position) + samplepos_t timeline_position) { for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { @@ -231,7 +239,7 @@ static void write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, vector >& newfiles) { - const framecnt_t nframes = ResampledImportableSource::blocksize; + const samplecnt_t nframes = ResampledImportableSource::blocksize; boost::shared_ptr afs; uint32_t channels = source->channels(); if (channels == 0) { @@ -265,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); + samplecnt_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,15 +294,15 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, progress_base = 0.5; } - framecnt_t read_count = 0; + samplecnt_t read_count = 0; while (!status.cancel) { - framecnt_t nread, nfread; + samplecnt_t nread, nfread; 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 */ @@ -317,7 +325,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, for (chn = 0; chn < channels; ++chn) { - framecnt_t n; + samplecnt_t n; for (x = chn, n = 0; n < nfread; x += channels, ++n) { channel_data[chn][n] = (Sample) data[x]; } @@ -338,26 +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); Glib::Threads::Mutex::Lock source_lock(smfs->mutex()); smfs->drop_model (source_lock); - source->seek_to_track (i); + if (type0) { + source->seek_to_start (); + } else { + source->seek_to_track (i); + } uint64_t t = 0; uint32_t delta_t = 0; @@ -385,6 +407,17 @@ 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 (source_lock); first = false; @@ -392,9 +425,9 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, smfs->append_event_beats( source_lock, - Evoral::Event( - 0, - Evoral::Beats::ticks_at_rate(t, source->ppqn()), + Evoral::Event( + Evoral::MIDI_EVENT, + Temporal::Beats::ticks_at_rate(t, source->ppqn()), size, buf)); @@ -407,9 +440,9 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, /* we wrote something */ - 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); + const samplepos_t pos = 0; + const Temporal::Beats length_beats = Temporal::Beats::ticks_at_rate(t, source->ppqn()); + BeatsSamplesConverter converter(smfs->session().tempo_map(), pos); smfs->update_length(pos + converter.to(length_beats.round_up_to_beat())); smfs->mark_streaming_write_completed (source_lock); @@ -417,10 +450,13 @@ 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->num_tracks()) << 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 (exception& e) { @@ -456,20 +492,22 @@ 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) { boost::shared_ptr source; - std::auto_ptr smf_reader; + const DataType type = SMFSource::safe_midi_file_extension (*p) ? DataType::MIDI : DataType::AUDIO; + boost::scoped_ptr smf_reader; if (type == DataType::AUDIO) { try { - source = open_importable_source (*p, frame_rate(), status.quality); + source = open_importable_source (*p, sample_rate(), status.quality); channels = source->channels(); } catch (const failed_constructor& err) { error << string_compose(_("Import: cannot open input sound file \"%1\""), (*p)) << endmsg; @@ -479,31 +517,49 @@ Session::import_files (ImportStatus& status) } else { try { - smf_reader = std::auto_ptr(new Evoral::SMF()); - smf_reader->open(*p); - channels = smf_reader->num_tracks(); + smf_reader.reset (new Evoral::SMF()); + + 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; + samplepos_t natural_position = source ? source->natural_position() : 0; if (status.replace_existing_source) { fatal << "THIS IS NOT IMPLEMENTED YET, IT SHOULD NEVER GET CALLED!!! DYING!" << endmsg; - status.cancel = !map_existing_mono_sources (new_paths, *this, frame_rate(), newfiles, this); + status.cancel = !map_existing_mono_sources (new_paths, *this, sample_rate(), newfiles, this); } else { - status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles, natural_position); + status.cancel = !create_mono_sources_for_writing (new_paths, *this, sample_rate(), newfiles, natural_position); } // copy on cancel/failure so that any files that were created will be removed below @@ -521,11 +577,11 @@ Session::import_files (ImportStatus& status) if (source) { // audio status.doing_what = compose_status_message (*p, source->samplerate(), - frame_rate(), status.current, status.total); + 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); + write_midi_data_to_new_files (smf_reader.get(), status, newfiles, status.split_midi_channels); } ++status.current; @@ -553,7 +609,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 */ @@ -591,7 +647,7 @@ Session::import_files (ImportStatus& status) } catch (...) { error << _("Failed to remove some files after failed/cancelled import operation") << endmsg; } - + } status.done = true;