From 1b7a32472ec398f81be6e32648338b3f7e4268fa Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 3 Oct 2012 10:11:15 +0200 Subject: [PATCH] Pressing the Play key during normal live viewing mode now opens the Recordings menu if there is no "last viewed" recording --- CONTRIBUTORS | 2 ++ HISTORY | 5 +++++ config.h | 10 +++++----- vdr.c | 4 +++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a275edbb..42824d73 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2314,6 +2314,8 @@ Alexander Wenzel for fixing the shutdown timeout for making the script given to VDR with the '-r' option be also called whenever a recording is deleted + for making pressing the Play key during normal live viewing mode open the Recordings + menu if there is no "last viewed" recording Jan Lenz for reporting a bug in deleting recordings that have been removed externally when diff --git a/HISTORY b/HISTORY index a1cb40c6..3544f1a8 100644 --- a/HISTORY +++ b/HISTORY @@ -7271,3 +7271,8 @@ Video Disk Recorder Revision History whether a directory is empty. This allows users to continue to use files such as ".keep" to prevent a directory from being deleted when it is empty. Currently the only file name that is ignored is ".sort". + +2012-10-03: Version 1.7.32 + +- Pressing the Play key during normal live viewing mode now opens the Recordings menu + if there is no "last viewed" recording (thanks to Alexander Wenzel). diff --git a/config.h b/config.h index a07310ee..03b6cf0d 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.53 2012/09/15 11:51:54 kls Exp $ + * $Id: config.h 2.54 2012/10/03 09:59:34 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.31" -#define VDRVERSNUM 10731 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.32" +#define VDRVERSNUM 10732 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.31" -#define APIVERSNUM 10731 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.32" +#define APIVERSNUM 10732 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/vdr.c b/vdr.c index 2e097bae..4ce7b269 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.tvdr.de * - * $Id: vdr.c 2.40 2012/09/24 12:43:04 kls Exp $ + * $Id: vdr.c 2.41 2012/10/03 09:58:46 kls Exp $ */ #include @@ -1238,6 +1238,8 @@ int main(int argc, char *argv[]) cControl::Shutdown(); cControl::Launch(new cReplayControl); } + else + DirectMainFunction(osRecordings); // no last viewed recording, so enter the Recordings menu break; default: break; }