diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-12 19:10:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-09-12 19:10:04 +0000 |
| commit | 71df552f0a85858f2119adafcbd70fc851444257 (patch) | |
| tree | 77cc368bd4d4c2d82b4a9622c8a10b24116f4e04 /gtk2_ardour/editor_audio_import.cc | |
| parent | 0a38cee852134ff5d2632c02517e2a00e2c52ca2 (diff) | |
make big clock be on top ALWAYS; more design fixes for async peak building; fix up peakfile name screw up but WITHOUT back-compatibility
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2461 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 6a482b5438..0633b5ccaf 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -19,6 +19,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <sys/time.h> #include <errno.h> #include <unistd.h> @@ -589,8 +590,6 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64 region_name = region_name_from_path (afs->path(), false, true, sources.size(), n); - cerr << "got region name " << region_name << endl; - regions.push_back (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0, Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)))); @@ -619,7 +618,7 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64 for (vector<boost::shared_ptr<AudioRegion> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { finish_bringing_in_audio (*r, input_chan, output_chan, pos, mode, track); - + if (target_tracks != 1) { track.reset (); } else { @@ -627,6 +626,12 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64 } } + /* setup peak file building in another thread */ + + for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) { + SourceFactory::setup_peakfile (*x, true); + } + return 0; } @@ -634,7 +639,6 @@ int Editor::finish_bringing_in_audio (boost::shared_ptr<AudioRegion> region, uint32_t in_chans, uint32_t out_chans, nframes64_t& pos, ImportMode mode, boost::shared_ptr<AudioTrack>& existing_track) { - switch (mode) { case ImportAsRegion: /* relax, its been done */ |