Rename Session::import_audiofile to Session::import_audiofiles now that it imports...

git-svn-id: svn://localhost/ardour2/trunk@2676 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 193e98b58aa131a35129561f758f50a67cf30467..ff91dc227cf59d79172c7a81db826c1b26e7b040 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -390,7 +390,7 @@ Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality qual
        track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
        ARDOUR_UI::instance()->flush_pending ();
 
-       /* start import thread for this spec. this will ultimately call Session::import_audiofile()
+       /* start import thread for this spec. this will ultimately call Session::import_audiofiles()
           and if successful will add the file(s) as a region to the session region list.
        */
        
@@ -742,7 +742,7 @@ Editor::_import_thread (void *arg)
 void *
 Editor::import_thread ()
 {
-       session->import_audiofile (import_status);
+       session->import_audiofiles (import_status);
        pthread_exit_pbd (0);
        /*NOTREACHED*/
        return 0;

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 579521fd2cc7f934604b5e08f59dbbb96c200328..0b5b2e83ef60216b2458b6419049756c9ad958c3 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -582,7 +582,7 @@ class Session : public PBD::StatefulDestructible
            
        };
 
-       int import_audiofile (import_status&);
+       int import_audiofiles (import_status&);
        bool sample_rate_convert (import_status&, string infile, string& outfile);
        string build_tmp_convert_name (string file);
 

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index 0aee2edf62e35f51d5ff44b5481f1711af3adcd6..acde11aef7ce2ed87bb9566e28f3baf67348fdc2 100644 (file)
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -232,7 +232,7 @@ remove_file_source (boost::shared_ptr<AudioFileSource> file_source)
 }
 
 int
-Session::import_audiofile (import_status& status)
+Session::import_audiofiles (import_status& status)
 {
        uint32_t cnt = 1;
        typedef vector<boost::shared_ptr<AudioFileSource> > AudioSources;