summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2012-05-22 19:28:37 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2012-05-22 19:28:37 (GMT)
commit928135e87559bfdc675cdb35a8cf31e8adcde159 (patch)
tree8116dbe1feb1b48e1f15d7e3d3d60a9a5340abe8
parent650b2728375fac7ae45039b2c7fa95208ff9a728 (diff)
Remove the broken "Expire in deleted order" setting.
Unfortunately, this setting has been broken since the day it was committed. When disabled, this setting could cause non-deleted programs to be expired before deleted programs when the Auto Expirer was trying to free up disk space. The desired effect of the setting is now already handled by default, expiring deleted programs in a FIFO order on a particular filesystem. The first program deleted is the first to be expired for disk space if necessary.
-rw-r--r--mythtv/programs/mythbackend/autoexpire.cpp2
-rw-r--r--mythtv/programs/mythfrontend/globalsettings.cpp13
2 files changed, 0 insertions, 15 deletions
diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp
index a34d35e..a8b1927 100644
--- a/mythtv/programs/mythbackend/autoexpire.cpp
+++ b/mythtv/programs/mythbackend/autoexpire.cpp
@@ -967,8 +967,6 @@ void AutoExpire::FillDBOrdered(pginfolist_t &expireList, int expMethod)
orderby = "lastmodified ASC";
break;
case emNormalDeletedPrograms:
- if (gCoreContext->GetNumSetting("DeletedFifoOrder", 0) == 0)
- return;
msg = "Adding deleted programs in FIFO order";
where = "recgroup = 'Deleted'";
orderby = "lastmodified ASC";
diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
index 5c497c8..23e350d 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -307,17 +307,6 @@ static GlobalSpinBox *DeletedMaxAge()
return bs;
};
-static GlobalCheckBox *DeletedFifoOrder()
-{
- GlobalCheckBox *cb = new GlobalCheckBox("DeletedFifoOrder");
- cb->setLabel(QObject::tr("Expire in deleted order"));
- cb->setValue(false);
- cb->setHelpText(QObject::tr(
- "If enabled, delete recordings in the order which they were "
- "originally deleted."));
- return cb;
-};
-
#if 0
class DeletedExpireOptions : public TriggeredConfigurationGroup
{
@@ -332,7 +321,6 @@ class DeletedExpireOptions : public TriggeredConfigurationGroup
HorizontalConfigurationGroup* settings =
new HorizontalConfigurationGroup(false);
- settings->addChild(DeletedFifoOrder());
settings->addChild(DeletedMaxAge());
addTarget("1", settings);
@@ -3425,7 +3413,6 @@ GeneralSettings::GeneralSettings()
autoexp->addChild(expgrp);
// autoexp->addChild(new DeletedExpireOptions());
- autoexp->addChild(DeletedFifoOrder());
autoexp->addChild(DeletedMaxAge());
addChild(autoexp);