*** mythweb.orig/settings_channels.php	Tue Jul 26 17:34:16 2005
--- mythweb/settings_channels.php	Tue Jul 26 17:41:10 2005
***************
*** 31,36 ****
--- 31,40 ----
                                       .'contrast='.escape($_POST['contrast_'.$chanid])    .','
                                         .'colour='.escape($_POST['colour_'.$chanid])      .','
                                            .'hue='.escape($_POST['hue_'.$chanid])         .','
+                                           .'xmltvid='.escape($_POST['xmltvid_'.$chanid])       .','
+                                           .'mplexid='.escape($_POST['mplexid_'.$chanid])       .','
+                                           .'serviceid='.escape($_POST['serviceid_'.$chanid])   .','
+                                           .'atscsrcid='.escape($_POST['atscsrcid_'.$chanid])   .','
                                    .'recpriority='.escape($_POST['recpriority_'.$chanid]) .','
                                    .'commfree='.escape((isset($_POST['commfree_'.$chanid]) && $_POST['commfree_'.$chanid] == "on") ? 1 : 0) .','
                                    .'visible='.escape((isset($_POST['visible_'.$chanid]) && $_POST['visible_'.$chanid] == "on") ? 1 : 0);
*** mythweb.orig/languages/English.php	Tue Jul 26 17:35:03 2005
--- mythweb/languages/English.php	Tue Jul 26 17:43:55 2005
***************
*** 261,266 ****
--- 261,270 ----
      'finetune'                                                                                                                           => '',
      'freqid'                                                                                                                             => '',
      'hue'                                                                                                                                => '',
+     'xmltvid'                                                                                                                            => '',
+     'mplexid'                                                                                                                            => '',
+     'serviceid'                                                                                                                          => '',
+     'atscsrcid'                                                                                                                          => '',
      'name'                                                                                                                               => '',
      'recpriority'                                                                                                                        => '',
      'sourceid'                                                                                                                           => '',
*** mythweb.orig/themes/Default/settings_channels.php	Tue Jul 26 17:35:48 2005
--- mythweb/themes/Default/settings_channels.php	Tue Jul 26 17:47:43 2005
***************
*** 37,42 ****
--- 37,46 ----
      <td width="7%"><?php  echo t('contrast')     ?></td>
      <td width="7%"><?php  echo t('colour')       ?></td>
      <td width="7%"><?php  echo t('hue')          ?></td>
+     <td width="7%"><?php  echo t('xmltvid')      ?></td>
+     <td width="7%"><?php  echo t('mplexid')      ?></td>
+     <td width="7%"><?php  echo t('serviceid')    ?></td>
+     <td width="7%"><?php  echo t('atscsrcid')    ?></td>
      <td width="5%"><?php  echo t('recpriority')  ?></td>
      <td width="5%"><?php  echo t('commfree')     ?></td>
      <td width="5%"><?php  echo t('visible')      ?></td>
***************
*** 55,60 ****
--- 59,68 ----
      <td><input type="text" size="6" name="contrast_<?php echo $channel['chanid']?>" id="contrast_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['contrast'])?>"></td>
      <td><input type="text" size="6" name="colour_<?php echo $channel['chanid']?>" id="colour_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['colour'])?>"></td>
      <td><input type="text" size="6" name="hue_<?php echo $channel['chanid']?>" id="hue_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['hue'])?>"></td>
+     <td><input type="text" size="6" name="xmltvid_<?php echo $channel['chanid']?>" id="xmltvid_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['xmltvid'])?>"></td>
+     <td><input type="text" size="6" name="mplexid_<?php echo $channel['chanid']?>" id="mplexid_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['mplexid'])?>"></td>
+     <td><input type="text" size="6" name="serviceid_<?php echo $channel['chanid']?>" id="serviceid_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['serviceid'])?>"></td>
+     <td><input type="text" size="6" name="atscsrcid_<?php echo $channel['chanid']?>" id="atscsrcid_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['atscsrcid'])?>"></td>
      <td><input type="text" size="2" name="recpriority_<?php echo $channel['chanid']?>" id="recpriority_<?php echo $channel['chanid']?>" value="<?php echo htmlentities($channel['recpriority'])?>"></td>
      <td><input type="checkbox" name="commfree_<?php echo $channel['chanid']?>" <?php if (htmlentities($channel['commfree'])) echo "CHECKED" ?> ></td>
      <td><input type="checkbox" name="visible_<?php echo $channel['chanid']?>" <?php if (htmlentities($channel['visible'])) echo "CHECKED" ?> ></td>