Ticket #8564: 8564_v3.patch

libs/libmythtv/deletemap.cpp

@@ -71 +71 @@
 {
     if (!osd || !ctx)
         return;
-    CleanMap(total);
+    //CleanMap(total);
 
     InfoMap infoMap;
     ctx->LockPlayingInfo(__FILE__, __LINE__);
@@ -162 +162 @@
         int type = Delete(it.key());
         Add(it.key(), type == MARK_CUT_END ? MARK_CUT_START : MARK_CUT_END);
     }
-    CleanMap(total);
+    //CleanMap(total);
 }
 
 /**
@@ -177 +177 @@
        ((MARK_CUT_START != type) && (MARK_CUT_END != type)))
         return;
 
+#if 0
     int       lasttype  = MARK_UNSET;
     long long lastframe = -1;
     long long remove    = -1;
@@ -224 +225 @@
 
     if (remove > -1)
         Delete((uint64_t)remove);
+#endif // 0
     Add(frame, type);
-    CleanMap(total);
+    //CleanMap(total);
 }
 
 /// Remove the mark at the given frame.
@@ -233 +235 @@
 {
     EDIT_CHECK
     Delete(frame);
-    CleanMap(total);
+    //CleanMap(total);
 }
 
 /// Reverse the direction of the mark at the given frame.
@@ -387 +389 @@
             uint64_t thisframe = it.key();
             if (lasttype == thistype)
             {
-                Delete(thistype == MARK_CUT_END ? thisframe :
+                Delete(thistype == MARK_CUT_START ? thisframe :
                                                   (uint64_t)lastframe);
                 clear = false;
                 break;

libs/libmythtv/osd.cpp

@@ -461 +461 @@
     long long start = -1;
     long long end   = -1;
     bool first = true;
+    QVector<float> pendingStarts;
+    int i;
     QMapIterator<uint64_t, MarkTypes> it(map);
     while (it.hasNext())
     {
-        bool error = false;
         it.next();
         if (it.value() == MARK_CUT_START)
         {
             start = it.key();
-            if (end > -1)
-                error = true;
+            if (start > total)
+                start = total;
+            pendingStarts += start;
         }
         else if (it.value() == MARK_CUT_END)
         {
             if (first)
                 start = 0;
-            if (start < 0)
-                error = true;
             end = it.key();
+            if (end > total)
+                end = total;
+            if (pendingStarts.isEmpty())
+                pendingStarts += start;
+            for (i=0; i<pendingStarts.size(); i++)
+                bar->AddRegion((float)(pendingStarts[i]/(double)total),
+                               (float)(end/(double)total));
+            pendingStarts.clear();
         }
         first = false;
-
-        if (error)
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR + "deleteMap discontinuity");
-            start = -1;
-            end   = -1;
-        }
-
-        if (start >=0 && end >= 0)
-        {
-            bar->AddRegion((float)((double)start/(double)total),
-                           (float)((double)end/(double)total));
-            start = -1;
-            end   = -1;
-        }
     }
-    if (start > -1 && end < 0)
-        bar->AddRegion((float)((double)start/(double)total), 1.0f);
+    for (i=0; i<pendingStarts.size(); i++)
+        bar->AddRegion((float)(pendingStarts[i]/(double)total), 1.0f);
 
     bar->Display();
 }

libs/libmythui/mythuieditbar.cpp

@@ -130 +130 @@
         QPair<float,float> region = regions.next();
         int left  = (int)((region.first * cutarea.width()) + 0.5f);
         int right = (int)((region.second * cutarea.width()) + 0.5f);
+        if (left >= right)
+            right = left + 1;
         if (cut)
         {
             AddBar(barshape, barimage, QRect(left, cutarea.top(), right - left,
@@ -158 +160 @@
         QPair<float,float> region = regions2.next();
         int left  = (int)((region.first * keeparea.width()) + 0.5f);
         int right = (int)((region.second * keeparea.width()) + 0.5f);
+        if (left >= right)
+            right = left + 1;
         if (keep)
         {
             AddBar(barshape, barimage, QRect(left, keeparea.top(), right - left,
@@ -250 +254 @@
         }
         else
         {
-            m_invregions.append(qMakePair(start, region.first));
+            if (region.first > start)
+                m_invregions.append(qMakePair(start, region.first));
             start = region.second;
         }
     }