#include "dcpomatic_log.h"
#include "config.h"
#include "exceptions.h"
-#include "warnings.h"
+#include <dcp/filesystem.h>
#include <dcp/raw_convert.h>
#include <glib.h>
-extern "C" {
-#include <libavformat/avio.h>
-}
#include <boost/algorithm/string.hpp>
#include <boost/regex.hpp>
#if BOOST_VERSION >= 106100
using std::list;
using std::ifstream;
using std::string;
-using std::wstring;
using std::make_pair;
using std::vector;
using std::cerr;
using std::function;
-/** @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
directory_containing_executable ()
{
- return boost::filesystem::canonical(boost::dll::program_location()).parent_path();
+ return dcp::filesystem::canonical(boost::dll::program_location()).parent_path();
}
boost::filesystem::path
-xsd_path ()
-{
- return resources_path() / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
+libdcp_resources_path ()
{
- return resources_path() / "tags";
+ return resources_path();
}
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)
{
auto path = directory_containing_executable () / "ffprobe";
+ if (!dcp::filesystem::exists(path)) {
+ /* This is a hack but we need ffprobe during tests */
+ path = "/Users/ci/workspace/bin/ffprobe";
+ }
+ string const redirect = err ? "2>" : ">";
- string ffprobe = "\"" + path.string() + "\" \"" + content.string() + "\" 2> \"" + out.string() + "\"";
+ auto const ffprobe = String::compose("\"%1\" %2 \"%3\" %4 \"%5\"", path, args.empty() ? " " : args, content.string(), redirect, out.string());
LOG_GENERAL (N_("Probing with %1"), ffprobe);
- system (ffprobe.c_str ());
+ system (ffprobe.c_str());
}
#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 OS X */
- return false;
-}
-
-
static optional<string>
get_vendor (CFDictionaryRef& description)
{
* a partition /dev/disk2s2 whose content is made into a synthesized /dev/disk3, itself containing some partitions
* which are mounted. /dev/disk2s2 is not considered to be mounted, in this case. So we need to know that
* disk2s2 is related to disk3 so we can consider disk2s2 as mounted if any parts of disk3 are. In order to do
- * this I am picking out what looks like a suitable identifier prefixed with PRT from the MediaContentKey.
- * If disk2s2 and disk3 have the same PRT code I am assuming they are linked.
+ * this I am taking the first two parts of the IODeviceTree and seeing if they exist anywhere in a
+ * IOService identifier. If they do, I am assuming the IOService device is on the matching IODeviceTree device.
*
* Lots of this is guesswork and may be broken. In my defence the documentation that I have been able to
* unearth is, to put it impolitely, crap.
OSXDisk this_disk;
- this_disk.mount_point = string("/dev/") + bsd_name;
- LOG_DISK("Mount point is %1", this_disk.mount_point);
+ this_disk.device = string("/dev/") + bsd_name;
+ LOG_DISK("Device is %1", this_disk.device);
CFDictionaryRef description = DADiskCopyDescription (disk);
return;
}
- this_disk.real = media_path->real;
- this_disk.prt = media_path->prt;
+ this_disk.media_path = *media_path;
this_disk.whole = is_whole_drive (disk);
auto mp = mount_point (description);
if (mp) {
}
LOG_DISK(
- "%1 prt=%2 %3 %4",
- this_disk.real ? "Real" : "Synth",
- this_disk.prt,
+ "%1 %2 mounted at %3",
+ this_disk.media_path.real ? "Real" : "Synth",
this_disk.whole ? "whole" : "part",
- mp ? ("mounted at " + mp->string()) : "unmounted"
+ mp ? mp->string() : "[nowhere]"
);
auto media_size_cstr = CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey);
using namespace boost::algorithm;
vector<OSXDisk> disks;
+ LOG_DISK_NC("Drive::get() starts");
+
auto session = DASessionCreate(kCFAllocatorDefault);
if (!session) {
return {};
}
+ LOG_DISK_NC("Drive::get() has session");
+
DARegisterDiskAppearedCallback (session, NULL, disk_appeared, &disks);
auto run_loop = CFRunLoopGetCurrent ();
DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode);
DAUnregisterCallback(session, (void *) disk_appeared, &disks);
CFRelease(session);
- return osx_disks_to_drives (disks);
+ auto drives = osx_disks_to_drives(disks);
+
+ LOG_DISK("Drive::get() found %1 drives:", drives.size());
+ for (auto const& drive: drives) {
+ LOG_DISK("%1 %2 mounted=%3", drive.description(), drive.device(), drive.mounted() ? "yes" : "no");
+ }
+
+ return drives;
}
}
+struct UnmountState
+{
+ bool success = false;
+ bool callback = false;
+};
+
+
void done_callback(DADiskRef, DADissenterRef dissenter, void* context)
{
LOG_DISK_NC("Unmount finished");
- bool* success = reinterpret_cast<bool*> (context);
+ auto state = reinterpret_cast<UnmountState*>(context);
+ state->callback = true;
if (dissenter) {
LOG_DISK("Error: %1", DADissenterGetStatus(dissenter));
- *success = false;
} else {
LOG_DISK_NC("Successful");
- *success = true;
+ state->success = true;
}
}
return false;
}
LOG_DISK("Requesting unmount of %1 from %2", _device, thread_id());
- bool success = false;
- DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &success);
+ UnmountState state;
+ DADiskUnmount(disk, kDADiskUnmountOptionWhole, &done_callback, &state);
CFRelease (disk);
CFRunLoopRef run_loop = CFRunLoopGetCurrent ();
DASessionScheduleWithRunLoop (session, run_loop, kCFRunLoopDefaultMode);
CFRunLoopStop (run_loop);
- CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.5, 0);
+ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 5, 0);
CFRelease(session);
- LOG_DISK_NC("End of unmount");
- return success;
+ if (!state.callback) {
+ LOG_DISK_NC("End of unmount: timeout");
+ } else {
+ LOG_DISK("End of unmount: %1", state.success ? "success" : "failure");
+ }
+ return state.success;
}
make_foreground_application ()
{
ProcessSerialNumber serial;
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
GetCurrentProcess (&serial);
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
TransformProcessType (&serial, kProcessTransformToForegroundApplication);
}
-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, boost::filesystem::path select)
{