Ticket #1211: save_input.diff

tv_rec.cpp

@@ -151 +151 @@
     if (!ok)
         return false;
 
-    QString startchannel = GetStartChannel(cardid, genOpt.defaultinput);
+    QString startchannel = GetStartChannel(cardid, QString::null);
 
     bool init_run = false;
     if (genOpt.cardtype == "DVB")
@@ -1410 +1410 @@
     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 == QString::null)
+    {
+        // 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(
@@ -3417 +3436 @@
 
         // 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, QString::null);
     }
     bool ok = false;
     if (channel)

tv_rec.h

@@ -267 +267 @@
                            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);

tv_play.cpp

@@ -3829 +3829 @@
     if (prevChan.size() == 0)
         AddPreviousChannel();
 
+    // Save new input
+    QString inputname("");
+    int cardid = -1;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT cardid FROM channel,cardinput "
+                  "WHERE channel.sourceid = cardinput.sourceid "
+                  "AND chanid = :CHANID");
+    query.bindValue(":CHANID", chanid);
+    if (query.exec() && query.isActive() && query.size() > 0 && query.next())
+        cardid = query.value(0).toInt();
+    else
+        MythContext::DBError("GetNewCardID", query);
+
+    if (cardid >= 0)
+        if (get_cardinputid(cardid, channum, inputname) >= 0)
+            set_startinput(cardid, inputname);
     PauseLiveTV();
 
     activerecorder->SetChannel(channum);