Ticket #1847: inputs.2.diff

libs/libmythtv/dvbchannel.h

@@ -109 +109 @@
     int               cardnum;     ///< DVB Card number
     bool              has_crc_bug; ///< true iff our driver munges PMT
     int               nextInputID; ///< Signal an input change
+    QString           nextInputName; ///< Contains name of the new input or null
 };
 
 #endif

libs/libmythtv/dvbchannel.cpp

@@ -89 +89 @@
     bzero(&info, sizeof(info));
     has_crc_bug = CardUtil::HasDVBCRCBug(aCardNum);
     sigmon_delay = CardUtil::GetMinSignalMonitoringDelay(aCardNum);
+
+    nextInputName = QString::null;
 }
 
 DVBChannel::~DVBChannel()
@@ -260 +262 @@
         return true;
     }
 
+    if (nextInputName.isNull())
+    {
+        QString inputName;
+        if (!CheckChannel(chan, inputName))
+        {
+            VERBOSE(VB_IMPORTANT, LOC + "CheckChannel failed. " +
+                    QString("Please verify channel '%1'").arg(chan) +
+                    " in the \"mythtv-setup\" Channel Editor.");
+            return false;
+        }
+
+        // If CheckChannel filled in the inputName then we need to
+        // change inputs and return, since the act of changing
+        // inputs will change the channel as well.
+        if (!inputName.isEmpty())
+        {
+            nextInputName = inputName;
+            return ChannelBase::SwitchToInput(inputName, chan);
+        }
+    }
+
     if (GetChannelOptions(chan) == false)
     {
         VERBOSE(VB_IMPORTANT, LOC_ERR + "Failed to get channel options for " +
@@ -285 +308 @@
             QString("channel '%1'.").arg(chan));
 
     currentInputID = nextInputID;
+    nextInputName = QString::null;
     inputs[currentInputID]->startChanNum = curchannelname;
 
     return true;