mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
vdr:
- remove two unneeded and not working patches
This commit is contained in:
Stephan Raue
parent
7e65f6cab3
commit
fd61a3b6c3
File diff suppressed because it is too large
Load Diff
@ -1,449 +0,0 @@
|
|||||||
diff -ruNp vdr-1.7.7-extensions/config.c vdr-1.7.7-ext-gotox/config.c
|
|
||||||
--- vdr-1.7.7-extensions/config.c 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/config.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -286,6 +286,13 @@ cSetup::cSetup(void)
|
|
||||||
LnbFrequLo = 9750;
|
|
||||||
LnbFrequHi = 10600;
|
|
||||||
DiSEqC = 0;
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ UseGotox = 0;
|
|
||||||
+ GotoxSpeed = 100;
|
|
||||||
+ GotoxRepeat = 0;
|
|
||||||
+ GotoxSN = 0; GotoxLat = 613; GotoxEW = 1; GotoxLong = 236; // Somewhere at Tampere, Finland :^)
|
|
||||||
+ GotoxPrevSource = 0;
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
SetSystemTime = 0;
|
|
||||||
TimeSource = 0;
|
|
||||||
TimeTransponder = 0;
|
|
||||||
@@ -642,6 +649,16 @@ bool cSetup::Parse(const char *Name, con
|
|
||||||
else if (!strcasecmp(Name, "LnbFrequLo")) LnbFrequLo = atoi(Value);
|
|
||||||
else if (!strcasecmp(Name, "LnbFrequHi")) LnbFrequHi = atoi(Value);
|
|
||||||
else if (!strcasecmp(Name, "DiSEqC")) DiSEqC = atoi(Value);
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ else if (!strcasecmp(Name, "UseGotox")) UseGotox = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxSpeed")) GotoxSpeed = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxRepeat")) GotoxRepeat = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxSN")) GotoxSN = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxLat")) GotoxLat = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxEW")) GotoxEW = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxLong")) GotoxLong = atoi(Value);
|
|
||||||
+ else if (!strcasecmp(Name, "GotoxPrevSource")) GotoxPrevSource = atoi(Value);
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value);
|
|
||||||
else if (!strcasecmp(Name, "TimeSource")) TimeSource = cSource::FromString(Value);
|
|
||||||
else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value);
|
|
||||||
@@ -873,6 +890,16 @@ bool cSetup::Save(void)
|
|
||||||
Store("LnbFrequLo", LnbFrequLo);
|
|
||||||
Store("LnbFrequHi", LnbFrequHi);
|
|
||||||
Store("DiSEqC", DiSEqC);
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ Store("UseGotox", UseGotox);
|
|
||||||
+ Store("GotoxSpeed", GotoxSpeed);
|
|
||||||
+ Store("GotoxRepeat", GotoxRepeat);
|
|
||||||
+ Store("GotoxSN", GotoxSN);
|
|
||||||
+ Store("GotoxLat", GotoxLat);
|
|
||||||
+ Store("GotoxEW", GotoxEW);
|
|
||||||
+ Store("GotoxLong", GotoxLong);
|
|
||||||
+ Store("GotoxPrevSource", GotoxPrevSource);
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
Store("SetSystemTime", SetSystemTime);
|
|
||||||
Store("TimeSource", cSource::ToString(TimeSource));
|
|
||||||
Store("TimeTransponder", TimeTransponder);
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/config.h vdr-1.7.7-ext-gotox/config.h
|
|
||||||
--- vdr-1.7.7-extensions/config.h 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/config.h 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -301,6 +301,16 @@ public:
|
|
||||||
int LnbFrequLo;
|
|
||||||
int LnbFrequHi;
|
|
||||||
int DiSEqC;
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ int GotoxRepeat;
|
|
||||||
+ int GotoxSN;
|
|
||||||
+ int GotoxEW;
|
|
||||||
+ int GotoxSpeed;
|
|
||||||
+ int GotoxLat;
|
|
||||||
+ int GotoxLong;
|
|
||||||
+ int UseGotox;
|
|
||||||
+ int GotoxPrevSource;
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
int SetSystemTime;
|
|
||||||
int TimeSource;
|
|
||||||
int TimeTransponder;
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/diseqc.c vdr-1.7.7-ext-gotox/diseqc.c
|
|
||||||
--- vdr-1.7.7-extensions/diseqc.c 2008-02-10 15:09:27.000000000 +0100
|
|
||||||
+++ vdr-1.7.7-ext-gotox/diseqc.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -114,6 +114,9 @@ cDiseqc::eDiseqcActions cDiseqc::Execute
|
|
||||||
case 'V': return daVoltage18;
|
|
||||||
case 'A': return daMiniA;
|
|
||||||
case 'B': return daMiniB;
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ case 'G': return daGotoX;
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
case 'W': *CurrentAction = Wait(*CurrentAction); break;
|
|
||||||
case '[': *CurrentAction = Codes(*CurrentAction); return *CurrentAction ? daCodes : daNone;
|
|
||||||
default: return daNone;
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/diseqc.h vdr-1.7.7-ext-gotox/diseqc.h
|
|
||||||
--- vdr-1.7.7-extensions/diseqc.h 2002-12-07 14:54:02.000000000 +0100
|
|
||||||
+++ vdr-1.7.7-ext-gotox/diseqc.h 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -22,6 +22,9 @@ public:
|
|
||||||
daVoltage18,
|
|
||||||
daMiniA,
|
|
||||||
daMiniB,
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ daGotoX,
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
daCodes,
|
|
||||||
};
|
|
||||||
enum { MaxDiseqcCodes = 6 };
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/dvbdevice.c vdr-1.7.7-ext-gotox/dvbdevice.c
|
|
||||||
--- vdr-1.7.7-extensions/dvbdevice.c 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/dvbdevice.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -17,6 +17,9 @@
|
|
||||||
#include <linux/dvb/video.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/mman.h>
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+#include <math.h>
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
#include "channels.h"
|
|
||||||
#include "diseqc.h"
|
|
||||||
#include "dvbci.h"
|
|
||||||
@@ -214,6 +217,87 @@ static unsigned int FrequencyToHz(unsign
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+void HandleGotox(int fd_frontend, int new_source)
|
|
||||||
+{
|
|
||||||
+ int gotoXTable[10] = { 0x00, 0x02, 0x03, 0x05, 0x06, 0x08, 0x0A, 0x0B, 0x0D, 0x0E };
|
|
||||||
+ int satlong;
|
|
||||||
+ int satprev;
|
|
||||||
+ float waitseconds = 0;
|
|
||||||
+
|
|
||||||
+ if (Setup.UseGotox == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ // Check if zapped into new source position?
|
|
||||||
+ if (new_source != Setup.GotoxPrevSource) {
|
|
||||||
+ satlong = (new_source & ~0xC800);
|
|
||||||
+ satprev = (Setup.GotoxPrevSource & ~0xC800);
|
|
||||||
+ if ((new_source & 0xC000) != 0x8000)
|
|
||||||
+ return; // Fail
|
|
||||||
+ if (new_source & 0x0800)
|
|
||||||
+ satlong = satlong * (-1);
|
|
||||||
+ if (Setup.GotoxPrevSource & 0x0800)
|
|
||||||
+ satprev = satprev * (-1);
|
|
||||||
+ if (Setup.GotoxSpeed > 0) {
|
|
||||||
+ waitseconds = fabs(satlong-satprev)/(float)(Setup.GotoxSpeed);
|
|
||||||
+ if (waitseconds < 0.0) waitseconds = 0.0; // Should not happen but ...
|
|
||||||
+ if (waitseconds > 60.0) waitseconds = 60.0; // Limit wait time to 60s
|
|
||||||
+ }
|
|
||||||
+ int Long = Setup.GotoxEW ? -Setup.GotoxLong : Setup.GotoxLong;
|
|
||||||
+ int Lat = Setup.GotoxSN ? -Setup.GotoxLat : Setup.GotoxLat;
|
|
||||||
+ double azimuth = M_PI+atan(tan((satlong-Long)*M_PI/1800)/sin(Lat*M_PI/1800));
|
|
||||||
+ double x = acos(cos((satlong-Long)*M_PI/1800)*cos(Lat*M_PI/1800));
|
|
||||||
+ double elevation = atan((cos(x)-0.1513)/sin(x));
|
|
||||||
+ double SatHourangle = 180+atan((-cos(elevation)*sin(azimuth))/(sin(elevation)*cos(Lat*M_PI/1800)
|
|
||||||
+ -cos(elevation)*sin(Lat*M_PI/1800)*cos(azimuth)))*180/M_PI;
|
|
||||||
+ int tmp = (int)(fabs(180-SatHourangle)*10);
|
|
||||||
+ tmp = (tmp/10)*0x10 + gotoXTable[ tmp % 10 ];
|
|
||||||
+ int p2 = (tmp%0x0100);
|
|
||||||
+ int p1 = (tmp/0x0100);
|
|
||||||
+ if (SatHourangle < 180)
|
|
||||||
+ p1 |= 0xe0;
|
|
||||||
+ else
|
|
||||||
+ p1 |= 0xd0;
|
|
||||||
+
|
|
||||||
+ dsyslog("DiSEqC GotoX %d (%d) -> %d (%d), wait time %4.1fs",
|
|
||||||
+ satprev, Setup.GotoxPrevSource, satlong, new_source, waitseconds);
|
|
||||||
+
|
|
||||||
+#if 1
|
|
||||||
+ // Set high LNB voltage and tone off, then wait > 15ms
|
|
||||||
+ CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18));
|
|
||||||
+ CHECK(ioctl(fd_frontend, FE_SET_TONE, SEC_TONE_OFF));
|
|
||||||
+ usleep(20000);
|
|
||||||
+
|
|
||||||
+ // Send 1st GotoX command, then wait > 15ms
|
|
||||||
+ uchar gotox_bytes[5] = { 0xe0, 0x31, 0x6e, p1, p2};
|
|
||||||
+ struct dvb_diseqc_master_cmd gotox_cmd;
|
|
||||||
+ memcpy(gotox_cmd.msg, gotox_bytes, 5);
|
|
||||||
+ gotox_cmd.msg_len = 5;
|
|
||||||
+ CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &gotox_cmd));
|
|
||||||
+ usleep(20000);
|
|
||||||
+
|
|
||||||
+ // Send repeated GotoX command, then wait > 15ms
|
|
||||||
+ if (Setup.GotoxRepeat) {
|
|
||||||
+ gotox_bytes[0] = 0xe1;
|
|
||||||
+ memcpy(gotox_cmd.msg, gotox_bytes, 5);
|
|
||||||
+ CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_MASTER_CMD, &gotox_cmd));
|
|
||||||
+ usleep(20000);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Wait for dish movement
|
|
||||||
+ while (waitseconds > 0.0) {
|
|
||||||
+ usleep(100000); // 100ms
|
|
||||||
+ waitseconds = waitseconds - 100e-3;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ Setup.GotoxPrevSource = new_source;
|
|
||||||
+ dsyslog("DiSEqC GotoX done.");
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
+
|
|
||||||
bool cDvbTuner::SetFrontend(void)
|
|
||||||
{
|
|
||||||
#define MAXFRONTENDCMDS 16
|
|
||||||
@@ -252,6 +336,9 @@ bool cDvbTuner::SetFrontend(void)
|
|
||||||
case cDiseqc::daVoltage18: CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_18)); break;
|
|
||||||
case cDiseqc::daMiniA: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_A)); break;
|
|
||||||
case cDiseqc::daMiniB: CHECK(ioctl(fd_frontend, FE_DISEQC_SEND_BURST, SEC_MINI_B)); break;
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ case cDiseqc::daGotoX: HandleGotox(fd_frontend, channel.Source()); break;
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
case cDiseqc::daCodes: {
|
|
||||||
int n = 0;
|
|
||||||
uchar *codes = diseqc->Codes(n);
|
|
||||||
@@ -278,6 +365,11 @@ bool cDvbTuner::SetFrontend(void)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ // Send GotoX DiSEqC command if activated in vdr setup. Then wait with high LNB voltage
|
|
||||||
+ // estimated time for dish movement
|
|
||||||
+ HandleGotox(fd_frontend, channel.Source());
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
int tone = SEC_TONE_OFF;
|
|
||||||
if (frequency < (unsigned int)Setup.LnbSLOF) {
|
|
||||||
frequency -= Setup.LnbFrequLo;
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/Make.config.template vdr-1.7.7-ext-gotox/Make.config.template
|
|
||||||
--- vdr-1.7.7-extensions/Make.config.template 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/Make.config.template 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -67,6 +67,7 @@ DOLBYINREC = 1
|
|
||||||
#DVLRECSCRIPTADDON = 1
|
|
||||||
#DVLVIDPREFER = 1
|
|
||||||
#EM84XX = 1
|
|
||||||
+#GOTOX = 1
|
|
||||||
#GRAPHTFT = 1
|
|
||||||
#HARDLINKCUTTER = 1
|
|
||||||
#JUMPPLAY = 1
|
|
||||||
@@ -173,6 +174,10 @@ ifdef EM84XX
|
|
||||||
DEFINES += -DUSE_EM84XX
|
|
||||||
endif
|
|
||||||
|
|
||||||
+ifdef GOTOX
|
|
||||||
+DEFINES += -DUSE_GOTOX
|
|
||||||
+endif
|
|
||||||
+
|
|
||||||
ifdef GRAPHTFT
|
|
||||||
DEFINES += -DUSE_GRAPHTFT
|
|
||||||
endif
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/menu.c vdr-1.7.7-ext-gotox/menu.c
|
|
||||||
--- vdr-1.7.7-extensions/menu.c 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/menu.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -3447,6 +3447,15 @@ void cMenuSetupLNB::Setup(void)
|
|
||||||
Add(new cMenuEditIntItem( tr("Setup.LNB$High LNB frequency (MHz)"), &data.LnbFrequHi));
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ Add(new cMenuEditBoolItem(tr("Setup.LNB$Use GotoX dish positioning"), &data.UseGotox));
|
|
||||||
+ if (data.UseGotox) {
|
|
||||||
+ Add(new cMenuEditBoolItem(tr("Setup.LNB$Repeat GotoX commands"), &data.GotoxRepeat));
|
|
||||||
+ Add(new cMenuEditIntpItem(tr("Setup.LNB$Latitude"), &data.GotoxLat, 0, 900, &data.GotoxSN, tr("North"), tr("South")));
|
|
||||||
+ Add(new cMenuEditIntpItem(tr("Setup.LNB$Longitude"), &data.GotoxLong, 0, 1800, &data.GotoxEW, tr("West"), tr("East")));
|
|
||||||
+ Add(new cMenuEditIntdItem(tr("Setup.LNB$Rotor speed (deg/s)"), &data.GotoxSpeed, 1, 100));
|
|
||||||
+ }
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
SetCurrent(Get(current));
|
|
||||||
Display();
|
|
||||||
}
|
|
||||||
@@ -3454,6 +3463,9 @@ void cMenuSetupLNB::Setup(void)
|
|
||||||
eOSState cMenuSetupLNB::ProcessKey(eKeys Key)
|
|
||||||
{
|
|
||||||
int oldDiSEqC = data.DiSEqC;
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ int oldUseGotox = data.UseGotox;
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
eOSState state = cMenuSetupBase::ProcessKey(Key);
|
|
||||||
|
|
||||||
#ifdef USE_LNBSHARE
|
|
||||||
@@ -3462,6 +3474,12 @@ eOSState cMenuSetupLNB::ProcessKey(eKeys
|
|
||||||
|
|
||||||
if (Key != kNone && data.DiSEqC != oldDiSEqC)
|
|
||||||
Setup();
|
|
||||||
+
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ if (Key != kNone && data.UseGotox != oldUseGotox)
|
|
||||||
+ Setup();
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
+
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/menuitems.c vdr-1.7.7-ext-gotox/menuitems.c
|
|
||||||
--- vdr-1.7.7-extensions/menuitems.c 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/menuitems.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -1286,3 +1286,119 @@ void cMenuSetupPage::SetupStore(const ch
|
|
||||||
if (plugin)
|
|
||||||
plugin->SetupStore(Name, Value);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+// cMenuEditIntpItem & cMenuEditIntdItem for GotoX function
|
|
||||||
+
|
|
||||||
+void cMenuEditIntpItem::Set(void)
|
|
||||||
+{
|
|
||||||
+ char buf[16];
|
|
||||||
+ snprintf(buf, sizeof(buf), "%d.%d %s", *value/10, *value % 10, *value2 ? trueString : falseString);
|
|
||||||
+ SetValue(buf);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void cMenuEditIntdItem::Set(void)
|
|
||||||
+{
|
|
||||||
+ char buf[16];
|
|
||||||
+ snprintf(buf, sizeof(buf), "%d.%d", *value/10, *value % 10);
|
|
||||||
+ SetValue(buf);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+cMenuEditIntpItem::cMenuEditIntpItem(const char *Name, int *Value, int Min, int Max,int *Value2, const char *FalseString, const char *TrueString):cMenuEditIntItem(Name, Value, Min, Max)
|
|
||||||
+{
|
|
||||||
+ value = Value;
|
|
||||||
+ value2= Value2;
|
|
||||||
+ trueString = TrueString;
|
|
||||||
+ falseString = FalseString;
|
|
||||||
+ min = Min;
|
|
||||||
+ max = Max;
|
|
||||||
+ Set();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+cMenuEditIntdItem::cMenuEditIntdItem(const char *Name, int *Value, int Min, int Max):cMenuEditIntItem(Name, Value, Min, Max)
|
|
||||||
+{
|
|
||||||
+ value = Value;
|
|
||||||
+ min = Min;
|
|
||||||
+ max = Max;
|
|
||||||
+ Set();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+eOSState cMenuEditIntpItem::ProcessKey(eKeys Key)
|
|
||||||
+{
|
|
||||||
+ eOSState state = cMenuEditItem::ProcessKey(Key);
|
|
||||||
+ if (state == osUnknown) {
|
|
||||||
+ int newValue = *value;
|
|
||||||
+ int newValue2 = *value2;
|
|
||||||
+ Key = NORMALKEY(Key);
|
|
||||||
+ switch (Key) {
|
|
||||||
+ case kNone : break;
|
|
||||||
+ case k0...k9:
|
|
||||||
+ if (fresh) {
|
|
||||||
+ *value = 0;
|
|
||||||
+ fresh = false;
|
|
||||||
+ }
|
|
||||||
+ newValue = *value * 10 + (Key - k0);
|
|
||||||
+ break;
|
|
||||||
+ case kLeft :
|
|
||||||
+ newValue2 = 0;
|
|
||||||
+ fresh = true;
|
|
||||||
+ break;
|
|
||||||
+ case kRight :
|
|
||||||
+ newValue2 = 1;
|
|
||||||
+ fresh = true;
|
|
||||||
+ break;
|
|
||||||
+ default :
|
|
||||||
+ if (*value < min) { *value = min; Set(); }
|
|
||||||
+ if (*value > max) { *value = max; Set(); }
|
|
||||||
+ return state;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((!fresh || min <= newValue) && newValue <= max) {
|
|
||||||
+ *value = newValue;
|
|
||||||
+ *value2 = newValue2;
|
|
||||||
+ Set();
|
|
||||||
+ }
|
|
||||||
+ state = osContinue;
|
|
||||||
+ }
|
|
||||||
+ return state;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+eOSState cMenuEditIntdItem::ProcessKey(eKeys Key)
|
|
||||||
+{
|
|
||||||
+ eOSState state = cMenuEditItem::ProcessKey(Key);
|
|
||||||
+ if (state == osUnknown) {
|
|
||||||
+ int newValue = *value;
|
|
||||||
+ Key = NORMALKEY(Key);
|
|
||||||
+ switch (Key) {
|
|
||||||
+ case kNone : break;
|
|
||||||
+ case k0...k9:
|
|
||||||
+ if (fresh) {
|
|
||||||
+ *value = 0;
|
|
||||||
+ fresh = false;
|
|
||||||
+ }
|
|
||||||
+ newValue = *value * 10 + (Key - k0);
|
|
||||||
+ break;
|
|
||||||
+ case kLeft :
|
|
||||||
+ newValue = *value - 1;
|
|
||||||
+ fresh = true;
|
|
||||||
+ break;
|
|
||||||
+ case kRight :
|
|
||||||
+ newValue = *value + 1;
|
|
||||||
+ fresh = true;
|
|
||||||
+ break;
|
|
||||||
+ default :
|
|
||||||
+ if (*value < min) { *value = min; Set(); }
|
|
||||||
+ if (*value > max) { *value = max; Set(); }
|
|
||||||
+ return state;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((!fresh || min <= newValue) && newValue <= max) {
|
|
||||||
+ *value = newValue;
|
|
||||||
+ Set();
|
|
||||||
+ }
|
|
||||||
+ state = osContinue;
|
|
||||||
+ }
|
|
||||||
+ return state;
|
|
||||||
+}
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/menuitems.h vdr-1.7.7-ext-gotox/menuitems.h
|
|
||||||
--- vdr-1.7.7-extensions/menuitems.h 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/menuitems.h 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -241,4 +241,24 @@ public:
|
|
||||||
#endif /* GRAPHTFT */
|
|
||||||
};
|
|
||||||
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+class cMenuEditIntpItem : public cMenuEditIntItem {
|
|
||||||
+protected:
|
|
||||||
+ virtual void Set(void);
|
|
||||||
+ const char *falseString, *trueString;
|
|
||||||
+ int *value2;
|
|
||||||
+public:
|
|
||||||
+ cMenuEditIntpItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX, int *Value2=0, const char *FalseString = "", const char *TrueSting = NULL);
|
|
||||||
+ virtual eOSState ProcessKey(eKeys Key);
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+class cMenuEditIntdItem : public cMenuEditIntItem {
|
|
||||||
+protected:
|
|
||||||
+ virtual void Set(void);
|
|
||||||
+public:
|
|
||||||
+ cMenuEditIntdItem(const char *Name, int *Value, int Min = 0, int Max = INT_MAX);
|
|
||||||
+ virtual eOSState ProcessKey(eKeys Key);
|
|
||||||
+};
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
+
|
|
||||||
#endif //__MENUITEMS_H
|
|
||||||
diff -ruNp vdr-1.7.7-extensions/vdr.c vdr-1.7.7-ext-gotox/vdr.c
|
|
||||||
--- vdr-1.7.7-extensions/vdr.c 2009-05-04 21:24:29.000000000 +0200
|
|
||||||
+++ vdr-1.7.7-ext-gotox/vdr.c 2009-05-04 21:30:15.000000000 +0200
|
|
||||||
@@ -589,6 +589,10 @@ int main(int argc, char *argv[])
|
|
||||||
printf(" EM84XX\n");
|
|
||||||
#endif /* EM84XX */
|
|
||||||
|
|
||||||
+#ifdef USE_GOTOX
|
|
||||||
+ printf(" GOTOX\n");
|
|
||||||
+#endif /* GOTOX */
|
|
||||||
+
|
|
||||||
#ifdef USE_GRAPHTFT
|
|
||||||
printf(" GRAPHTFT\n");
|
|
||||||
#endif /* GRAPHTFT */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user