Use dcp::File in DCP-o-matic (#2231).

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

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index ee49d50bc8ef8972da9f13d25b7f90680fc49396..89a9c5bb66df62ccf2eec05867d054c5fc843b30 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -26,14 +26,14 @@
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "log.h"
-#include "warnings.h"
 #include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <glib.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avio.h>
 }
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
@@ -58,7 +58,6 @@ using std::make_pair;
 using std::pair;
 using std::string;
 using std::vector;
-using std::wstring;
 using boost::optional;
 
 
@@ -110,22 +109,12 @@ resources_path ()
 
 
 boost::filesystem::path
-xsd_path ()
+libdcp_resources_path ()
 {
        if (auto appdir = getenv("APPDIR")) {
-               return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "xsd";
+               return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp";
        }
-       return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
-}
-
-
-boost::filesystem::path
-tags_path ()
-{
-       if (auto appdir = getenv("APPDIR")) {
-               return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags";
-       }
-       return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
+       return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp";
 }
 
 
@@ -200,24 +189,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 ()
 {
@@ -405,13 +376,6 @@ dcpomatic::get_process_id ()
 }
 
 
-boost::filesystem::path
-fix_long_path (boost::filesystem::path path)
-{
-       return path;
-}
-
-
 bool
 show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path)
 {