summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2012-11-28 19:42:40 (GMT)
committer David Engel <dengel@mythtv.org>2012-11-28 19:42:40 (GMT)
commit6eaa373c0391f6a298c1db5548dfdf34ed87de23 (patch)
treec01d9f102de48c0735f06589fe826f20747b3a82
parent4b059d3e416fd328f174ddc2cc181452534e0d0a (diff)
Remove the SchedMoveHigher scheduler setting.
This setting controls whether or not the scheduler can move a high priority program that is already scheduled to another time, channel or input to make room for a low priority program. The scheduler now always does this. In the rare case the resulting schedule is undesirable, overrides can be used to achieve the desired result.
-rw-r--r--mythtv/programs/mythbackend/scheduler.cpp6
-rw-r--r--mythtv/programs/mythbackend/scheduler.h1
-rw-r--r--mythtv/programs/mythfrontend/globalsettings.cpp14
3 files changed, 1 insertions, 20 deletions
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 36858cf..f3b375a 100644
--- a/mythtv/programs/mythbackend/scheduler.cpp
+++ b/mythtv/programs/mythbackend/scheduler.cpp
@@ -62,7 +62,6 @@ Scheduler::Scheduler(bool runthread, QMap<int, EncoderLink *> *tvList,
m_queueLock(),
reclist_changed(false),
specsched(master_sched),
- schedMoveHigher(false),
schedulingEnabled(true),
m_tvList(tvList),
m_expirer(NULL),
@@ -360,7 +359,6 @@ static bool comp_priority(RecordingInfo *a, RecordingInfo *b)
bool Scheduler::FillRecordList(void)
{
- schedMoveHigher = (bool)gCoreContext->GetNumSetting("SchedMoveHigher");
schedTime = MythDate::current();
LOG(VB_SCHEDULE, LOG_INFO, "BuildWorkList...");
@@ -1365,9 +1363,7 @@ void Scheduler::MoveHigherRecords(bool move_this)
RecConstIter k = conflictlist.begin();
for ( ; FindNextConflict(conflictlist, p, k); ++k)
{
- if ((p->GetRecordingPriority() < (*k)->GetRecordingPriority() &&
- !schedMoveHigher && move_this) ||
- !TryAnotherShowing(*k, false, !move_this))
+ if (!TryAnotherShowing(*k, false, !move_this))
{
RestoreRecStatus();
break;
diff --git a/mythtv/programs/mythbackend/scheduler.h b/mythtv/programs/mythbackend/scheduler.h
index 4a194a9..0ccb232 100644
--- a/mythtv/programs/mythbackend/scheduler.h
+++ b/mythtv/programs/mythbackend/scheduler.h
@@ -220,7 +220,6 @@ class Scheduler : public MThread, public MythScheduler
bool reclist_changed;
bool specsched;
- bool schedMoveHigher;
bool schedulingEnabled;
QMap<int, bool> schedAfterStartMap;
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 008ab2c..a1f92e5 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -2272,19 +2272,6 @@ class ChannelGroupSettings : public TriggeredConfigurationGroup
// General RecPriorities settings
-static GlobalCheckBox *GRSchedMoveHigher()
-{
- GlobalCheckBox *bc = new GlobalCheckBox("SchedMoveHigher");
- bc->setLabel(QObject::tr("Reschedule higher priorities"));
- bc->setHelpText(QObject::tr("Move higher priority programs to other "
- "cards and showings when resolving conflicts. This "
- "can be used to record lower priority programs that "
- "would otherwise not be recorded, but risks missing "
- "a higher priority program if the schedule changes."));
- bc->setValue(true);
- return bc;
-}
-
static GlobalComboBox *GRSchedOpenEnd()
{
GlobalComboBox *bc = new GlobalComboBox("SchedOpenEnd");
@@ -3462,7 +3449,6 @@ GeneralRecPrioritiesSettings::GeneralRecPrioritiesSettings()
VerticalConfigurationGroup* sched = new VerticalConfigurationGroup(false);
sched->setLabel(QObject::tr("Scheduler Options"));
- sched->addChild(GRSchedMoveHigher());
sched->addChild(GRSchedOpenEnd());
sched->addChild(GRPrefInputRecPriority());
sched->addChild(GRHDTVRecPriority());