Even more missing unistd.h includes.

[cubemap] / input.h

diff --git a/input.h b/input.h
index 508eb59ae68cac1ba029c88caae5f67bbff73000..79cfc54183dfb9bdfee82e25a3448ccdc7ae7bd1 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,52 +1,27 @@
 #ifndef _INPUT_H
 #define _INPUT_H 1
 
-#include <vector>
 #include <string>
 
-class Input {
-public:
-       Input(const std::string &stream_id, const std::string &url);
-
-       // Connect to the given URL and start streaming.
-       void run();
-
-       // Stop streaming. NOTE: Does not currently work!
-       void stop();
-
-private:
-       // Recovers the this pointer and calls do_work().
-       static void *do_work_thunk(void *arg);
-
-       // Actually does the download.
-       void do_work();
+#include "thread.h"
 
-       // Recovers the this pointer and calls curl_callback().
-       static size_t curl_callback_thunk(char *ptr, size_t size, size_t nmemb, void *userdata);
+class Input;
+class InputProto;
 
-       // Stores the given data, looks for Metacube blocks (skipping data if needed),
-       // and calls process_block() for each one.
-       void curl_callback(char *ptr, size_t bytes);
-       void process_block(const char *data, uint32_t size, uint32_t flags);
+// Extremely rudimentary URL parsing.
+bool parse_url(const std::string &url, std::string *protocol, std::string *host, std::string *port, std::string *path);
 
-       // Drops <num_bytes> bytes from the head of <pending_data>,
-       // and outputs a warning.
-       void drop_pending_data(size_t num_bytes);
+// 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 &stream_id, const std::string &url);
+Input *create_input(const InputProto &serialized);
 
-       std::string stream_id;
-       std::string url;
-
-       // Data we have received but not fully processed yet.
-       std::vector<char> pending_data;
-
-       // If <pending_data> starts with a Metacube header,
-       // this is true.
-       bool has_metacube_header;
-
-       pthread_t worker_thread;
-
-       // Whether we should stop or not.
-       volatile bool should_stop;
+class Input : public Thread {
+public:
+       virtual ~Input();
+       virtual InputProto serialize() const = 0;
+       virtual std::string get_url() const = 0;
+       virtual void close_socket() = 0;
 };
 
 #endif  // !defined(_INPUT_H)