If we are requesting audio from before the start of a piece of content we need to...

[dcpomatic.git] / src / lib / config.h

diff --git a/src/lib/config.h b/src/lib/config.h
index 55a172d78df40ed7c62025ff60c5422c7e9406fc..45a9e282b7aed6ea638c540d264defd3df26b21a 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -24,16 +24,16 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
 #include "video_content.h"
+#include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 class ServerDescription;
 class Scaler;
@@ -135,10 +135,6 @@ public:
                return _default_still_length;
        }
 
-       VideoContentScale default_scale () const {
-               return _default_scale;
-       }
-
        Ratio const * default_container () const {
                return _default_container;
        }
@@ -314,11 +310,6 @@ public:
                changed ();
        }
 
-       void set_default_scale (VideoContentScale s) {
-               _default_scale = s;
-               changed ();
-       }
-
        void set_default_container (Ratio const * c) {
                _default_container = c;
                changed ();
@@ -482,7 +473,6 @@ private:
        ISDCFMetadata _default_isdcf_metadata;
        boost::optional<std::string> _language;
        int _default_still_length;
-       VideoContentScale _default_scale;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
        std::string _dcp_issuer;