Ticket #13057: programdata.cpp.diff

File programdata.cpp.diff, 2.8 KB (added by klaas@…, 3 years ago)

git diff of final version, identical to pull request

  • mythtv/libs/libmythtv/programdata.cpp

    diff --git a/mythtv/libs/libmythtv/programdata.cpp b/mythtv/libs/libmythtv/programdata.cpp
    index f99b0d8..0a1f18e 100644
    a b uint DBEvent::UpdateDB( 
    626626    QString  linetref   = inetref;
    627627    QDate loriginalairdate = originalairdate;
    628628
    629     if (match.title.length() >= ltitle.length())
    630         ltitle = match.title;
    631 
    632     if (match.subtitle.length() >= lsubtitle.length())
    633         lsubtitle = match.subtitle;
    634 
    635     if (match.description.length() >= ldesc.length())
    636         ldesc = match.description;
    637 
    638     if (lcategory.isEmpty() && !match.category.isEmpty())
    639         lcategory = match.category;
    640 
    641     if (!lairdate && !match.airdate)
    642         lairdate = match.airdate;
    643 
    644     if (!loriginalairdate.isValid() && match.originalairdate.isValid())
    645         loriginalairdate = match.originalairdate;
    646 
    647     if (lprogramId.isEmpty() && !match.programId.isEmpty())
    648         lprogramId = match.programId;
    649 
    650     if (lseriesId.isEmpty() && !match.seriesId.isEmpty())
    651         lseriesId = match.seriesId;
    652 
    653     if (linetref.isEmpty() && !match.inetref.isEmpty())
    654         linetref= match.inetref;
    655 
    656629    ProgramInfo::CategoryType tmp = categoryType;
    657     if (!categoryType && match.categoryType)
    658         tmp = match.categoryType;
    659 
    660630    QString lcattype = myth_category_type_to_string(tmp);
    661631
    662     unsigned char lsubtype = subtitleType | match.subtitleType;
    663     unsigned char laudio   = audioProps   | match.audioProps;
    664     unsigned char lvideo   = videoProps   | match.videoProps;
    665 
    666     uint lseason = match.season;
    667     uint lepisode = match.episode;
    668     uint lepisodeTotal = match.totalepisodes;
    669 
    670     if (season || episode || totalepisodes)
    671     {
    672         lseason = season;
    673         lepisode = episode;
    674         lepisodeTotal = totalepisodes;
    675     }
     632    unsigned char lsubtype = subtitleType;
     633    unsigned char laudio   = audioProps;
     634    unsigned char lvideo   = videoProps;
    676635
    677     uint lpartnumber = match.partnumber;
    678     uint lparttotal = match.parttotal;
     636    uint lseason = season;
     637    uint lepisode = episode;
     638    uint lepisodeTotal = totalepisodes;
    679639
    680     if (partnumber || parttotal)
    681     {
    682         lpartnumber = partnumber;
    683         lparttotal  = parttotal;
    684     }
     640    uint lpartnumber = partnumber;
     641    uint lparttotal  = parttotal;
    685642
    686     bool lpreviouslyshown = previouslyshown | match.previouslyshown;
     643    bool lpreviouslyshown = previouslyshown;
    687644
    688     uint32_t llistingsource = listingsource | match.listingsource;
     645    uint32_t llistingsource = listingsource;
    689646
    690647    QString lsyndicatedepisodenumber = syndicatedepisodenumber;
    691     if (lsyndicatedepisodenumber.isEmpty() &&
    692         !match.syndicatedepisodenumber.isEmpty())
    693         lsyndicatedepisodenumber = match.syndicatedepisodenumber;
    694648
    695649    query.prepare(
    696650        "UPDATE program "