Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 928135e from master.
  • Loading branch information...
commit fe9bd6d3af30bd1090ccd5b63273e6fa2050affd 1 parent e12af86
Chris Pinkham authored May 22, 2012
2  mythtv/programs/mythbackend/autoexpire.cpp
@@ -933,8 +933,6 @@ void AutoExpire::FillDBOrdered(pginfolist_t &expireList, int expMethod)
933 933
             orderby = "starttime ASC";
934 934
             break;
935 935
         case emNormalDeletedPrograms:
936  
-            if (gCoreContext->GetNumSetting("DeletedFifoOrder", 0) == 0)
937  
-                return;
938 936
             msg = "Adding deleted programs in FIFO order";
939 937
             where = "recgroup = 'Deleted'";
940 938
             orderby = "lastmodified ASC";
12  mythtv/programs/mythfrontend/globalsettings.cpp
@@ -918,17 +918,6 @@ static GlobalSpinBox *DeletedMaxAge()
918 918
     return bs;
919 919
 };
920 920
 
921  
-static GlobalCheckBox *DeletedFifoOrder()
922  
-{
923  
-    GlobalCheckBox *cb = new GlobalCheckBox("DeletedFifoOrder");
924  
-    cb->setLabel(QObject::tr("Expire in deleted order"));
925  
-    cb->setValue(false);
926  
-    cb->setHelpText(QObject::tr(
927  
-                    "If enabled, delete recordings in the order which they were "
928  
-                    "originally deleted."));
929  
-    return cb;
930  
-};
931  
-
932 921
 class DeletedExpireOptions : public TriggeredConfigurationGroup
933 922
 {
934 923
     public:
@@ -942,7 +931,6 @@ class DeletedExpireOptions : public TriggeredConfigurationGroup
942 931
 
943 932
              HorizontalConfigurationGroup* settings =
944 933
                  new HorizontalConfigurationGroup(false);
945  
-             settings->addChild(DeletedFifoOrder());
946 934
              settings->addChild(DeletedMaxAge());
947 935
              addTarget("1", settings);
948 936
 

0 notes on commit fe9bd6d

Please sign in to comment.
Something went wrong with that request. Please try again.