Ticket #7783: httpstatus.3.patch

mythtv/libs/libmythtv/cardutil.cpp

@@ -1734 +1734 @@
     return QString("[ %1 : %2 ]").arg(cardtype).arg(videodevice);
 }
 
+QString CardUtil::GetDeviceLabel(uint cardid)
+{
+    QString devlabel;
+    MSqlQuery query(MSqlQuery::InitCon());
+    query.prepare("SELECT cardtype, videodevice "
+                  "FROM capturecard WHERE cardid = :CARDID "
+                  "ORDER BY cardid");
+    query.bindValue(":CARDID", cardid);
+
+    if (query.exec() && query.next())
+    {
+        return( GetDeviceLabel( query.value(0).toString(), 
+                                query.value(1).toString()) );
+    }
+
+    return( "[ UNKNOWN ]" );
+}
+
 void CardUtil::GetCardInputs(
     uint                cardid,
     const QString      &device,

mythtv/libs/libmythtv/cardutil.h

@@ -226 +226 @@
 
     static QString      GetDeviceLabel(const QString &cardtype,
                                        const QString &videodevice);
+    static QString      GetDeviceLabel(uint cardid);
 
     static QString      ProbeSubTypeName(uint cardid);
 

mythtv/programs/mythbackend/httpstatus.cpp

@@ -35 +35 @@
 #include "encoderlink.h"
 #include "scheduler.h"
 #include "mainserver.h"
+#include "cardutil.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -200 +201 @@
             else
                 encoder.setAttribute("hostname", elink->GetHostName());
 
+            encoder.setAttribute("devlabel", 
+                          CardUtil::GetDeviceLabel(elink->GetCardID()) );
+
             if (elink->IsConnected())
                 numencoders++;
 
@@ -708 +712 @@
 
                 bool bIsLowOnFreeSpace=e.attribute( "lowOnFreeSpace", "0").toInt();
 
-                os << "    Encoder " << sCardId << " is " << sIsLocal
-                   << " on " << sHostName;
+                QString sDevlabel = e.attribute( "devlabel", "[ UNKNOWN ]");
+
+                os << "    Encoder " << sCardId << " " << sDevlabel 
+                   << " is " << sIsLocal << " on " << sHostName;
 
                 if ((sIsLocal == "remote") && !bConnected)
                 {