Ticket #2930: tuner_busy.diff

libs/libmythtv/remoteutil.h

@@ -63 +63 @@
 MPUBLIC int RemoteCheckForRecording(ProgramInfo *pginfo);
 MPUBLIC int RemoteGetRecordingStatus(ProgramInfo *pginfo, int overrecsecs,
                                      int underrecsecs);
-
+MPUBLIC vector<ProgramInfo *> *RemoteGetCurrentlyRecordingList(void);
 #endif
 
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/tv_play.cpp

@@ -103 +103 @@
 
     while (!quitAll)
     {
+        int freeRecorders = RemoteGetFreeRecorderCount();
         if (curProgram)
         {
             if (!tv->Playback(curProgram))
                 quitAll = true;
         }
+        else if (!freeRecorders)
+        {
+            vector<ProgramInfo *> *reclist;
+            reclist = RemoteGetCurrentlyRecordingList();
+            if (reclist->empty())
+            {
+                VERBOSE(VB_PLAYBACK, LOC_ERR + 
+                        "Failed to get recording show list");
+                quitAll = true;
+            }
+
+            int numrecordings = reclist->size();
+            if (numrecordings > 0)
+            {
+                if (numrecordings == 1)
+                {
+                    curProgram = new ProgramInfo(*reclist->at(0));
+                }
+                else
+                {
+                    ProgramInfo *p = NULL;
+                    QStringList recTitles;
+                    QString buttonTitle;
+                    vector<ProgramInfo *>::iterator it = reclist->begin();
+                    while (it != reclist->end())
+                    {
+                        p = *it;
+                        buttonTitle = tr("Chan %1: %2")
+                            .arg(p->chanstr).arg(p->title);
+                        recTitles.append(buttonTitle);
+                        it++;
+                    }
+                    int ret = MythPopupBox::showButtonPopup(
+                                    gContext->GetMainWindow(),
+                                    "",
+                                    tr("All Tuners are Busy.\n"
+                                       "Select a Current Recording"),
+                                    recTitles, 1);
+                    if (ret == -1)
+                    {
+                        quitAll = true;
+                    }
+                    else
+                    {
+                        p = reclist->at(ret);
+                        curProgram = new ProgramInfo(*p);
+                    }
+                }
+            }
+
+            if (reclist)
+                delete reclist;
+            continue;
+        }
         else
         {
             if (!tv->LiveTV(showDialogs, startInGuide))

libs/libmythtv/remoteutil.cpp

@@ -426 +426 @@
     return retval;
 }
 
+/*
+ * \brief return list of currently recording shows
+ */
+vector<ProgramInfo *> *RemoteGetCurrentlyRecordingList(void)
+{
+    QString str = "QUERY_RECORDINGS ";
+    str += "Recording";
+    QStringList strlist = str;
+
+    vector<ProgramInfo *> *reclist = new vector<ProgramInfo *>;
+    vector<ProgramInfo *> *info = new vector<ProgramInfo *>;
+    if (!RemoteGetRecordingList(info, strlist))
+    {
+        if (info)
+            delete info;
+        return reclist;
+    }
+
+    ProgramInfo *p = NULL;
+    vector<ProgramInfo *>::iterator it = info->begin();
+    // make sure whatever remotegetrecordinglist returned
+    // only has rsRecording shows
+    for ( ; it != info->end(); it++)
+    {
+        p = *it;
+        if (p->recstatus == rsRecording)
+            reclist->push_back(new ProgramInfo(*p));
+    }
+    
+    if (info)
+        delete info;
+
+    return reclist; 
+}
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

programs/mythbackend/mainserver.cpp

@@ -1099 +1099 @@
         "  recorded.starttime = recordedprogram.starttime ) "
         "WHERE ( recorded.deletepending = 0 OR "
         "        DATE_ADD(recorded.lastmodified, INTERVAL 5 MINUTE) <= NOW() "
-        "      ) "
-        "ORDER BY recorded.starttime";
+        "      ) ";
 
+    if (type == "Recording")
+        thequery += "AND recorded.endtime >= NOW() AND "
+            "recorded.starttime <= NOW()";
+
+    thequery += "ORDER BY recorded.starttime";
+
     if (type == "Delete")
         thequery += " DESC";