From e3887083391d10f8cfcd1d8ac65a99d9978f05f2 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 27 Jan 2008 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.5.14=20-=20Fixed=20the=20Play=20function=20?= =?UTF-8?q?in=20the=20pictures=20plugin.=20-=20Updated=20the=20Finnish=20O?= =?UTF-8?q?SD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Updated=20?= =?UTF-8?q?the=20Makefile=20of=20the=20skincurses=20plugin=20(thanks=20to?= =?UTF-8?q?=20Rolf=20Ahrenberg).=20-=20The=20new=20option=20--localedir=20?= =?UTF-8?q?can=20be=20used=20to=20set=20the=20locale=20directory=20at=20ru?= =?UTF-8?q?ntime=20=20=20(based=20on=20a=20patch=20from=20Stefan=20Huelswi?= =?UTF-8?q?tt).=20-=20Fixed=20finding=20new=20transponders=20(thanks=20to?= =?UTF-8?q?=20Winfried=20K=C3=B6hler).=20-=20Implemented=20handling=20of?= =?UTF-8?q?=20DVB-S2=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler=20and=20?= =?UTF-8?q?Reinhard=20Nissl=20=20=20for=20a=20patch=20that=20was=20used=20?= =?UTF-8?q?to=20implement=20this).=20VDR=20now=20requires=20the=20"multipr?= =?UTF-8?q?oto"=20=20=20DVB=20driver,=20e.g.=20from=20http://jusst.de/hg/m?= =?UTF-8?q?ultiproto.=20-=20Removed=20switching=20to=20the=20next=20higher?= =?UTF-8?q?=20or=20lower=20channel=20if=20the=20current=20channel=20=20=20?= =?UTF-8?q?is=20not=20available,=20in=20order=20to=20allow=20staying=20on?= =?UTF-8?q?=20an=20encrypted=20channel=20that=20takes=20=20=20a=20while=20?= =?UTF-8?q?for=20the=20CAM=20to=20start=20decrypting.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- menu.c | 80 +++++++++--------------------------------------------------------- 1 file changed, 10 insertions(+), 70 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index b7ecf2a..4499b5f 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.469 2008/01/13 13:59:33 kls Exp $ + * $Id: menu.c 1.470 2008/01/26 16:29:05 kls Exp $ */ #include "menu.h" @@ -148,70 +148,6 @@ eOSState cMenuEditSrcItem::ProcessKey(eKeys Key) return state; } -// --- cMenuEditMapItem ------------------------------------------------------ - -class cMenuEditMapItem : public cMenuEditItem { -protected: - int *value; - const tChannelParameterMap *map; - const char *zeroString; - virtual void Set(void); -public: - cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString = NULL); - virtual eOSState ProcessKey(eKeys Key); - }; - -cMenuEditMapItem::cMenuEditMapItem(const char *Name, int *Value, const tChannelParameterMap *Map, const char *ZeroString) -:cMenuEditItem(Name) -{ - value = Value; - map = Map; - zeroString = ZeroString; - Set(); -} - -void cMenuEditMapItem::Set(void) -{ - int n = MapToUser(*value, map); - if (n == 999) - SetValue(tr("auto")); - else if (n == 0 && zeroString) - SetValue(zeroString); - else if (n >= 0) { - char buf[16]; - snprintf(buf, sizeof(buf), "%d", n); - SetValue(buf); - } - else - SetValue("???"); -} - -eOSState cMenuEditMapItem::ProcessKey(eKeys Key) -{ - eOSState state = cMenuEditItem::ProcessKey(Key); - - if (state == osUnknown) { - int newValue = *value; - int n = DriverIndex(*value, map); - if (NORMALKEY(Key) == kLeft) { // TODO might want to increase the delta if repeated quickly? - if (n-- > 0) - newValue = map[n].driverValue; - } - else if (NORMALKEY(Key) == kRight) { - if (map[++n].userValue >= 0) - newValue = map[n].driverValue; - } - else - return state; - if (newValue != *value) { - *value = newValue; - Set(); - } - state = osContinue; - } - return state; -} - // --- cMenuEditChannel ------------------------------------------------------ class cMenuEditChannel : public cOsdMenu { @@ -272,15 +208,19 @@ void cMenuEditChannel::Setup(void) XXX*/ // Parameters for specific types of sources: ST(" S ") Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr")); + ST(" S ") Add(new cMenuEditMapItem( tr("System"), &data.system, SystemValues)); ST("CS ") Add(new cMenuEditIntItem( tr("Srate"), &data.srate)); - ST("CST") Add(new cMenuEditMapItem( tr("Inversion"), &data.inversion, InversionValues, tr("off"))); - ST("CST") Add(new cMenuEditMapItem( tr("CoderateH"), &data.coderateH, CoderateValues, tr("none"))); - ST(" T") Add(new cMenuEditMapItem( tr("CoderateL"), &data.coderateL, CoderateValues, tr("none"))); - ST("C T") Add(new cMenuEditMapItem( tr("Modulation"), &data.modulation, ModulationValues, "QPSK")); + ST("CST") Add(new cMenuEditMapItem( tr("Inversion"), &data.inversion, InversionValues)); + ST("CST") Add(new cMenuEditMapItem( tr("CoderateH"), &data.coderateH, CoderateValues)); + ST(" T") Add(new cMenuEditMapItem( tr("CoderateL"), &data.coderateL, CoderateValues)); + ST("CST") Add(new cMenuEditMapItem( tr("Modulation"), &data.modulation, ModulationValues)); ST(" T") Add(new cMenuEditMapItem( tr("Bandwidth"), &data.bandwidth, BandwidthValues)); ST(" T") Add(new cMenuEditMapItem( tr("Transmission"), &data.transmission, TransmissionValues)); ST(" T") Add(new cMenuEditMapItem( tr("Guard"), &data.guard, GuardValues)); - ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues, tr("none"))); + ST(" T") Add(new cMenuEditMapItem( tr("Hierarchy"), &data.hierarchy, HierarchyValues)); + ST(" T") Add(new cMenuEditMapItem( tr("Alpha"), &data.alpha, AlphaValues)); + ST(" T") Add(new cMenuEditMapItem( tr("Priority"), &data.priority, PriorityValues)); + ST(" S ") Add(new cMenuEditMapItem( tr("Rolloff"), &data.rollOff, RollOffValues)); SetCurrent(Get(current)); Display(); -- cgit v1.2.3