From c601676abbce532136b5c5357f302771a34bc499 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 9 Feb 2011 11:26:39 +0000 Subject: [PATCH] fix icecast select git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1131 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6819701b2f5d301fe5c718482d2854d49cc613bd Author: Jacek Jendrzej Date: 2011-02-09 (Wed, 09 Feb 2011) Origin message was: ------------------ -fix icecast select git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1131 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 28f812f08..0715a58e2 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -688,16 +688,16 @@ int CAudioPlayerGui::show() InputSelector.addItem(new CMenuForwarder( LOCALE_AUDIOPLAYER_ADD_LOC, true, NULL, InetRadioInputChanger, cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); + sprintf(cnt, "%d", ++count); + InputSelector.addItem(new CMenuForwarder( + LOCALE_AUDIOPLAYER_ADD_IC, true, NULL, InetRadioInputChanger, + cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); if(g_settings.shoutcast_dev_id != "XXXXXXXXXXXXXXXX"){ sprintf(cnt, "%d", ++count); InputSelector.addItem(new CMenuForwarder( LOCALE_AUDIOPLAYER_ADD_SC, true, NULL, InetRadioInputChanger, cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); } - sprintf(cnt, "%d", ++count); - InputSelector.addItem(new CMenuForwarder( - LOCALE_AUDIOPLAYER_ADD_IC, true, NULL, InetRadioInputChanger, - cnt, CRCInput::convertDigitToKey(count + 1)), old_select == count); //InputSelector.addItem(GenericMenuSeparator); hide(); @@ -711,14 +711,13 @@ int CAudioPlayerGui::show() paintLCD(); break; case 1: - if(g_settings.shoutcast_dev_id != "XXXXXXXXXXXXXXXX") - openSCbrowser(); - break; - case 2: readDir_ic(); CVFD::getInstance()->setMode(CVFD::MODE_AUDIO); paintLCD(); break; + case 2: + openSCbrowser(); + break; default: break; }