Ticket #13473: mythtv-fixes-30-recording-groups.patch

mythtv/libs/libmythtv/recordinginfo.cpp

@@ -1638 +1638 @@
     return query.value(0).toUInt();
 }
 
+/**
+ *  \brief Helper for converting SpecialRecordingGroups to actual IDs
+ */
+uint RecordingInfo::GetSpecialRecgroupID(SpecialRecordingGroups group)
+{
+    static QString names[3] = { QString("Default"), QString("LiveTV"), QString("Deleted") };
+
+    return GetRecgroupID(names[group]);
+}
+
 /**
  *  \brief Temporary helper during transition from string to ID
  */

mythtv/libs/libmythtv/recordinginfo.h

@@ -231 +231 @@
                   LoadStatus *status = nullptr);
 
     typedef enum {
-        kDefaultRecGroup     = 1, // Auto-increment columns start at one
-        kLiveTVRecGroup      = 2,
-        kDeletedRecGroup     = 3,
+        kDefaultRecGroup     = 0, // Auto-increment columns start at one
+        kLiveTVRecGroup      = 1,
+        kDeletedRecGroup     = 2,
     } SpecialRecordingGroups;
 
   public:
@@ -309 +309 @@
     // Temporary while we transition from string to integer
     static QString GetRecgroupString(uint recGroupID);
     static uint GetRecgroupID(const QString &recGroup);
+    static uint GetSpecialRecgroupID(SpecialRecordingGroups group);
 
     // File specific metdata
     void LoadRecordingFile();

mythtv/libs/libmythtv/recordingrule.cpp

@@ -49 +49 @@
     m_dupIn(kDupsInAll),
     m_filter(0),
     m_recProfile(tr("Default")),
-    m_recGroupID(RecordingInfo::kDefaultRecGroup),
+    m_recGroupID(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kDefaultRecGroup)),
     m_storageGroup("Default"),
     m_playGroup("Default"),
     m_autoExpire(false),

mythtv/libs/libmythtv/tv_rec.cpp

@@ -4685 +4685 @@
 
     pginfo->SaveAutoExpire(kLiveTVAutoExpire);
     if (!pseudoLiveTVRecording)
-        pginfo->ApplyRecordRecGroupChange(RecordingInfo::kLiveTVRecGroup);
+        pginfo->ApplyRecordRecGroupChange(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kLiveTVRecGroup));
 
     bool discont = (tvchain->TotalSize() > 0);
     tvchain->AppendNewProgram(pginfo, channel->GetChannelName(),
@@ -4739 +4739 @@
     pginfo->MarkAsInUse(true, kRecorderInUseID);
     pginfo->SaveAutoExpire(kLiveTVAutoExpire);
     if (!pseudoLiveTVRecording)
-        pginfo->ApplyRecordRecGroupChange(RecordingInfo::kLiveTVRecGroup);
+        pginfo->ApplyRecordRecGroupChange(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kLiveTVRecGroup));
     tvchain->AppendNewProgram(pginfo, channel->GetChannelName(),
                               channel->GetInputName(), discont);
 

mythtv/programs/mythbackend/services/dvr.cpp

@@ -1172 +1172 @@
     rule.m_recProfile = sRecProfile;
     rule.m_recGroupID = RecordingInfo::GetRecgroupID(sRecGroup);
     if (rule.m_recGroupID == 0)
-        rule.m_recGroupID = RecordingInfo::kDefaultRecGroup;
+        rule.m_recGroupID = RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kDefaultRecGroup);
     rule.m_storageGroup = sStorageGroup;
     rule.m_playGroup = sPlayGroup;
 
@@ -1334 +1334 @@
     pRule.m_recProfile = sRecProfile;
     pRule.m_recGroupID = RecordingInfo::GetRecgroupID(sRecGroup);
     if (pRule.m_recGroupID == 0)
-        pRule.m_recGroupID = RecordingInfo::kDefaultRecGroup;
+        pRule.m_recGroupID = RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kDefaultRecGroup);
     pRule.m_storageGroup = sStorageGroup;
     pRule.m_playGroup = sPlayGroup;
 

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -1461 +1461 @@
     // Ignore recordings in the LiveTV and Deleted recgroups
     // We cannot currently prevent LiveTV recordings from being expired while
     // being streamed to a upnp device, so there's no point in listing them.
-    QString liveTVGroup = RecordingInfo::GetRecgroupString(RecordingInfo::kLiveTVRecGroup);
+    QString liveTVGroup = RecordingInfo::GetRecgroupString(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kLiveTVRecGroup));
     clauses.append(QString("g.recgroup != '%1'").arg(liveTVGroup));
-    QString deletedGroup = RecordingInfo::GetRecgroupString(RecordingInfo::kDeletedRecGroup);
+    QString deletedGroup = RecordingInfo::GetRecgroupString(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kDeletedRecGroup));
     clauses.append(QString("g.recgroup != '%1'").arg(deletedGroup));
 
     if (tokens["recording"].toInt() > 0)

mythtv/programs/mythfrontend/statusbox.cpp

@@ -485 +485 @@
                     if ((rec)->GetRecordingGroup() == "LiveTV")
                     {
                         RecordingInfo ri(*rec);
-                        ri.ApplyRecordRecGroupChange(RecordingInfo::kDefaultRecGroup);
+                        ri.ApplyRecordRecGroupChange(RecordingInfo::GetSpecialRecgroupID(RecordingInfo::kDefaultRecGroup));
                         *rec = ri;
                     }
                 }