frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed handling the channelID in cMenuEditChanItem

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-08-12 13:21:42 +02:00
parent 2c2ed53adf
commit b863d9a702
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1701,6 +1701,7 @@ Udo Richter <udo_richter@gmx.de>
for a patch to "Made updating the editing marks during replay react faster in case for a patch to "Made updating the editing marks during replay react faster in case
the marks file has just been written" the marks file has just been written"
for suggesting a fix for a bug in handling DiSEqC codes for suggesting a fix for a bug in handling DiSEqC codes
for fixing handling the channelID in cMenuEditChanItem
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

3
HISTORY
View File

@ -6650,7 +6650,7 @@ Video Disk Recorder Revision History
- Added support for "content identifier descriptor" and "default authority descriptor" - Added support for "content identifier descriptor" and "default authority descriptor"
to 'libsi' (thanks to Dave Pickles). to 'libsi' (thanks to Dave Pickles).
2011-08-07: Version 1.7.20 2011-08-12: Version 1.7.20
- Added some missing 'const' to tChannelID (reported by Sundararaj Reel). - Added some missing 'const' to tChannelID (reported by Sundararaj Reel).
- The isnumber() function now checks the given pointer for NULL (thanks to Holger - The isnumber() function now checks the given pointer for NULL (thanks to Holger
@ -6673,3 +6673,4 @@ Video Disk Recorder Revision History
not yet known when a new payload starts. This adds no overhead for channels not yet known when a new payload starts. This adds no overhead for channels
that broadcast the frame type within the first TS packet of a payload; it only that broadcast the frame type within the first TS packet of a payload; it only
kicks in if that information is not in the first TS packet. kicks in if that information is not in the first TS packet.
- Fixed handling the channelID in cMenuEditChanItem (thanks to Udo Richter).

9
menuitems.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: menuitems.c 2.9 2011/06/13 14:48:41 kls Exp $ * $Id: menuitems.c 2.10 2011/08/12 13:19:40 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -736,9 +736,14 @@ void cMenuEditChanItem::Set(void)
cChannel *channel = Channels.GetByNumber(*value); cChannel *channel = Channels.GetByNumber(*value);
snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : ""); snprintf(buf, sizeof(buf), "%d %s", *value, channel ? channel->Name() : "");
SetValue(buf); SetValue(buf);
if (channelID)
*channelID = channel->GetChannelID().ToString();
} }
else if (noneString) else if (noneString) {
SetValue(noneString); SetValue(noneString);
if (channelID)
*channelID = "";
}
} }
eOSState cMenuEditChanItem::ProcessKey(eKeys Key) eOSState cMenuEditChanItem::ProcessKey(eKeys Key)