Ticket #1728: 04_activate_slave_control.diff

mythtv/programs/mythbackend/mainserver.cpp

@@ -2767 +2767 @@
         info->ToStringList(retlist);
         delete info;
     }
+    else if (command == "START_EIT_SCAN")
+    {
+        retlist << QString::number((int)enc->StartEITScan(commands[2]));
+    }
 
     SendResponse(pbssock, retlist);
 }

mythtv/programs/mythbackend/playbacksock.cpp

@@ -285 +285 @@
     int ret = strlist[0].toInt();
     return ret;
 }
+
+bool PlaybackSock::StartEITScan(int capturecardnum, QString chanid)
+{
+    QStringList strlist = QString("QUERY_REMOTEENCODER %1").arg(capturecardnum);
+    strlist << "START_EIT_SCAN";
+    strlist << chanid;
+
+    SendReceiveStringList(strlist);
+
+    bool ret = strlist[0].toInt();
+    return ret;
+}
+

mythtv/programs/mythbackend/playbacksock.h

@@ -60 +60 @@
                                  const ProgramInfo *pginfo);
     void RecordPending(int capturecardnum, const ProgramInfo *pginfo, int secsleft);
     int SetSignalMonitoringRate(int capturecardnum, int rate, int notifyFrontend);
+    bool StartEITScan(int capturecardnum, QString chanid);
 
   private:
     bool SendReceiveStringList(QStringList &strlist);

mythtv/programs/mythbackend/eitactivescanner.cpp

@@ -56 +56 @@
             rec->SetEITCache(eitCache);
         }
     }
-//    if (ismaster)
+    if (ismaster)
         StartActiveScan();
 
 

mythplugins/mythweb/includes/mythbackend.php

@@ -17 +17 @@
 
 // MYTH_PROTO_VERSION is defined in libmyth in mythtv/libs/libmyth/mythcontext.h
 // and should be the current MythTV protocol version.
-    define('MYTH_PROTO_VERSION', 29);
+    define('MYTH_PROTO_VERSION', 30);
 
 // NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 // the number of items in a ProgramInfo QStringList group used by

mythtv/libs/libmyth/mythcontext.h

@@ -229 +229 @@
  *   You must also update this value in
  *   mythplugins/mythweb/includes/mythbackend.php
  */
-#define MYTH_PROTO_VERSION "29"
+#define MYTH_PROTO_VERSION "30"
 
 /** \class MythContext
  *  \brief This class contains the runtime context for MythTV.