Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu in case there is only one audio track

This commit is contained in:
Klaus Schmidinger 2005-01-23 19:27:43 +01:00
parent 039cdaecb5
commit c7211d13be
4 changed files with 14 additions and 8 deletions

View File

@ -747,6 +747,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
for reporting a bug in cChannel::SetName() in case only the ShortName or Provider
has changed
for fixing a possible recursion in cControl::Shutdown()
for reporting that the "Audio" menu is not displayed with the "Green" button from
the "Main" menu in case there is only one audio track
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception

View File

@ -3332,3 +3332,9 @@ Video Disk Recorder Revision History
cDolbyRepacker).
- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
to avoid overflows (thanks to Marco Schlüßler for pointing this out).
2005-01-23: Version 1.3.20
- Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu
in case there is only one audio track (thanks to Sascha Volkenandt for reporting
this one).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 1.210 2005/01/09 16:50:11 kls Exp $
* $Id: config.h 1.211 2005/01/23 19:24:20 kls Exp $
*/
#ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h"
#include "tools.h"
#define VDRVERSION "1.3.19"
#define VDRVERSNUM 10319 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.3.20"
#define VDRVERSNUM 10320 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
#define MAXLIFETIME 99

8
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.337 2005/01/16 12:05:13 kls Exp $
* $Id: menu.c 1.338 2005/01/23 19:24:04 kls Exp $
*/
#include "menu.h"
@ -2513,10 +2513,8 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
state = replaying ? osContinue : osRecord;
break;
case kGreen: if (!HadSubMenu) {
if (cDevice::PrimaryDevice()->NumAudioTracks() > 1) {
cRemote::Put(kAudio, true);
state = osEnd;
}
cRemote::Put(kAudio, true);
state = osEnd;
}
break;
case kYellow: if (!HadSubMenu)