Move some common methods out to cross_unix.cc

[dcpomatic.git] / src / lib / cross_osx.cc

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 018516abbf0a337e3eb319715f995629a860da3b..eb713a980eb7325dae61459b66af7769ac7c3e6c 100644 (file)
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -25,12 +25,8 @@
 #include "dcpomatic_log.h"
 #include "config.h"
 #include "exceptions.h"
-#include "warnings.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
@@ -58,7 +54,6 @@ 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;
@@ -70,21 +65,6 @@ using boost::optional;
 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 ()
@@ -116,16 +96,9 @@ resources_path ()
 
 
 boost::filesystem::path
-xsd_path ()
+libdcp_resources_path ()
 {
-       return resources_path() / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
-{
-       return resources_path() / "tags";
+       return resources_path();
 }
 
 
@@ -165,24 +138,6 @@ disk_writer_path ()
 #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 ()
 {
@@ -241,36 +196,6 @@ start_player ()
 }
 
 
-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)
 {
@@ -380,8 +305,8 @@ mount_point (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.
@@ -399,8 +324,8 @@ disk_appeared (DADiskRef disk, void* context)
 
        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);
 
@@ -414,8 +339,7 @@ disk_appeared (DADiskRef disk, void* context)
                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) {
@@ -423,11 +347,10 @@ disk_appeared (DADiskRef disk, void* context)
        }
 
        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);
@@ -537,27 +460,13 @@ void
 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)
 {