summaryrefslogtreecommitdiff
path: root/tvguideosd.c
diff options
context:
space:
mode:
Diffstat (limited to 'tvguideosd.c')
-rw-r--r--tvguideosd.c34
1 files changed, 16 insertions, 18 deletions
diff --git a/tvguideosd.c b/tvguideosd.c
index fc64eae..041e831 100644
--- a/tvguideosd.c
+++ b/tvguideosd.c
@@ -410,9 +410,7 @@ void cTvGuideOsd::timeBack() {
}
void cTvGuideOsd::ScrollBack() {
- bool tooFarInPast = timeManager->DelStep(config.stepMinutes);
- if (tooFarInPast)
- return;
+ timeManager->DelStep(config.stepMinutes);
if (config.useHWAccel) {
drawGridsTimeJump();
timeLine->drawDateViewer();
@@ -640,24 +638,20 @@ void cTvGuideOsd::processNumKey(int numKey) {
void cTvGuideOsd::TimeJump(int mode) {
switch (mode) {
case 1: {
- bool tooFarInPast = timeManager->DelStep(config.bigStepHours*60);
- if (tooFarInPast)
- return;
- }
+ timeManager->DelStep(config.bigStepHours * 60);
+ }
break;
case 3: {
- timeManager->AddStep(config.bigStepHours*60);
- }
+ timeManager->AddStep(config.bigStepHours * 60);
+ }
break;
case 4: {
- bool tooFarInPast = timeManager->DelStep(config.hugeStepHours*60);
- if (tooFarInPast)
- return;
- }
+ timeManager->DelStep(config.hugeStepHours * 60);
+ }
break;
case 6: {
- timeManager->AddStep(config.hugeStepHours*60);
- }
+ timeManager->AddStep(config.hugeStepHours * 60);
+ }
break;
case 7: {
cTimeManager primeChecker;
@@ -666,13 +660,13 @@ void cTvGuideOsd::TimeJump(int mode) {
if (primeChecker.tooFarInPast(prevPrime))
return;
timeManager->SetTime(prevPrime);
- }
+ }
break;
case 9: {
cTimeManager primeChecker;
time_t nextPrime = primeChecker.getNextPrimetime(timeManager->GetStart());
timeManager->SetTime(nextPrime);
- }
+ }
break;
default:
return;
@@ -783,8 +777,12 @@ eOSState cTvGuideOsd::ProcessKey(eKeys Key) {
case kYellow: processKeyYellow(); break;
case kBlue: state = processKeyBlue(&alreadyUnlocked); break;
case kOk: state = processKeyOk(&alreadyUnlocked); break;
- case kBack: state=osEnd; break;
+ case kBack: state = osEnd; break;
case k0 ... k9: processNumKey(Key - k0); break;
+ case kFastRew: TimeJump(1); break; // Doesnt work, if used from timeshiftmode
+ case kFastFwd: TimeJump(3); break;
+ case kPrev: TimeJump(4); break;
+ case kNext: TimeJump(6); break;
case kNone: if (channelJumper) CheckTimeout(); break;
default: break;
}