Merge master.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 87b7038def5844843db76892d76ae6c20a2d8969..ccd37ec1e22a2bc2d133b82138bf0a6268428196 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -28,7 +28,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/metadata.h>
+#include <dcp/metadata.h>
 #include "dci_metadata.h"
 #include "colour_conversion.h"
 #include "server.h"
@@ -141,7 +141,7 @@ public:
                return _default_dcp_content_type;
        }
 
-       libdcp::XMLMetadata dcp_metadata () const {
+       dcp::XMLMetadata dcp_metadata () const {
                return _dcp_metadata;
        }
 
@@ -188,6 +188,10 @@ public:
        int maximum_j2k_bandwidth () const {
                return _maximum_j2k_bandwidth;
        }
+
+       int log_types () const {
+               return _log_types;
+       }
        
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
@@ -280,7 +284,7 @@ public:
                changed ();
        }
 
-       void set_dcp_metadata (libdcp::XMLMetadata m) {
+       void set_dcp_metadata (dcp::XMLMetadata m) {
                _dcp_metadata = m;
                changed ();
        }
@@ -339,6 +343,11 @@ public:
                _maximum_j2k_bandwidth = b;
                changed ();
        }
+
+       void set_log_types (int t) {
+               _log_types = t;
+               changed ();
+       }
        
        boost::filesystem::path signer_chain_directory () const;
 
@@ -386,7 +395,7 @@ private:
        int _default_still_length;
        Ratio const * _default_container;
        DCPContentType const * _default_dcp_content_type;
-       libdcp::XMLMetadata _dcp_metadata;
+       dcp::XMLMetadata _dcp_metadata;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        std::vector<PresetColourConversion> _colour_conversions;
@@ -401,6 +410,7 @@ private:
        bool _check_for_test_updates;
        /** maximum allowed J2K bandwidth in bits per second */
        int _maximum_j2k_bandwidth;
+       int _log_types;
 
        /** Singleton instance, or 0 */
        static Config* _instance;