Ticket #2782: mythtv_jobqueue_3.patch

libs/libmythtv/jobqueue.cpp

@@ -163 +163 @@
     int sleepTime;
 
     QMap<QString, int> jobStatus;
-    int maxJobs;
     QString queueStartTimeStr;
     QString queueEndTimeStr;
     int queueStartTime;
@@ -188 +187 @@
         queueEndTimeStr =
             gContext->GetSetting("JobQueueWindowEnd", "23:59");
 
-        maxJobs = gContext->GetNumSetting("JobQueueMaxSimultaneousJobs", 3);
         VERBOSE(VB_JOBQUEUE, LOC +
-                QString("Currently set at %1 job(s) max and to run new jobs "
-                        "from %2 to %3").arg(maxJobs).arg(queueStartTimeStr)
+                QString("Currently set to run new jobs "
+                        "from %2 to %3").arg(queueStartTimeStr)
                                         .arg(queueEndTimeStr));
 
         jobStatus.clear();
@@ -241 +240 @@
                                    .arg(queueStartTimeStr);
                 VERBOSE(VB_JOBQUEUE, LOC + message);
             }
-            else if (jobsRunning >= maxJobs)
-            {
-                message += " (At Maximum, no new jobs can be started until "
-                           "a running job completes)";
-
-                if (!atMax)
-                    VERBOSE(VB_JOBQUEUE, LOC + message);
-
-            }
             else

programs/mythtv-setup/backendsettings.cpp

@@ -426 +426 @@
     return gc;
 };
 
-static HostSpinBox *JobQueueMaxSimultaneousJobs()
-{
-    HostSpinBox *gc = new HostSpinBox("JobQueueMaxSimultaneousJobs", 1, 10, 1);
-    gc->setLabel(QObject::tr("Maximum simultaneous jobs on this backend"));
-    gc->setHelpText(QObject::tr("The Job Queue will be limited to running "
-                    "this many simultaneous jobs on this backend."));
-    gc->setValue(1);
-    return gc;
-};
-
 static HostSpinBox *JobQueueCheckFrequency()
 {
     HostSpinBox *gc = new HostSpinBox("JobQueueCheckFrequency", 5, 300, 5);
@@ -736 +726 @@
 
     VerticalConfigurationGroup* group5 = new VerticalConfigurationGroup(false);
     group5->setLabel(QObject::tr("Job Queue (Host-Specific)"));
-    group5->addChild(JobQueueMaxSimultaneousJobs());
     group5->addChild(JobQueueCheckFrequency());
 
     HorizontalConfigurationGroup* group5a =