Ticket #5888: osd_input_timeout_trunk@18947.diff

libs/libmythtv/tv_play.h

@@ -467 +467 @@
     bool    arrowAccel;
     int     osd_general_timeout;
     int     osd_prog_info_timeout;
+    int     osd_input_timeout;
 
     enum commSkipMode autoCommercialSkip;
     bool    tryUnflaggedSkip;
@@ -579 +580 @@
     /// Lock used so that input QStrings can be used across threads, and so
     /// that queuedChanNumExpr can be used safely in Qt 3.2 and earlier.
     mutable QMutex  queuedInputLock;
+    /// Timer for entering channel numbers
+    MythTimer enterChanTimer;
 
     int       unmuteTimeout; ///< For temp. audio muting during channel changes
     MythTimer unmuteTimer;   ///< For temp. audio muting during channel changes

libs/libmythtv/tv_play.cpp

@@ -539 +539 @@
       jumptime(0), smartChannelChange(false),
       MuteIndividualChannels(false), arrowAccel(false),
       osd_general_timeout(2), osd_prog_info_timeout(3),
+      osd_input_timeout(0),
       autoCommercialSkip(CommSkipOff), tryUnflaggedSkip(false),
       smartForward(false), stickykeys(0),
       ff_rew_repos(1.0f), ff_rew_reverse(false),
@@ -661 +662 @@
     persistentbrowsemode = gContext->GetNumSetting("PersistentBrowseMode", 0);
     osd_general_timeout  = gContext->GetNumSetting("OSDGeneralTimeout", 2);
     osd_prog_info_timeout= gContext->GetNumSetting("OSDProgramInfoTimeout", 3);
+    osd_input_timeout    = gContext->GetNumSetting("OSDInputTimeout", 0);
     autoCommercialSkip   = (enum commSkipMode)gContext->GetNumSetting(
                             "AutoCommercialSkip", CommSkipOff);
     tryUnflaggedSkip     = gContext->GetNumSetting("TryUnflaggedSkip", 0);
@@ -2422 +2424 @@
             nvp->SetMuted(false);
     }
 
+    if (enterChanTimer.isRunning() && 
+       (enterChanTimer.elapsed() >= osd_input_timeout))
+    {
+        enterChanTimer.stop();
+        CommitQueuedInput();
+    }
 
     if (prevChanTimer.isRunning() &&
         (prevChanTimer.elapsed() >= kPrevChanTimeout))
@@ -4879 +4887 @@
         (smartChannelChange || browsemode))
     {
         commitSmart = ProcessSmartChannel(inputStr);
+        if (osd_input_timeout > 0) 
+            enterChanTimer.start();
     }
 
     // Handle OSD...

programs/mythfrontend/globalsettings.cpp

@@ -1597 +1597 @@
     return gs;
 }
 
+static HostSpinBox *OSDInputTimeout()
+{
+    HostSpinBox *gs = new HostSpinBox("OSDInputTimeout", 0, 5000, 100);
+    gs->setLabel(QObject::tr("Maximum timeout between entering to digits for channel selection until input was commited."));
+    gs->setValue(0);
+    gs->setHelpText(QObject::tr("How many milliseconds the input parser waits for an additional"
+                " digit before committing channel number. If 0 the input will be committed after OSD fade-out (old behaviour)"));
+    return gs;
+}
+
 static HostSpinBox *ThemeCacheSize()
 {
     HostSpinBox *gs = new HostSpinBox("ThemeCacheSize", 1, 1000, 1, true);
@@ -4795 +4805 @@
     osd->addChild(OSDThemeFontSizeType());
     osd->addChild(EnableMHEG());
     osd->addChild(PersistentBrowseMode());
+    osd->addChild(OSDInputTimeout());
     addChild(osd);
 
     VerticalConfigurationGroup *udp = new VerticalConfigurationGroup(false);