Ticket #1211: def_input.diff

libs/libmythtv/channelbase.h

@@ -174 +174 @@
     virtual void SetCachedATSCInfo(const QString &chan);
     static void GetCachedPids(int chanid, pid_cache_t&);
     static void SaveCachedPids(int chanid, const pid_cache_t&);
-    static void StoreInputChannels(const InputMap&);
+    virtual void StoreInputChannels(const InputMap&);
 
     TVRec   *pParent;
     QString  channelorder;

libs/libmythtv/channelbase.cpp

@@ -559 +559 @@
         if (!query.exec() || !query.isActive())
             MythContext::DBError("StoreInputChannels", query);
     }
+
+    // Save the current Input as the default for this card
+    QString inputname = GetCurrentInput();
+    int inputid = GetInputByName(inputname);
+    int cardid = GetInputCardID(inputid);
+
+    if (cardid && !inputname.isNull())
+    {
+        query.prepare("UPDATE capturecard "
+                      "SET defaultinput = :INNAME "
+                      "WHERE cardid = :CARDID");
+        query.bindValue(":INNAME", inputname);
+        query.bindValue(":CARDID", cardid);
+        if (!query.exec())
+            MythContext::DBError("set_startinput", query);
+    }
 }
 
 bool ChannelBase::CheckChannel(const QString &channum, 

libs/libmythtv/tv_rec.cpp

@@ -253 +253 @@
         return false;
 
     // configure the Channel instance
-    QString startchannel = GetStartChannel(cardid, genOpt.defaultinput);
+    QString startchannel = GetStartChannel(cardid);
     if (!CreateChannel(startchannel))
         return false;
 
@@ -1468 +1468 @@
     return true;
 }
 
-QString TVRec::GetStartChannel(int cardid, const QString &defaultinput)
+QString TVRec::GetStartChannel(int cardid, const QString &input)
 {
+    QString defaultinput;
     QString msg("");
     QString startchan = QString::null;
 
+    if (input.isNull())
+    {
+        // Get the last viewed input
+        MSqlQuery query(MSqlQuery::InitCon());
+        query.prepare(
+            "SELECT defaultinput "
+            "FROM capturecard "
+            "WHERE cardid = :CARDID");
+        query.bindValue(":CARDID", cardid);
+
+        if (!query.exec() || !query.isActive())
+            MythContext::DBError("getdefaultinput", query);
+        else if (query.next())
+            defaultinput = query.value(0).toString();
+    }
+    else
+        defaultinput = input;
+
     // Get last tuned channel from database, to use as starting channel
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(
@@ -3023 +3042 @@
 
     // If this is Live TV startup, we need a channel...
     if (channum.isEmpty() && (request.flags & kFlagLiveTV))
-    {
-        input   = genOpt.defaultinput;
-        channum = GetStartChannel(cardid, input);
-    }
+        channum = GetStartChannel(cardid);
 
     if (channel && !channum.isEmpty() && (channum.find("NextChannel") >= 0))
     {

libs/libmythtv/tv_rec.h

@@ -269 +269 @@
                            DBox2DBOptions     &dbox2_opts);
 
 
-    static QString GetStartChannel(int cardid, const QString &defaultinput);
+    static QString GetStartChannel(int cardid,
+                                   const QString &input = QString::null);
 
     bool SetupRecorder(RecordingProfile& profile);
     void TeardownRecorder(bool killFile = false);