Fix problems with FFmpeg files that have all-zero stream IDs.

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

diff --git a/src/lib/config.h b/src/lib/config.h
index 07b3d68910edce82281a7295132cd85e60f32364..1fa54f669bd83130fa8502faf3c9789e9a5a8285 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -64,8 +64,21 @@ public:
                return _server_port_base;
        }
 
-       /** @return J2K encoding servers to use */
-       std::vector<ServerDescription> servers () const {
+       void set_use_any_servers (bool u) {
+               _use_any_servers = u;
+       }
+
+       bool use_any_servers () const {
+               return _use_any_servers;
+       }
+
+       /** @param s New list of servers */
+       void set_servers (std::vector<std::string> s) {
+               _servers = s;
+       }
+
+       /** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
+       std::vector<std::string> servers () const {
                return _servers;
        }
 
@@ -73,7 +86,7 @@ public:
        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;
@@ -160,11 +173,6 @@ public:
                _server_port_base = p;
        }
 
-       /** @param s New list of servers */
-       void set_servers (std::vector<ServerDescription> s) {
-               _servers = s;
-       }
-
        void set_reference_scaler (Scaler const * s) {
                _reference_scaler = s;
        }
@@ -274,9 +282,10 @@ private:
         *  this port and the one above it will be used.
         */
        int _server_port_base;
-
-       /** J2K encoding servers to use */
-       std::vector<ServerDescription> _servers;
+       /** true to broadcast on the `any' address to look for servers */
+       bool _use_any_servers;
+       /** J2K encoding servers that should definitely be used */
+       std::vector<std::string> _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 */