MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 23:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

ICY scanner modifications

Browse Source
This commit is contained in:
ejurgensen 2014-05-29 11:50:56 +02:00
parent 02c23b0065
commit 22d37f240b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/filescanner_icy.c
View File

@ -42,7 +42,7 @@
#include <event.h> #include <event.h>
#if defined HAVE_LIBEVENT2 #if defined HAVE_LIBEVENT2
# include <evhttp.h> # include <event2/http.h>
#else #else
# include "evhttp/evhttp.h" # include "evhttp/evhttp.h"
#endif #endif
@ -124,8 +124,6 @@ scan_icy_request_cb(struct evhttp_request *req, void *arg)
status = ICY_DONE; status = ICY_DONE;
pthread_cond_signal(&ctx->cond); pthread_cond_signal(&ctx->cond);
pthread_mutex_unlock(&ctx->lck); pthread_mutex_unlock(&ctx->lck);
return;
} }
/* Will always return -1 to make evhttp close the connection - we only need the http headers */ /* Will always return -1 to make evhttp close the connection - we only need the http headers */
@ -172,6 +170,7 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
struct evhttp_request *req; struct evhttp_request *req;
struct evkeyvalq *headers; struct evkeyvalq *headers;
struct icy_ctx *ctx; struct icy_ctx *ctx;
char s[PATH_MAX];
time_t start; time_t start;
time_t end; time_t end;
int ret; int ret;
@ -208,6 +207,12 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
if (ctx->port < 0) if (ctx->port < 0)
ctx->port = 80; ctx->port = 80;
if (strlen(ctx->path) == 0)
{
ctx->path[0] = '/';
ctx->path[1] = '\0';
}
#ifdef HAVE_LIBEVENT2 #ifdef HAVE_LIBEVENT2
evcon = evhttp_connection_base_new(evbase_main, NULL, ctx->hostname, (unsigned short)ctx->port); evcon = evhttp_connection_base_new(evbase_main, NULL, ctx->hostname, (unsigned short)ctx->port);
if (!evcon) if (!evcon)
@ -257,7 +262,8 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
req->header_cb = scan_icy_header_cb; req->header_cb = scan_icy_header_cb;
headers = req->output_headers; headers = req->output_headers;
#endif #endif
evhttp_add_header(headers, "Host", ctx->hostname); snprintf(s, PATH_MAX, "%s:%d", ctx->hostname, ctx->port);
evhttp_add_header(headers, "Host", s);
evhttp_add_header(headers, "Icy-MetaData", "1"); evhttp_add_header(headers, "Icy-MetaData", "1");
/* Make request */ /* Make request */
@ -275,6 +281,7 @@ scan_metadata_icy(char *url, struct media_file_info *mfi)
/* Can't count on server support for ICY metadata, so /* Can't count on server support for ICY metadata, so
* while waiting for a reply make a parallel call to scan_metadata_ffmpeg. * while waiting for a reply make a parallel call to scan_metadata_ffmpeg.
* TODO ffmpeg 2/libav 10 has ICY/Shoutcast support
*/ */
no_icy: no_icy:
ret = scan_metadata_ffmpeg(url, mfi); ret = scan_metadata_ffmpeg(url, mfi);