Ticket #3476: mergecomm.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -5715 +5715 @@
     }
 }
 
+void NuppelVideoPlayer::MergeShortCommercials(void)
+{
+    double maxMerge = gContext->GetNumSetting("MergeShortCommBreaks", 0) * 
+                       video_frame_rate;
+    if (maxMerge > 0)
+    {
+        long long lastFrame = commBreakIter.key();
+        ++commBreakIter;
+        while ((commBreakIter != commBreakMap.end()) && 
+               (commBreakIter.key() - lastFrame < maxMerge)) {
+            ++commBreakIter;
+        }
+        --commBreakIter;
+    }
+}
+
 void NuppelVideoPlayer::AutoCommercialSkip(void)
 {
     if (((time(NULL) - lastSkipTime) <= 2) ||
@@ -5746 +5762 @@
                     .arg(framesPlayed).arg(commBreakIter.key()));
 
             ++commBreakIter;
+
+            MergeShortCommercials();
+            
             if (commBreakIter == commBreakMap.end())
             {
                 VERBOSE(VB_COMMFLAG, LOC + "AutoCommercialSkip(), at "
@@ -5952 +5971 @@
         }
     }
 
+    if (direction > 0)
+        MergeShortCommercials();
+
     if (osd)
     {
         int skipped_seconds = (int)((commBreakIter.key() -

libs/libmythtv/NuppelVideoPlayer.h

@@ -453 +453 @@
     void SkipCommercialsByBlanks(void);
     bool DoSkipCommercials(int direction);
     void AutoCommercialSkip(void);
+    void MergeShortCommercials(void);
 
     // Private edit stuff
     void SaveCutList(void);

programs/mythfrontend/globalsettings.cpp

@@ -518 +518 @@
     return bs;
 }
 
+static GlobalSpinBox *MergeShortCommBreaks()
+{
+    GlobalSpinBox *bs = new GlobalSpinBox("MergeShortCommBreaks", 0, 3600, 5);
+    bs->setLabel(QObject::tr("Merge short commercial breaks (in seconds)"));
+    bs->setHelpText(QObject::tr("Treat consecutive commercial breaks shorter "
+                    "than this as one break when skipping forward. Useful if "
+                    "you have to skip a few times during breaks. Applies to "
+                    "automatic skipping as well. Set to 0 to disable."));
+    bs->setValue(0);
+    return bs;
+}
 
 static GlobalSpinBox *AutoExpireExtraSpace()
 {
@@ -3575 +3586 @@
     comms->addChild(CommRewindAmount());
     comms->addChild(CommNotifyAmount());
     comms->addChild(MaximumCommercialSkip());
+    comms->addChild(MergeShortCommBreaks());
     comms->addChild(CommSkipAllBlanks());
     addChild(comms);