Open kambala-decapitator opened 4 years ago
Checked diff of the following files:
git diff ed477cbc50b43b57469e202d666f98aed0c47a75 docs/README.md xbmc/Application.cpp xbmc/Application.h xbmc/GUIInfoManager.cpp xbmc/Util.cpp xbmc/Util.h xbmc/addons/addoninfo/AddonInfoBuilder.cpp xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp xbmc/filesystem/DirectoryFactory.cpp xbmc/filesystem/FileFactory.cpp xbmc/guilib/GUIKeyboardFactory.cpp xbmc/guilib/TextureManager.cpp xbmc/guilib/guiinfo/GUIInfoLabels.h xbmc/guilib/guiinfo/SystemGUIInfo.cpp xbmc/network/Network.h xbmc/platform/posix/network/NetworkLinux.cpp xbmc/settings/DisplaySettings.cpp xbmc/settings/SettingConditions.cpp xbmc/settings/Settings.cpp xbmc/settings/Settings.h xbmc/threads/platform/pthreads/ThreadImpl.cpp xbmc/utils/RecentlyAddedJob.cpp xbmc/utils/SystemInfo.cpp xbmc/utils/test/TestSystemInfo.cpp
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 92362ec92e..1d487b1f53 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -3034,7 +3034,6 @@ void CApplication::OnPlayBackStarted(const CFileItem &file)
{
CLog::LogF(LOGDEBUG,"CApplication::OnPlayBackStarted");
Any idea why would iOS want WINDOW_DIALOG_KEYBOARD_TOUCH
? We show native keyboard anyway, don't we?
diff --git a/xbmc/guilib/GUIKeyboardFactory.cpp b/xbmc/guilib/GUIKeyboardFactory.cpp
index 0a09cc5d56..193a77de5c 100644
--- a/xbmc/guilib/GUIKeyboardFactory.cpp
+++ b/xbmc/guilib/GUIKeyboardFactory.cpp
@@ -84,7 +84,18 @@ bool CGUIKeyboardFactory::ShowAndGetInput(std::string& aTextString, CVariant hea
headingStr = g_localizeStrings.Get((uint32_t)heading.asInteger());
#if defined(TARGET_DARWIN_EMBEDDED)
- kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardTouch>(WINDOW_DIALOG_KEYBOARD_TOUCH);
+ bool use_kodi_keyboard = false;
+ #if defined(TARGET_DARWIN_TVOS)
+ use_kodi_keyboard = CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_INPUT_APPLEUSEKODIKEYBOARD);
+ #endif
+ if(use_kodi_keyboard)
+ {
+ kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardGeneric>(WINDOW_DIALOG_KEYBOARD);
+ }
+ else
+ {
+ kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardTouch>(WINDOW_DIALOG_KEYBOARD_TOUCH);
+ }
#else
kb = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogKeyboardGeneric>(WINDOW_DIALOG_KEYBOARD);
#endif
xbmc/utils/RecentlyAddedJob.cp
adds items to top shelf, we should check if it's possible to move to the platform code.
Have pulled in all changes in https://github.com/kambala-decapitator/xbmc/commit/e348a2a06aa5b10114f79a88d5f85dae458c3fc3
Link anymore commits and i'll cherry-pick in
compared from d34918c97eb357a00ddbb83fa9c43053e19e0106 in my branch:
git diff --name-status ed477cbc50b43b57469e202d666f98aed0c47a75