Merge HTTPResponse into HTTP::Connection.

1 files changed, 4 insertions, 5 deletions

diff --git a/music.h b/music.h
index 1362a7a..c019136 100644
--- a/music.h
+++ b/music.h
@@ -1,7 +1,6 @@
 #ifndef MUSIC_H
 #define MUSIC_H
 
-#include "http.h"
 #include "http_connection.h"
 
 #include <boost/filesystem.hpp>
@@ -14,13 +13,13 @@ class MusicListing {
 	public:
 		typedef boost::shared_ptr<MusicListing> p;
 		fs::path path;
-		virtual void render(HTTP::Connection::p req, HTTPResponse& res) = 0;
+		virtual void render(HTTP::Connection::p req) = 0;
 };
 
 class MusicTrack : public MusicListing {
 	public:
 		MusicTrack(const fs::path path);
-		virtual void render(HTTP::Connection::p req, HTTPResponse& res);
+		virtual void render(HTTP::Connection::p req);
 };
 
 class MusicDirectory : public MusicListing {
@@ -31,13 +30,13 @@ class MusicDirectory : public MusicListing {
 		PathListings tracks;
 
 		MusicDirectory(const fs::path root);
-		virtual void render(HTTP::Connection::p req, HTTPResponse& res);
+		virtual void render(HTTP::Connection::p req);
 };
 
 namespace music {
 	extern fs::path root_directory;
 	void init(std::string root);
-	MusicListing::p get(const std::vector<std::string>& path);
+	MusicListing::p get(const HTTP::Connection::PathList& path);
 	MusicListing::p get(const std::string& path);
 	MusicDirectory::p get_directory(const std::string& path);
 	std::vector<MusicListing::p> find_artist(const std::string artist);