Ticket #314: jobqueue.userjobs.diff

libs/libmythtv/jobqueue.cpp

@@ -955 +955 @@
 
     if (jobType & JOB_USERJOB)
     {
-        QString settingName = QString("UserJobDesc%1").arg(jobType >> 8);
+        QString settingName = QString("UserJobDesc%1").arg(jobTypeToIndex(jobType));
         return gContext->GetSetting(settingName, settingName);
     }
 
@@ -1072 +1072 @@
 
             if (thisJob.type & JOB_USERJOB)
             {
-                int userJobNumber = 1;
-                int jobType = thisJob.type;
-
-                jobType = jobType >> 8;
-                while (jobType != 0x01 && userJobNumber < 5)
-                {
-                    jobType = jobType >> 1;
-                    userJobNumber++;
-                }
-
-                if (userJobNumber >= 5)
-                    thisJob.type = JOB_NONE;
-                else
-                    thisJob.type = userJobNumber << 8;
+                thisJob.type = 1 << (8 + jobTypeToIndex(thisJob.type) -1);
             }
 
             jobs[jobCount++] = thisJob;
@@ -1152 +1139 @@
                              break;
         case JOB_USERJOB4:   allowSetting = "JobAllowUserJob4";
                              break;
-        default:             return false;
+        default:             VERBOSE(VB_JOBQUEUE, QString("JobQueue::AllowedToRun: unknown job.type: %1").arg(job.type));
+                            return false;
     }
 
     if (gContext->GetNumSetting(allowSetting, 1))
@@ -1443 +1431 @@
     else if (!(jobType & JOB_USERJOB))
         return "Unknown Job";
 
-    QString descSetting = QString("UserJobDesc%1").arg(jobType >> 8);
+    QString descSetting = QString("UserJobDesc%1").arg(jobTypeToIndex(jobType));
 
     return gContext->GetSetting(descSetting, "Unknown Job");
 }
@@ -1460 +1448 @@
     else if (!(jobType & JOB_USERJOB))
         return "";
 
-    QString commandSetting = QString("UserJob%1").arg(jobType >> 8);
+    QString commandSetting = QString("UserJob%1").arg(jobTypeToIndex(jobType));
 
     command = gContext->GetSetting(commandSetting, "");
 
@@ -1892 +1880 @@
     controlFlagsLock.unlock();
 }
 
+int JobQueue::jobTypeToIndex(int JobType)
+{
+    if (JobType & JOB_USERJOB)
+    {
+        int x = ((JobType & JOB_USERJOB)>> 8);
+        int bits = 1;
+        while( (x != 0) && ((x & 0x01) == 0) )
+        {
+            bits++;
+            x = x >> 1;
+        }
+        if( bits > 4 )
+            return 0;
+
+        return bits;
+    }
+    return 0;
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/jobqueue.h

@@ -137 +137 @@
     static int GetJobFlags(int jobID);
     static int GetJobStatus(int jobID);
     static int GetJobStatus(int jobType, QString chanid, QDateTime starttime);
+    static int jobTypeToIndex(int JobType);
 
     static bool DeleteAllJobs(QString chanid, QDateTime starttime);