Use jack_client_stop_thread on windows

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index cd78397f3e6e98b7d01939d93b9f3f7f2c91ae8e..4c7e996e462830efab0289a1ee69a08316817b65 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -39,7 +39,9 @@ using std::string;
 std::string
 user_config_directory ()
 {
-       std::string p;
+       static std::string p;
+
+       if (!p.empty()) return p;
 
 #ifdef __APPLE__
        p = Glib::build_filename (Glib::get_home_dir(), "Library/Preferences");
@@ -84,13 +86,29 @@ user_config_directory ()
 std::string
 ardour_dll_directory ()
 {
+#ifdef WIN32
+       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 WIN32
+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
 ardour_config_search_path ()
@@ -99,7 +117,9 @@ ardour_config_search_path ()
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-               
+#ifdef WIN32
+               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");
@@ -107,6 +127,7 @@ ardour_config_search_path ()
                }
                
                search_path += SearchPath (s);
+#endif
        }
 
        return search_path;
@@ -119,7 +140,9 @@ ardour_data_search_path ()
 
        if (search_path.empty()) {
                search_path += user_config_directory();
-               
+#ifdef WIN32
+               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");
@@ -127,6 +150,7 @@ ardour_data_search_path ()
                }
                
                search_path += SearchPath (s);
+#endif
        }
 
        return search_path;