Ticket #12499: 12499-v1.patch

mythtv/libs/libmythtv/cardutil.cpp

@@ -1737 +1737 @@
     inputs.clear();
     if (IsSingleInputType(inputtype))
         inputs += "MPEG2TS";
-    else if ("DVB" != inputtype)
+    else if (inputtype == "DVB")
+        inputs += "DVBInput";
+    else
         inputs += ProbeV4LVideoInputs(device);
-
-#ifdef USING_DVB
-    if ("DVB" == inputtype)
-    {
-        bool needs_conf = IsInNeedOfExternalInputConf(inputid);
-        InputNames list = GetConfiguredDVBInputs(device);
-        if (!needs_conf && list.empty())
-        {
-            inputs += "DVBInput";
-        }
-
-        // Always list the 1 through n+1 inputs
-        if (needs_conf)
-        {
-            for (int i = 0; i <= list.size(); ++i)
-                inputs += QString("DVBInput #%1").arg(i+1);
-        }
-
-        // Always list the existing inputs
-        InputNames::const_iterator it;
-        for (it = list.begin(); it != list.end(); ++it)
-        {
-            inputs += *it;
-        }
-    }
-#endif // USING_DVB
 }
 
 int CardUtil::CreateCaptureCard(const QString &videodevice,
@@ -1868 +1844 @@
     if (!inputid)
         return true;
 
-    // delete any DiSEqC device tree
     DiSEqCDevTree tree;
     tree.Load(inputid);
-    if (!tree.Root())
-    {
-        tree.SetRoot(NULL);
-        tree.Store(inputid);
-    }
 
     // delete any clones
     QString rawtype     = GetRawInputType(inputid);
@@ -1885 +1855 @@
         query.prepare(
             "SELECT cardid "
             "FROM capturecard "
-            "WHERE videodevice = :DEVICE AND "
-            "      cardid      > :INPUTID");
-        query.bindValue(":DEVICE", videodevice);
+            "WHERE parentid = :INPUTID");
         query.bindValue(":INPUTID", inputid);
 
         if (!query.exec())
@@ -1903 +1871 @@
             return false;
     }
 
-    // delete input
     ok &= CardUtil::DeleteInput(inputid);
 
     if (!ok)
@@ -1921 +1888 @@
 
     if (ok)
     {
+        // Delete the diseqc tree if no more inputs reference it.
+        if (tree.Root())
+        {
+            query.prepare("SELECT cardid FROM capturecard "
+                          "WHERE diseqcid = :DISEQCID LIMIT 1");
+            query.bindValue(":DISEQCID", tree.Root()->GetDeviceID());
+            if (!query.exec())
+            {
+                MythDB::DBError("DeleteCard -- find diseqc tree", query);
+            }
+            else if (!query.next())
+            {
+                tree.SetRoot(NULL);
+                tree.Store(inputid);
+            }
+        }
+
         // delete any unused input groups
         UnlinkInputGroup(0,0);
     }

mythtv/libs/libmythtv/diseqc.cpp

@@ -323 +323 @@
     delete m_root;
 }
 
+/** \fn DiSEqCDevTree::Load(const QString&, const QString&)
+ *  \brief Loads the device tree from the database.
+ *  \param device recording input uses.
+ *  \return True if successful.
+ */
+bool DiSEqCDevTree::Load(const QString &device)
+{
+    // lookup configuration for this card
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare(
+        "SELECT cardid "
+        "FROM capturecard "
+        "WHERE hostname = :HOSTNAME AND "
+        "      videodevice = :VIDEODEVICE "
+        "LIMIT 1");
+    query.bindValue(":HOSTNAME", gCoreContext->GetHostName());
+    query.bindValue(":VIDEODEVICE", device);
+
+    uint cardid = 0;
+
+    if (!query.exec())
+    {
+        MythDB::DBError("DiSEqCDevTree::Load", query);
+    }
+    else if (query.next())
+    {
+        cardid = query.value(0).toUInt();
+    }
+
+    return Load(cardid);
+}
+
 /** \fn DiSEqCDevTree::Load(uint)
  *  \brief Loads the device tree from the database.
  *  \param cardid Capture card id.
@@ -394 +426 @@
     return false;
 }
 
-/** \fn DiSEqCDevTree::Store(uint)
+/** \fn DiSEqCDevTree::Store(QString)
+ *  \brief Stores the device tree to the database.
+ *  \param device.
+ *  \return True if successful.
+ */
+bool DiSEqCDevTree::Store(const QString &device)
+{
+    MSqlQuery query0(MSqlQuery::InitCon());
+
+    // apply pending node deletions
+    if (!m_delete.empty())
+    {
+        MSqlQuery query1(MSqlQuery::InitCon());
+
+        query0.prepare(
+            "DELETE FROM diseqc_tree "
+            "WHERE diseqcid = :DEVID");
+        query1.prepare(
+            "DELETE FROM diseqc_config "
+            "WHERE diseqcid = :DEVID");
+
+        vector<uint>::const_iterator it = m_delete.begin();
+        for (; it != m_delete.end(); ++it)
+        {
+            query0.bindValue(":DEVID", *it);
+            if (!query0.exec())
+                MythDB::DBError("DiSEqCDevTree::Store 1", query0);
+
+            query1.bindValue(":DEVID", *it);
+            if (!query1.exec())
+                MythDB::DBError("DiSEqCDevTree::Store 2", query1);
+
+        }
+        m_delete.clear();
+    }
+
+    // store changed and new nodes
+    uint devid = 0;
+    if (m_root && m_root->Store())
+        devid = m_root->GetDeviceID();
+    else if (m_root)
+    {
+        LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to save DiSEqC tree.");
+        return false;
+    }
+
+    // update capture card to point to tree, or 0 if there is no tree
+    query0.prepare(
+        "UPDATE capturecard "
+        "SET diseqcid = :DEVID "
+        "WHERE hostname = :HOSTNAME AND "
+        "      videodevice = :VIDEODEVICE");
+    query0.bindValue(":DEVID",  devid);
+    query0.bindValue(":HOSTNAME", gCoreContext->GetHostName());
+    query0.bindValue(":VIDEODEVICE", device);
+    if (!query0.exec())
+    {
+        MythDB::DBError("DiSEqCDevTree::Store 3", query0);
+        return false;
+    }
+
+    return true;
+}
+
+/** \fn DiSEqCDevTree::Store(QString)
  *  \brief Stores the device tree to the database.
  *  \param cardid Capture card id.
  *  \return True if successful.

mythtv/libs/libmythtv/diseqc.h

@@ -78 +78 @@
     DiSEqCDevTree();
     ~DiSEqCDevTree();
 
+    bool Load(const QString &device);
     bool Load(uint cardid);
+    bool Store(const QString &device);
     bool Store(uint cardid);
     bool Execute(const DiSEqCDevSettings &settings,
                  const DTVMultiplex &tuning);

mythtv/libs/libmythtv/videosource.cpp

@@ -2960 +2960 @@
         ComboBoxSetting(this), CardInputDBStorage(this, parent, "inputname")
     {
         setLabel(QObject::tr("Input name"));
-        addSelection(QObject::tr("(None)"), "None");
     };
 
     virtual void Load(void)
@@ -3940 +3939 @@
         QString videodevice = query.value(1).toString();
         QString cardtype    = query.value(2).toString();
         QString inputname   = query.value(3).toString();
-        if (inputname.isEmpty())
-            inputname = QObject::tr("(None)");
 
-        CardInput *cardinput = new CardInput(cardtype, false, cardid);
+        CardInput *cardinput = new CardInput(cardtype, true, cardid);
         cardinput->loadByID(cardid);
         QString inputlabel = QString("%1 (%2) -> %3")
             .arg(CardUtil::GetDeviceLabel(cardtype, videodevice))
@@ -3997 +3994 @@
 }
 #endif // USING_DVB
 
+void DVBConfigurationGroup::reloadDiseqcTree(const QString &videodevice)
+{
+    if (diseqc_tree)
+        diseqc_tree->Load(videodevice);
+}
+
 void DVBConfigurationGroup::probeCard(const QString &videodevice)
 {
     if (videodevice.isEmpty())
@@ -4230 +4233 @@
 
     connect(cardnum,      SIGNAL(valueChanged(const QString&)),
             this,         SLOT(  probeCard   (const QString&)));
+    connect(cardnum,      SIGNAL(valueChanged(const QString&)),
+            this,         SLOT(  reloadDiseqcTree(const QString&)));
     connect(diseqc_btn,   SIGNAL(pressed()),
             this,         SLOT(  DiSEqCPanel()));
     connect(buttonRecOpt, SIGNAL(pressed()),
@@ -4256 +4261 @@
 void DVBConfigurationGroup::Load(void)
 {
     VerticalConfigurationGroup::Load();
-    diseqc_tree->Load(parent.getCardID());
+    reloadDiseqcTree(cardnum->getValue());
     if (cardtype->getValue() == "DVB-S" ||
         cardtype->getValue() == "DVB-S2" ||
         DiSEqCDevTree::Exists(parent.getCardID()))
@@ -4268 +4273 @@
 void DVBConfigurationGroup::Save(void)
 {
     VerticalConfigurationGroup::Save();
-    diseqc_tree->Store(parent.getCardID());
+    diseqc_tree->Store(cardnum->getValue());
     DiSEqCDev trees;
     trees.InvalidateTrees();
 }

mythtv/libs/libmythtv/videosource.h

@@ -623 +623 @@
 
   public slots:
     void probeCard(const QString& cardNumber);
+    void reloadDiseqcTree(const QString &device);
     void DiSEqCPanel(void);
     void DVBExtraPanel(void);