Ticket #1485: siparser-other-frequency-handling.diff

libs/libmythtv/siparser.cpp

@@ -659 +659 @@
             tobj.CodeRateLP       = tdsd.CodeRateLPString();
             tobj.GuardInterval    = tdsd.GuardIntervalString();
             tobj.TransmissionMode = tdsd.TransmissionModeString();
+            if (tdsd.OtherFrequencyInUse() &&
+                (DescriptorID::frequency_list == dlist[i+1][0]))
+            {
+                VERBOSE(VB_SIPARSER, LOC + "Found OtherFrequency Descriptor");
+                FrequencyListDescriptor fld(dlist[i+1]);
+                for (uint flc = 0; flc < fld.FrequencyCount(); flc++)
+                    tobj.frequencies.push_back(fld.FrequencyHz(flc));
+            }
         }
         else if (DescriptorID::satellite_delivery_system == dlist[i][0])
         {
@@ -671 +679 @@
             tobj.SymbolRate       = sdsd.SymbolRateHz();
             tobj.FEC_Inner        = sdsd.FECInnerString();
         }
-        else if (DescriptorID::frequency_list == dlist[i][0])
-        {
-            FrequencyListDescriptor fld(dlist[i]);
-            for (uint i = 0; i < fld.FrequencyCount(); i++)
-                tobj.frequencies.push_back(fld.FrequencyHz(i));
-        }
         else if (DescriptorID::dvb_uk_channel_list == dlist[i][0])
         {
             UKChannelListDescriptor ucld(dlist[i]);