summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2011-08-16 19:17:03 (GMT)
committer David Engel <dengel@mythtv.org>2011-08-16 19:17:03 (GMT)
commit8b9c59536fe78e81852cd62a0600690ebbb99864 (patch)
tree4e86eb284bd017ddde081c18a2e4702eccfa21d4
parent5ec6561c6ecd291a15d19b8a0f3457ca0c25bac7 (diff)
Remove redundant sort in the scheduler.
Scheduler::GetAllPending() was performing an extra sort and was changing the intended ordering.
-rw-r--r--mythtv/programs/mythbackend/scheduler.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 354de46..0726410 100644
--- a/mythtv/programs/mythbackend/scheduler.cpp
+++ b/mythtv/programs/mythbackend/scheduler.cpp
@@ -341,17 +341,6 @@ static bool comp_priority(RecordingInfo *a, RecordingInfo *b)
return a->GetRecordingRuleID() < b->GetRecordingRuleID();
}
-static bool comp_timechannel(RecordingInfo *a, RecordingInfo *b)
-{
- if (a->GetRecordingStartTime() != b->GetRecordingStartTime())
- return a->GetRecordingStartTime() < b->GetRecordingStartTime();
- if (a->GetChanNum() == b->GetChanNum())
- return a->GetChanID() < b->GetChanID();
- if (a->GetChanNum().toInt() > 0 && b->GetChanNum().toInt() > 0)
- return a->GetChanNum().toInt() < b->GetChanNum().toInt();
- return a->GetChanNum() < b->GetChanNum();
-}
-
bool Scheduler::FillRecordList(void)
{
schedMoveHigher = (bool)gCoreContext->GetNumSetting("SchedMoveHigher");
@@ -1554,8 +1543,6 @@ bool Scheduler::GetAllPending(RecList &retList) const
retList.push_back(new RecordingInfo(**it));
}
- SORT_RECLIST(retList, comp_timechannel);
-
return hasconflicts;
}