From c4ac1ba47652884a647103ec49b2de4c0b6e60a9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Oct 2018 11:23:35 +0100
Subject: [PATCH] Fix non-variant build.

---
 src/lib/config.h              | 6 +++---
 src/lib/monitor_checker.cc    | 4 ++++
 src/lib/spl.h                 | 2 +-
 src/lib/spl_entry.h           | 5 +++++
 src/tools/dcpomatic_player.cc | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/lib/config.h b/src/lib/config.h
index a313e4342..011906a41 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -519,11 +519,11 @@ public:
 	std::vector<Monitor> required_monitors () const {
 		return _required_monitors;
 	}
+#endif
 
 	bool allow_spl_editing () const {
 		return _allow_spl_editing;
 	}
-#endif
 
 	/* SET (mostly) */
 
@@ -1003,11 +1003,11 @@ public:
 	void set_required_monitors (std::vector<Monitor> monitors) {
 		maybe_set (_required_monitors, monitors);
 	}
+#endif
 
 	void set_allow_spl_editing (bool s) {
 		maybe_set (_allow_spl_editing, s);
 	}
-#endif
 
 	void changed (Property p = OTHER);
 	boost::signals2::signal<void (Property)> Changed;
@@ -1211,8 +1211,8 @@ private:
 	/** watermark duration in milliseconds */
 	int _player_watermark_duration;
 	std::vector<Monitor> _required_monitors;
-	bool _allow_spl_editing;
 #endif
+	bool _allow_spl_editing;
 
 	static int const _current_version;
 
diff --git a/src/lib/monitor_checker.cc b/src/lib/monitor_checker.cc
index c506cd09e..19d8d8181 100644
--- a/src/lib/monitor_checker.cc
+++ b/src/lib/monitor_checker.cc
@@ -18,6 +18,8 @@
 
 */
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+
 #include "monitor_checker.h"
 #include "config.h"
 #include "cross.h"
@@ -100,3 +102,5 @@ MonitorChecker::instance ()
 
 	return _instance;
 }
+
+#endif
diff --git a/src/lib/spl.h b/src/lib/spl.h
index 5e1bd47b2..25e8ac4c5 100644
--- a/src/lib/spl.h
+++ b/src/lib/spl.h
@@ -21,9 +21,9 @@
 #ifndef DCPOMATIC_SPL_H
 #define DCPOMATIC_SPL_H
 
+#include "spl_entry.h"
 #include <boost/filesystem.hpp>
 
-class SPLEntry;
 
 class SPL
 {
diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h
index cc28d92bd..e79d89afc 100644
--- a/src/lib/spl_entry.h
+++ b/src/lib/spl_entry.h
@@ -18,6 +18,9 @@
 
 */
 
+#ifndef DCPOMATIC_SPL_ENTRY_H
+#define DCPOMATIC_SPL_ENTRY_H
+
 #include "dcpomatic_time.h"
 
 namespace dcp {
@@ -37,3 +40,5 @@ public:
 	boost::shared_ptr<dcp::CPL> cpl;
 	boost::filesystem::path directory;
 };
+
+#endif
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index e855a1cc6..c2d053430 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -241,6 +241,7 @@ public:
 		}
 	}
 
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 	void monitor_checker_state_changed ()
 	{
 		if (!MonitorChecker::instance()->ok()) {
@@ -248,6 +249,7 @@ public:
 			_viewer->stop ();
 		}
 	}
+#endif
 
 	void setup_main_sizer (Config::PlayerMode mode)
 	{
-- 
2.30.2