diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | config.h | 10 | ||||
| -rw-r--r-- | dvbplayer.c | 4 |
3 files changed, 13 insertions, 6 deletions
@@ -6888,3 +6888,8 @@ Video Disk Recorder Revision History - Fixed a possible deadlock in time shift mode. - Fixed switching into time shift mode when pausing live video (thanks to Reinhard Nissl for helping to debug this one). + +2012-02-19: Version 1.7.25 + +- The fps value for channels where it differs from the default is now set correctly + when pausing live video. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.40 2012/01/16 09:50:03 kls Exp $ + * $Id: config.h 2.41 2012/02/19 14:33:23 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.24" -#define VDRVERSNUM 10724 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.25" +#define VDRVERSNUM 10725 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.24" -#define APIVERSNUM 10724 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.25" +#define APIVERSNUM 10725 // 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/dvbplayer.c b/dvbplayer.c index b0adac40..2abc186c 100644 --- a/dvbplayer.c +++ b/dvbplayer.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbplayer.c 2.23 2012/02/19 10:48:02 kls Exp $ + * $Id: dvbplayer.c 2.24 2012/02/19 14:31:22 kls Exp $ */ #include "dvbplayer.h" @@ -291,6 +291,8 @@ cDvbPlayer::cDvbPlayer(const char *FileName, bool PauseLive) delete index; index = NULL; } + else if (PauseLive) + framesPerSecond = cRecording(FileName).FramesPerSecond(); // the fps rate might have changed from the default } cDvbPlayer::~cDvbPlayer() |