From 928135e87559bfdc675cdb35a8cf31e8adcde159 Mon Sep 17 00:00:00 2001 From: Chris Pinkham Date: Tue, 22 May 2012 15:28:37 -0400 Subject: [PATCH] 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. --- mythtv/programs/mythbackend/autoexpire.cpp | 2 -- mythtv/programs/mythfrontend/globalsettings.cpp | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/mythtv/programs/mythbackend/autoexpire.cpp b/mythtv/programs/mythbackend/autoexpire.cpp index a34d35ef48d..a8b1927c335 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 5c497c81010..23e350de3b1 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);