Fix non-variant build.

diff --git a/src/lib/config.h b/src/lib/config.h
index a313e43425bc002481d4f501d18d26f0eb12d126..011906a410abf9d1a5477f8a45a54e97c792033e 100644 (file)
--- 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 c506cd09e342620e76b21424bb1086d30ce4f82c..19d8d8181943faaef5e58494d98b1a690c68feb5 100644 (file)
--- 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 5e1bd47b2acdeaf5a6a35d3fe5ec887f73ec2c62..25e8ac4c5db29a77f147d2a94c07f4552442e6d9 100644 (file)
--- 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 cc28d92bda2adf21236f54ef84acfb31e291a302..e79d89afcf7263f0cdd37f7a7e126c95ebd2ec82 100644 (file)
--- 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 e855a1cc6042dd582f7bcf19f15de724391117e5..c2d0534302bcacd084f78b26d52ab1582c68543a 100644 (file)
--- 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)
        {