mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- audioplayer: fix station logo handling for icecast"

Browse Source 
This reverts commit 2e96ac3 - it is incomplete!
This commit is contained in:
GetAway
2018-05-26 18:31:03 +02:00
parent 714cca6ba6
commit 15572e2d7c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/audioplayer.cpp
View File

@@ -1183,7 +1183,7 @@ void CAudioPlayerGui::readDir_ic(void)
{ {
xmlDocPtr answer_parser = parseXml(answer.c_str()); xmlDocPtr answer_parser = parseXml(answer.c_str());
scanBox->hide(); scanBox->hide();
scanXmlData(answer_parser, "listen_url", "server_name", "", "bitrate", true); scanXmlData(answer_parser, "listen_url", "server_name", "bitrate", true);
} }
else else
scanBox->hide(); scanBox->hide();
@@ -1197,7 +1197,7 @@ void CAudioPlayerGui::scanXmlFile(std::string filename)
scanXmlData(answer_parser, "url", "name"); scanXmlData(answer_parser, "url", "name");
} }
void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *logotag, const char *bitratetag, bool usechild) void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *bitratetag, bool usechild)
{ {
#define IC_typetag "server_type" #define IC_typetag "server_type"

2
src/gui/audioplayer.h
View File

@@ -178,7 +178,7 @@ class CAudioPlayerGui : public CMenuTarget
/** /**
* Processes a loaded XML file/data of internet audiostreams or playlists * Processes a loaded XML file/data of internet audiostreams or playlists
*/ */
void scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *logotag = "", const char *bitratetag = NULL, bool usechild = false); void scanXmlData(xmlDocPtr answer_parser, const char *urltag, const char *nametag, const char *bitratetag = NULL, bool usechild = false);
/** /**
* Reads the icecast directory (XML file) and calls scanXmlData * Reads the icecast directory (XML file) and calls scanXmlData