From e3e40a14f30941586536426231a824519cade6ac Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Thu, 26 May 2005 10:20:31 +0200
Subject: Pressing the "Play" key in live viewing mode now resumes a previous
 replay session

---
 CONTRIBUTORS |  1 +
 HISTORY      |  2 ++
 vdr.c        | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2880c8e5..d9ffd84b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -408,6 +408,7 @@ Mirko D
  change in Daylight Saving Time
  for suggesting to avoid the external 'find' command to scan the video directory
  for reporting a problem with inconsistent channel and timer lists
+ for making the "Play" key in live viewing mode resume a previous replay session
 
 Michael Rakowski <mrak@gmx.de>
  for translating OSD texts to the Polish language
diff --git a/HISTORY b/HISTORY
index 1a6347b4..c4c98ad6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3555,3 +3555,5 @@ Video Disk Recorder Revision History
   is waiting (thanks to Marco Schlüßler).
 - The SVDRP command DELR no longer deletes recordings that are currently being
   written to by a timer (thanks to Sascha Volkenandt for pointing out this one).
+- Pressing the "Play" key in live viewing mode now resumes a previous replay
+  session (thanks to Mirko Dölle).
diff --git a/vdr.c b/vdr.c
index fe4c2ca2..fcf21532 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.204 2005/05/22 11:20:22 kls Exp $
+ * $Id: vdr.c 1.205 2005/05/26 10:04:58 kls Exp $
  */
 
 #include <getopt.h>
@@ -846,6 +846,14 @@ int main(int argc, char *argv[])
                   break;
              // Viewing Control:
              case kOk:   LastChannel = -1; break; // forces channel display
+             // Instant resume of the last viewed recording:
+             case kPlay:
+                  if (cReplayControl::LastReplayed()) {
+                     cControl::Shutdown();
+                     Temp = NULL;
+                     cControl::Launch(new cReplayControl);
+                     }
+                  break;
              // Key macros:
              case kRed:
              case kGreen:
-- 
cgit v1.2.3