http: use libcurl

MPD's HTTP client code has always been broken, no matter how effort
was put into fixing it.  Replace it with libcurl, which is known to be
quite stable.  This adds a fat library dependency, but only for people
who need streaming.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/inputStream.c b/src/inputStream.c
index 1c5e027e9..b293cb1cd 100644
--- a/src/inputStream.c
+++ b/src/inputStream.c
@@ -17,20 +17,29 @@
  */
 
 #include "inputStream.h"
+#include "config.h"
 
 #include "inputStream_file.h"
-#include "inputStream_http.h"
+
+#ifdef HAVE_CURL
+#include "input_curl.h"
+#endif
 
 #include <stdlib.h>
 
 void initInputStream(void)
 {
 	inputStream_initFile();
-	inputStream_initHttp();
+#ifdef HAVE_CURL
+	input_curl_global_init();
+#endif
 }
 
 void input_stream_global_finish(void)
 {
+#ifdef HAVE_CURL
+	input_curl_global_finish();
+#endif
 }
 
 int openInputStream(struct input_stream *inStream, char *url)
@@ -46,8 +55,11 @@ int openInputStream(struct input_stream *inStream, char *url)
 
 	if (inputStream_fileOpen(inStream, url) == 0)
 		return 0;
-	if (inputStream_httpOpen(inStream, url) == 0)
+
+#ifdef HAVE_CURL
+	if (input_curl_open(inStream, url))
 		return 0;
+#endif
 
 	return -1;
 }