*/
-#include <pbd/error.h>
-#include <pbd/filesystem_paths.h>
+#include "pbd/error.h"
+#include "pbd/filesystem_paths.h"
#include <glibmm/miscutils.h>
-#include <ardour/directory_names.h>
-#include <ardour/filesystem_paths.h>
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
#define WITH_STATIC_PATHS 1
+using namespace PBD;
+
namespace ARDOUR {
using std::string;
{
const string home_dir = Glib::get_home_dir ();
- if (home_dir.empty ())
- {
+ if (home_dir.empty ()) {
const string error_msg = "Unable to determine home directory";
// log the error
ardour_module_directory ()
{
sys::path module_directory(MODULE_DIR);
- module_directory /= "ardour2";
+ module_directory /= "ardour3";
return module_directory;
}
system_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("ardour2");
+ config_path.add_subdirectory_to_paths("ardour3");
return config_path;
}
system_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("ardour2");
+ data_path.add_subdirectory_to_paths("ardour3");
return data_path;
}