diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-06-09 15:04:11 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-06-09 15:04:11 +0000 |
| commit | de2d3057b5393eb17ab1e4d7d4bbf79c8f3c7836 (patch) | |
| tree | 73adbaec517cb1d058f23f5d4be456e374734510 | |
| parent | b130bc597363a2ef8dc166265076c982cb497c1d (diff) | |
Rename import_audiofiles -> import_files.
git-svn-id: svn://localhost/ardour2/branches/3.0@12628 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audio_region_importer.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/import.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 46cd59dcd5..bfb44aa5f3 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -209,7 +209,7 @@ Editor::session_import_dialog () typedef std::map<PBD::ID,boost::shared_ptr<ARDOUR::Source> > SourceMap; /** - * Updating is still disabled, see note in libs/ardour/import.cc Session::import_audiofiles() + * Updating is still disabled, see note in libs/ardour/import.cc Session::import_files() * * all_or_nothing: * true = show "Update", "Import" and "Skip" @@ -546,7 +546,7 @@ Editor::import_sndfiles (vector<string> paths, ImportMode mode, SrcQuality quali set_canvas_cursor (_cursors->wait); gdk_flush (); - /* start import thread for this spec. this will ultimately call Session::import_audiofiles() + /* start import thread for this spec. this will ultimately call Session::import_files() which, if successful, will add the files as regions to the region list. its up to us (the GUI) to direct additional steps after that. */ @@ -989,7 +989,7 @@ Editor::_import_thread (void *arg) void * Editor::import_thread () { - _session->import_audiofiles (import_status); + _session->import_files (import_status); pthread_exit_pbd (0); /*NOTREACHED*/ return 0; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 36a0733a3d..d47734f6ae 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -529,7 +529,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* source management */ - void import_audiofiles (ImportStatus&); + void import_files (ImportStatus&); bool sample_rate_convert (ImportStatus&, std::string infile, std::string& outfile); std::string build_tmp_convert_name (std::string file); diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index 91c362d042..c4755ec1f5 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -356,7 +356,7 @@ AudioRegionImporter::prepare_sources () // import files // TODO: threading & exception handling - session.import_audiofiles (status); + session.import_files (status); // Add imported sources to handlers map std::vector<string>::iterator file_it = status.paths.begin(); diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 17b396961a..2ae51cd471 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -474,7 +474,7 @@ remove_file_source (boost::shared_ptr<Source> source) // is disabled at the GUI until the Source implementations are able to provide // the necessary API. void -Session::import_audiofiles (ImportStatus& status) +Session::import_files (ImportStatus& status) { typedef vector<boost::shared_ptr<Source> > Sources; Sources all_new_sources; |