Remove support for mark pools.

[cubemap] / config.h

diff --git a/config.h b/config.h
index f06b9c56ef819cb1aaa7228dca1f5f5179fda680..60531486ea94e91cf82740bc9fe9293110f836e6 100644 (file)
--- a/config.h
+++ b/config.h
@@ -9,15 +9,10 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-struct MarkPoolConfig {
-       int from, to;
-};
-

 struct StreamConfig {
        std::string url;  // As seen by the client.
        std::string src;  // Can be empty.
        size_t backlog_size;
 struct StreamConfig {
        std::string url;  // As seen by the client.
        std::string src;  // Can be empty.
        size_t backlog_size;

-       int mark_pool;  // -1 for none.

        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
 };
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
        enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
 };


@@ -25,7 +20,6 @@ struct StreamConfig {
 struct UDPStreamConfig {
        sockaddr_in6 dst;
        std::string src;  // Can be empty.
 struct UDPStreamConfig {
        sockaddr_in6 dst;
        std::string src;  // Can be empty.

-       int mark_pool;  // -1 for none.

        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
 };
 
        uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
 };
 


@@ -41,7 +35,6 @@ struct LogConfig {
 struct Config {
        bool daemonize;
        int num_servers;
 struct Config {
        bool daemonize;
        int num_servers;

-       std::vector<MarkPoolConfig> mark_pools;

        std::vector<StreamConfig> streams;
        std::vector<UDPStreamConfig> udpstreams;
        std::vector<AcceptorConfig> acceptors;
        std::vector<StreamConfig> streams;
        std::vector<UDPStreamConfig> udpstreams;
        std::vector<AcceptorConfig> acceptors;