X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=14b8c71ba7bd9e23aa9425b5eaf27d1c8177ddbf;hb=769d56b7f3b2fe78036b4ba12c0cfe71734b379d;hp=2fcec28910013fea3ef54cfc8519cbb5a49272ad;hpb=18cb0e914922cd76e9c205e88962816970b5c0cb;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 2fcec2891..14b8c71ba 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -58,7 +58,6 @@ using std::make_pair;
 using std::pair;
 using std::string;
 using std::vector;
-using std::wstring;
 using boost::optional;
 
 
@@ -110,22 +109,12 @@ resources_path ()
 
 
 boost::filesystem::path
-xsd_path ()
+libdcp_resources_path ()
 {
 	if (auto appdir = getenv("APPDIR")) {
-		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "xsd";
+		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp";
 	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
-{
-	if (auto appdir = getenv("APPDIR")) {
-		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags";
-	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
+	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp";
 }
 
 
@@ -379,11 +368,14 @@ Drive::unmount ()
 
 
 boost::filesystem::path
-config_path ()
+config_path (optional<string> version)
 {
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	p /= "dcpomatic2";
+	if (version) {
+		p /= *version;
+	}
 	return p;
 }