X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fimport.cc;h=deba3efb05f916c1e19ba0e220fac3e4a5e393d8;hb=0bee288b5d6c6ca1fb33b8bc3b584c6d2c3d3364;hp=c3352a61272b18a8c02bb365bede5cf903e36c64;hpb=a5e74a774c6e1b39672392e26ee48385c4ac0034;p=ardour.git diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index c3352a6127..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 @@ -121,40 +121,52 @@ get_non_existent_filename (HeaderFormat hf, DataType type, const bool allow_repl { char buf[PATH_MAX+1]; bool goodfile = false; - string base(basename); + 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%s", base.c_str(), ext.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%s", base.c_str(), ext.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.c_str()); + 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.c_str()); + 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; } @@ -202,26 +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) - { + for (vector::const_iterator i = new_paths.begin(); i != new_paths.end(); ++i) { + boost::shared_ptr source; - try - { + 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; } @@ -240,12 +253,12 @@ 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"), @@ -261,7 +274,7 @@ 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(); @@ -292,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; } @@ -317,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; @@ -336,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]; } @@ -411,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)); @@ -448,7 +461,7 @@ Session::import_audiofiles (ImportStatus& status) status.sources.clear (); - for (vector::iterator p = status.paths.begin(); + for (vector::iterator p = status.paths.begin(); p != status.paths.end() && !status.cancel; ++p) { @@ -489,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