frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-12-26 23:06:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enabled manually turning subtitles on/off in 'after rewind' mode

Browse Source
This commit is contained in:
Klaus Schmidinger
2025-04-18 09:48:11 +02:00
parent 67417d23c1
commit b8ccac2815
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -10119,7 +10119,7 @@ Video Disk Recorder Revision History
- Now deleting old recording info before reading modified info file (suggested by - Now deleting old recording info before reading modified info file (suggested by
Stefan Hofmann). Stefan Hofmann).
2025-04-16: 2025-04-18:
- Fixed some misplaced 'override' keywords in the 'hello' and 'skincurses' plugins. - Fixed some misplaced 'override' keywords in the 'hello' and 'skincurses' plugins.
- cRecording now fetches priority, lifetime and framesPerSecond from cRecordingInfo. - cRecording now fetches priority, lifetime and framesPerSecond from cRecordingInfo.
@@ -10127,3 +10127,4 @@ Video Disk Recorder Revision History
- Now forcing re-reading the info file of an ongoing recording (reported by Christoph - Now forcing re-reading the info file of an ongoing recording (reported by Christoph
Haubrich). Haubrich).
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Enabled manually turning subtitles on/off in 'after rewind' mode.

5
MANUAL
View File

@@ -954,7 +954,10 @@ VDR version 2.6.6 added '/' to this list.
switching to a channel or playing a recording that provides switching to a channel or playing a recording that provides
subtitles. 'after rewind' turns on subtitles after a fast subtitles. 'after rewind' turns on subtitles after a fast
rewind during replay, and off again when the point where the rewind during replay, and off again when the point where the
rewind was started is reached. rewind was started is reached. In 'after rewind' mode you
can manually turn on subtitles by opening the Subtitles menu
and pressing Ok. If you later switch back to "No subtitles"
VDR will automatically go into 'after rewind' mode again.
Subtitle languages = 0 Some tv stations broadcast various subtitle tracks in different Subtitle languages = 0 Some tv stations broadcast various subtitle tracks in different
languages. This option allows you to define which language(s) languages. This option allows you to define which language(s)

7
device.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: device.c 5.16 2025/03/28 22:49:17 kls Exp $ * $Id: device.c 5.17 2025/04/18 09:48:11 kls Exp $
*/ */
#include "device.h" #include "device.h"
@@ -1188,9 +1188,8 @@ bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual)
if (Type == ttNone || IS_SUBTITLE_TRACK(Type)) { if (Type == ttNone || IS_SUBTITLE_TRACK(Type)) {
currentSubtitleTrack = Type; currentSubtitleTrack = Type;
autoSelectPreferredSubtitleLanguage = !Manual; autoSelectPreferredSubtitleLanguage = !Manual;
if (dvbSubtitleConverter)
dvbSubtitleConverter->Reset();
if (dvbSubtitleConverter) { if (dvbSubtitleConverter) {
dvbSubtitleConverter->Reset();
if (Type == ttNone) { if (Type == ttNone) {
if (Replaying() && !Transferring() && Setup.DisplaySubtitles == SUBTITLES_REWIND) if (Replaying() && !Transferring() && Setup.DisplaySubtitles == SUBTITLES_REWIND)
dvbSubtitleConverter->SetVisible(false); dvbSubtitleConverter->SetVisible(false);
@@ -1199,7 +1198,7 @@ bool cDevice::SetCurrentSubtitleTrack(eTrackType Type, bool Manual)
DELETENULL(dvbSubtitleConverter); DELETENULL(dvbSubtitleConverter);
} }
} }
else if (Replaying() && !Transferring() && Setup.DisplaySubtitles == SUBTITLES_REWIND) else if (Replaying() && !Transferring() && Setup.DisplaySubtitles == SUBTITLES_REWIND && Manual)
dvbSubtitleConverter->SetVisible(true); dvbSubtitleConverter->SetVisible(true);
} }
DELETENULL(liveSubtitle); DELETENULL(liveSubtitle);

9
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 5.26 2025/03/28 22:49:17 kls Exp $ * $Id: menu.c 5.27 2025/04/18 09:48:11 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@@ -5305,8 +5305,7 @@ eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
timeout.Set(TRACKTIMEOUT); timeout.Set(TRACKTIMEOUT);
break; break;
case kOk: case kOk:
if (types[track] != cDevice::PrimaryDevice()->GetCurrentSubtitleTrack()) oldTrack = -1; // make sure we explicitly switch to that track
oldTrack = -1; // make sure we explicitly switch to that track
timeout.Set(); timeout.Set();
break; break;
case kNone: break; case kNone: break;
@@ -5316,6 +5315,10 @@ eOSState cDisplaySubtitleTracks::ProcessKey(eKeys Key)
if (track != oldTrack) { if (track != oldTrack) {
Show(); Show();
cDevice::PrimaryDevice()->SetCurrentSubtitleTrack(types[track], true); cDevice::PrimaryDevice()->SetCurrentSubtitleTrack(types[track], true);
if (track == ttNone && Setup.DisplaySubtitles == SUBTITLES_REWIND) {
cDevice::PrimaryDevice()->SetCurrentSubtitleTrack(types[track], false);
cDevice::PrimaryDevice()->EnsureSubtitleTrack();
}
} }
return timeout.TimedOut() ? osEnd : osContinue; return timeout.TimedOut() ? osEnd : osContinue;
} }