Permalink
Browse files

More aggressively move recordings to resolve conflicts.

Change the scheduler to move already scheduled programs in order to
resolve conflicts as long as the recording isn't moved to a lower
priority showing.  Previously, the scheduler would only do this in one
very restictive case.  N.B. the scheduler might still move a recording
to a lower priority showing in a later pass if the "Reschedule higher
priorities" setting is enabled.
  • Loading branch information...
1 parent 96f505f commit 53cf459f39d836ac079d301b632767f26fcf1a0a @gigem gigem committed Jun 16, 2011
Showing with 2 additions and 3 deletions.
  1. +2 −3 mythtv/programs/mythbackend/scheduler.cpp
@@ -1103,7 +1103,7 @@ bool Scheduler::TryAnotherShowing(RecordingInfo *p, bool samePriority,
continue;
if (samePriority &&
- (q->GetRecordingPriority() != p->GetRecordingPriority()))
+ (q->GetRecordingPriority() < p->GetRecordingPriority()))
{
continue;
}
@@ -1294,8 +1294,7 @@ void Scheduler::MoveHigherRecords(bool move_this)
RecConstIter k = cardlist.begin();
for ( ; FindNextConflict(cardlist, p, k ); ++k)
{
- if (p->GetRecordingPriority() != (*k)->GetRecordingPriority() ||
- !TryAnotherShowing(*k, true))
+ if (!TryAnotherShowing(*k, true))
{
RestoreRecStatus();
break;

0 comments on commit 53cf459

Please sign in to comment.