diff options
| -rw-r--r-- | CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | MANUAL | 4 | ||||
| -rw-r--r-- | config.c | 5 | ||||
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | menu.c | 5 |
6 files changed, 19 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 34b9232e..608ea5f1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2231,6 +2231,8 @@ André Weidemann <Andre.Weidemann@web.de> for his support in using convert/ffmpeg in the pic2mpg script of the 'pictures' plugin for requesting a way of getting to the very end of an edited recording, since version 1.7.32 no longer generates a mark at that point + for suggesting to automatically go into Pause mode if an editing mark is set during + replay Jürgen Schilling <juergen_schilling@web.de> for reporting that color buttons were displayed in the recording info menu if it @@ -7339,7 +7339,7 @@ Video Disk Recorder Revision History - Modified editing marks are now written to disk whenever the replay progress display gets hidden (thanks to Christoph Haubrich). -2012-12-04: Version 1.7.33 +2012-12-05: Version 1.7.33 - In order to be able to play TS recordings from other sources, in which there is more than one PMT PID in the PAT, 'int cPatPmtParser::PatPmt(void)' has been changed @@ -7384,3 +7384,6 @@ Video Disk Recorder Revision History have separate keys for "Play" and "Pause", but rather have a single key for both functions (thanks to Stefan Hofmann for suggesting to implement support for such remote controls). +- The new option "Setup/Replay/Pause on mark set" can be used to activate automatically + going into Pause mode if an editing mark is set during replay (suggested by Andre + Weidemann). @@ -882,6 +882,10 @@ Version 1.6 Defines whether the replay progress display shows the remaining time or the total length of the recording. + Pause replay when setting mark = no + Defines whether the player automatically goes into Pause + mode when setting an editing mark. + Resume ID = 0 Defines an additional ID that can be used in a multi user environment, so that every user has his/her own resume files for each recording. The valid range is 0...99, with @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.c 2.28 2012/09/15 11:52:03 kls Exp $ + * $Id: config.c 2.29 2012/12/05 09:56:02 kls Exp $ */ #include "config.h" @@ -458,6 +458,7 @@ cSetup::cSetup(void) MultiSpeedMode = 0; ShowReplayMode = 0; ShowRemainingTime = 0; + PauseOnMarkSet = 0; ResumeID = 0; CurrentChannel = -1; CurrentVolume = MAXVOLUME; @@ -658,6 +659,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "MultiSpeedMode")) MultiSpeedMode = atoi(Value); else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value); else if (!strcasecmp(Name, "ShowRemainingTime")) ShowRemainingTime = atoi(Value); + else if (!strcasecmp(Name, "PauseOnMarkSet")) PauseOnMarkSet = atoi(Value); else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value); else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value); else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value); @@ -761,6 +763,7 @@ bool cSetup::Save(void) Store("MultiSpeedMode", MultiSpeedMode); Store("ShowReplayMode", ShowReplayMode); Store("ShowRemainingTime", ShowRemainingTime); + Store("PauseOnMarkSet", PauseOnMarkSet); Store("ResumeID", ResumeID); Store("CurrentChannel", CurrentChannel); Store("CurrentVolume", CurrentVolume); @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.55 2012/11/19 10:24:24 kls Exp $ + * $Id: config.h 2.56 2012/12/05 09:54:48 kls Exp $ */ #ifndef __CONFIG_H @@ -319,6 +319,7 @@ public: int MultiSpeedMode; int ShowReplayMode; int ShowRemainingTime; + int PauseOnMarkSet; int ResumeID; int CurrentChannel; int CurrentVolume; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 2.67 2012/12/04 13:17:49 kls Exp $ + * $Id: menu.c 2.68 2012/12/05 09:57:20 kls Exp $ */ #include "menu.h" @@ -3140,6 +3140,7 @@ cMenuSetupReplay::cMenuSetupReplay(void) Add(new cMenuEditBoolItem(tr("Setup.Replay$Multi speed mode"), &data.MultiSpeedMode)); Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode)); Add(new cMenuEditBoolItem(tr("Setup.Replay$Show remaining time"), &data.ShowRemainingTime)); + Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay when setting mark"), &data.PauseOnMarkSet)); Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99)); } @@ -4741,7 +4742,7 @@ void cReplayControl::MarkToggle(void) marks.Add(Current); bool Play, Forward; int Speed; - if (GetReplayMode(Play, Forward, Speed) && !Play) + if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play) Goto(Current, true); } ShowTimed(2); |