X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_osx.cc;h=fc8ccd4a872dbe2566324d877d053e5beaa80637;hb=8aa97c043d73e0c6c8bc484a307b944702c7d3dd;hp=a4888d114212dae02892ac1edfd09ca84f8bf415;hpb=cfef8499db2ddb5ba6f54b83e2b68c129745e00a;p=dcpomatic.git diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index a4888d114..fc8ccd4a8 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -31,7 +31,6 @@ extern "C" { #include } #include -#include #include #if BOOST_VERSION >= 106100 #include @@ -64,7 +63,7 @@ using std::cerr; using std::cout; using std::runtime_error; using std::map; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::function; @@ -100,19 +99,7 @@ cpu_info () boost::filesystem::path directory_containing_executable () { -#if BOOST_VERSION >= 106100 return boost::dll::program_location().parent_path(); -#else - uint32_t size = 1024; - char buffer[size]; - if (_NSGetExecutablePath (buffer, &size)) { - throw runtime_error ("_NSGetExecutablePath failed"); - } - - boost::filesystem::path path (buffer); - path = boost::filesystem::canonical (path); - return path.parent_path (); -#endif } @@ -208,20 +195,22 @@ Waker::~Waker () void start_tool (string executable, string app) { - boost::filesystem::path batch = directory_containing_executable(); - batch = batch.parent_path (); // MacOS - batch = batch.parent_path (); // Contents - batch = batch.parent_path (); // DCP-o-matic.app - batch = batch.parent_path (); // Applications - batch /= app; - batch /= "Contents"; - batch /= "MacOS"; - batch /= executable; + boost::filesystem::path exe_path = directory_containing_executable(); + exe_path = exe_path.parent_path (); // Contents + exe_path = exe_path.parent_path (); // DCP-o-matic 2.app + exe_path = exe_path.parent_path (); // Applications + exe_path /= app; + exe_path /= "Contents"; + exe_path /= "MacOS"; + exe_path /= executable; pid_t pid = fork (); if (pid == 0) { - int const r = system (batch.string().c_str()); + LOG_GENERAL ("start_tool %1 %2 with path %3", executable, app, exe_path.string()); + int const r = system (exe_path.string().c_str()); exit (WEXITSTATUS (r)); + } else if (pid == -1) { + LOG_ERROR_NC("Fork failed in start_tool"); } } @@ -258,12 +247,6 @@ home_directory () return getenv("HOME"); } -string -command_and_read (string) -{ - return ""; -} - /** @return true if this process is a 32-bit one running on a 64-bit-capable OS */ bool running_32_on_64 () @@ -277,10 +260,15 @@ get_vendor (CFDictionaryRef& description) { void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceVendorKey); if (!str) { - return optional(); + return {}; + } + + auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + if (!c_str) { + return {}; } - string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + string s (c_str); boost::algorithm::trim (s); return s; } @@ -290,10 +278,15 @@ get_model (CFDictionaryRef& description) { void const* str = CFDictionaryGetValue (description, kDADiskDescriptionDeviceModelKey); if (!str) { - return optional(); + return {}; + } + + auto c_str = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + if (!c_str) { + return {}; } - string s = CFStringGetCStringPtr ((CFStringRef) str, kCFStringEncodingUTF8); + string s (c_str); boost::algorithm::trim (s); return s; } @@ -311,17 +304,23 @@ analyse_media_path (CFDictionaryRef& description) void const* str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey); if (!str) { - LOG_DISK_NC("There is no MediaPathKey"); - return optional(); + LOG_DISK_NC("There is no MediaPathKey (no dictionary value)"); + return {}; } - string path(CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8)); + auto path_key_cstr = CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8); + if (!path_key_cstr) { + LOG_DISK_NC("There is no MediaPathKey (no cstring)"); + return {}; + } + + string path(path_key_cstr); LOG_DISK("MediaPathKey is %1", path); if (path.find("/IOHDIXController") != string::npos) { /* This is a disk image, so we completely ignore it */ LOG_DISK_NC("Ignoring this as it seems to be a disk image"); - return optional(); + return {}; } MediaPath mp; @@ -330,12 +329,12 @@ analyse_media_path (CFDictionaryRef& description) } else if (starts_with(path, "IOService:")) { mp.real = false; } else { - return optional(); + return {}; } vector bits; split(bits, path, boost::is_any_of("/")); - BOOST_FOREACH (string i, bits) { + for (auto i: bits) { if (starts_with(i, "PRT")) { mp.prt = i; } @@ -361,10 +360,14 @@ is_whole_drive (DADiskRef& disk) static optional mount_point (CFDictionaryRef& description) { - CFURLRef volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey); + auto volume_path_key = (CFURLRef) CFDictionaryGetValue (description, kDADiskDescriptionVolumePathKey); + if (!volume_path_key) { + return {}; + } + char mount_path_buffer[1024]; if (!CFURLGetFileSystemRepresentation(volume_path_key, false, (UInt8 *) mount_path_buffer, sizeof(mount_path_buffer))) { - return boost::optional(); + return {}; } return boost::filesystem::path(mount_path_buffer); } @@ -408,8 +411,9 @@ struct Disk static void disk_appeared (DADiskRef disk, void* context) { - const char* bsd_name = DADiskGetBSDName (disk); + auto bsd_name = DADiskGetBSDName (disk); if (!bsd_name) { + LOG_DISK_NC("Disk with no BSDName appeared"); return; } LOG_DISK("%1 appeared", bsd_name); @@ -417,6 +421,7 @@ disk_appeared (DADiskRef disk, void* context) Disk this_disk; this_disk.mount_point = string("/dev/") + bsd_name; + LOG_DISK("Mount point is %1", this_disk.mount_point); CFDictionaryRef description = DADiskCopyDescription (disk); @@ -424,7 +429,7 @@ disk_appeared (DADiskRef disk, void* context) this_disk.model = get_model (description); LOG_DISK("Vendor/model: %1 %2", this_disk.vendor.get_value_or("[none]"), this_disk.model.get_value_or("[none]")); - optional media_path = analyse_media_path (description); + auto media_path = analyse_media_path (description); if (!media_path) { LOG_DISK("Finding media path for %1 failed", bsd_name); return; @@ -433,7 +438,7 @@ disk_appeared (DADiskRef disk, void* context) this_disk.real = media_path->real; this_disk.prt = media_path->prt; this_disk.whole = is_whole_drive (disk); - optional mp = mount_point (description); + auto mp = mount_point (description); if (mp) { this_disk.mount_points.push_back (*mp); } @@ -446,7 +451,13 @@ disk_appeared (DADiskRef disk, void* context) mp ? ("mounted at " + mp->string()) : "unmounted" ); - CFNumberGetValue ((CFNumberRef) CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey), kCFNumberLongType, &this_disk.size); + auto media_size_cstr = CFDictionaryGetValue (description, kDADiskDescriptionMediaSizeKey); + if (!media_size_cstr) { + LOG_DISK_NC("Could not read media size"); + return; + } + + CFNumberGetValue ((CFNumberRef) media_size_cstr, kCFNumberLongType, &this_disk.size); CFRelease (description); reinterpret_cast*>(context)->push_back(this_disk); @@ -460,7 +471,7 @@ Drive::get () DASessionRef session = DASessionCreate(kCFAllocatorDefault); if (!session) { - return vector(); + return {}; } DARegisterDiskAppearedCallback (session, NULL, disk_appeared, &disks); @@ -472,11 +483,11 @@ Drive::get () CFRelease(session); /* Mark disks containing mounted partitions as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (!i.whole) { continue; } - BOOST_FOREACH (Disk& j, disks) { + for (auto& j: disks) { if (!j.mount_points.empty() && starts_with(j.mount_point, i.mount_point)) { LOG_DISK("Marking %1 as mounted because %2 is", i.mount_point, j.mount_point); std::copy(j.mount_points.begin(), j.mount_points.end(), back_inserter(i.mount_points)); @@ -486,7 +497,7 @@ Drive::get () /* Make a map of the PRT codes and mount points of mounted, synthesized disks */ map > mounted_synths; - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (!i.real && !i.mount_points.empty()) { LOG_DISK("Found a mounted synth %1 with %2", i.mount_point, i.prt); mounted_synths[i.prt] = i.mount_points; @@ -494,9 +505,9 @@ Drive::get () } /* Mark containers of those mounted synths as themselves mounted */ - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (i.real) { - map >::const_iterator j = mounted_synths.find(i.prt); + auto j = mounted_synths.find(i.prt); if (j != mounted_synths.end()) { LOG_DISK("Marking %1 (%2) as mounted because it contains a mounted synth", i.mount_point, i.prt); std::copy(j->second.begin(), j->second.end(), back_inserter(i.mount_points)); @@ -505,7 +516,7 @@ Drive::get () } vector drives; - BOOST_FOREACH (Disk& i, disks) { + for (auto& i: disks) { if (i.whole) { /* A whole disk that is not a container for a mounted synth */ drives.push_back(Drive(i.mount_point, i.mount_points, i.size, i.vendor, i.model)); @@ -590,3 +601,9 @@ DCPOMATIC_ENABLE_WARNINGS TransformProcessType (&serial, kProcessTransformToForegroundApplication); } + +string +dcpomatic::get_process_id () +{ + return dcp::raw_convert(getpid()); +}