X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=server.h;h=4b3aab8e9b7250eb47e634805f1978c5a4071ce2;hp=f0eb622c5ac2d62a188092448143a2d95fef0974;hb=9b8129d05b5d1ec0caed09a40f170e967afc60b3;hpb=628e632811242333b1a88330c380ce48b8521fcb;ds=sidebyside diff --git a/server.h b/server.h index f0eb622..4b3aab8 100644 --- a/server.h +++ b/server.h @@ -61,10 +61,10 @@ public: void set_encoding(int stream_index, Stream::Encoding encoding); private: - // Mutex protecting queued_add_clients and streams[..]->queued_data. + // Mutex protecting queued_add_clients. // 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; + mutable pthread_mutex_t queued_clients_mutex; // Deferred commands that should be run from the do_work() thread as soon as possible. // We defer these for two reasons: @@ -75,7 +75,7 @@ private: // add_data(), since they want to do add_data() rather often, and // can be taken a lot of the time. // - // Protected by . + // Protected by . std::vector queued_add_clients; // All variables below this line are protected by the mutex.