Remove unused method.

[ardour.git] / libs / ardour / import.cc

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 4fc546ebd5259e26dd3668db62d286c0681cfa1f..deba3efb05f916c1e19ba0e220fac3e4a5e393d8 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -73,7 +73,7 @@ using namespace ARDOUR;
 using namespace PBD;
 
 static boost::shared_ptr<ImportableSource>
-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;
 }
@@ -262,7 +274,7 @@ static void
 write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status,
                               vector<boost::shared_ptr<Source> >& newfiles)
 {
-       const nframes_t nframes = ResampledImportableSource::blocksize;
+       const framecnt_t nframes = ResampledImportableSource::blocksize;
        boost::shared_ptr<AudioFileSource> afs;
        uint channels = source->channels();
 
@@ -293,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;
                        }
@@ -318,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;
 
@@ -337,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];
                        }