ardour/livetrax
13
0
Fork 0
Code

Rename Session::import_audiofile to Session::import_audiofiles now that it imports more than a single file

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2676 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-11-15 02:32:35 +00:00
parent b5e959cc4c
commit a39a9ea2d4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_audio_import.cc
View File

@ -390,7 +390,7 @@ Editor::import_sndfiles (vector<ustring> paths, ImportMode mode, SrcQuality qual
track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH));
ARDOUR_UI::instance()->flush_pending (); 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. 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 * void *
Editor::import_thread () Editor::import_thread ()
{ {
session->import_audiofile (import_status); session->import_audiofiles (import_status);
pthread_exit_pbd (0); pthread_exit_pbd (0);
/*NOTREACHED*/ /*NOTREACHED*/
return 0; return 0;

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

@ -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); bool sample_rate_convert (import_status&, string infile, string& outfile);
string build_tmp_convert_name (string file); string build_tmp_convert_name (string file);

2
libs/ardour/import.cc
View File

@ -232,7 +232,7 @@ remove_file_source (boost::shared_ptr<AudioFileSource> file_source)
} }
int int
Session::import_audiofile (import_status& status) Session::import_audiofiles (import_status& status)
{ {
uint32_t cnt = 1; uint32_t cnt = 1;
typedef vector<boost::shared_ptr<AudioFileSource> > AudioSources; typedef vector<boost::shared_ptr<AudioFileSource> > AudioSources;