try not thinning when loading old-school automation lists

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 5dc5e4dbdef823bb31cf4fc796e5a6a4d37801ec..271de8f8495275b2cff6869c3c9a27d84c91bca6 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -17,16 +17,19 @@
 
 */
 #include <cstdlib>
+#include <iostream>
 
 #include "pbd/error.h"
-#include "pbd/filesystem_paths.h"
+#include "pbd/compose.h"
+#include "pbd/strsplit.h"
 
 #include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
 
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 
-#define WITH_STATIC_PATHS 1
+#include "i18n.h"
 
 using namespace PBD;
 
@@ -37,9 +40,15 @@ using std::string;
 sys::path
 user_config_directory ()
 {
-       const char* c = 0;
        sys::path p;
 
+#ifdef __APPLE__
+       p = Glib::get_home_dir();
+       p /= "Library/Preferences";
+
+#else
+       const char* c = 0;
+
        /* adopt freedesktop standards, and put .ardour3 into $XDG_CONFIG_HOME or ~/.config
         */
 
@@ -60,53 +69,94 @@ user_config_directory ()
                p = home_dir;
                p /= ".config";
        }
+#endif
 
        p /= user_config_dir_name;
 
+       std::string ps (p.to_string());
+
+       if (!Glib::file_test (ps, Glib::FILE_TEST_EXISTS)) {
+               if (g_mkdir_with_parents (ps.c_str(), 0755)) {
+                       error << string_compose (_("Cannot create Configuration directory %1 - cannot run"),
+                                                  ps) << endmsg;
+                       exit (1);
+               }
+       } else if (!Glib::file_test (ps, Glib::FILE_TEST_IS_DIR)) {
+               error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
+                                          ps) << endmsg;
+               exit (1);
+       }
+
        return p;
 }
 
 sys::path
-ardour_module_directory ()
-{
-       sys::path module_directory(MODULE_DIR);
-       module_directory /= "ardour3";
-       return module_directory;
-}
-
-SearchPath
-ardour_search_path ()
+ardour_dll_directory ()
 {
-       SearchPath spath_env(Glib::getenv("ARDOUR_PATH"));
-       return spath_env;
+       std::string s = Glib::getenv("ARDOUR_DLL_PATH");
+       if (s.empty()) {
+               std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
+               ::exit (1);
+       }       
+       return sys::path (s);
 }
 
 SearchPath
-system_config_search_path ()
+ardour_config_search_path ()
 {
-#ifdef WITH_STATIC_PATHS
-       SearchPath config_path(string(CONFIG_DIR));
-#else
-       SearchPath config_path(system_config_directories());
-#endif
-
-       config_path.add_subdirectory_to_paths("ardour3");
+       static bool have_path = false;
+       static SearchPath search_path;
+
+       if (!have_path) {
+               SearchPath sp (user_config_directory());
+               
+               std::string s = Glib::getenv("ARDOUR_CONFIG_PATH");
+               if (s.empty()) {
+                       std::cerr << _("ARDOUR_CONFIG_PATH not set in environment - exiting\n");
+                       ::exit (1);
+               }
+               
+               std::vector<string> ss;
+               split (s, ss, ':');
+               for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
+                       sp += sys::path (*i);
+               }
+               
+               search_path = sp;
+               have_path = true;
+               std::cerr << "CONFIG PATH: " << search_path.to_string() << std::endl;
+       }
 
-       return config_path;
+       return search_path;
 }
 
 SearchPath
-system_data_search_path ()
+ardour_data_search_path ()
 {
-#ifdef WITH_STATIC_PATHS
-       SearchPath data_path(string(DATA_DIR));
-#else
-       SearchPath data_path(system_data_directories());
-#endif
-
-       data_path.add_subdirectory_to_paths("ardour3");
+       static bool have_path = false;
+       static SearchPath search_path;
+
+       if (!have_path) {
+               SearchPath sp (user_config_directory());
+               
+               std::string s = Glib::getenv("ARDOUR_DATA_PATH");
+               if (s.empty()) {
+                       std::cerr << _("ARDOUR_DATA_PATH not set in environment - exiting\n");
+                       ::exit (1);
+               }
+               
+               std::vector<string> ss;
+               split (s, ss, ':');
+               for (std::vector<string>::iterator i = ss.begin(); i != ss.end(); ++i) {
+                       sp += sys::path (*i);
+               }
+               
+               search_path = sp;
+               have_path = true;
+               std::cerr << "DATA PATH: " << search_path.to_string() << std::endl;
+       }
 
-       return data_path;
+       return search_path;
 }
 
 } // namespace ARDOUR