X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=49f9d51badedd68c02ae2e7436b6807f1eccb060;hp=84f822d6fa629e66fce7149d6e1c724e10e53291;hb=6889a665614e926437484a556124a5ff60363568;hpb=ce0d42a14da5686366d0c73fa9b152e90619ff91 diff --git a/server.h b/server.h index 84f822d..49f9d51 100644 --- a/server.h +++ b/server.h @@ -23,7 +23,6 @@ struct Stream; #define MAX_CLIENT_REQUEST 16384 class CubemapStateProto; -class MarkPool; class StreamProto; class Server : public Thread { @@ -39,10 +38,6 @@ public: const std::string &http_header, const std::string &stream_header); - // Set that the given stream should use the given mark pool from now on. - // NOTE: This should be set before any clients are connected! - void set_mark_pool(int stream_index, MarkPool *mark_pool); - // Set that the given stream should use the given max pacing rate from now on. // NOTE: This should be set before any clients are connected! void set_pacing_rate(int stream_index, uint32_t pacing_rate); @@ -58,7 +53,7 @@ public: // at the same time). CubemapStateProto serialize(); void add_client_from_serialized(const ClientProto &client); - int add_stream(const std::string &url, size_t bytes_received, Stream::Encoding encoding); + int add_stream(const std::string &url, size_t bytes_received, size_t prebuffering_bytes, Stream::Encoding encoding); int add_stream_from_serialized(const StreamProto &stream, int data_fd); int lookup_stream_by_url(const std::string &url) const; void set_backlog_size(int stream_index, size_t new_size);