Ticket #5869: free_scheduling_channel_blacklist.2.diff
File free_scheduling_channel_blacklist.2.diff, 8.7 KB (added by , 15 years ago) |
---|
-
i18n/mythfrontend_de.ts
7370 7370 <translation>es war markiert als "Niemals aufnehmen".</translation> 7371 7371 </message> 7372 7372 <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> 7373 7386 <source>Channel Separator</source> 7374 7387 <translation type="obsolete">Trennzeichen fÃŒr Sender (bei ATSC)</translation> 7375 7388 </message> -
libs/libmythtv/programinfo.h
129 129 rsInactive = 10, 130 130 rsNeverRecord = 11, 131 131 rsOffLine = 12, 132 rsOtherShowing = 13 132 rsOtherShowing = 13, 133 rsNotAllowed = 14 133 134 }; 134 135 135 136 enum AvailableStatusType { -
libs/libmythtv/programinfo.cpp
3298 3298 return QObject::tr("F", "RecStatusChar rsOffLine"); 3299 3299 case rsOtherShowing: 3300 3300 return QObject::tr("O", "RecStatusChar rsOtherShowing"); 3301 case rsNotAllowed: 3302 return QObject::tr("A", "RecStatusChar rsNotAllowed"); 3301 3303 default: 3302 3304 return "-"; 3303 3305 } … … 3358 3360 return QObject::tr("Recorder Off-Line"); 3359 3361 case rsOtherShowing: 3360 3362 return QObject::tr("Other Showing"); 3363 case rsNotAllowed: 3364 return QObject::tr("Not Allowed"); 3361 3365 default: 3362 3366 return QObject::tr("Unknown"); 3363 3367 } … … 3471 3475 message += QObject::tr("this episode will be recorded on a " 3472 3476 "different channel in this time slot."); 3473 3477 break; 3478 case rsNotAllowed: 3479 message += QObject::tr("this recording is not allowed on this channel."); 3480 break; 3474 3481 default: 3475 3482 message += QObject::tr("you should never see this."); 3476 3483 break; … … 4591 4598 recstatus == rsEarlierShowing || 4592 4599 recstatus == rsOtherShowing || 4593 4600 recstatus == rsNeverRecord || 4601 recstatus == rsNotAllowed || 4594 4602 recstatus == rsRepeat || 4595 4603 recstatus == rsInactive || 4596 4604 recstatus == rsLaterShowing)) … … 4610 4618 recstatus != rsPreviousRecording && 4611 4619 recstatus != rsCurrentRecording && 4612 4620 recstatus != rsNeverRecord && 4621 recstatus != rsNotAllowed && 4613 4622 recstatus != rsNotListed) 4614 4623 { 4615 4624 if (recstartts > now) -
programs/mythbackend/scheduler.cpp
2798 2798 "RECTABLE.dupin, " 2799 2799 "recduplicate, " 2800 2800 "findduplicate, " 2801 "RECTABLE.type, RECTABLE.recordid, "2801 "RECTABLE.type, RECTABLE.recordid, RECTABLE.search, " 2802 2802 "program.starttime - INTERVAL RECTABLE.startoffset minute AS recstartts, " 2803 2803 "program.endtime + INTERVAL RECTABLE.endoffset minute AS recendts, " 2804 2804 "program.previouslyshown, RECTABLE.recgroup, RECTABLE.dupmethod, " … … 2854 2854 while (result.next()) 2855 2855 { 2856 2856 ProgramInfo *p = new ProgramInfo; 2857 p->reactivate = result.value(3 8).toInt();2858 p->oldrecstatus = RecStatusType(result.value(3 7).toInt());2857 p->reactivate = result.value(39).toInt(); 2858 p->oldrecstatus = RecStatusType(result.value(38).toInt()); 2859 2859 if (p->oldrecstatus == rsAborted || p->reactivate) 2860 2860 p->recstatus = rsUnknown; 2861 2861 else … … 2874 2874 p->category = result.value(11).toString(); 2875 2875 p->recpriority = result.value(12).toInt(); 2876 2876 p->dupin = RecordingDupInType(result.value(13).toInt()); 2877 p->dupmethod = RecordingDupMethodType(result.value(2 2).toInt());2877 p->dupmethod = RecordingDupMethodType(result.value(23).toInt()); 2878 2878 p->rectype = RecordingType(result.value(16).toInt()); 2879 2879 p->recordid = result.value(17).toInt(); 2880 2880 2881 p->recstartts = result.value(1 8).toDateTime();2882 p->recendts = result.value( 19).toDateTime();2883 p->repeat = result.value(2 0).toInt();2884 p->recgroup = result.value(2 1).toString();2885 p->storagegroup = result.value(4 2).toString();2886 p->playgroup = result.value(3 6).toString();2887 p->chancommfree = COMM_DETECT_COMMFREE == result.value(2 3).toInt();2888 p->hostname = result.value(4 3).toString();2889 p->cardid = result.value(2 4).toInt();2890 p->inputid = result.value(2 5).toInt();2891 p->shareable = result.value(2 6).toInt();2892 p->seriesid = result.value(2 7).toString();2893 p->programid = result.value(2 8).toString();2894 p->catType = result.value( 29).toString();2895 p->year = result.value(3 0).toString();2896 p->stars = result.value(3 1).toDouble();2881 p->recstartts = result.value(19).toDateTime(); 2882 p->recendts = result.value(20).toDateTime(); 2883 p->repeat = result.value(21).toInt(); 2884 p->recgroup = result.value(22).toString(); 2885 p->storagegroup = result.value(43).toString(); 2886 p->playgroup = result.value(37).toString(); 2887 p->chancommfree = COMM_DETECT_COMMFREE == result.value(24).toInt(); 2888 p->hostname = result.value(44).toString(); 2889 p->cardid = result.value(25).toInt(); 2890 p->inputid = result.value(26).toInt(); 2891 p->shareable = result.value(27).toInt(); 2892 p->seriesid = result.value(28).toString(); 2893 p->programid = result.value(29).toString(); 2894 p->catType = result.value(30).toString(); 2895 p->year = result.value(31).toString(); 2896 p->stars = result.value(32).toDouble(); 2897 2897 2898 if (result.value(3 2).isNull())2898 if (result.value(33).isNull()) 2899 2899 { 2900 2900 p->originalAirDate = QDate (0, 1, 1); 2901 2901 p->hasAirDate = false; 2902 2902 } 2903 2903 else 2904 2904 { 2905 p->originalAirDate = QDate::fromString(result.value(3 2).toString(), Qt::ISODate);2905 p->originalAirDate = QDate::fromString(result.value(33).toString(), Qt::ISODate); 2906 2906 p->hasAirDate = true; 2907 2907 } 2908 2908 2909 bool inactive = result.value(3 3).toInt();2910 p->parentid = result.value(3 4).toInt();2911 p->findid = result.value(3 5).toInt();2909 bool inactive = result.value(34).toInt(); 2910 p->parentid = result.value(35).toInt(); 2911 p->findid = result.value(36).toInt(); 2912 2912 2913 2913 2914 p->videoproperties = result.value( 39).toInt();2915 p->subtitleType = result.value(4 0).toInt();2916 p->audioproperties = result.value(4 1).toInt();2914 p->videoproperties = result.value(40).toInt(); 2915 p->subtitleType = result.value(41).toInt(); 2916 p->audioproperties = result.value(42).toInt(); 2917 2917 2918 2918 if (!recTypeRecPriorityMap.contains(p->rectype)) 2919 2919 recTypeRecPriorityMap[p->rectype] = … … 2922 2922 2923 2923 if (autopriority) 2924 2924 p->recpriority += autopriority - 2925 (result.value(4 5).toInt() * autostrata / 200);2925 (result.value(46).toInt() * autostrata / 200); 2926 2926 2927 p->recpriority2 = result.value(4 6).toInt();2927 p->recpriority2 = result.value(47).toInt(); 2928 2928 2929 2929 if (complexpriority == 0) 2930 2930 { … … 2970 2970 if ((threadrunning || specsched) && !cardMap.contains(p->cardid)) 2971 2971 p->recstatus = rsOffLine; 2972 2972 2973 // Check for rsNotAllowed 2974 if (result.value(18).toInt() != kNoSearch && p->recpriority <= -500) 2975 p->recstatus = rsNotAllowed; 2976 2973 2977 // Check for rsTooManyRecordings 2974 2978 if (checkTooMany && tooManyMap[p->recordid] && !p->reactivate) 2975 2979 p->recstatus = rsTooManyRecordings; … … 2989 2993 2990 2994 if ((p->dupin & kDupsInOldRecorded) && result.value(10).toInt()) 2991 2995 { 2992 if (result.value(4 4).toInt() == rsNeverRecord)2996 if (result.value(45).toInt() == rsNeverRecord) 2993 2997 p->recstatus = rsNeverRecord; 2994 2998 else 2995 2999 p->recstatus = rsPreviousRecording;