/*
- Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "cross.h"
+
#include "compose.hpp"
-#include "log.h"
-#include "dcpomatic_log.h"
#include "config.h"
-#include "exceptions.h"
+#include "cross.h"
+#include "dcpomatic_log.h"
#include "dcpomatic_log.h"
+#include "exceptions.h"
+#include "log.h"
+#include "warnings.h"
#include <dcp/raw_convert.h>
#include <glib.h>
+DCPOMATIC_DISABLE_WARNINGS
extern "C" {
#include <libavformat/avio.h>
}
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-#include <boost/function.hpp>
-#ifdef DCPOMATIC_DISK
+#if BOOST_VERSION >= 106100
#include <boost/dll/runtime_symbol_info.hpp>
#endif
#include <unistd.h>
#include "i18n.h"
-using std::pair;
-using std::list;
-using std::ifstream;
-using std::string;
-using std::wstring;
-using std::make_pair;
-using std::vector;
+
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 boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using std::wstring;
using boost::optional;
-using boost::function;
+
/** @param s Number of seconds to sleep for */
void
sleep (s);
}
+
void
dcpomatic_sleep_milliseconds (int ms)
{
usleep (ms * 1000);
}
+
/** @return A string of CPU information (model name etc.) */
string
cpu_info ()
return info;
}
+
boost::filesystem::path
-shared_path ()
+resources_path ()
{
- char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
- if (p) {
- return p;
+ return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
+}
+
+
+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 ()
+{
+ if (auto appdir = getenv("APPDIR")) {
+ return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags";
}
- return boost::filesystem::canonical (LINUX_SHARE_PREFIX);
+ return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
}
+
void
run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
{
string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
LOG_GENERAL (N_("Probing with %1"), ffprobe);
- system (ffprobe.c_str ());
+ int const r = system (ffprobe.c_str());
+ if (r == -1 || (WIFEXITED(r) && WEXITSTATUS(r) != 0)) {
+ LOG_GENERAL (N_("Could not run ffprobe (system returned %1"), r);
+ }
}
-list<pair<string, string> >
+
+list<pair<string, string>>
mount_info ()
{
- list<pair<string, string> > m;
+ list<pair<string, string>> m;
- FILE* f = setmntent ("/etc/mtab", "r");
+ auto f = setmntent ("/etc/mtab", "r");
if (!f) {
return m;
}
return m;
}
+
+boost::filesystem::path
+directory_containing_executable ()
+{
+#if BOOST_VERSION >= 106100
+ return boost::dll::program_location().parent_path();
+#else
+ char buffer[PATH_MAX];
+ ssize_t N = readlink ("/proc/self/exe", buffer, PATH_MAX);
+ return boost::filesystem::path(string(buffer, N)).parent_path();
+#endif
+}
+
+
boost::filesystem::path
openssl_path ()
{
+ auto p = directory_containing_executable() / "dcpomatic2_openssl";
+ if (boost::filesystem::is_regular_file(p)) {
+ return p;
+ }
+
return "dcpomatic2_openssl";
}
+
#ifdef DCPOMATIC_DISK
boost::filesystem::path
disk_writer_path ()
{
- return boost::dll::program_location().parent_path() / "dcpomatic2_disk_writer";
+ return directory_containing_executable() / "dcpomatic2_disk_writer";
}
#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 ());
+ 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 ()
{
}
+
Waker::Waker ()
{
}
+
Waker::~Waker ()
{
}
+
void
-start_tool (boost::filesystem::path dcpomatic, string executable, string)
+start_tool (string executable)
{
- boost::filesystem::path batch = dcpomatic.parent_path() / executable;
+ auto batch = directory_containing_executable() / executable;
pid_t pid = fork ();
if (pid == 0) {
}
}
+
void
-start_batch_converter (boost::filesystem::path dcpomatic)
+start_batch_converter ()
{
- start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
+ start_tool ("dcpomatic2_batch");
}
+
void
-start_player (boost::filesystem::path dcpomatic)
+start_player ()
{
- start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
+ start_tool ("dcpomatic2_player");
}
+
uint64_t
thread_id ()
{
return (uint64_t) pthread_self ();
}
+
int
avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
{
boost::filesystem::path
home_directory ()
{
- return getenv("HOME");
+ return getenv("HOME");
}
-string
-command_and_read (string cmd)
-{
- FILE* pipe = popen (cmd.c_str(), "r");
- if (!pipe) {
- throw runtime_error ("popen failed");
- }
-
- string result;
- char buffer[128];
- try {
- while (fgets(buffer, sizeof(buffer), pipe)) {
- result += buffer;
- }
- } catch (...) {
- pclose (pipe);
- throw;
- }
-
- pclose (pipe);
- return result;
-}
/** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
bool
static
-vector<pair<string, string> >
+vector<pair<string, string>>
get_mounts (string prefix)
{
- vector<pair<string, string> > mounts;
+ vector<pair<string, string>> mounts;
std::ifstream f("/proc/mounts");
string line;
vector<string> bits;
boost::algorithm::split (bits, line, boost::is_any_of(" "));
if (bits.size() > 1 && boost::algorithm::starts_with(bits[0], prefix)) {
+ boost::algorithm::replace_all (bits[1], "\\040", " ");
mounts.push_back(make_pair(bits[0], bits[1]));
LOG_DISK("Found mounted device %1 from prefix %2", bits[0], prefix);
}
vector<Drive> drives;
using namespace boost::filesystem;
- vector<pair<string, string> > mounted_devices = get_mounts("/dev/");
+ auto mounted_devices = get_mounts("/dev/");
- for (directory_iterator i = directory_iterator("/sys/block"); i != directory_iterator(); ++i) {
- string const name = i->path().filename().string();
+ for (auto i: directory_iterator("/sys/block")) {
+ string const name = i.path().filename().string();
path device_type_file("/sys/block/" + name + "/device/type");
optional<string> device_type;
if (exists(device_type_file)) {
}
/* Device type 5 is "SCSI_TYPE_ROM" in blkdev.h; seems usually to be a CD/DVD drive */
if (!boost::algorithm::starts_with(name, "loop") && (!device_type || *device_type != "5")) {
- uint64_t const size = dcp::raw_convert<uint64_t>(dcp::file_to_string(*i / "size")) * 512;
+ uint64_t const size = dcp::raw_convert<uint64_t>(dcp::file_to_string(i / "size")) * 512;
if (size == 0) {
continue;
}
boost::trim(*model);
} catch (...) {}
vector<boost::filesystem::path> mount_points;
- for (vector<pair<string, string> >::const_iterator j = mounted_devices.begin(); j != mounted_devices.end(); ++j) {
- if (boost::algorithm::starts_with(j->first, "/dev/" + name)) {
- mount_points.push_back (j->second);
+ for (auto const& j: mounted_devices) {
+ if (boost::algorithm::starts_with(j.first, "/dev/" + name)) {
+ mount_points.push_back (j.second);
}
}
drives.push_back(Drive("/dev/" + name, mount_points, size, vendor, model));
bool
Drive::unmount ()
{
- BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
+ for (auto i: _mount_points) {
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) {
}
-string
-Drive::device_for_write () const
+boost::filesystem::path
+config_path ()
{
- return device ();
+ boost::filesystem::path p;
+ p /= g_get_user_config_dir ();
+ p /= "dcpomatic2";
+ return p;
}
void
-unprivileged ()
+disk_write_finished ()
{
- uid_t ruid, euid, suid;
- if (getresuid(&ruid, &euid, &suid) == -1) {
- cerr << "getresuid() failed.\n";
- exit (EXIT_FAILURE);
- }
- seteuid (ruid);
-}
-PrivilegeEscalator::~PrivilegeEscalator ()
-{
- unprivileged ();
}
-PrivilegeEscalator::PrivilegeEscalator ()
-{
- seteuid (0);
-}
-boost::filesystem::path
-config_path ()
+string
+dcpomatic::get_process_id ()
{
- boost::filesystem::path p;
- p /= g_get_user_config_dir ();
- p /= "dcpomatic2";
- return p;
+ return dcp::raw_convert<string>(getpid());
}
-void
-disk_write_finished ()
+boost::filesystem::path
+fix_long_path (boost::filesystem::path path)
{
-
+ return path;
}
projects / dcpomatic.git / blobdiff