X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=2b3f1058792b60b8fcb18fe41851cfcf40cf59d6;hb=7eab4c6f339777a0e5bd202ff851bdce466cb183;hp=b66f3542249bcb042e771c8e405bd97ff57fbbf4;hpb=59076a7e4c66db12bbbfbf01f012ca2f6ba4bf56;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index b66f354224..2b3f105879 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -117,78 +117,36 @@ open_importable_source (const string& path, framecnt_t samplerate, ARDOUR::SrcQu } } -static std::string -get_non_existent_filename (HeaderFormat hf, DataType type, const bool allow_replacing, const std::string& destdir, const std::string& basename, uint32_t channel, uint32_t channels) -{ - char buf[PATH_MAX+1]; - bool goodfile = false; - string base = basename; - string ext = native_header_format_extension (hf, type); - uint32_t cnt = 1; - - do { - - if (type == DataType::AUDIO && channels == 2) { - if (channel == 0) { - if (cnt == 1) { - snprintf (buf, sizeof(buf), "%s-L%s", base.c_str(), ext.c_str()); - } else { - snprintf (buf, sizeof(buf), "%s-%d-L%s", base.c_str(), cnt, ext.c_str()); - } - } else { - if (cnt == 1) { - snprintf (buf, sizeof(buf), "%s-R%s", base.c_str(), ext.c_str()); - } else { - snprintf (buf, sizeof(buf), "%s-%d-R%s", base.c_str(), cnt, ext.c_str()); - } - } - } else if (channels > 1) { - if (cnt == 1) { - snprintf (buf, sizeof(buf), "%s-c%d%s", base.c_str(), channel, ext.c_str()); - } else { - snprintf (buf, sizeof(buf), "%s-%d-c%d%s", base.c_str(), cnt, channel, ext.c_str()); - } - } else { - if (cnt == 1) { - snprintf (buf, sizeof(buf), "%s%s", base.c_str(), ext.c_str()); - } else { - snprintf (buf, sizeof(buf), "%s-%d%s", base.c_str(), cnt, ext.c_str()); - } - } - - string tempname = destdir + "/" + buf; - - if (!allow_replacing && Glib::file_test (tempname, Glib::FILE_TEST_EXISTS)) { - - cnt++; - - } else { - - goodfile = true; - } - - } while (!goodfile); - - return buf; -} - -static vector -get_paths_for_new_sources (HeaderFormat hf, const bool allow_replacing, const string& import_file_path, const string& session_dir, uint32_t channels) +vector +Session::get_paths_for_new_sources (bool /*allow_replacing*/, const string& import_file_path, uint32_t channels) { vector new_paths; const string basename = basename_nosuffix (import_file_path); - SessionDirectory sdir(session_dir); - for (uint32_t n = 0; n < channels; ++n) { const DataType type = SMFSource::safe_midi_file_extension (import_file_path) ? DataType::MIDI : DataType::AUDIO; + 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); + } else { + filepath = new_midi_source_path (basename); + } + break; + case DataType::AUDIO: + filepath = new_audio_source_path (basename, channels, n, false, false); + break; + } - std::string filepath = (type == DataType::MIDI) - ? sdir.midi_path() : sdir.sound_path(); + if (filepath.empty()) { + error << string_compose (_("Cannot find new filename for imported file %1"), import_file_path) << endmsg; + return vector(); + } - filepath = Glib::build_filename (filepath, - get_non_existent_filename (hf, type, allow_replacing, filepath, basename, n, channels)); new_paths.push_back (filepath); } @@ -202,7 +160,7 @@ map_existing_mono_sources (const vector& new_paths, Session& /*sess*/, for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { - boost::shared_ptr source = session->source_by_path_and_channel(*i, 0); + boost::shared_ptr source = session->audio_source_by_path_and_channel(*i, 0); if (source == 0) { error << string_compose(_("Could not find a source for %1 even though we are updating this file!"), (*i)) << endl; @@ -276,6 +234,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; @@ -325,7 +286,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, progress_base = 0.5; } - uint32_t read_count = 0; + framecnt_t read_count = 0; while (!status.cancel) { @@ -393,7 +354,9 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, boost::shared_ptr smfs = boost::dynamic_pointer_cast (*s); - smfs->drop_model (); + Glib::Threads::Mutex::Lock source_lock(smfs->mutex()); + + smfs->drop_model (source_lock); source->seek_to_track (i); uint64_t t = 0; @@ -423,15 +386,17 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, } 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( + 0, + Evoral::MusicalTime::ticks_at_rate(t, source->ppqn()), + size, + buf)); if (status.progress < 0.99) { status.progress += 0.01; @@ -442,11 +407,11 @@ 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()); - BeatsFramesConverter converter(smfs->session().tempo_map(), pos); - smfs->update_length(pos + converter.to(length_beats)); - smfs->mark_streaming_write_completed (); + const framepos_t pos = 0; + const Evoral::MusicalTime length_beats = Evoral::MusicalTime::ticks_at_rate(t, source->ppqn()); + BeatsFramesConverter 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); if (status.cancel) { break; @@ -472,6 +437,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()); } @@ -521,11 +488,13 @@ Session::import_files (ImportStatus& status) return; } } + + if (channels == 0) { + error << _("Import: file contains no channels.") << endmsg; + continue; + } - vector new_paths = get_paths_for_new_sources (config.get_native_file_header_format(), - status.replace_existing_source, *p, - get_best_session_directory_for_new_source (), - channels); + vector new_paths = get_paths_for_new_sources (status.replace_existing_source, *p, channels); Sources newfiles; framepos_t natural_position = source ? source->natural_position() : 0;