Fix non-variant build.
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2018 10:23:35 +0000 (11:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Oct 2018 10:23:35 +0000 (11:23 +0100)
src/lib/config.h
src/lib/monitor_checker.cc
src/lib/spl.h
src/lib/spl_entry.h
src/tools/dcpomatic_player.cc

index a313e43..011906a 100644 (file)
@@ -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;
 
index c506cd0..19d8d81 100644 (file)
@@ -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
index 5e1bd47..25e8ac4 100644 (file)
@@ -21,9 +21,9 @@
 #ifndef DCPOMATIC_SPL_H
 #define DCPOMATIC_SPL_H
 
+#include "spl_entry.h"
 #include <boost/filesystem.hpp>
 
-class SPLEntry;
 
 class SPL
 {
index cc28d92..e79d89a 100644 (file)
@@ -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
index e855a1c..c2d0534 100644 (file)
@@ -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)
        {