All pastes #47432 Raw Edit

Stuff

public text v1 · immutable
#47432 ·published 2006-03-29 12:53 UTC
rendered paste body
Index: libs/libmythtv/channelutil.cpp
===================================================================
--- libs/libmythtv/channelutil.cpp	(revision 9538)
+++ libs/libmythtv/channelutil.cpp	(working copy)
@@ -55,7 +55,6 @@
         QString((polarity    >= 0) ? " AND polarity    = :POLARITY    " : "") +
         QString(!inner_FEC.isNull()? " AND fec         = :FEC         " : "") +
         QString((set_odfm_info) ?
-                " AND inversion         = :INVERSION      "
                 " AND bandwidth         = :BANDWIDTH      "
                 " AND hp_code_rate      = :HP_CODE_RATE   "
                 " AND lp_code_rate      = :LP_CODE_RATE   "
@@ -83,7 +82,6 @@
 
     if (set_odfm_info)
     {
-        query.bindValue(":INVERSION",      QString("%1").arg(inversion));
         query.bindValue(":BANDWIDTH",      QString("%1").arg(bandwidth));
         query.bindValue(":HP_CODE_RATE",   hp_code_rate);
         query.bindValue(":LP_CODE_RATE",   lp_code_rate);
@@ -153,6 +151,7 @@
     if (network_id > 0)
         query.bindValue(":NETWORKID",  network_id);
     query.bindValue(":FREQUENCY",      frequency);
+    query.bindValue(":INVERSION",      QString("%1").arg(inversion));
     if (modulation != QString::null)
         query.bindValue(":MODULATION", modulation);
     query.bindValue(":SISTANDARD",     sistandard);
@@ -166,7 +165,6 @@
 
     if (set_odfm_info)
     {
-        query.bindValue(":INVERSION",      QString("%1").arg(inversion));
         query.bindValue(":BANDWIDTH",      QString("%1").arg(bandwidth));
         query.bindValue(":HP_CODE_RATE",   hp_code_rate);
         query.bindValue(":LP_CODE_RATE",   lp_code_rate);
@@ -261,7 +259,7 @@
             tsid,                 netid,
             true,
             -1,                   QChar(cd.BandwidthString()[0]),
-            -1,                   -1,
+            -1,                   'a',
             QChar(cd.TransmissionModeString()[0]),
             QString::null,        cd.ConstellationString(),
             QChar(cd.HierarchyString()[0]), cd.CodeRateHPString(),
@@ -289,7 +291,7 @@
             tsid,                 netid,
             false,
             cd.SymbolRateHz(),    -1,
-            QChar(cd.PolarizationString()[0]), -1,
+            QChar(cd.PolarizationString()[0]), 'a',
             -1,
             cd.FECInnerString(),  QString::null,
             -1,                   QString::null,
@@ -312,7 +314,7 @@
             tsid,                 netid,
             false,
             cd.SymbolRateHz(),    -1,
-            -1,                   -1,
+            -1,                   'a',
             -1,
             cd.FECInnerString(),  QString::null,
             -1,                   QString::null,