Ticket #5561: dvb_snr_through_proto.diff

mythtv/libs/libmythtv/libmythtv.pro

@@ -140 +140 @@
 HEADERS += channeleditor.h          channelsettings.h
 HEADERS += previewgenerator.h       transporteditor.h
 HEADERS += importicons.h
+HEADERS += dvbsignalmeter.h
 
 SOURCES += programinfo.cpp          proglist.cpp
 SOURCES += RingBuffer.cpp           avfringbuffer.cpp
@@ -162 +163 @@
 SOURCES += channeleditor.cpp        channelsettings.cpp
 SOURCES += previewgenerator.cpp     transporteditor.cpp
 SOURCES += importicons.cpp
+SOURCES += dvbsignalmeter.cpp
 
 # DiSEqC
 HEADERS += diseqc.h                 diseqcsettings.h

mythtv/libs/libmythtv/dvbsignalmeter.cpp

@@ +1 @@
+// -*- Mode: c++ -*-
+
+// C includes
+#include <cstdio>
+#include <pthread.h>
+#include <unistd.h>
+
+
+// MythTV includes - General
+#include "mythcontext.h"
+#include "cardutil.h"
+
+#include "dvbchannel.h"
+#include "channel.h"
+#include "compat.h"
+
+#include "dvbsignalmeter.h"
+
+
+int getDVBSignalMeterValues(uint cardid, uint &sig, uint &snr)
+{
+    QString device = CardUtil::GetVideoDevice(cardid);
+    if (device.isEmpty())
+    {
+        VERBOSE(VB_IMPORTANT, QString("No Device for cardid=%1").arg(cardid));
+        return 0;
+    }
+
+    QString card_type = CardUtil::GetRawCardType(cardid);
+
+    DVBChannel *channel;
+    
+    if ("DVB" == card_type)
+    {
+        channel = new DVBChannel(device.toInt());
+    }
+    else
+    {
+        VERBOSE(VB_IMPORTANT, QString("Not a DVB card; cardid=%1").arg(cardid));
+        return 0;
+    }
+
+
+    // explicitly set the cardid
+    channel->SetCardID(cardid);
+
+    // If the backend is running this may fail...
+    if (!channel->Open())
+    {
+        VERBOSE(VB_IMPORTANT, QString("DVB Channel could not be opened; cardid=%1").arg(cardid));
+        return 0;
+    }
+
+    // Get info from card
+    sig = (uint) (channel->GetSignalStrength() * 65535);
+    snr = (uint) (channel->GetSNR() * 65535);
+
+    VERBOSE(VB_IMPORTANT,QString("DVBSignalMeter: sig=%1 snr=%2").arg(sig).arg(snr));
+
+
+    channel->Close();
+    delete channel;
+    
+    return 1;
+}
+

mythtv/libs/libmythtv/dvbsignalmeter.h

@@ +1 @@
+int getDVBSignalMeterValues(uint cardid, uint &sig, uint &snr);

mythtv/programs/mythbackend/mainserver.h

@@ -133 +133 @@
     void HandleQueryMemStats(PlaybackSock *pbs);
     void HandleBlockShutdown(bool blockShutdown, PlaybackSock *pbs);
     
+    void HandleDVBSignalQuery(QStringList &tokens, PlaybackSock *pbs);
+
+    
     void SendResponse(MythSocket *pbs, QStringList &commands);
 
     void getGuideDataThrough(QDateTime &GuideDataThrough);

mythtv/programs/mythbackend/mainserver.cpp

@@ -41 +41 @@
 #include "libmyth/mythcontext.h"
 #include "libmyth/util.h"
 #include "libmyth/mythdbcon.h"
+#include "libmythtv/dvbsignalmeter.h"
 
 #include "mainserver.h"
 #include "scheduler.h"
@@ -52 +53 @@
 #include "storagegroup.h"
 #include "compat.h"
 
+
+
 /** Milliseconds to wait for an existing thread from
  *  process request thread pool.
  */
@@ -561 +564 @@
         else
             HandleSettingQuery(tokens, pbs);
     }
+    else if (command == "QUERY_DVBSIGNAL")
+    {
+        if (tokens.size() != 2)
+            VERBOSE(VB_IMPORTANT, "Bad QUERY_DVBSIGNAL");
+        else
+            HandleDVBSignalQuery(tokens, pbs);
+    }
     else if (command == "SET_SETTING")
     {
         if (tokens.size() != 4)
@@ -3523 +3533 @@
     return;
 }
 
+void MainServer::HandleDVBSignalQuery(QStringList &tokens, PlaybackSock *pbs)
+{
+// Format: HandleDVBSignalQuery <cardid> 
+// Returns ok/fail signal strength , SNR  string
+
+    MythSocket *pbssock = NULL;
+    if (pbs)
+        pbssock = pbs->getSocket();
+
+    QString cardidstr = tokens[1];
+
+    QStringList retlist;
+    
+    uint cardid = (uint) cardidstr.toInt();
+    uint sig = 0, snr = 0;
+    int ret = getDVBSignalMeterValues( cardid, sig, snr );
+
+    if(ret == 1)
+        retlist << "ok";
+    else
+        retlist << "fail";
+    
+    retlist << QString("%1").arg(sig);
+    retlist << QString("%1").arg(snr);
+    
+    if (pbssock)
+        SendResponse(pbssock, retlist);
+
+    return;
+}
+
+
 void MainServer::HandleSetSetting(QStringList &tokens,
                                   PlaybackSock *pbs)
 {