#include "dcpomatic_log.h"
#include "exceptions.h"
#include "log.h"
-#include "warnings.h"
#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
#include <glib.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
extern "C" {
#include <libavformat/avio.h>
}
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
#if BOOST_VERSION >= 106100
#include <boost/dll/runtime_symbol_info.hpp>
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;
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";
}
#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 ()
{
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) {
}
-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;
}
}
-boost::filesystem::path
-fix_long_path (boost::filesystem::path path)
-{
- return path;
+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));
+ }
+ }
+
+ return true;
}