X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=input.h;h=14537c85c6010900b8cb6c096cd8f48606ac648b;hp=28bc14b09b309f4dc034ff665136513c75864d8d;hb=e1722a5c0341fd541ce57f1eed4dc76cbd3efe07;hpb=99738bd173040bf4e2d2d42ffc8c7ab8c105cf75

diff --git a/input.h b/input.h
index 28bc14b..14537c8 100644
--- a/input.h
+++ b/input.h
@@ -4,9 +4,11 @@
 #include <vector>
 #include <string>
 
+#include "thread.h"
+
 class InputProto;
 
-class Input {
+class Input : public Thread {
 public:
 	Input(const std::string &stream_id, const std::string &url);
 
@@ -14,20 +16,11 @@ public:
 	Input(const InputProto &serialized);
 	InputProto serialize() const;
 
-	// Connect to the given URL and start streaming.
-	void run();
-
-	// Stops the streaming, but lets the file descriptor stay open.
-	void stop();
-
 	std::string get_url() const { return url; }
 
 private:
-	// Recovers the this pointer and calls do_work().
-	static void *do_work_thunk(void *arg);
-
 	// Actually does the download.
-	void do_work();
+	virtual void do_work();
 	
 	// Open a socket that connects to the given host and port. Does DNS resolving.
 	int lookup_and_connect(const std::string &host, const std::string &port);
@@ -81,12 +74,6 @@ private:
 
 	// The socket we are downloading on (or -1).
 	int sock;	
-
-	// Handle to the thread that actually does the download.
-	pthread_t worker_thread;
-
-	// Whether we should stop or not.
-	volatile bool should_stop;
 };
 
 #endif  // !defined(_INPUT_H)