fix plugin silence runs (e.g. during audition)

[ardour.git] / libs / ardour / session_directory.cc

diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc
index 46c4bf024a344929fbc4267577e664bfd3e89fcf..3a4d049e3a1b38ab322e50232d72ce1512268989 100644 (file)
--- a/libs/ardour/session_directory.cc
+++ b/libs/ardour/session_directory.cc
@@ -24,6 +24,7 @@
 #include "pbd/error.h"
 #include "pbd/compose.h"
 #include "pbd/file_utils.h"
+#include "pbd/openuri.h"
 
 #include "ardour/directory_names.h"
 #include "ardour/session_directory.h"
@@ -91,8 +92,6 @@ SessionDirectory::old_sound_path () const
        return Glib::build_filename (m_root_path, old_sound_dir_name);
 }
 
-static bool leading_dot (const std::string& value) { return value.at(0) == '.'; }
-
 const std::string
 SessionDirectory::sources_root () const
 {
@@ -142,10 +141,20 @@ SessionDirectory::sources_root () const
        try {
                Glib::Dir dir(sources_root_path);
 
-               std::list<std::string> entries (dir.begin(), dir.end());
+               std::list<std::string> entries;
 
-               // filter out dirs starting with a dot. e.g ".DS_Store"
-               entries.remove_if (leading_dot);
+               for (Glib::DirIterator di = dir.begin(); di != dir.end(); di++) {
+                       // ignore hidden files (eg. OS X ".DS_Store")
+                       if ((*di).at(0) == '.') {
+                               continue;
+                       }
+                       // and skip regular files (eg. Win Thumbs.db)
+                       string fullpath = Glib::build_filename (sources_root_path, *di);
+                       if (!Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR)) {
+                               continue;
+                       }
+                       entries.push_back(*di);
+               }
 
                if (entries.size() == 1) {
                        if (entries.front() != legalized_root) {
@@ -154,6 +163,7 @@ SessionDirectory::sources_root () const
                        root_cache[m_root_path] = Glib::build_filename (sources_root_path, entries.front());
                }
                else if (entries.size() > 1) {
+                       PBD::open_folder (sources_root_path);
                        PBD::fatal << string_compose (_("The session's interchange dir is tainted.\nThere is more than one folder in '%1'.\nPlease remove extra subdirs to reduce possible filename ambiguties."), sources_root_path) << endmsg;
                        assert (0); // not reached
                }