X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.h;h=1b94e59ffef5faf1b8952e797caa62653f337af8;hp=a00113da80250100fa7917d0ec5c62d8c93fdf2f;hb=6544fa0ec3f3a501bcb89ea977756911bd7f3ebd;hpb=b3cabe9eb67ad22e671cc47408641b4a24a1af0a

diff --git a/input.h b/input.h
index a00113d..1b94e59 100644
--- a/input.h
+++ b/input.h
@@ -1,6 +1,8 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
+#include <stddef.h>
+#include <time.h>
 #include <string>
 
 #include "thread.h"
@@ -8,14 +10,6 @@
 class Input;
 class InputProto;
 
-// Extremely rudimentary URL parsing.
-bool parse_url(const std::string &url, std::string *protocol, std::string *host, std::string *port, std::string *path);
-
-// Figure out the right type of input based on the URL, and create a new Input of the right type.
-// Will return NULL if unknown.
-Input *create_input(const std::string &url);
-Input *create_input(const InputProto &serialized);
-
 // Digested statistics for writing to logs etc.
 struct InputStats {
 	std::string url;
@@ -41,6 +35,9 @@ struct InputStats {
 
 class Input : public Thread {
 public:
+	// Must be in sync with StreamConfig::Encoding.
+	enum Encoding { INPUT_ENCODING_RAW = 0, INPUT_ENCODING_METACUBE };
+
 	virtual ~Input();
 	virtual InputProto serialize() const = 0;
 	virtual std::string get_url() const = 0;
@@ -51,4 +48,12 @@ public:
 	virtual InputStats get_stats() const = 0;
 };
 
+// Extremely rudimentary URL parsing.
+bool parse_url(const std::string &url, std::string *protocol, std::string *user, std::string *host, std::string *port, std::string *path);
+
+// Figure out the right type of input based on the URL, and create a new Input of the right type.
+// Will return NULL if unknown.
+Input *create_input(const std::string &url, Input::Encoding encoding);
+Input *create_input(const InputProto &serialized);
+
 #endif  // !defined(_INPUT_H)