[mythtv-commits] mythtv commit: r11682 by danielk

[mythtv at cvs.mythtv.org]

      Author: danielk
        Date: 2006-11-05 03:00:59 +0000 (Sun, 05 Nov 2006)
New Revision: 11682
   Changeset: http://cvs.mythtv.org/trac/changeset/11682

Added:

   trunk/mythtv/libs/libmythtv/dtvconfparserhelpers.cpp
   trunk/mythtv/libs/libmythtv/dtvconfparserhelpers.h

Modified:

   trunk/mythtv/libs/libmythtv/dvbconfparser.cpp
   trunk/mythtv/libs/libmythtv/dvbconfparser.h
   trunk/mythtv/libs/libmythtv/dvbtypes.cpp
   trunk/mythtv/libs/libmythtv/dvbtypes.h
   trunk/mythtv/libs/libmythtv/frequencytables.cpp
   trunk/mythtv/libs/libmythtv/frequencytables.h
   trunk/mythtv/libs/libmythtv/libmythtv.pro
   trunk/mythtv/libs/libmythtv/scanwizard.cpp
   trunk/mythtv/libs/libmythtv/scanwizard.h
   trunk/mythtv/libs/libmythtv/scanwizardhelpers.cpp
   trunk/mythtv/libs/libmythtv/scanwizardhelpers.h
   trunk/mythtv/libs/libmythtv/scanwizardscanner.cpp
   trunk/mythtv/libs/libmythtv/scanwizardscanner.h
   trunk/mythtv/libs/libmythtv/siscan.cpp
   trunk/mythtv/libs/libmythtv/siscan.h

Log:

Fixes #2316. Adds checks of dvb-utils imported channels before adding them to the DB.

This also moves the dvb-utils scanner output parsers from dvbtypes.{h,cpp} to dtvconfparserhelpers.{h,cpp} so that dvb-utils channel maps can be imported for non-DVB cards like the HDHomeRun without compiling MythTV with DVB support.

This uses the list of channels generated by the dvb-utils channels.conf parser to seed the internal channel scanner. It then scan the inserted transports like it does normally, except that before inserting channels it checks the parser output and uses it's name for the channel rather than whatever the scanner picked up. Any channels we find on the same transport as a channels.conf channel are reported but not added to the database.

This also avoids use of the dvb-utils channels.conf parser's DB manipulation routines which were causing the problems reported in #2316, notably channels inserted with the same channel id as an existing channel.