X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=4f964873b22503c54c1fa782c0785d453d5ba345;hp=523f5c55f376eed2ca9becf25a15c60a9172ba70;hb=3fd8650ccf3da3960a946d8ac9abc305aec399ce;hpb=8f44468bfe4a1d1607b0ab7044c3071605ae1fa7

diff --git a/server.h b/server.h
index 523f5c5..4f96487 100644
--- a/server.h
+++ b/server.h
@@ -19,7 +19,6 @@ class ClientProto;
 struct Stream;
 
 #define EPOLL_MAX_EVENTS 8192
-#define EPOLL_TIMEOUT_MS 20
 #define MAX_CLIENT_REQUEST 16384
 
 class CubemapStateProto;
@@ -55,7 +54,7 @@ public:
 	CubemapStateProto serialize();
 	void add_client_from_serialized(const ClientProto &client);
 	void add_stream(const std::string &stream_id, size_t bytes_received, Stream::Encoding encoding);
-	void add_stream_from_serialized(const StreamProto &stream);
+	void add_stream_from_serialized(const StreamProto &stream, int data_fd);
 	void set_backlog_size(const std::string &stream_id, size_t new_size);
 	void set_encoding(const std::string &stream_id, Stream::Encoding encoding);