Move directory names out of Session class and into directory_names.h/cc files

git-svn-id: svn://localhost/ardour2/trunk@1873 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 34 insertions, 14 deletions

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 9ae82096b5..23d67074b7 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -29,6 +29,7 @@ ardour.Append(CPPPATH = '#libs/surfaces/control_protocol')
 ardour_files=Split("""
 chan_count.cc
 diskstream.cc
+directory_names.cc
 filename_extensions.cc
 find_session.cc
 track.cc
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
new file mode 100644
index 0000000000..ff327e6ad9
--- /dev/null
+++ b/libs/ardour/ardour/directory_names.h
@@ -0,0 +1,18 @@
+
+#ifndef __ardour_directory_names_h__
+#define __ardour_directory_names_h__
+
+#include <string>
+
+namespace ARDOUR {
+
+extern const char* const old_sound_dir_name;
+extern const char* const sound_dir_name;
+extern const char* const dead_sound_dir_name;
+extern const char* const interchange_dir_name;
+extern const char* const peak_dir_name;
+extern const char* const export_dir_name;
+
+};
+
+#endif
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 5811efc234..7310c0dc62 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1558,13 +1558,6 @@ class Session : public PBD::StatefulDestructible
 	vector<space_and_path>::iterator last_rr_session_dir;
 	uint32_t _total_free_4k_blocks;
 	Glib::Mutex space_lock;
-
-	static const char* old_sound_dir_name;
-	static const char* sound_dir_name;
-	static const char* dead_sound_dir_name;
-	static const char* interchange_dir_name;
-	static const char* peak_dir_name;
-	static const char* export_dir_name;
 	
 	string old_sound_dir (bool with_path = true) const;
 	string discover_best_sound_dir (bool destructive = false);
diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
new file mode 100644
index 0000000000..ca8ed45643
--- /dev/null
+++ b/libs/ardour/directory_names.cc
@@ -0,0 +1,14 @@
+#include <ardour/directory_names.h>
+
+#include "i18n.h"
+
+namespace ARDOUR {                       
+
+const char* const old_sound_dir_name = X_("sounds");
+const char* const sound_dir_name = X_("audiofiles");
+const char* const peak_dir_name = X_("peaks");
+const char* const dead_sound_dir_name = X_("dead_sounds");
+const char* const interchange_dir_name = X_("interchange");
+const char* const export_dir_name = X_("export");
+
+}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 30ac4b28c7..9a858daca0 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -91,13 +91,6 @@ static const int CPU_CACHE_ALIGN = 64;
 static const int CPU_CACHE_ALIGN = 16; /* arguably 32 on most arches, but it matters less */
 #endif
 
-const char* Session::old_sound_dir_name = X_("sounds");
-const char* Session::sound_dir_name = X_("audiofiles");
-const char* Session::peak_dir_name = X_("peaks");
-const char* Session::dead_sound_dir_name = X_("dead_sounds");
-const char* Session::interchange_dir_name = X_("interchange");
-const char* Session::export_dir_name = X_("export");
-
 sigc::signal<int> Session::AskAboutPendingState;
 sigc::signal<void> Session::SendFeedback;
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index ccbb62b0dc..798c7045d0 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -97,6 +97,7 @@
 #include <ardour/source_factory.h>
 #include <ardour/playlist_factory.h>
 #include <ardour/filename_extensions.h>
+#include <ardour/directory_names.h>
 #include <control_protocol/control_protocol.h>
 
 #include "i18n.h"