Don't assume compiler can avoid copy to const ref.

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

diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index 6fb15eaabd399ffce5232e1b601d34b6160f3506..43238ba45afa687d3a90862883aefbffabbc66a5 100644 (file)
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -38,12 +38,14 @@ const char* const route_templates_dir_name = X_("route_templates");
 const char* const surfaces_dir_name = X_("surfaces");
 const char* const ladspa_dir_name = X_("ladspa");
 const char* const panner_dir_name = X_("panners");
+const char* const backend_dir_name = X_("backends");
 
-/* these should end up using variants of PROGRAM_NAME */
-#ifdef __APPLE__
-const char* const user_config_dir_name = X_("Ardour" "3");
+char config_dir_name[] = X_(PROGRAM_NAME PROGRAM_VERSION);
+#if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
+const char* const user_config_dir_name = config_dir_name;
 #else
-const char* const user_config_dir_name = X_("ardour" "3");
+#include "pbd/convert.h"
+const char* const user_config_dir_name = PBD::downcase (config_dir_name);
 #endif
 
 }