ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Rename import_audiofiles -> import_files. 

git-svn-id: svn://localhost/ardour2/branches/3.0@12628 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-06-09 15:04:11 +00:00
parent b130bc5973
commit de2d3057b5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_audio_import.cc
View File

@ -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;

2
libs/ardour/ardour/session.h
View File

@ -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);

2
libs/ardour/audio_region_importer.cc
View File

@ -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();

2
libs/ardour/import.cc
View File

@ -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;