Ticket #1330: 8psk.diff

libs/libmythtv/dvbtypes.cpp

@@ -156 +156 @@
    {"QAM_128",QAM_128},
    {"QAM_256",QAM_256},
    {"QPSK",QPSK},
+   {"QPSK_8",QPSK_8},
    {NULL,QAM_AUTO},
 };
 
@@ -180 +181 @@
    {"qam_128",QAM_128},
    {"qam_256",QAM_256},
    {"qpsk",QPSK},
+   {"qpsk_8",QPSK_8},
    {"8vsb",VSB_8},
    {"16vsb",VSB_16},
    {NULL,QAM_AUTO},
@@ -195 +197 @@
     "qam_256", //QAM_256,
     "auto",    //QAM_AUTO,
     "8vsb",    //VSB_8,
-    "16vsb"    //VSB_16
+    "16vsb",   //VSB_16
+    "qpsk_8",  //QPSK_8
 };
 
 DVBParamHelper<fe_transmit_mode_t>::Table DVBTransmitMode::confTable[] =
@@ -315 +318 @@
         p.frequency          <= op.frequency + range   &&
         p.inversion          == op.inversion           &&
         p.u.qpsk.symbol_rate == op.u.qpsk.symbol_rate  &&
+        p.u.qpsk.modulation  == op.u.qpsk.modulation   &&
         p.u.qpsk.fec_inner   == op.u.qpsk.fec_inner;
 }
 
@@ -662 +666 @@
                           const QString& _diseqc_pos,
                           const QString& _lnb_lof_switch,
                           const QString& _lnb_lof_hi,
-                          const QString& _lnb_lof_lo)
+                          const QString& _lnb_lof_lo, const QString &modulation)
 {
     bool ok = true;
 
@@ -692 +696 @@
     }
 
     p.fec_inner = parseCodeRate(fec_inner, ok);
+    p.modulation = parseModulation(modulation, ok);
 
     diseqc_type = _diseqc_type.toInt();
     diseqc_port = _diseqc_port.toInt();
@@ -872 +877 @@
     QString modulation = mod.lower();
     ok = true;
     if (   modulation ==    "qpsk") return QPSK; 
+    else if (modulation =="qpsk_8") return QPSK_8;
     else if (modulation ==    "auto") return QAM_AUTO;
     else if (modulation ==       "a") return QAM_AUTO;
     else if (modulation =="qam_auto") return QAM_AUTO;
@@ -915 +921 @@
         ok = tuning.parseQPSK(
             frequency,       inversion,     symbolrate,   fec,   polarity,
             dvb_diseqc_type, diseqc_port,   diseqc_pos,
-            lnb_lof_switch,  lnb_lof_hi,    lnb_lof_lo);
+            lnb_lof_switch,  lnb_lof_hi,    lnb_lof_lo, modulation);
     else if (FE_QAM == type)
         ok = tuning.parseQAM(
             frequency,       inversion,     symbolrate,   fec,   modulation);
@@ -939 +945 @@
     switch (mod)
     {
         case QPSK:     return    "QPSK";
+        case QPSK_8:   return  "QPSK_8";
         case QAM_AUTO: return    "Auto";
         case QAM_256:  return "QAM-256";
         case QAM_128:  return "QAM-128";
@@ -957 +964 @@
     switch (mod)
     {
         case QPSK:     return "qpsk";
+        case QPSK_8:   return "qpsk_8";
         case QAM_AUTO: return "auto";
         case QAM_16:   return "qam_16";
         case QAM_32:   return "qam_32";

libs/libmythtv/scanwizardhelpers.h

@@ -410 +410 @@
     {
         addSelection(QObject::tr("Auto"),"auto",true);
         addSelection("QPSK","qpsk");
+        addSelection("QPSK_8","qpsk");
         addSelection("QAM 16","qam_16");
         addSelection("QAM 32","qam_32");
         addSelection("QAM 64","qam_64");
@@ -606 +607 @@
     QString inversion()  { return pinversion->getValue(); }
     QString fec()        { return pfec->getValue(); }
     QString polarity()   { return ppolarity->getValue(); }
+    QString modulation() { return pmodulation->getValue(); }
 
   protected:
     ScanFrequency  *pfrequency;
@@ -613 +615 @@
     ScanInversion  *pinversion;
     ScanFec        *pfec;
     ScanPolarity   *ppolarity;
+    ScanModulation *pmodulation;
 };
 
 class QAMPane : public HorizontalConfigurationGroup

libs/libmythtv/dvbchannel.cpp

@@ -488 +488 @@
         case FE_QPSK:
             symbol_rate = t.QPSKSymbolRate();
 
+            if (!CheckModulation(t.params.u.qpsk.modulation))
+                WARNING("Unsupported modulation parameter.");
+
             if (!CheckCodeRate(t.params.u.qpsk.fec_inner))
                 WARNING("Unsupported fec_inner parameter.");
             break;
@@ -572 +575 @@
     switch (modulation)
     {
         case QPSK:     if (info.caps & FE_CAN_QPSK)     return true;
+        case QPSK_8:   if (info.caps & FE_CAN_QPSK_8)     return true;
         case QAM_16:   if (info.caps & FE_CAN_QAM_16)   return true;
         case QAM_32:   if (info.caps & FE_CAN_QAM_32)   return true;
         case QAM_64:   if (info.caps & FE_CAN_QAM_64)   return true;

libs/libmythtv/scanwizard.cpp

@@ -536 +536 @@
                         query.value(2).toString(), // diseqc_pos
                         query.value(3).toString(), // lnb_lof_switch
                         query.value(4).toString(), // lnb_lof_hi
-                        query.value(5).toString()  // lnb_lof_lo
+                        query.value(5).toString(), // lnb_lof_lo
+                        pane->modulation ()
                         ))
                     fParseError = true;
             }

libs/libmythtv/dvbtypes.h

@@ -379 +379 @@
                    const QString& pol,            const QString& diseqc_type,
                    const QString& diseqc_port,    const QString& diseqc_pos,
                    const QString& lnb_lof_switch, const QString& lnb_lof_hi,
-                   const QString& lnb_lof_lo);
+                   const QString& lnb_lof_lo,     const QString& modulation);
 
     bool parseQAM(const TransportObject&);