X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.cpp;h=dba6cf38b26b3ca87a6a953c8842600012e0124b;hp=102207f955deabdc8861ffbd9798fcefd1542e29;hb=0f36a8f674788a6ee10ff54ae72619b384c62b9d;hpb=8a2129f4c808600d6151f724dcbd816188d3d1c6

diff --git a/input.cpp b/input.cpp
index 102207f..dba6cf3 100644
--- a/input.cpp
+++ b/input.cpp
@@ -63,7 +63,6 @@ bool parse_url(const string &url, string *protocol, string *user, string *host,
 	if (split == rest.size()) {
 		// http://foo
 		split_user_host(rest, user, host);
-		fprintf(stderr, "ooo user='%s' host='%s'\n", user->c_str(), host->c_str());
 		*port = *protocol;
 		*path = "/";
 		return true;
@@ -95,26 +94,27 @@ bool parse_url(const string &url, string *protocol, string *user, string *host,
 	return true;
 }
 
-Input *create_input(const std::string &url)
+Input *create_input(const string &url, Input::Encoding encoding)
 {
 	string protocol, user, host, port, path;
 	if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
-		return NULL;
+		return nullptr;
 	}
 	if (protocol == "http") {
-		return new HTTPInput(url);
+		return new HTTPInput(url, encoding);
 	}
 	if (protocol == "udp") {
+		assert(encoding == Input::INPUT_ENCODING_RAW);
 		return new UDPInput(url);
 	}
-	return NULL;
+	return nullptr;
 }
 
 Input *create_input(const InputProto &serialized)
 {
 	string protocol, user, host, port, path;
 	if (!parse_url(serialized.url(), &protocol, &user, &host, &port, &path)) {
-		return NULL;
+		return nullptr;
 	}
 	if (protocol == "http") {
 		return new HTTPInput(serialized);
@@ -122,7 +122,7 @@ Input *create_input(const InputProto &serialized)
 	if (protocol == "udp") {
 		return new UDPInput(serialized);
 	}
-	return NULL;
+	return nullptr;
 }
 
 Input::~Input() {}