Ticket #2142: diseqc-only-lnb.patch

libs/libmythtv/videosource.cpp

@@ -2376 +2376 @@
 
     DTVDeviceTreeWizard diseqcWiz(tree);
     diseqcWiz.exec();
-    defaultinput->fillSelections(tree.Root() != NULL);
+    defaultinput->fillSelections(DTVDeviceNeedsConfiguration(tree));
 #endif // USING_DVB
 }
 
@@ -2385 +2385 @@
     VerticalConfigurationGroup::load();
 #ifdef USING_DVB
     tree.Load(parent.getCardID());
-    defaultinput->fillSelections(tree.Root() != NULL);
+    defaultinput->fillSelections(DTVDeviceNeedsConfiguration(tree));
 #endif
 }
 

libs/libmythtv/diseqcsettings.cpp

@@ -1071 +1071 @@
 
 bool DTVDeviceNeedsConfiguration(uint cardid)
 {
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare(
-        "SELECT type "
-        "FROM diseqc_tree, capturecard "
-        "WHERE capturecard.diseqcid = diseqc_tree.diseqcid AND"
-        "      capturecard.cardid = :CARDID");
-    query.bindValue(":CARDID", cardid);
+    DiSEqCDev dev;
+    DiSEqCDevTree *diseqc_tree = dev.FindTree(cardid);
+    return diseqc_tree ? DTVDeviceNeedsConfiguration(*diseqc_tree) : false;
+}
 
-    if (!query.exec() || !query.isActive())
-        MythContext::DBError("DTVDeviceNeedsConfiguration", query);
-    else if (query.next())
-        return (query.value(0).toString().lower() != "lnb");
-
-    return false;
+bool DTVDeviceNeedsConfiguration(DiSEqCDevTree& tree)
+{
+    DiSEqCDevDevice *root = tree.Root();
+    return (root && root->GetDeviceType() != DiSEqCDevDevice::kTypeLNB);
 }
 
 //////////////////////////////////////// DTVDeviceConfigWizard

libs/libmythtv/diseqcsettings.h

@@ -12 +12 @@
 
 typedef QMap<uint, Setting*> devid_to_setting_t;
 
-bool DTVDeviceNeedsConfiguration(uint input_id);
+bool DTVDeviceNeedsConfiguration(uint cardid);
+bool DTVDeviceNeedsConfiguration(DiSEqCDevTree& tree);
 
 class SwitchTypeSetting;
 class SwitchPortsSetting;