Move some common methods out to cross_unix.cc

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 89a9c5bb66df62ccf2eec05867d054c5fc843b30..919927fdacddd53cf14b7e05c79d9052718b5a76 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -29,11 +29,6 @@
 #include <dcp/raw_convert.h>
 #include <dcp/warnings.h>
 #include <glib.h>
-LIBDCP_DISABLE_WARNINGS
-extern "C" {
-#include <libavformat/avio.h>
-}
-LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
@@ -61,21 +56,6 @@ using std::vector;
 using boost::optional;
 
 
-/** @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 ()
@@ -235,36 +215,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 Linux */
-       return false;
-}
-
-
 static
 vector<pair<string, string>>
 get_mounts (string prefix)
@@ -368,14 +318,6 @@ disk_write_finished ()
 
 }
 
-
-string
-dcpomatic::get_process_id ()
-{
-       return dcp::raw_convert<string>(getpid());
-}
-
-
 bool
 show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path)
 {

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index b214b6359767b21749095b5f83a06b3466fe6ff8..eb713a980eb7325dae61459b66af7769ac7c3e6c 100644 (file)
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -27,9 +27,6 @@
 #include "exceptions.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
@@ -68,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 ()
@@ -214,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)
 {
@@ -515,13 +467,6 @@ LIBDCP_ENABLE_WARNINGS
 }
 
 
-string
-dcpomatic::get_process_id ()
-{
-       return dcp::raw_convert<string>(getpid());
-}
-
-
 bool
 show_in_file_manager (boost::filesystem::path, boost::filesystem::path select)
 {

diff --git a/src/lib/cross_unix.cc b/src/lib/cross_unix.cc
new file mode 100644 (file)
index 0000000..7501a4c
--- /dev/null
+++ b/src/lib/cross_unix.cc
@@ -0,0 +1,86 @@
+/*
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "cross.h"
+#include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
+extern "C" {
+#include <libavformat/avio.h>
+}
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::string;
+
+
+/** @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);
+}
+
+
+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 Linux/macOS */
+       return false;
+}
+
+
+string
+dcpomatic::get_process_id ()
+{
+       return dcp::raw_convert<string>(getpid());
+}
+
+

diff --git a/src/lib/wscript b/src/lib/wscript
index b280aec4e501ec0fef91a4e973f1e765c4f0c7f0..7400c5bf11ab2863fb78b4f4c4ab3afc01dee60a 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -229,9 +229,9 @@ def build(bld):
         obj.uselib += ' WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE SETUPAPI OLE32 UUID'
         obj.source += ' cross_windows.cc'
     if bld.env.TARGET_OSX:
-        obj.source += ' cross_osx.cc'
+        obj.source += ' cross_osx.cc cross_unix.cc'
     if bld.env.TARGET_LINUX:
-        obj.source += ' cross_linux.cc'
+        obj.source += ' cross_linux.cc cross_unix.cc'
     if bld.env.STATIC_DCPOMATIC:
         obj.uselib += ' XMLPP'