Ticket #13571: 20200516-encoderlink-rc2.patch

mythtv/programs/mythbackend/httpstatus.cpp

@@ -197 +197 @@
 
     TVRec::s_inputsLock.lockForRead();
 
-    foreach (auto elink, *m_pEncoders)
+    for (auto elink : qAsConst(*m_pEncoders))
     {
         if (elink != nullptr)
         {

mythtv/programs/mythbackend/mainserver.cpp

@@ -1863 +1863 @@
 
         bool wasAsleep = true;
         TVRec::s_inputsLock.lockForRead();
-        foreach (auto elink, *m_encoderList)
+        for (auto elink : qAsConst(*m_encoderList))
         {
             if (elink->GetHostName() == commands[2])
             {
@@ -2930 +2930 @@
                 if (m_sched)
                     m_sched->UpdateRecStatus(&recinfo);
             }
+
+            break;
         }
     }
     TVRec::s_inputsLock.unlock();
@@ -4238 +4240 @@
     QString enchost;
 
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto elink, *m_encoderList)
+    for (auto elink : qAsConst(*m_encoderList))
     {
         // we're looking for a specific card but this isn't the one we want
         if ((cardid != -1) && (cardid != elink->GetInputID()))
@@ -4360 +4362 @@
     vector<InputInfo> freeinputs;
     QMap<uint, QSet<uint> > groupids;
 
-    // Lopp over each encoder and divide the inputs into busy and free
-    // lists.
+    // Loop over each encoder and divide the inputs into busy and free lists.
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto elink, *m_encoderList)
+    for (auto elink : qAsConst(*m_encoderList))
     {
         InputInfo info;
         info.m_inputId = elink->GetInputID();
@@ -4895 +4896 @@
     }
 
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto & encoder, *m_encoderList)
+    for (auto encoder : qAsConst(*m_encoderList))
     {
         if (encoder)
         {
             ok &= encoder->SetChannelInfo(chanid, sourceid, oldcnum,
-                                        callsign, channum, channame, xmltv);
+                                          callsign, channum, channame, xmltv);
         }
     }
     TVRec::s_inputsLock.unlock();
@@ -5091 +5092 @@
     size_t totalKBperMin = 0;
 
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto enc, *m_encoderList)
+    for (auto enc : qAsConst(*m_encoderList))
     {
         if (!enc->IsConnected() || !enc->IsBusy())
             continue;
@@ -7328 +7329 @@
     QStringList retlist;
 
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto elink, *m_encoderList)
+    for (auto elink : qAsConst(*m_encoderList))
     {
         if (elink->IsBusyRecording()) {
             RecordingsInProgress++;
@@ -7793 +7794 @@
 
                 bool isFallingAsleep = true;
                 TVRec::s_inputsLock.lockForRead();
-                foreach (auto elink, *m_encoderList)
+                for (auto elink : qAsConst(*m_encoderList))
                 {
                     if (elink->GetSocket() == pbs)
                     {
@@ -7834 +7835 @@
                 if (chain->HostSocketCount() == 0)
                 {
                     TVRec::s_inputsLock.lockForRead();
-                    foreach (auto enc, *m_encoderList)
+                    for (auto enc : qAsConst(*m_encoderList))
                     {
                         if (enc->IsLocal())
                         {
@@ -8181 +8182 @@
     QStringList strlist( str );
 
     TVRec::s_inputsLock.lockForRead();
-    foreach (auto elink, *m_encoderList)
+    for (auto elink : qAsConst(*m_encoderList))
     {
         elink->CancelNextRecording(true);
         ProgramInfo *pinfo = elink->GetRecording();
@@ -8354 +8355 @@
     {
         int active = 0;
         TVRec::s_inputsLock.lockForRead();
-        foreach (auto elink, *m_encoderList)
+        for (auto elink : qAsConst(*m_encoderList))
         {
             if (not elink->IsLocal())
                 continue;

mythtv/programs/mythbackend/scheduler.cpp

@@ -2524 +2524 @@
     QReadLocker tvlocker(&TVRec::s_inputsLock);
 
     QMap<int, EncoderLink*>::const_iterator tvit = m_tvList->constFind(ri.GetInputID());
-    if (tvit == m_tvList->end())
+    if (tvit == m_tvList->constEnd())
         return;
 
     QString sysEventKey = ri.MakeUniqueKey();
@@ -2607 +2607 @@
                     "to reschedule around its tuners.")
                 .arg(nexttv->GetHostName()));
 
-        foreach (auto & enc, *m_tvList)
+        for (auto enc : qAsConst(*m_tvList))
         {
             if (enc->GetHostName() == nexttv->GetHostName())
                 enc->SetSleepStatus(sStatus_Undefined);
@@ -2682 +2682 @@
     QReadLocker tvlocker(&TVRec::s_inputsLock);
 
     QMap<int, EncoderLink*>::const_iterator tvit = m_tvList->constFind(ri.GetInputID());
-    if (tvit == m_tvList->end())
+    if (tvit == m_tvList->constEnd())
     {
         QString msg = QString("Invalid cardid [%1] for %2")
             .arg(ri.GetInputID()).arg(ri.GetTitle());
@@ -2764 +2764 @@
                         "to reschedule around its tuners.")
                     .arg(nexttv->GetHostName()));
 
-            foreach (auto enc, *m_tvList)
+            for (auto enc : qAsConst(*m_tvList))
             {
                 if (enc->GetHostName() == nexttv->GetHostName())
                     enc->SetSleepStatus(sStatus_Undefined);
@@ -3452 +3452 @@
     QReadLocker tvlocker(&TVRec::s_inputsLock);
 
     bool someSlavesCanSleep = false;
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if (enc->CanSleep())
             someSlavesCanSleep = true;
@@ -3533 +3533 @@
     LOG(VB_SCHEDULE, LOG_DEBUG, QString("  Shutting down slaves which will "
         "be inactive for the next %1 minutes and can be put to sleep.")
             .arg(sleepThreshold / 60));
-
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if ((!enc->IsLocal()) &&
             (enc->IsAwake()) &&
@@ -3558 +3557 @@
 
                 if (enc->GoToSleep())
                 {
-                    foreach (auto slv, *m_tvList)
+                    for (auto slv : qAsConst(*m_tvList))
                     {
                         if (slv->GetHostName() == thisHost)
                         {
@@ -3576 +3575 @@
                     LOG(VB_GENERAL, LOG_ERR, LOC +
                         QString("Unable to shutdown %1 slave backend, setting "
                                 "sleep status to undefined.").arg(thisHost));
-                    foreach (auto slv, *m_tvList)
+                    for (auto slv : qAsConst(*m_tvList))
                     {
                         if (slv->GetHostName() == thisHost)
                             slv->SetSleepStatus(sStatus_Undefined);
@@ -3605 +3604 @@
         LOG(VB_GENERAL, LOG_NOTICE,
             QString("Trying to Wake Up %1, but this slave "
                     "does not have a WakeUpCommand set.").arg(slaveHostname));
-
-        foreach (auto enc, *m_tvList)
+        for (auto enc : qAsConst(*m_tvList))
         {
             if (enc->GetHostName() == slaveHostname)
                 enc->SetSleepStatus(sStatus_Undefined);
@@ -3616 +3614 @@
     }
 
     QDateTime curtime = MythDate::current();
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if (setWakingStatus && (enc->GetHostName() == slaveHostname))
             enc->SetSleepStatus(sStatus_Waking);
@@ -3640 +3638 @@
 
     QStringList SlavesThatCanWake;
     QString thisSlave;
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if (enc->IsLocal())
             continue;
@@ -4314 +4312 @@
     RecList tmpList;
 
     QMap<int, bool> cardMap;
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if (enc->IsConnected() || enc->IsAsleep())
             cardMap[enc->GetInputID()] = true;
@@ -5447 +5445 @@
                         QString backuppath = expire->GetPathname();
                         ProgramInfo *programinfo = expire;
                         bool foundSlave = false;
-
-                        foreach (auto & enc, *m_tvList)
+                        for (auto enc : qAsConst(*m_tvList))
                         {
                             if (enc->GetHostName() ==
                                 programinfo->GetHostname())
@@ -5606 +5603 @@
         return;
 
     // Build a list of active livetv programs
-    foreach (auto enc, *m_tvList)
+    for (auto enc : qAsConst(*m_tvList))
     {
         if (kState_WatchingLiveTV != enc->GetState())
             continue;

mythtv/programs/mythbackend/services/dvr.cpp

@@ -680 +680 @@
 
     QReadLocker tvlocker(&TVRec::s_inputsLock);
     QList<InputInfo> inputInfoList = CardUtil::GetAllInputInfo();
-    foreach (auto elink, tvList)
+    for (auto elink : qAsConst(tvList))
     {
         if (elink != nullptr)
         {