Ticket #4071: recording_led-v14391.2.patch

libs/libmythtv/remoteutil.cpp

@@ -337 +337 @@
         pginfo->FromStringList(strlist, 0);
 }
 
-int RemoteIsRecording(void)
+QStringList RemoteRecordings(void)
 {
     QStringList strlist = "QUERY_ISRECORDING";
+    QStringList empty;
+
+    empty << "0" << "0";
 
     if (!gContext->SendReceiveStringList(strlist, false, false))
-        return -1;
+        return empty;
 
-    return strlist[0].toInt();
+    return strlist;
 }
 
 int RemoteGetRecordingMask(void)

libs/libmythtv/remoteutil.h

@@ -3 +3 @@
 
 #include <vector>
 #include <qstring.h>
+#include <qstringlist.h>
 using namespace std;
 
 #include "mythexp.h"
@@ -56 +57 @@
 MPUBLIC QString RemoteGetPreviewLastModified(ProgramInfo *pginfo);
 MPUBLIC void RemoteFillProginfo(ProgramInfo *pginfo,
                                 const QString &playbackhostname);
-MPUBLIC int RemoteIsRecording(void);
+MPUBLIC QStringList RemoteRecordings(void);
 MPUBLIC int RemoteGetRecordingMask(void);
 MPUBLIC int RemoteGetFreeRecorderCount(void);
 

libs/libmythtv/xbox.cpp

@@ -22 +22 @@
     RecordingLED = gContext->GetSetting("XboxLEDRecording","rrrr");
     DefaultLED = gContext->GetSetting("XboxLEDDefault","gggg");
     BlinkBIN = gContext->GetSetting("XboxBlinkBIN");
+    LEDNonLiveTV = gContext->GetSetting("XboxLEDNonLiveTV","0");
 
     if (!BlinkBIN)
         return;
@@ -36 +37 @@
 
 void XBox::CheckRec(void)
 {
-    bool recording = RemoteIsRecording();
+    QStringList recording = RemoteRecordings();
 
-    QString color = (recording) ? RecordingLED : DefaultLED;
+    int all = recording[0].toInt();
+    int livetv = recording[1].toInt();
+    int numrec = all;
+
+    if (LEDNonLiveTV.toInt())
+        numrec -= livetv;
+
+    QString color = (numrec) ? RecordingLED : DefaultLED;
 
     if (color != PhaseCache)
     {

libs/libmythtv/xbox.h

@@ -3 +3 @@
 
 #include <qobject.h>
 #include <qtimer.h>
+#include <qstringlist.h>
 
 #include "mythexp.h"
 
@@ -26 +27 @@
     QString DefaultLED;
     QString PhaseCache;
     QString BlinkBIN;
+    QString LEDNonLiveTV;
 };
 
 #endif

programs/mythbackend/mainserver.cpp

@@ -3511 +3511 @@
 
     MythSocket *pbssock = pbs->getSocket();
     int RecordingsInProgress = 0;
+    int LiveTVRecordingsInProgress = 0;
+    ProgramInfo *info;
+    QStringList retlist;
+
     QMap<int, EncoderLink *>::Iterator iter = encoderList->begin();
     for (; iter != encoderList->end(); ++iter)
     {
         EncoderLink *elink = iter.data();
-        if (elink->IsBusyRecording())
-            RecordingsInProgress++;
+        if (elink->IsBusyRecording()) {
+            info = elink->GetRecording();
+
+            if (info->recgroup == "LiveTV")
+                LiveTVRecordingsInProgress++;
+            else
+                RecordingsInProgress++;
+
+            delete info;
+        }
     }
 
-    QStringList retlist = QString::number(RecordingsInProgress);
+    retlist << QString::number(RecordingsInProgress);
+    retlist << QString::number(LiveTVRecordingsInProgress);
 
     SendResponse(pbssock, retlist);
 }

programs/mythfrontend/globalsettings.cpp

@@ -3231 +3231 @@
     return gc;
 }
 
+static HostCheckBox *XboxLEDNonLiveTV()
+{
+    HostCheckBox *gc = new HostCheckBox("XboxLEDNonLiveTV");
+    gc->setLabel(QObject::tr("Ignore LiveTV Recordings"));
+    gc->setHelpText(QObject::tr("Recording monitoring will "
+                    "ignore LiveTV recordings."));
+    gc->setValue(false);
+    return gc;
+}
+
 static HostSpinBox *XboxCheckRec()
 {
     HostSpinBox *gs = new HostSpinBox("XboxCheckRec", 1, 600, 2);
@@ -4636 +4646 @@
     xboxset->addChild(XboxBlinkBIN());
     xboxset->addChild(XboxLEDDefault());
     xboxset->addChild(XboxLEDRecording());
+    xboxset->addChild(XboxLEDNonLiveTV());
     xboxset->addChild(XboxCheckRec());
     addChild(xboxset);
 }