summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-01-09 23:22:21 +0100
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-01-09 23:23:14 +0100
commit53bcebbadb1edc1429ff499d71876e8ecea69c4d (patch)
treec8e014d50254596b8bc3a862278718303d7bcbc8 /plugins
parentf327ae6e50094931f3f4cb4e8a858b5a7d4c1a9a (diff)
fixed icecast genre metadata
Diffstat (limited to 'plugins')
-rw-r--r--plugins/vfs_curl/vfs_curl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/vfs_curl/vfs_curl.c b/plugins/vfs_curl/vfs_curl.c
index 411ddd13..127a5a4e 100644
--- a/plugins/vfs_curl/vfs_curl.c
+++ b/plugins/vfs_curl/vfs_curl.c
@@ -646,7 +646,6 @@ http_get_content_name (DB_FILE *stream) {
return fp->content_name;
}
-#if 0
static const char *
http_get_content_genre (DB_FILE *stream) {
trace ("http_get_content_genre\n");
@@ -662,12 +661,11 @@ http_get_content_genre (DB_FILE *stream) {
http_start_streamer (fp);
}
trace ("http_get_content_genre waiting for response...\n");
- while (fp->status != STATUS_FINISHED && fp->status != STATUS_ABORTED && !fp->gotheader) {
+ while (fp->status != STATUS_FINISHED && fp->status != STATUS_ABORTED && !fp->gotheader && !vfs_curl_abort) {
usleep (3000);
}
return fp->content_genre;
}
-#endif
static int
vfs_curl_on_abort (DB_event_t *ev, uintptr_t data) {
@@ -721,7 +719,7 @@ static DB_vfs_t plugin = {
.getlength = http_getlength,
.get_content_type = http_get_content_type,
.get_content_name = http_get_content_name,
- .get_content_genre = http_get_content_type,
+ .get_content_genre = http_get_content_genre,
.scheme_names = scheme_names,
.streaming = 1
};