summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/menu.c b/menu.c
index 5b40f166..6a7907f7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.283 2004/02/08 14:12:23 kls Exp $
+ * $Id: menu.c 1.284 2004/02/08 15:06:42 kls Exp $
*/
#include "menu.h"
@@ -2216,11 +2216,16 @@ cMenuSetupCICAM::cMenuSetupCICAM(void)
helpKeys = -1;
SetSection(tr("CICAM"));
for (int d = 0; d < cDevice::NumDevices(); d++) {
- for (int i = 0; i < 2; i++) {
+ cDevice *Device = cDevice::GetDevice(d);
+ cCiHandler *CiHandler = Device->CiHandler();
+ for (int Slot = 0; Slot < 2; Slot++) {
char buffer[32];
- int CardIndex = cDevice::GetDevice(d)->CardIndex();
- snprintf(buffer, sizeof(buffer), "%s%d %d", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, i + 1);
- Add(new cMenuEditCaItem(buffer, &data.CaCaps[CardIndex][i]));
+ int CardIndex = Device->CardIndex();
+ const char *CamName = CiHandler ? CiHandler->GetCamName(Slot) : NULL;
+ if (!CamName)
+ CamName = "-";
+ snprintf(buffer, sizeof(buffer), "%s%d %d\t%s", tr("Setup.CICAM$CICAM DVB"), CardIndex + 1, Slot + 1, CamName);
+ Add(new cOsdItem(buffer));
}
}
SetHelpKeys();
@@ -2275,9 +2280,7 @@ eOSState cMenuSetupCICAM::ProcessKey(eKeys Key)
{
eOSState state = cMenuSetupBase::ProcessKey(Key);
- if (state == osBack && Key == kOk)
- cDevice::SetCaCaps();
- else if (state == osUnknown) {
+ if (state == osUnknown) {
switch (Key) {
case kRed: if (helpKeys == 1)
return Menu();