diff options
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/import.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 193e98b58a..ff91dc227c 100644 --- 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 579521fd2c..0b5b2e83ef 100644 --- 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 0aee2edf62..acde11aef7 100644 --- 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; |