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

[cubemap] / serverpool.h

diff --git a/serverpool.h b/serverpool.h
index ba60d7c0d9b0705e01c372ed9f4d71d9db99e35d..5f5f6f80c03ff7264829cab95d0f42625148811c 100644 (file)
--- a/serverpool.h
+++ b/serverpool.h
@@ -7,6 +7,7 @@
 
 #include "server.h"
 #include "state.pb.h"
+#include "stream.h"
 
 class MarkPool;
 class Server;
@@ -25,19 +26,27 @@ public:
        void add_client(int sock);
        void add_client_from_serialized(const ClientProto &client);
 
-       // Adds the given stream to all the servers.
-       void add_stream(const std::string &stream_id, size_t backlog_size);
-       void add_stream_from_serialized(const StreamProto &stream);
+       // Adds the given stream to all the servers. Returns the stream index.
+       int add_stream(const std::string &url, size_t backlog_size, Stream::Encoding encoding);
+       int add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
+
+       // Returns the stream index for the given URL (e.g. /foo.ts). Returns -1 on failure.
+       int lookup_stream_by_url(const std::string &url) const;
 
        // Adds the given data to all the servers.
-       void set_header(const std::string &stream_id, const std::string &header);
-       void add_data(const std::string &stream_id, const char *data, size_t bytes);
+       void set_header(int stream_index,
+                       const std::string &http_header,
+                       const std::string &stream_header);
+       void add_data(int stream_index, const char *data, size_t bytes);
 
        // Connects the given stream to the given mark pool for all the servers.
-       void set_mark_pool(const std::string &stream_id, MarkPool *mark_pool);
+       void set_mark_pool(int stream_index, MarkPool *mark_pool);
 
        // Changes the given stream's backlog size on all the servers.
-       void set_backlog_size(const std::string &stream_id, size_t new_size);
+       void set_backlog_size(int stream_index, size_t new_size);
+
+       // Changes the given stream's encoding type on all the servers.
+       void set_encoding(int stream_index, Stream::Encoding encoding);
 
        // Starts all the servers.
        void run();