Skip to content

Commit

Permalink
Remove the broken "Expire in deleted order" setting.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
cpinkham committed May 22, 2012
1 parent 650b272 commit 928135e
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
2 changes: 0 additions & 2 deletions mythtv/programs/mythbackend/autoexpire.cpp
Expand Up @@ -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";
Expand Down
13 changes: 0 additions & 13 deletions mythtv/programs/mythfrontend/globalsettings.cpp
Expand Up @@ -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
{
Expand All @@ -332,7 +321,6 @@ class DeletedExpireOptions : public TriggeredConfigurationGroup

HorizontalConfigurationGroup* settings =
new HorizontalConfigurationGroup(false);
settings->addChild(DeletedFifoOrder());
settings->addChild(DeletedMaxAge());
addTarget("1", settings);

Expand Down Expand Up @@ -3425,7 +3413,6 @@ GeneralSettings::GeneralSettings()

autoexp->addChild(expgrp);
// autoexp->addChild(new DeletedExpireOptions());
autoexp->addChild(DeletedFifoOrder());
autoexp->addChild(DeletedMaxAge());

addChild(autoexp);
Expand Down

0 comments on commit 928135e

Please sign in to comment.