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

Modified editing marks are now written to disk whenever the replay progress display gets hidden

This commit is contained in:
Klaus Schmidinger 2012-11-18 13:12:31 +01:00
parent 3c65130e38
commit d46a31d417
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -2308,6 +2308,8 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full
minutes minutes
for suggesting to check for NULL in cOsd::AddPixmap() for suggesting to check for NULL in cOsd::AddPixmap()
for making modified editing marks be written to disk whenever the replay progress
display gets hidden
Pekka Mauno <pekka.mauno@iki.fi> Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present for fixing cSchedule::GetFollowingEvent() in case there is currently no present

2
HISTORY
View File

@ -7336,3 +7336,5 @@ Video Disk Recorder Revision History
of each other, the '4' key moves the first one of them to the left, while the '6' of each other, the '4' key moves the first one of them to the left, while the '6'
key moves the last one of them to the right. The '7' and '9' key handle multiple key moves the last one of them to the right. The '7' and '9' key handle multiple
marks at the same place as if it were one single mark. marks at the same place as if it were one single mark.
- Modified editing marks are now written to disk whenever the replay progress display
gets hidden (thanks to Christoph Haubrich).

14
menu.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: menu.c 2.64 2012/11/18 13:00:33 kls Exp $ * $Id: menu.c 2.65 2012/11/18 13:07:53 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -4482,10 +4482,6 @@ cReplayControl::~cReplayControl()
Hide(); Hide();
cStatus::MsgReplaying(this, NULL, fileName, false); cStatus::MsgReplaying(this, NULL, fileName, false);
Stop(); Stop();
if (marksModified) {
marks.Save();
marksModified = false;
}
if (currentReplayControl == this) if (currentReplayControl == this)
currentReplayControl = NULL; currentReplayControl = NULL;
} }
@ -4573,6 +4569,10 @@ void cReplayControl::Hide(void)
timeSearchActive = false; timeSearchActive = false;
timeoutShow = 0; timeoutShow = 0;
} }
if (marksModified) {
marks.Save();
marksModified = false;
}
} }
void cReplayControl::ShowMode(void) void cReplayControl::ShowMode(void)
@ -4789,10 +4789,6 @@ void cReplayControl::EditCut(void)
{ {
if (*fileName) { if (*fileName) {
Hide(); Hide();
if (marksModified) {
marks.Save();
marksModified = false;
}
if (!cCutter::Active()) { if (!cCutter::Active()) {
if (!marks.Count()) if (!marks.Count())
Skins.Message(mtError, tr("No editing marks defined!")); Skins.Message(mtError, tr("No editing marks defined!"));