Merge remote-tracking branch 'teamxbmc/master'

.gitignore

@@ -18,9 +18,6 @@ testMain
 .vscode/
 
 # generated files etc
-config.cache
-config.status
-config.log
 .last_success_revision
 *.d
 *.depend
@@ -89,32 +86,11 @@ cmake_install.cmake
 /nbproject
 
 # /
-/.dummy
-/.dummy.in
-/Makefile
-/Makefile.include
-/aclocal.m4
-/autom4te.cache/
-/build-aux/compile
-/build-aux/config.guess
-/build-aux/config.sub
-/build-aux/install-sh
-/build-aux/ltmain.sh
-/build-aux/missing
-/build-aux/ltmain.sh
-/autotools
-/BUILD/
-
 /kodi.log
 /kodi.old.log
-/Makefile.depend
-/config.status
-/configure
 /kodi.bin
 /kodi-test
 /kodi-xrandr
-/git_revision.h
-/libtool
 /*.patch
 /kodi-build/
 /gtestresults.xml
@@ -133,9 +109,26 @@ cmake_install.cmake
 /addons/adsp.*
 /addons/peripheral.*
 /addons/game.*
+/addons/kodi.binary.global.audioengine/addon.xml
+/addons/kodi.binary.global.filesystem/addon.xml
+/addons/kodi.binary.global.general/addon.xml
+/addons/kodi.binary.global.gui/addon.xml
+/addons/kodi.binary.global.main/addon.xml
+/addons/kodi.binary.global.network/addon.xml
+/addons/kodi.binary.instance.adsp/addon.xml
+/addons/kodi.binary.instance.audiodecoder/addon.xml
+/addons/kodi.binary.instance.audioencoder/addon.xml
+/addons/kodi.binary.instance.game/addon.xml
+/addons/kodi.binary.instance.imagedecoder/addon.xml
+/addons/kodi.binary.instance.inputstream/addon.xml
+/addons/kodi.binary.instance.peripheral/addon.xml
+/addons/kodi.binary.instance.pvr/addon.xml
+/addons/kodi.binary.instance.screensaver/addon.xml
+/addons/kodi.binary.instance.vfs/addon.xml
+/addons/kodi.binary.instance.videocodec/addon.xml
+/addons/kodi.binary.instance.visualization/addon.xml
 /addons/xbmc.addon/addon.xml
 /addons/xbmc.json/addon.xml
-/addons/kodi.guilib/addon.xml
 /addons/audiodecoder.*
 /addons/visualization.*
 /addons/screensaver.*
@@ -157,6 +150,9 @@ cmake_install.cmake
 /lib/cpluff/config.h.in
 /lib/cpluff/config.h.in~
 /lib/cpluff/configure
+/lib/cpluff/config.cache
+/lib/cpluff/config.log
+/lib/cpluff/config.status
 /lib/cpluff/Makefile.in
 /lib/cpluff/*/Makefile.in
 /lib/cpluff/*/*/Makefile.in
@@ -191,6 +187,9 @@ lib/cpluff/stamp-h1
 /lib/gtest/build-aux/ltmain.sh
 /lib/gtest/build-aux/missing
 /lib/gtest/configure
+/lib/gtest/config.cache
+/lib/gtest/config.log
+/lib/gtest/config.status
 /lib/gtest/m4/libtool.m4
 /lib/gtest/m4/ltoptions.m4
 /lib/gtest/m4/ltsugar.m4
@@ -311,6 +310,9 @@ lib/cpluff/stamp-h1
 /tools/android/packaging/xbmc/strings.xml
 
 #/tools/depends
+/tools/depends/**/config.cache
+/tools/depends/**/config.log
+/tools/depends/**/config.status
 /tools/depends/native/*/*native/
 /tools/depends/target/*/aarch64-linux-gnu/
 /tools/depends/native/JsonSchemaBuilder/bin/
@@ -362,7 +364,6 @@ lib/cpluff/stamp-h1
 # /tools/TexturePacker
 /tools/TexturePacker/TexturePacker*
 /tools/TexturePacker/Makefile
-/tools/TexturePacker/*.dll
 
 # /userdata/
 /userdata/Database
@@ -371,126 +372,6 @@ lib/cpluff/stamp-h1
 /userdata/cache
 /userdata/guisettings.xml
 
-# /xbmc/
-/xbmc/.GitRevision
-/xbmc/config.h
-/xbmc/config.h.in
-/xbmc/config.h.in~
-/xbmc/CompileInfo.cpp
-/xbmc/DllPaths_generated.h
-/xbmc/DllPaths_generated_android.h
-/xbmc/Makefile
-/xbmc/stamp-h1
-
-# /xbmc/addons/
-/xbmc/addons/Makefile
-/xbmc/addons/interfaces/Makefile
-
-# /xbmc/platform/android
-/xbmc/platform/android/Makefile
-/xbmc/platform/android/activity/Makefile
-/xbmc/platform/android/loader/Makefile
-/xbmc/platform/android/jni/Makefile
-
-# /xbmc/cdrip/
-/xbmc/cdrip/Makefile
-
-# /xbmc/cores/
-/xbmc/cores/AudioEngine/Makefile
-/xbmc/cores/DllLoader/exports/build_wrapper.sh
-/xbmc/cores/DllLoader/exports/wrapper.def
-/xbmc/cores/DllLoader/Makefile
-/xbmc/cores/DllLoader/exports/Makefile
-/xbmc/cores/VideoPlayer/Makefile
-/xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile
-/xbmc/cores/VideoPlayer/DVDCodecs/Makefile
-/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile
-/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile
-/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile
-/xbmc/cores/VideoPlayer/DVDSubtitles/Makefile
-/xbmc/cores/VideoPlayer/Process/Makefile
-/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/Makefile
-/xbmc/cores/omxplayer/Makefile
-/xbmc/cores/paplayer/Makefile
-/xbmc/cores/playercorefactory/Makefile
-/xbmc/cores/Makefile
-/xbmc/cores/VideoPlayer/VideoRenderers/Makefile
-/xbmc/cores/RetroPlayer/Makefile
-
-# /xbmc/filesystem/
-/xbmc/filesystem/Makefile
-
-# /xbmc/freebsd/
-/xbmc/freebsd/Makefile
-
-# /xbmc/guilib/
-/xbmc/guilib/Makefile
-/xbmc/guilib/*.obj
-/xbmc/guilib/*.idb
-/xbmc/guilib/*.pdb
-/xbmc/guilib/*.bak
-/xbmc/guilib/Debug (Win32)
-/xbmc/guilib/Release (Win32)
-/xbmc/guilib/Release
-/xbmc/guilib/Release_LTCG
-/xbmc/guilib/Debug
-/xbmc/guilib/Profile
-/xbmc/guilib/Profile_FastCap
-
-# /xbmc/input
-/xbmc/input/linux/Makefile
-
-# /xbmc/interfaces/
-/xbmc/interfaces/Makefile
-/xbmc/interfaces/builtins/Makefile
-/xbmc/interfaces/json-rpc/ServiceDescription.h
-/xbmc/interfaces/python/Makefile
-/xbmc/interfaces/python/generated/
-/xbmc/interfaces/python/test/Makefile
-
-# /xbmc/linux/
-/xbmc/linux/Makefile
-/xbmc/linux/sse4/Makefile
-
-# /xbmc/platform/posix
-/xbmc/platform/posix/Makefile
-
-# /xbmc/platform
-/xbmc/platform/Makefile
-
-# /xbmc/messaging/
-/xbmc/messaging/Makefile
-/xbmc/messaging/helpers/Makefile
-
-# /xbmc/network/
-/xbmc/network/Makefile
-/xbmc/network/httprequesthandler/python/Makefile
-/xbmc/network/upnp/Makefile
-
-# /xbmc/platform/darwin/osx/
-/xbmc/platform/darwin/osx/Info.plist
-/xbmc/platform/darwin/osx/Makefile
-
-# /xbmc/platform/darwin/ios/
-/xbmc/platform/darwin/osx/ios/IOS-Info.plist
-
-# /xbmc/peripherals/
-/xbmc/peripherals/addons/Makefile
-/xbmc/peripherals/bus/Makefile
-/xbmc/peripherals/devices/Makefile
-
-#/xbmc/utils
-/xbmc/utils/Makefile
-
-#/xbmc/platform/win32/
-/xbmc/platform/win32/XBMC_PC.rc
-# no longer used
-/xbmc/platform/win32/git_rev.h
-
-# /xbmc/windowing/
-/xbmc/windowing/Makefile
-/xbmc/windowing/egl/Makefile
-
 #/lib/win32
 /lib/win32/*.tar*
 /lib/win32/pax_global_header
@@ -505,9 +386,6 @@ lib/cpluff/stamp-h1
 
 # Doxygen generated files
 /docs/html
-tools/depends/native/TexturePacker/src/Win32/Debug/
-tools/depends/native/TexturePacker/src/Win32/Release/
-tools/depends/native/TexturePacker/src/Win32/TexturePacker.VC.db
 exclude_dll.txt
 
 #certificates

CMakeLists.txt

@@ -51,6 +51,7 @@ if(UNIX)
   option(FFMPEG_PATH        "Path to external ffmpeg?" "")
   option(ENABLE_INTERNAL_CROSSGUID "Enable internal crossguid?" ON)
   option(ENABLE_INTERNAL_RapidJSON "Enable internal rapidjson?" OFF)
+  option(ENABLE_INTERNAL_FMT "Enable internal fmt?" OFF)
   option(ENABLE_OPENSSL     "Enable OpenSSL?" ON)
 endif()
 # System options

addons/resource.language.en_gb/resources/strings.po

@@ -9990,11 +9990,7 @@ msgctxt "#19169"
 msgid "Hide video information box"
 msgstr ""
 
-#. pvr settings "playback timeout" setting label
-#: system/settings/settings.xml
-msgctxt "#19170"
-msgid "Timeout when starting playback"
-msgstr ""
+#empty string with id 19170
 
 #. pvr settings "start playback full screen" setting label
 #: system/settings/settings.xml
@@ -16383,8 +16379,20 @@ msgctxt "#34128"
 msgid "192.0"
 msgstr ""
 
+#. SPDIF max sampling rate
+#: system/settings/settings.xml
+msgctxt "#34129"
+msgid "352.8"
+msgstr ""
+
+#. SPDIF max sampling rate
+#: system/settings/settings.xml
+msgctxt "#34130"
+msgid "384.0"
+msgstr ""
+
 #empty strings from id 34129 to 34200
-#34129-34200 reserved for future use
+#34131-34200 reserved for future use
 
 #: xbmc/PlayListPlayer.cpp
 msgctxt "#34201"
@@ -18146,10 +18154,7 @@ msgctxt "#36229"
 msgid "Display signal quality information in the codec information window (if supported by the add-on and backend)."
 msgstr ""
 
-#: system/settings/settings.xml
-msgctxt "#36230"
-msgid "Time to wait for a channel to be received after a channel change. Useful for over-the-air channels that occasionally lose signal strength."
-msgstr ""
+#empty string with id 36230
 
 #: system/settings/settings.xml
 msgctxt "#36231"
@@ -20656,7 +20661,13 @@ msgctxt "#38208"
 msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed."
 msgstr ""
 
-#empty strings from id 38209 to 38999
+#. Contextmenu entry to remove the resume point of the currently selected item
+#: xbmc/video/ContextMenus.h
+msgctxt "#38209"
+msgid "Reset resume position"
+msgstr ""
+
+#empty strings from id 38210 to 38999
 
 #: system/settings/settings.xml
 msgctxt "#39000"

addons/skin.estouchy/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estouchy" version="2.0.7" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="2.0.8" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.13.0"/>
 	</requires>

addons/skin.estouchy/changelog.txt

@@ -1,5 +1,6 @@
+
 V2.0.0
-- Kodi v18 LittlePony
+- Kodi v18 Leia
 
 V1.1.0
 - Redesign

addons/skin.estouchy/xml/ViewsPVR.xml

@@ -191,7 +191,6 @@
 			<timeblocks>40</timeblocks>
 			<rulerunit>6</rulerunit>
 			<progresstexture border="0,3,8,3">epg_marker.png</progresstexture>
-			<preloaditems>4</preloaditems>
 			<rulerlayout height="30" width="40">
 				<control type="label" id="2">
 					<posx>10</posx>

addons/skin.estuary/xml/DialogBusy.xml

@@ -11,7 +11,7 @@
 				<texture>colors/black.png</texture>
 				<include>FullScreenDimensions</include>
 				<animation effect="fade" start="100" end="70" time="0" condition="true">Conditional</animation>
-				<animation effect="fade" start="100" end="0" time="240" condition="Window.IsVisible(fullscreenvideo)">Conditional</animation>
+				<animation effect="fade" start="100" end="0" time="240" condition="Window.IsVisible(fullscreenvideo) | Window.IsVisible(FullscreenGame)">Conditional</animation>
 			</control>
 			<control type="group">
 				<depth>DepthMax</depth>

addons/skin.estuary/xml/DialogExtendedProgressBar.xml

@@ -10,7 +10,7 @@
 			<width>80</width>
 			<top>0</top>
 			<animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
-			<animation effect="slide" end="0,-80" time="150" condition="Window.IsVisible(FullscreenVideo)">conditional</animation>
+			<animation effect="slide" end="0,-80" time="150" condition="Window.IsVisible(FullscreenVideo) | Window.IsVisible(FullscreenGame)">conditional</animation>
 			<control type="image">
 				<left>20</left>
 				<top>10</top>

addons/skin.estuary/xml/DialogSeekBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<visible>Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(GameOSD) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput)</visible>
+	<visible>Player.Seeking | Player.DisplayAfterSeek | [Player.Paused + !Player.Caching] | Player.Forwarding | Player.Rewinding | Player.ShowInfo | Window.IsActive(videoosd) | Window.IsActive(musicosd) | Window.IsActive(playerprocessinfo) | !String.IsEmpty(Player.SeekNumeric) | !String.IsEmpty(PVR.ChannelNumberInput)</visible>
 	<visible>![Window.IsActive(sliderdialog) | Window.IsActive(pvrosdchannels)]</visible>
 	<visible>Window.IsActive(fullscreenvideo) | Window.IsActive(visualisation)</visible>
 	<include>Animation_BottomSlide</include>

addons/skin.estuary/xml/DialogVolumeBar.xml

@@ -20,7 +20,7 @@
 				<width>88</width>
 				<height>88</height>
 				<texture>osd/buffer-bg.png</texture>
-				<visible>Window.IsActive(fullscreenvideo) | Window.IsActive(slideshow)</visible>
+				<visible>Window.IsActive(fullscreenvideo) | Window.IsActive(FullscreenGame) | Window.IsActive(slideshow)</visible>
 			</control>
 			<control type="image">
 				<left>22</left>

addons/skin.estuary/xml/Includes.xml

@@ -1120,7 +1120,7 @@
 				<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
 				<control type="group">
 					<animation effect="fade" start="100" end="bg_alpha" time="0" condition="!Control.IsVisible(31111)">Conditional</animation>
-					<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup)">WindowOpen</animation>
+					<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(FullscreenGame) | Window.Previous(startup)">WindowOpen</animation>
 					<include>ColoredBackgroundImages</include>
 				</control>
 				<control type="group" id="31111">

addons/skin.estuary/xml/MyWeather.xml

@@ -35,7 +35,7 @@
 		<control type="group">
 			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
 			<animation effect="fade" start="100" end="bg_alpha" time="0" condition="Player.HasMedia">Conditional</animation>
-			<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup)">WindowOpen</animation>
+			<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(FullscreenGame) | Window.Previous(startup)">WindowOpen</animation>
 			<include>ColoredBackgroundImages</include>
 		</control>
 		<control type="multiimage">