kodi: rebase patch

projects/S912/patches/kodi/k21-Kodi-settings-default-to-Expert-level.patch.Needs.rebase → projects/S912/patches/kodi/k21-Kodi-settings-default-to-Expert-level.patch

@@ -1,32 +1,32 @@
-From 1044fe6c6e1b70a2f2b428a6cc6d49b9bcbcb276 Mon Sep 17 00:00:00 2001
-From: wrxtasy <[email protected]>
-Date: Tue, 7 Mar 2017 12:30:11 +0800
-Subject: [PATCH 2/4] Kodi settings: default to Expert level
+From a50cb328331628a15065b82d73b1716a57d49240 Mon Sep 17 00:00:00 2001
+From: Jamie Coldhill <[email protected]>
+Date: Tue, 27 Jun 2017 14:32:55 +0800
+Subject: [PATCH] Kodi-settings-default-to-Expert-level
 
 ---
  xbmc/view/ViewStateSettings.cpp | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/xbmc/view/ViewStateSettings.cpp b/xbmc/view/ViewStateSettings.cpp
-index a608a82..8122c43 100644
+index 406ddff..51372f6 100644
 --- a/xbmc/view/ViewStateSettings.cpp
 +++ b/xbmc/view/ViewStateSettings.cpp
-@@ -124,12 +124,14 @@ bool CViewStateSettings::Load(const TiXmlNode *settings)
+@@ -125,11 +125,13 @@ bool CViewStateSettings::Load(const TiXmlNode *settings)
    pElement = settings->FirstChild(XML_GENERAL);
    if (pElement != NULL)
    {
 +    /*
-+    // Force setting level to expert
++    // Force settings level to Expert
      int settingLevel;
-     if (XMLUtils::GetInt(pElement, XML_SETTINGLEVEL, settingLevel, (const int)SettingLevelBasic, (const int)SettingLevelExpert))
+     if (XMLUtils::GetInt(pElement, XML_SETTINGLEVEL, settingLevel, (const int)SettingLevel::Basic, (const int)SettingLevel::Expert))
        m_settingLevel = (SettingLevel)settingLevel;
-     else
--      m_settingLevel = SettingLevelStandard;
--
-+    */
-+      m_settingLevel = SettingLevelExpert;
+-    else
+-      m_settingLevel = SettingLevel::Standard;
++    else */
++      m_settingLevel = SettingLevel::Expert;
+ 
      const TiXmlNode* pEventLogNode = pElement->FirstChild(XML_EVENTLOG);
      if (pEventLogNode != NULL)
-     {
 -- 
 2.7.4
+