X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.cpp;h=6a53c22dc7a31cf3219aa70603a0a0446f0f5e0a;hp=a1b71d618f4beeee42a7ec3431a89991901125ad;hb=b59fa7ce2d47f135ea027548cc89f937a5fa875b;hpb=0dd17aefa9103f0ad53e19d1ee08771304512886

diff --git a/input.cpp b/input.cpp
index a1b71d6..6a53c22 100644
--- a/input.cpp
+++ b/input.cpp
@@ -18,10 +18,11 @@
 #include "mutexlock.h"
 #include "input.h"
 #include "server.h"
+#include "serverpool.h"
 
 using namespace std;
 
-extern Server *servers;
+extern ServerPool *servers;
 
 Input::Input(const string &stream_id, const string &url)
 	: stream_id(stream_id),
@@ -67,8 +68,10 @@ void Input::do_work()
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &Input::curl_callback_thunk);
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
 		curl_easy_perform(curl);
-		printf("Transfer ended, waiting 0.2 seconds and restarting...\n");
-		usleep(200000);
+		if (!should_stop) {
+			printf("Transfer ended, waiting 0.2 seconds and restarting...\n");
+			usleep(200000);
+		}
 	}
 }
 
@@ -136,6 +139,7 @@ void Input::curl_callback(char *ptr, size_t bytes)
 		// should we have many blocks, but these routines don't need to be too efficient
 		// anyway.
 		pending_data.erase(pending_data.begin(), pending_data.begin() + sizeof(metacube_block_header) + size);
+		has_metacube_header = false;
 	}
 }
 		
@@ -143,13 +147,9 @@ void Input::process_block(const char *data, uint32_t size, uint32_t flags)
 {	
 	if (flags & METACUBE_FLAGS_HEADER) {
 		string header(data, data + size);
-		for (int i = 0; i < NUM_SERVERS; ++i) {
-			servers[i].set_header(stream_id, header);
-		}
+		servers->set_header(stream_id, header);
 	} else { 
-		for (int i = 0; i < NUM_SERVERS; ++i) {
-			servers[i].add_data(stream_id, data, size);
-		}
+		servers->add_data(stream_id, data, size);
 	}
 }