Ticket #2695: 2695-merge-v1.patch

libs/libmythtv/libmythtv.pro

@@ -25 +25 @@
 DEPENDPATH  += ../libmyth ../libavcodec ../libavformat ../libavutil ../libswscale
 DEPENDPATH  += ../libmythmpeg2 ../libmythdb ../libmythhdhomerun
 DEPENDPATH  += ../libmythdvdnav/
-DEPENDPATH  += ./dvbdev ./mpeg ./iptv
+DEPENDPATH  += ./dvbdev ./mpeg ./iptv ./channelscan
 DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment/include
 DEPENDPATH  += ../libmythlivemedia/BasicUsageEnvironment
 DEPENDPATH  += ../libmythlivemedia/groupsock/include
@@ -247 +247 @@
 SOURCES += dtvmultiplex.cpp
 SOURCES += dtvconfparser.cpp        dtvconfparserhelpers.cpp
 
+HEADERS += channelscan/scaninfo.h   channelscan/channelimporter.h
+SOURCES += channelscan/scaninfo.cpp channelscan/channelimporter.cpp
+
 using_frontend {
     # Recording profile stuff
     HEADERS += profilegroup.h
@@ -399 +402 @@
     SOURCES += inputinfo.cpp               inputgroupmap.cpp
 
     # Channel scanner stuff
-    HEADERS += scanwizard.h                scanwizardhelpers.h
-    HEADERS += siscan.h
-    HEADERS += scanwizardscanner.h
-    SOURCES += scanwizard.cpp              scanwizardhelpers.cpp
-    SOURCES += siscan.cpp
-    SOURCES += scanwizardscanner.cpp
+    HEADERS += scanwizard.h
+    SOURCES += scanwizard.cpp
 
+    HEADERS += channelscan/channelscan_sm.h
+    HEADERS += channelscan/channelscanner.h
+    HEADERS += channelscan/channelscanner_gui.h
+    HEADERS += channelscan/channelscanner_cli.h
+    HEADERS += channelscan/frequencytablesetting.h
+    HEADERS += channelscan/inputselectorsetting.h
+    HEADERS += channelscan/loglist.h
+    HEADERS += channelscan/channelscanmiscsettings.h
+    HEADERS += channelscan/modulationsetting.h
+    HEADERS += channelscan/multiplexsetting.h
+    HEADERS += channelscan/paneanalog.h
+    HEADERS += channelscan/paneatsc.h
+    HEADERS += channelscan/panedvbc.h
+    HEADERS += channelscan/panedvbs.h
+    HEADERS += channelscan/panedvbs2.h
+    HEADERS += channelscan/panedvbt.h
+    HEADERS += channelscan/panedvbutilsimport.h
+    HEADERS += channelscan/panesingle.h
+    HEADERS += channelscan/scanmonitor.h
+    HEADERS += channelscan/scanprogresspopup.h
+    HEADERS += channelscan/scanwizardconfig.h
+
+    SOURCES += channelscan/channelscan_sm.cpp
+    SOURCES += channelscan/channelscanner.cpp
+    SOURCES += channelscan/channelscanner_gui.cpp
+    SOURCES += channelscan/channelscanner_cli.cpp
+    SOURCES += channelscan/frequencytablesetting.cpp
+    SOURCES += channelscan/inputselectorsetting.cpp
+    SOURCES += channelscan/loglist.cpp
+    SOURCES += channelscan/multiplexsetting.cpp
+    SOURCES += channelscan/paneanalog.cpp
+    SOURCES += channelscan/scanmonitor.cpp
+    SOURCES += channelscan/scanprogresspopup.cpp
+    SOURCES += channelscan/scanwizardconfig.cpp
+
     # EIT stuff
     HEADERS += eithelper.h                 eitscanner.h
     HEADERS += eitfixup.h                  eitcache.h

libs/libmythtv/scanwizardhelpers.h

@@ -1 @@
-/* -*- Mode: c++ -*-
- * $Id$
- * vim: set expandtab tabstop=4 shiftwidth=4:
- *
- * Original Project
- *      MythTV      http://www.mythtv.org
- *
- * Author(s):
- *      John Pullan  (john@pullan.org)
- *
- * Description:
- *     Collection of classes to provide dvb channel scanning
- *     functionality
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef SCANWIZARDHELPERS_H
-#define SCANWIZARDHELPERS_H
-
-#include "compat.h"
-#include "settings.h"
-
-#include <qwaitcondition.h>
-#include <qevent.h>
-
-class TransFreqTableSelector;
-class TransLabelSetting;
-class ScanWizardScanner;
-class ScanWizard;
-class OptionalTypeSetting;
-class VideoSourceSelector;
-class OFDMPane;
-class QPSKPane;
-class DVBS2Pane;
-class ATSCPane;
-class QAMPane;
-class AnalogPane;
-class STPane;
-class DVBUtilsImportPane;
-
-class ScanSignalMeter: public ProgressSetting, public TransientStorage
-{
-  public:
-    ScanSignalMeter(int steps): ProgressSetting(this, steps) {};
-};
-
-class ScanProgressPopup : public ConfigurationPopupDialog
-{
-    Q_OBJECT
-
-    friend class QObject; // quiet OSX gcc warning
-
-  public:
-    ScanProgressPopup(bool lock, bool strength, bool snr);
-    virtual void deleteLater(void);
-
-    void CreateDialog(void);
-    virtual DialogCode exec(void);
-    void DeleteDialog(void);
-
-    void SetStatusSignalToNoise(int value);
-    void SetStatusSignalStrength(int value);
-    void SetStatusLock(int value);
-    void SetScanProgress(double value);
-
-    void SetStatusText(const QString &value);
-    void SetStatusTitleText(const QString &value);
-
-  private slots:
-    void Done(void);
-
-  private:
-    ~ScanProgressPopup();
-
-    bool               done;
-    QWaitCondition     wait;
-
-    ScanSignalMeter   *ss;
-    ScanSignalMeter   *sn;
-    ScanSignalMeter   *progressBar;
-
-    TransLabelSetting *sl;
-    TransLabelSetting *sta;
-};
-
-class ScannerEvent : public QEvent
-{
-    friend class QObject; // quiet OSX gcc warning
-
-  public:
-    enum TYPE
-    {
-        ScanComplete,
-        ScanShutdown,
-        AppendTextToLog,
-        SetStatusText,
-        SetStatusTitleText,
-        SetPercentComplete,
-        SetStatusRotorPosition,
-        SetStatusSignalToNoise,
-        SetStatusSignalStrength,
-        SetStatusSignalLock,
-    };
-
-    ScannerEvent(TYPE t) :
-        QEvent((QEvent::Type)(t + QEvent::User)),
-        str(""), intvalue(0), spp_ptr(NULL) { ; }
-
-    QString strValue()              const { return str; }
-    void    strValue(const QString& _str) { str = _str; }
-
-    int     intValue()        const { return intvalue; }
-    void    intValue(int _intvalue) { intvalue = _intvalue; }
-
-    ScanProgressPopup *ScanProgressPopupValue() const { return spp_ptr; }
-    void    ScanProgressPopupValue(ScanProgressPopup *_spp_ptr)
-        { spp_ptr = _spp_ptr; }
-
-    TYPE    eventType()       const { return (TYPE)(type()-QEvent::User); }
-
-  private:
-    ~ScannerEvent() { }
-
-  private:
-    QString str;
-    int     intvalue;
-    ScanProgressPopup *spp_ptr;
-};
-
-void post_event(QObject *dest, ScannerEvent::TYPE type, int val);
-void post_event(QObject *dest, ScannerEvent::TYPE type, const QString &val);
-void post_event(QObject *dest, ScannerEvent::TYPE type, int val,
-                ScanProgressPopup *spp);
-
-// ///////////////////////////////
-// Settings Below Here
-// ///////////////////////////////
-
-class MultiplexSetting : public ComboBoxSetting, public TransientStorage
-{
-    Q_OBJECT
-
-  public:
-    MultiplexSetting() : ComboBoxSetting(this), sourceid(0)
-        { setLabel(tr("Transport")); }
-
-    virtual void Load(void);
-
-    void SetSourceID(uint _sourceid);
-
-  protected:
-    uint sourceid;
-};
-
-class IgnoreSignalTimeout : public CheckBoxSetting, public TransientStorage
-{
-  public:
-    IgnoreSignalTimeout() : CheckBoxSetting(this)
-    {
-        setLabel(QObject::tr("Ignore Signal Timeout"));
-        setHelpText(
-            QObject::tr("This option allows you to slow down the scan for "
-                        "broken drivers, such as the DVB drivers for the "
-                        "Leadtek LR6650 DVB card."));
-    }
-};
-
-class InputSelector : public ComboBoxSetting, public TransientStorage
-{
-    Q_OBJECT
-
-  public:
-    InputSelector(uint _default_cardid, const QString &_default_inputname);
-
-    virtual void Load(void);
-
-    uint GetCardID(void) const;
-
-    QString GetInputName(void) const;
-
-    static bool Parse(const QString &cardid_inputname,
-                      uint          &cardid,
-                      QString       &inputname);
-
-  public slots:
-    void SetSourceID(const QString &_sourceid);
-
-  private:
-    uint    sourceid;
-    uint    default_cardid;
-    QString default_inputname;
-};
-
-class ScanCountry : public ComboBoxSetting, public TransientStorage
-{
-    Q_OBJECT
-
-  public:
-    enum Country
-    {
-        AU,
-        FI,
-        SE,
-        UK,
-        DE,
-        ES,
-        NZ,
-        FR,
-    };
-
-    ScanCountry();
-};
-
-class ScanTypeSetting : public ComboBoxSetting, public TransientStorage
-{
-    Q_OBJECT
-  public:
-    enum Type
-    {
-        Error_Open = 0,
-        Error_Probe,
-        // Scans that check each frequency in a predefined list
-        FullScan_Analog,
-        FullScan_ATSC,
-        FullScan_OFDM,
-        // Scans starting on one frequency that adds each transport
-        // seen in the Network Information Tables to the scan.
-        NITAddScan_OFDM,
-        NITAddScan_QPSK,
-        NITAddScan_QAM,
-        // Scan of all transports already in the database
-        FullTransportScan,
-        // Scan of one transport already in the database
-        TransportScan,
-        // IPTV import of channels from M3U URL
-        IPTVImport,
-        // Imports lists from dvb-utils scanners
-        DVBUtilsImport,
-    };
-
-    ScanTypeSetting() : ComboBoxSetting(this), hw_cardid(0)
-        { setLabel(QObject::tr("Scan Type")); }
-
-  protected slots:
-    void SetInput(const QString &cardids_inputname);
-
-  protected:
-    uint    hw_cardid;
-};
-
-class ScanOptionalConfig : public TriggeredConfigurationGroup
-{
-    Q_OBJECT
-
-  public:
-    ScanOptionalConfig(ScanTypeSetting *_scan_type);
-
-    QString GetATSCFormat(const QString&)    const;
-    QString GetFrequencyStandard(void)       const;
-    QString GetModulation(void)              const;
-    QString GetFrequencyTable(void)          const;
-    bool    DoIgnoreSignalTimeout(void)      const;
-    QString GetFilename(void)                const;
-    uint    GetMultiplex(void)               const;
-    bool    DoDeleteChannels(void)           const;
-    bool    DoRenameChannels(void)           const;
-    QMap<QString,QString> GetStartChan(void) const;
-
-    void SetDefaultATSCFormat(const QString &atscFormat);
-
-  public slots:
-    void SetSourceID(const QString&);
-    void triggerChanged(const QString&);
-
-  private:
-    ScanTypeSetting     *scanType;
-    ScanCountry         *country;
-    IgnoreSignalTimeout *ignoreSignalTimeoutAll;
-    OFDMPane            *paneOFDM;
-    QPSKPane            *paneQPSK;
-    DVBS2Pane           *paneDVBS2;
-    ATSCPane            *paneATSC;
-    QAMPane             *paneQAM;
-    AnalogPane          *paneAnalog;
-    STPane              *paneSingle;
-    DVBUtilsImportPane  *paneDVBUtilsImport;
-};
-
-class ScanWizardConfig: public VerticalConfigurationGroup
-{
-    Q_OBJECT
-
-  public:
-    ScanWizardConfig(ScanWizard *_parent,
-                     uint        default_sourceid,
-                     uint        default_cardid,
-                     QString     default_inputname);
-
-    uint    GetSourceID(void)     const;
-    QString GetATSCFormat(void)   const;
-    QString GetModulation(void)   const { return scanConfig->GetModulation(); }
-    int     GetScanType(void)     const { return scanType->getValue().toInt();}
-    uint    GetCardID(void)       const { return input->GetCardID();          }
-    QString GetInputName(void)    const { return input->GetInputName();       }
-    QString GetFilename(void)     const { return scanConfig->GetFilename();   }
-    uint    GetMultiplex(void)    const { return scanConfig->GetMultiplex();  }
-    bool DoDeleteChannels(void) const { return scanConfig->DoDeleteChannels();}
-    bool DoRenameChannels(void) const { return scanConfig->DoRenameChannels();}
-    QString GetFrequencyStandard(void) const
-        { return scanConfig->GetFrequencyStandard(); }
-    QString GetFrequencyTable(void) const
-        { return scanConfig->GetFrequencyTable(); }
-    QMap<QString,QString> GetStartChan(void) const
-        { return scanConfig->GetStartChan(); }
-    bool    DoIgnoreSignalTimeout(void) const
-        { return scanConfig->DoIgnoreSignalTimeout(); }
-
-    void SetDefaultATSCFormat(const QString &atscFormat)
-        { scanConfig->SetDefaultATSCFormat(atscFormat); }
-
-  protected:
-    VideoSourceSelector *videoSource;
-    InputSelector       *input;
-    ScanTypeSetting     *scanType;
-    ScanOptionalConfig  *scanConfig;
-};
-
-class LogList: public ListBoxSetting, public TransientStorage
-{
-  public:
-    LogList();
-
-    void updateText(const QString& status);
-  protected:
-    int n;
-};
-
-class ScanFrequencyTable: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanFrequencyTable() : ComboBoxSetting(this)
-    {
-        addSelection(QObject::tr("Broadcast"),        "us",          true);
-        addSelection(QObject::tr("Cable")     + " " +
-                     QObject::tr("High"),             "uscablehigh", false);
-        addSelection(QObject::tr("Cable HRC") + " " +
-                     QObject::tr("High"),             "ushrchigh",   false);
-        addSelection(QObject::tr("Cable IRC") + " " +
-                     QObject::tr("High"),             "usirchigh",   false);
-        addSelection(QObject::tr("Cable"),            "uscable",     false);
-        addSelection(QObject::tr("Cable HRC"),        "ushrc",       false);
-        addSelection(QObject::tr("Cable IRC"),        "usirc",       false);
-
-        setLabel(QObject::tr("Frequency Table"));
-        setHelpText(QObject::tr("Frequency table to use.") + " " +
-                    QObject::tr(
-                        "The option of scanning only \"High\" "
-                        "frequency channels is useful because most "
-                        "digital channels are on the higher frequencies."));
-    }
-};
-
-class ScanATSCModulation: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanATSCModulation() : ComboBoxSetting(this)
-    {
-        addSelection(QObject::tr("Terrestrial")+" (8-VSB)","vsb8",  true);
-        addSelection(QObject::tr("Cable") + " (QAM-256)", "qam256", false);
-        addSelection(QObject::tr("Cable") + " (QAM-128)", "qam128", false);
-        addSelection(QObject::tr("Cable") + " (QAM-64)",  "qam64",  false);
-
-        setLabel(QObject::tr("Modulation"));
-        setHelpText(
-            QObject::tr("Modulation, 8-VSB, QAM-256, etc.") + " " +
-            QObject::tr("Most cable systems in the United States use "
-                        "QAM-256 or QAM-64, but some mixed systems "
-                        "may use 8-VSB for over-the-air channels."));
-    }
-};
-
-class ScanATSCChannelFormat: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanATSCChannelFormat() : ComboBoxSetting(this)
-    {
-        addSelection(QObject::tr("(5_1) Underscore"), "%1_%2", true);
-        addSelection(QObject::tr("(5-1) Minus"),      "%1-%2", false);
-        addSelection(QObject::tr("(5.1) Period"),     "%1.%2", false);
-        addSelection(QObject::tr("(501) Zero"),       "%10%2", false);
-        addSelection(QObject::tr("(51) None"),        "%1%2",  false);
-        setLabel(QObject::tr("ATSC Channel Separator"));
-        setHelpText(QObject::tr("What to use to separate ATSC major "
-                                "and minor channels."));
-    }
-};
-
-class ScanOldChannelTreatment: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanOldChannelTreatment(bool rename = true) : ComboBoxSetting(this)
-    {
-        addSelection(QObject::tr("Minimal Updates"),    "minimal");
-        if (rename)
-            addSelection(QObject::tr("Rename to Match"),    "rename");
-        addSelection(QObject::tr("Delete"),             "delete");
-        setLabel(QObject::tr("Existing Channel Treatment"));
-        setHelpText(QObject::tr("How to treat existing channels."));
-    }
-};
-
-class ScanFrequency: public LineEditSetting, public TransientStorage
-{
-  public:
-    ScanFrequency(bool in_kHz = false) : LineEditSetting(this)
-    {
-        QString units = (in_kHz) ? "kHz" : "Hz";
-        setLabel(QObject::tr("Frequency (%1)").arg(units));
-        setHelpText(
-            QObject::tr(
-                "Frequency (Option has no default).\n"
-                "The frequency for this channel in %1.").arg(units));
-    };
-};
-
-class ScanSymbolRate: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanSymbolRate() : ComboBoxSetting(this, true)
-    {
-        setLabel(QObject::tr("Symbol Rate"));
-        setHelpText(
-             QObject::tr(
-                "Symbol Rate (symbols/second).\n"
-                "Most dvb-s transponders transmit at 27.5 "
-                "million symbols per second."));
-        addSelection("3333000");
-        addSelection("22000000");
-        addSelection("27500000", "27500000", true);
-        addSelection("28000000");
-        addSelection("28500000");
-        addSelection("29900000");
-    };
-};
-
-class ScanPolarity: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanPolarity() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Polarity"));
-        setHelpText(QObject::tr("Polarity (Option has no default)"));
-        addSelection(QObject::tr("Horizontal"), "h",true);
-        addSelection(QObject::tr("Vertical"), "v");
-        addSelection(QObject::tr("Right Circular"), "r");
-        addSelection(QObject::tr("Left Circular"), "l");
-    };
-};
-
-class ScanInversion: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanInversion() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Inversion"));
-        setHelpText(QObject::tr(
-                        "Inversion (Default: Auto):\n"
-                        "Most cards can autodetect this now, so "
-                        "leave it at Auto unless it won't work."));
-        addSelection(QObject::tr("Auto"), "a",true);
-        addSelection(QObject::tr("On"), "1");
-        addSelection(QObject::tr("Off"), "0");
-    };
-};
-
-class ScanBandwidth: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanBandwidth() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Bandwidth"));
-        setHelpText(QObject::tr("Bandwidth (Default: Auto)\n"));
-        addSelection(QObject::tr("Auto"),"a",true);
-        addSelection(QObject::tr("6 MHz"),"6");
-        addSelection(QObject::tr("7 MHz"),"7");
-        addSelection(QObject::tr("8 MHz"),"8");
-    };
-};
-
-class ScanModulationSetting: public ComboBoxSetting
-{
-  public:
-    ScanModulationSetting(Storage *_storage) : ComboBoxSetting(_storage)
-    {
-        addSelection(QObject::tr("Auto"),"auto",true);
-        addSelection("QPSK","qpsk");
-#ifdef FE_GET_EXTENDED_INFO
-        addSelection("8PSK","8psk");
-#endif
-        addSelection("QAM 16","qam_16");
-        addSelection("QAM 32","qam_32");
-        addSelection("QAM 64","qam_64");
-        addSelection("QAM 128","qam_128");
-        addSelection("QAM 256","qam_256");
-    };
-};
-
-class ScanModulation: public ScanModulationSetting, public TransientStorage
-{
-  public:
-    ScanModulation() : ScanModulationSetting(this)
-    {
-        setLabel(QObject::tr("Modulation"));
-        setHelpText(QObject::tr("Modulation (Default: Auto)"));
-    };
-};
-
-class ScanConstellation: public ScanModulationSetting,
-                         public TransientStorage
-{
-  public:
-    ScanConstellation() : ScanModulationSetting(this)
-    {
-        setLabel(QObject::tr("Constellation"));
-        setHelpText(QObject::tr("Constellation (Default: Auto)"));
-    };
-};
-
-class ScanFecSetting: public ComboBoxSetting
-{
-  public:
-    ScanFecSetting(Storage *_storage) : ComboBoxSetting(_storage)
-    {
-        addSelection(QObject::tr("Auto"),"auto",true);
-        addSelection(QObject::tr("None"),"none");
-        addSelection("1/2");
-        addSelection("2/3");
-        addSelection("3/4");
-        addSelection("4/5");
-        addSelection("5/6");
-        addSelection("6/7");
-        addSelection("7/8");
-        addSelection("8/9");
-    }
-};
-
-class ScanFec: public ScanFecSetting, public TransientStorage
-{
-  public:
-    ScanFec() : ScanFecSetting(this)
-    {
-        setLabel(QObject::tr("FEC"));
-        setHelpText(QObject::tr(
-                        "Forward Error Correction (Default: Auto)"));
-    }
-};
-
-class ScanCodeRateLP: public ScanFecSetting, public TransientStorage
-{
-  public:
-    ScanCodeRateLP() : ScanFecSetting(this)
-    {
-        setLabel(QObject::tr("LP Coderate"));
-        setHelpText(QObject::tr("Low Priority Code Rate (Default: Auto)"));
-    }
-};
-
-class ScanCodeRateHP: public ScanFecSetting, public TransientStorage
-{
-  public:
-    ScanCodeRateHP() : ScanFecSetting(this)
-    {
-        setLabel(QObject::tr("HP Coderate"));
-        setHelpText(QObject::tr("High Priority Code Rate (Default: Auto)"));
-    };
-};
-
-class ScanGuardInterval: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanGuardInterval() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Guard Interval"));
-        setHelpText(QObject::tr("Guard Interval (Default: Auto)"));
-        addSelection(QObject::tr("Auto"),"auto");
-        addSelection("1/4");
-        addSelection("1/8");
-        addSelection("1/16");
-        addSelection("1/32");
-    };
-};
-
-class ScanTransmissionMode: public ComboBoxSetting, public TransientStorage
-{
-  public:
-    ScanTransmissionMode() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Trans. Mode"));
-        setHelpText(QObject::tr("Transmission Mode (Default: Auto)"));
-        addSelection(QObject::tr("Auto"),"a");
-        addSelection("2K","2");
-        addSelection("8K","8");
-    };
-};
-
-class ScanHierarchy: public ComboBoxSetting, public TransientStorage
-{
-    public:
-    ScanHierarchy() : ComboBoxSetting(this)
-    {
-        setLabel(QObject::tr("Hierarchy"));
-        setHelpText(QObject::tr("Hierarchy (Default: Auto)"));
-        addSelection(QObject::tr("Auto"),"a");
-        addSelection(QObject::tr("None"), "n");
-        addSelection("1");
-        addSelection("2");
-        addSelection("4");
-    };
-};
-
-class OFDMPane : public HorizontalConfigurationGroup
-{
-  public:
-    OFDMPane() : HorizontalConfigurationGroup(false, false, true, true)
-    {
-        setUseFrame(false);
-        VerticalConfigurationGroup *left =
-            new VerticalConfigurationGroup(false,true,true,false);
-        VerticalConfigurationGroup *right =
-            new VerticalConfigurationGroup(false,true,true,false);
-        left->addChild(pfrequency       = new ScanFrequency());
-        left->addChild(pbandwidth       = new ScanBandwidth());
-        left->addChild(pinversion       = new ScanInversion());
-        left->addChild(pconstellation   = new ScanConstellation());
-        right->addChild(pcoderate_lp    = new ScanCodeRateLP());
-        right->addChild(pcoderate_hp    = new ScanCodeRateHP());
-        right->addChild(ptrans_mode     = new ScanTransmissionMode());
-        right->addChild(pguard_interval = new ScanGuardInterval());
-        right->addChild(phierarchy      = new ScanHierarchy());
-        addChild(left);
-        addChild(right);
-    }
-
-    QString frequency(void)      const { return pfrequency->getValue();     }
-    QString bandwidth(void)      const { return pbandwidth->getValue();     }
-    QString inversion(void)      const { return pinversion->getValue();     }
-    QString constellation(void)  const { return pconstellation->getValue(); }
-    QString coderate_lp(void)    const { return pcoderate_lp->getValue();   }
-    QString coderate_hp(void)    const { return pcoderate_hp->getValue();   }
-    QString trans_mode(void)     const { return ptrans_mode->getValue();    }
-    QString guard_interval(void) const { return pguard_interval->getValue(); }
-    QString hierarchy(void)      const { return phierarchy->getValue();     }
-
-  protected:
-    ScanFrequency        *pfrequency;
-    ScanInversion        *pinversion;
-    ScanBandwidth        *pbandwidth;
-    ScanConstellation    *pconstellation;
-    ScanCodeRateLP       *pcoderate_lp;
-    ScanCodeRateHP       *pcoderate_hp;
-    ScanTransmissionMode *ptrans_mode;
-    ScanGuardInterval    *pguard_interval;
-    ScanHierarchy        *phierarchy;
-};
-
-class DVBS2Pane : public HorizontalConfigurationGroup
-{
-  public:
-    DVBS2Pane() : HorizontalConfigurationGroup(false,false,true,false)
-    {
-        setUseFrame(false);
-        VerticalConfigurationGroup *left =
-            new VerticalConfigurationGroup(false,true);
-        VerticalConfigurationGroup *right =
-            new VerticalConfigurationGroup(false,true);
-        left->addChild( pfrequency  = new ScanFrequency());
-        left->addChild( ppolarity   = new ScanPolarity());
-        left->addChild( psymbolrate = new ScanSymbolRate());
-        right->addChild(pfec        = new ScanFec());
-        right->addChild(pmodulation = new ScanModulation());
-        right->addChild(pinversion  = new ScanInversion());
-        addChild(left);
-        addChild(right);
-    }
-
-    QString frequency(void)  const { return pfrequency->getValue();  }
-    QString symbolrate(void) const { return psymbolrate->getValue(); }
-    QString inversion(void)  const { return pinversion->getValue();  }
-    QString fec(void)        const { return pfec->getValue();        }
-    QString polarity(void)   const { return ppolarity->getValue();   }
-    QString modulation(void) const { return pmodulation->getValue(); }
-
-  protected:
-    ScanFrequency  *pfrequency;
-    ScanSymbolRate *psymbolrate;
-    ScanInversion  *pinversion;
-    ScanFec        *pfec;
-    ScanPolarity   *ppolarity;
-    ScanModulation *pmodulation;
-};
-
-class QPSKPane : public HorizontalConfigurationGroup
-{
-  public:
-    QPSKPane() : HorizontalConfigurationGroup(false, false, true, false)
-    {
-        setUseFrame(false);
-        VerticalConfigurationGroup *left =
-            new VerticalConfigurationGroup(false,true);
-        VerticalConfigurationGroup *right =
-            new VerticalConfigurationGroup(false,true);
-        left->addChild(pfrequency  = new ScanFrequency(true));
-        left->addChild(ppolarity   = new ScanPolarity());
-        left->addChild(psymbolrate = new ScanSymbolRate());
-        right->addChild(pfec       = new ScanFec());
-        right->addChild(pinversion = new ScanInversion());
-        addChild(left);
-        addChild(right);
-    }
-
-    QString frequency(void)  const { return pfrequency->getValue();  }
-    QString symbolrate(void) const { return psymbolrate->getValue(); }
-    QString inversion(void)  const { return pinversion->getValue();  }
-    QString fec(void)        const { return pfec->getValue();        }
-    QString polarity(void)   const { return ppolarity->getValue();   }
-
-  protected:
-    ScanFrequency  *pfrequency;
-    ScanSymbolRate *psymbolrate;
-    ScanInversion  *pinversion;
-    ScanFec        *pfec;
-    ScanPolarity   *ppolarity;
-};
-
-class QAMPane : public HorizontalConfigurationGroup
-{
-  public:
-    QAMPane() : HorizontalConfigurationGroup(false, false, true, false)
-    {
-        setUseFrame(false);
-        VerticalConfigurationGroup *left =
-            new VerticalConfigurationGroup(false,true);
-        VerticalConfigurationGroup *right =
-            new VerticalConfigurationGroup(false,true);
-        left->addChild(pfrequency   = new ScanFrequency());
-        left->addChild(psymbolrate  = new ScanSymbolRate());
-        left->addChild(pinversion   = new ScanInversion());
-        right->addChild(pmodulation = new ScanModulation());
-        right->addChild(pfec        = new ScanFec());
-        addChild(left);
-        addChild(right);
-    }
-
-    QString frequency(void)  const { return pfrequency->getValue();  }
-    QString symbolrate(void) const { return psymbolrate->getValue(); }
-    QString inversion(void)  const { return pinversion->getValue();  }
-    QString fec(void)        const { return pfec->getValue();        }
-    QString modulation(void) const { return pmodulation->getValue(); }
-
-  protected:
-    ScanFrequency  *pfrequency;
-    ScanSymbolRate *psymbolrate;
-    ScanInversion  *pinversion;
-    ScanModulation *pmodulation;
-    ScanFec        *pfec;
-};
-
-class ATSCPane : public VerticalConfigurationGroup
-{
-  public:
-    ATSCPane() : VerticalConfigurationGroup(false, false, true, false)
-    {
-        addChild(atsc_table            = new ScanFrequencyTable());
-        addChild(atsc_modulation       = new ScanATSCModulation());
-        addChild(atsc_format           = new ScanATSCChannelFormat());
-        addChild(old_channel_treatment = new ScanOldChannelTreatment());
-    }
-
-    QString atscFreqTable(void)  const { return atsc_table->getValue();      }
-    QString atscModulation(void) const { return atsc_modulation->getValue(); }
-    QString GetATSCFormat(void)  const { return atsc_format->getValue();     }
-    bool DoDeleteChannels(void) const
-        { return old_channel_treatment->getValue() == "delete"; }
-    bool DoRenameChannels(void) const
-        { return old_channel_treatment->getValue() == "rename"; }
-
-    void SetDefaultATSCFormat(const QString &d)
-    {
-        int val = atsc_format->getValueIndex(d);
-        atsc_format->setValue(val);
-    }
-
-  protected:
-    ScanFrequencyTable      *atsc_table;
-    ScanATSCModulation      *atsc_modulation;
-    ScanATSCChannelFormat   *atsc_format;
-    ScanOldChannelTreatment *old_channel_treatment;
-};
-
-class AnalogPane : public VerticalConfigurationGroup
-{
-  public:
-    AnalogPane();
-
-    void SetSourceID(uint sourceid);
-
-    QString GetFrequencyTable(void) const;
-
-    bool DoDeleteChannels(void) const
-        { return old_channel_treatment->getValue() == "delete"; }
-    bool DoRenameChannels(void) const
-        { return old_channel_treatment->getValue() == "rename"; }
-
-  protected:
-    TransFreqTableSelector  *freq_table;
-    ScanOldChannelTreatment *old_channel_treatment;
-};
-
-class STPane : public VerticalConfigurationGroup
-{
-  public:
-    STPane() :
-        VerticalConfigurationGroup(false, false, true, false),
-        transport_setting(new MultiplexSetting()),
-        atsc_format(new ScanATSCChannelFormat()),
-        old_channel_treatment(new ScanOldChannelTreatment()),
-        ignore_signal_timeout(new IgnoreSignalTimeout())
-    {
-        addChild(transport_setting);
-        addChild(atsc_format);
-        addChild(old_channel_treatment);
-        addChild(ignore_signal_timeout);
-    }
-
-    QString GetATSCFormat(void) const { return atsc_format->getValue(); }
-    bool DoDeleteChannels(void) const
-        { return old_channel_treatment->getValue() == "delete"; }
-    bool DoRenameChannels(void) const
-        { return old_channel_treatment->getValue() == "rename"; }
-    int  GetMultiplex(void) const
-        { return transport_setting->getValue().toInt(); }
-    bool ignoreSignalTimeout(void) const
-        { return ignore_signal_timeout->getValue().toInt(); }
-
-    void SetDefaultATSCFormat(const QString &d)
-    {
-        int val = atsc_format->getValueIndex(d);
-        atsc_format->setValue(val);
-    }
-
-    void SetSourceID(uint sourceid)
-        { transport_setting->SetSourceID(sourceid); }
-
-  protected:
-    MultiplexSetting        *transport_setting;
-    ScanATSCChannelFormat   *atsc_format;
-    ScanOldChannelTreatment *old_channel_treatment;
-    IgnoreSignalTimeout     *ignore_signal_timeout;
-};
-
-class DVBUtilsImportPane : public VerticalConfigurationGroup
-{
-    Q_OBJECT
-
-  public:
-    DVBUtilsImportPane() :
-        VerticalConfigurationGroup(false,false,true,false),
-        filename(new TransLineEditSetting()),
-        atsc_format(new ScanATSCChannelFormat()),
-        old_channel_treatment(new ScanOldChannelTreatment()),
-        ignore_signal_timeout(new IgnoreSignalTimeout())
-    {
-        filename->setLabel(tr("File location"));
-        filename->setHelpText(tr("Location of the channels.conf file."));
-        addChild(filename);
-
-        addChild(atsc_format);
-        addChild(old_channel_treatment);
-        addChild(ignore_signal_timeout);
-    }
-
-    QString GetFilename(void)   const { return filename->getValue();    }
-    QString GetATSCFormat(void) const { return atsc_format->getValue(); }
-
-    bool DoDeleteChannels(void) const
-        { return old_channel_treatment->getValue() == "delete"; }
-    bool DoRenameChannels(void) const
-        { return old_channel_treatment->getValue() == "rename"; }
-    bool DoIgnoreSignalTimeout(void) const
-        { return ignore_signal_timeout->getValue().toInt(); }
-
-    void SetDefaultATSCFormat(const QString &d)
-    {
-        int val = atsc_format->getValueIndex(d);
-        atsc_format->setValue(val);
-    }
-
-  private:
-    TransLineEditSetting    *filename;
-    ScanATSCChannelFormat   *atsc_format;
-    ScanOldChannelTreatment *old_channel_treatment;
-    IgnoreSignalTimeout     *ignore_signal_timeout;
-};
-
-class ErrorPane : public HorizontalConfigurationGroup
-{
-  public:
-    ErrorPane(const QString &error) :
-        HorizontalConfigurationGroup(false, false, true, false)
-    {
-        TransLabelSetting* label = new TransLabelSetting();
-        label->setValue(error);
-        addChild(label);
-    }
-};
-
-class BlankSetting: public TransLabelSetting
-{
-  public:
-    BlankSetting() : TransLabelSetting()
-    {
-        setLabel("");
-    }
-};
-
-#endif // SCANWIZARDHELPERS_H

libs/libmythtv/scanwizardscanner.cpp

@@ -1 @@
-/* -*- Mode: c++ -*-
- * vim: set expandtab tabstop=4 shiftwidth=4:
- *
- * Original Project
- *      MythTV      http://www.mythtv.org
- *
- * Copyright (c) 2004, 2005 John Pullan <john@pullan.org>
- * Copyright (c) 2005 - 2007 Daniel Kristjansson
- *
- * Description:
- *     Collection of classes to provide channel scanning functionallity
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-// System headers
-#include <unistd.h>
-
-// Qt headers
-#include <QApplication>
-#include <QEvent>
-
-// MythTV headers
-#include "mythcontext.h"
-#include "mythverbose.h"
-#include "scanwizard.h"
-#include "scanwizardhelpers.h"
-#include "scanwizardscanner.h"
-#include "channelbase.h"
-#include "dtvsignalmonitor.h"
-#include "siscan.h"
-#include "dtvconfparser.h"
-
-#ifdef USING_V4L
-#include "v4lchannel.h"
-#include "analogsignalmonitor.h"
-#endif
-
-#ifdef USING_DVB
-#include "dvbchannel.h"
-#include "dvbsignalmonitor.h"
-#endif
-
-#ifdef USING_HDHOMERUN
-#include "hdhrchannel.h"
-#include "hdhrsignalmonitor.h"
-#endif
-
-#ifdef USING_IPTV
-#include "iptvchannelfetcher.h"
-#endif
-
-#define LOC QString("SWizScan: ")
-#define LOC_ERR QString("SWizScan, Error: ")
-
-/// Percentage to set to after the transports have been scanned
-#define TRANSPORT_PCT 6
-/// Percentage to set to after the first tune
-#define TUNED_PCT     3
-
-QString ScanWizardScanner::kTitle = QString::null;
-
-// kTitel must be initialized after the Qt translation system is initialized...
-static void init_statics(void)
-{
-    static QMutex lock;
-    static bool do_init = true;
-    QMutexLocker locker(&lock);
-    if (do_init)
-    {
-        ScanWizardScanner::kTitle = ScanWizardScanner::tr("Scanning");
-        do_init = false;
-    }
-}
-
-ScanWizardScanner::ScanWizardScanner(void)
-    : VerticalConfigurationGroup(false, true, false, false),
-      log(new LogList()), channel(NULL), popupProgress(NULL),
-      scanner(NULL), freeboxScanner(NULL), nVideoSource(0)
-{
-    init_statics();
-
-    setLabel(kTitle);
-    addChild(log);
-}
-
-ScanWizardScanner::~ScanWizardScanner()
-{
-    Teardown();
-
-    QMutexLocker locker(&popupLock);
-    StopPopup();
-}
-
-void ScanWizardScanner::Teardown()
-{
-    // Join the thread and close the channel
-    if (scanner)
-    {
-        scanner->deleteLater();
-        scanner = NULL;
-    }
-
-    if (channel)
-    {
-        delete channel;
-        channel = NULL;
-    }
-
-#ifdef USING_IPTV
-    if (freeboxScanner)
-    {
-        freeboxScanner->Stop();
-        freeboxScanner->deleteLater();
-        freeboxScanner = NULL;
-    }
-#endif
-}
-
-void ScanWizardScanner::customEvent(QEvent *e)
-{
-    ScannerEvent *scanEvent = (ScannerEvent*) e;
-
-    switch (scanEvent->eventType())
-    {
-        case ScannerEvent::ScanComplete:
-        {
-            QMutexLocker locker(&popupLock);
-            if (popupProgress)
-            {
-                popupProgress->SetScanProgress(1.0);
-                popupProgress->accept();
-            }
-        }
-        break;
-
-        case ScannerEvent::ScanShutdown:
-        {
-            if (scanEvent->ScanProgressPopupValue())
-            {
-                ScanProgressPopup *spp = scanEvent->ScanProgressPopupValue();
-                spp->DeleteDialog();
-                spp->deleteLater();
-            }
-
-            Teardown();
-        }
-        break;
-
-        case ScannerEvent::AppendTextToLog:
-        {
-            log->updateText(scanEvent->strValue());
-        }
-        break;
-
-        default:
-            break;
-    }
-
-    QMutexLocker locker(&popupLock);
-    if (!popupProgress)
-        return;
-
-    switch (scanEvent->eventType())
-    {
-        case ScannerEvent::SetStatusText:
-            popupProgress->SetStatusText(scanEvent->strValue());
-            break;
-        case ScannerEvent::SetStatusTitleText:
-            popupProgress->SetStatusTitleText(scanEvent->strValue());
-            break;
-        case ScannerEvent::SetPercentComplete:
-            popupProgress->SetScanProgress(scanEvent->intValue() * 0.01);
-            break;
-        case ScannerEvent::SetStatusSignalLock:
-            popupProgress->SetStatusLock(scanEvent->intValue());
-            break;
-        case ScannerEvent::SetStatusSignalToNoise:
-            popupProgress->SetStatusSignalToNoise(scanEvent->intValue());
-            break;
-        case ScannerEvent::SetStatusSignalStrength:
-            popupProgress->SetStatusSignalStrength(scanEvent->intValue());
-            break;
-        default:
-            break;
-    }
-}
-
-void ScanWizardScanner::scanComplete()
-{
-    ScannerEvent::TYPE se = ScannerEvent::ScanComplete;
-    QApplication::postEvent(this, new ScannerEvent(se));
-}
-
-void ScanWizardScanner::transportScanComplete()
-{
-    scanner->ScanServicesSourceID(nVideoSource);
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetPercentComplete);
-    e->intValue(TRANSPORT_PCT);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::serviceScanPctComplete(int pct)
-{
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetPercentComplete);
-    int tmp = TRANSPORT_PCT + ((100 - TRANSPORT_PCT) * pct)/100;
-    e->intValue(tmp);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::updateText(const QString &str)
-{
-    if (str.isEmpty())
-        return;
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::AppendTextToLog);
-    e->strValue(str);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::updateStatusText(const QString &str)
-{
-    QString msg = tr("Scanning");
-    if (!str.isEmpty())
-        msg = QString("%1 %2").arg(msg).arg(str);
-
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetStatusText);
-    e->strValue(msg);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::StatusSignalLock(const SignalMonitorValue &val)
-{
-    dvbLock(val.GetValue());
-}
-
-void ScanWizardScanner::StatusSignalToNoise(const SignalMonitorValue &val)
-{
-    dvbSNR(val.GetNormalizedValue(0, 65535));
-}
-
-void ScanWizardScanner::StatusSignalStrength(const SignalMonitorValue &val)
-{
-    dvbSignalStrength(val.GetNormalizedValue(0, 65535));
-}
-
-void ScanWizardScanner::dvbLock(int locked)
-{
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetStatusSignalLock);
-    e->intValue(locked);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::dvbSNR(int i)
-{
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetStatusSignalToNoise);
-    e->intValue(i);
-    QApplication::postEvent(this, e);
-}
-
-void ScanWizardScanner::dvbSignalStrength(int i)
-{
-    ScannerEvent* e = new ScannerEvent(ScannerEvent::SetStatusSignalStrength);
-    e->intValue(i);
-    QApplication::postEvent(this, e);
-}
-
-// full scan of existing transports broken
-// existing transport scan broken
-void ScanWizardScanner::Scan(
-    int            scantype,
-    uint           cardid,
-    const QString &inputname,
-    uint           sourceid,
-    bool           do_delete_channels,
-    bool           do_rename_channels,
-    bool           do_ignore_signal_timeout,
-    // stuff needed for particular scans
-    uint           mplexid /* TransportScan */,
-    const QMap<QString,QString> &startChan /* NITAddScan */,
-    const QString &freq_std /* FullScan */,
-    const QString &mod /* FullScan */,
-    const QString &tbl /* FullScan */,
-    const QString &atsc_format /* any ATSC scan */)
-{
-    nVideoSource = sourceid;
-    PreScanCommon(scantype, cardid, inputname,
-                  sourceid, do_ignore_signal_timeout);
-
-    VERBOSE(VB_SIPARSER, LOC + "HandleTuneComplete()");
-
-    if (!scanner)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "HandleTuneComplete(): "
-                "scanner does not exist...");
-        return;
-    }
-
-    scanner->StartScanner();
-    updateStatusText("");
-
-    bool ok = false;
-
-    if (do_delete_channels && (ScanTypeSetting::TransportScan == scantype))
-    {
-        MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("DELETE FROM channel "
-                      "WHERE sourceid = :SOURCEID AND "
-                      "      mplexid  = :MPLEXID");
-        query.bindValue(":SOURCEID", sourceid);
-        query.bindValue(":MPLEXID",  mplexid);
-        query.exec();
-    }
-    else if (do_delete_channels)
-    {
-        MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("DELETE FROM channel "
-                      "WHERE sourceid = :SOURCEID");
-        query.bindValue(":SOURCEID", sourceid);
-        query.exec();
-
-        if (ScanTypeSetting::TransportScan != scantype)
-        {
-            query.prepare("DELETE FROM dtv_multiplex "
-                          "WHERE sourceid = :SOURCEID");
-            query.bindValue(":SOURCEID", sourceid);
-            query.exec();
-        }
-    }
-
-    scanner->SetChannelFormat(atsc_format);
-    scanner->SetRenameChannels(do_rename_channels);
-
-    if ((ScanTypeSetting::FullScan_ATSC   == scantype) ||
-        (ScanTypeSetting::FullScan_OFDM   == scantype) ||
-        (ScanTypeSetting::FullScan_Analog == scantype))
-    {
-        VERBOSE(VB_SIPARSER, LOC +
-                "ScanTransports("<<freq_std<<", "<<mod<<", "<<tbl<<")");
-
-        // HACK HACK HACK -- begin
-        // if using QAM we may need additional time... (at least with HD-3000)
-        if ((mod.left(3).toLower() == "qam") &&
-            (scanner->GetSignalTimeout() < 1000))
-        {
-            scanner->SetSignalTimeout(1000);
-        }
-        // HACK HACK HACK -- end
-
-        scanner->SetAnalog(ScanTypeSetting::FullScan_Analog == scantype);
-
-        ok = scanner->ScanTransports(sourceid, freq_std, mod, tbl);
-    }
-    else if ((ScanTypeSetting::NITAddScan_OFDM == scantype) ||
-             (ScanTypeSetting::NITAddScan_QPSK == scantype) ||
-             (ScanTypeSetting::NITAddScan_QAM  == scantype))
-    {
-        VERBOSE(VB_SIPARSER, LOC + "ScanTransports()");
-
-        ok = scanner->ScanTransportsStartingOn(sourceid, startChan);
-    }
-    else if (ScanTypeSetting::FullTransportScan == scantype)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "ScanServicesSourceID("<<sourceid<<")");
-
-        ok = scanner->ScanServicesSourceID(sourceid);
-        if (ok)
-        {
-            serviceScanPctComplete(0);
-        }
-        else
-        {
-            MythPopupBox::showOkPopup(gContext->GetMainWindow(),
-                                      tr("ScanWizard"),
-                                      tr("Error tuning to transport"));
-            Teardown();
-        }
-    }
-    else if ((ScanTypeSetting::DVBUtilsImport == scantype) && channels.size())
-    {
-        ok = true;
-
-        VERBOSE(VB_SIPARSER, LOC + "ScanForChannels("<<sourceid<<")");
-
-        QString card_type = CardUtil::GetRawCardType(cardid);
-        QString sub_type  = card_type;
-        if (card_type == "DVB")
-        {
-            QString device = CardUtil::GetVideoDevice(cardid);
-
-            ok = !device.isEmpty();
-            if (ok)
-                sub_type = CardUtil::ProbeDVBType(device).toUpper();
-        }
-
-        if (ok)
-        {
-            ok = scanner->ScanForChannels(sourceid, freq_std,
-                                          sub_type, channels);
-        }
-        if (ok)
-        {
-            serviceScanPctComplete(0);
-        }
-        else
-        {
-            MythPopupBox::showOkPopup(gContext->GetMainWindow(),
-                                      tr("ScanWizard"),
-                                      tr("Error tuning to transport"));
-            Teardown();
-        }
-    }
-    else if (ScanTypeSetting::TransportScan == scantype)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "ScanTransport("<<mplexid<<")");
-
-        ok = scanner->ScanTransport(mplexid);
-    }
-
-    if (!ok)
-    {
-        VERBOSE(VB_IMPORTANT, "Failed to handle tune complete.");
-    }
-}
-
-void ScanWizardScanner::ImportDVBUtils(uint sourceid, int cardtype,
-                                       const QString &file)
-{
-    channels.clear();
-
-    DTVConfParser::cardtype_t type = DTVConfParser::UNKNOWN;
-    type = (CardUtil::OFDM == cardtype) ? DTVConfParser::OFDM : type;
-    type = (CardUtil::QPSK == cardtype) ? DTVConfParser::QPSK : type;
-    type = (CardUtil::QAM  == cardtype) ? DTVConfParser::QAM  : type;
-    type = ((CardUtil::ATSC == cardtype)||(CardUtil::HDHOMERUN == cardtype)) ?
-        DTVConfParser::ATSC : type;
-
-    if (type == DTVConfParser::UNKNOWN)
-        return;
-
-    DTVConfParser parser(type, sourceid, file);
-
-    DTVConfParser::return_t ret = parser.Parse();
-    if (DTVConfParser::OK != ret)
-    {
-        QString msg = (DTVConfParser::ERROR_PARSE == ret) ?
-            tr("Failed to parse '%1'") : tr("Failed to open '%1'");
-
-        MythPopupBox::showOkPopup(gContext->GetMainWindow(),
-                                  tr("ScanWizard"), msg.arg(file));
-    }
-    else
-    {
-        channels = parser.GetChannels();
-    }
-}
-
-void ScanWizardScanner::PreScanCommon(int scantype,
-                                      uint cardid,
-                                      const QString &inputname,
-                                      uint sourceid,
-                                      bool do_ignore_signal_timeout)
-{
-    uint signal_timeout  = 1000;
-    uint channel_timeout = 40000;
-    CardUtil::GetTimeouts(cardid, signal_timeout, channel_timeout);
-
-    QString device = CardUtil::GetVideoDevice(cardid);
-    if (device.isEmpty())
-    {
-        VERBOSE(VB_IMPORTANT, "No Device");
-        return;
-    }
-
-    QString card_type = CardUtil::GetRawCardType(cardid);
-
-    if ("DVB" == card_type)
-    {
-        QString sub_type = CardUtil::ProbeDVBType(device).toUpper();
-        bool need_nit = (("QAM"  == sub_type) ||
-                         ("QPSK" == sub_type) ||
-                         ("OFDM" == sub_type));
-
-        // Ugh, Some DVB drivers don't fully support signal monitoring...
-        if ((ScanTypeSetting::TransportScan     == scantype) ||
-            (ScanTypeSetting::FullTransportScan == scantype))
-        {
-            signal_timeout = (do_ignore_signal_timeout) ?
-                channel_timeout * 10 : signal_timeout;
-        }
-
-        // Since we the NIT is only sent every 10 seconds, we add an
-        // extra 20 + 2 seconds to the scan time for DVB countries.
-        channel_timeout += (need_nit) ? 22 * 1000 : 0;
-    }
-
-#ifdef USING_DVB
-    if ("DVB" == card_type)
-        channel = new DVBChannel(device);
-#endif
-
-#ifdef USING_V4L
-    if (("V4L" == card_type) || ("MPEG" == card_type) ||
-        ("HDPVR" == card_type))
-    {
-        channel = new V4LChannel(NULL, device);
-    }
-#endif
-
-#ifdef USING_HDHOMERUN
-    if ("HDHOMERUN" == card_type)
-    {
-        uint tuner = CardUtil::GetHDHRTuner(cardid);
-        channel = new HDHRChannel(NULL, device, tuner);
-    }
-#endif // USING_HDHOMERUN
-
-    if (!channel)
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "Channel not created");
-        return;
-    }
-
-    // explicitly set the cardid
-    channel->SetCardID(cardid);
-
-    // If the backend is running this may fail...
-    if (!channel->Open())
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "Channel could not be opened");
-        return;
-    }
-
-    scanner = new SIScan(card_type, channel, sourceid, signal_timeout,
-                         channel_timeout, inputname);
-
-    scanner->SetForceUpdate(true);
-
-    bool ftao = CardUtil::IgnoreEncrypted(cardid, inputname);
-    scanner->SetFTAOnly(ftao);
-
-    bool tvo = CardUtil::TVOnly(cardid, inputname);
-    scanner->SetTVOnly(tvo);
-
-    connect(scanner, SIGNAL(ServiceScanComplete(void)),
-            this,    SLOT(  scanComplete(void)));
-    connect(scanner, SIGNAL(TransportScanComplete(void)),
-            this,    SLOT(  transportScanComplete(void)));
-    connect(scanner, SIGNAL(ServiceScanUpdateStatusText(const QString&)),
-            this,    SLOT(  updateStatusText(const QString&)));
-    connect(scanner, SIGNAL(ServiceScanUpdateText(const QString&)),
-            this,    SLOT(  updateText(const QString&)));
-    connect(scanner, SIGNAL(TransportScanUpdateText(const QString&)),
-            this,    SLOT(  updateText(const QString&)));
-    connect(scanner, SIGNAL(PctServiceScanComplete(int)),
-            this,    SLOT(  serviceScanPctComplete(int)));
-
-    // Signal Meters are connected here
-    SignalMonitor *monitor = scanner->GetSignalMonitor();
-    if (monitor)
-        monitor->AddListener(this);
-    
-    DVBSignalMonitor *dvbm = NULL;
-#ifdef USING_DVB
-    dvbm = scanner->GetDVBSignalMonitor();
-#endif // USING_DVB
-
-    MonitorProgress(monitor, monitor, dvbm);
-}
-
-void ScanWizardScanner::ImportM3U(uint cardid, const QString &inputname,
-                                  uint sourceid)
-{
-    (void) cardid;
-    (void) inputname;
-    (void) sourceid;
-
-#ifdef USING_IPTV
-    //Create an analog scan object
-    freeboxScanner = new IPTVChannelFetcher(cardid, inputname, sourceid);
-
-    connect(freeboxScanner, SIGNAL(ServiceScanComplete(void)),
-            this,           SLOT(  scanComplete(void)));
-    connect(freeboxScanner, SIGNAL(ServiceScanUpdateText(const QString&)),
-            this,           SLOT(  updateText(const QString&)));
-    connect(freeboxScanner, SIGNAL(ServiceScanPercentComplete(int)),
-            this,           SLOT(  serviceScanPctComplete(int)));
-
-    MonitorProgress(false, false, false);
-
-    if (!freeboxScanner->Scan())
-    {
-        MythPopupBox::showOkPopup(gContext->GetMainWindow(),
-                                  tr("ScanWizard"),
-                                  tr("Error starting scan"));
-    }
-#endif // USING_IPTV
-}
-
-void *spawn_popup(void *tmp)
-{
-    ((ScanWizardScanner*)(tmp))->RunPopup();
-    return NULL;
-}
-
-void ScanWizardScanner::RunPopup(void)
-{
-    DialogCode ret = popupProgress->exec();
-
-    post_event(this, ScannerEvent::ScanShutdown, ret, popupProgress);
-    popupProgress = NULL;
-}
-
-void ScanWizardScanner::StopPopup(void)
-{
-    if (popupProgress)
-    {
-        popupProgress->reject();
-        popupLock.unlock();
-        pthread_join(popup_thread, NULL);
-        popupLock.lock();
-    }
-}
-
-void ScanWizardScanner::MonitorProgress(bool lock, bool strength, bool snr)
-{
-    QMutexLocker locker(&popupLock);
-    StopPopup();
-    popupProgress = new ScanProgressPopup(lock, strength, snr);
-    popupProgress->CreateDialog();
-    if (pthread_create(&popup_thread, NULL, spawn_popup, this) != 0)
-    {
-        VERBOSE(VB_IMPORTANT, "Failed to start MonitorProgress thread");
-        popupProgress->DeleteDialog();
-        popupProgress->deleteLater();
-        popupProgress = NULL;
-    }
-}

libs/libmythtv/siscan.cpp

@@ -1 @@
-// -*- Mode: c++ -*-
-
-// C includes
-#include <cstdio>
-#include <pthread.h>
-#include <unistd.h>
-
-// Qt includes
-#include <qmutex.h>
-
-// MythTV includes - General
-#include "siscan.h"
-#include "scheduledrecording.h"
-#include "frequencies.h"
-#include "mythdb.h"
-#include "channelutil.h"
-#include "cardutil.h"
-
-// MythTV includes - DTV
-#include "dtvsignalmonitor.h"
-#include "scanstreamdata.h"
-
-// MythTV includes - ATSC
-#include "atsctables.h"
-
-// MythTV includes - DVB
-#include "dvbsignalmonitor.h"
-#include "dvbtables.h"
-
-#include "dvbchannel.h"
-#include "hdhrchannel.h"
-#include "v4lchannel.h"
-#include "compat.h"
-
-QString SIScan::loc(const SIScan *siscan)
-{
-    if (siscan && siscan->channel)
-        return QString("SIScan(%1)").arg(siscan->channel->GetDevice());
-    return "SIScan(u)";
-}
-
-#define LOC     (SIScan::loc(this) + ": ")
-#define LOC_ERR (SIScan::loc(this) + ", Error: ")
-
-/** \class SIScan
- *  \brief Scanning class for cards that support a SignalMonitor class.
- *
- *   Currently both SIParser and ScanStreamData are being used in
- *   this class. The SIParser is being phased out, so that is not
- *   described here.
- *
- *   With ScanStreamData, we call ScanTransport() on each transport
- *   and frequency offset in the list of transports. This list is
- *   created from a FrequencyTable object.
- *
- *   Each ScanTransport() call resets the ScanStreamData and the
- *   SignalMonitor, then tunes to a new frequency and notes the tuning
- *   time in the "timer" QTime object.
- *
- *   HandleActiveScan is called every time through the event loop
- *   and is what calls ScanTransport(), as well as checking when
- *   the current time is "timeoutTune" or "channelTimeout" milliseconds
- *   ahead of "timer". When the "timeoutTune" is exceeded we check
- *   to see if we have a signal lock on the channel, if we don't we
- *   check the next transport. When the larger "channelTimeout" is
- *   exceeded we do nothing unless "waitingForTables" is still true,
- *   if so we check if we at least got a PAT and if so we insert
- *    a channel based on that by calling HandleMPEGDBInsertion().
- *
- *   Meanwhile the ScanStreamData() emits several signals. For
- *   the UI it emits signal quality signals. For SIScan it emits
- *   UpdateMGT, UpdateVCT, UpdateNIT, and UpdateSDT signals. We
- *   connect these to the HandleMGT, HandleVCT, etc. These in
- *   turn just call HandleATSCDBInsertion() or
- *   HandleDVBDBInsertion() depending on the type of table.
- *
- *   HandleATSCDBInsertion() first checks if we have all the VCTs
- *   described in the MGT. If we do we call UpdateVCTinDB() for each
- *   TVCT and CVCT in the stream. UpdateVCTinDB() inserts the actual
- *   channels. Then we set "waitingForTables" to false, set the
- *   scanOffsetIt to 99 and updates the UI to reflect the added channel.
- *   HandleDVBDBInsertion() and HandleMPEGDBInsertion() are similar.
- */
-
-SIScan::SIScan(const QString &_cardtype, ChannelBase *_channel, int _sourceID,
-               uint signal_timeout, uint channel_timeout,
-               const QString &_inputname)
-    : // Set in constructor
-      channel(_channel),
-      signalMonitor(SignalMonitor::Init(_cardtype, -1, _channel)),
-      sourceID(_sourceID),
-      scanMode(IDLE),
-      signalTimeout(signal_timeout),
-      channelTimeout(channel_timeout),
-      inputname(_inputname),
-      // Settable
-      isAnalog(false),
-      ignoreAudioOnlyServices(false),
-      ignoreDataServices(false),
-      ignoreEncryptedServices(false),
-      forceUpdate(false),
-      renameChannels(false),
-      channelFormat("%1_%2"),
-      // State
-      threadExit(false),
-      waitingForTables(false),
-      // Transports List
-      transportsScanned(0),
-      // Misc
-      scanner_thread_running(false)
-{
-    inputname.detach();
-
-    // Initialize statics
-    current = transport_scan_items_it_t( scanTransports.end());
-
-    signalMonitor->AddListener(this);
-
-    // Create a stream data for digital signal monitors
-    DTVSignalMonitor* dtvSigMon = GetDTVSignalMonitor();
-    if (dtvSigMon)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "Connecting up DTVSignalMonitor");
-        ScanStreamData *data = new ScanStreamData();
-
-        dtvSigMon->SetStreamData(data);
-        dtvSigMon->AddFlags(SignalMonitor::kDTVSigMon_WaitForMGT |
-                            SignalMonitor::kDTVSigMon_WaitForVCT |
-                            SignalMonitor::kDTVSigMon_WaitForNIT |
-                            SignalMonitor::kDTVSigMon_WaitForSDT);
-
-        data->AddMPEGListener(this);
-        data->AddATSCMainListener(this);
-        data->AddDVBMainListener(this);
-    }
-}
-
-SIScan::~SIScan(void)
-{
-    // Use deleteLater() instead
-    StopScanner();
-    VERBOSE(VB_SIPARSER, LOC + "SIScanner dtor");
-}
-
-void SIScan::deleteLater(void)
-{
-    disconnect();
-    StopScanner();
-    VERBOSE(VB_SIPARSER, LOC + "SIScanner Stopped");
-    channel = 0; // Deleted by caller
-    teardown_frequency_tables();
-    QObject::deleteLater();
-}
-
-void SIScan::AllGood(void)
-{
-    if (!isAnalog)
-        return;
-
-    QString cur_chan = (*current).FriendlyName;
-    QStringList list = cur_chan.split(" ", QString::SkipEmptyParts);
-    QString freqid = (list.size() >= 2) ? list[1] : cur_chan;
-
-    bool ok = false;
-
-    QString msg = tr("Updated Channel %1").arg(cur_chan);
-
-    if (!ChannelUtil::FindChannel(sourceID, freqid))
-    {
-        int chanid = ChannelUtil::CreateChanID(sourceID, freqid);
-
-        QString callsign = QString("%1%2")
-            .arg(ChannelUtil::GetUnknownCallsign()).arg(freqid);
-
-        ok = ChannelUtil::CreateChannel(
-            0      /* mplexid */,
-            sourceID,
-            chanid,
-            callsign,
-            ""     /* service name       */,
-            freqid /* channum            */,
-            0      /* service id         */,
-            0      /* ATSC major channel */,
-            0      /* ATSC minor channel */,
-            false  /* use on air guide   */,
-            false  /* hidden             */,
-            false  /* hidden in guide    */,
-            freqid);
-
-        msg = (ok) ?
-            tr("Added Channel %1").arg(cur_chan) :
-            tr("Failed to add channel %1").arg(cur_chan);
-    }
-    else
-    {
-        // nothing to do here, XMLTV & DataDirect have better info
-    }
-
-    emit ServiceScanUpdateText(msg);
-
-    // tell UI we are done with these channels
-    if (scanMode == TRANSPORT_LIST)
-    {
-        UpdateScanPercentCompleted();
-        waitingForTables = false;
-        nextIt = current.nextTransport();
-    }
-}
-
-/** \fn SIScan::ScanServicesSourceID(int)
- *  \brief If we are not already scanning a frequency table, this creates
- *         a new frequency table from database and begins scanning it.
- *
- *   This is used by DVB to scan for channels we are told about from other
- *   channels.
- *
- *   Note: Something similar could be used with ATSC when EIT for other
- *   channels is available on another ATSC channel, as encouraged by the
- *   ATSC specification.
- */
-bool SIScan::ScanServicesSourceID(int SourceID)
-{
-    if (scanMode == TRANSPORT_LIST)
-        return false;
-
-    nextIt = transport_scan_items_it_t( scanTransports.end() );
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    // Run DB query to get transports on sourceid SourceID
-    // connected to this card
-    QString theQuery = QString(
-        "SELECT sourceid, mplexid, sistandard, transportid "
-        "FROM dtv_multiplex WHERE sourceid = %1").arg(SourceID);
-    query.prepare(theQuery);
-
-    if (!query.exec() || !query.isActive())
-    {
-        MythDB::DBError("Get Transports for SourceID", query);
-        return false;
-    }
-
-    if (query.size() <= 0)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "Unable to find any transports for " +
-                QString("sourceid %1").arg(sourceID));
-
-        return false;
-    }
-
-    while (query.next())
-    {
-        int sourceid = query.value(0).toInt();
-        int mplexid  = query.value(1).toInt();
-        QString std  = query.value(2).toString();
-        int tsid     = query.value(3).toInt();
-
-        QString fn = (tsid) ? QString("Transport ID %1").arg(tsid) :
-            QString("Multiplex #%1").arg(mplexid);
-
-        VERBOSE(VB_SIPARSER, LOC + "Adding " + fn);
-
-        TransportScanItem item(sourceid, std, fn, mplexid, signalTimeout);
-        scanTransports += item;
-    }
-
-    waitingForTables  = false;
-    transportsScanned = 0;
-    if (scanTransports.size())
-    {
-        nextIt        = transport_scan_items_it_t(scanTransports.begin());
-        scanMode      = TRANSPORT_LIST;
-        return true;
-    }
-
-    return false;
-}
-
-void SIScan::HandlePAT(const ProgramAssociationTable *pat)
-{
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("Got a Program Association Table for %1")
-            .arg((*current).FriendlyName));
-
-    // Add pmts to list, so we can do MPEG scan properly.
-    ScanStreamData *sd = GetDTVSignalMonitor()->GetScanStreamData();
-    for (uint i = 0; i < pat->ProgramCount(); i++)
-    {
-        if (pat->ProgramPID(i)) // don't add NIT "program", MPEG/ATSC safe.
-            sd->AddListeningPID(pat->ProgramPID(i));
-    }
-}
-
-void SIScan::HandleVCT(uint, const VirtualChannelTable*)
-{
-    VERBOSE(VB_SIPARSER, LOC + QString("Got a Virtual Channel Table for %1")
-            .arg((*current).FriendlyName));
-
-    HandleATSCDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
-}
-
-void SIScan::HandleMGT(const MasterGuideTable*)
-{
-    VERBOSE(VB_SIPARSER, LOC + QString("Got the Master Guide for %1")
-            .arg((*current).FriendlyName));
-
-    HandleATSCDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
-}
-
-void SIScan::HandleSDT(uint, const ServiceDescriptionTable* sdt)
-{
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("Got a Service Description Table for %1")
-            .arg((*current).FriendlyName));
-    VERBOSE(VB_SIPARSER, LOC + sdt->toString());
-
-    HandleDVBDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
-}
-
-void SIScan::HandleNIT(const NetworkInformationTable *nit)
-{
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("Got a Network Information Table for %1")
-            .arg((*current).FriendlyName));
-    VERBOSE(VB_SIPARSER, LOC + nit->toString());
-
-    if (nit->TransportStreamCount())
-    {
-        emit TransportScanUpdateText(
-            tr("Network %1 Processing").arg(nit->NetworkName()));
-
-        vector<uint> mp;
-        mp = ChannelUtil::CreateMultiplexes(sourceID, nit);
-        VERBOSE(VB_SIPARSER, QString("Created %1 multiplexes from NIT")
-                .arg(mp.size()));
-
-        // Get channel numbers from UK Frequency List Descriptors
-        for (uint i = 0; i < nit->TransportStreamCount(); i++)
-        {
-            const desc_list_t& list =
-                MPEGDescriptor::Parse(nit->TransportDescriptors(i),
-                                      nit->TransportDescriptorsLength(i));
-
-            const unsigned char* desc =
-                MPEGDescriptor::Find(list, DescriptorID::dvb_uk_channel_list);
-
-            if (desc)
-            {
-                UKChannelListDescriptor uklist(desc);
-                for (uint j = 0; j < uklist.ChannelCount(); j++)
-                    dvbChanNums[uklist.ServiceID(j)] = uklist.ChannelNumber(j);
-            }
-        }
-    }
-
-    const ScanStreamData *sd = GetDTVSignalMonitor()->GetScanStreamData();
-    const DVBStreamData &dsd = *sd;
-    if (dsd.HasAllNITSections())
-    {
-        emit TransportScanUpdateText(tr("Finished processing Transport List"));
-        emit TransportScanComplete();
-    }
-
-    HandleDVBDBInsertion(GetDTVSignalMonitor()->GetScanStreamData(), true);
-}
-
-void SIScan::HandleMPEGDBInsertion(const ScanStreamData *sd, bool)
-{
-    // Try to determine if this might be "OpenCable" transport.
-    QString sistandard = sd->GetSIStandard((*current).tuning.sistandard);
-
-    if (!(*current).mplexid)
-        (*current).mplexid = InsertMultiplex(current);
-
-    if (!(*current).mplexid)
-        return;
-
-    int     mplexid = (*current).mplexid;
-    int     freqid  = (*current).friendlyNum;
-    QString fn      = (*current).FriendlyName;
-
-    pat_vec_t pats = sd->GetCachedPATs();
-    pmt_map_t pmt_map = sd->GetCachedPMTMap();
-    for (uint i = 0; i < pats.size(); i++)
-    {
-        UpdatePATinDB(mplexid, fn, freqid, pats[i], pmt_map,
-                      (*current).expectedChannels, sistandard, true);
-    }
-    sd->ReturnCachedPMTTables(pmt_map);
-    sd->ReturnCachedPATTables(pats);
-
-    // tell UI we are done with these channels
-    if (scanMode == TRANSPORT_LIST)
-    {
-        UpdateScanPercentCompleted();
-        waitingForTables = false;
-        nextIt = current.nextTransport();
-    }
-}
-
-void SIScan::HandleATSCDBInsertion(const ScanStreamData *sd,
-                                   bool wait_until_complete)
-{
-    if (wait_until_complete && !sd->HasCachedAllVCTs())
-        return;
-
-    if (!(*current).mplexid)
-        (*current).mplexid = InsertMultiplex(current);
-
-    if (!(*current).mplexid)
-        return;
-
-    int     mplexid = (*current).mplexid;
-    int     freqid  = (*current).friendlyNum;
-    QString fn      = (*current).FriendlyName;
-
-    // Insert Terrestrial VCTs
-    tvct_vec_t tvcts = sd->GetCachedTVCTs();
-    for (uint i = 0; i < tvcts.size(); i++)
-    {
-        UpdateVCTinDB(mplexid, fn, freqid, tvcts[i],
-                      (*current).expectedChannels, true);
-    }
-    sd->ReturnCachedTVCTTables(tvcts);
-
-    // Insert Cable VCTs
-    cvct_vec_t cvcts = sd->GetCachedCVCTs();
-    for (uint i = 0; i < cvcts.size(); i++)
-    {
-        UpdateVCTinDB(mplexid, fn, freqid, cvcts[i],
-                      (*current).expectedChannels, true);
-    }
-    sd->ReturnCachedCVCTTables(cvcts);
-
-    // tell UI we are done with these channels
-    if (scanMode == TRANSPORT_LIST)
-    {
-        UpdateScanPercentCompleted();
-        waitingForTables = false;
-        nextIt = current.nextTransport();
-    }
-}
-
-void SIScan::HandleDVBDBInsertion(const ScanStreamData *sd,
-                                  bool wait_until_complete)
-{
-    const DVBStreamData &dsd = (const DVBStreamData &)(*sd);
-    if (wait_until_complete && !(dsd.HasCachedSDT() && dsd.HasCachedAllNIT()))
-        return;
-
-    emit ServiceScanUpdateText(tr("Updating Services"));
-
-    if (!(*current).mplexid)
-        (*current).mplexid = InsertMultiplex(current);
-
-    vector<const ServiceDescriptionTable*> sdts = sd->GetCachedSDTs();
-    for (uint i = 0; i < sdts.size(); i++)
-    {
-        UpdateSDTinDB((*current).mplexid, sdts[i],
-                      (*current).expectedChannels, forceUpdate);
-    }
-    sd->ReturnCachedSDTTables(sdts);
-
-    emit ServiceScanUpdateText(tr("Finished processing Services"));
-
-    if (scanMode == TRANSPORT_LIST)
-    {
-        UpdateScanPercentCompleted();
-        waitingForTables = false;
-        nextIt = current.nextTransport();
-    }
-    else
-    {
-        emit PctServiceScanComplete(100);
-        emit ServiceScanComplete();
-    }
-}
-
-/** \fn SIScan::HandlePostInsertion(void)
- *  \brief Insert channels based on any partial tables we do have.
- *  \return true if we saw any tables
- */
-bool SIScan::HandlePostInsertion(void)
-{
-    DTVSignalMonitor* dtvSigMon = GetDTVSignalMonitor();
-    if (!dtvSigMon)
-        return false;
-
-    const ScanStreamData *sd = dtvSigMon->GetScanStreamData();
-
-    VERBOSE(VB_SIPARSER, LOC + "HandlePostInsertion() " +
-            QString("pat(%1)").arg(sd->HasCachedAnyPAT()));
-
-    const MasterGuideTable *mgt = sd->GetCachedMGT();
-    if (mgt)
-    {
-        VERBOSE(VB_IMPORTANT, mgt->toString());
-        HandleATSCDBInsertion(sd, false);
-        sd->ReturnCachedTable(mgt);
-        return true;
-    }
-
-    const NetworkInformationTable *nit = sd->GetCachedNIT(0, true);
-    sdt_vec_t sdts = sd->GetCachedSDTs();
-    if (nit || sdts.size())
-    {
-        if (nit)
-            VERBOSE(VB_IMPORTANT, nit->toString());
-        HandleDVBDBInsertion(sd, false);
-        sd->ReturnCachedSDTTables(sdts);
-        sd->ReturnCachedTable(nit);
-        return true;
-    }
-
-    if (sd->HasCachedAnyPAT())
-    {
-        VERBOSE(VB_IMPORTANT, LOC + "Post insertion found PAT..");
-        HandleMPEGDBInsertion(sd, false);
-        return true;
-    }
-    return false;
-}
-
-DTVSignalMonitor* SIScan::GetDTVSignalMonitor(void)
-{
-    return dynamic_cast<DTVSignalMonitor*>(signalMonitor);
-}
-
-DVBSignalMonitor* SIScan::GetDVBSignalMonitor(void)
-{
-#ifdef USING_DVB
-    return dynamic_cast<DVBSignalMonitor*>(signalMonitor);
-#else
-    return NULL;
-#endif
-}
-
-DTVChannel *SIScan::GetDTVChannel(void)
-{
-    return dynamic_cast<DTVChannel*>(channel);
-}
-
-DVBChannel *SIScan::GetDVBChannel(void)
-{
-#ifdef USING_DVB
-    return dynamic_cast<DVBChannel*>(channel);
-#else
-    return NULL;
-#endif
-}
-
-V4LChannel *SIScan::GetV4LChannel(void)
-{
-#ifdef USING_V4L
-    return dynamic_cast<V4LChannel*>(channel);
-#else
-    return NULL;
-#endif
-}
-
-/** \fn SIScan::SpawnScanner(void*)
- *  \brief Thunk that allows scanner_thread pthread to
- *         call SIScan::RunScanner().
- */
-void *SIScan::SpawnScanner(void *param)
-{
-    SIScan *scanner = (SIScan *)param;
-    scanner->RunScanner();
-    return NULL;
-}
-
-/** \fn SIScan::StartScanner(void)
- *  \brief Starts the SIScan event loop.
- */
-void SIScan::StartScanner(void)
-{
-    pthread_create(&scanner_thread, NULL, SpawnScanner, this);
-}
-
-/** \fn SIScan::RunScanner(void)
- *  \brief This runs the event loop for SIScan until 'threadExit' is true.
- */
-void SIScan::RunScanner(void)
-{
-    VERBOSE(VB_SIPARSER, LOC + "Starting SIScanner");
-
-    scanner_thread_running = true;
-    threadExit = false;
-
-    while (!threadExit)
-    {
-        if (scanMode == TRANSPORT_LIST)
-            HandleActiveScan();
-
-        usleep(250);
-    }
-    scanner_thread_running = false;
-}
-
-// See if we have timed out
-bool SIScan::HasTimedOut(void)
-{
-    if (!waitingForTables)
-        return true;
-
-    // have the tables have timed out?
-    if (timer.elapsed() > (int)channelTimeout)
-    {
-        QString offset_str = current.offset() ?
-            QObject::tr(" offset %2").arg(current.offset()) : "";
-        QString cur_chan = QString("%1%2")
-            .arg((*current).FriendlyName).arg(offset_str);
-        QString time_out_table_str =
-            QObject::tr("Timeout Scanning %1 -- no tables").arg(cur_chan);
-
-        emit ServiceScanUpdateText(time_out_table_str);
-        VERBOSE(VB_SIPARSER, LOC + time_out_table_str);
-
-        return true;
-    }
-
-    // ok the tables haven't timed out, but have we hit the signal timeout?
-    if (timer.elapsed() > (int)(*current).timeoutTune)
-    {
-        // If we don't have a signal in timeoutTune msec, continue..
-        SignalMonitor *sm = GetSignalMonitor();
-        if (NULL == sm || sm->HasSignalLock())
-            return false;
-
-        QString offset_str = current.offset() ?
-            QObject::tr(" offset %2").arg(current.offset()) : "";
-        QString cur_chan = QString("%1%2")
-            .arg((*current).FriendlyName).arg(offset_str);
-        QString time_out_sig_str =
-            QObject::tr("Timeout Scanning %1 -- no signal").arg(cur_chan);
-
-        emit ServiceScanUpdateText(time_out_sig_str);
-        VERBOSE(VB_SIPARSER, LOC + time_out_sig_str);
-
-        return true;
-    }
-    return false;
-}
-
-/** \fn SIScan::HandleActiveScan(void)
- *  \brief Handles the TRANSPORT_LIST SIScan mode.
- */
-void SIScan::HandleActiveScan(void)
-{
-    bool do_post_insertion = waitingForTables;
-
-    if (!HasTimedOut())
-        return;
-
-    if (0 == nextIt.offset() && nextIt != transport_scan_items_it_t(scanTransports.begin()))
-    {
-        // Stop signal monitor for previous transport
-        signalMonitor->Stop();
-
-        if (do_post_insertion)
-            HandlePostInsertion();
-
-        transportsScanned++;
-        UpdateScanPercentCompleted();
-    }
-
-    current = nextIt; // Increment current
-
-    if (current != transport_scan_items_it_t(scanTransports.end()))
-    {
-        ScanTransport(current);
-
-        // Increment nextIt
-        nextIt = current;
-        ++nextIt;
-    }
-    else
-    {
-        emit ServiceScanComplete();
-        scanMode = IDLE;
-        scanTransports.clear();
-        current = nextIt = transport_scan_items_it_t(scanTransports.end());
-    }
-}
-
-bool SIScan::Tune(const transport_scan_items_it_t transport)
-{
-    const TransportScanItem &item = *transport;
-    const uint64_t freq = item.freq_offset(transport.offset());
-
-#ifdef USING_DVB
-    if (GetDVBSignalMonitor() && GetDVBChannel())
-    {
-        if (GetDVBChannel()->GetRotor())
-        {
-            GetDVBSignalMonitor()->AddFlags(SignalMonitor::kDVBSigMon_WaitForPos);
-            GetDVBSignalMonitor()->SetRotorTarget(1.0f);
-        }
-    }
-#endif // USING_DVB
-
-    if (!GetDTVChannel())
-        return false;
-
-    if (item.mplexid > 0)
-        return GetDTVChannel()->TuneMultiplex(item.mplexid, inputname);
-
-    DTVMultiplex tuning = item.tuning;
-    tuning.frequency = freq;
-    return GetDTVChannel()->Tune(tuning, inputname);
-}
-
-void SIScan::ScanTransport(const transport_scan_items_it_t transport)
-{
-    QString offset_str = (transport.offset()) ?
-        QObject::tr(" offset %2").arg(transport.offset()) : "";
-    QString cur_chan = QString("%1%2")
-        .arg((*current).FriendlyName).arg(offset_str);
-    QString tune_msg_str =
-        QObject::tr("Tuning to %1 mplexid(%2)")
-        .arg(cur_chan).arg((*current).mplexid);
-
-    const TransportScanItem &item = *transport;
-
-    if (transport.offset() &&
-        (item.freq_offset(transport.offset()) == item.freq_offset(0)))
-    {
-        waitingForTables = false;
-        return; // nothing to do
-    }
-
-    emit ServiceScanUpdateStatusText(cur_chan);
-    VERBOSE(VB_SIPARSER, LOC + tune_msg_str);
-
-    if (!Tune(transport))
-    {   // If we did not tune successfully, bail with message
-        UpdateScanPercentCompleted();
-        VERBOSE(VB_SIPARSER, LOC +
-                QString("Failed to tune %1 mplexid(%2) at offset %3")
-                .arg(item.FriendlyName).arg(item.mplexid)
-                .arg(transport.offset()));
-        return;
-    }
-
-    // If we have a DTV Signal Monitor, perform table scanner reset
-    if (GetDTVSignalMonitor() && GetDTVSignalMonitor()->GetScanStreamData())
-    {
-        GetDTVSignalMonitor()->GetScanStreamData()->Reset();
-        GetDTVSignalMonitor()->SetChannel(-1,-1);
-    }
-
-    // Start signal monitor for this channel
-    signalMonitor->Start();
-
-    timer.start();
-    waitingForTables = true;
-}
-
-/** \fn SIScan::StopScanner(void)
- *  \brief Stops the SIScan event loop and the signal monitor,
- *         blocking until both exit.
- */
-void SIScan::StopScanner(void)
-{
-    VERBOSE(VB_SIPARSER, LOC + "Stopping SIScanner");
-
-    threadExit = true;
-
-    if (scanner_thread_running)
-        pthread_join(scanner_thread, NULL);
-
-    if (signalMonitor)
-    {
-        signalMonitor->Stop();
-        delete signalMonitor;
-        signalMonitor = NULL;
-    }
-}
-
-/** \fn SIScan::ScanTransports(int,const QString,const QString,const QString)
- *  \brief Generates a list of frequencies to scan and adds it to the
- *   scanTransport list, and then sets the scanMode to TRANSPORT_LIST.
- */
-bool SIScan::ScanTransports(int SourceID,
-                            const QString std,
-                            const QString modulation,
-                            const QString country)
-{
-    QString si_std = (std.toLower() != "atsc") ? "dvb" : "atsc";
-    QString name("");
-    if (scanMode == TRANSPORT_LIST)
-        return false;
-
-    scanTransports.clear();
-    nextIt = transport_scan_items_it_t( scanTransports.end());
-
-    freq_table_list_t tables =
-        get_matching_freq_tables(std, modulation, country);
-
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("Looked up freq table (%1, %2, %3) w/%4 entries")
-            .arg(std).arg(modulation).arg(country).arg(tables.size()));
-
-    freq_table_list_t::iterator it = tables.begin();
-    for (; it != tables.end(); ++it)
-    {
-        const FrequencyTable &ft = **it;
-        int     name_num         = ft.name_offset;
-        QString strNameFormat    = ft.name_format;
-        uint    freq             = ft.frequencyStart;
-        while (freq <= ft.frequencyEnd)
-        {
-            name = strNameFormat;
-            if (strNameFormat.indexOf("%") >= 0)
-                name = strNameFormat.arg(name_num);
-
-            TransportScanItem item(SourceID, si_std, name, name_num,
-                                   freq, ft, signalTimeout);
-            scanTransports += item;
-
-            VERBOSE(VB_SIPARSER, LOC + item.toString());
-
-            name_num++;
-            freq += ft.frequencyStep;
-        }
-        delete *it;
-    }
-    tables.clear();
-
-    timer.start();
-    waitingForTables = false;
-
-    nextIt            = transport_scan_items_it_t( scanTransports.begin() );
-    transportsScanned = 0;
-    scanMode          = TRANSPORT_LIST;
-
-    return true;
-}
-
-bool SIScan::ScanForChannels(uint sourceid,
-                             const QString &std,
-                             const QString &cardtype,
-                             const DTVChannelList &channels)
-{
-    scanTransports.clear();
-    nextIt = transport_scan_items_it_t( scanTransports.end());
-
-    DTVTunerType tunertype;
-    tunertype.Parse(cardtype);
-
-    DTVChannelList::const_iterator it = channels.begin();
-    for (uint i = 0; it != channels.end(); ++it, i++)
-    {
-        DTVTransport tmp = *it;
-        tmp.sistandard = std;
-        TransportScanItem item(sourceid, QString::number(i),
-                               tunertype, tmp, signalTimeout);
-
-        scanTransports += item;
-
-        VERBOSE(VB_SIPARSER, LOC + item.toString());
-    }
-
-    if (scanTransports.empty())
-    {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "ScanForChannels() no transports");
-        return false;
-    }
-
-    timer.start();
-    waitingForTables = false;
-
-    nextIt            = transport_scan_items_it_t( scanTransports.begin());
-    transportsScanned = 0;
-    scanMode          = TRANSPORT_LIST;
-
-    return true;
-}
-
-/** \fn SIScan::ScanTransportsStartingOn(int,const QMap<QString,QString>&)
- *  \brief Generates a list of frequencies to scan and adds it to the
- *   scanTransport list, and then sets the scanMode to TRANSPORT_LIST.
- */
-bool SIScan::ScanTransportsStartingOn(int sourceid,
-                                      const QMap<QString,QString> &startChan)
-{
-    QMap<QString,QString>::const_iterator it;
-
-    if (startChan.find("std")        == startChan.end() ||
-        startChan.find("modulation") == startChan.end())
-    {
-        return false;
-    }
-
-    QString std    = *startChan.find("std");
-    QString mod    = (*(startChan.find("modulation"))).toUpper();
-    QString si_std = (std.toLower() != "atsc") ? "dvb" : "atsc";
-    QString name   = "";
-    bool    ok     = false;
-
-    if (scanMode == TRANSPORT_LIST)
-        return false;
-
-    scanTransports.clear();
-    nextIt = transport_scan_items_it_t( scanTransports.end() );
-
-    DTVMultiplex tuning;
-
-    DTVTunerType type;
-
-    if (std == "dvb")
-    {
-        ok = type.Parse(mod);
-    }
-    else if (std == "atsc")
-    {
-        type = DTVTunerType::kTunerTypeATSC;
-        ok = true;
-    }
-
-    if (ok)
-    {
-        ok = tuning.ParseTuningParams(
-            type,
-            startChan["frequency"],      startChan["inversion"],
-            startChan["symbolrate"],     startChan["fec"],
-            startChan["polarity"],
-            startChan["coderate_hp"],    startChan["coderate_lp"],
-            startChan["constellation"],  startChan["trans_mode"],
-            startChan["guard_interval"], startChan["hierarchy"],
-            startChan["modulation"],     startChan["bandwidth"]);
-    }
-
-    if (ok)
-    {
-        tuning.sistandard = si_std;
-        scanTransports += TransportScanItem(
-            sourceid, tr("Frequency %1").arg(startChan["frequency"]),
-            tuning, signalTimeout);
-    }
-
-    if (!ok)
-        return false;
-
-    timer.start();
-    waitingForTables = false;
-
-    nextIt            = transport_scan_items_it_t(scanTransports.begin());
-    transportsScanned = 0;
-    scanMode          = TRANSPORT_LIST;
-
-    return true;
-}
-
-bool SIScan::ScanTransport(int mplexid)
-{
-    scanTransports.clear();
-    nextIt = transport_scan_items_it_t(scanTransports.end());
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    // Run DB query to get transports on sourceid SourceID
-    // connected to this card
-    QString theQuery = QString(
-        "SELECT sourceid, mplexid, sistandard, transportid "
-        "FROM dtv_multiplex WHERE mplexid = %2").arg(mplexid);
-    query.prepare(theQuery);
-
-    if (!query.exec() || !query.isActive())
-    {
-        MythDB::DBError("Get Transports for SourceID", query);
-        return false;
-    }
-
-    if (query.size() <= 0)
-    {
-        VERBOSE(VB_SIPARSER, LOC + "Unable to find transport to scan.");
-        return false;
-    }
-
-    while (query.next())
-    {
-        int sourceid = query.value(0).toInt();
-        int queriedMplexid  = query.value(1).toInt();
-        QString std  = query.value(2).toString();
-        int tsid     = query.value(3).toInt();
-
-        QString fn = (tsid) ? QString("Transport ID %1").arg(tsid) :
-            QString("Multiplex #%1").arg(queriedMplexid);
-
-        VERBOSE(VB_SIPARSER, LOC + "Adding " + fn);
-
-        TransportScanItem item(
-            sourceid, std, fn, queriedMplexid, signalTimeout);
-        scanTransports += item;
-    }
-
-    timer.start();
-    waitingForTables  = false;
-
-    transportsScanned = 0;
-    if (scanTransports.size())
-    {
-        nextIt        = transport_scan_items_it_t(scanTransports.begin());
-        scanMode      = TRANSPORT_LIST;
-        return true;
-    }
-
-    return false;
-}
-
-/** \fn SIScan::CheckImportedList(const DTVChannelInfoList&,uint,QString&,QString&,QString&)
- *  \brief If we as scanning a dvb-utils import verify channel is in list..
- */
-bool SIScan::CheckImportedList(const DTVChannelInfoList &channels,
-                               uint mpeg_program_num,
-                               QString &service_name,
-                               QString &callsign,
-                               QString &common_status_info)
-{
-    if (channels.empty())
-        return true;
-
-    bool found = false;
-    for (uint i = 0; i < channels.size(); i++)
-    {
-        VERBOSE(VB_IMPORTANT,
-                QString("comparing %1 %2 against %3 %4")
-                .arg(channels[i].serviceid).arg(channels[i].name)
-                .arg(mpeg_program_num).arg(common_status_info));
-
-        if (channels[i].serviceid == mpeg_program_num)
-        {
-            found = true;
-            if (!channels[i].name.isEmpty())
-            {
-                service_name = channels[i].name; service_name.detach();
-                callsign     = channels[i].name; callsign.detach();
-            }
-        }
-    }
-
-    if (found)
-    {
-        common_status_info += QString(" %1 %2")
-            .arg(tr("as")).arg(service_name);
-    }
-    else
-    {
-        emit ServiceScanUpdateText(
-            tr("Skipping %1, not in imported channel map")
-            .arg(common_status_info));
-    }
-
-    return found;
-}
-
-// ///////////////////// DB STUFF /////////////////////
-// ///////////////////// DB STUFF /////////////////////
-// ///////////////////// DB STUFF /////////////////////
-// ///////////////////// DB STUFF /////////////////////
-// ///////////////////// DB STUFF /////////////////////
-
-void SIScan::UpdatePMTinDB(
-    int db_source_id,
-    int db_mplexid, const QString &friendlyName, int freqid,
-    int pmt_indx, const ProgramMapTable *pmt,
-    const DTVChannelInfoList &channels, bool /*force_update*/)
-{
-    VERBOSE(VB_IMPORTANT, LOC + pmt->toString());
-
-    // See if service already in database based on program number
-    int chanid = ChannelUtil::GetChanID(
-        db_mplexid, -1, -1, -1, pmt->ProgramNumber());
-
-    QString chan_num = ChannelUtil::GetChanNum(chanid);
-    if (chan_num.isEmpty() || renameChannels)
-    {
-        chan_num = QString("%1#%2")
-            .arg((freqid) ? freqid : db_mplexid).arg(pmt_indx);
-    }
-
-    QString callsign = ChannelUtil::GetCallsign(chanid);
-    QString service_name = ChannelUtil::GetServiceName(chanid);
-
-    if (callsign.isEmpty())
-    {
-        callsign = QString("%1%2")
-            .arg(ChannelUtil::GetUnknownCallsign())
-            .arg(chan_num);
-    }
-    else if (service_name.isEmpty())
-        service_name = callsign; // only do this for real callsigns
-
-    QString common_status_info = tr("%1%2%3 on %4 (%5)")
-        .arg(service_name)
-        .arg(service_name.isEmpty() ? "" : QString(" %1 ").arg(tr("as")))
-        .arg(chan_num)
-        .arg(friendlyName).arg(freqid);
-
-    if (!CheckImportedList(channels, pmt->ProgramNumber(),
-                           service_name, chan_num, common_status_info))
-    {
-        return;
-    }
-
-    if (chanid < 0)
-    {   // The service is not in database, add it
-        emit ServiceScanUpdateText(
-            tr("Adding %1").arg(common_status_info));
-        chanid = ChannelUtil::CreateChanID(db_source_id, chan_num);
-        ChannelUtil::CreateChannel(
-            db_mplexid, db_source_id, chanid,
-            callsign,
-            service_name,
-            chan_num,
-            pmt->ProgramNumber(),
-            0, 0,
-            false, false, false, QString::number(freqid));
-    }
-    else
-    {   // The service is in database, update it
-        emit ServiceScanUpdateText(
-            tr("Updating %1").arg(common_status_info));
-
-        bool useeit = false;
-        bool hidden = false;
-
-        ChannelUtil::GetChannelSettings(chanid, useeit, hidden);
-
-        ChannelUtil::UpdateChannel(
-            db_mplexid, db_source_id, chanid,
-            callsign,
-            service_name,
-            chan_num,
-            pmt->ProgramNumber(),
-            0, 0,
-            useeit, hidden, false, QString::number(freqid));
-    }
-}
-
-void SIScan::IgnoreDataOnlyMsg(const QString &name, int aux_num)
-{
-    QString vmsg = QString("Ignoring Data Channel: %1").arg(name);
-    if (aux_num > 0)
-        vmsg += QString(" on %1").arg(aux_num);
-    VERBOSE(VB_SIPARSER, vmsg);
-
-    //
-
-    QString tmsg = tr("Skipping %1").arg(name);
-    if (aux_num > 0)
-        tmsg += " " + tr("on %1").arg(aux_num);
-    tmsg += " - " + tr("Data Only Channel (off-air?)");
-    emit ServiceScanUpdateText(tmsg);
-}
-
-void SIScan::IgnoreEmptyChanMsg(const QString &name, int aux_num)
-{
-    QString vmsg = QString("Ignoring Empty Channel: %1").arg(name);
-    if (aux_num > 0)
-        vmsg += QString(" on %1").arg(aux_num);
-    VERBOSE(VB_SIPARSER, vmsg);
-
-    //
-
-    QString tmsg = tr("Skipping %1").arg(name);
-    if (aux_num > 0)
-        tmsg += " " + tr("on %1").arg(aux_num);
-    tmsg += " - " + tr("Empty Channel (off-air?)");
-    emit ServiceScanUpdateText(tmsg);
-}
-
-void SIScan::IgnoreAudioOnlyMsg(const QString &name, int aux_num)
-{
-    QString vmsg = QString("Ignoring Audio Only Channel: %1").arg(name);
-    if (aux_num > 0)
-        vmsg += QString(" on %1").arg(aux_num);
-    VERBOSE(VB_SIPARSER, vmsg);
-
-    //
-
-    QString tmsg = tr("Skipping %1").arg(name);
-    if (aux_num > 0)
-        tmsg += " " + tr("on %1").arg(aux_num);
-    tmsg += " - " + tr("Audio Only Channel");
-    emit ServiceScanUpdateText(tmsg);
-}
-
-void SIScan::IgnoreEncryptedMsg(const QString &name, int aux_num)
-{
-    QString vmsg = QString("Ignoring Encrypted Channel: %1").arg(name);
-    if (aux_num > 0)
-        vmsg += QString(" on %1").arg(aux_num);
-    VERBOSE(VB_SIPARSER, vmsg);
-
-    //
-
-    QString tmsg = tr("Skipping %1").arg(name);
-    if (aux_num > 0)
-        tmsg += " " + tr("on %1").arg(aux_num);
-    tmsg += " - " + tr("Encrypted Channel");
-    emit ServiceScanUpdateText(tmsg);
-}
-
-void SIScan::UpdatePATinDB(
-    int db_mplexid, const QString &friendlyName, int freqid,
-    const ProgramAssociationTable *pat, const pmt_map_t &pmt_map,
-    const DTVChannelInfoList &channels, const QString &si_standard,
-    bool force_update)
-{
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("UpdatePATinDB(): tsid: 0x%1  mplex: %2")
-            .arg(pat->TransportStreamID(),0,16).arg(db_mplexid));
-
-    VERBOSE(VB_IMPORTANT, LOC + pat->toString());
-
-    int db_source_id   = ChannelUtil::GetSourceID(db_mplexid);
-
-    for (uint i = 0; i < pat->ProgramCount(); i++)
-    {
-        pmt_map_t::const_iterator it = pmt_map.find(pat->ProgramNumber(i));
-        if (it == pmt_map.end())
-        {
-            VERBOSE(VB_SIPARSER,
-                   QString("UpdatePATinDB(): PMT for Program #%1 is missing")
-                   .arg(pat->ProgramNumber(i)));
-            continue;
-        }
-        pmt_vec_t::const_iterator vit = (*it).begin();
-        for (; vit != (*it).end(); ++vit)
-        {
-            VERBOSE(VB_SIPARSER,
-                    QString("UpdatePATinDB(): Prog %1 PID %2: PMT @")
-                    .arg(pat->ProgramNumber(i))
-                    .arg(pat->ProgramPID(i)) << *vit);
-
-            // ignore all services without PMT, and
-            // ignore services we have decided to ignore
-            if (!(*vit))
-                continue;
-            else if ((*vit)->StreamCount() <= 0)
-            {
-                IgnoreEmptyChanMsg(friendlyName, pat->ProgramNumber(i));
-                continue;
-            }
-            else if (ignoreAudioOnlyServices &&
-                     (*vit)->IsStillPicture(si_standard))
-            {
-                IgnoreAudioOnlyMsg(friendlyName, pat->ProgramNumber(i));
-                continue;
-            }
-            else if (ignoreEncryptedServices && (*vit)->IsEncrypted())
-            {
-                IgnoreEncryptedMsg(friendlyName, pat->ProgramNumber(i));
-                continue;
-            }
-
-            UpdatePMTinDB(db_source_id, db_mplexid, friendlyName, freqid,
-                          i, *vit, channels, force_update);
-        }
-    }
-}
-
-void SIScan::UpdateVCTinDB(int db_mplexid,
-                           const QString &friendlyName, int freqid,
-                           const VirtualChannelTable *vct,
-                           const DTVChannelInfoList &channels,
-                           bool force_update)
-{
-    (void) force_update;
-
-    VERBOSE(VB_SIPARSER, LOC +
-            QString("UpdateVCTinDB(): tsid: 0x%1  mplex: %2")
-            .arg(vct->TransportStreamID(),0,16).arg(db_mplexid));
-
-    int db_source_id   = ChannelUtil::GetSourceID(db_mplexid);
-
-    for (uint i = 0; i < vct->ChannelCount(); i++)
-    {
-        if (vct->ModulationMode(i) == 0x01 /* NTSC Modulation */ ||
-            vct->ServiceType(i)    == 0x01 /* Analog TV */)
-        {
-            continue;
-        }
-
-        QString basic_status_info = QString("%1 %2-%3")
-            .arg(vct->ShortChannelName(i))
-            .arg(vct->MajorChannel(i)).arg(vct->MinorChannel(i));
-
-        if (vct->ServiceType(i) == 0x04 && ignoreDataServices)
-        {
-            IgnoreEmptyChanMsg(basic_status_info, vct->ProgramNumber(i));
-            continue;
-        }
-
-        if (vct->ServiceType(i) == 0x03 && ignoreAudioOnlyServices)
-        {
-            IgnoreAudioOnlyMsg(basic_status_info, vct->ProgramNumber(i));
-            continue;
-        }
-
-        if (vct->IsAccessControlled(i) && ignoreEncryptedServices)
-        {
-            IgnoreEncryptedMsg(basic_status_info, vct->ProgramNumber(i));
-            continue;
-        }
-
-        // See if service already in database
-        int chanid = ChannelUtil::GetChanID(
-            db_mplexid, vct->ChannelTransportStreamID(i),
-            vct->MajorChannel(i), vct->MinorChannel(i),
-            vct->ProgramNumber(i));
-
-        QString chan_num = ChannelUtil::GetChanNum(chanid);
-        if (chan_num.isEmpty() || renameChannels)
-        {
-            chan_num = channelFormat
-                .arg(vct->MajorChannel(i))
-                .arg(vct->MinorChannel(i));
-        }
-
-        QString callsign = ChannelUtil::GetCallsign(chanid);
-        if (callsign.isEmpty() || renameChannels)
-            callsign = vct->ShortChannelName(i);
-
-        // try to find an extended channel name, fallback to short name.
-        QString longName = vct->GetExtendedChannelName(i);
-        if (longName.isEmpty())
-            longName = vct->ShortChannelName(i);
-
-        QString common_status_info = tr("%1 %2-%3 as %4 on %5 (%6)")
-            .arg(vct->ShortChannelName(i))
-            .arg(vct->MajorChannel(i)).arg(vct->MinorChannel(i))
-            .arg(chan_num).arg(friendlyName).arg(freqid);
-
-        bool use_eit = !vct->IsHidden(i) ||
-            (vct->IsHidden(i) && !vct->IsHiddenInGuide(i));
-
-
-        if (!CheckImportedList(channels, vct->ProgramNumber(i),
-                               longName, callsign, common_status_info))
-        {
-            continue;
-        }
-
-        QString msg = "";
-        if (chanid < 0)
-        {   // The service is not in database, add it
-            msg = tr("Adding %1").arg(common_status_info);
-            chanid = ChannelUtil::CreateChanID(db_source_id, chan_num);
-            if (chanid > 0)
-            {
-                bool use_eit = !vct->IsHidden(i) ||
-                    (vct->IsHidden(i) && !vct->IsHiddenInGuide(i));
-
-                ChannelUtil::CreateChannel(
-                    db_mplexid,
-                    db_source_id,
-                    chanid,
-                    callsign,
-                    longName,
-                    chan_num,
-                    vct->ProgramNumber(i),
-                    vct->MajorChannel(i), vct->MinorChannel(i),
-                    use_eit,
-                    vct->IsHidden(i), vct->IsHiddenInGuide(i),
-                    QString::number(freqid));
-            }
-        }
-        else
-        {   // The service is in database, update it
-            msg = tr("Updating %1").arg(common_status_info);
-            ChannelUtil::UpdateChannel(
-                db_mplexid,
-                db_source_id,
-                chanid,
-                callsign,
-                longName,
-                chan_num,
-                vct->ProgramNumber(i),
-                vct->MajorChannel(i), vct->MinorChannel(i),
-                use_eit,
-                vct->IsHidden(i), vct->IsHiddenInGuide(i),
-                QString::number(freqid));
-        }
-        emit ServiceScanUpdateText(msg);
-        VERBOSE(VB_SIPARSER, msg);
-    }
-}
-
-/**
- *  \brief Inserts channels from service description table.
- */
-void SIScan::UpdateSDTinDB(int /*mplexid*/, const ServiceDescriptionTable *sdt,
-                           const DTVChannelInfoList &channels,
-                           bool force_update)
-{
-    if (!sdt->ServiceCount())
-        return;
-
-    int db_mplexid = ChannelUtil::GetMplexID(
-        sourceID, sdt->TSID(), sdt->OriginalNetworkID());
-
-    // HACK beg -- special exception for this network (dbver == "1067")
-    bool force_guide_present = (sdt->OriginalNetworkID() == 70);
-    // HACK end -- special exception for this network
-
-    if (db_mplexid == -1)
-    {
-        VERBOSE(VB_IMPORTANT, "SDT: Error determing what transport this "
-                "service table is associated with so failing");
-        emit ServiceScanUpdateText(
-            tr("Found channel, but it doesn't match existing tsid. You may "
-               "wish to delete existing channels and do a full scan."));
-        return;
-    }
-
-    int db_source_id = ChannelUtil::GetSourceID(db_mplexid);
-
-    /* This will be fixed post .17 to be more elegant */
-    bool upToDate = (ChannelUtil::GetServiceVersion(db_mplexid) ==
-                     (int)sdt->Version());
-    if (upToDate && !force_update)
-    {
-        emit ServiceScanUpdateText("Channels up to date");
-        return;
-    }
-    if (!upToDate)
-        ChannelUtil::SetServiceVersion(db_mplexid, sdt->Version());
-
-    for (uint i = 0; i < sdt->ServiceCount(); i++)
-    {
-        // Figure out best service name...
-        ServiceDescriptor *desc = sdt->GetServiceDescriptor(i);
-        QString service_name = "";
-        if (desc)
-            service_name = desc->ServiceName();
-
-        if (service_name.trimmed().isEmpty())
-            service_name = QString("%1 %2")
-                .arg(sdt->ServiceID(i)).arg(db_mplexid);
-
-        // Figure out best channel number
-        QString chan_num = QString::number(sdt->ServiceID(i));
-        bool have_uk_chan_num =
-            dvbChanNums.find(sdt->ServiceID(i)) != dvbChanNums.end();
-        if (have_uk_chan_num)
-            chan_num = QString::number(dvbChanNums[sdt->ServiceID(i)]);
-
-        // Skip to next if this is a service we don't care for
-        if (desc && desc->IsDigitalAudio() && ignoreAudioOnlyServices)
-        {
-            IgnoreAudioOnlyMsg(service_name, sdt->ServiceID(i));
-            delete desc;
-            continue;
-        }
-        else if (desc && !desc->IsDTV() && !desc->IsDigitalAudio() &&
-                 ignoreDataServices)
-        {
-            IgnoreDataOnlyMsg(service_name, sdt->ServiceID(i));
-            delete desc;
-            continue;
-        }
-        else if (ignoreEncryptedServices && sdt->IsEncrypted(i))
-        {
-            IgnoreEncryptedMsg(service_name, sdt->ServiceID(i));
-            if (desc)
-                delete desc;
-            continue;
-        }
-
-        // Default authority
-        QString default_authority = "";
-        desc_list_t parsed =
-            MPEGDescriptor::Parse(sdt->ServiceDescriptors(i),
-                                  sdt->ServiceDescriptorsLength(i));
-        const unsigned char *def_auth =
-            MPEGDescriptor::Find(parsed, DescriptorID::default_authority);
-        if (def_auth)
-            default_authority =
-                QString::fromAscii((const char*)def_auth+2, def_auth[1]);
-
-        QString common_status_info = service_name;
-
-        if (!CheckImportedList(channels, sdt->ServiceID(i),
-                               service_name, service_name, common_status_info))
-        {
-            if (desc)
-                delete desc;
-            continue;
-        }
-
-        // See if service already in database based on service ID
-        int chanid = ChannelUtil::GetChanID(db_mplexid, -1, -1, -1,
-                                            sdt->ServiceID(i));
-
-        if (chanid < 0)
-        {   // The service is not in database, add it
-            emit ServiceScanUpdateText(tr("Adding %1").arg(service_name));
-            chanid = ChannelUtil::CreateChanID(db_source_id, chan_num);
-            if (chanid > 0)
-            {
-                ChannelUtil::CreateChannel(
-                    db_mplexid, db_source_id, chanid,
-                    service_name,
-                    service_name,
-                    chan_num,
-                    sdt->ServiceID(i),
-                    0, 0,
-                    sdt->HasEITSchedule(i) ||
-                    sdt->HasEITPresentFollowing(i) ||
-                    force_guide_present,
-                    false, false, QString::null,
-                    QString::null, "Default", QString::null,
-                    default_authority);
-            }
-        }
-        else if (force_update || (desc && have_uk_chan_num))
-        {   // The service is in database & we have good info, update it
-            emit ServiceScanUpdateText(tr("Updating %1").arg(service_name));
-
-            bool useeit = false;
-            bool hidden = false;
-
-            ChannelUtil::GetChannelSettings(chanid, useeit, hidden);
-
-            if (!renameChannels)
-                chan_num = ChannelUtil::GetChanNum(chanid);
-            else
-                useeit = (sdt->HasEITSchedule(i) ||
-                            sdt->HasEITPresentFollowing(i) ||
-                            force_guide_present);
-
-            ChannelUtil::UpdateChannel(
-                db_mplexid,
-                db_source_id,
-                chanid,
-                service_name,
-                service_name,
-                chan_num,
-                sdt->ServiceID(i),
-                0, 0,
-                useeit,
-                hidden, false, QString::null,
-                QString::null, QString::null, QString::null,
-                default_authority);
-        }
-        else
-        {
-            emit ServiceScanUpdateText(
-                tr("Skipping %1 - already in DB, and "
-                   "we don't have better data.")
-                .arg(service_name));
-        }
-
-        if (desc)
-            delete desc;
-    }
-}
-
-// FindBestMplexFreq()
-//  - Examines the freq in the DB against the curent tuning frequency and
-//    it's offset frequencies. If the frequency in the DB is any of the
-//    tuning frequencies or offsets then use the DB frequency.
-uint64_t SIScan::FindBestMplexFreq(
-    const uint64_t tuning_freq,
-    const transport_scan_items_it_t transport, const uint sourceid,
-    const uint transportid, const uint networkid)
-{
-    uint64_t    db_freq;
-    QString     tmp_modulation;
-    QString     tmp_si_std;
-    uint        tmp_transportid, tmp_networkid;
-    int         mplexid;
-
-    if (!transportid || !networkid)
-        return tuning_freq;
-
-    mplexid = ChannelUtil::GetMplexID(sourceid, transportid, networkid);
-    if (mplexid <= 0)
-        return tuning_freq;
-
-    if (!ChannelUtil::GetTuningParams(
-            (uint)mplexid, tmp_modulation,
-            db_freq, tmp_transportid, tmp_networkid, tmp_si_std))
-    {
-        return tuning_freq;
-    }
-
-    for (uint i = 0; i < (*transport).offset_cnt(); i++)
-    {
-        if (db_freq == (*transport).freq_offset(i))
-            return db_freq;
-    }
-
-    return tuning_freq;
-}
-
-uint SIScan::InsertMultiplex(const transport_scan_items_it_t transport)
-{
-    DTVMultiplex tuning = (*transport).tuning;
-    uint tsid  = 0;
-    uint netid = 0;
-
-    tuning.frequency = (*transport).freq_offset(transport.offset());
-
-#ifdef USING_DVB
-    if (GetDVBSignalMonitor())
-    {
-        DVBSignalMonitor *sm = GetDVBSignalMonitor();
-
-        tsid  = sm->GetDetectedTransportID();
-        netid = sm->GetDetectedNetworkID();
-
-        // Try to read the actual values back from the card
-        if (GetDVBChannel()->IsTuningParamsProbeSupported())
-            GetDVBChannel()->ProbeTuningParams(tuning);
-
-        tuning.frequency = FindBestMplexFreq(
-            tuning.frequency, transport, (*transport).SourceID, tsid, netid);
-    }
-#endif // USING_DVB
-
-#ifdef USING_V4L
-    if (GetV4LChannel())
-    {
-        // convert to visual carrier
-        tuning.frequency = tuning.frequency - 1750000;
-    }
-#endif // USING_V4L
-
-    return ChannelUtil::CreateMultiplex(
-        (*transport).SourceID, tuning, tsid, netid);
-}

libs/libmythtv/scanwizard.h

@@ -38 +38 @@
 #include "settings.h"
 
 class ScanWizardConfig;
-class ScanWizardScanner;
+class ChannelScannerGUI;
 
 class MPUBLIC ScanWizard : public QObject, public ConfigurationWizard
 {
@@ -62 +62 @@
     uint               lastHWCardID;
     uint               lastHWCardType;
     ScanWizardConfig  *configPane;
-    ScanWizardScanner *scannerPane;
+    ChannelScannerGUI *scannerPane;
 };
 
 #endif // SCANWIZARD_H

libs/libmythtv/frequencytables.h

@@ -76 +76 @@
           constellation(_constellation),   trans_mode(_trans_mode),
           guard_interval(_guard_interval), hierarchy(_hierarchy) { ; }
 
+    FrequencyTable(uint64_t                _frequencyStart,
+                   uint64_t                _frequencyEnd,
+                   uint                    _frequencyStep,
+                   QString                 _name_format,
+                   int                     _name_offset,
+                   DTVCodeRate             _fec_inner,
+                   DTVModulation           _modulation,
+                   uint                    _symbol_rate,
+                   int                     _offset1,
+                   int                     _offset2)
+        : name_format(_name_format),       name_offset(_name_offset),
+          frequencyStart(_frequencyStart), frequencyEnd(_frequencyEnd),
+          frequencyStep(_frequencyStep),   modulation(_modulation),
+          offset1(_offset1),               offset2(_offset2),
+          symbol_rate(_symbol_rate),       fec_inner(_fec_inner) { ; }
+
     virtual ~FrequencyTable() { ; }
 
     // Common Stuff
@@ -93 +109 @@
     DTVBandwidth      bandwidth;
     DTVCodeRate       coderate_hp;
     DTVCodeRate       coderate_lp;
-    DTVModulation     constellation; 
+    DTVModulation     constellation;
     DTVTransmitMode   trans_mode;
     DTVGuardInterval  guard_interval;
     DTVHierarchy      hierarchy;
+
+    // DVB-C/DVB-S stuff
+    uint              symbol_rate;
+    DTVCodeRate       fec_inner;
 };
 
 /**

libs/libmythtv/siscan.h

@@ -1 @@
-// -*- Mode: c++ -*-
-
-#ifndef SISCAN_H
-#define SISCAN_H
-
-#include <pthread.h>
-
-// Qt includes
-#include <qobject.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qmutex.h>
-#include <qdatetime.h>
-
-// MythTV includes
-#include "frequencytables.h"
-#include "streamlisteners.h"
-#include "dtvconfparser.h"
-#include "signalmonitorlistener.h"
-
-class MSqlQuery;
-
-class ChannelBase;
-class DTVChannel;
-class V4LChannel;
-class DVBChannel;
-class HDHRChannel;
-
-class SignalMonitor;
-class DTVSignalMonitor;
-class DVBSignalMonitor;
-
-typedef enum
-{
-    IDLE,           ///< Don't do anything
-    TRANSPORT_LIST, ///< Actively scan for channels
-} SCANMODE;
-
-typedef vector<const ProgramMapTable*>  pmt_vec_t;
-typedef QMap<uint, pmt_vec_t>           pmt_map_t;
-
-class SIScan : public QObject,
-               public MPEGStreamListener,
-               public ATSCMainStreamListener,
-               public DVBMainStreamListener,
-               public SignalMonitorListener
-{
-    Q_OBJECT
-  public:
-    SIScan(const QString &_cardtype, ChannelBase* _channel, int _sourceID,
-           uint signal_timeout, uint channel_timeout,
-           const QString &_inputname);
-    ~SIScan();
-
-    void StartScanner(void);
-    void StopScanner(void);
-
-    bool ScanTransports(
-        int src, const QString std, const QString mod, const QString country);
-    bool ScanTransportsStartingOn(
-        int sourceid, const QMap<QString,QString> &valueMap);
-    bool ScanTransport(int mplexid);
-    bool ScanForChannels(
-        uint sourceid, const QString &std, const QString &cardtype,
-        const DTVChannelList&);
-
-    bool ScanServicesSourceID(int SourceID);
-
-    void SetAnalog(bool is_analog)    { isAnalog                = is_analog; }
-    void SetSourceID(int _SourceID)   { sourceID                = _SourceID; }
-    void SetFTAOnly(bool _fFTAOnly)   { ignoreEncryptedServices = _fFTAOnly; }
-    void SetTVOnly(bool _tvOnly)
-        { ignoreAudioOnlyServices = ignoreDataServices = _tvOnly; }
-    void SetForceUpdate(bool _force)  { forceUpdate             = _force;    }
-    void SetRenameChannels(bool _r)   { renameChannels          = _r; }
-    void SetChannelFormat(const QString _fmt) { channelFormat   = _fmt; }
-    void SetSignalTimeout(uint val)    { signalTimeout = val; }
-    void SetChannelTimeout(uint val)   { channelTimeout = val; }
-
-    uint GetSignalTimeout(void)  const { return signalTimeout; }
-    uint GetChannelTimeout(void) const { return channelTimeout; }
-
-    SignalMonitor    *GetSignalMonitor(void) { return signalMonitor; }
-    DTVSignalMonitor *GetDTVSignalMonitor(void);
-    DVBSignalMonitor *GetDVBSignalMonitor(void);
-
-    // MPEG
-    void HandlePAT(const ProgramAssociationTable*);
-    void HandleCAT(const ConditionalAccessTable*) { }
-    void HandlePMT(uint, const ProgramMapTable*) { }
-    void HandleEncryptionStatus(uint /*pnum*/, bool /*encrypted*/) { }
-
-    // ATSC Main
-    void HandleSTT(const SystemTimeTable*) {}
-    void HandleMGT(const MasterGuideTable*);
-    void HandleVCT(uint tsid, const VirtualChannelTable*);
-
-    // DVB Main
-    void HandleNIT(const NetworkInformationTable*);
-    void HandleSDT(uint tsid, const ServiceDescriptionTable*);
-    void HandleTDT(const TimeDateTable*) {}
-
-    // SignalMonitorListener
-    virtual void AllGood(void);
-    virtual void StatusSignalLock(const SignalMonitorValue&) { }
-    virtual void StatusSignalStrength(const SignalMonitorValue&) { }
-
-  public slots:
-    void deleteLater(void);
-
-  signals:
-    // Values from 1-100 of scan completion
-    void PctServiceScanComplete(int pct);
-    void PctTransportScanComplete(int pct);
-    void ServiceScanUpdateStatusText(const QString& status);
-    void ServiceScanUpdateText(const QString& status);
-    void TransportScanUpdateText(const QString& status);
-    void ServiceScanComplete(void);
-    void TransportScanComplete(void);
-
-  private:
-    // some useful gets
-    DTVChannel       *GetDTVChannel(void);
-    V4LChannel       *GetV4LChannel(void);
-    DVBChannel       *GetDVBChannel(void);
-
-    /// \brief Called by SpawnScanner to run scanning thread
-    void RunScanner(void);
-    /// \brief Thunk to call RunScanner from pthread
-    static void *SpawnScanner(void *param);
-
-    bool HasTimedOut(void);
-    void HandleActiveScan(void);
-    bool Tune(const transport_scan_items_it_t transport);
-    uint InsertMultiplex(const transport_scan_items_it_t transport);
-    void ScanTransport(const transport_scan_items_it_t transport);
-
-    /// \brief Updates Transport Scan progress bar
-    inline void UpdateScanPercentCompleted(void);
-
-    bool CheckImportedList(const DTVChannelInfoList&,
-                           uint mpeg_program_num,
-                           QString &service_name,
-                           QString &callsign,
-                           QString &common_status_info);
-
-    void IgnoreDataOnlyMsg( const QString &name, int aux_num);
-    void IgnoreEmptyChanMsg(const QString &name, int aux_num);
-    void IgnoreAudioOnlyMsg(const QString &name, int aux_num);
-    void IgnoreEncryptedMsg(const QString &name, int aux_num);
-
-    void HandleMPEGDBInsertion(const ScanStreamData *sd, bool wait);
-    void UpdatePATinDB(int mplexid, const QString &friendlyName, int freqid,
-                       const ProgramAssociationTable*, const pmt_map_t&,
-                       const DTVChannelInfoList&, const QString &si_standard,
-                       bool force_update);
-
-    void UpdatePMTinDB(int sourceid,
-                       int mplexid, const QString &friendlyName, int freqid,
-                       int pmt_indx, const ProgramMapTable*,
-                       const DTVChannelInfoList&,
-                       bool force_update);
-
-    void HandleATSCDBInsertion(const ScanStreamData *sd, bool wait);
-    void UpdateVCTinDB(int mplexid, const QString &friendlyName, int freqid,
-                       const VirtualChannelTable*,
-                       const DTVChannelInfoList&,
-                       bool force_update);
-
-    void HandleDVBDBInsertion(const ScanStreamData *sd, bool wait);
-    void UpdateSDTinDB(int mplexid,
-                       const ServiceDescriptionTable*,
-                       const DTVChannelInfoList&,
-                       bool force_update);
-
-    bool HandlePostInsertion(void);
-
-    uint64_t FindBestMplexFreq(const uint64_t tuning_freq,
-                               const transport_scan_items_it_t transport,
-                               const uint sourceid, const uint transportid,
-                               const uint networkid);
-
-
-    static QString loc(const SIScan*);
-
-  private:
-    // Set in constructor
-    ChannelBase      *channel;
-    SignalMonitor    *signalMonitor;
-    int               sourceID;
-    SCANMODE          scanMode;
-    uint              signalTimeout;
-    uint              channelTimeout;
-    QString           inputname;
-
-    // Settable
-    bool              isAnalog;
-    bool              ignoreAudioOnlyServices;
-    bool              ignoreDataServices;
-    bool              ignoreEncryptedServices;
-    bool              forceUpdate;
-    bool              renameChannels;
-    QString           channelFormat;
-
-    // State
-    bool              threadExit;
-    bool              waitingForTables;
-    QTime             timer;
-
-    // Transports List
-    int                         transportsScanned;
-    transport_scan_items_t      scanTransports;
-    transport_scan_items_it_t   current;
-    transport_scan_items_it_t   nextIt;
-    QMap<uint, uint>            dvbChanNums;
-
-    /// Scanner thread, runs SIScan::StartScanner()
-    pthread_t        scanner_thread;
-    bool             scanner_thread_running;
-};
-
-inline void SIScan::UpdateScanPercentCompleted(void)
-{
-    int tmp = (transportsScanned * 100) / scanTransports.size();
-    emit PctServiceScanComplete(tmp);
-}
-
-#endif // SISCAN_H

libs/libmythtv/frequencytables.cpp

@@ -92 +92 @@
 
     // setup tuning params
     tuning.frequency  = freq;
-    tuning.sistandard = std;
+    tuning.sistandard = (std.toLower() != "atsc") ? "dvb" : "atsc";
+    tuning.modulation = ft.modulation;
     freq_offsets[1]   = ft.offset1;
     freq_offsets[2]   = ft.offset2;
 
-    if (std == "dvb")
+    if (std == "dvbt")
     {
         tuning.inversion      = ft.inversion;
         tuning.bandwidth      = ft.bandwidth;
         tuning.hp_code_rate   = ft.coderate_hp;
         tuning.lp_code_rate   = ft.coderate_lp;
-        tuning.modulation     = ft.modulation;
         tuning.trans_mode     = ft.trans_mode;
         tuning.guard_interval = ft.guard_interval;
         tuning.hierarchy      = ft.hierarchy;
     }
-    else
+    else if (std == "dvbc" || std == "dvbs")
     {
-        tuning.modulation     = ft.modulation;
+        tuning.symbolrate     = ft.symbol_rate;
+        tuning.fec            = ft.fec_inner;
     }
 
     mplexid = GetMultiplexIdFromDB();
@@ -283 +284 @@
 {
     // United Kingdom
     fmap["dvbt_ofdm_uk0"] = new FrequencyTable(
-        474000000, 850000000, 8000000, "" , 0, DTVInversion::kInversionOff,
+        474000000, 850000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
         DTVTransmitMode::kTransmissionMode2K,
@@ -292 +294 @@
 
     // Finland
     fmap["dvbt_ofdm_fi0"] = new FrequencyTable(
-        474000000, 850000000, 8000000, "", 0, DTVInversion::kInversionOff,
+        474000000, 850000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAM64,
         DTVTransmitMode::kTransmissionModeAuto,
@@ -301 +304 @@
 
     // Sweden
     fmap["dvbt_ofdm_se0"] = new FrequencyTable(
-        474000000, 850000000, 8000000, "", 0, DTVInversion::kInversionOff,
+        474000000, 850000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAM64,
         DTVTransmitMode::kTransmissionModeAuto,
@@ -310 +314 @@
 
     // Australia
     fmap["dvbt_ofdm_au0"] = new FrequencyTable(
-        177500000, 226500000, 7000000, "", 0, DTVInversion::kInversionOff,
+        177500000, 226500000, 7000000, "Channel %1", 6,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth7MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAM64,
-        DTVTransmitMode::kTransmissionMode8K, DTVGuardInterval::kGuardIntervalAuto, DTVHierarchy::kHierarchyNone,
+        DTVTransmitMode::kTransmissionMode8K,
+        DTVGuardInterval::kGuardIntervalAuto, DTVHierarchy::kHierarchyNone,
         DTVModulation::kModulationQAMAuto, 125000, 0); // VHF 6-12
     fmap["dvbt_ofdm_au1"] = new FrequencyTable(
-        529500000, 816500000, 7000000, "", 0, DTVInversion::kInversionOff,
+        529500000, 816500000, 7000000, "Channel %1", 28,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth7MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAM64,
         DTVTransmitMode::kTransmissionMode8K,
@@ -325 +332 @@
 
     // Germany (Deuschland)
     fmap["dvbt_ofdm_de0"] = new FrequencyTable(
-        177500000, 226500000, 7000000, "", 0, DTVInversion::kInversionOff,
+        177500000, 226500000, 7000000, "Channel %1", 6,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth7MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
         DTVTransmitMode::kTransmissionMode8K,
         DTVGuardInterval::kGuardIntervalAuto, DTVHierarchy::kHierarchyNone,
-        DTVModulation::kModulationQAMAuto, 125000, 0); // VHF 6-12
+        DTVModulation::kModulationQAMAuto, 0, 0); // VHF 6-12
     fmap["dvbt_ofdm_de1"] = new FrequencyTable(
-        474000000, 826000000, 8000000, "", 0, DTVInversion::kInversionOff,
+        474000000, 826000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
         DTVTransmitMode::kTransmissionModeAuto,
         DTVGuardInterval::kGuardIntervalAuto, DTVHierarchy::kHierarchyNone,
-        DTVModulation::kModulationQAMAuto, 125000, 0); // UHF 21-65
+        DTVModulation::kModulationQAMAuto, 0, 0); // UHF 21-65
 
     // Spain
     fmap["dvbt_ofdm_es0"] = new FrequencyTable(
-        474000000, 858000000, 8000000, "", 0, DTVInversion::kInversionOff,
+        474000000, 858000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
         DTVTransmitMode::kTransmissionModeAuto,
@@ -350 +360 @@
 
     // New Zealand
     fmap["dvbt_ofdm_nz0"] = new FrequencyTable(
-        474000000, 858000000, 8000000, "", 0, DTVInversion::kInversionOff,
+        474000000, 858000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFEC_3_4,
         DTVCodeRate::kFEC_3_4, DTVModulation::kModulationQAM64,
         DTVTransmitMode::kTransmissionMode8K,
@@ -359 +370 @@
 
     // france
     fmap["dvbt_ofdm_fr0"] = new FrequencyTable(
-        474000000, 850000000, 8000000, "" , 0, DTVInversion::kInversionOff,
+        474000000, 850000000, 8000000, "Channel %1", 21,
+        DTVInversion::kInversionOff,
         DTVBandwidth::kBandwidth8MHz, DTVCodeRate::kFECAuto,
         DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
         DTVTransmitMode::kTransmissionMode8K,
         DTVGuardInterval::kGuardIntervalAuto, DTVHierarchy::kHierarchyNone,
         DTVModulation::kModulationQAMAuto, 167000, -166000);
-    
+
+    // DVB-C Germany
+    fmap["dvbc_qam_de0"] = new FrequencyTable(
+         73000000,  73000000, 8000000, "Channel D%1", 73,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+    fmap["dvbc_qam_de1"] = new FrequencyTable(
+         81000000,  81000000, 8000000, "Channel D%1", 81,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+    fmap["dvbc_qam_de2"] = new FrequencyTable(
+        113000000, 121000000, 8000000, "Channel S0%1", 2,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+    fmap["dvbc_qam_de3"] = new FrequencyTable(
+        306000000, 466000000, 8000000, "Channel S%1", 21,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+    fmap["dvbc_qam_de4"] = new FrequencyTable(
+        474000000, 858000000, 8000000, "Channel %1", 21,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+
+    fmap["dvbc_qam_uk0"] = new FrequencyTable(
+        12324000, 12324000+1, 10, "Channel %1", 1,
+        DTVCodeRate::kFEC_3_4, DTVModulation::kModulationQAMAuto,
+        29500000, 0, 0);
+    fmap["dvbc_qam_uk1"] = new FrequencyTable(
+        459000000, 459000000+1, 10, "Channel %1", 2,
+        DTVCodeRate::kFEC_3_4, DTVModulation::kModulationQAM64,
+        6952000, 0, 0);
+
+    fmap["dvbc_qam_bf0"] = new FrequencyTable(
+        203000000, 795000000, 100000, "BF Channel %1", 1,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+    fmap["dvbc_qam_bf1"] = new FrequencyTable(
+        194750000, 794750000, 100000, "BF Channel %1", 1 + (795000-203000) / 100,
+        DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto,
+        6900000, 0, 0);
+
 //#define DEBUG_DVB_OFFSETS
 #ifdef DEBUG_DVB_OFFSETS
     // UHF 14-69

libs/libmythtv/scanwizard.cpp

@@ -29 +29 @@
  *
  */
 
-#include "scanwizardhelpers.h"
-#include "scanwizardscanner.h"
+#include "scanwizardconfig.h"
+#include "channelscanner_gui.h"
 #include "scanwizard.h"
 #include "sourceutil.h"
 #include "cardutil.h"
 #include "videosource.h"
+#include "scaninfo.h"
+#include "channelimporter.h"
 #include "mythverbose.h"
 
 #define LOC QString("SWiz: ")
@@ -47 +49 @@
     lastHWCardType(CardUtil::ERROR_PROBE),
     configPane(new ScanWizardConfig(
                    this, default_sourceid, default_cardid, default_inputname)),
-    scannerPane(new ScanWizardScanner())
+    scannerPane(new ChannelScannerGUI())
 {
     addChild(configPane);
     addChild(scannerPane);
@@ -66 +68 @@
 
 void ScanWizard::SetPage(const QString &pageTitle)
 {
-    VERBOSE(VB_SIPARSER, QString("SetPage(%1)").arg(pageTitle));
-    if (pageTitle != ScanWizardScanner::kTitle)
+    VERBOSE(VB_CHANSCAN, QString("SetPage(%1)").arg(pageTitle));
+    if (pageTitle != ChannelScannerGUI::kTitle)
         return;
 
     QMap<QString,QString> start_chan;
@@ -79 +81 @@
     int     scantype  = configPane->GetScanType();
     bool    do_scan   = true;
 
-    VERBOSE(VB_SIPARSER, LOC + "SetPage(): " +
+    VERBOSE(VB_CHANSCAN, LOC + "SetPage(): " +
             QString("type(%1) cardid(%2) inputname(%3)")
             .arg(scantype).arg(cardid).arg(inputname));
 
@@ -88 +90 @@
         scannerPane->ImportDVBUtils(sourceid, lastHWCardType,
                                     configPane->GetFilename());
     }
-    else if (scantype == ScanTypeSetting::NITAddScan_OFDM)
+    else if (scantype == ScanTypeSetting::NITAddScan_DVBT)
     {
         start_chan = configPane->GetStartChan();
         parse_type = DTVTunerType::kTunerTypeOFDM;
     }
-    else if (scantype == ScanTypeSetting::NITAddScan_QPSK)
+    else if (scantype == ScanTypeSetting::NITAddScan_DVBS)
     {
         start_chan = configPane->GetStartChan();
         parse_type = DTVTunerType::kTunerTypeQPSK;
     }
-    else if (scantype == ScanTypeSetting::NITAddScan_QAM)
+    else if (scantype == ScanTypeSetting::NITAddScan_DVBC)
     {
         start_chan = configPane->GetStartChan();
         parse_type = DTVTunerType::kTunerTypeQAM;
@@ -111 +113 @@
     else if ((scantype == ScanTypeSetting::FullScan_ATSC)     ||
              (scantype == ScanTypeSetting::FullTransportScan) ||
              (scantype == ScanTypeSetting::TransportScan)     ||
-             (scantype == ScanTypeSetting::FullScan_OFDM)     ||
+             (scantype == ScanTypeSetting::FullScan_DVBT)     ||
              (scantype == ScanTypeSetting::FullScan_Analog))
     {
         ;
     }
+    else if (scantype == ScanTypeSetting::ExistingScanImport)
+    {
+        do_scan = false;
+        uint scanid = configPane->GetScanID();
+        ScanDTVTransportList transports = LoadScan(scanid);
+        ChannelImporter ci(true, true, true, false);
+        ci.Process(transports);
+    }
     else
     {
         do_scan = false;
-        VERBOSE(VB_SIPARSER, LOC_ERR + "SetPage(): " +
+        VERBOSE(VB_CHANSCAN, LOC_ERR + "SetPage(): " +
                 QString("type(%1) src(%2) cardid(%3) not handled")
                 .arg(scantype).arg(sourceid).arg(cardid));
 
@@ -150 +160 @@
 
     if (do_scan)
     {
+        QString table_start, table_end;
+        configPane->GetFrequencyTableRange(table_start, table_end);
+
         scannerPane->Scan(
             configPane->GetScanType(),       configPane->GetCardID(),
             configPane->GetInputName(),      configPane->GetSourceID(),
-            configPane->DoDeleteChannels(),  configPane->DoRenameChannels(),
+            /*configPane->DoDeleteChannels(),configPane->DoRenameChannels(),*/
             configPane->DoIgnoreSignalTimeout(), configPane->GetMultiplex(),
             start_chan,
             configPane->GetFrequencyStandard(), configPane->GetModulation(),
-            configPane->GetFrequencyTable(), configPane->GetATSCFormat());
+            configPane->GetFrequencyTable()/*,configPane->GetATSCFormat()*/,
+            table_start, table_end);
     }
 }
 
@@ -177 +191 @@
         lastHWCardID    = cardid;
         QString subtype = CardUtil::ProbeSubTypeName(cardid);
         lastHWCardType  = CardUtil::toCardType(subtype);
-        configPane->SetDefaultATSCFormat(
-            SourceUtil::GetChannelFormat(configPane->GetSourceID()));
     }
 }

libs/libmythtv/scanwizardscanner.h

@@ -1 @@
-/* -*- Mode: c++ -*-
- * vim: set expandtab tabstop=4 shiftwidth=4:
- *
- * Original Project
- *      MythTV      http://www.mythtv.org
- *
- * Author(s):
- *      John Pullan  (john@pullan.org)
- *
- * Description:
- *     Collection of classes to provide dvb channel scanning
- *     functionallity
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#ifndef _SCANWIZARDSCANNER_H_
-#define _SCANWIZARDSCANNER_H_
-
-// Standard UNIX C headers
-#include <pthread.h>
-
-// Qt headers
-#include <qstring.h>
-#include <QEvent>
-
-// MythTV headers
-#include "settings.h"
-#include "dtvconfparser.h"
-#include "signalmonitorlistener.h"
-
-class ScanWizard;
-class AnalogScan;
-class IPTVChannelFetcher;
-class LogList;
-class SIScan;
-class ScanProgressPopup;
-
-class ChannelBase;
-class V4LChannel;
-class DVBChannel;
-class SignalMonitorValue;
-
-class ScanWizardScanner :
-    public VerticalConfigurationGroup,
-    public DVBSignalMonitorListener
-{
-    Q_OBJECT
-
-    friend void *spawn_popup(void*);
-
-  public:
-    ScanWizardScanner(void);
-    virtual void deleteLater(void)
-        { Teardown(); VerticalConfigurationGroup::deleteLater(); }
-
-    void Scan(int            scantype,
-              uint           cardid,
-              const QString &inputname,
-              uint           sourceid,
-              bool           do_delete_channels,
-              bool           do_rename_channels,
-              bool           do_ignore_signal_timeout,
-              // stuff needed for particular scans
-              uint           mplexid,
-              const QMap<QString,QString> &startChan,
-              const QString &freq_std,
-              const QString &mod,
-              const QString &tbl,
-              const QString &atsc_format);
-
-    void ImportDVBUtils(uint sourceid, int cardtype, const QString &file);
-    void ImportM3U(     uint cardid, const QString &inputname, uint sourceid);
-
-    // SignalMonitorListener
-    virtual void AllGood(void) { }
-    virtual void StatusSignalLock(const SignalMonitorValue&);
-    virtual void StatusSignalStrength(const SignalMonitorValue&);
-
-    // DVBSignalMonitorListener
-    virtual void StatusSignalToNoise(const SignalMonitorValue&);
-    virtual void StatusBitErrorRate(const SignalMonitorValue&) { }
-    virtual void StatusUncorrectedBlocks(const SignalMonitorValue&) { }
-    virtual void StatusRotorPosition(const SignalMonitorValue&) { }
-
-  protected slots:
-    void CancelScan(void) { Teardown(); }
-    void scanComplete(void);
-    void transportScanComplete(void);
-    void updateText(const QString& status);
-    void updateStatusText(const QString& status);
-
-    void serviceScanPctComplete(int pct);
-
-  protected:
-    ~ScanWizardScanner();
-    void Teardown(void);
-
-    void PreScanCommon(int scantype, uint cardid,
-                       const QString &inputname,
-                       uint sourceid, bool do_ignore_signal_timeout);
-
-    void dvbLock(int);
-    void dvbSNR(int);
-    void dvbSignalStrength(int);
-    void customEvent(QEvent *e);
-
-    void MonitorProgress(bool lock, bool strength, bool snr);
-    void RunPopup(void);
-    void StopPopup(void);
-
-  public:
-    static QString kTitle;
-
-  private:
-    LogList           *log;
-    ChannelBase       *channel;
-
-    ScanProgressPopup  *popupProgress;
-    pthread_t           popup_thread;
-    mutable QMutex      popupLock;
-
-    SIScan             *scanner;
-    IPTVChannelFetcher *freeboxScanner;
-
-    uint               nVideoSource;
-
-    // dvb-utils imported channels
-    DTVChannelList channels;
-};
-
-#endif // _SCANWIZARDSCANNER_H_
-

libs/libmythtv/iptv/iptvchannelfetcher.cpp

@@ -15 +15 @@
 #include "cardutil.h"
 #include "channelutil.h"
 #include "iptvchannelfetcher.h"
+#include "scanmonitor.h"
 
 #define LOC QString("IPTVChanFetch: ")
 #define LOC_ERR QString("IPTVChanFetch, Error: ")
@@ -38 +39 @@
 }
 
 IPTVChannelFetcher::IPTVChannelFetcher(
-    uint cardid, const QString &inputname, uint sourceid) :
+    uint cardid, const QString &inputname, uint sourceid,
+    ScanMonitor *monitor) :
+    _scan_monitor(monitor),
     _cardid(cardid),       _inputname(inputname),
     _sourceid(sourceid),
     _chan_cnt(1),          _thread_running(false),
@@ -115 +118 @@
     VERBOSE(VB_CHANNEL, QString("Playlist URL: %1").arg(url));
 
     // Step 2/4 : Download
-    emit ServiceScanPercentComplete(5);
-    emit ServiceScanUpdateText(tr("Downloading Playlist"));
+    if (_scan_monitor)
+    {
+        _scan_monitor->ScanPercentComplete(5);
+        _scan_monitor->ScanAppendTextToLog(QObject::tr("Downloading Playlist"));
+    }
 
     QString playlist = DownloadPlaylist(url, true);
 
@@ -127 +133 @@
     }
 
     // Step 3/4 : Process
-    emit ServiceScanPercentComplete(35);
-    emit ServiceScanUpdateText(tr("Processing Playlist"));
+    if (_scan_monitor)
+    {
+        _scan_monitor->ScanPercentComplete(35);
+        _scan_monitor->ScanAppendTextToLog(QObject::tr("Processing Playlist"));
+    }
 
     const fbox_chan_map_t channels = ParsePlaylist(playlist, this);
 
     // Step 4/4 : Finish up
-    emit ServiceScanUpdateText(tr("Adding Channels"));
+    if (_scan_monitor)
+        _scan_monitor->ScanAppendTextToLog(QObject::tr("Adding Channels"));
     SetTotalNumChannels(channels.size());
     fbox_chan_map_t::const_iterator it = channels.begin();    
     for (uint i = 1; it != channels.end(); ++it, ++i)
@@ -141 +151 @@
         QString channum = it.key();
         QString name    = (*it).m_name;
         QString xmltvid = (*it).m_xmltvid.isEmpty() ? "" : (*it).m_xmltvid;
-        QString msg     = tr("Channel #%1 : %2").arg(channum).arg(name);
+        QString msg = QObject::tr("Channel #%1 : %2").arg(channum).arg(name);
 
         int chanid = ChannelUtil::GetChanID(_sourceid, channum);
         if (chanid <= 0)
         { 
-            emit ServiceScanUpdateText(tr("Adding %1").arg(msg));
+            if (_scan_monitor)
+            {
+                _scan_monitor->ScanAppendTextToLog(
+                    QObject::tr("Adding %1").arg(msg));
+            }
             chanid = ChannelUtil::CreateChanID(_sourceid, channum);
             ChannelUtil::CreateChannel(
                 0, _sourceid, chanid, name, name, channum,
@@ -155 +169 @@
         }
         else
         {
-            emit ServiceScanUpdateText(tr("Updating %1").arg(msg));
+            if (_scan_monitor)
+            {
+                _scan_monitor->ScanAppendTextToLog(
+                    QObject::tr("Updating %1").arg(msg));
+            }
             ChannelUtil::UpdateChannel(
                 0, _sourceid, chanid, name, name, channum,
                 0, 0, 0, false, false, false, QString::null,
@@ -165 +183 @@
         SetNumChannelsInserted(i);
     }
 
-    emit ServiceScanUpdateText(tr("Done"));
-    emit ServiceScanUpdateText("");
-    emit ServiceScanPercentComplete(100);
-    emit ServiceScanComplete();
+    if (_scan_monitor)
+    {
+        _scan_monitor->ScanAppendTextToLog(QObject::tr("Done"));
+        _scan_monitor->ScanAppendTextToLog("");
+        _scan_monitor->ScanPercentComplete(100);
+        _scan_monitor->ScanComplete();
+    }
 
     _thread_running = false;
 }
@@ -177 +198 @@
 {
     uint minval = 35, range = 70 - minval;
     uint pct = minval + (uint) truncf((((float)val) / _chan_cnt) * range);
-    emit ServiceScanPercentComplete(pct);
+    if (_scan_monitor)
+        _scan_monitor->ScanPercentComplete(pct);
 }
 
 void IPTVChannelFetcher::SetNumChannelsInserted(uint val)
 {
     uint minval = 70, range = 100 - minval;
     uint pct = minval + (uint) truncf((((float)val) / _chan_cnt) * range);
-    emit ServiceScanPercentComplete(pct);
+    if (_scan_monitor)
+        _scan_monitor->ScanPercentComplete(pct);
 }
 
 void IPTVChannelFetcher::SetMessage(const QString &status)
 {
-    emit ServiceScanUpdateText(status);
+    if (_scan_monitor)
+        _scan_monitor->ScanAppendTextToLog(status);
 }
 
 QString IPTVChannelFetcher::DownloadPlaylist(const QString &url,
@@ -265 +289 @@
                 QString("Invalid channel list header (%1)").arg(header));
 
         if (fetcher)
-            fetcher->SetMessage(tr("ERROR: M3U channel list is malformed"));
+        {
+            fetcher->SetMessage(
+                QObject::tr("ERROR: M3U channel list is malformed"));
+        }
 
         return chanmap;
     }
@@ -290 +317 @@
         if (!parse_chan_info(rawdata, info, channum, lineNum))
             break;
 
-        QString msg = tr("Encountered malformed channel");
+        QString msg = QObject::tr("Encountered malformed channel");
         if (!channum.isEmpty())
         {
             chanmap[channum] = info;
 
-            msg = tr("Parsing Channel #%1 : %2 : %3")
+            msg = QObject::tr("Parsing Channel #%1 : %2 : %3")
                 .arg(channum).arg(info.m_name).arg(info.m_url);
             VERBOSE(VB_CHANNEL, msg);
 

libs/libmythtv/iptv/iptvchannelfetcher.h

@@ -2 +2 @@
 #define _IPTVCHANNELFETCHER_H_
 
 // Qt headers
-#include <qobject.h>
-#include <qmutex.h>
-#include <qthread.h>
+#include <QObject>
+#include <QMutex>
+#include <QThread>
 
 // MythTV headers
 #include "iptvchannelinfo.h"
 
+class ScanMonitor;
 class IPTVChannelFetcher;
 
 class IPTVChannelFetcherThread : public QThread
@@ -18 +19 @@
     IPTVChannelFetcher *iptvfetcher;
 };
 
-class IPTVChannelFetcher : public QObject
+class IPTVChannelFetcher
 {
-    Q_OBJECT
-
     friend class IPTVChannelFetcherThread;
 
   public:
-    IPTVChannelFetcher(uint cardid, const QString &inputname, uint sourceid);
+    IPTVChannelFetcher(uint cardid, const QString &inputname, uint sourceid,
+                       ScanMonitor *monitor = NULL);
+    ~IPTVChannelFetcher();
 
     bool Scan(void);
     void Stop(void);
@@ -34 +35 @@
     static fbox_chan_map_t ParsePlaylist(
         const QString &rawdata, IPTVChannelFetcher *fetcher = NULL);
 
-  signals:
-    /** \brief Tells listener how far along we are from 0..100%
-     *  \param p percentage completion
-     */
-    void ServiceScanPercentComplete(int p);
-    /// \brief Returns tatus message from the scanner
-    void ServiceScanUpdateText(const QString &status);
-    /// \brief Signals that the scan is complete
-    void ServiceScanComplete(void);
-
-  protected:
-    void RunScan(void);
-
   private:
-    ~IPTVChannelFetcher();
     void SetTotalNumChannels(uint val) { _chan_cnt = (val) ? val : 1; }
     void SetNumChannelsParsed(uint);
     void SetNumChannelsInserted(uint);
     void SetMessage(const QString &status);
 
+  protected:
+    void RunScan(void);
+
   private:
+    ScanMonitor *_scan_monitor;
     uint      _cardid;
     QString   _inputname;
     uint      _sourceid;

libs/libmythtv/scanwizardhelpers.cpp

@@ -1 @@
-/* -*- Mode: c++ -*-
- * $Id$
- * vim: set expandtab tabstop=4 shiftwidth=4:
- *
- * Original Project
- *      MythTV      http://www.mythtv.org
- *
- * Author(s):
- *      John Pullan  (john@pullan.org)
- *
- * Description:
- *     Collection of classes to provide dvb channel scanning
- *     functionallity
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-// Qt headers
-#include <QApplication>
-#include <QLocale>
-
-// MythTV headers
-#include "mythcontext.h"
-#include "mythdb.h"
-#include "mythverbose.h"
-#include "frequencies.h"
-#include "videosource.h"
-#include "cardutil.h"
-#include "sourceutil.h"
-#include "scanwizardhelpers.h"
-#include "scanwizardscanner.h"
-#include "scanwizard.h"
-
-static QString card_types(void)
-{
-    QString cardTypes = "";
-
-#ifdef USING_DVB
-    cardTypes += "'DVB'";
-#endif // USING_DVB
-
-#ifdef USING_V4L
-    if (!cardTypes.isEmpty())
-        cardTypes += ",";
-    cardTypes += "'V4L'";
-# ifdef USING_IVTV
-    cardTypes += ",'MPEG'";
-# endif // USING_IVTV
-# ifdef USING_HDPVR
-    cardTypes += ",'HDPVR'";
-# endif // USING_HDPVR
-#endif // USING_V4L
-
-#ifdef USING_IPTV
-    if (!cardTypes.isEmpty())
-        cardTypes += ",";
-    cardTypes += "'FREEBOX'";
-#endif // USING_IPTV
-
-#ifdef USING_HDHOMERUN
-    if (!cardTypes.isEmpty())
-        cardTypes += ",";
-    cardTypes += "'HDHOMERUN'";
-#endif // USING_HDHOMERUN
-
-    if (cardTypes.isEmpty())
-        cardTypes = "'DUMMY'";
-
-    return QString("(%1)").arg(cardTypes);
-}
-
-ScanProgressPopup::ScanProgressPopup(bool lock, bool strength, bool snr) :
-    ConfigurationPopupDialog(),
-    done(false), ss(NULL), sn(NULL), progressBar(NULL), sl(NULL), sta(NULL)
-{
-    setLabel(tr("Scan Progress"));
-
-    addChild(sta = new TransLabelSetting());
-    sta->setLabel(tr("Status"));
-    sta->setValue(tr("Tuning"));
-
-    if (lock)
-    {
-        addChild(sl = new TransLabelSetting());
-        sl->setValue("                                  "
-                     "                                  ");
-    }
-
-    if (strength)
-    {
-        addChild(ss = new ScanSignalMeter(65535));
-        ss->setLabel(tr("Signal Strength"));
-    }
-
-    if (snr)
-    {
-        addChild(sn = new ScanSignalMeter(65535));
-        sn->setLabel(tr("Signal/Noise"));
-    }
-
-    addChild(progressBar = new ScanSignalMeter(65535));
-    progressBar->setValue(0);
-    progressBar->setLabel(tr("Scan"));
-
-
-    TransButtonSetting *cancel = new TransButtonSetting();
-    cancel->setLabel(tr("Cancel"));
-    addChild(cancel);
-
-    connect(cancel, SIGNAL(pressed(void)),
-            this,   SLOT(  reject(void)));
-
-    //Seem to need to do this as the constructor doesn't seem enough
-    setUseLabel(false);
-    setUseFrame(false);
-}
-
-ScanProgressPopup::~ScanProgressPopup()
-{
-    VERBOSE(VB_SIPARSER, "~ScanProgressPopup()");
-}
-
-void ScanProgressPopup::SetStatusSignalToNoise(int value)
-{
-    if (sn)
-        sn->setValue(value);
-}
-
-void ScanProgressPopup::SetStatusSignalStrength(int value)
-{
-    if (ss)
-        ss->setValue(value);
-}
-
-void ScanProgressPopup::SetStatusLock(int value)
-{
-    if (sl)
-        sl->setValue((value) ? tr("Locked") : tr("No Lock"));
-}
-
-void ScanProgressPopup::SetScanProgress(double value)
-{
-    if (progressBar)
-        progressBar->setValue((uint)(value * 65535));
-}
-
-void ScanProgressPopup::SetStatusText(const QString &value)
-{
-    if (sta)
-        sta->setValue(value);
-}
-
-void ScanProgressPopup::SetStatusTitleText(const QString &value)
-{
-    QString msg = tr("Scan Progress") + QString(" %1").arg(value);
-    setLabel(msg);
-}
-
-void ScanProgressPopup::deleteLater(void)
-{
-    disconnect();
-    if (dialog)
-    {
-        VERBOSE(VB_IMPORTANT, "Programmer Error: "
-                "ScanProgressPopup::DeleteDialog() never called.");
-    }
-    ConfigurationPopupDialog::deleteLater();
-}
-
-void ScanProgressPopup::CreateDialog(void)
-{
-    if (!dialog)
-    {
-        dialog = (ConfigPopupDialogWidget*)
-            dialogWidget(gContext->GetMainWindow(),
-                         "ConfigurationPopupDialog");
-        dialog->ShowPopup(this, SLOT(Done(void)));
-    }
-}
-
-void ScanProgressPopup::DeleteDialog(void)
-{
-    if (dialog)
-    {
-        dialog->deleteLater();
-        dialog = NULL;
-    }
-}
-
-DialogCode ScanProgressPopup::exec(void)
-{
-    if (!dialog)
-    {
-        dialog = (ConfigPopupDialogWidget*)
-            dialogWidget(gContext->GetMainWindow(),
-                         "ConfigurationPopupDialog");
-    }
-
-    dialog->setResult(kDialogCodeRejected);
-
-    done = false;
-
-    // Qt4 requires a QMutex as a parameter...
-    // not sure if this is the best solution.  Mutex Must be locked before wait.
-    QMutex mutex;
-    QMutexLocker locker(&mutex);
-
-    while (!done)
-        wait.wait(&mutex, 100);
-
-    return dialog->result();
-}
-
-void ScanProgressPopup::Done(void)
-{
-    done = true;
-    wait.wakeAll();
-}
-
-void post_event(QObject *dest, ScannerEvent::TYPE type, int val)
-{
-    ScannerEvent *e = new ScannerEvent(type);
-    e->intValue(val);
-    QApplication::postEvent(dest, e);
-}
-
-void post_event(QObject *dest, ScannerEvent::TYPE type, const QString &val)
-{
-    ScannerEvent *e = new ScannerEvent(type);
-    QString tmp = val; tmp.detach();
-    e->strValue(tmp);
-    QApplication::postEvent(dest, e);
-}
-
-void post_event(QObject *dest, ScannerEvent::TYPE type, int val,
-                ScanProgressPopup *spp)
-{
-    ScannerEvent *e = new ScannerEvent(type);
-    e->intValue(val);
-    e->ScanProgressPopupValue(spp);
-    QApplication::postEvent(dest, e);
-}
-
-void MultiplexSetting::Load(void)
-{
-    clearSelections();
-
-    if (!sourceid)
-        return;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-
-    query.prepare(
-        "SELECT mplexid,   networkid,  transportid, "
-        "       frequency, symbolrate, modulation "
-        "FROM dtv_multiplex "
-        "WHERE sourceid = :SOURCEID "
-        "ORDER by frequency, networkid, transportid");
-    query.bindValue(":SOURCEID", sourceid);
-
-    if (!query.exec() || !query.isActive() || query.size() <= 0)
-        return;
-
-    while (query.next())
-    {
-        QString DisplayText;
-        if (query.value(5).toString() == "8vsb")
-        {
-            QString ChannelNumber =
-                QString("Freq %1").arg(query.value(3).toInt());
-            struct CHANLIST* curList = chanlists[0].list;
-            int totalChannels = chanlists[0].count;
-            int findFrequency = (query.value(3).toInt() / 1000) - 1750;
-            for (int x = 0 ; x < totalChannels ; x++)
-            {
-                if ((curList[x].freq <= findFrequency + 200) &&
-                    (curList[x].freq >= findFrequency - 200))
-                {
-                    ChannelNumber = QString("%1").arg(curList[x].name);
-                }
-            }
-            DisplayText = QObject::tr("ATSC Channel %1").arg(ChannelNumber);
-        }
-        else
-        {
-            DisplayText = QString("%1 Hz (%2) (%3) (%4)")
-                .arg(query.value(3).toString())
-                .arg(query.value(4).toString())
-                .arg(query.value(1).toInt())
-                .arg(query.value(2).toInt());
-        }
-        addSelection(DisplayText, query.value(0).toString());
-    }
-}
-
-void MultiplexSetting::SetSourceID(uint _sourceid)
-{
-    sourceid = _sourceid;
-    Load();
-}
-
-InputSelector::InputSelector(
-    uint _default_cardid, const QString &_default_inputname) :
-    ComboBoxSetting(this), sourceid(0), default_cardid(_default_cardid),
-    default_inputname(_default_inputname)
-{
-    default_inputname.detach();
-    setLabel(tr("Input"));
-}
-
-void InputSelector::Load(void)
-{
-    clearSelections();
-
-    if (!sourceid)
-        return;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare(
-        "SELECT capturecard.cardid, cardtype, videodevice, inputname "
-        "FROM capturecard, cardinput, videosource "
-        "WHERE cardinput.sourceid = videosource.sourceid AND "
-        "      hostname           = :HOSTNAME            AND "
-        "      cardinput.sourceid = :SOURCEID            AND "
-        "      cardinput.cardid   = capturecard.cardid");
-
-    query.bindValue(":HOSTNAME", gContext->GetHostName());
-    query.bindValue(":SOURCEID", sourceid);
-
-    if (!query.exec() || !query.isActive())
-    {
-        MythDB::DBError("InputSelector::Load()", query);
-        return;
-    }
-
-    uint which = 0, cnt = 0;
-    for (; query.next(); cnt++)
-    {
-        uint    cardid     = query.value(0).toUInt();
-        QString inputname  = query.value(3).toString();
-
-        QString desc = CardUtil::GetDeviceLabel(
-            cardid, query.value(1).toString(), query.value(2).toString());
-
-        desc += QString(" (%1)").arg(inputname);
-
-        QString key = QString("%1:%2").arg(cardid).arg(inputname);
-
-        addSelection(desc, key);
-
-        which = (default_cardid == cardid) ? cnt : which;
-    }
-
-    if (cnt)
-        setValue(which);
-}
-
-void InputSelector::SetSourceID(const QString &_sourceid)
-{
-    if (sourceid != _sourceid.toUInt())
-    {
-        sourceid = _sourceid.toUInt();
-        Load();
-    }
-}
-
-uint InputSelector::GetCardID(void) const
-{
-    uint    cardid    = 0;
-    QString inputname = QString::null;
-
-    Parse(getValue(), cardid, inputname);
-
-    return cardid;
-}
-
-QString InputSelector::GetInputName(void) const
-{
-    uint    cardid    = 0;
-    QString inputname = QString::null;
-
-    Parse(getValue(), cardid, inputname);
-
-    return inputname;
-}
-
-bool InputSelector::Parse(const QString &cardid_inputname,
-                          uint          &cardid,
-                          QString       &inputname)
-{
-    cardid    = 0;
-    inputname = QString::null;
-
-    int sep0 = cardid_inputname.indexOf(':');
-    if (sep0 < 1)
-        return false;
-
-    cardid    = cardid_inputname.left(sep0).toUInt();
-    inputname = cardid_inputname.mid(sep0 + 1);
-
-    return true;
-}
-
-void ScanTypeSetting::SetInput(const QString &cardids_inputname)
-{
-    uint    cardid    = 0;
-    QString inputname = QString::null;
-    if (!InputSelector::Parse(cardids_inputname, cardid, inputname))
-        return;
-
-    // Only refresh if we really have to. If we do it too often
-    // Then we end up fighting the scan routine when we want to
-    // check the type of dvb card :/
-    if (cardid == hw_cardid)
-        return;
-
-    hw_cardid       = cardid;
-    QString subtype = CardUtil::ProbeSubTypeName(hw_cardid);
-    int nCardType   = CardUtil::toCardType(subtype);
-    clearSelections();
-
-    bool importConf = false;
-
-    switch (nCardType)
-    {
-        case CardUtil::V4L:
-        case CardUtil::MPEG:
-            addSelection(tr("Full Scan"),
-                         QString::number(FullScan_Analog), true);
-            return;
-        case CardUtil::OFDM:
-            addSelection(tr("Full Scan"),
-                         QString::number(FullScan_OFDM), true);
-            addSelection(tr("Full Scan (Tuned)"),
-                         QString::number(NITAddScan_OFDM));
-            importConf = true;
-            break;
-        case CardUtil::QPSK:
-            addSelection(tr("Full Scan (Tuned)"),
-                         QString::number(NITAddScan_QPSK));
-            importConf = true;
-            break;
-        case CardUtil::QAM:
-            addSelection(tr("Full Scan (Tuned)"),
-                         QString::number(NITAddScan_QAM));
-            importConf = true;
-            break;
-        case CardUtil::ATSC:
-            addSelection(tr("Full Scan"),
-                         QString::number(FullScan_ATSC), true);
-            importConf = true;
-            break;
-        case CardUtil::HDHOMERUN:
-            addSelection(tr("Full Scan (ATSC)"),
-                         QString::number(FullScan_ATSC), true);
-            addSelection(tr("Full Scan (DVB)"),
-                         QString::number(FullScan_OFDM), true);
-            addSelection(tr("Full Scan (DVB, tuned)"),
-                         QString::number(NITAddScan_OFDM));
-            importConf = true;
-            break;
-        case CardUtil::FREEBOX:
-            addSelection(tr("M3U Import"),
-                         QString::number(IPTVImport), true);
-            return;
-        case CardUtil::ERROR_PROBE:
-            addSelection(QObject::tr("Failed to probe the card"),
-                         QString::number(Error_Probe), true);
-            return;
-        default:
-            addSelection(QObject::tr("Failed to open the card"),
-                         QString::number(Error_Open), true);
-            return;
-    }
-
-    if (importConf)
-        addSelection(tr("Import channels.conf"),
-                     QString::number(DVBUtilsImport));
-
-    addSelection(tr("Full Scan of Existing Transports"),
-                 QString::number(FullTransportScan));
-    addSelection(tr("Existing Transport Scan"),
-                 QString::number(TransportScan));
-}
-
-ScanCountry::ScanCountry() : ComboBoxSetting(this)
-{
-    Country country = AU;
-    QLocale locale = QLocale::system();
-    QLocale::Country qtcountry = locale.country();
-    if (qtcountry == QLocale::Australia)
-        country = AU;
-    else if (qtcountry == QLocale::Germany)
-        country = DE;
-    else if (qtcountry == QLocale::Finland)
-        country = FI;
-    else if (qtcountry == QLocale::Sweden)
-        country = SE;
-    else if (qtcountry == QLocale::UnitedKingdom)
-        country = UK;
-    else if (qtcountry == QLocale::Spain)
-        country = ES;
-    else if (qtcountry == QLocale::NewZealand)
-        country = NZ;
-    else if (qtcountry == QLocale::France)
-        country = FR;
-
-    setLabel(tr("Country"));
-    addSelection(QObject::tr("Australia"),      "au", country == AU);
-    addSelection(QObject::tr("Finland"),        "fi", country == FI);
-    addSelection(QObject::tr("Sweden"),         "se", country == SE);
-    addSelection(QObject::tr("United Kingdom"), "uk", country == UK);
-    addSelection(QObject::tr("Germany"),        "de", country == DE);
-    addSelection(QObject::tr("Spain"),          "es", country == ES);
-    addSelection(QObject::tr("New Zealand"),    "nz", country == NZ);
-    addSelection(QObject::tr("France"),         "fr", country == FR);
-}
-
-AnalogPane::AnalogPane() :
-    VerticalConfigurationGroup(false, false, true, false),
-    freq_table(new TransFreqTableSelector(0)),
-    old_channel_treatment(new ScanOldChannelTreatment(false))
-{
-    addChild(freq_table);
-    addChild(old_channel_treatment);
-}
-
-void AnalogPane::SetSourceID(uint sourceid)
-{
-    freq_table->SetSourceID(sourceid);
-}
-
-QString AnalogPane::GetFrequencyTable(void) const
-{
-    return freq_table->getValue();
-}
-
-ScanOptionalConfig::ScanOptionalConfig(ScanTypeSetting *_scan_type) :
-    TriggeredConfigurationGroup(false, false, true, true,
-                                false, false, true, true),
-    scanType(_scan_type),
-    country(new ScanCountry()),
-    ignoreSignalTimeoutAll(new IgnoreSignalTimeout()),
-    paneOFDM(new OFDMPane()),     paneQPSK(new QPSKPane()),
-    paneDVBS2(new DVBS2Pane()),   paneATSC(new ATSCPane()),
-    paneQAM(new QAMPane()),       paneAnalog(new AnalogPane()),
-    paneSingle(new STPane()),
-    paneDVBUtilsImport(new DVBUtilsImportPane())
-{
-    setTrigger(scanType);
-
-    // only save settings for the selected pane
-    setSaveAll(false);
-
-    // There need to be two IgnoreSignalTimeout instances
-    // because otherwise Qt will free the one instance twice..
-
-    // There need to be two IgnoreSignalTimeout instances
-    // because otherwise Qt will free the one instance twice..
-    VerticalConfigurationGroup *scanAllTransports =
-        new VerticalConfigurationGroup(false,false,true,true);
-    scanAllTransports->addChild(ignoreSignalTimeoutAll);
-
-    addTarget(QString::number(ScanTypeSetting::Error_Open),
-             new ErrorPane(QObject::tr("Failed to open the card")));
-    addTarget(QString::number(ScanTypeSetting::Error_Probe),
-             new ErrorPane(QObject::tr("Failed to probe the card")));
-    addTarget(QString::number(ScanTypeSetting::NITAddScan_QAM),
-              paneQAM);
-    addTarget(QString::number(ScanTypeSetting::NITAddScan_QPSK),
-              paneQPSK);
-    addTarget(QString::number(ScanTypeSetting::NITAddScan_OFDM),
-              paneOFDM);
-    addTarget(QString::number(ScanTypeSetting::FullScan_ATSC),
-              paneATSC);
-    addTarget(QString::number(ScanTypeSetting::FullScan_OFDM),
-              country);
-    addTarget(QString::number(ScanTypeSetting::FullScan_Analog),
-              paneAnalog);
-    addTarget(QString::number(ScanTypeSetting::TransportScan),
-              paneSingle);
-    addTarget(QString::number(ScanTypeSetting::FullTransportScan),
-              scanAllTransports);
-    addTarget(QString::number(ScanTypeSetting::IPTVImport),
-              new BlankSetting());
-    addTarget(QString::number(ScanTypeSetting::DVBUtilsImport),
-              paneDVBUtilsImport);
-}
-
-void ScanOptionalConfig::triggerChanged(const QString& value)
-{
-    TriggeredConfigurationGroup::triggerChanged(value);
-}
-
-void ScanOptionalConfig::SetSourceID(const QString &sourceid)
-{
-    paneAnalog->SetSourceID(sourceid.toUInt());
-    paneSingle->SetSourceID(sourceid.toUInt());
-}
-
-void ScanOptionalConfig::SetDefaultATSCFormat(const QString &atscFormat)
-{
-    paneATSC->SetDefaultATSCFormat(atscFormat);
-    paneSingle->SetDefaultATSCFormat(atscFormat);
-    paneDVBUtilsImport->SetDefaultATSCFormat(atscFormat);
-}
-
-QString ScanOptionalConfig::GetATSCFormat(const QString &dfl) const
-{
-    int     st =  scanType->getValue().toInt();
-
-    bool    ts0 = (ScanTypeSetting::FullScan_ATSC  == st);
-    QString vl0 = paneATSC->GetATSCFormat();
-
-    bool    ts1 = (ScanTypeSetting::TransportScan  == st);
-    QString vl1 = paneSingle->GetATSCFormat();
-
-    bool    ts2 = (ScanTypeSetting::DVBUtilsImport == st);
-    QString vl2 = paneDVBUtilsImport->GetATSCFormat();
-
-    return (ts0) ? vl0 : ((ts1) ? vl1 : (ts2) ? vl2 : dfl);
-}
-
-QString ScanOptionalConfig::GetFrequencyStandard(void) const
-{
-    int     st =  scanType->getValue().toInt();
-
-    bool    ts0 = (ScanTypeSetting::FullScan_ATSC   == st);
-    bool    ts1 = (ScanTypeSetting::FullScan_Analog == st);
-
-    return (ts0) ? "atsc" : ((ts1) ? "analog" : "dvbt");
-}
-
-QString ScanOptionalConfig::GetModulation(void) const
-{
-    int     st =  scanType->getValue().toInt();
-
-    bool    ts0 = (ScanTypeSetting::FullScan_ATSC == st);
-    QString vl0 = paneATSC->atscModulation();
-
-    bool    ts1 = (ScanTypeSetting::FullScan_OFDM == st);
-    QString vl1 = "ofdm";
-
-    bool    ts2 = (ScanTypeSetting::FullScan_Analog == st);
-    QString vl2 = "analog";
-
-    return (ts0) ? vl0 : ((ts1) ? vl1 : (ts2) ? vl2 : "unknown");
-}
-
-QString ScanOptionalConfig::GetFrequencyTable(void) const
-{
-    int     st =  scanType->getValue().toInt();
-
-    bool    ts0 = (ScanTypeSetting::FullScan_ATSC == st);
-    QString vl0 = paneATSC->atscFreqTable();
-
-    bool    ts1 = (ScanTypeSetting::FullScan_OFDM == st);
-    QString vl1 = country->getValue();
-
-    bool    ts2 = (ScanTypeSetting::FullScan_Analog == st);
-    QString vl2 = paneAnalog->GetFrequencyTable();
-
-    return (ts0) ? vl0 : ((ts1) ? vl1 : (ts2) ? vl2 : "unknown");
-}
-
-bool ScanOptionalConfig::DoIgnoreSignalTimeout(void) const
-{
-    int  st  = scanType->getValue().toInt();
-
-    bool ts0 = (ScanTypeSetting::TransportScan     == st);
-    bool vl0 = paneSingle->ignoreSignalTimeout();
-
-    bool ts1 = (ScanTypeSetting::FullTransportScan == st);
-    bool vl1 = (ignoreSignalTimeoutAll->getValue().toInt());
-
-    bool ts2 = (ScanTypeSetting::DVBUtilsImport    == st);
-    bool vl2 = paneDVBUtilsImport->DoIgnoreSignalTimeout();
-
-    return (ts0) ? vl0 : ((ts1) ? vl1 : (ts2) ? vl2 : false);
-}
-
-bool ScanOptionalConfig::DoDeleteChannels(void) const
-{
-    int  st  = scanType->getValue().toInt();
-
-    bool ts0 = (ScanTypeSetting::FullScan_ATSC  == st);
-    bool vl0 = paneATSC->DoDeleteChannels();
-
-    bool ts1 = (ScanTypeSetting::TransportScan  == st);
-    bool vl1 = paneSingle->DoDeleteChannels();
-
-    bool ts2 = (ScanTypeSetting::DVBUtilsImport == st);
-    bool vl2 = paneDVBUtilsImport->DoDeleteChannels();
-
-    bool ts3 = (ScanTypeSetting::FullScan_Analog == st);
-    bool vl3 = paneAnalog->DoDeleteChannels();
-
-    return (ts0) ? vl0 : (((ts1) ? vl1 : (ts2) ? vl2 : (ts3) ? vl3 : false));
-}
-
-bool ScanOptionalConfig::DoRenameChannels(void) const
-{
-    int  st  = scanType->getValue().toInt();
-
-    bool ts0 = (ScanTypeSetting::FullScan_ATSC  == st);
-    bool vl0 = paneATSC->DoRenameChannels();
-
-    bool ts1 = (ScanTypeSetting::TransportScan  == st);
-    bool vl1 = paneSingle->DoRenameChannels();
-
-    bool ts2 = (ScanTypeSetting::DVBUtilsImport == st);
-    bool vl2 = paneDVBUtilsImport->DoRenameChannels();
-
-    bool ts3 = (ScanTypeSetting::FullScan_Analog == st);
-    bool vl3 = paneAnalog->DoRenameChannels();
-
-    return (ts0) ? vl0 : (((ts1) ? vl1 : (ts2) ? vl2 : (ts3) ? vl3 : false));
-}
-
-QString ScanOptionalConfig::GetFilename(void) const
-{
-    return paneDVBUtilsImport->GetFilename();
-}
-
-uint ScanOptionalConfig::GetMultiplex(void) const
-{
-    int mplexid = paneSingle->GetMultiplex();
-    return (mplexid <= 0) ? 0 : mplexid;
-}
-
-QMap<QString,QString> ScanOptionalConfig::GetStartChan(void) const
-{
-    QMap<QString,QString> startChan;
-
-    int st = scanType->getValue().toInt();
-    if (ScanTypeSetting::NITAddScan_OFDM == st)
-    {
-        const OFDMPane *pane = paneOFDM;
-
-        startChan["std"]            = "dvb";
-        startChan["frequency"]      = pane->frequency();
-        startChan["inversion"]      = pane->inversion();
-        startChan["bandwidth"]      = pane->bandwidth();
-        startChan["modulation"]     = "ofdm";
-        startChan["coderate_hp"]    = pane->coderate_hp();
-        startChan["coderate_lp"]    = pane->coderate_lp();
-        startChan["constellation"]  = pane->constellation();
-        startChan["trans_mode"]     = pane->trans_mode();
-        startChan["guard_interval"] = pane->guard_interval();
-        startChan["hierarchy"]      = pane->hierarchy();
-    }
-    else if (ScanTypeSetting::NITAddScan_QPSK == st)
-    {
-        const QPSKPane *pane = paneQPSK;
-
-        startChan["std"]        = "dvb";
-        startChan["frequency"]  = pane->frequency();
-        startChan["inversion"]  = pane->inversion();
-        startChan["symbolrate"] = pane->symbolrate();
-        startChan["fec"]        = pane->fec();
-        startChan["modulation"] = "qpsk";
-        startChan["polarity"]   = pane->polarity();
-    }
-    else if (ScanTypeSetting::NITAddScan_QAM == st)
-    {
-        const QAMPane *pane = paneQAM;
-
-        startChan["std"]        = "dvb";
-        startChan["frequency"]  = pane->frequency();
-        startChan["inversion"]  = pane->inversion();
-        startChan["symbolrate"] = pane->symbolrate();
-        startChan["fec"]        = pane->fec();
-        startChan["modulation"] = pane->modulation();
-    }
-
-    return startChan;
-}
-
-ScanWizardConfig::ScanWizardConfig(
-    ScanWizard *_parent,
-    uint    default_sourceid,  uint default_cardid,
-    QString default_inputname) :
-    VerticalConfigurationGroup(false, true, false, false),
-    videoSource(new VideoSourceSelector(
-                    default_sourceid, card_types(), false)),
-    input(new InputSelector(default_cardid, default_inputname)),
-    scanType(new ScanTypeSetting()),
-    scanConfig(new ScanOptionalConfig(scanType))
-{
-    setLabel(tr("Scan Configuration"));
-
-    addChild(videoSource);
-    addChild(input);
-    addChild(scanType);
-    addChild(scanConfig);
-
-    connect(videoSource, SIGNAL(valueChanged(const QString&)),
-            scanConfig,  SLOT(  SetSourceID( const QString&)));
-
-    connect(videoSource, SIGNAL(valueChanged(const QString&)),
-            input,       SLOT(  SetSourceID( const QString&)));
-
-    connect(input,       SIGNAL(valueChanged(const QString&)),
-            scanType,    SLOT(  SetInput(    const QString&)));
-
-    connect(input,       SIGNAL(valueChanged(const QString&)),
-            _parent,     SLOT(  SetInput(    const QString&)));
-}
-
-uint ScanWizardConfig::GetSourceID(void) const
-{
-    return videoSource->getValue().toUInt();
-}
-
-QString ScanWizardConfig::GetATSCFormat(void) const
-{
-    QString dfl = SourceUtil::GetChannelFormat(GetSourceID());
-    return scanConfig->GetATSCFormat(dfl);
-}
-
-LogList::LogList() : ListBoxSetting(this), n(0)
-{
-    setSelectionMode(MythListBox::NoSelection);
-}
-
-void LogList::updateText(const QString& status)
-{
-    addSelection(status,QString::number(n));
-    setCurrentItem(n);
-    n++;
-}

programs/mythtv-setup/main.cpp

@@ -20 +20 @@
 #include "mythuihelper.h"
 #include "mythdirs.h"
 
+#include "libmythtv/channelscan/channelscanner_cli.h"
+#include "libmythtv/channelscan/scanwizardconfig.h"
+#include "libmythtv/channelscan/scaninfo.h"
+#include "libmythtv/channelscan/channelimporter.h"
+#include "libmythtv/cardutil.h"
 #include "libmythtv/dbcheck.h"
 #include "libmythtv/videosource.h"
 #include "channeleditor.h"
@@ -108 +113 @@
 {
     QString geometry = QString::null;
     QString display  = QString::null;
-    QString verboseString = QString(" important general");
+    bool    doScan   = false;
+    bool    doScanList = false;
+    bool    doScanSaveOnly = false;
+    bool    scanInteractive = true;
+    uint    scanImport = 0;
+    uint    scanCardId = 0;
+    QString scanTableName = "atsc-vsb8-us";
+    QString scanInputName = "";
+    bool    use_display = true;
 
 #ifdef USING_X11
     // Remember any -display or -geometry argument
@@ -119 +132 @@
             geometry = argv[argpos+1];
         else if (!strcmp(argv[argpos],"-display"))
             display = argv[argpos+1];
+        else if (QString(argv[argpos]).left(6) == "--scan")
+        {
+            use_display = false;
+            print_verbose_messages = 0;
+            verboseString = "";
+        }
     }
 #endif
 
@@ -127 +146 @@
     // of the MythPushButton widgets, and they don't use the themed background.
     QApplication::setDesktopSettingsAware(FALSE);
 #endif
-    QApplication a(argc, argv);
+    QApplication a(argc, argv, use_display);
 
     QMap<QString, QString> settingsOverride;
 
@@ -223 +242 @@
 
             ++argpos;
         }
+        else if (!strcmp(a.argv()[argpos],"--scan-list"))
+        {
+            doScanList = true;
+        }
+        else if (!strcmp(a.argv()[argpos],"--scan-import"))
+        {
+            if (a.argc()-1 > argpos)
+            {
+                QString tmpArg = a.argv()[argpos + 1];
+                scanImport = tmpArg.toUInt();
+                ++argpos;
+            }
+            else
+            {
+                cerr << "Missing scan number for import, please run "
+                     << "--scan-list to list importable scans." << endl;
+                return BACKEND_EXIT_INVALID_CMDLINE;
+            }
+        }
+        else if (!strcmp(a.argv()[argpos],"--scan-save-only"))
+        {
+            doScanSaveOnly = true;
+        }
+        else if (!strcmp(a.argv()[argpos],"--scan-non-interactive"))
+        {
+            scanInteractive = false;
+        }
+        else if (!strcmp(a.argv()[argpos],"--scan"))
+        {
+            if (a.argc()-1 > argpos)
+            {
+                scanTableName = a.argv()[argpos + 1];
+                ++argpos;
+            }
+            if (a.argc()-1 > argpos)
+            {
+                QString tmpArg = a.argv()[argpos + 1];
+                scanCardId = tmpArg.toUInt();
+                ++argpos;
+            }
+            if (a.argc()-1 > argpos)
+            {
+                scanInputName = a.argv()[argpos + 1];
+                ++argpos;
+            }
+            doScan = true;
+        }
         else
         {
             if (!(!strcmp(a.argv()[argpos],"-h") ||
@@ -245 +311 @@
                  << "-v or --verbose debug-level    "
                     "Use '-v help' for level info" << endl
                  << endl;
-            return -1;
+            return BACKEND_EXIT_INVALID_CMDLINE;
         }
     }
 
@@ -258 +324 @@
 
     std::auto_ptr<MythContext> contextScopeDelete(gContext);
 
-    if (!gContext->Init(true))
+    if (!gContext->Init(use_display))
     {
         VERBOSE(VB_IMPORTANT, "Failed to init MythContext, exiting.");
         return GENERIC_EXIT_NO_MYTHCONTEXT;
@@ -293 +359 @@
         return GENERIC_EXIT_DB_ERROR;
     }
 
-    gContext->SetSetting("Theme", "G.A.N.T");
-    GetMythUI()->LoadQtConfig();
+    if (use_display)
+    {
+        gContext->SetSetting("Theme", "G.A.N.T");
+        GetMythUI()->LoadQtConfig();
 
-    QString fileprefix = GetConfDir();
+        QString fileprefix = GetConfDir();
 
-    QDir dir(fileprefix);
-    if (!dir.exists())
-        dir.mkdir(fileprefix);
+        QDir dir(fileprefix);
+        if (!dir.exists())
+            dir.mkdir(fileprefix);
+    }
 
+    if (doScan)
+    {
+        bool okCardID = scanCardId;
+
+        QStringList inputnames = CardUtil::GetInputNames(scanCardId);
+        okCardID &= !inputnames.empty();
+
+        if (scanInputName.isEmpty())
+            scanInputName = CardUtil::GetDefaultInput(scanCardId);
+
+        bool okInputName = inputnames.contains(scanInputName);
+
+        doScan = (okCardID && okInputName);
+
+        if (!okCardID)
+        {
+            cerr << "You must enter a valid cardid to scan." << endl;
+            vector<uint> cardids = CardUtil::GetCardIDs();
+            if (cardids.empty())
+            {
+                cerr << "But no cards have been defined on this host"
+                     << endl;
+                return BACKEND_EXIT_INVALID_CMDLINE;
+            }
+            cerr << "Valid cards: " << endl;
+            for (uint i = 0; i < cardids.size(); i++)
+            {
+                fprintf(stderr, "%5i: %s %s\n",
+                        cardids[i],
+                        CardUtil::GetRawCardType(cardids[i])
+                        .toAscii().constData(),
+                        CardUtil::GetVideoDevice(cardids[i])
+                        .toAscii().constData());
+            }
+            return BACKEND_EXIT_INVALID_CMDLINE;
+        }
+
+        if (!okInputName)
+        {
+            cerr << "You must enter a valid input to scan this card."
+                 << endl;
+            cerr << "Valid inputs: " << endl;
+            for (int i = 0; i < inputnames.size(); i++)
+            {
+                cerr << inputnames[i].toAscii().constData() << endl;
+            }
+            return BACKEND_EXIT_INVALID_CMDLINE;
+        }
+    }
+
+    if (doScan)
+    {
+        int ret = 0;
+        int firstBreak   = scanTableName.indexOf("-");
+        int secondBreak  = scanTableName.lastIndexOf("-");
+        QString freq_std = scanTableName.mid(0, firstBreak).toLower();
+        QString mod      = scanTableName.mid(
+            firstBreak+1, secondBreak-firstBreak-1).toLower();
+        QString tbl      = scanTableName.mid(secondBreak+1).toLower();
+        uint    inputid  = CardUtil::GetInputID(scanCardId, scanInputName);
+        uint    sourceid = ChannelUtil::GetSourceID(inputid);
+        QMap<QString,QString> startChan;
+        {
+            ChannelScannerCLI scanner(doScanSaveOnly, scanInteractive);
+            scanner.Scan(
+                (freq_std=="atsc") ?
+                ScanTypeSetting::FullScan_ATSC :
+                ((freq_std=="dvbt") ?
+                 ScanTypeSetting::FullScan_DVBT :
+                 ScanTypeSetting::FullScan_ATSC),
+                /* cardid    */ scanCardId,
+                /* inputname */ scanInputName,
+                /* sourceid  */ sourceid,
+                false,
+                // stuff needed for particular scans
+                /* mplexid   */ 0,
+                startChan, freq_std, mod, tbl);
+            ret = a.exec();
+        }
+        return (ret) ? GENERIC_EXIT_NOT_OK : BACKEND_EXIT_OK;
+    }
+
+    if (doScanList)
+    {
+        vector<ScanInfo> scans = LoadScanList();
+
+        cout<<" scanid cardid sourceid processed        date"<<endl;
+        for (uint i = 0; i < scans.size(); i++)
+        {
+            printf("%5i %6i %8i %8s    %20s\n",
+                   scans[i].scanid,   scans[i].cardid,
+                   scans[i].sourceid, (scans[i].processed) ? "yes" : "no",
+                   scans[i].scandate.toString().toAscii().constData());
+        }
+        cout<<endl;
+
+        return BACKEND_EXIT_OK;
+    }
+
+    if (scanImport)
+    {
+        cout<<"*** SCAN IMPORT START ***"<<endl;
+        {
+            ScanDTVTransportList list = LoadScan(scanImport);
+            ChannelImporter ci(false, true, true, false);
+            ci.Process(list);
+        }
+        cout<<"*** SCAN IMPORT END ***"<<endl;
+        return BACKEND_EXIT_OK;
+    }
+
     MythMainWindow *mainWindow = GetMythMainWindow();
     mainWindow->Init();
     gContext->SetMainWindow(mainWindow);