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:52:57 (GMT)
commitfe9bd6d3af30bd1090ccd5b63273e6fa2050affd (patch)
treea5ff68db15c6855395c01794432b651d0e6e737c
parente12af866cda3e65a7cc556aec8e18d92015023d5 (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. Backports 928135e87559bfdc675cdb35a8cf31e8adcde159 from master.
-rw-r--r--mythtv/programs/mythbackend/autoexpire.cpp2
-rw-r--r--mythtv/programs/mythfrontend/globalsettings.cpp12
2 files changed, 0 insertions, 14 deletions
diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp
index d71fb2b..1d4e3fc 100644
--- a/mythtv/programs/mythbackend/autoexpire.cpp
+++ b/mythtv/programs/mythbackend/autoexpire.cpp
@@ -933,8 +933,6 @@ void AutoExpire::FillDBOrdered(pginfolist_t &expireList, int expMethod)
orderby = "starttime 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 83e7fae..4304f78 100644
--- a/mythtv/programs/mythfrontend/globalsettings.cpp
+++ b/mythtv/programs/mythfrontend/globalsettings.cpp
@@ -918,17 +918,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;
-};
-
class DeletedExpireOptions : public TriggeredConfigurationGroup
{
public:
@@ -942,7 +931,6 @@ class DeletedExpireOptions : public TriggeredConfigurationGroup
HorizontalConfigurationGroup* settings =
new HorizontalConfigurationGroup(false);
- settings->addChild(DeletedFifoOrder());
settings->addChild(DeletedMaxAge());
addTarget("1", settings);