code.vuplus.com Git - vuplus_openembedded/blob - packages/enigma/enigma/duplicate_tsid_onid_cable_terrestrial_fix_backport.diff

   1 --- enigma-org/lib/dvb/dvbscan.cpp      11 Oct 2005 20:34:36 -0000      1.34
   2 +++ enigma/lib/dvb/dvbscan.cpp  29 Apr 2008 14:43:47 -0000
   3 @@ -244,11 +244,15 @@
   4                                                         break;
   5                                                 }
   6                                         }
   7 -
   8 +
   9                                         eDVBNamespace dvb_namespace =
  10                                                 tp.satellite.isValid()
  11                                                 ?eTransponder::buildNamespace(onid,tsid,tp.satellite.orbital_position,tp.satellite.frequency, tp.satellite.polarisation)
  12 -                                               :-1;
  13 +                                               :tp.cable.isValid()
  14 +                                               ?eTransponder::buildNamespace(onid,tsid, 0xFFFF, tp.cable.frequency, 0)
  15 +                                               :tp.terrestrial.isValid()
  16 +                                               ?eTransponder::buildNamespace(onid,tsid, 0xEEEE, tp.terrestrial.centre_frequency/1000, 0)
  17 +                                               :-1; // should not happen
  18
  19                                         tp.dvb_namespace=dvb_namespace;
  20
  21 @@ -390,14 +394,17 @@
  22                 // build "namespace" to work around buggy satellites
  23         if (transponder->satellite.valid)
  24                 dvb_namespace=eTransponder::buildNamespace(onid, tsid, transponder->satellite.orbital_position, transponder->satellite.frequency, transponder->satellite.polarisation);
  25 +       else if (transponder->cable.valid)
  26 +               dvb_namespace=eTransponder::buildNamespace(onid, tsid, 0xFFFF, transponder->cable.frequency, 0);
  27 +       else if (transponder->terrestrial.valid)
  28 +               dvb_namespace=eTransponder::buildNamespace(onid, tsid, 0xEEEE, transponder->terrestrial.centre_frequency/1000, 0);
  29         else
  30 -               dvb_namespace=0;
  31 +               dvb_namespace=0; // should not happen!
  32
  33         transponder->dvb_namespace=dvb_namespace;
  34
  35         eTransponder *tmp = 0;
  36 -       if ( transponder->satellite.valid &&
  37 -               dvb_namespace.get() & 0xFFFF )  // feeds.. scpc.. or muxxers with default values
  38 +       if ( dvb_namespace.get() & 0xFFFF )  // feeds.. scpc.. or muxxers with default values
  39         {
  40                 eDebug("[SCAN] SCPC detected... compare complete transponder");
  41                 // we must search transponder via freq pol usw..
  42 --- enigma-org/src/scan.cpp     17 Dec 2007 15:09:13 -0000      1.93
  43 +++ enigma/src/scan.cpp 29 Apr 2008 14:44:15 -0000
  44 @@ -2004,8 +2004,16 @@
  45                         transponder.satellite.orbital_position,
  46                         transponder.satellite.frequency,
  47                         transponder.satellite.polarisation);
  48 -       else
  49 -               dvb_namespace=0;
  50 +       else if (transponder.cable.valid)
  51 +               dvb_namespace=eTransponder::buildNamespace(onid, tsid,
  52 +                       0xFFFF,
  53 +                       transponder.cable.frequency,
  54 +                       0);
  55 +       else if (transponder.terrestrial.valid)
  56 +               dvb_namespace=eTransponder::buildNamespace(onid, tsid,
  57 +                       0xEEEE,
  58 +                       transponder.terrestrial.centre_frequency/1000, // centre_freq is in hz
  59 +                       0);
  60
  61         transponder.dvb_namespace=dvb_namespace;
  62