Merge branch 'master' into windows
[ardour.git] / libs / ardour / filesystem_paths.cc
index 834b1b33319d2bf6eb42638a238cc54ad9b350e8..54f7508b659d92ce55b34410dcbbd1fb35b26f1b 100644 (file)
@@ -21,8 +21,6 @@
 
 #include "pbd/error.h"
 #include "pbd/compose.h"
-#include "pbd/strsplit.h"
-#include "pbd/filesystem.h"
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
@@ -41,12 +39,12 @@ using std::string;
 std::string
 user_config_directory ()
 {
-       sys::path p;
+       static std::string p;
 
-#ifdef __APPLE__
-       p = Glib::get_home_dir();
-       p /= "Library/Preferences";
+       if (!p.empty()) return p;
 
+#ifdef __APPLE__
+       p = Glib::build_filename (Glib::get_home_dir(), "Library/Preferences");
 #else
        const char* c = 0;
 
@@ -59,100 +57,100 @@ user_config_directory ()
                const string home_dir = Glib::get_home_dir();
 
                if (home_dir.empty ()) {
-                       const string error_msg = "Unable to determine home directory";
-
-                       // log the error
-                       error << error_msg << endmsg;
-
-                       throw sys::filesystem_error(error_msg);
+                       error << "Unable to determine home directory" << endmsg;
+                       exit (1);
                }
 
                p = home_dir;
-               p /= ".config";
+               p = Glib::build_filename (p, ".config");
        }
 #endif
 
-       p /= user_config_dir_name;
-
-       std::string ps (p.to_string());
+       p = Glib::build_filename (p, user_config_dir_name);
 
-       if (!Glib::file_test (ps, Glib::FILE_TEST_EXISTS)) {
-               if (g_mkdir_with_parents (ps.c_str(), 0755)) {
+       if (!Glib::file_test (p, Glib::FILE_TEST_EXISTS)) {
+               if (g_mkdir_with_parents (p.c_str(), 0755)) {
                        error << string_compose (_("Cannot create Configuration directory %1 - cannot run"),
-                                                  ps) << endmsg;
+                                                  p) << endmsg;
                        exit (1);
                }
-       } else if (!Glib::file_test (ps, Glib::FILE_TEST_IS_DIR)) {
+       } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
                error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
-                                          ps) << endmsg;
+                                          p) << endmsg;
                exit (1);
        }
 
-       return p.to_string();
+       return p;
 }
 
 std::string
 ardour_dll_directory ()
 {
+#ifdef PLATFORM_WINDOWS
+       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       dll_dir_path = Glib::build_filename (dll_dir_path, "lib");
+       return Glib::build_filename (dll_dir_path, "ardour3");
+#else
        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 s;
+#endif
+}
+
+#ifdef PLATFORM_WINDOWS
+Searchpath
+windows_search_path ()
+{
+       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       dll_dir_path = Glib::build_filename (dll_dir_path, "share");
+       return Glib::build_filename (dll_dir_path, "ardour3");
 }
+#endif
 
-SearchPath
+Searchpath
 ardour_config_search_path ()
 {
-       static bool have_path = false;
-       static SearchPath search_path;
+       static Searchpath search_path;
 
-       if (!have_path) {
-               SearchPath sp (user_config_directory());
-               
+       if (search_path.empty()) {
+               search_path += user_config_directory();
+#ifdef PLATFORM_WINDOWS
+               search_path += windows_search_path ();
+#else
                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 += *i;
-               }
-               
-               search_path = sp;
-               have_path = true;
+               search_path += Searchpath (s);
+#endif
        }
 
        return search_path;
 }
 
-SearchPath
+Searchpath
 ardour_data_search_path ()
 {
-       static bool have_path = false;
-       static SearchPath search_path;
+       static Searchpath search_path;
 
-       if (!have_path) {
-               SearchPath sp (user_config_directory());
-               
+       if (search_path.empty()) {
+               search_path += user_config_directory();
+#ifdef PLATFORM_WINDOWS
+               search_path += windows_search_path ();
+#else
                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 += *i;
-               }
-               
-               search_path = sp;
-               have_path = true;
+               search_path += Searchpath (s);
+#endif
        }
 
        return search_path;