git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1466 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4292dac8a6
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-12 (Thu, 12 May 2011)

Origin message was:
------------------
- audio-select testfix -> http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p130017-bug-audio-optionen/#post130017

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1466 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-05-12 18:45:34 +00:00
parent 598aaf23a5
commit 2ad944f661

View File

@@ -96,6 +96,8 @@ int CAudioSelectMenuHandler::doMenu ()
AudioSelector.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); AudioSelector.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL);
unsigned int shortcut_num = 1;
// -- setup menue due to Audio PIDs // -- setup menue due to Audio PIDs
if (g_RemoteControl->current_PIDs.APIDs.size() > 1) if (g_RemoteControl->current_PIDs.APIDs.size() > 1)
{ {
@@ -109,6 +111,7 @@ int CAudioSelectMenuHandler::doMenu ()
fw[i] = new CMenuForwarderNonLocalized(g_RemoteControl->current_PIDs.APIDs[i].desc, true, NULL, APIDChanger, apid, CRCInput::convertDigitToKey(i + 1)); fw[i] = new CMenuForwarderNonLocalized(g_RemoteControl->current_PIDs.APIDs[i].desc, true, NULL, APIDChanger, apid, CRCInput::convertDigitToKey(i + 1));
fw[i]->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true); fw[i]->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
AudioSelector.addItem(fw[i], (i == g_RemoteControl->current_PIDs.PIDs.selected_apid)); AudioSelector.addItem(fw[i], (i == g_RemoteControl->current_PIDs.PIDs.selected_apid));
shortcut_num = i+1;
} }
AudioSelector.addItem(GenericMenuSeparatorLine); AudioSelector.addItem(GenericMenuSeparatorLine);
} }
@@ -131,7 +134,6 @@ int CAudioSelectMenuHandler::doMenu ()
int curnum = channelList->getActiveChannelNumber(); int curnum = channelList->getActiveChannelNumber();
CZapitChannel * cc = channelList->getChannel(curnum); CZapitChannel * cc = channelList->getChannel(curnum);
unsigned int shortcut_num = 1;
bool sep_added = false; bool sep_added = false;
if(cc) if(cc)
{ {