Ticket #13455: libmythtv.190506.v0.30.patch

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1274 +1274 @@
 /// \brief Event handling method, contains event loop.
 void TVRec::run(void)
 {
+    QMutexLocker mylocker(&myLock);
     QMutexLocker lock(&stateChangeLock);
     SetFlags(kFlagRunMainLoop, __FILE__, __LINE__);
     ClearFlags(kFlagExitPlayer | kFlagFinishRecording, __FILE__, __LINE__);

mythtv/libs/libmythtv/tv_rec.h

@@ -383 +383 @@
     // State variables
     mutable QMutex setChannelLock;
     mutable QMutex stateChangeLock;
+    mutable QMutex myLock;
     mutable QMutex pendingRecLock;
     TVState        internalState;
     TVState        desiredNextState;

mythtv/libs/libmythtv/eithelper.cpp

@@ -218 +218 @@
 
     // Report if an unmatched ett was previously noted and overwrite it.
     // See also https://code.mythtv.org/trac/ticket/11739
-    EventIDToETT &elist = unmatched_etts[atsc_key];
-    EventIDToETT::iterator existing_unmatched_ett_it =
-        elist.find(ett->EventID());
-    const QString next_ett_text = ett->ExtendedTextMessage()
-        .GetBestMatch(languagePreferences);
-    if (existing_unmatched_ett_it != elist.end() &&
-        existing_unmatched_ett_it->ett_text != next_ett_text)
-    {
-       LOG(VB_EIT, LOG_DEBUG, LOC +
-           QString("Overwriting previously unmatched ett. stale: %1 major: %2 "
-                   "minor: %3 old ett: %4  new ett: %5")
-               .arg(existing_unmatched_ett_it->IsStale())
-               .arg(atsc_major)
-               .arg(atsc_minor)
-               .arg(existing_unmatched_ett_it->ett_text)
-               .arg(next_ett_text));
-    }
-    elist.insert(ett->EventID(), ATSCEtt(next_ett_text));
+//    EventIDToETT &elist = unmatched_etts[atsc_key];
+//    EventIDToETT::iterator existing_unmatched_ett_it =
+//        elist.find(ett->EventID());
+//    const QString next_ett_text = ett->ExtendedTextMessage()
+//        .GetBestMatch(languagePreferences);
+//    if (existing_unmatched_ett_it != elist.end() &&
+//        existing_unmatched_ett_it->ett_text != next_ett_text)
+//    {
+//       LOG(VB_EIT, LOG_DEBUG, LOC +
+//           QString("Overwriting previously unmatched ett. stale: %1 major: %2 "
+//                   "minor: %3 old ett: %4  new ett: %5")
+//               .arg(existing_unmatched_ett_it->IsStale())
+//               .arg(atsc_major)
+//               .arg(atsc_minor)
+//               .arg(existing_unmatched_ett_it->ett_text)
+//               .arg(next_ett_text));
+//    }
+//    elist.insert(ett->EventID(), ATSCEtt(next_ett_text));
 }
 
 static void parse_dvb_event_descriptors(desc_list_t list, FixupValue fix,