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

The setup option "DVB/Video display format" is now only available if "Video format" is set to "4:3"

This commit is contained in:
Klaus Schmidinger 2005-03-05 15:48:26 +01:00
parent e3be67dbaa
commit 379d4b7d63
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -1292,3 +1292,7 @@ Chris Warren <dvb@ixalon.net>
Luca Olivetti <luca@ventoso.org> Luca Olivetti <luca@ventoso.org>
for making cDevice::AttachPlayer() keep the track language codes and descriptions for making cDevice::AttachPlayer() keep the track language codes and descriptions
in Transfer Mode in Transfer Mode
Mikko Salo <mikko.salo@ppe.inet.fi>
for suggesting to make the setup option "DVB/Video display format" available only
if "Video format" is set to "4:3"

5
HISTORY
View File

@ -3443,3 +3443,8 @@ Video Disk Recorder Revision History
Luca Olivetti). Luca Olivetti).
- Fixed handling repeated kAudio keys. - Fixed handling repeated kAudio keys.
- Improved displaying the the current audio track in the ST:TNG channel display. - Improved displaying the the current audio track in the ST:TNG channel display.
2005-03-05: Version 1.3.23
- The setup option "DVB/Video display format" is now only available if "Video format"
is set to "4:3" (suggested by Mikko Salo).

8
MANUAL
View File

@ -588,12 +588,14 @@ Version 1.2
from the primary DVB interface, so that the viewer will from the primary DVB interface, so that the viewer will
be disturbed as little as possible. be disturbed as little as possible.
Video format = 4:3 The video format (or aspect ratio) of the tv set in use
(4:3 or 16:9).
Video display format = letterbox Video display format = letterbox
The display format to use for playing wide screen video on The display format to use for playing wide screen video on
a 4:3 tv set ("pan & scan", "letterbox" or "center cut out"). a 4:3 tv set ("pan & scan", "letterbox" or "center cut out").
This option is only available if "Video format" is set to
Video format = 4:3 The video format (or aspect ratio) of the tv set in use 4:3.
(4:3 or 16:9).
Use Dolby Digital = yes Use Dolby Digital = yes
Turns recording of the Dolby Digital audio channels on Turns recording of the Dolby Digital audio channels on

6
config.h
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: config.h 1.215 2005/02/20 12:50:37 kls Exp $ * $Id: config.h 1.216 2005/03/05 15:44:35 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.22" #define VDRVERSION "1.3.23"
#define VDRVERSNUM 10322 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10323 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

11
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 1.342 2005/02/27 14:09:00 kls Exp $ * $Id: menu.c 1.343 2005/03/05 15:43:10 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1947,8 +1947,9 @@ void cMenuSetupDVB::Setup(void)
Clear(); Clear();
Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices())); Add(new cMenuEditIntItem( tr("Setup.DVB$Primary DVB interface"), &data.PrimaryDVB, 1, cDevice::NumDevices()));
Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9")); Add(new cMenuEditBoolItem(tr("Setup.DVB$Video format"), &data.VideoFormat, "4:3", "16:9"));
if (data.VideoFormat == 0)
Add(new cMenuEditStraItem(tr("Setup.DVB$Video display format"), &data.VideoDisplayFormat, 3, videoDisplayFormatTexts));
Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"), &data.UseDolbyDigital)); Add(new cMenuEditBoolItem(tr("Setup.DVB$Use Dolby Digital"), &data.UseDolbyDigital));
Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 5, updateChannelsTexts)); Add(new cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 5, updateChannelsTexts));
Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nNumLanguages)); Add(new cMenuEditIntItem( tr("Setup.DVB$Audio languages"), &numAudioLanguages, 0, I18nNumLanguages));
@ -1964,10 +1965,12 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
int oldPrimaryDVB = ::Setup.PrimaryDVB; int oldPrimaryDVB = ::Setup.PrimaryDVB;
int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat; int oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
bool oldVideoFormat = ::Setup.VideoFormat; bool oldVideoFormat = ::Setup.VideoFormat;
bool newVideoFormat = data.VideoFormat;
int oldnumAudioLanguages = numAudioLanguages; int oldnumAudioLanguages = numAudioLanguages;
eOSState state = cMenuSetupBase::ProcessKey(Key); eOSState state = cMenuSetupBase::ProcessKey(Key);
if (Key != kNone) { if (Key != kNone) {
bool DoSetup = data.VideoFormat != newVideoFormat;
if (numAudioLanguages != oldnumAudioLanguages) { if (numAudioLanguages != oldnumAudioLanguages) {
for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) { for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
data.AudioLanguages[i] = 0; data.AudioLanguages[i] = 0;
@ -1984,8 +1987,10 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
} }
} }
data.AudioLanguages[numAudioLanguages] = -1; data.AudioLanguages[numAudioLanguages] = -1;
Setup(); DoSetup = true;
} }
if (DoSetup)
Setup();
} }
if (state == osBack && Key == kOk) { if (state == osBack && Key == kOk) {
if (::Setup.PrimaryDVB != oldPrimaryDVB) if (::Setup.PrimaryDVB != oldPrimaryDVB)