Add a missing log_perror() on close() failure (cosmetic issue).

[cubemap] / serverpool.h

diff --git a/serverpool.h b/serverpool.h
index ba60d7c0d9b0705e01c372ed9f4d71d9db99e35d..6a2fcb53deef177fedd13ba7be99448a48198f48 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;
@@ -26,11 +27,13 @@ public:
        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);
+       void add_stream(const std::string &stream_id, size_t backlog_size, Stream::Encoding encoding);
+       void add_stream_from_serialized(const StreamProto &stream, const std::vector<int> &data_fds);
 
        // Adds the given data to all the servers.
-       void set_header(const std::string &stream_id, const std::string &header);
+       void set_header(const std::string &stream_id,
+                       const std::string &http_header,
+                       const std::string &stream_header);
        void add_data(const std::string &stream_id, const char *data, size_t bytes);
 
        // Connects the given stream to the given mark pool for all the servers.
@@ -39,6 +42,9 @@ public:
        // Changes the given stream's backlog size on all the servers.
        void set_backlog_size(const std::string &stream_id, size_t new_size);
 
+       // Changes the given stream's encoding type on all the servers.
+       void set_encoding(const std::string &stream_id, Stream::Encoding encoding);
+
        // Starts all the servers.
        void run();