Ticket #11739: libmythtv.160508.v0.28.patch

File libmythtv.160508.v0.28.patch, 2.8 KB (added by deadletterfile@…, 3 years ago)

libmythtv patch for v0.28

  • tv_rec.cpp

    old new  
    12741274/// \brief Event handling method, contains event loop.
    12751275void TVRec::run(void)
    12761276{
     1277    QMutexLocker mylocker(&myLock);
    12771278    QMutexLocker lock(&stateChangeLock);
    12781279    SetFlags(kFlagRunMainLoop, __FILE__, __LINE__);
    12791280    ClearFlags(kFlagExitPlayer | kFlagFinishRecording, __FILE__, __LINE__);
  • tv_rec.h

    old new  
    383383    // State variables
    384384    mutable QMutex setChannelLock;
    385385    mutable QMutex stateChangeLock;
     386    mutable QMutex myLock;
    386387    mutable QMutex pendingRecLock;
    387388    TVState        internalState;
    388389    TVState        desiredNextState;
  • eithelper.cpp

    old new  
    218218
    219219    // Report if an unmatched ett was previously noted and overwrite it.
    220220    // See also https://code.mythtv.org/trac/ticket/11739
    221     EventIDToETT &elist = unmatched_etts[atsc_key];
    222     EventIDToETT::iterator existing_unmatched_ett_it =
    223         elist.find(ett->EventID());
    224     const QString next_ett_text = ett->ExtendedTextMessage()
    225         .GetBestMatch(languagePreferences);
    226     if (existing_unmatched_ett_it != elist.end() &&
    227         existing_unmatched_ett_it->ett_text != next_ett_text)
    228     {
    229        LOG(VB_EIT, LOG_DEBUG, LOC +
    230            QString("Overwriting previously unmatched ett. stale: %1 major: %2 "
    231                    "minor: %3 old ett: %4  new ett: %5")
    232                .arg(existing_unmatched_ett_it->IsStale())
    233                .arg(atsc_major)
    234                .arg(atsc_minor)
    235                .arg(existing_unmatched_ett_it->ett_text)
    236                .arg(next_ett_text));
    237     }
    238     elist.insert(ett->EventID(), ATSCEtt(next_ett_text));
     221//    EventIDToETT &elist = unmatched_etts[atsc_key];
     222//    EventIDToETT::iterator existing_unmatched_ett_it =
     223//        elist.find(ett->EventID());
     224//    const QString next_ett_text = ett->ExtendedTextMessage()
     225//        .GetBestMatch(languagePreferences);
     226//    if (existing_unmatched_ett_it != elist.end() &&
     227//        existing_unmatched_ett_it->ett_text != next_ett_text)
     228//    {
     229//       LOG(VB_EIT, LOG_DEBUG, LOC +
     230//           QString("Overwriting previously unmatched ett. stale: %1 major: %2 "
     231//                   "minor: %3 old ett: %4  new ett: %5")
     232//               .arg(existing_unmatched_ett_it->IsStale())
     233//               .arg(atsc_major)
     234//               .arg(atsc_minor)
     235//               .arg(existing_unmatched_ett_it->ett_text)
     236//               .arg(next_ett_text));
     237//    }
     238//    elist.insert(ett->EventID(), ATSCEtt(next_ett_text));
    239239}
    240240
    241241static void parse_dvb_event_descriptors(desc_list_t list, FixupValue fix,