frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed pausing replay at the last editing mark

This commit is contained in:
Klaus Schmidinger 2015-02-13 15:17:45 +01:00
parent d99d408fd8
commit 01b1137284
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -3376,6 +3376,8 @@ Clemens Brauers <vdr@admin-cb.de>
Stefan Herdler <herdler@gmx.de> Stefan Herdler <herdler@gmx.de>
for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd() for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
for reporting that pausing replay at the last editing mark actually paused one I-frame
too early
Tobias Faust <tobias.faust@gmx.de> Tobias Faust <tobias.faust@gmx.de>
for the original "jumpingseconds" patch for the original "jumpingseconds" patch

1
HISTORY
View File

@ -8580,3 +8580,4 @@ Video Disk Recorder Revision History
- Updated the Swedish OSD texts (thanks to Magnus Sirwiö). - Updated the Swedish OSD texts (thanks to Magnus Sirwiö).
- Updated the Hungarian OSD texts (thanks to István Füley and Albert Danis). - Updated the Hungarian OSD texts (thanks to István Füley and Albert Danis).
- Modified the German translations of the OSD texts regarding "adaptive skipping". - Modified the German translations of the OSD texts regarding "adaptive skipping".
- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).

6
dvbplayer.c
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: dvbplayer.c 3.5 2015/02/06 15:08:51 kls Exp $ * $Id: dvbplayer.c 3.6 2015/02/13 15:12:57 kls Exp $
*/ */
#include "dvbplayer.h" #include "dvbplayer.h"
@ -460,9 +460,9 @@ void cDvbPlayer::Action(void)
// Read the next frame from the file: // Read the next frame from the file:
if (playMode != pmStill && playMode != pmPause && !AtLastMark) { if (playMode != pmStill && playMode != pmPause) {
if (!readFrame && (replayFile || readIndex >= 0)) { if (!readFrame && (replayFile || readIndex >= 0)) {
if (!nonBlockingFileReader->Reading()) { if (!nonBlockingFileReader->Reading() && !AtLastMark) {
if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) { if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
uint16_t FileNumber; uint16_t FileNumber;
off_t FileOffset; off_t FileOffset;