X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=deba3efb05f916c1e19ba0e220fac3e4a5e393d8;hb=0bee288b5d6c6ca1fb33b8bc3b584c6d2c3d3364;hp=61eb959829878318a2c9f4c5ff7401e6ae0d24ef;hpb=f4ac9430f3fc2c405334f3f02fe08a5782454396;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 61eb959829..deba3efb05 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -73,7 +73,7 @@ using namespace ARDOUR; using namespace PBD; static boost::shared_ptr -open_importable_source (const string& path, nframes_t samplerate, ARDOUR::SrcQuality quality) +open_importable_source (const string& path, framecnt_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 @@ -117,50 +117,62 @@ open_importable_source (const string& path, nframes_t samplerate, ARDOUR::SrcQua } static std::string -get_non_existent_filename (DataType type, const bool allow_replacing, const std::string& destdir, const std::string& basename, uint channel, uint channels) +get_non_existent_filename (HeaderFormat hf, DataType type, const bool allow_replacing, const std::string& destdir, const std::string& basename, uint channel, uint channels) { char buf[PATH_MAX+1]; bool goodfile = false; - string base(basename); - const char* ext = (type == DataType::AUDIO) ? "wav" : "mid"; + 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) { - snprintf (buf, sizeof(buf), "%s-L.wav", base.c_str()); + 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 { - snprintf (buf, sizeof(buf), "%s-R.wav", base.c_str()); + 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) { - snprintf (buf, sizeof(buf), "%s-c%d.%s", base.c_str(), channel, ext); + 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 { - snprintf (buf, sizeof(buf), "%s.%s", base.c_str(), ext); + 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)) { - - /* if the file already exists, we must come up with - * a new name for it. for now we just keep appending - * _ to basename - */ - - base += "_"; + + cnt++; } else { goodfile = true; } - } while ( !goodfile); + } while (!goodfile); return buf; } static vector -get_paths_for_new_sources (const bool allow_replacing, const string& import_file_path, const string& session_dir, uint channels) +get_paths_for_new_sources (HeaderFormat hf, const bool allow_replacing, const string& import_file_path, const string& session_dir, uint channels) { vector new_paths; const string basename = basename_nosuffix (import_file_path); @@ -169,14 +181,13 @@ get_paths_for_new_sources (const bool allow_replacing, const string& import_file for (uint n = 0; n < channels; ++n) { - const DataType type = (import_file_path.rfind(".mid") != string::npos) - ? DataType::MIDI : DataType::AUDIO; + const DataType type = SMFSource::safe_midi_file_extension (import_file_path) ? DataType::MIDI : DataType::AUDIO; std::string filepath = (type == DataType::MIDI) ? sdir.midi_path().to_string() : sdir.sound_path().to_string(); - filepath += '/'; - filepath += get_non_existent_filename (type, allow_replacing, filepath, basename, n, channels); + filepath = Glib::build_filename (filepath, + get_non_existent_filename (hf, type, allow_replacing, filepath, basename, n, channels)); new_paths.push_back (filepath); } @@ -203,27 +214,27 @@ map_existing_mono_sources (const vector& new_paths, Session& /*sess*/, } static bool -create_mono_sources_for_writing (const vector& new_paths, Session& sess, - uint samplerate, vector >& newfiles, +create_mono_sources_for_writing (const string& origin, + const vector& new_paths, + Session& sess, uint samplerate, + vector >& newfiles, framepos_t timeline_position) { - for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) - { - boost::shared_ptr source; + for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { - try - { - const DataType type = ((*i).rfind(".mid") != string::npos) - ? DataType::MIDI : DataType::AUDIO; + boost::shared_ptr source; + try { + const DataType type = SMFSource::safe_midi_file_extension (*i) ? DataType::MIDI : DataType::AUDIO; source = SourceFactory::createWritable (type, sess, - i->c_str(), - false, // destructive - samplerate); + i->c_str(), + origin, + false, // destructive + samplerate); } - catch (const failed_constructor& err) - { + + catch (const failed_constructor& err) { error << string_compose (_("Unable to create file %1 during import"), *i) << endmsg; return false; } @@ -242,31 +253,28 @@ create_mono_sources_for_writing (const vector& new_paths, Session& sess, return true; } -static Glib::ustring +static string compose_status_message (const string& path, uint file_samplerate, uint session_samplerate, - uint current_file, - uint total_files) + uint /* current_file */, + uint /* total_files */) { if (file_samplerate != session_samplerate) { - return string_compose (_("resampling %1 from %2kHz to %3kHz\n(%4 of %5)"), + return string_compose (_("Resampling %1 from %2kHz to %3kHz"), Glib::path_get_basename (path), file_samplerate/1000.0f, - session_samplerate/1000.0f, - current_file, total_files); + session_samplerate/1000.0f); } - - return string_compose (_("copying %1\n(%2 of %3)"), - Glib::path_get_basename (path), - current_file, total_files); + + return string_compose (_("Copying %1"), Glib::path_get_basename (path)); } static void write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, vector >& newfiles) { - const nframes_t nframes = ResampledImportableSource::blocksize; + const framecnt_t nframes = ResampledImportableSource::blocksize; boost::shared_ptr afs; uint channels = source->channels(); @@ -297,7 +305,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, uint read_count = 0; while (!status.cancel) { - nframes_t const nread = source->read (data.get(), nframes); + framecnt_t const nread = source->read (data.get(), nframes); if (nread == 0) { break; } @@ -322,7 +330,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, while (!status.cancel) { - nframes_t nread, nfread; + framecnt_t nread, nfread; uint x; uint chn; @@ -341,7 +349,7 @@ write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, for (chn = 0; chn < channels; ++chn) { - nframes_t n; + framecnt_t n; for (x = chn, n = 0; n < nfread; x += channels, ++n) { channel_data[chn][n] = (Sample) data[x]; } @@ -383,9 +391,12 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, bool first = true; while (!status.cancel) { - size = buf_size; + gint ignored; // imported files either don't have NoteID's or + // we ignore them. - int ret = source->read_event(&delta_t, &size, &buf); + size = buf_size; + + int ret = source->read_event(&delta_t, &size, &buf, &ignored); if (size > buf_size) buf_size = size; @@ -413,7 +424,7 @@ write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, status.progress += 0.01; } - const nframes64_t pos = 0; + 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)); @@ -442,7 +453,6 @@ remove_file_source (boost::shared_ptr source) void Session::import_audiofiles (ImportStatus& status) { - uint32_t cnt = 1; typedef vector > Sources; Sources all_new_sources; boost::shared_ptr afs; @@ -451,14 +461,13 @@ Session::import_audiofiles (ImportStatus& status) status.sources.clear (); - for (vector::iterator p = status.paths.begin(); - p != status.paths.end() && !status.cancel; - ++p, ++cnt) + for (vector::iterator p = status.paths.begin(); + p != status.paths.end() && !status.cancel; + ++p) { boost::shared_ptr source; std::auto_ptr smf_reader; - const DataType type = ((*p).rfind(".mid") != string::npos) ? - DataType::MIDI : DataType::AUDIO; + const DataType type = SMFSource::safe_midi_file_extension (*p) ? DataType::MIDI : DataType::AUDIO; if (type == DataType::AUDIO) { try { @@ -482,7 +491,8 @@ Session::import_audiofiles (ImportStatus& status) } } - vector new_paths = get_paths_for_new_sources (status.replace_existing_source, *p, + 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); Sources newfiles; @@ -492,7 +502,7 @@ Session::import_audiofiles (ImportStatus& status) 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); } else { - status.cancel = !create_mono_sources_for_writing (new_paths, *this, frame_rate(), newfiles, natural_position); + status.cancel = !create_mono_sources_for_writing (*p, new_paths, *this, frame_rate(), newfiles, natural_position); } // copy on cancel/failure so that any files that were created will be removed below @@ -510,12 +520,15 @@ Session::import_audiofiles (ImportStatus& status) if (source) { // audio status.doing_what = compose_status_message (*p, source->samplerate(), - frame_rate(), cnt, status.total); + frame_rate(), status.current, status.total); 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); } + + ++status.current; + status.progress = 0; } if (!status.cancel) {