Ticket #4472: 4472-v1.patch

libs/libmythtv/channel.h

@@ -31 +31 @@
     Channel(TVRec *parent, const QString &videodevice);
     virtual ~Channel(void);
 
-    bool Init(QString &inputname, QString &startchannel);
+    bool Init(QString &inputname, QString &startchannel, bool setchan);
 
     bool Open(void);
     void Close(void);

libs/libmythtv/channelbase.h

@@ -28 +28 @@
     ChannelBase(TVRec *parent);
     virtual ~ChannelBase();
 
-    virtual bool Init(QString &inputname, QString &startchannel);
+    virtual bool Init(QString &inputname, QString &startchannel, bool setchan);
+    virtual bool IsTunable(const QString &input, const QString &channum) const;
 
     // Methods that must be implemented.
     /// \brief Opens the channel changing hardware for use.

libs/libmythtv/channelbase.cpp

@@ -45 +45 @@
 {
 }
 
-bool ChannelBase::Init(QString &inputname, QString &startchannel)
+bool ChannelBase::Init(QString &inputname, QString &startchannel, bool setchan)
 {
     bool ok;
 
-    if (inputname.isEmpty())
+    if (!setchan)
+        ok = IsTunable(inputname, startchannel);
+    else if (inputname.isEmpty())
         ok = SetChannelByString(startchannel);
     else
         ok = SwitchToInput(inputname, startchannel);
@@ -86 +88 @@
 
             if (chanid && cit != channels.end())
             {
-                ok = SwitchToInput(*it, (*cit).channum);
+                if (!setchan)
+                    ok = IsTunable(inputname, startchannel);
+                else
+                    ok = SwitchToInput(*it, (*cit).channum);
+
                 if (ok)
                 {
                     inputname    = *it;
                     startchannel = QDeepCopy<QString>((*cit).channum);
-                    msg2 = QString("tuned to '%1' on input '%2' instead.")
+                    msg2 = QString("selected to '%1' on input '%2' instead.")
                         .arg(startchannel).arg(inputname);
                     msg_error = false;
                 }
@@ -111 +117 @@
     return ok;
 }
 
+bool ChannelBase::IsTunable(const QString &input, const QString &channum) const
+{
+    QString loc = LOC + QString("IsTunable(%1,%2)").arg(input).arg(channum);
+
+    int inputid = currentInputID;
+    if (!input.isEmpty())
+        inputid = GetInputByName(input);
+
+    InputMap::const_iterator it = inputs.find(inputid);
+    if (it == inputs.end())
+    {
+        VERBOSE(VB_IMPORTANT, loc + " " + QString(
+                    "Requested non-existant input '%1':'%2' ")
+                .arg(input).arg(inputid));
+
+        return false;
+    }
+
+    uint mplexid_restriction;
+    if (!IsInputAvailable(inputid, mplexid_restriction))
+    {
+        VERBOSE(VB_IMPORTANT, loc + " " + QString(
+                    "Requested channel is on input '%1' "
+                    "which is in a busy input group")
+                .arg(inputid));
+
+        return false;
+    }
+
+    // Fetch tuning data from the database.
+    QString tvformat, modulation, freqtable, freqid, dtv_si_std;
+    int finetune;
+    uint64_t frequency;
+    int mpeg_prog_num;
+    uint atsc_major, atsc_minor, mplexid, tsid, netid;
+    bool commfree;
+
+    if (!ChannelUtil::GetChannelData(
+        (*it)->sourceid, channum,
+        tvformat, modulation, freqtable, freqid,
+        finetune, frequency,
+        dtv_si_std, mpeg_prog_num, atsc_major, atsc_minor, tsid, netid,
+        mplexid, commfree))
+    {
+        VERBOSE(VB_IMPORTANT, loc + " " + QString(
+                    "Failed to find channel in DB on input '%1' ")
+                .arg(inputid));
+
+        return false;
+    }
+
+    if (mplexid_restriction && (mplexid != mplexid_restriction))
+    {
+        VERBOSE(VB_IMPORTANT, loc + " " + QString(
+                    "Channel is valid, but tuner is busy "
+                    "on different multiplex (%1 != %2)")
+                .arg(mplexid).arg(mplexid_restriction));
+
+        return false;
+    }
+
+    return true;
+}
+
 uint ChannelBase::GetNextChannel(uint chanid, int direction) const
 {
     if (!chanid)

libs/libmythtv/dvbchannel.h

@@ -34 +34 @@
     bool Open(void) { return Open(this); }
     void Close(void) { Close(this); }
 
-    bool Init(QString &inputname, QString &startchannel);
+    bool Init(QString &inputname, QString &startchannel, bool setchan);
 
     // Sets
     void SetPMT(const ProgramMapTable*);

libs/libmythtv/dvbchannel.cpp

@@ -297 +297 @@
     return it != is_open.end();
 }
 
-bool DVBChannel::Init(QString &inputname, QString &startchannel)
+bool DVBChannel::Init(QString &inputname, QString &startchannel, bool setchan)
 {
-    if (!IsOpen())
+    if (setchan && !IsOpen())
         Open(this);
-    return ChannelBase::Init(inputname, startchannel);
+
+    return ChannelBase::Init(inputname, startchannel, setchan);
 }
 
 // documented in dtvchannel.h

libs/libmythtv/tv_rec.cpp

@@ -1175 +1175 @@
     QString input   = inputname;
     QString channum = startchannel;
 
-    channel->Init(input, channum);
+    channel->Init(input, channum, true);
 }
 
 void TVRec::CloseChannel(void)
@@ -3310 +3310 @@
         }
     }
     if (request.flags & kFlagLiveTV)
-        channel->Init(input, channum);
+        channel->Init(input, channum, false);
 
     if (channel && !channum.isEmpty() && (channum.find("NextChannel") >= 0))
     {

libs/libmythtv/channel.cpp

@@ -58 +58 @@
     Close();
 }
 
-bool Channel::Init(QString &inputname, QString &startchannel)
+bool Channel::Init(QString &inputname, QString &startchannel, bool setchan)
 {
-    SetFormat(gContext->GetSetting("TVFormat"));
-    SetDefaultFreqTable(gContext->GetSetting("FreqTable"));
-    return ChannelBase::Init(inputname, startchannel);
+    if (setchan)
+    {
+        SetFormat(gContext->GetSetting("TVFormat"));
+        SetDefaultFreqTable(gContext->GetSetting("FreqTable"));
+    }
+    return ChannelBase::Init(inputname, startchannel, setchan);
 }
 
 bool Channel::Open(void)