Merge remote-tracking branch 'origin/pr/188'

This commit is contained in:
Adam Sutton 2012-12-30 12:23:24 +00:00
commit aa838c6c05

View file

@ -527,6 +527,8 @@ page_http_playlist(http_connection_t *hc, const char *remain, void *opaque)
r = http_tag_list_playlist(hc);
else if(!strcmp(components[0], "channels"))
r = http_channel_list_playlist(hc);
else if(!strcmp(components[0], "channels.m3u"))
r = http_channel_list_playlist(hc);
else if(!strcmp(components[0], "recordings"))
r = http_dvr_list_playlist(hc);
else {