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

Preparing the menu classes for Lua Part #2

Browse Source 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
This commit is contained in:
M. Liebmann
2014-01-16 23:20:04 +01:00
parent 2c9c9debcc
commit b41819190d
35 changed files with 298 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/audio_select.cpp
View File

@@ -111,7 +111,7 @@ int CAudioSelectMenuHandler::doMenu ()
{
char apid[5];
sprintf(apid, "%d", i);
CMenuForwarderNonLocalized *fw = new CMenuForwarderNonLocalized(g_RemoteControl->current_PIDs.APIDs[i].desc,
CMenuForwarder *fw = new CMenuForwarder(g_RemoteControl->current_PIDs.APIDs[i].desc,
true, NULL, this, apid, CRCInput::convertDigitToKey(i + 1));
fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
AudioSelector.addItem(fw, (i == g_RemoteControl->current_PIDs.PIDs.selected_apid));
@@ -156,7 +156,7 @@ int CAudioSelectMenuHandler::doMenu ()
snprintf(spid,sizeof(spid), "DVB:%d", sd->pId);
char item[64];
snprintf(item,sizeof(item), "DVB: %s (pid %x)", sd->ISO639_language_code.c_str(), sd->pId);
AudioSelector.addItem(new CMenuForwarderNonLocalized(item /*sd->ISO639_language_code.c_str()*/,
AudioSelector.addItem(new CMenuForwarder(item /*sd->ISO639_language_code.c_str()*/,
sd->pId != dvbsub_getpid(), NULL, &SubtitleChanger, spid, CRCInput::convertDigitToKey(++shortcut_num)));
}
if (s->thisSubType == CZapitAbsSub::TTX)
@@ -174,7 +174,7 @@ int CAudioSelectMenuHandler::doMenu ()
snprintf(spid,sizeof(spid), "TTX:%d:%03X:%s", sd->pId, page, sd->ISO639_language_code.c_str());
char item[64];
snprintf(item,sizeof(item), "TTX: %s (pid %x page %03X)", sd->ISO639_language_code.c_str(), sd->pId, page);
AudioSelector.addItem(new CMenuForwarderNonLocalized(item /*sd->ISO639_language_code.c_str()*/,
AudioSelector.addItem(new CMenuForwarder(item /*sd->ISO639_language_code.c_str()*/,
!tuxtx_subtitle_running(&pid, &page, NULL), NULL, &SubtitleChanger, spid, CRCInput::convertDigitToKey(++shortcut_num)));
}
}