Use glibmm to simplify my earlier efforts with 'user_config_directory()' and 'user_ca...

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

diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index 5ba01d83a415d3f3c5f2a8a6992a3ab1cc0ec57f..c368f8eaaf0e9a057d4ccef5a156149526fb1e47 100644 (file)
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -27,6 +27,7 @@ const char* const old_sound_dir_name = X_("sounds");
 const char* const sound_dir_name = X_("audiofiles");
 const char* const midi_dir_name = X_("midifiles");
 const char* const midi_patch_dir_name = X_("patchfiles");
+const char* const video_dir_name = X_("videofiles");
 const char* const peak_dir_name = X_("peaks");
 const char* const dead_dir_name = X_("dead");
 const char* const interchange_dir_name = X_("interchange");
@@ -35,13 +36,16 @@ const char* const export_formats_dir_name = X_("export");
 const char* const templates_dir_name = X_("templates");
 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 "3");
+#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
 
 }