Ticket #10772: expirer.diff

mythtv/programs/mythbackend/mainserver.cpp

@@ -941 +941 @@
                 {
                     recInfo.ForgetHistory();
                 }
-                DoHandleDeleteRecording(recInfo, NULL, false, true, false);
+                DoHandleDeleteRecording(recInfo, NULL, false, false);
             }
             else
             {
@@ -989 +989 @@
             if (recInfo.GetChanID())
             {
                 if (tokens[0] == "FORCE_DELETE_RECORDING")
-                    DoHandleDeleteRecording(recInfo, NULL, true, false, false);
+                    DoHandleDeleteRecording(recInfo, NULL, true, false);
                 else
-                    DoHandleDeleteRecording(recInfo, NULL, false, false, false);
+                    DoHandleDeleteRecording(recInfo, NULL, false, false);
             }
             else
             {
@@ -2444 +2444 @@
         return;
     }
 
-    DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false, forgetHistory);
+    DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, forgetHistory);
 }
 
 void MainServer::HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,
@@ -2453 +2453 @@
     QStringList::const_iterator it = slist.begin() + 1;
     RecordingInfo recinfo(it, slist.end());
     if (recinfo.GetChanID())
-        DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false, false);
+        DoHandleDeleteRecording(recinfo, pbs, forceMetadataDelete, false);
 }
 
 void MainServer::DoHandleDeleteRecording(
     RecordingInfo &recinfo, PlaybackSock *pbs,
-    bool forceMetadataDelete, bool expirer, bool forgetHistory)
+    bool forceMetadataDelete, bool forgetHistory)
 {
     int resultCode = -1;
     MythSocket *pbssock = NULL;
     if (pbs)
         pbssock = pbs->getSocket();
 
-    bool justexpire = expirer ? false :
-            ( //gCoreContext->GetNumSetting("AutoExpireInsteadOfDelete") &&
-             (recinfo.GetRecordingGroup() != "Deleted") &&
+    bool justexpire = ((recinfo.GetRecordingGroup() != "Deleted") &&
              (recinfo.GetRecordingGroup() != "LiveTV"));
-
     QString filename = GetPlaybackURL(&recinfo, false);
     if (filename.isEmpty())
     {

mythtv/programs/mythbackend/mainserver.h

@@ -158 +158 @@
     void HandleDeleteRecording(QStringList &slist, PlaybackSock *pbs,
                                bool forceMetadataDelete);
     void DoHandleDeleteRecording(RecordingInfo &recinfo, PlaybackSock *pbs,
-                                 bool forceMetadataDelete, bool expirer=false,
-                                 bool forgetHistory=false);
+                                 bool forceMetadataDelete,
+                                 bool forgetHistory=false);
     void HandleUndeleteRecording(QStringList &slist, PlaybackSock *pbs);
     void DoHandleUndeleteRecording(RecordingInfo &recinfo, PlaybackSock *pbs);
     void HandleForgetRecording(QStringList &slist, PlaybackSock *pbs);