Add suppor for raw (non-Metacube) inputs over HTTP. Only really useful for TS.

[cubemap] / input.cpp

diff --git a/input.cpp b/input.cpp
index f5d8d5ef19ff8dced7f5d75a73b5a724b2942a82..25012a6bbad930f63a53914ed53fd0e9d8cc4fcf 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -94,16 +94,19 @@ 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;
        }
        if (protocol == "http") {
-               return new HTTPInput(url);
+               return new HTTPInput(url, encoding);
        }
        if (protocol == "udp") {
+               if (encoding == Input::INPUT_ENCODING_METACUBE) {
+                       return NULL;
+               }
                return new UDPInput(url);
        }
        return NULL;