mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
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
This commit is contained in:
parent
551b46cab1
commit
cfd9206195
@ -2231,6 +2231,8 @@ Andr
|
|||||||
for his support in using convert/ffmpeg in the pic2mpg script of the 'pictures' plugin
|
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
|
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
|
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>
|
Jürgen Schilling <juergen_schilling@web.de>
|
||||||
for reporting that color buttons were displayed in the recording info menu if it
|
for reporting that color buttons were displayed in the recording info menu if it
|
||||||
|
5
HISTORY
5
HISTORY
@ -7339,7 +7339,7 @@ Video Disk Recorder Revision History
|
|||||||
- Modified editing marks are now written to disk whenever the replay progress display
|
- Modified editing marks are now written to disk whenever the replay progress display
|
||||||
gets hidden (thanks to Christoph Haubrich).
|
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
|
- 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
|
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
|
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
|
functions (thanks to Stefan Hofmann for suggesting to implement support for such
|
||||||
remote controls).
|
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).
|
||||||
|
4
MANUAL
4
MANUAL
@ -882,6 +882,10 @@ Version 1.6
|
|||||||
Defines whether the replay progress display shows the
|
Defines whether the replay progress display shows the
|
||||||
remaining time or the total length of the recording.
|
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
|
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
|
environment, so that every user has his/her own resume
|
||||||
files for each recording. The valid range is 0...99, with
|
files for each recording. The valid range is 0...99, with
|
||||||
|
5
config.c
5
config.c
@ -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.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"
|
#include "config.h"
|
||||||
@ -458,6 +458,7 @@ cSetup::cSetup(void)
|
|||||||
MultiSpeedMode = 0;
|
MultiSpeedMode = 0;
|
||||||
ShowReplayMode = 0;
|
ShowReplayMode = 0;
|
||||||
ShowRemainingTime = 0;
|
ShowRemainingTime = 0;
|
||||||
|
PauseOnMarkSet = 0;
|
||||||
ResumeID = 0;
|
ResumeID = 0;
|
||||||
CurrentChannel = -1;
|
CurrentChannel = -1;
|
||||||
CurrentVolume = MAXVOLUME;
|
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, "MultiSpeedMode")) MultiSpeedMode = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
|
else if (!strcasecmp(Name, "ShowReplayMode")) ShowReplayMode = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "ShowRemainingTime")) ShowRemainingTime = 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, "ResumeID")) ResumeID = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
|
else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
|
||||||
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
|
else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
|
||||||
@ -761,6 +763,7 @@ bool cSetup::Save(void)
|
|||||||
Store("MultiSpeedMode", MultiSpeedMode);
|
Store("MultiSpeedMode", MultiSpeedMode);
|
||||||
Store("ShowReplayMode", ShowReplayMode);
|
Store("ShowReplayMode", ShowReplayMode);
|
||||||
Store("ShowRemainingTime", ShowRemainingTime);
|
Store("ShowRemainingTime", ShowRemainingTime);
|
||||||
|
Store("PauseOnMarkSet", PauseOnMarkSet);
|
||||||
Store("ResumeID", ResumeID);
|
Store("ResumeID", ResumeID);
|
||||||
Store("CurrentChannel", CurrentChannel);
|
Store("CurrentChannel", CurrentChannel);
|
||||||
Store("CurrentVolume", CurrentVolume);
|
Store("CurrentVolume", CurrentVolume);
|
||||||
|
3
config.h
3
config.h
@ -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 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
|
#ifndef __CONFIG_H
|
||||||
@ -319,6 +319,7 @@ public:
|
|||||||
int MultiSpeedMode;
|
int MultiSpeedMode;
|
||||||
int ShowReplayMode;
|
int ShowReplayMode;
|
||||||
int ShowRemainingTime;
|
int ShowRemainingTime;
|
||||||
|
int PauseOnMarkSet;
|
||||||
int ResumeID;
|
int ResumeID;
|
||||||
int CurrentChannel;
|
int CurrentChannel;
|
||||||
int CurrentVolume;
|
int CurrentVolume;
|
||||||
|
5
menu.c
5
menu.c
@ -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.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"
|
#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$Multi speed mode"), &data.MultiSpeedMode));
|
||||||
Add(new cMenuEditBoolItem(tr("Setup.Replay$Show replay mode"), &data.ShowReplayMode));
|
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$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));
|
Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4741,7 +4742,7 @@ void cReplayControl::MarkToggle(void)
|
|||||||
marks.Add(Current);
|
marks.Add(Current);
|
||||||
bool Play, Forward;
|
bool Play, Forward;
|
||||||
int Speed;
|
int Speed;
|
||||||
if (GetReplayMode(Play, Forward, Speed) && !Play)
|
if (Setup.PauseOnMarkSet || GetReplayMode(Play, Forward, Speed) && !Play)
|
||||||
Goto(Current, true);
|
Goto(Current, true);
|
||||||
}
|
}
|
||||||
ShowTimed(2);
|
ShowTimed(2);
|
||||||
|
Loading…
Reference in New Issue
Block a user