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

Merge remote-tracking branch 'check/next-cc'

Browse Source
This commit is contained in:
Stefan Seyfried
2013-12-07 18:28:56 +01:00
parent 76f1f6f007 a8f7668a9c
commit 5976f03ca2
11 changed files with 37 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/audioplayer.cpp
View File

@@ -512,10 +512,9 @@ int CAudioPlayerGui::show()
{
if (m_show_playlist && !m_playlist.empty() )
{
int step = 0;
int prevselected = m_selected;
int step = msg == CRCInput::RC_page_up ? m_listmaxshow : 1;
step = msg == CRCInput::RC_page_up ? m_listmaxshow : 1;
m_selected -= step;
if ((prevselected-step) < 0)
m_selected = m_playlist.size()-1;
@@ -1197,7 +1196,6 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *nametag,
char *ptr = NULL;
char *name = NULL;
char *url = NULL;
char *type = NULL;
time_t bitrate = 0;
bool skip = true;
listPos++;
@@ -1210,6 +1208,7 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *nametag,
#endif // LCD_UPDATE
if (usechild) {
char *type = NULL;
xmlNodePtr child = element->xmlChildrenNode;
while (child) {
if (strcmp(xmlGetName(child), nametag) == 0)