Remove the "simple" UI (#1868).

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

diff --git a/src/lib/config.h b/src/lib/config.h
index f54ca3814043abf5c8fa51c619c975cf87591113..11ca36b855742eea81a065ffce6bbd3ddc4650ff 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -80,7 +80,6 @@ public:
                DKDM_RECIPIENTS,
                SOUND,
                SOUND_OUTPUT,
-               INTERFACE_COMPLEXITY,
                PLAYER_CONTENT_DIRECTORY,
                PLAYER_PLAYLIST_DIRECTORY,
                PLAYER_DEBUG_LOG,
@@ -186,10 +185,6 @@ public:
                return _default_container;
        }
 
-       Ratio const * default_scale_to () const {
-               return _default_scale_to;
-       }
-
        DCPContentType const * default_dcp_content_type () const {
                return _default_dcp_content_type;
        }
@@ -206,6 +201,22 @@ public:
                return _dcp_creator;
        }
 
+       std::string dcp_company_name () const {
+               return _dcp_company_name;
+       }
+
+       std::string dcp_product_name () const {
+               return _dcp_product_name;
+       }
+
+       std::string dcp_product_version () const {
+               return _dcp_product_version;
+       }
+
+       std::string dcp_j2k_comment () const {
+               return _dcp_j2k_comment;
+       }
+
        int default_j2k_bandwidth () const {
                return _default_j2k_bandwidth;
        }
@@ -218,8 +229,8 @@ public:
                return _default_interop;
        }
 
-       bool default_upload_after_make_dcp () {
-               return _default_upload_after_make_dcp;
+       bool upload_after_make_dcp () {
+               return _upload_after_make_dcp;
        }
 
        void set_default_kdm_directory (boost::filesystem::path d) {
@@ -389,8 +400,6 @@ public:
                NAG_ENCRYPTED_METADATA,
                NAG_ALTER_DECRYPTION_CHAIN,
                NAG_BAD_SIGNER_CHAIN,
-               /* Not really a nag but it's the same idea */
-               NAG_INITIAL_SETUP,
                NAG_IMPORT_DECRYPTION_CHAIN,
                NAG_DELETE_DKDM,
                NAG_32_ON_64,
@@ -482,15 +491,6 @@ public:
                return _gdc_password;
        }
 
-       enum Interface {
-               INTERFACE_SIMPLE,
-               INTERFACE_FULL
-       };
-
-       Interface interface_complexity () const {
-               return _interface_complexity;
-       }
-
        enum PlayerMode {
                PLAYER_MODE_WINDOW, ///< one window containing image and controls
                PLAYER_MODE_FULL,   ///< just the image filling the screen
@@ -686,10 +686,6 @@ public:
                maybe_set (_default_container, c);
        }
 
-       void set_default_scale_to (Ratio const * c) {
-               maybe_set (_default_scale_to, c);
-       }
-
        void set_default_dcp_content_type (DCPContentType const * t) {
                maybe_set (_default_dcp_content_type, t);
        }
@@ -706,6 +702,22 @@ public:
                maybe_set (_dcp_creator, c);
        }
 
+       void set_dcp_company_name (std::string c) {
+               maybe_set (_dcp_company_name, c);
+       }
+
+       void set_dcp_product_name (std::string c) {
+               maybe_set (_dcp_product_name, c);
+       }
+
+       void set_dcp_product_version (std::string c) {
+               maybe_set (_dcp_product_version, c);
+       }
+
+       void set_dcp_j2k_comment (std::string c) {
+               maybe_set (_dcp_j2k_comment, c);
+       }
+
        void set_default_j2k_bandwidth (int b) {
                maybe_set (_default_j2k_bandwidth, b);
        }
@@ -718,8 +730,8 @@ public:
                maybe_set (_default_interop, i);
        }
 
-       void set_default_upload_after_make_dcp (bool u) {
-               maybe_set (_default_upload_after_make_dcp, u);
+       void set_upload_after_make_dcp (bool u) {
+               maybe_set (_upload_after_make_dcp, u);
        }
 
        void set_mail_server (std::string s) {
@@ -990,10 +1002,6 @@ public:
                maybe_set (_gdc_password, boost::optional<std::string>());
        }
 
-       void set_interface_complexity (Interface i) {
-               maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
-       }
-
        void set_player_mode (PlayerMode m) {
                maybe_set (_player_mode, m);
        }
@@ -1233,11 +1241,14 @@ private:
        /** Default length of still image content (seconds) */
        int _default_still_length;
        Ratio const * _default_container;
-       Ratio const * _default_scale_to;
        DCPContentType const * _default_dcp_content_type;
        int _default_dcp_audio_channels;
        std::string _dcp_issuer;
        std::string _dcp_creator;
+       std::string _dcp_company_name;
+       std::string _dcp_product_name;
+       std::string _dcp_product_version;
+       std::string _dcp_j2k_comment;
        int _default_j2k_bandwidth;
        int _default_audio_delay;
        bool _default_interop;
@@ -1245,7 +1256,7 @@ private:
            the home directory will be offered.
        */
        boost::optional<boost::filesystem::path> _default_kdm_directory;
-       bool _default_upload_after_make_dcp;
+       bool _upload_after_make_dcp;
        std::list<boost::shared_ptr<Cinema> > _cinemas;
        std::list<boost::shared_ptr<DKDMRecipient> > _dkdm_recipients;
        std::string _mail_server;
@@ -1317,7 +1328,6 @@ private:
        boost::optional<std::string> _christie_password;
        boost::optional<std::string> _gdc_username;
        boost::optional<std::string> _gdc_password;
-       Interface _interface_complexity;
        PlayerMode _player_mode;
        int _image_display;
        VideoViewType _video_view_type;