diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/ardour/import.cc | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index d79c930e6d..d4afda8b5a 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -459,15 +459,16 @@ Session::import_audiofiles (import_status& status) if ((afs = boost::dynamic_pointer_cast<AudioFileSource>(*x)) != 0) { afs->update_header(0, *now, xnow); afs->done_with_peakfile_writes (); - } - - /* now that there is data there, requeue the file for analysis */ - if (Config->get_auto_analyse_audio()) { - Analyser::queue_source_for_analysis (boost::static_pointer_cast<Source>(*x), false); + /* now that there is data there, requeue the file for analysis */ + + if (Config->get_auto_analyse_audio()) { + Analyser::queue_source_for_analysis (boost::static_pointer_cast<Source>(*x), false); + } } - + /* don't create tracks for empty MIDI sources (channels) */ + if ((smfs = boost::dynamic_pointer_cast<SMFSource>(*x)) != 0 && smfs->is_empty()) { x = all_new_sources.erase(x); } else { |