Remove film player, DVD ripping, alignment, screen configs; never finished and not...

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 62fcebbc3e03aa9836642f58a26ae6733d5297d9..5113236d652fabdb0e989c3effd6fdbf81599ae1 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -26,12 +26,12 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/signal.h>
+#include <boost/signals2.hpp>
 
-class Server;
-class Screen;
+class ServerDescription;
 class Scaler;
 class Filter;
+class SoundProcessor;
 
 /** @class Config
  *  @brief A singleton class holding configuration.
@@ -45,6 +45,12 @@ public:
                return _num_local_encoding_threads;
        }
 
+       std::string default_directory () const {
+               return _default_directory;
+       }
+
+       std::string default_directory_or (std::string a) const;
+
        /** @return port to use for J2K encoding servers */
        int server_port () const {
                return _server_port;
@@ -53,7 +59,6 @@ public:
        /** @return index of colour LUT to use when converting RGB to XYZ.
         *  0: sRGB
         *  1: Rec 709
-        *  2: DC28
         */
        int colour_lut_index () const {
                return _colour_lut_index;
@@ -65,14 +70,10 @@ public:
        }
 
        /** @return J2K encoding servers to use */
-       std::vector<Server*> servers () const {
+       std::vector<ServerDescription*> servers () const {
                return _servers;
        }
 
-       std::vector<boost::shared_ptr<Screen> > screens () const {
-               return _screens;
-       }
-
        Scaler const * reference_scaler () const {
                return _reference_scaler;
        }
@@ -81,91 +82,89 @@ public:
                return _reference_filters;
        }
 
+       /** @return The IP address of a TMS that we can copy DCPs to */
        std::string tms_ip () const {
                return _tms_ip;
        }
 
+       /** @return The path on a TMS that we should write DCPs to */
        std::string tms_path () const {
                return _tms_path;
        }
 
+       /** @return User name to log into the TMS with */
        std::string tms_user () const {
                return _tms_user;
        }
 
+       /** @return Password to log into the TMS with */
        std::string tms_password () const {
                return _tms_password;
        }
 
+       SoundProcessor const * sound_processor () const {
+               return _sound_processor;
+       }
+
        /** @param n New number of local encoding threads */
        void set_num_local_encoding_threads (int n) {
                _num_local_encoding_threads = n;
-               Changed ();
+       }
+
+       void set_default_directory (std::string d) {
+               _default_directory = d;
        }
 
        /** @param p New server port */
-       void set_sever_port (int p) {
+       void set_server_port (int p) {
                _server_port = p;
-               Changed ();
        }
 
        /** @param i New colour LUT index */
        void set_colour_lut_index (int i) {
                _colour_lut_index = i;
-               Changed ();
        }
 
        /** @param b New J2K bandwidth */
        void set_j2k_bandwidth (int b) {
                _j2k_bandwidth = b;
-               Changed ();
        }
 
        /** @param s New list of servers */
-       void set_servers (std::vector<Server*> s) {
+       void set_servers (std::vector<ServerDescription*> s) {
                _servers = s;
-               Changed ();
-       }
-
-       void set_screens (std::vector<boost::shared_ptr<Screen> > s) {
-               _screens = s;
-               Changed ();
        }
 
        void set_reference_scaler (Scaler const * s) {
                _reference_scaler = s;
-               Changed ();
        }
        
        void set_reference_filters (std::vector<Filter const *> const & f) {
                _reference_filters = f;
-               Changed ();
        }
 
+       /** @param i IP address of a TMS that we can copy DCPs to */
        void set_tms_ip (std::string i) {
                _tms_ip = i;
-               Changed ();
        }
 
+       /** @param p Path on a TMS that we should write DCPs to */
        void set_tms_path (std::string p) {
                _tms_path = p;
-               Changed ();
        }
 
+       /** @param u User name to log into the TMS with */
        void set_tms_user (std::string u) {
                _tms_user = u;
-               Changed ();
        }
 
+       /** @param p Password to log into the TMS with */
        void set_tms_password (std::string p) {
                _tms_password = p;
-               Changed ();
        }
        
        void write () const;
 
-       sigc::signal0<void> Changed;
-
        static Config* instance ();
 
 private:
@@ -174,31 +173,33 @@ private:
 
        /** number of threads to use for J2K encoding on the local machine */
        int _num_local_encoding_threads;
+       /** default directory to put new films in */
+       std::string _default_directory;
        /** port to use for J2K encoding servers */
        int _server_port;
        /** index of colour LUT to use when converting RGB to XYZ
         *  (see colour_lut_index ())
         */
        int _colour_lut_index;
-       /** bandwidth for J2K files in Mb/s */
+       /** bandwidth for J2K files in bits per second */
        int _j2k_bandwidth;
 
        /** J2K encoding servers to use */
-       std::vector<Server *> _servers;
-
-       /** Screen definitions */
-       std::vector<boost::shared_ptr<Screen> > _screens;
-
+       std::vector<ServerDescription *> _servers;
        /** Scaler to use for the "A" part of A/B comparisons */
        Scaler const * _reference_scaler;
-
        /** Filters to use for the "A" part of A/B comparisons */
        std::vector<Filter const *> _reference_filters;
-
+       /** The IP address of a TMS that we can copy DCPs to */
        std::string _tms_ip;
+       /** The path on a TMS that we should write DCPs to */
        std::string _tms_path;
+       /** User name to log into the TMS with */
        std::string _tms_user;
+       /** Password to log into the TMS with */
        std::string _tms_password;
+       /** Our sound processor */
+       SoundProcessor const * _sound_processor;
 
        /** Singleton instance, or 0 */
        static Config* _instance;