X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcross_linux.cc;h=919927fdacddd53cf14b7e05c79d9052718b5a76;hb=2695f450ca00654cef8709e4e3cfb4cf5de48fc7;hp=a3dbdebf2a4b9fb5e3c10a1959d0d2b5985c19c0;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index a3dbdebf2..919927fda 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -27,10 +27,8 @@
 #include "exceptions.h"
 #include "log.h"
 #include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <glib.h>
-extern "C" {
-#include <libavformat/avio.h>
-}
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
@@ -49,34 +47,15 @@ extern "C" {
 
 using std::cerr;
 using std::cout;
-using std::function;
 using std::ifstream;
 using std::list;
 using std::make_pair;
 using std::pair;
-using std::runtime_error;
-using std::shared_ptr;
 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,22 +89,12 @@ resources_path ()
 
 
 boost::filesystem::path
-xsd_path ()
-{
-	if (auto appdir = getenv("APPDIR")) {
-		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "xsd";
-	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
+libdcp_resources_path ()
 {
 	if (auto appdir = getenv("APPDIR")) {
-		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags";
+		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp";
 	}
-	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
+	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp";
 }
 
 
@@ -200,24 +169,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 +215,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)
@@ -368,7 +289,6 @@ bool
 Drive::unmount ()
 {
 	for (auto i: _mount_points) {
-		PrivilegeEscalator esc;
 		int const r = umount(i.string().c_str());
 		LOG_DISK("Tried to unmount %1 and got %2 and %3", i.string(), r, errno);
 		if (r == -1) {
@@ -379,47 +299,15 @@ Drive::unmount ()
 }
 
 
-void
-unprivileged ()
-{
-	uid_t ruid, euid, suid;
-	if (getresuid(&ruid, &euid, &suid) == -1) {
-		cerr << "getresuid() failed.\n";
-	}
-	if (seteuid(ruid) == -1) {
-		cerr << "seteuid() failed.\n";
-	}
-}
-
-
-bool PrivilegeEscalator::test = false;
-
-
-PrivilegeEscalator::~PrivilegeEscalator ()
-{
-	if (!test) {
-		unprivileged ();
-	}
-}
-
-
-PrivilegeEscalator::PrivilegeEscalator ()
-{
-	if (!test) {
-		int const r = seteuid(0);
-		if (r < 0) {
-			throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
-		}
-	}
-}
-
-
 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;
 }
 
@@ -430,17 +318,21 @@ disk_write_finished ()
 
 }
 
+bool
+show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path)
+{
+	int r = system ("which nautilus");
+	if (WEXITSTATUS(r) == 0) {
+		r = system (String::compose("nautilus \"%1\"", dir.string()).c_str());
+		return static_cast<bool>(WEXITSTATUS(r));
+	} else {
+		int r = system ("which konqueror");
+		if (WEXITSTATUS(r) == 0) {
+			r = system (String::compose("konqueror \"%1\"", dir.string()).c_str());
+			return static_cast<bool>(WEXITSTATUS(r));
+		}
+	}
 
-string
-dcpomatic::get_process_id ()
-{
-	return dcp::raw_convert<string>(getpid());
-}
-
-
-boost::filesystem::path
-fix_long_path (boost::filesystem::path path)
-{
-	return path;
+	return true;
 }