X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcross_osx.cc;h=eb713a980eb7325dae61459b66af7769ac7c3e6c;hb=2695f450ca00654cef8709e4e3cfb4cf5de48fc7;hp=b06f45a77e82c14b86ec3c1c88bc3535e84f4c67;hpb=a04c9c056235b136853953dd12e6079d3a4129b1;p=dcpomatic.git

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index b06f45a77..eb713a980 100644
--- 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
@@ -69,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 ()
@@ -115,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();
 }
 
 
@@ -164,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 ()
 {
@@ -240,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)
 {
@@ -534,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)
 {