Rename RecTypePriority to RecTypePrecedence.

This is to avoid confusion with the other scheduling related priorities.
MythTV · Nov 28, 2012 · 4b059d3 · 4b059d3
1 parent 33d80a9
commit 4b059d3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/mythtv/libs/libmyth/recordingtypes.cpp b/mythtv/libs/libmyth/recordingtypes.cpp
@@ -4,7 +4,7 @@
 
 /// Converts a RecordingType to a simple integer so it's specificity can
 /// be compared to another.  Lower number means more specific.
-int RecTypePriority(RecordingType rectype)
+int RecTypePrecedence(RecordingType rectype)
 {
     switch (rectype)
     {

diff --git a/mythtv/libs/libmyth/recordingtypes.h b/mythtv/libs/libmyth/recordingtypes.h
@@ -36,7 +36,7 @@ MPUBLIC QString toRawString(RecordingType);
 MPUBLIC QChar   toQChar( RecordingType);
 MPUBLIC RecordingType recTypeFromString(QString);
 
-MPUBLIC int RecTypePriority(RecordingType rectype);
+MPUBLIC int RecTypePrecedence(RecordingType rectype);
 
 typedef enum RecordingDupInTypes
 {

diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h
@@ -12,7 +12,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and
 /// libmythui class methods used by plug-ins.
-#define MYTH_BINARY_VERSION "0.27.20121127-1"
+#define MYTH_BINARY_VERSION "0.27.20121128-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *

diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
@@ -253,20 +253,20 @@ static bool comp_overlap(RecordingInfo *a, RecordingInfo *b)
     // won't record except for those from kDontRecord rules.  This
     // will force them to yield to a rule that might record.
     // Otherwise, more specific record type beats less specific.
-    int apri = RecTypePriority(a->GetRecordingRuleType());
+    int aprec = RecTypePrecedence(a->GetRecordingRuleType());
     if (a->GetRecordingStatus() != rsUnknown &&
         a->GetRecordingStatus() != rsDontRecord)
     {
-        apri += 100;
+        aprec += 100;
     }
-    int bpri = RecTypePriority(b->GetRecordingRuleType());
+    int bprec = RecTypePrecedence(b->GetRecordingRuleType());
     if (b->GetRecordingStatus() != rsUnknown &&
         b->GetRecordingStatus() != rsDontRecord)
     {
-        bpri += 100;
+        bprec += 100;
     }
-    if (apri != bpri)
-        return apri < bpri;
+    if (aprec != bprec)
+        return aprec < bprec;
 
     if (a->GetFindID() != b->GetFindID())
         return a->GetFindID() > b->GetFindID();
@@ -335,11 +335,11 @@ static bool comp_priority(RecordingInfo *a, RecordingInfo *b)
     if (apast != bpast)
         return apast < bpast;
 
-    int apri = RecTypePriority(a->GetRecordingRuleType());
-    int bpri = RecTypePriority(b->GetRecordingRuleType());
+    int aprec = RecTypePrecedence(a->GetRecordingRuleType());
+    int bprec = RecTypePrecedence(b->GetRecordingRuleType());
 
-    if (apri != bpri)
-        return apri < bpri;
+    if (aprec != bprec)
+        return aprec < bprec;
 
     if (a->GetRecordingStartTime() != b->GetRecordingStartTime())
     {

diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp
@@ -156,8 +156,8 @@ class TitleSort
                 return finalA > finalB;
         }
 
-        int typeA = RecTypePriority(a->recType);
-        int typeB = RecTypePriority(b->recType);
+        int typeA = RecTypePrecedence(a->recType);
+        int typeB = RecTypePrecedence(b->recType);
 
         if (typeA != typeB)
         {
@@ -200,8 +200,8 @@ class ProgramRecPrioritySort
                 return finalA > finalB;
         }
 
-        int typeA = RecTypePriority(a->recType);
-        int typeB = RecTypePriority(b->recType);
+        int typeA = RecTypePrecedence(a->recType);
+        int typeB = RecTypePrecedence(b->recType);
 
         if (typeA != typeB)
         {
@@ -231,8 +231,8 @@ class ProgramRecTypeSort
     bool operator()(const ProgramRecPriorityInfo *a, 
                     const ProgramRecPriorityInfo *b) const
     {
-        int typeA = RecTypePriority(a->recType);
-        int typeB = RecTypePriority(b->recType);
+        int typeA = RecTypePrecedence(a->recType);
+        int typeB = RecTypePrecedence(b->recType);
 
         if (typeA != typeB)
         {