X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=edcdc83438b9a0322f382514601abf71e46f43ff;hp=a3e032d88f71a2f66b9613781d64053a6f32b143;hb=e0b47eba2f5ec1aca1d02adc9fb4ffc7293d5c0f;hpb=7c26826d3c485f4f18a6c427f520dc470e68f94a diff --git a/server.h b/server.h index a3e032d..edcdc83 100644 --- a/server.h +++ b/server.h @@ -60,8 +60,9 @@ public: void set_encoding(const std::string &stream_id, Stream::Encoding encoding); private: - // Mutex protecting queued_data only. Note that if you want to hold both this - // and below, you will need to take before this one. + // Mutex protecting queued_add_clients and streams[..]->queued_data. + // Note that if you want to hold both this and below, + // you will need to take before this one. mutable pthread_mutex_t queued_data_mutex; // Deferred commands that should be run from the do_work() thread as soon as possible. @@ -75,7 +76,6 @@ private: // // Protected by . std::vector queued_add_clients; - std::map queued_data; // All variables below this line are protected by the mutex. mutable pthread_mutex_t mutex;