Ticket #2756: 2756-v1.patch

libs/libmythtv/channelutil.h

@@ -198 +198 @@
      */
     static QString GetServiceName(int chanid);
     static int     GetSourceID(int mplexid);
-    static QString GetInputName(int sourceid);
     static int     GetInputID(int sourceid, int cardid);
     static QString GetDTVPrivateType(uint networkid, const QString &key,
                                      const QString sitype = "dvb");

libs/libmythtv/cardutil.h

@@ -138 +138 @@
 
 
     static QString      GetDefaultInput(uint cardid);
-    static QString      GetInputName(uint cardid, uint sourceid);
+    static QStringList  GetInputNames(uint cardid, uint sourceid);
 
     static QString      GetDeviceLabel(uint    cardid,
                                        QString cardtype,

libs/libmythtv/scanwizardscanner.cpp

@@ -521 +521 @@
         return;
     }
 
-    scanner = new SIScan(card_type, channel, sourceid,
-                         signal_timeout, channel_timeout);
+    scanner = new SIScan(card_type, channel, sourceid, signal_timeout,
+                         channel_timeout, inputname);
 
     scanner->SetForceUpdate(true);
 

libs/libmythtv/siscan.cpp

@@ -81 +81 @@
  *   HandleDVBDBInsertion() and HandleMPEGDBInsertion() are similar.
  */
 
-/** \fn SIScan::SIScan(QString,ChannelBase*,int,uint,uint)
+/** \fn SIScan::SIScan(QString,ChannelBase*,int,uint,uint,const QString&)
  */
-SIScan::SIScan(QString _cardtype, ChannelBase* _channel, int _sourceID,
-               uint signal_timeout, uint channel_timeout)
+SIScan::SIScan(const QString &_cardtype, ChannelBase *_channel, int _sourceID,
+               uint signal_timeout, uint channel_timeout,
+               const QString &_inputname)
     : // Set in constructor
       channel(_channel),
       signalMonitor(SignalMonitor::Init(_cardtype, -1, _channel)),
@@ -92 +93 @@
       scanMode(IDLE),
       signalTimeout(signal_timeout),
       channelTimeout(channel_timeout),
+      inputname(QDeepCopy<QString>(_inputname)),
       // Settable
       ignoreAudioOnlyServices(false),
       ignoreDataServices(false),
@@ -687 +689 @@
     }
 #endif // USING_DVB
 
-    // TODO we should actually use the input the user specifies...
-    QString inputname = ChannelUtil::GetInputName(item.SourceID);
-
     if (!GetDTVChannel())
         return false;
 

libs/libmythtv/channelutil.cpp

@@ -699 +699 @@
     return -1;
 }
 
-/** \fn ChannelUtil::GetInputName(int)
- *  \brief Returns input name for a card input
- *  NOTE: This is BROKEN, it does not specify which card the input is on.
- */
-QString ChannelUtil::GetInputName(int source_id)
-{
-    QString inputname = QString::null;
-
-    MSqlQuery query(MSqlQuery::InitCon());
-    query.prepare("SELECT inputname "
-                  "FROM cardinput "
-                  "WHERE sourceid = :SOURCEID");
-    query.bindValue(":SOURCEID", source_id);
-
-    if (query.exec() && query.isActive() && query.size() > 0)
-    {
-        query.next();
-        inputname = query.value(0).toString();
-    }
-    return inputname;
-}
-
 int ChannelUtil::GetInputID(int source_id, int card_id)
 {
     int input_id = -1;

libs/libmythtv/cardutil.cpp

@@ -348 +348 @@
     return str;
 }
 
-QString CardUtil::GetInputName(uint cardid, uint sourceid)
+QStringList CardUtil::GetInputNames(uint cardid, uint sourceid)
 {
-    QString str = QString::null;
+    QStringList list;
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare("SELECT inputname "
                   "FROM cardinput "
@@ -360 +360 @@
     query.bindValue(":CARDID",   cardid);
 
     if (!query.exec() || !query.isActive())
-        MythContext::DBError("CardUtil::GetInputName()", query);
-    else if (query.next())
-        str = query.value(0).toString();
+    {
+        MythContext::DBError("CardUtil::GetInputNames()", query);
+    }
+    else
+    {
+        while (query.next())
+            list = query.value(0).toString();
+    }
 
-    return str;
+    return list;
 }
 
 bool CardUtil::GetTimeouts(uint cardid,

libs/libmythtv/siscan.h

@@ -44 +44 @@
 {
     Q_OBJECT
   public:
-    SIScan(QString _cardtype, ChannelBase* _channel, int _sourceID,
-           uint signal_timeout, uint channel_timeout);
+    SIScan(const QString &_cardtype, ChannelBase* _channel, int _sourceID,
+           uint signal_timeout, uint channel_timeout,
+           const QString &_inputname);
     ~SIScan();
 
     void StartScanner(void);
@@ -180 +181 @@
     SCANMODE          scanMode;
     uint              signalTimeout;
     uint              channelTimeout;
+    QString           inputname;
 
     // Settable
     bool              ignoreAudioOnlyServices;

libs/libmythtv/transporteditor.cpp

@@ -188 +188 @@
     vector<uint>::const_iterator it = cardids.begin();
     for (; it != cardids.end(); ++it)
     {
-        CardUtil::CARD_TYPES nType = CardUtil::ERROR_PROBE;
-        QString inputname = CardUtil::GetInputName(*it, sourceid);
+        QStringList inputnames = CardUtil::GetInputNames(*it, sourceid);
+        QStringList::const_iterator it2 = inputnames.begin();
 
-        if (!inputname.isEmpty())
+        for (; it2 != inputnames.end(); ++it2)
         {
-            QString cardtype = CardUtil::GetRawCardType(*it, inputname);
+            CardUtil::CARD_TYPES nType = CardUtil::ERROR_PROBE;
+            QString cardtype = CardUtil::GetRawCardType(*it, *it2);
             if (cardtype == "DVB")
-                cardtype = CardUtil::ProbeSubTypeName(*it, inputname);
+                cardtype = CardUtil::ProbeSubTypeName(*it, *it2);
             nType = CardUtil::toCardType(cardtype);
-        }
 
-        if ((CardUtil::ERROR_OPEN    == nType) ||
-            (CardUtil::ERROR_UNKNOWN == nType) ||
-            (CardUtil::ERROR_PROBE   == nType))
-        {
-            MythPopupBox::showOkPopup(
-                gContext->GetMainWindow(), 
-                QObject::tr("Transport Editor"), 
-                QObject::tr(
-                    "Failed to probe a capture card connected to this "
-                    "transport's video source. Please make sure the "
-                    "backend is not running."));
+            if ((CardUtil::ERROR_OPEN    == nType) ||
+                (CardUtil::ERROR_UNKNOWN == nType) ||
+                (CardUtil::ERROR_PROBE   == nType))
+            {
+                MythPopupBox::showOkPopup(
+                    gContext->GetMainWindow(), 
+                    QObject::tr("Transport Editor"), 
+                    QObject::tr(
+                        "Failed to probe a capture card connected to this "
+                        "transport's video source. Please make sure the "
+                        "backend is not running."));
 
-            return CardUtil::ERROR_PROBE;
+                return CardUtil::ERROR_PROBE;
+            }
+
+            cardtypes.push_back(nType);
         }
-
-        cardtypes.push_back(nType);
     }
 
+    // This should never happen... (unless DB has changed under us)
+    if (cardtypes.empty())
+        return CardUtil::ERROR_PROBE;
+
     for (uint i = 1; i < cardtypes.size(); i++)
     {
         CardUtil::CARD_TYPES typeA = cardtypes[i - 1];