diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2007-09-04 09:01:25 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2007-09-04 09:01:25 +0000 |
| commit | d07c90b003d7680eb4e0fd91e526ce8b5596de92 (patch) | |
| tree | 0a361e22f54896e76d796316bbdebf81bf748647 | |
| parent | d8d24a7521853c9f3610f7a02e4197ac8fa3a3eb (diff) | |
Use PBD::get_files_in_directory instead of PBD::Scanner in Session::remove_empty_sounds
git-svn-id: svn://localhost/ardour2/trunk@2409 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/session.cc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index bdb47415ec..d20f0fcf90 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -40,6 +40,7 @@ #include <pbd/stl_delete.h> #include <pbd/basename.h> #include <pbd/stacktrace.h> +#include <pbd/file_utils.h> #include <ardour/audioengine.h> #include <ardour/configuration.h> @@ -3374,10 +3375,9 @@ Session::RoutePublicOrderSorter::operator() (boost::shared_ptr<Route> a, boost:: void Session::remove_empty_sounds () { - PathScanner scanner; + vector<string> audio_filenames; - vector<string *>* possible_audiofiles = scanner (_session_dir->sound_path().to_string (), - Config->get_possible_audio_file_regexp (), false, true); + get_files_in_directory (_session_dir->sound_path(), audio_filenames); Glib::Mutex::Lock lm (source_lock); @@ -3394,27 +3394,26 @@ Session::remove_empty_sounds () return; } - for (vector<string *>::iterator i = possible_audiofiles->begin(); i != possible_audiofiles->end(); ++i) { + for (vector<string>::iterator i = audio_filenames.begin(); i != audio_filenames.end(); ++i) { - /* never remove files that appear to be a tape track */ + // never remove files that appear to be a tape track - if (regexec (&compiled_tape_track_pattern, (*i)->c_str(), 0, 0, 0) == 0) { - delete *i; + if (regexec (&compiled_tape_track_pattern, i->c_str(), 0, 0, 0) == 0) { continue; } + + sys::path audio_file_path (_session_dir->sound_path()); + + audio_file_path /= *i; - if (AudioFileSource::is_empty (*this, *(*i))) { + if (AudioFileSource::is_empty (*this, audio_file_path.to_string())) { - unlink ((*i)->c_str()); + unlink (audio_file_path.to_string().c_str()); - string peak_path = peak_path_from_audio_path (**i); + string peak_path = peak_path_from_audio_path (audio_file_path.to_string()); unlink (peak_path.c_str()); } - - delete* i; } - - delete possible_audiofiles; } bool |