Ticket #5869: free_scheduling_channel_blacklist.3.diff

File free_scheduling_channel_blacklist.3.diff, 4.5 KB (added by Wolfgang <mythtv@…>, 4 years ago)

  • i18n/mythfrontend_de.ts

     
    73707370        <translation>es war markiert als &quot;Niemals aufnehmen&quot;.</translation> 
    73717371    </message> 
    73727372    <message> 
     7373        <source>A</source> 
     7374        <comment>RecStatusChar rsNotAllowed</comment> 
     7375        <translation>A</translation> 
     7376    </message> 
     7377    <message> 
     7378        <source>Not Allowed</source> 
     7379        <translation>Nicht erlaubt</translation> 
     7380    </message> 
     7381    <message> 
     7382        <source>this recording is not allowed on this channel.</source> 
     7383        <translation>diese Aufnahme ist auf diesem Kanal nicht erlaubt.</translation> 
     7384    </message> 
     7385    <message> 
    73737386        <source>Channel Separator</source> 
    73747387        <translation type="obsolete">Trennzeichen fÃŒr Sender (bei ATSC)</translation> 
    73757388    </message> 

  • libs/libmythtv/programinfo.h

     
    129129    rsInactive = 10, 
    130130    rsNeverRecord = 11, 
    131131    rsOffLine = 12, 
    132     rsOtherShowing = 13 
     132    rsOtherShowing = 13, 
     133    rsNotAllowed = 14 
    133134}; 
    134135 
    135136enum AvailableStatusType { 

  • libs/libmythtv/programinfo.cpp

     
    32983298        return QObject::tr("F", "RecStatusChar rsOffLine"); 
    32993299    case rsOtherShowing: 
    33003300        return QObject::tr("O", "RecStatusChar rsOtherShowing"); 
     3301    case rsNotAllowed: 
     3302        return QObject::tr("A", "RecStatusChar rsNotAllowed"); 
    33013303    default: 
    33023304        return "-"; 
    33033305    } 
    … …  
    33583360            return QObject::tr("Recorder Off-Line"); 
    33593361        case rsOtherShowing: 
    33603362            return QObject::tr("Other Showing"); 
     3363        case rsNotAllowed: 
     3364            return QObject::tr("Not Allowed"); 
    33613365        default: 
    33623366            return QObject::tr("Unknown"); 
    33633367        } 
    … …  
    34713475            message += QObject::tr("this episode will be recorded on a " 
    34723476                                   "different channel in this time slot."); 
    34733477            break; 
     3478        case rsNotAllowed: 
     3479            message += QObject::tr("this recording is not allowed on this channel."); 
     3480            break;             
    34743481        default: 
    34753482            message += QObject::tr("you should never see this."); 
    34763483            break; 
    … …  
    45914598             recstatus == rsEarlierShowing || 
    45924599             recstatus == rsOtherShowing || 
    45934600             recstatus == rsNeverRecord || 
     4601             recstatus == rsNotAllowed || 
    45944602             recstatus == rsRepeat || 
    45954603             recstatus == rsInactive || 
    45964604             recstatus == rsLaterShowing)) 
    … …  
    46104618                recstatus != rsPreviousRecording && 
    46114619                recstatus != rsCurrentRecording && 
    46124620                recstatus != rsNeverRecord && 
     4621                recstatus != rsNotAllowed && 
    46134622                recstatus != rsNotListed) 
    46144623            { 
    46154624                if (recstartts > now) 

  • programs/mythbackend/scheduler.cpp

     
    28102810"oldrecstatus.recstatus, oldrecstatus.reactivate, " 
    28112811"program.videoprop+0, program.subtitletypes+0, program.audioprop+0, " 
    28122812"RECTABLE.storagegroup, capturecard.hostname, recordmatch.oldrecstatus, " 
    2813 "RECTABLE.avg_delay, " +  pwrpri + QString( 
     2813"RECTABLE.avg_delay, " +  pwrpri + QString(", " 
     2814"RECTABLE.search " 
    28142815"FROM recordmatch " 
    28152816" INNER JOIN RECTABLE ON (recordmatch.recordid = RECTABLE.recordid) " 
    28162817" INNER JOIN program ON (recordmatch.chanid = program.chanid AND " 
    … …  
    29702971        if ((threadrunning || specsched) && !cardMap.contains(p->cardid)) 
    29712972            p->recstatus = rsOffLine; 
    29722973 
     2974        // Check for rsNotAllowed 
     2975        if ((result.value(47).toInt() != kNoSearch || 
     2976             p->rectype == kAllRecord || 
     2977             p->rectype == kFindWeeklyRecord || 
     2978             p->rectype == kFindDailyRecord || 
     2979             p->rectype == kFindOneRecord) && p->recpriority <= -500) 
     2980             p->recstatus = rsNotAllowed; 
     2981 
    29732982        // Check for rsTooManyRecordings 
    29742983        if (checkTooMany && tooManyMap[p->recordid] && !p->reactivate) 
    29752984            p->recstatus = rsTooManyRecordings;