summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY5
-rw-r--r--MANUAL8
-rw-r--r--config.h6
-rw-r--r--menu.c11
5 files changed, 25 insertions, 9 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 52d52244..daf5d7f9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1292,3 +1292,7 @@ Chris Warren <dvb@ixalon.net>
Luca Olivetti <luca@ventoso.org>
for making cDevice::AttachPlayer() keep the track language codes and descriptions
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"
diff --git a/HISTORY b/HISTORY
index 62c9af3d..814e1f03 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3443,3 +3443,8 @@ Video Disk Recorder Revision History
Luca Olivetti).
- Fixed handling repeated kAudio keys.
- 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).
diff --git a/MANUAL b/MANUAL
index e95b94fa..a8d3a57b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -588,12 +588,14 @@ Version 1.2
from the primary DVB interface, so that the viewer will
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
The display format to use for playing wide screen video on
a 4:3 tv set ("pan & scan", "letterbox" or "center cut out").
-
- Video format = 4:3 The video format (or aspect ratio) of the tv set in use
- (4:3 or 16:9).
+ This option is only available if "Video format" is set to
+ 4:3.
Use Dolby Digital = yes
Turns recording of the Dolby Digital audio channels on
diff --git a/config.h b/config.h
index a94f9066..833022ea 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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
@@ -20,8 +20,8 @@
#include "i18n.h"
#include "tools.h"
-#define VDRVERSION "1.3.22"
-#define VDRVERSNUM 10322 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.3.23"
+#define VDRVERSNUM 10323 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
#define MAXLIFETIME 99
diff --git a/menu.c b/menu.c
index e3168633..a6bac7d8 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -1947,8 +1947,9 @@ void cMenuSetupDVB::Setup(void)
Clear();
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"));
+ 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 cMenuEditStraItem(tr("Setup.DVB$Update channels"), &data.UpdateChannels, 5, updateChannelsTexts));
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 oldVideoDisplayFormat = ::Setup.VideoDisplayFormat;
bool oldVideoFormat = ::Setup.VideoFormat;
+ bool newVideoFormat = data.VideoFormat;
int oldnumAudioLanguages = numAudioLanguages;
eOSState state = cMenuSetupBase::ProcessKey(Key);
if (Key != kNone) {
+ bool DoSetup = data.VideoFormat != newVideoFormat;
if (numAudioLanguages != oldnumAudioLanguages) {
for (int i = oldnumAudioLanguages; i < numAudioLanguages; i++) {
data.AudioLanguages[i] = 0;
@@ -1984,8 +1987,10 @@ eOSState cMenuSetupDVB::ProcessKey(eKeys Key)
}
}
data.AudioLanguages[numAudioLanguages] = -1;
- Setup();
+ DoSetup = true;
}
+ if (DoSetup)
+ Setup();
}
if (state == osBack && Key == kOk) {
if (::Setup.PrimaryDVB != oldPrimaryDVB)