X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=server.h;h=6b94c0e6d9d9d2dbf98d0c025a77f814585b8d64;hb=refs%2Ftags%2F1.1.1;hp=f0eb622c5ac2d62a188092448143a2d95fef0974;hpb=1c6b126fe95eb0465383ba225da764757eba05c0;p=cubemap

diff --git a/server.h b/server.h
index f0eb622..6b94c0e 100644
--- a/server.h
+++ b/server.h
@@ -23,7 +23,6 @@ struct Stream;
 #define MAX_CLIENT_REQUEST 16384
 
 class CubemapStateProto;
-class MarkPool;
 class StreamProto;
 
 class Server : public Thread {
@@ -39,9 +38,9 @@ public:
 	                const std::string &http_header,
 	                const std::string &stream_header);
 
-	// Set that the given stream should use the given mark pool from now on.
+	// Set that the given stream should use the given max pacing rate from now on.
 	// NOTE: This should be set before any clients are connected!
-	void set_mark_pool(int stream_index, MarkPool *mark_pool);
+	void set_pacing_rate(int stream_index, uint32_t pacing_rate);
 
 	// These will be deferred until the next time an iteration in do_work() happens,
 	// and the order between them are undefined.
@@ -61,10 +60,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 <mutex> below,
 	// you will need to take <mutex> 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 +74,7 @@ private:
 	//    add_data(), since they want to do add_data() rather often, and <mutex>
 	//    can be taken a lot of the time.
 	//	
-	// Protected by <queued_data_mutex>.
+	// Protected by <queued_clients_mutex>.
 	std::vector<int> queued_add_clients;
 
 	// All variables below this line are protected by the mutex.