Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / config.h

diff --git a/config.h b/config.h
index 34edaa7c878a2f340733b78aab1e8fd01b7fa9e5..d79d3d79de584292cf51efecd6a22d0c8917fc72 100644 (file)
--- a/config.h
+++ b/config.h
@@ -12,24 +12,34 @@ struct MarkPoolConfig {
 };
 
 struct StreamConfig {
-       std::string stream_id;
+       std::string url;  // As seen by the client.
        std::string src;  // Can be empty.
        size_t backlog_size;
        int mark_pool;  // -1 for none.
+       enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
 };
 
 struct AcceptorConfig {
        int port;
 };
 
+struct LogConfig {
+       enum { LOG_TYPE_FILE, LOG_TYPE_CONSOLE, LOG_TYPE_SYSLOG } type;
+       std::string filename;
+};
+
 struct Config {
+       bool daemonize;
        int num_servers;
        std::vector<MarkPoolConfig> mark_pools;
        std::vector<StreamConfig> streams;
        std::vector<AcceptorConfig> acceptors;
+       std::vector<LogConfig> log_destinations;
 
        std::string stats_file;  // Empty means no stats file.
        int stats_interval;
+
+       std::string access_log_file;  // Empty means no accses_log file.
 };
 
 // Parse and validate configuration. Returns false on error.