[mythtv-commits] mythtv commit: r26168 by robertm

[mythtv at cvs.mythtv.org]

      Author: robertm
        Date: 2010-09-08 06:13:02 +0000 (Wed, 08 Sep 2010)
New Revision: 26168
   Changeset: http://svn.mythtv.org/trac/changeset/26168

Log:

Channel Scanner:  Multiple fixups for the channel scanner.  First, fix multiple wrong arguments being passed to IsConflicting()-- the serviceid was being passed in as the sourceid for some reason.  Also, construct ClearQAM channels are they used to be-- freqid-service_id  (ie 105-2).  For some reason, some of the MPEG and SCTE channels are *still* being considered conflicting in spite of the fact that they appear nowhere in the video source, but then the suggested channum (which is identical to the original, conflicting one) is inserted just fine.  

This leaves the channel scanner in a state where it is at least possible to just scan, Insert All, and then hit Suggest->OK until the "conflicting" channels are all inserted, and gives a proper, working lineup.  The only thing left to do is figure out why these channels are still being considered Conflicting.

Refs #7838.


Modified:

   trunk/mythtv/libs/libmythtv/channelscan/channelimporter.cpp