diff -r -u -X diff.exclude myth.13823.0705a/mythtv/libs/libmythtv/programinfo.cpp myth.13823.0705b/mythtv/libs/libmythtv/programinfo.cpp
|
|
|
4586 | 4586 | QDateTime rectime = QDateTime::currentDateTime().addSecs( |
4587 | 4587 | -gContext->GetNumSetting("RecordOverTime")); |
4588 | 4588 | |
| 4589 | int categoryOverTime = gContext->GetNumSetting("CategoryOverTime") * 60; |
| 4590 | QDateTime catrectime = QDateTime::currentDateTime().addSecs(-categoryOverTime); |
| 4591 | |
| 4592 | QString overRecordCategory = gContext->GetSetting("OverTimeCategory"); |
| 4593 | |
4589 | 4594 | QString ip = gContext->GetSetting("BackendServerIP"); |
4590 | 4595 | QString port = gContext->GetSetting("BackendServerPort"); |
4591 | 4596 | |
… |
… |
|
4765 | 4770 | proginfo->storagegroup = query.value(36).toString(); |
4766 | 4771 | proginfo->recstatus = rsRecorded; |
4767 | 4772 | |
4768 | | if ((pSchedList != NULL) && (proginfo->recendts > rectime)) |
| 4773 | QDateTime progrectime = rectime; |
| 4774 | if (proginfo->category == overRecordCategory) |
| 4775 | progrectime = catrectime; |
| 4776 | |
| 4777 | if ((pSchedList != NULL) && (proginfo->recendts > progrectime)) |
4769 | 4778 | { |
4770 | 4779 | ProgramInfo *s; |
4771 | 4780 | |
diff -r -u -X diff.exclude myth.13823.0705a/mythtv/libs/libmythtv/tv_play.cpp myth.13823.0705b/mythtv/libs/libmythtv/tv_play.cpp
|
|
|
957 | 957 | playbackinfo = new ProgramInfo(*rcinfo); |
958 | 958 | |
959 | 959 | int overrecordseconds = gContext->GetNumSetting("RecordOverTime"); |
| 960 | |
| 961 | QString overRecordCategory = gContext->GetSetting("OverTimeCategory"); |
| 962 | if (rcinfo->category == overRecordCategory) |
| 963 | overrecordseconds = gContext->GetNumSetting("CategoryOverTime") * 60; |
| 964 | |
960 | 965 | QDateTime curtime = QDateTime::currentDateTime(); |
961 | 966 | QDateTime recendts = rcinfo->recendts.addSecs(overrecordseconds); |
962 | 967 | |
diff -r -u -X diff.exclude myth.13823.0705a/mythtv/programs/mythbackend/mainserver.cpp myth.13823.0705b/mythtv/programs/mythbackend/mainserver.cpp
|
|
|
1029 | 1029 | |
1030 | 1030 | QDateTime rectime = QDateTime::currentDateTime().addSecs( |
1031 | 1031 | -gContext->GetNumSetting("RecordOverTime")); |
| 1032 | |
| 1033 | int categoryOverTime = gContext->GetNumSetting("CategoryOverTime") * 60; |
| 1034 | QDateTime catrectime = QDateTime::currentDateTime().addSecs(-categoryOverTime); |
| 1035 | |
| 1036 | QString overRecordCategory = gContext->GetSetting("OverTimeCategory"); |
| 1037 | |
1032 | 1038 | RecIter ri; |
1033 | 1039 | RecList schedList; |
1034 | 1040 | if (m_sched) |
… |
… |
|
1228 | 1234 | proginfo->recpriority = query.value(36).toInt(); |
1229 | 1235 | |
1230 | 1236 | proginfo->recstatus = rsRecorded; |
1231 | | if (proginfo->recendts > rectime) |
| 1237 | |
| 1238 | QDateTime progrectime = rectime; |
| 1239 | |
| 1240 | if (proginfo->category == overRecordCategory) |
| 1241 | progrectime = catrectime; |
| 1242 | |
| 1243 | if (proginfo->recendts > progrectime) |
1232 | 1244 | { |
1233 | 1245 | for (ri = schedList.begin(); ri != schedList.end(); ri++) |
1234 | 1246 | { |