Ticket #1861: 1861.patch

libs/libmythtv/dvbrecorder.cpp

@@ -58 +58 @@
 #include "iso639.h"
 #include "atscstreamdata.h"
 #include "cardutil.h"
+#include "tv_rec.h"
 
 // MythTV DVB includes
 #include "dvbtypes.h"

libs/libmythtv/dvbtypes.cpp

@@ -970 +970 @@
 #undef LOC_WARN
 #undef LOC_ERR
 
-bool dvb_channel_t::Parse(
-    fe_type_t type,
-    QString frequency,         QString inversion,      QString symbolrate,
-    QString fec,               QString polarity,       QString dvb_diseqc_type,
-    QString diseqc_port,       QString diseqc_pos,     QString lnb_lof_switch,
-    QString lnb_lof_hi,        QString lnb_lof_lo,     QString _sistandard,
-    QString hp_code_rate,      QString lp_code_rate,   QString constellation,
-    QString trans_mode,        QString guard_interval, QString hierarchy,
-    QString modulation,        QString bandwidth,      QString _input_id)
-{
-    lock.lock();
-        
-    bool ok = false;
-    if (FE_QPSK == type)
-        ok = tuning.parseQPSK(
-            frequency,       inversion,     symbolrate,   fec,   polarity,
-            dvb_diseqc_type, diseqc_port,   diseqc_pos,
-            lnb_lof_switch,  lnb_lof_hi,    lnb_lof_lo);
-    else if (FE_QAM == type)
-        ok = tuning.parseQAM(
-            frequency,       inversion,     symbolrate,   fec,   modulation);
-    else if (FE_OFDM == type)
-        ok = tuning.parseOFDM(
-            frequency,       inversion,     bandwidth,    hp_code_rate,
-            lp_code_rate,    constellation, trans_mode,   guard_interval,
-            hierarchy);
-    else if (FE_ATSC == type)
-        ok = tuning.parseATSC(frequency, modulation);
-#ifdef FE_GET_EXTENDED_INFO
-    else if (FE_DVB_S2 == type)
-        ok = tuning.parseDVBS2(
-            frequency,       inversion,     symbolrate,   fec,   polarity,
-            dvb_diseqc_type, diseqc_port,   diseqc_pos,
-            lnb_lof_switch,  lnb_lof_hi,    lnb_lof_lo, modulation);
-#endif
-        
-    sistandard = _sistandard;
-    input_id   = _input_id.toInt();
-
-    lock.unlock();
-    return ok;
-}
-
 static QString mod2str(fe_modulation mod)
 {
     switch (mod)

libs/libmythtv/scanwizardscanner.cpp

@@ -354 +354 @@
         startChan["hierarchy"]      = pane->hierarchy();
 
 #ifdef USING_DVB
-        dvb_channel_t chan_opts;
-        nit_scan_parse_failed = !chan_opts.tuning.parseOFDM(
+        DVBTuning tuning;
+        nit_scan_parse_failed = !tuning.parseOFDM(
             startChan["frequency"],   startChan["inversion"],
             startChan["bandwidth"],   startChan["coderate_hp"],
             startChan["coderate_lp"], startChan["constellation"],
@@ -380 +380 @@
 #ifdef USING_DVB
         if (!nit_scan_parse_failed)
         {
-            dvb_channel_t chan_opts;
-            nit_scan_parse_failed = !chan_opts.tuning.parseQPSK(
+            DVBTuning tuning;
+            nit_scan_parse_failed = !tuning.parseQPSK(
                 startChan["frequency"],   startChan["inversion"],
                 startChan["symbolrate"],  startChan["fec"],
                 startChan["polarity"],
@@ -403 +403 @@
         startChan["modulation"] = pane->modulation();
 
 #ifdef USING_DVB
-        dvb_channel_t chan_opts;
-        nit_scan_parse_failed = !chan_opts.tuning.parseQAM(
+        DVBTuning tuning;
+        nit_scan_parse_failed = !tuning.parseQAM(
             startChan["frequency"],   startChan["inversion"],
             startChan["symbolrate"],  startChan["fec"],
             startChan["modulation"]);

libs/libmythtv/dvbchannel.h

@@ -17 +17 @@
 #include "channelbase.h"
 #include "streamlisteners.h"
 
-#include "dvbdiseqc.h"
+#ifdef USING_DVB
+#include "dvbtypes.h"
+#else // if !USING_DVB
+typedef int fe_type_t;
+typedef int fe_modulation_t;
+typedef int fe_code_rate_t;
+typedef int DVBTuning;
+typedef struct { QString name; fe_type_t type; } dvb_frontend_info;
+#endif //!USING_DVB
 
 class TVRec;
 class DVBCam;
 class DVBRecorder;
+class DVBDiSEqC;
 
 class DVBChannel : public ChannelBase
 {

libs/libmythtv/dvbtypes.h

@@ -39 +39 @@
 #if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
 #    define USE_ATSC
 #else
-#warning DVB API version < 3.1, ATSC over DVB will not be supported.
+#warning DVB API version < 3.1
+#warning ATSC will not be supported using the Linux DVB drivers
 #    define FE_ATSC       (FE_OFDM+1)
 #    define FE_CAN_8VSB   0x200000
 #    define FE_CAN_16VSB  0x400000
@@ -411 +412 @@
 #endif
 };
 
-class dvb_channel_t
-{
-  public:
-    dvb_channel_t() :
-        pmtpid(0),          pmt(NULL),
-        serviceID(0xffff),  networkID(0xffff),
-        providerID(0xffff), transportID(0xffff),
-        sistandard(""),     version(255) {;}
-   ~dvb_channel_t()
-    {
-        if (pmt)
-            delete pmt;
-    }
-
-    bool IsPMTSet() const
-    {
-        QMutexLocker locker(&lock);
-        return pmt;
-    }
-
-    void SetPMT(uint pid, const ProgramMapTable *_pmt)
-    {
-        QMutexLocker locker(&lock);
-        if (pmt)
-        {
-            pmtpid = 0;
-            delete pmt;
-            pmt = NULL;
-        }
-        if (_pmt)
-        {
-            pmtpid = pid;
-            pmt = new ProgramMapTable(*_pmt);
-        }
-    }
-
-    bool Parse(
-        fe_type_t type,
-        QString frequency,         QString inversion,      QString symbolrate,
-        QString fec,               QString polarity,       QString dvb_diseqc_type,
-        QString diseqc_port,       QString diseqc_pos,     QString lnb_lof_switch,
-        QString lnb_lof_hi,        QString lnb_lof_lo,     QString _sistandard,
-        QString hp_code_rate,      QString lp_code_rate,   QString constellation,
-        QString transmission_mode, QString guard_interval, QString hierarchy,
-        QString modulation,        QString bandwidth,      QString _input_id);
-
-    DVBTuning       tuning;
-
-    uint            pmtpid;
-    ProgramMapTable *pmt;
-    bool            PMTSet;
-
-    uint16_t        serviceID; /// program number in PAT
-    uint16_t        networkID; /// network ID from PAT
-    uint16_t        providerID;
-    uint16_t        transportID;
-
-    QString         sistandard;
-    int             input_id;
-    uint8_t         version;
-  private:
-    mutable QMutex  lock;
-};
-
 #endif // DVB_TYPES_H

libs/libmythtv/eitscanner.h

@@ -16 +16 @@
 class ChannelBase;
 class DVBSIParser;
 class EITHelper;
-class dvb_channel_t;
 class ProgramMapTable;
 
 class EITSource