Ticket #2782: mythtv_jobqueue_3.patch

File mythtv_jobqueue_3.patch, 2.5 KB (added by oa@…, 14 years ago)

final part - eliminate the setting for number of simultaneous jobs

  • libs/libmythtv/jobqueue.cpp

     
    163163    int sleepTime;
    164164
    165165    QMap<QString, int> jobStatus;
    166     int maxJobs;
    167166    QString queueStartTimeStr;
    168167    QString queueEndTimeStr;
    169168    int queueStartTime;
     
    188187        queueEndTimeStr =
    189188            gContext->GetSetting("JobQueueWindowEnd", "23:59");
    190189
    191         maxJobs = gContext->GetNumSetting("JobQueueMaxSimultaneousJobs", 3);
    192190        VERBOSE(VB_JOBQUEUE, LOC +
    193                 QString("Currently set at %1 job(s) max and to run new jobs "
    194                         "from %2 to %3").arg(maxJobs).arg(queueStartTimeStr)
     191                QString("Currently set to run new jobs "
     192                        "from %2 to %3").arg(queueStartTimeStr)
    195193                                        .arg(queueEndTimeStr));
    196194
    197195        jobStatus.clear();
     
    241240                                   .arg(queueStartTimeStr);
    242241                VERBOSE(VB_JOBQUEUE, LOC + message);
    243242            }
    244             else if (jobsRunning >= maxJobs)
    245             {
    246                 message += " (At Maximum, no new jobs can be started until "
    247                            "a running job completes)";
    248 
    249                 if (!atMax)
    250                     VERBOSE(VB_JOBQUEUE, LOC + message);
    251 
    252             }
    253243            else
  • programs/mythtv-setup/backendsettings.cpp

     
    426426    return gc;
    427427};
    428428
    429 static HostSpinBox *JobQueueMaxSimultaneousJobs()
    430 {
    431     HostSpinBox *gc = new HostSpinBox("JobQueueMaxSimultaneousJobs", 1, 10, 1);
    432     gc->setLabel(QObject::tr("Maximum simultaneous jobs on this backend"));
    433     gc->setHelpText(QObject::tr("The Job Queue will be limited to running "
    434                     "this many simultaneous jobs on this backend."));
    435     gc->setValue(1);
    436     return gc;
    437 };
    438 
    439429static HostSpinBox *JobQueueCheckFrequency()
    440430{
    441431    HostSpinBox *gc = new HostSpinBox("JobQueueCheckFrequency", 5, 300, 5);
     
    736726
    737727    VerticalConfigurationGroup* group5 = new VerticalConfigurationGroup(false);
    738728    group5->setLabel(QObject::tr("Job Queue (Host-Specific)"));
    739     group5->addChild(JobQueueMaxSimultaneousJobs());
    740729    group5->addChild(JobQueueCheckFrequency());
    741730
    742731    HorizontalConfigurationGroup* group5a =