frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling the "Power" key in case a recording is going on and no plugin is active

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-04-29 09:24:07 +02:00
parent 70297ef174
commit 42ce340670
4 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTORS
View File

@ -1420,6 +1420,8 @@ Udo Richter <udo_richter@gmx.de>
for suggesting to add a warning about plugins that don't honor APIVERSION in their for suggesting to add a warning about plugins that don't honor APIVERSION in their
Makefile Makefile
for providing a shorter version of the 'sed' expression for extracting APIVERSION for providing a shorter version of the 'sed' expression for extracting APIVERSION
for fixing a bug in handling the "Power" key in case a recording is going on and
no plugin is active
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date
@ -1886,3 +1888,7 @@ Markus Ehrnsperger <markus.ehrnsperger@googlemail.com>
Werner Färber <w.faerber@gmx.de> Werner Färber <w.faerber@gmx.de>
for reporting a bug in handling the cPluginManager::Active() result when pressing for reporting a bug in handling the cPluginManager::Active() result when pressing
the "Power" key the "Power" key
Dominique Simon <d.simon@gmx.net>
for reporting a bug in handling the "Power" key in case a recording is going on and
no plugin is active

5
HISTORY
View File

@ -4677,3 +4677,8 @@ Video Disk Recorder Revision History
- Removed the obsolete "'1' for encrypted radio channels" part from the description - Removed the obsolete "'1' for encrypted radio channels" part from the description
of the VPID in vdr.5 (reported by Alexander Hans). of the VPID in vdr.5 (reported by Alexander Hans).
- Fixed tuning to the channel of a VPS timer if the device is the actual device. - Fixed tuning to the channel of a VPS timer if the device is the actual device.
2006-04-29: Version 1.4.0
- Fixed handling the "Power" key in case a recording is going on and no plugin
is active (thanks to Udo Richter; bug reported by Dominique Simon).

10
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: config.h 1.254 2006/04/28 12:33:13 kls Exp $ * $Id: config.h 1.255 2006/04/29 09:24:07 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,13 +21,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.3.49" #define VDRVERSION "1.4.0"
#define VDRVERSNUM 10349 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "1.3.47" #define APIVERSION "1.4.0"
#define APIVERSNUM 10347 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10400 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to

34
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * The project's page is at http://www.cadsoft.de/vdr
* *
* $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $ * $Id: vdr.c 1.267 2006/04/29 09:14:06 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -970,21 +970,23 @@ int main(int argc, char *argv[])
} }
break; break;
// Power off: // Power off:
case kPower: isyslog("Power button pressed"); case kPower:
DELETE_MENU; isyslog("Power button pressed");
if (!Shutdown) { DELETE_MENU;
Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!")); if (!Shutdown) {
break; Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
} break;
if (cRecordControls::Active()) { }
if (Interface->Confirm(tr("Recording - shut down anyway?"))) LastActivity = 1; // not 0, see below!
ForceShutdown = true; UserShutdown = true;
} if (cRecordControls::Active()) {
if (!cPluginManager::Active(tr("shut down anyway?"))) if (!Interface->Confirm(tr("Recording - shut down anyway?")))
ForceShutdown = true; break;
LastActivity = 1; // not 0, see below! }
UserShutdown = true; if (cPluginManager::Active(tr("shut down anyway?")))
break; break;
ForceShutdown = true;
break;
default: break; default: break;
} }
Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time