#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>
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 ()
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 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)) {
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;
}
#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 ()
{
}
-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)
}
-
-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)
{