diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 21:24:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 21:24:09 +0000 |
| commit | 2c2f7a2fcccac98401b533b98ea7a41dbca1cf57 (patch) | |
| tree | 02401739a02b5a8894273643a5a80df53964f556 | |
| parent | f38036cf739f80700942af913ec33d88e260ff57 (diff) | |
clean up settings of various bundle paths
git-svn-id: svn://localhost/ardour2/branches/3.0@10593 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/main.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 4d092cd28a..6c868978b1 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -140,8 +140,7 @@ fixup_bundle_environment (int, char* []) _NSGetExecutablePath (execpath, &pathsz); - std::string exec_path (execpath); - std::string dir_path = Glib::path_get_dirname (exec_path); + std::string dir_path = Glib::path_get_dirname (execpath); std::string path; const char *cstr = getenv ("PATH"); @@ -169,9 +168,9 @@ fixup_bundle_environment (int, char* []) path = dir_path; path += "/../Resources"; path += dir_path; - path += "/../Resources/Surfaces"; + path += "/../Surfaces"; path += dir_path; - path += "/../Resources/Panners"; + path += "/../Panners"; setenv ("ARDOUR_MODULE_PATH", path.c_str(), 1); @@ -296,8 +295,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) EnvironmentalProtectionAgency::set_global_epa (new EnvironmentalProtectionAgency (true, "PREBUNDLE_ENV")); - Glib::ustring exec_path = argv[0]; - Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (exec_path)); + Glib::ustring dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0])); Glib::ustring path; Glib::ustring userconfigdir = user_config_directory().to_string(); |