Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[pvr] invert pvrplayback.confirmchannelswitch setting, and use the va…

…lue of pvrplayback.channelentrytimeout as autoclose value. closes #13480
  • Loading branch information...
commit adb0a32f30ed116ca49191917184f4fb07b79f3b 1 parent 4bbf77e
Lars Op den Kamp opdenkamp authored
8 language/English/strings.po
View
@@ -7006,9 +7006,7 @@ msgctxt "#19167"
msgid "Scan for missing icons"
msgstr ""
-msgctxt "#19168"
-msgid "Switch channel without pressing OK"
-msgstr ""
+#empty string with id 19168
msgctxt "#19169"
msgid "Hide video information box"
@@ -7462,6 +7460,10 @@ msgctxt "#19280"
msgid "Client specific settings"
msgstr ""
+msgctxt "#19281"
+msgid "Confirm channel switches by pressing OK"
+msgstr ""
+
#empty strings from id 19281 to 19498
msgctxt "#19499"
2  xbmc/settings/GUISettings.cpp
View
@@ -975,10 +975,10 @@ void CGUISettings::Initialize()
CSettingsCategory* pvrp = AddCategory(SETTINGS_PVR, "pvrplayback", 19177);
AddBool(pvrp, "pvrplayback.playminimized", 19171, true);
AddInt(pvrp, "pvrplayback.startlast", 19189, START_LAST_CHANNEL_OFF, START_LAST_CHANNEL_OFF, 1, START_LAST_CHANNEL_ON, SPIN_CONTROL_TEXT);
- AddBool(pvrp, "pvrplayback.switchautoclose", 19168, true);
AddBool(pvrp, "pvrplayback.signalquality", 19037, true);
AddSeparator(pvrp, "pvrplayback.sep1");
AddInt(pvrp, "pvrplayback.scantime", 19170, 10, 1, 1, 60, SPIN_CONTROL_INT_PLUS, MASK_SECS);
+ AddBool(pvrp, "pvrplayback.confirmchannelswitch", 19281, false);
AddInt(pvrp, "pvrplayback.channelentrytimeout", 19073, 0, 0, 250, 2000, SPIN_CONTROL_INT_PLUS, MASK_MS);
CSettingsCategory* pvrr = AddCategory(SETTINGS_PVR, "pvrrecord", 19043);
2  xbmc/video/windows/GUIWindowFullScreen.cpp
View
@@ -396,7 +396,7 @@ bool CGUIWindowFullScreen::OnAction(const CAction &action)
}
else
{
- int autoCloseTime = g_guiSettings.GetBool("pvrplayback.switchautoclose") ? 1500 : 0;
+ int autoCloseTime = g_guiSettings.GetBool("pvrplayback.confirmchannelswitch") ? 0 : g_guiSettings.GetInt("pvrplayback.channelentrytimeout");
CStdString strChannel;
strChannel.Format("%i", action.GetID() - REMOTE_0);
if (CGUIDialogNumeric::ShowAndGetNumber(strChannel, g_localizeStrings.Get(19000), autoCloseTime) || autoCloseTime)
Please sign in to comment.
Something went wrong with that request. Please try again.