1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed editing and creating new channels

This commit is contained in:
Klaus Schmidinger 2004-02-13 13:36:52 +01:00
parent f379b56d0e
commit 30d262fa88
2 changed files with 9 additions and 3 deletions

View File

@ -2657,3 +2657,5 @@ Video Disk Recorder Revision History
- Fixed reading the EPG preferred language parameter from 'setup.conf'. - Fixed reading the EPG preferred language parameter from 'setup.conf'.
- Fixed switching to a visible programme in case the current channel has neither - Fixed switching to a visible programme in case the current channel has neither
a video nor an audio PID. a video nor an audio PID.
- Fixed editing channels (SID now range checked) and creating new channels (NID,
TID and RID are now set to 0).

10
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.284 2004/02/08 15:06:42 kls Exp $ * $Id: menu.c 1.285 2004/02/13 13:23:07 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -557,8 +557,12 @@ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
channel = Channel; channel = Channel;
if (channel) { if (channel) {
data = *channel; data = *channel;
if (New) if (New) {
channel = NULL; channel = NULL;
data.nid = 0;
data.tid = 0;
data.rid = 0;
}
Setup(); Setup();
} }
} }
@ -583,7 +587,7 @@ void cMenuEditChannel::Setup(void)
Add(new cMenuEditIntItem( tr("Dpid2"), &data.dpids[1], 0, 0x1FFF)); Add(new cMenuEditIntItem( tr("Dpid2"), &data.dpids[1], 0, 0x1FFF));
Add(new cMenuEditIntItem( tr("Tpid"), &data.tpid, 0, 0x1FFF)); Add(new cMenuEditIntItem( tr("Tpid"), &data.tpid, 0, 0x1FFF));
Add(new cMenuEditCaItem( tr("CA"), &data.caids[0], true));//XXX Add(new cMenuEditCaItem( tr("CA"), &data.caids[0], true));//XXX
Add(new cMenuEditIntItem( tr("Sid"), &data.sid, 0)); Add(new cMenuEditIntItem( tr("Sid"), &data.sid, 1, 0xFFFF));
/* XXX not yet used /* XXX not yet used
Add(new cMenuEditIntItem( tr("Nid"), &data.nid, 0)); Add(new cMenuEditIntItem( tr("Nid"), &data.nid, 0));
Add(new cMenuEditIntItem( tr("Tid"), &data.tid, 0)); Add(new cMenuEditIntItem( tr("Tid"), &data.tid, 0));