Ticket #13: tune2startchannel.1.patch

libs/libmythtv/firewirechannel.cpp

@@ -89 +89 @@
 
 }
     
-void FirewireChannel::SwitchToInput(const QString &input, const QString &chan)
+bool FirewireChannel::SwitchToInput(const QString &input, const QString &chan)
 {
     currentcapchannel = 0;
     if (channelnames.empty())
        channelnames[currentcapchannel] = input;
 
-    SetChannelByString(chan);
+    return SetChannelByString(chan);
 }
 
 void FirewireChannel::SetExternalChanger(void) {

libs/libmythtv/dvbchannel.h

@@ -58 +58 @@
     bool        IsPMTSet()              const { return chan_opts.IsPMTSet(); }
 
     // Commands
-    void SwitchToInput(const QString &inputname, const QString &chan);
+    bool SwitchToInput(const QString &inputname, const QString &chan);
     void SwitchToInput(int newcapchannel, bool setstarting)
         { (void)newcapchannel; (void)setstarting; }
     bool Tune(const dvb_channel_t& channel, bool force_reset=false);

libs/libmythtv/dvbchannel.cpp

@@ -246 +246 @@
     }
     curchannelname = chan;
 
-    GENERAL(QString("Successfully tuned to channel %1.").arg(chan));
-
     if (!chan_opts.pmt.OnAir())
     {
         ERROR(QString("Channel #%1 is off air.").arg(chan));
         return false;
     }
 
+    GENERAL(QString("Successfully tuned to channel %1.").arg(chan));
+
     inputChannel[currentcapchannel] = curchannelname;
 
 #if (DVB_API_VERSION_MINOR == 1)
@@ -271 +271 @@
         emit ChannelChanged(chan_opts);
 }
 
-void DVBChannel::SwitchToInput(const QString &input, const QString &chan)
+bool DVBChannel::SwitchToInput(const QString &input, const QString &chan)
 {
     currentcapchannel = 0;
     if (channelnames.empty())
        channelnames[currentcapchannel] = input;
 
-    SetChannelByString(chan);
+    return SetChannelByString(chan);
 }
 
 /** \fn DVBChannel::GetChannelOptions(const QString&)

libs/libmythtv/firewirechannel.h

@@ -44 +44 @@
         { return QString("%1:%2").arg(fw_opts.port).arg(fw_opts.node); }
 
     // Commands
-    void SwitchToInput(const QString &inputname, const QString &chan);
+    bool SwitchToInput(const QString &inputname, const QString &chan);
     void SwitchToInput(int newcapchannel, bool setstarting)
         { (void)newcapchannel; (void)setstarting; }
 

libs/libmythtv/tv_rec.cpp

@@ -960 +960 @@
     gContext->dispatch(me);
 }    
 
-void TVRec::InitChannel(const QString &inputname, const QString &startchannel)
+void TVRec::InitChannel(const QString &inputname, QString &startchannel)
 {
+    bool tuneSuccess;
     if (!channel)
         return;
 
@@ -976 +977 @@
 
     QString chanorder = gContext->GetSetting("ChannelOrdering", "channum + 0");
     if (inputname.isEmpty())
-        channel->SetChannelByString(startchannel);
+        tuneSuccess=channel->SetChannelByString(startchannel);
     else
-        channel->SwitchToInput(inputname, startchannel);
+        tuneSuccess=channel->SwitchToInput(inputname, startchannel);
+
+    if (!tuneSuccess)
+    {
+        startchannel=gContext->GetSetting("DefaultTVChannel");
+        if (inputname.isEmpty())
+            tuneSuccess=channel->SetChannelByString(startchannel);
+        else
+            tuneSuccess=channel->SwitchToInput(inputname, startchannel);
+    }
+
+    if (!tuneSuccess)
+        VERBOSE(VB_IMPORTANT,"Utter failuer to tune to a channel");
+
     channel->SetChannelOrdering(chanorder);
 }
 
@@ -3164 +3178 @@
     }
 
 }
-

libs/libmythtv/channelbase.h

@@ -78 +78 @@
     // Input toggling convenience methods
     virtual void ToggleInputs(void);
     virtual void SwitchToInput(const QString &input);
-    virtual void SwitchToInput(const QString &input, const QString &chan);
+    virtual bool SwitchToInput(const QString &input, const QString &chan);
 
     /// Saves current channel as the default channel for the current input.
     virtual void StoreInputChannels(void);

libs/libmythtv/tv_rec.h

@@ -193 +193 @@
     void SetupRecorder(class RecordingProfile& profile);
     void TeardownRecorder(bool killFile = false);
     
-    void InitChannel(const QString &inputname, const QString &startchannel);
+    void InitChannel(const QString &inputname, QString &startchannel);
     void CloseChannel(void);
 
     void SetupSignalMonitor(void);

libs/libmythtv/channelbase.cpp

@@ -90 +90 @@
                                       "%1 on card\n").arg(inputname));
 }
 
-void ChannelBase::SwitchToInput(const QString &inputname, const QString &chan)
+bool ChannelBase::SwitchToInput(const QString &inputname, const QString &chan)
 {
     int input = GetInputByName(inputname);
 
     if (input >= 0)
     {
         SwitchToInput(input, false);
-        SetChannelByString(chan);
+        return SetChannelByString(chan);
     }
     else
+    {
         VERBOSE(VB_IMPORTANT,
                 QString("ChannelBase: Could not find input: %1 on card when "
                         "setting channel %2\n").arg(inputname).arg(chan));
+        return false;
+    }
 }
 
 bool ChannelBase::ChangeExternalChannel(const QString &channum)

libs/libmythtv/channel.cpp

@@ -463 +463 @@
     // and return, since the act of changing inputs will change the channel as well.
     if (!inputName.isEmpty())
     {
-        ChannelBase::SwitchToInput(inputName, chan);
-        SetCachedATSCInfo(atsc_chan);
-        return true;
+        if(ChannelBase::SwitchToInput(inputName, chan))
+        {
+            SetCachedATSCInfo(atsc_chan);
+            return true;
+        }
+        else return false;
     }
 
     QString modulation;
@@ -794 +797 @@
         TuneTo(inputTuneTo[currentcapchannel], 0);
 
     if (setstarting && !inputChannel[currentcapchannel].isEmpty())
-        SetChannelByString(inputChannel[currentcapchannel]);
+        if (!SetChannelByString(inputChannel[currentcapchannel]))
+            VERBOSE(VB_IMPORTANT,"Channel::SwitchToInput() FAILED");
 }
 
 unsigned short *Channel::GetV4L1Field(int attrib, struct video_picture &vid_pic)
@@ -1099 +1103 @@
 {
     return ChangeColourAttribute(V4L2_CID_HUE, "hue", up);
 }
-