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

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 2fcec2891..015158aa8 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -26,14 +26,10 @@
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "log.h"
-#include "warnings.h"
+#include <dcp/filesystem.h>
 #include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <glib.h>
-DCPOMATIC_DISABLE_WARNINGS
-extern "C" {
-#include <libavformat/avio.h>
-}
-DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
@@ -58,25 +54,9 @@ using std::make_pair;
 using std::pair;
 using std::string;
 using std::vector;
-using std::wstring;
 using boost::optional;
 
 
-/** @param s Number of seconds to sleep for */
-void
-dcpomatic_sleep_seconds (int s)
-{
-	sleep (s);
-}
-
-
-void
-dcpomatic_sleep_milliseconds (int ms)
-{
-	usleep (ms * 1000);
-}
-
-
 /** @return A string of CPU information (model name etc.) */
 string
 cpu_info ()
@@ -110,29 +90,20 @@ 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 dcp::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp";
 }
 
 
 void
-run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
+run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool err, string args)
 {
-	string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
+	string const redirect = err ? "2>" : ">";
+	auto const ffprobe = String::compose("ffprobe %1 \"%2\" %3 \"%4\"", args.empty() ? " " : args, content.string(), redirect, out.string());
 	LOG_GENERAL (N_("Probing with %1"), ffprobe);
 	int const r = system (ffprobe.c_str());
 	if (r == -1 || (WIFEXITED(r) && WEXITSTATUS(r) != 0)) {
@@ -183,7 +154,7 @@ boost::filesystem::path
 openssl_path ()
 {
 	auto p = directory_containing_executable() / "dcpomatic2_openssl";
-	if (boost::filesystem::is_regular_file(p)) {
+	if (dcp::filesystem::is_regular_file(p)) {
 		return p;
 	}
 
@@ -200,24 +171,6 @@ disk_writer_path ()
 #endif
 
 
-/* Apparently there is no way to create an ofstream using a UTF-8
-   filename under Windows.  We are hence reduced to using fopen
-   with this wrapper.
-*/
-FILE *
-fopen_boost (boost::filesystem::path p, string t)
-{
-        return fopen(p.c_str(), t.c_str());
-}
-
-
-int
-dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
-{
-	return fseek (stream, offset, whence);
-}
-
-
 void
 Waker::nudge ()
 {
@@ -264,36 +217,6 @@ start_player ()
 }
 
 
-uint64_t
-thread_id ()
-{
-	return (uint64_t) pthread_self ();
-}
-
-
-int
-avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
-{
-	return avio_open (s, file.c_str(), flags);
-}
-
-
-boost::filesystem::path
-home_directory ()
-{
-	return getenv("HOME");
-}
-
-
-/** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
-bool
-running_32_on_64 ()
-{
-	/* I'm assuming nobody does this on Linux */
-	return false;
-}
-
-
 static
 vector<pair<string, string>>
 get_mounts (string prefix)
@@ -379,11 +302,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;
 }
 
@@ -394,21 +320,6 @@ disk_write_finished ()
 
 }
 
-
-string
-dcpomatic::get_process_id ()
-{
-	return dcp::raw_convert<string>(getpid());
-}
-
-
-boost::filesystem::path
-fix_long_path (boost::filesystem::path path)
-{
-	return path;
-}
-
-
 bool
 show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path)
 {