Send backlog file descriptors around instead of going through the protobuf. Much...

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index 8282a562863deea72c1294cb55f8e0a0100f6a8d..640f10a094b717e864a6d9f8774d47bcf7fe74d7 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -202,10 +202,10 @@ void Server::add_stream(const string &stream_id, size_t backlog_size, Stream::En
        streams.insert(make_pair(stream_id, new Stream(stream_id, backlog_size, encoding)));
 }
 
-void Server::add_stream_from_serialized(const StreamProto &stream)
+void Server::add_stream_from_serialized(const StreamProto &stream, int data_fd)
 {
        MutexLock lock(&mutex);
-       streams.insert(make_pair(stream.stream_id(), new Stream(stream)));
+       streams.insert(make_pair(stream.stream_id(), new Stream(stream, data_fd)));
 }
        
 void Server::set_backlog_size(const string &stream_id, size_t new_size)