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

[cubemap] / config.h

diff --git a/config.h b/config.h
index bed0551c3e3de4709963dc0fa305b3143dfd7362..d79d3d79de584292cf51efecd6a22d0c8917fc72 100644 (file)
--- a/config.h
+++ b/config.h
@@ -12,10 +12,11 @@ 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 {
@@ -28,6 +29,7 @@ struct LogConfig {
 };
 
 struct Config {
+       bool daemonize;
        int num_servers;
        std::vector<MarkPoolConfig> mark_pools;
        std::vector<StreamConfig> streams;
@@ -36,6 +38,8 @@ struct Config {
 
        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.