store the count of imported files in the import_status record, and initialize it...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5827 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 902093b342d77b793c8cbe6caf97e433e4bf9167..9476dc836c24a6ecf6b9b848ba87b00c2fb98519 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -284,6 +284,9 @@ Editor::get_nth_selected_audio_track (int nth) const
 void
 Editor::do_import (vector<ustring> paths, ImportDisposition chns, ImportMode mode, SrcQuality quality, nframes64_t& pos)
 {
+       //this is where an import "starts" so initialize the count here ... the rest gets initialized in import_sndfiles()
+       import_status.count = 0;
+
        boost::shared_ptr<AudioTrack> track;
        vector<ustring> to_import;
        int nth = 0;

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index dc9c4701b6b2415769e4c553d027c53759780f31..012ebd3f75f7c4ec744ae08e82aeb774bbad9f3f 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -606,6 +606,7 @@ class Session : public PBD::StatefulDestructible
            
            /* control info */
            uint32_t total;
+           uint32_t count;
            SrcQuality quality;
            volatile bool freeze;
            std::vector<Glib::ustring> paths;

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 18747b1beb021b8df4b77c055de6f2d8705bfbf6..30bcaa891af99f749fee36a4edc63bbad29c6b92 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -307,7 +307,6 @@ remove_file_source (boost::shared_ptr<AudioFileSource> file_source)
 void
 Session::import_audiofiles (import_status& status)
 {
-       uint32_t cnt = 1;
        typedef vector<boost::shared_ptr<AudioFileSource> > AudioSources;
        AudioSources all_new_sources;
 
@@ -315,8 +314,10 @@ Session::import_audiofiles (import_status& status)
        
        for (vector<Glib::ustring>::iterator p = status.paths.begin();
                        p != status.paths.end() && !status.cancel;
-                       ++p, ++cnt)
+                       ++p)
        {
+               status.count++;
+
                boost::shared_ptr<ImportableSource> source;
                
                try
@@ -355,7 +356,7 @@ Session::import_audiofiles (import_status& status)
                }
 
                status.doing_what = compose_status_message (*p, source->samplerate(),
-                               frame_rate(), cnt, status.total);
+                               frame_rate(), status.count, status.total);
 
                write_audio_data_to_new_files (source.get(), status, newfiles);
        }