mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/filebrowser.cpp
View File

@@ -39,6 +39,7 @@
#include <global.h>
#include <neutrino.h>
#include <driver/display.h>
#include <driver/screen_max.h>
#include <driver/display.h>
@@ -440,7 +441,7 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
xmlDocPtr answer_parser = parseXml(answer.c_str());
if (answer_parser != NULL) {
char *ptr;
const char *ptr = NULL;
unsigned char xml_decode = 0;
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
@@ -448,7 +449,7 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
xml_decode = 1;
else if (strcmp(xmlGetName(element), "stationlist") == 0)
xml_decode = 2;
element = element->xmlChildrenNode;
element = xmlChildrenNode(element);
if (element == NULL) {
printf("[FileBrowser] SC: Directory cannot be read.\n");
@@ -459,7 +460,7 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
file.Time = 0;
flist->push_back(file);
} else {
char * tunein_base = NULL;
const char * tunein_base = NULL;
if (xml_decode == 1) {
CFile file;
@@ -482,7 +483,9 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
CFile file;
if (xml_decode == 1) {
file.Mode = S_IFDIR + 0777 ;
file.Name = xmlGetAttribute(element, "name");
const char *eptr = xmlGetAttribute(element, "name");
if(eptr)
file.Name = eptr;
file.Url = sc_get_genre + file.Name;
file.Size = 0;
file.Time = 0;
@@ -499,8 +502,14 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
ptr = xmlGetAttribute(element, "mt");
if (ptr && (strcmp(ptr, "audio/mpeg")==0)) {
file.Mode = S_IFREG + 0777 ;
file.Name = xmlGetAttribute(element, "name");
file.Url = sc_tune_in_base + tunein_base + (std::string)"?id=" + xmlGetAttribute(element, "id") + (std::string)"&k=" + g_settings.shoutcast_dev_id;
const char *aptr = xmlGetAttribute(element, "name");
if(aptr)
file.Name = aptr;
const char *idptr = xmlGetAttribute(element, "id");
std::string id;
if(idptr)
id = idptr;
file.Url = sc_tune_in_base + tunein_base + (std::string)"?id=" + id + (std::string)"&k=" + g_settings.shoutcast_dev_id;
//printf("adding %s (%s)\n", file.Name.c_str(), file.Url.c_str());
ptr = xmlGetAttribute(element, "br");
if (ptr) {
@@ -515,7 +524,7 @@ printf("CFileBrowser::readDir_sc: read done, size %d\n", (int)answer.size());
}
}
}
element = element->xmlNextNode;
element = xmlNextNode(element);
}
}
xmlFreeDoc(answer_parser);