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

- audioplayer: change scanXmlData() arguments order ...

Browse Source 
switch url <-> name to get the same order as in other used functions

(cherry picked from commit f31f8c5bc84c817e3fc955d816bb57cb0dcdfab7)
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-06-27 23:45:57 +02:00
committed by Thilo Graf
parent 9d323f4994
commit d75a3b0f58
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audioplayer.cpp
View File

@@ -1141,7 +1141,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, "server_name", "listen_url", "bitrate", true); scanXmlData(answer_parser, "listen_url", "server_name", "bitrate", true);
} }
else else
scanBox->hide(); scanBox->hide();
@@ -1152,10 +1152,10 @@ void CAudioPlayerGui::readDir_ic(void)
void CAudioPlayerGui::scanXmlFile(std::string filename) void CAudioPlayerGui::scanXmlFile(std::string filename)
{ {
xmlDocPtr answer_parser = parseXmlFile(filename.c_str()); xmlDocPtr answer_parser = parseXmlFile(filename.c_str());
scanXmlData(answer_parser, "name", "url"); scanXmlData(answer_parser, "url", "name");
} }
void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *nametag, const char *urltag, 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

@@ -176,7 +176,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 *nametag, const char *urltag, 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