X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=0b494fb8d5527d4ba51290d62b109ad510f4cc9a;hp=d7a78a602098ab5d77dda08873af8c3d7b29e11b;hb=1135808bf9df44b879994e6dac07a31eb78c2fdb;hpb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3

diff --git a/stream.cpp b/stream.cpp
index d7a78a6..0b494fb 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -13,7 +13,6 @@
 
 #include "log.h"
 #include "metacube2.h"
-#include "mutexlock.h"
 #include "state.pb.h"
 #include "stream.h"
 #include "util.h"
@@ -31,8 +30,6 @@ Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes
 	if (data_fd == -1) {
 		exit(1);
 	}
-
-	pthread_mutex_init(&queued_data_mutex, nullptr);
 }
 
 Stream::~Stream()
@@ -49,7 +46,6 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
 	  encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
 	  data_fd(data_fd),
 	  backlog_size(serialized.backlog_size()),
-	  prebuffering_bytes(serialized.prebuffering_bytes()),
 	  bytes_received(serialized.bytes_received())
 {
 	if (data_fd == -1) {
@@ -65,8 +61,6 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
 		}
 		suitable_starting_points.push_back(point);
 	}
-
-	pthread_mutex_init(&queued_data_mutex, nullptr);
 }
 
 StreamProto Stream::serialize()
@@ -76,7 +70,6 @@ StreamProto Stream::serialize()
 	serialized.set_stream_header(stream_header);
 	serialized.add_data_fds(data_fd);
 	serialized.set_backlog_size(backlog_size);
-	serialized.set_prebuffering_bytes(prebuffering_bytes);
 	serialized.set_bytes_received(bytes_received);
 	for (size_t point : suitable_starting_points) {
 		serialized.add_suitable_starting_point(point);
@@ -232,7 +225,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, uint16_t metacube
 		return;
 	}
 
-	MutexLock lock(&queued_data_mutex);
+	lock_guard<mutex> lock(queued_data_mutex);
 
 	DataElement data_element;
 	data_element.metacube_flags = metacube_flags;
@@ -271,7 +264,7 @@ void Stream::process_queued_data()
 	// Hold the lock for as short as possible, since add_data_raw() can possibly
 	// write to disk, which might disturb the input thread.
 	{
-		MutexLock lock(&queued_data_mutex);
+		lock_guard<mutex> lock(queued_data_mutex);
 		if (queued_data.empty()) {
 			return;
 		}