Ticket #5863: min_comm_skip.diff

i18n/mythfrontend_de.ts

@@ -8392 +8392 @@
         <translation>Bestimmt die Methode mit der MyhTV den Beginn und das Ende eines Werbeblocks sucht.</translation>
     </message>
     <message>
+        <source>Minimum commercial skip (in seconds)</source>
+        <translation>Minimale Werbeblock SprunglÀnge (in Sek.)</translation>
+    </message>
+    <message>
         <source>Maximum commercial skip (in seconds)</source>
         <translation>Maximale Werbeblock SprunglÀnge (in Sek.)</translation>
     </message>
@@ -9016 +9020 @@
         <translation>Das Audio-AusgabegerÀt um AC3- und DTS-Ton durchzuleiten. Bei &quot;Standard&quot; wird das &quot;Audio-AusgabegerÀt&quot; verwendet. Diese Einstellung kann momentan nur bei Tonausgabe Ìber ALSA genutzt werden.</translation>
     </message>
     <message>
+        <source>Commercial skipping will only skip commercials longer than this limit. This will also affect automatic commercial skipping.</source>
+        <translation>WerbeblocksprÌnge werden nur ausgefÌhrt fÌr Werbeblöcke die lÀnger als das Limit sind. Dies betrifft auch automatische WerbeblocksprÌnge.</translation>
+    </message>
+    <message>
         <source>MythTV will discourage long manual commercial skips.  Skips which are longer than this will require the user to hit the SKIP key twice.  Automatic commercial skipping is not affected by this limit.</source>
         <translation>MythTV wird von langen manuellen WerbeblocksprÌngen Abstand nehmen. WerbesprÌnge, die lÀnger als dieser Wert sind, mÌssen mit einem weiteren Tastendruck (SKIP-Taste) wiederholt werden. Automatische WerbesprÌnge sind hiervon nicht betroffen.</translation>
     </message>

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -6170 +6170 @@
                     .arg(framesPlayed).arg(commBreakIter.key()));
 
             ++commBreakIter;
+                    
+            int minskip = gContext->GetNumSetting("MinimumCommercialSkip", 180);
+            int skipped_seconds = (int)((commBreakIter.key() -
+                    framesPlayed) / video_frame_rate);
 
             MergeShortCommercials();
             
-            if (commBreakIter == commBreakMap.end())
+            if (abs(skipped_seconds) <= minskip)
             {
+                VERBOSE(VB_COMMFLAG, LOC + "AutoCommercialSkip(), "
+                        "skipped_seconds smaller than minskip, will not skip.");
+
+                if (osd)
+                {
+                    QString comm_msg;
+                    QString skipTime;
+                    skipTime.sprintf("%d:%02d", skipped_seconds / 60,
+                                     abs(skipped_seconds) % 60);
+                    comm_msg = QString(QObject::tr("Too Far %1"))
+                                       .arg(skipTime);
+                    struct StatusPosInfo posInfo;
+                    calcSliderPos(posInfo);
+                    osd->ShowStatus(posInfo, false, comm_msg, 2);
+                }
+            }
+            else if (commBreakIter == commBreakMap.end())
+            {
                 VERBOSE(VB_COMMFLAG, LOC + "AutoCommercialSkip(), at "
                         "end of commercial break list, will not skip.");
             }
@@ -6198 +6220 @@
                 if (osd)
                 {
                     QString comm_msg;
-                    int skipped_seconds = (int)((commBreakIter.key() -
-                            framesPlayed) / video_frame_rate);
                     QString skipTime;
                     skipTime.sprintf("%d:%02d", skipped_seconds / 60,
                                      abs(skipped_seconds) % 60);
@@ -6386 +6406 @@
     {
         int skipped_seconds = (int)((commBreakIter.key() -
                 framesPlayed) / video_frame_rate);
+        int minskip = gContext->GetNumSetting("MinimumCommercialSkip", 0);
         int maxskip = gContext->GetNumSetting("MaximumCommercialSkip", 3600);
         QString skipTime;
         skipTime.sprintf("%d:%02d", skipped_seconds / 60,
@@ -6393 +6414 @@
         struct StatusPosInfo posInfo;
         calcSliderPos(posInfo);
         if ((lastIgnoredManualSkip.secsTo(QDateTime::currentDateTime()) > 3) &&
-            (abs(skipped_seconds) >= maxskip))
+            ((abs(skipped_seconds) <= minskip) ||
+            (abs(skipped_seconds) >= maxskip)))
         {
             osd->ShowStatus(posInfo, false,
                             QObject::tr("Too Far %1").arg(skipTime), 2);

programs/mythfrontend/globalsettings.cpp

@@ -574 +574 @@
     return gs;
 }
 
+static GlobalSpinBox *MinimumCommercialSkip()
+{
+    GlobalSpinBox *bs = new GlobalSpinBox("MinimumCommercialSkip", 0, 3600, 10);
+    bs->setLabel(QObject::tr("Minimum commercial skip (in seconds)"));
+    bs->setHelpText(QObject::tr("Commercial skipping will only skip commercials "
+                    "longer than this limit. This will also affect automatic "
+                    "commercial skipping."));
+    bs->setValue(0);
+    return bs;
+}
+
 static GlobalSpinBox *MaximumCommercialSkip()
 {
     GlobalSpinBox *bs = new GlobalSpinBox("MaximumCommercialSkip", 0, 3600, 10);
@@ -4748 +4759 @@
     comms->addChild(AutoCommercialSkip());
     comms->addChild(CommRewindAmount());
     comms->addChild(CommNotifyAmount());
+    comms->addChild(MinimumCommercialSkip());
     comms->addChild(MaximumCommercialSkip());
     comms->addChild(MergeShortCommBreaks());
     comms->addChild(CommSkipAllBlanks());