Ticket #6813: 100-playbackbox_menurepeat.patch

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -265 +265 @@
       progCache(NULL),                  playingSomething(false),
       // Selection state variables
       haveGroupInfoSet(false),          inTitle(false),
+      repeatTitles(true),
       leftRight(false), playbackVideoContainer(false),
       // Free disk space tracking
       freeSpaceNeedsUpdate(true),       freeSpaceTimer(new QTimer(this)),
@@ -300 +301 @@
     groupnameAsAllProg = gContext->GetNumSetting("DispRecGroupAsAllProg", 0);
     arrowAccel         = gContext->GetNumSetting("UseArrowAccels", 1);
     inTitle            = gContext->GetNumSetting("PlaybackBoxStartInTitle", 0);
+    repeatTitles       = gContext->GetNumSetting("PlaybackTitlesRepeat", 1);
     if (!player)
         previewVideoEnabled =gContext->GetNumSetting("PlaybackPreview");
     previewPixmapEnabled=gContext->GetNumSetting("GeneratePreviewPixmaps");
@@ -1457 +1459 @@
             ltype->ResetList();
             ltype->SetActive(inTitle);
 
-            int h = titleIndex - ltype->GetItems() +
-                ltype->GetItems() * titleList.count();
-            h = h % titleList.count();
+            int h = titleIndex - ltype->GetItems();
+            if (repeatTitles)
+            {
+                h += ltype->GetItems() * titleList.count();
+                h = h % titleList.count();
+            };
 
             for (int cnt = 0; cnt < ltype->GetItems(); cnt++)
             {
-                if (titleList[h] == "")
+                if (h < 0)
+                    tstring = "";
+                else if (titleList[h] == "")
                     tstring = groupDisplayName;
                 else
                     tstring = titleList[h];
@@ -1474 +1481 @@
                     lcdItems.append(new LCDMenuItem(0, NOTCHECKABLE, tstring));
 
                 h++;
-                h = h % titleList.count();
+                if (repeatTitles)
+                    h = h % titleList.count();
              }
         }
         else if (ltype)
@@ -1515 +1523 @@
             ltype->SetActive(inTitle);
 
             int h = titleIndex + 1;
-            h = h % titleList.count();
+            if (repeatTitles)
+                h = h % titleList.count();
 
             for (int cnt = 0; cnt < ltype->GetItems(); cnt++)
             {
-                if (titleList[h] == "")
+                if (h >= titleList.count())
+                    tstring = "";
+                else if (titleList[h] == "")
                     tstring = groupDisplayName;
                 else
                     tstring = titleList[h];
@@ -1530 +1541 @@
                     lcdItems.append(new LCDMenuItem(0, NOTCHECKABLE, tstring));
 
                 h++;
-                h = h % titleList.count();
+                if (repeatTitles)    
+                    h = h % titleList.count();
             }
         }
         else if (ltype)
@@ -1719 +1731 @@
     if (inTitle == true || newview)
     {
         titleIndex += (page ? 5 : 1);
-        titleIndex = titleIndex % (int)titleList.count();
+        if (repeatTitles)
+            titleIndex = titleIndex % (int)titleList.count();
+        else
+            titleIndex = min(titleIndex, (int)titleList.count()-1);
+        
 
         progIndex = 0;
 
@@ -1752 +1768 @@
     if (inTitle == true || newview)
     {
         titleIndex -= (page ? 5 : 1);
-        titleIndex += 5 * titleList.count();
-        titleIndex = titleIndex % titleList.count();
+        if (repeatTitles)
+        {
+            titleIndex += 5 * titleList.count();
+            titleIndex = titleIndex % titleList.count();
+        }
+        else
+            titleIndex = max(titleIndex, 0);
 
         progIndex = 0;
 
@@ -4376 +4397 @@
         QString action = actions[i];
         handled = true;
 
+        //custom key handling;
+        if (action == "TOGGLERECORD") action = "DELETE";
+
         if (action == "ESCAPE")
             exitWin();
         else if (action == "1" || action == "HELP")

mythtv/programs/mythfrontend/playbackbox.h

@@ -458 +458 @@
     // Selection state variables
     bool                haveGroupInfoSet;
     bool                inTitle;
+    bool                repeatTitles;
     /// If change is left or right, don't restart video
     bool                leftRight;