X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=stream.cpp;h=e88ad779648e7639fd35a2926476eb446075cb1c;hb=979a284b4039b0ea74525b700b9f1089b8c4248d;hp=6563b5b3d9e5f39f563aeecf2382ea72cb74f38c;hpb=70c0baf4bcec3a77f0626d5a7bfde87fc7339698;p=cubemap

diff --git a/stream.cpp b/stream.cpp
index 6563b5b..e88ad77 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "log.h"
-#include "metacube.h"
+#include "metacube2.h"
 #include "state.pb.h"
 #include "stream.h"
 #include "util.h"
@@ -219,12 +219,12 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
 
 	if (encoding == Stream::STREAM_ENCODING_METACUBE) {
 		// Add a Metacube block header before the data.
-		metacube_block_header hdr;
-		memcpy(hdr.sync, METACUBE_SYNC, sizeof(hdr.sync));
+		metacube2_block_header hdr;
+		memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync));
 		hdr.size = htonl(bytes);
-		hdr.flags = htonl(0);
+		hdr.flags = htons(0);
 		if (suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START) {
-			hdr.flags |= htonl(METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START);
+			hdr.flags |= htons(METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START);
 		}
 
 		iovec iov;