Packman Build Service PMBS

Changes of Revision 3

kodi.spec Changed

@@ -18,10 +18,10 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Jarvis
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
-%define dev_build 0
+%define dev_build 1
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
 %define noX_build 0
 %if %{noX_build}
@@ -42,7 +42,8 @@
 %define kodi_player none
 
 Name:           kodi
-Version:        16.0
+#Version:        17.0
+Version:        master
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -50,11 +51,14 @@
 Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
-Source2:        crossguid-8f399e8bd4.tar.gz
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+Source20:       crossguid-8f399e8bd4.tar.gz
+Source21:       libdvdcss-master.tar.gz
+Source22:       libdvdread-master.tar.gz
+Source23:       libdvdnav-master.tar.gz
 Patch1:         no-xbmc-symbolic-link.patch
 Patch2:         kodi-texturepacker.patch
 Patch3:         crossguid_build64.patch
@@ -242,10 +246,11 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
+
 %patch1
 %patch2
 %patch3
-%patch4 -p0
+#%patch4 -p0
 
 
 # Remove build time references so build-compare can do its work
@@ -268,8 +273,10 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE2} tools/depends/target/crossguid
-
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdcss
+cp %{SOURCE22} tools/depends/target/libdvdread
+cp %{SOURCE23} tools/depends/target/libdvdnav
 
 %build
 
@@ -349,7 +356,7 @@
     --disable-optimizations \
     --disable-static 
 
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
@@ -427,6 +434,10 @@
 %{_mandir}/man1/kodi.1.gz
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
+%dir %{_kodi_addons_dir}/game.controller.default
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -461,8 +472,6 @@
 %{_kodi_addons_dir}/script.module.pil/*
 %dir %{_kodi_addons_dir}/service.xbmc.versioncheck/
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
-%dir %{_kodi_addons_dir}/skin.confluence/
-%{_kodi_addons_dir}/skin.confluence/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
 %dir %{_kodi_addons_dir}/xbmc.codec/
@@ -499,14 +508,36 @@
 %{_kodi_addons_dir}/xbmc.webinterface/*
 %dir %{_kodi_addons_dir}/kodi.adsp
 %{_kodi_addons_dir}/kodi.adsp/*
-%dir %{_kodi_addons_dir}/library.kodi.adsp
-%{_kodi_addons_dir}/library.kodi.adsp/*
-%dir %{_kodi_addons_dir}/library.kodi.audioengine
-%{_kodi_addons_dir}/library.kodi.audioengine/*
 %dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
 %{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
+%dir %{_kodi_addons_dir}/skin.estuary
+%{_kodi_addons_dir}/skin.estuary/*
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+%{_libdir}/kodi/archsetup.cmake
+%{_libdir}/kodi/checkcommits.cmake
+%{_libdir}/kodi/generateversionedfiles.cmake
+%{_libdir}/kodi/generatorsetup.cmake
+%{_libdir}/kodi/macros.cmake
+%{_libdir}/kodi/managestring.cmake
+%{_libdir}/kodi/pathsetup.cmake
+%{_libdir}/kodi/projectmacros.cmake
 %{_libdir}/kodi/addon-helpers.cmake
 %{_libdir}/kodi/addoptions.cmake
 %{_libdir}/kodi/check_target_platform.cmake
@@ -514,12 +545,6 @@
 %{_libdir}/kodi/kodi-config.cmake
 %{_libdir}/kodi/prepare-env.cmake
 %{_libdir}/kodi/xbmc-config.cmake
-%dir %{_libdir}/kodi/addons/library.kodi.guilib/
-%{_libdir}/kodi/addons/library.kodi.guilib/*
-%dir %{_libdir}/kodi/addons/library.kodi.adsp
-%{_libdir}/kodi/addons/library.kodi.adsp/*
-%dir %{_libdir}/kodi/addons/library.kodi.audioengine
-%{_libdir}/kodi/addons/library.kodi.audioengine/*
 
 %if %{noX_build}
 %{_unitdir}/kodi-noX.service
@@ -530,10 +555,17 @@
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
+%{_includedir}/kodi/AEChannelData.h
 %{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
 %{_includedir}/kodi/libXBMC_addon.h
 %{_includedir}/kodi/libXBMC_codec.h
 %{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
 %{_includedir}/kodi/xbmc_addon_cpp_dll.h
 %{_includedir}/kodi/xbmc_addon_dll.h
 %{_includedir}/kodi/xbmc_addon_types.h
@@ -543,19 +575,22 @@
 %{_includedir}/kodi/xbmc_pvr_types.h
 %{_includedir}/kodi/xbmc_scr_dll.h
 %{_includedir}/kodi/xbmc_scr_types.h
-%{_includedir}/kodi/xbmc_stream_utils.hpp
 %{_includedir}/kodi/xbmc_vis_dll.h
 %{_includedir}/kodi/xbmc_vis_types.h
 %{_includedir}/kodi/xbmc_audioenc_dll.h
 %{_includedir}/kodi/xbmc_audioenc_types.h
-%{_includedir}/kodi/AEChannelData.h
 %{_includedir}/kodi/kodi_audiodec_dll.h
 %{_includedir}/kodi/kodi_audiodec_types.h
-%{_includedir}/kodi/libKODI_guilib.h
 %{_includedir}/kodi/kodi_adsp_dll.h
 %{_includedir}/kodi/kodi_adsp_types.h
 %{_includedir}/kodi/kodi_audioengine_types.h
-%{_includedir}/kodi/libKODI_adsp.h
-%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
 
 %changelog

no-xbmc-symbolic-link.patch Changed

@@ -1,6 +1,6 @@
---- Makefile.in.orig	2016-02-15 06:46:03.149076640 +0200
-+++ Makefile.in	2016-02-15 06:47:14.550439552 +0200
-@@ -464,7 +464,6 @@
+--- Makefile.in.orig	2016-03-31 21:54:56.341468445 +0300
++++ Makefile.in	2016-03-31 21:55:26.720402549 +0300
+@@ -460,7 +460,6 @@
  install-binaries: install-scripts
  	@echo "Copying @APP_NAME_LC@ binary to $(DESTDIR)$(libdir)/@APP_NAME_LC@/"
  	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
@@ -8,22 +8,22 @@
  ifeq (1,@USE_X11@)
  	@install @APP_NAME_LC@-xrandr $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@-xrandr
  endif
-@@ -502,14 +501,10 @@
+@@ -498,14 +497,10 @@
  install-scripts:
  	@install -d $(DESTDIR)$(bindir)
- 	@install tools/Linux/@APP_NAME_LC@.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
+ 	@install tools/Linux/kodi.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
 -	@cd $(DESTDIR)$(bindir); [ -L xbmc ] || [ -f xbmc ] || ln -s @APP_NAME_LC@ xbmc
- 	@install tools/Linux/@APP_NAME_LC@-standalone.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@-standalone
+ 	@install tools/Linux/kodi-standalone.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@-standalone
 -	@cd $(DESTDIR)$(bindir); [ -L xbmc-standalone ] || [ -f xbmc-standalone ] ||  ln -s @APP_NAME_LC@-standalone xbmc-standalone
  	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
 -	@cd $(DESTDIR)$(datarootdir); [ -L xbmc ] || [ -d xbmc ] || ln -s @APP_NAME_LC@ xbmc
  	@install -d $(DESTDIR)$(datarootdir)/xsessions
- 	@install -m 0644 tools/Linux/@APP_NAME_LC@-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
+ 	@install -m 0644 tools/Linux/kodi-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
 -	@cd $(DESTDIR)$(datarootdir)/xsessions; [ -L xbmc.desktop ] || [ -f xbmc.desktop ] || ln -s @APP_NAME_LC@.desktop xbmc.desktop
  
  install-datas: install-scripts
  	@echo "Copying support and legal files..."
-@@ -574,7 +569,6 @@
+@@ -570,7 +565,6 @@
  	@for f in project/cmake/scripts/common/*.cmake; do \
  	  install -m 0644 $$f $(DESTDIR)$(libdir)/@APP_NAME_LC@; \
  	done

_service:download_url:master.tar.gz/.gitignore Changed

@@ -124,6 +124,7 @@
 /addons/audioencoder.*
 /addons/pvr.*
 /addons/adsp.*
+/addons/peripheral.*
 /addons/xbmc.addon/addon.xml
 /addons/xbmc.json/addon.xml
 /addons/kodi.guilib/addon.xml
@@ -142,6 +143,7 @@
 /lib/addons/library.kodi.adsp/Makefile
 /lib/addons/library.xbmc.pvr/Makefile
 /lib/addons/library.xbmc.codec/Makefile
+/lib/addons/library.kodi.peripheral/Makefile
 /lib/addons/library.xbmc.addon/project/VS2010Express/Release
 /lib/addons/library.xbmc.addon/project/VS2010Express/Debug
 /lib/addons/library.kodi.adsp/project/VS2010Express/Release
@@ -153,6 +155,8 @@
 /lib/addons/library.kodi.audioengine/Makefile
 /lib/addons/library.kodi.audioengine/project/VS2010Express/Release/
 /lib/addons/library.kodi.audioengine/project/VS2010Express/Debug/
+/lib/addons/library.kodi.peripheral/project/VS2010Express/Release
+/lib/addons/library.kodi.peripheral/project/VS2010Express/Debug
 
 # /lib/cpluff/
 /lib/cpluff/ABOUT-NLS
@@ -329,6 +333,7 @@
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCBroadcastReceiver.java
+/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCInputDeviceListener.java
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java
 /tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCSettingsContentObserver.java
@@ -486,6 +491,7 @@
 /xbmc/platform/darwin/osx/ios/IOS-Info.plist
 
 # /xbmc/peripherals/
+/xbmc/peripherals/addons/Makefile
 /xbmc/peripherals/bus/Makefile
 /xbmc/peripherals/devices/Makefile

_service:download_url:master.tar.gz/.travis.yml Changed

_service:download_url:master.tar.gz/Kodi.xcodeproj/project.pbxproj Changed

@@ -113,7 +113,6 @@
 		18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */; };
 		18B7C8D912942546009E7A26 /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CF12942546009E7A26 /* KeyboardStat.cpp */; };
 		18B7C8DA12942546009E7A26 /* MouseStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D112942546009E7A26 /* MouseStat.cpp */; };
-		18B7C8DB12942546009E7A26 /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D312942546009E7A26 /* SDLJoystick.cpp */; };
 		18B7C8E912942603009E7A26 /* Crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8E712942603009E7A26 /* Crc32.cpp */; };
 		18B7C8EE12942613009E7A26 /* URIUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8EC12942613009E7A26 /* URIUtils.cpp */; };
 		18B7C8F31294261F009E7A26 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8F11294261F009E7A26 /* StringUtils.cpp */; };
@@ -254,6 +253,68 @@
 		5EB3113C1A978B9B00551907 /* CueInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB3113A1A978B9B00551907 /* CueInfoLoader.cpp */; };
 		5EE4F9181A9FF36F002E20F8 /* CueInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB3113A1A978B9B00551907 /* CueInfoLoader.cpp */; };
 		5EF801001A97892A0035AA4D /* ReplayGain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF800FE1A97892A0035AA4D /* ReplayGain.cpp */; };
+		68AE5BA51C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */; };
+		68AE5BA61C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */; };
+		68AE5BBD1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */; };
+		68AE5BBE1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */; };
+		68AE5BBF1C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */; };
+		68AE5BC01C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */; };
+		68AE5BC11C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */; };
+		68AE5BC21C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */; };
+		68AE5BC31C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */; };
+		68AE5BC41C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */; };
+		68AE5BC51C9241DF00C4D527 /* KeymapHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */; };
+		68AE5BC61C9241DF00C4D527 /* KeymapHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */; };
+		68AE5BCE1C9241F800C4D527 /* ButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */; };
+		68AE5BCF1C9241F800C4D527 /* ButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */; };
+		68AE5BD01C9241F800C4D527 /* FeatureHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */; };
+		68AE5BD11C9241F800C4D527 /* FeatureHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */; };
+		68AE5BD21C9241F800C4D527 /* InputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */; };
+		68AE5BD31C9241F800C4D527 /* InputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */; };
+		68AE5BDF1C92421800C4D527 /* AddonButtonMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */; };
+		68AE5BE01C92421800C4D527 /* AddonButtonMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */; };
+		68AE5BE11C92421800C4D527 /* AddonButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */; };
+		68AE5BE21C92421800C4D527 /* AddonButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */; };
+		68AE5BE31C92421800C4D527 /* AddonInputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */; };
+		68AE5BE41C92421800C4D527 /* AddonInputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */; };
+		68AE5BE51C92421800C4D527 /* PeripheralAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */; };
+		68AE5BE61C92421800C4D527 /* PeripheralAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */; };
+		68AE5BE71C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */; };
+		68AE5BE81C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */; };
+		68AE5BEB1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */; };
+		68AE5BEC1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */; };
+		68AE5BEF1C92424300C4D527 /* PeripheralJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */; };
+		68AE5BF01C92424400C4D527 /* PeripheralJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */; };
+		68AE5BF51C92431300C4D527 /* EventScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF11C92431300C4D527 /* EventScanner.cpp */; };
+		68AE5BF61C92431300C4D527 /* EventScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF11C92431300C4D527 /* EventScanner.cpp */; };
+		68AE5BF71C92431300C4D527 /* EventScanRate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF31C92431300C4D527 /* EventScanRate.cpp */; };
+		68AE5BF81C92431300C4D527 /* EventScanRate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF31C92431300C4D527 /* EventScanRate.cpp */; };
+		68AE5C071C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */; };
+		68AE5C081C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */; };
+		68AE5C091C92437900C4D527 /* GUIControllerList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C001C92437900C4D527 /* GUIControllerList.cpp */; };
+		68AE5C0A1C92437900C4D527 /* GUIControllerList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C001C92437900C4D527 /* GUIControllerList.cpp */; };
+		68AE5C0B1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */; };
+		68AE5C0C1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */; };
+		68AE5C0D1C92437900C4D527 /* GUIFeatureList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */; };
+		68AE5C0E1C92437900C4D527 /* GUIFeatureList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */; };
+		68AE5C191C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */; };
+		68AE5C1A1C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */; };
+		68AE5C1B1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */; };
+		68AE5C1C1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */; };
+		68AE5C1D1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */; };
+		68AE5C1E1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */; };
+		68AE5C1F1C92438E00C4D527 /* GUIGameController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C151C92438E00C4D527 /* GUIGameController.cpp */; };
+		68AE5C201C92438E00C4D527 /* GUIGameController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C151C92438E00C4D527 /* GUIGameController.cpp */; };
+		68AE5C211C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */; };
+		68AE5C221C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */; };
+		68AE5C2D1C9243A000C4D527 /* Controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C231C9243A000C4D527 /* Controller.cpp */; };
+		68AE5C2E1C9243A000C4D527 /* Controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C231C9243A000C4D527 /* Controller.cpp */; };
+		68AE5C2F1C9243A000C4D527 /* ControllerFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */; };
+		68AE5C301C9243A000C4D527 /* ControllerFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */; };
+		68AE5C311C9243A000C4D527 /* ControllerLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */; };
+		68AE5C321C9243A000C4D527 /* ControllerLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */; };
+		68AE5C331C9243A000C4D527 /* ControllerTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */; };
+		68AE5C341C9243A000C4D527 /* ControllerTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */; };
 		761170901C8B85F8006C6366 /* AddonGUIRenderingControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7611708C1C8B85F8006C6366 /* AddonGUIRenderingControl.cpp */; };
 		761170911C8B85F8006C6366 /* AddonGUIWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7611708E1C8B85F8006C6366 /* AddonGUIWindow.cpp */; };
 		76AEFB361C8F79BD00EF2EC0 /* AddonInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */; };
@@ -292,6 +353,8 @@
 		7C1409AA184015C9009F9411 /* InfoExpression.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1409A7184015C6009F9411 /* InfoExpression.cpp */; };
 		7C15DCBC1892481400FCE564 /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C15DCBB1892481300FCE564 /* InfoBool.cpp */; };
 		7C15DCBD1892481400FCE564 /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C15DCBB1892481300FCE564 /* InfoBool.cpp */; };
+		7C1870621CA1664D00114E45 /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1870601CA1664D00114E45 /* PVRClient.cpp */; };
+		7C1870631CA1664D00114E45 /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1870601CA1664D00114E45 /* PVRClient.cpp */; };
 		7C1A492315A962EE004AF4A4 /* SeekHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1A492115A962EE004AF4A4 /* SeekHandler.cpp */; };
 		7C1A85661520522500C63311 /* TextureCacheJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1A85631520522500C63311 /* TextureCacheJob.cpp */; };
 		7C1D682915A7D2FD00658B65 /* DatabaseManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C1D682715A7D2FD00658B65 /* DatabaseManager.cpp */; };
@@ -392,6 +455,8 @@
 		7C973CFB1B5038580002A874 /* GUIDialogAudioDSPSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C973CF81B5038580002A874 /* GUIDialogAudioDSPSettings.cpp */; };
 		7C99B6A4133D342100FC2B16 /* CircularCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6A2133D342100FC2B16 /* CircularCache.cpp */; };
 		7C99B7951340723F00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7931340723F00FC2B16 /* GUIDialogPlayEject.cpp */; };
+		7CA220071C921F74000FA3CD /* DemuxMultiSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CA220051C921F74000FA3CD /* DemuxMultiSource.cpp */; };
+		7CA220081C921F74000FA3CD /* DemuxMultiSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CA220051C921F74000FA3CD /* DemuxMultiSource.cpp */; };
 		7CAA20511079C8160096DE39 /* BaseRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA204F1079C8160096DE39 /* BaseRenderer.cpp */; };
 		7CAA25351085963B0096DE39 /* PasswordManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA25331085963B0096DE39 /* PasswordManager.cpp */; };
 		7CAA469019427AED00008885 /* PosixDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA468E19427AED00008885 /* PosixDirectory.cpp */; };
@@ -616,6 +681,10 @@
 		7CD4F7EC1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4F7EA1C60DBC10015214B /* VideoFileItemListModifier.cpp */; };
 		7CD4F7ED1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CD4F7EA1C60DBC10015214B /* VideoFileItemListModifier.cpp */; };
 		7CDAE9050FFCA3520040B25F /* DVDTSCorrection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */; };
+		7CE3FB8C1C9D3CCA00366A4C /* ServiceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE3FB8A1C9D3CCA00366A4C /* ServiceManager.cpp */; };
+		7CE3FB8D1C9D3CCA00366A4C /* ServiceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE3FB8A1C9D3CCA00366A4C /* ServiceManager.cpp */; };
+		7CE3FB901C9D40EA00366A4C /* ServiceBroker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE3FB8E1C9D40EA00366A4C /* ServiceBroker.cpp */; };
+		7CE3FB911C9D40EA00366A4C /* ServiceBroker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE3FB8E1C9D40EA00366A4C /* ServiceBroker.cpp */; };
 		7CEBD8A80F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEBD8A60F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp */; };
 		7CEE587D1B5A3FFB007C2B5A /* AudioDSPSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE587C1B5A3FFB007C2B5A /* AudioDSPSettings.cpp */; };
 		7CEE587E1B5A3FFB007C2B5A /* AudioDSPSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE587C1B5A3FFB007C2B5A /* AudioDSPSettings.cpp */; };
@@ -632,6 +701,10 @@
 		7CF80DCA19710DC2003B2B34 /* KeyboardLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF80DC719710DC2003B2B34 /* KeyboardLayout.cpp */; };
 		7CFC08381C5BA7D0000E5E73 /* DVDDemuxClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFC08361C5BA7D0000E5E73 /* DVDDemuxClient.cpp */; };
 		7CFC08391C5BA7D0000E5E73 /* DVDDemuxClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFC08361C5BA7D0000E5E73 /* DVDDemuxClient.cpp */; };
+		7CFEA2B21C98618400A0B60B /* BinaryAddonCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFEA2B01C98618400A0B60B /* BinaryAddonCache.cpp */; };
+		7CFEA2B31C98618400A0B60B /* BinaryAddonCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CFEA2B01C98618400A0B60B /* BinaryAddonCache.cpp */; };
+		80204F121C91CD3600E8C88B /* InputStreamMultiSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 80204F0F1C91CD3600E8C88B /* InputStreamMultiSource.cpp */; };
+		80204F131C91CD3600E8C88B /* InputStreamMultiSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 80204F0F1C91CD3600E8C88B /* InputStreamMultiSource.cpp */; };
 		815EE6350E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */; };
 		83E0B2490F7C95FF0091643F /* Atomics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83E0B2480F7C95FF0091643F /* Atomics.cpp */; };
 		880DBE4E0DC223FF00E26B71 /* MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 880DBE4B0DC223FF00E26B71 /* MediaSource.cpp */; };
@@ -643,10 +716,16 @@
 		8883CEA70DD81807004E8B72 /* DVDSubtitleParserSSA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA30DD81807004E8B72 /* DVDSubtitleParserSSA.cpp */; };
 		8883CEA80DD81807004E8B72 /* DVDSubtitlesLibass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8883CEA50DD81807004E8B72 /* DVDSubtitlesLibass.cpp */; };
 		889B4D8E0E0EF86C00FAD25E /* RSSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */; };
+		9A2FAD6A1C972BE10049652A /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A2FAD681C972BE10049652A /* ContextMenus.cpp */; };
+		9A2FAD6B1C972BE10049652A /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A2FAD681C972BE10049652A /* ContextMenus.cpp */; };
 		9A7368511C401F5F00CA169F /* DirectoryNodeInProgressTvShows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A73684F1C401F5F00CA169F /* DirectoryNodeInProgressTvShows.cpp */; };
 		9A7368521C401F5F00CA169F /* DirectoryNodeInProgressTvShows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A73684F1C401F5F00CA169F /* DirectoryNodeInProgressTvShows.cpp */; };
 		9A999F1D1C67B77600E4E0D5 /* AddonBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A999F1B1C67B77600E4E0D5 /* AddonBuilder.cpp */; };
 		9A999F1E1C67B77600E4E0D5 /* AddonBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A999F1B1C67B77600E4E0D5 /* AddonBuilder.cpp */; };
+		9AA7E3E81C972CF4000B7863 /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA7E3E61C972CF4000B7863 /* ContextMenus.cpp */; };
+		9AA7E3E91C972CF4000B7863 /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA7E3E61C972CF4000B7863 /* ContextMenus.cpp */; };
+		9ABFE7A11C972D60002F1318 /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFE79F1C972D60002F1318 /* ContextMenus.cpp */; };
+		9ABFE7A21C972D60002F1318 /* ContextMenus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9ABFE79F1C972D60002F1318 /* ContextMenus.cpp */; };
 		9AC167B61C5ED478004F0C29 /* MusicFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC167B41C5ED478004F0C29 /* MusicFileItemListModifier.cpp */; };
 		9AC167B71C5ED478004F0C29 /* MusicFileItemListModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC167B41C5ED478004F0C29 /* MusicFileItemListModifier.cpp */; };
 		AE32174218313ADF0003FAFC /* XSLTUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE4E87A517354C4A00D15206 /* XSLTUtils.cpp */; };
@@ -667,7 +746,6 @@
 		B542632B197D353B00726998 /* PosixInterfaceForCLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5426329197D353B00726998 /* PosixInterfaceForCLog.cpp */; };
 		B542632C197D353B00726998 /* PosixInterfaceForCLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5426329197D353B00726998 /* PosixInterfaceForCLog.cpp */; };
 		C807114D135DB5CC002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C807114B135DB5CC002F601B /* InputOperations.cpp */; };
-		C84828C0156CFCD8005A996F /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482874156CFCD8005A996F /* PVRClient.cpp */; };
 		C84828C1156CFCD8005A996F /* PVRClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482876156CFCD8005A996F /* PVRClients.cpp */; };
 		C84828C3156CFCD8005A996F /* PVRChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848287A156CFCD8005A996F /* PVRChannel.cpp */; };
 		C84828C4156CFCD8005A996F /* PVRChannelGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848287C156CFCD8005A996F /* PVRChannelGroup.cpp */; };
@@ -705,7 +783,6 @@
 		C84828FE156CFDC3005A996F /* GUIDialogExtendedProgressBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C84828FC156CFDC3005A996F /* GUIDialogExtendedProgressBar.cpp */; };
 		C8482901156CFE4B005A996F /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C84828FF156CFE4B005A996F /* Observer.cpp */; };
 		C8482909156CFF24005A996F /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482905156CFF24005A996F /* PVRDirectory.cpp */; };
-		C848290A156CFF24005A996F /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482907156CFF24005A996F /* PVRFile.cpp */; };
 		C8482910156CFFA0005A996F /* DVDInputStreamPVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848290E156CFFA0005A996F /* DVDInputStreamPVRManager.cpp */; };
 		C848291F156D003E005A996F /* TextSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848291D156D003E005A996F /* TextSearch.cpp */; };
 		C84BF7341349BB74006D6FC9 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C84BF7321349BB74006D6FC9 /* JSONServiceDescription.cpp */; };
@@ -716,7 +793,6 @@
 		DF02BA621A910623006DCA16 /* VideoSyncIos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF02BA601A910623006DCA16 /* VideoSyncIos.cpp */; };
 		DF02BA661A91065F006DCA16 /* VideoSyncOsx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF02BA641A91065F006DCA16 /* VideoSyncOsx.cpp */; };
 		DF033D381946612400BFC82E /* AEDeviceEnumerationOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF033D361946612400BFC82E /* AEDeviceEnumerationOSX.cpp */; };
-		DF072534168734ED008DCAAD /* FFmpegVideoDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF072532168734ED008DCAAD /* FFmpegVideoDecoder.cpp */; };
 		DF0ABB73183A94A30018445D /* Utf8Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0ABB71183A94A30018445D /* Utf8Utils.cpp */; };
 		DF0ABB74183A94A30018445D /* Utf8Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0ABB71183A94A30018445D /* Utf8Utils.cpp */; };
 		DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */; };
@@ -1584,7 +1660,6 @@
 		E49912A0174E5D9900741B6D /* PlaylistFileDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17420D25F9FA00618676 /* PlaylistFileDirectory.cpp */; };
 		E49912A1174E5D9900741B6D /* PluginDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17440D25F9FA00618676 /* PluginDirectory.cpp */; };
 		E49912A2174E5D9900741B6D /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482905156CFF24005A996F /* PVRDirectory.cpp */; };
-		E49912A3174E5D9900741B6D /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482907156CFF24005A996F /* PVRFile.cpp */; };
 		E49912A4174E5D9900741B6D /* RarDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17460D25F9FA00618676 /* RarDirectory.cpp */; };
 		E49912A5174E5D9900741B6D /* RarFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF93D6811444A8B0007C6459 /* RarFile.cpp */; };
 		E49912A6174E5D9900741B6D /* RarManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17480D25F9FA00618676 /* RarManager.cpp */; };
@@ -1854,7 +1929,6 @@
 		E49913EF174E5FB000741B6D /* ProfilesManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF28ED9C170E1A11005FA9D2 /* ProfilesManager.cpp */; };
 		E49913F0174E5FB000741B6D /* GUIViewStatePrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 886328190E07B37200BB3DAB /* GUIViewStatePrograms.cpp */; };
 		E49913F1174E5FB000741B6D /* GUIWindowPrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18230D25F9FA00618676 /* GUIWindowPrograms.cpp */; };
-		E49913F2174E5FB000741B6D /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482874156CFCD8005A996F /* PVRClient.cpp */; };
 		E49913F3174E5FB000741B6D /* PVRClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8482876156CFCD8005A996F /* PVRClients.cpp */; };
 		E49913F4174E5FB000741B6D /* PVRChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848287A156CFCD8005A996F /* PVRChannel.cpp */; };
 		E49913F5174E5FB000741B6D /* PVRChannelGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C848287C156CFCD8005A996F /* PVRChannelGroup.cpp */; };
@@ -1986,7 +2060,6 @@
 		E499148E174E606500741B6D /* GUIWindowVideoNav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18410D25F9FA00618676 /* GUIWindowVideoNav.cpp */; };
 		E499148F174E606600741B6D /* GUIWindowVideoPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18450D25F9FA00618676 /* GUIWindowVideoPlaylist.cpp */; };
 		E4991490174E606600741B6D /* Bookmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C62F24010505BC7002AD2C1 /* Bookmark.cpp */; };
-		E4991491174E606600741B6D /* FFmpegVideoDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF072532168734ED008DCAAD /* FFmpegVideoDecoder.cpp */; };
 		E4991492174E606600741B6D /* GUIViewStateVideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */; };
 		E4991493174E606600741B6D /* PlayerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C87B2CC162CE39600EF897D /* PlayerController.cpp */; };
 		E4991494174E606600741B6D /* Teletext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E55B6E10741340006E788A /* Teletext.cpp */; };
@@ -2074,7 +2147,6 @@
 		E499156A174E65AB00741B6D /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */; };
 		E499156B174E65AB00741B6D /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
 		E499156D174E65AB00741B6D /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CF12942546009E7A26 /* KeyboardStat.cpp */; };
-		E499156E174E65AB00741B6D /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D312942546009E7A26 /* SDLJoystick.cpp */; };
 		E499156F174E65AC00741B6D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */; };
 		E4991574174E661400741B6D /* WinEventsIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4991571174E661300741B6D /* WinEventsIOS.mm */; };
 		E4991575174E661400741B6D /* WinSystemIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4991573174E661300741B6D /* WinSystemIOS.mm */; };
@@ -2457,8 +2529,6 @@
 		18B7C8D012942546009E7A26 /* KeyboardStat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardStat.h; sourceTree = "<group>"; };
 		18B7C8D112942546009E7A26 /* MouseStat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseStat.cpp; sourceTree = "<group>"; };
 		18B7C8D212942546009E7A26 /* MouseStat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseStat.h; sourceTree = "<group>"; };
-		18B7C8D312942546009E7A26 /* SDLJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SDLJoystick.cpp; sourceTree = "<group>"; };
-		18B7C8D412942546009E7A26 /* SDLJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJoystick.h; sourceTree = "<group>"; };
 		18B7C8D512942546009E7A26 /* XBMC_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keyboard.h; sourceTree = "<group>"; };
 		18B7C8D612942546009E7A26 /* XBMC_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mouse.h; sourceTree = "<group>"; };
 		18B7C8E712942603009E7A26 /* Crc32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Crc32.cpp; sourceTree = "<group>"; };
@@ -2668,6 +2738,84 @@
 		5EB3113B1A978B9B00551907 /* CueInfoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueInfoLoader.h; sourceTree = "<group>"; };
 		5EF800FE1A97892A0035AA4D /* ReplayGain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplayGain.cpp; sourceTree = "<group>"; };
 		5EF800FF1A97892A0035AA4D /* ReplayGain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplayGain.h; sourceTree = "<group>"; };
+		68AE5BA01C923E5300C4D527 /* kodi_vfs_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_vfs_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp"; sourceTree = "<group>"; };
+		68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPeripheral.cpp; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp; sourceTree = "<group>"; };
+		68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPeripheral.h; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h; sourceTree = "<group>"; };
+		68AE5BA71C92414B00C4D527 /* kodi_peripheral_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_callbacks.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h"; sourceTree = "<group>"; };
+		68AE5BA81C92414B00C4D527 /* kodi_peripheral_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_dll.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h"; sourceTree = "<group>"; };
+		68AE5BA91C92414B00C4D527 /* kodi_peripheral_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_types.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"; sourceTree = "<group>"; };
+		68AE5BAA1C92414B00C4D527 /* kodi_peripheral_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_peripheral_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"; sourceTree = "<group>"; };
+		68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultJoystick.cpp; path = joysticks/DefaultJoystick.cpp; sourceTree = "<group>"; };
+		68AE5BAD1C9241DF00C4D527 /* DefaultJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultJoystick.h; path = joysticks/DefaultJoystick.h; sourceTree = "<group>"; };
+		68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DriverPrimitive.cpp; path = joysticks/DriverPrimitive.cpp; sourceTree = "<group>"; };
+		68AE5BAF1C9241DF00C4D527 /* DriverPrimitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DriverPrimitive.h; path = joysticks/DriverPrimitive.h; sourceTree = "<group>"; };
+		68AE5BB01C9241DF00C4D527 /* IButtonMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IButtonMap.h; path = joysticks/IButtonMap.h; sourceTree = "<group>"; };
+		68AE5BB11C9241DF00C4D527 /* IButtonMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IButtonMapper.h; path = joysticks/IButtonMapper.h; sourceTree = "<group>"; };
+		68AE5BB21C9241DF00C4D527 /* IDriverHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDriverHandler.h; path = joysticks/IDriverHandler.h; sourceTree = "<group>"; };
+		68AE5BB31C9241DF00C4D527 /* IInputHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IInputHandler.h; path = joysticks/IInputHandler.h; sourceTree = "<group>"; };
+		68AE5BB41C9241DF00C4D527 /* IKeymapHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IKeymapHandler.h; path = joysticks/IKeymapHandler.h; sourceTree = "<group>"; };
+		68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JoystickMonitor.cpp; path = joysticks/JoystickMonitor.cpp; sourceTree = "<group>"; };
+		68AE5BB61C9241DF00C4D527 /* JoystickMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickMonitor.h; path = joysticks/JoystickMonitor.h; sourceTree = "<group>"; };
+		68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JoystickTranslator.cpp; path = joysticks/JoystickTranslator.cpp; sourceTree = "<group>"; };
+		68AE5BB81C9241DF00C4D527 /* JoystickTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickTranslator.h; path = joysticks/JoystickTranslator.h; sourceTree = "<group>"; };
+		68AE5BB91C9241DF00C4D527 /* JoystickTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickTypes.h; path = joysticks/JoystickTypes.h; sourceTree = "<group>"; };
+		68AE5BBA1C9241DF00C4D527 /* JoystickUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickUtils.h; path = joysticks/JoystickUtils.h; sourceTree = "<group>"; };
+		68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeymapHandler.cpp; path = joysticks/KeymapHandler.cpp; sourceTree = "<group>"; };
+		68AE5BBC1C9241DF00C4D527 /* KeymapHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeymapHandler.h; path = joysticks/KeymapHandler.h; sourceTree = "<group>"; };
+		68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ButtonMapping.cpp; path = joysticks/generic/ButtonMapping.cpp; sourceTree = "<group>"; };
+		68AE5BC91C9241F800C4D527 /* ButtonMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonMapping.h; path = joysticks/generic/ButtonMapping.h; sourceTree = "<group>"; };
+		68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FeatureHandling.cpp; path = joysticks/generic/FeatureHandling.cpp; sourceTree = "<group>"; };
+		68AE5BCB1C9241F800C4D527 /* FeatureHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FeatureHandling.h; path = joysticks/generic/FeatureHandling.h; sourceTree = "<group>"; };
+		68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InputHandling.cpp; path = joysticks/generic/InputHandling.cpp; sourceTree = "<group>"; };
+		68AE5BCD1C9241F800C4D527 /* InputHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InputHandling.h; path = joysticks/generic/InputHandling.h; sourceTree = "<group>"; };
+		68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonButtonMap.cpp; path = addons/AddonButtonMap.cpp; sourceTree = "<group>"; };
+		68AE5BD61C92421800C4D527 /* AddonButtonMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonButtonMap.h; path = addons/AddonButtonMap.h; sourceTree = "<group>"; };
+		68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonButtonMapping.cpp; path = addons/AddonButtonMapping.cpp; sourceTree = "<group>"; };
+		68AE5BD81C92421800C4D527 /* AddonButtonMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonButtonMapping.h; path = addons/AddonButtonMapping.h; sourceTree = "<group>"; };
+		68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonInputHandling.cpp; path = addons/AddonInputHandling.cpp; sourceTree = "<group>"; };
+		68AE5BDA1C92421800C4D527 /* AddonInputHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonInputHandling.h; path = addons/AddonInputHandling.h; sourceTree = "<group>"; };
+		68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeripheralAddon.cpp; path = addons/PeripheralAddon.cpp; sourceTree = "<group>"; };
+		68AE5BDC1C92421800C4D527 /* PeripheralAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeripheralAddon.h; path = addons/PeripheralAddon.h; sourceTree = "<group>"; };
+		68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeripheralAddonTranslator.cpp; path = addons/PeripheralAddonTranslator.cpp; sourceTree = "<group>"; };
+		68AE5BDE1C92421800C4D527 /* PeripheralAddonTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeripheralAddonTranslator.h; path = addons/PeripheralAddonTranslator.h; sourceTree = "<group>"; };
+		68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeripheralBusAddon.cpp; sourceTree = "<group>"; };
+		68AE5BEA1C92422C00C4D527 /* PeripheralBusAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralBusAddon.h; sourceTree = "<group>"; };
+		68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeripheralJoystick.cpp; sourceTree = "<group>"; };
+		68AE5BEE1C92424300C4D527 /* PeripheralJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralJoystick.h; sourceTree = "<group>"; };
+		68AE5BF11C92431300C4D527 /* EventScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventScanner.cpp; sourceTree = "<group>"; };
+		68AE5BF21C92431300C4D527 /* EventScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventScanner.h; sourceTree = "<group>"; };
+		68AE5BF31C92431300C4D527 /* EventScanRate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventScanRate.cpp; sourceTree = "<group>"; };
+		68AE5BF41C92431300C4D527 /* EventScanRate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventScanRate.h; sourceTree = "<group>"; };
+		68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIConfigurationWizard.cpp; path = games/controllers/windows/GUIConfigurationWizard.cpp; sourceTree = "<group>"; };
+		68AE5BFE1C92437900C4D527 /* GUIConfigurationWizard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIConfigurationWizard.h; path = games/controllers/windows/GUIConfigurationWizard.h; sourceTree = "<group>"; };
+		68AE5BFF1C92437900C4D527 /* GUIControllerDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerDefines.h; path = games/controllers/windows/GUIControllerDefines.h; sourceTree = "<group>"; };
+		68AE5C001C92437900C4D527 /* GUIControllerList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerList.cpp; path = games/controllers/windows/GUIControllerList.cpp; sourceTree = "<group>"; };
+		68AE5C011C92437900C4D527 /* GUIControllerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerList.h; path = games/controllers/windows/GUIControllerList.h; sourceTree = "<group>"; };
+		68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerWindow.cpp; path = games/controllers/windows/GUIControllerWindow.cpp; sourceTree = "<group>"; };
+		68AE5C031C92437900C4D527 /* GUIControllerWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerWindow.h; path = games/controllers/windows/GUIControllerWindow.h; sourceTree = "<group>"; };
+		68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIFeatureList.cpp; path = games/controllers/windows/GUIFeatureList.cpp; sourceTree = "<group>"; };
+		68AE5C051C92437900C4D527 /* GUIFeatureList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIFeatureList.h; path = games/controllers/windows/GUIFeatureList.h; sourceTree = "<group>"; };
+		68AE5C061C92437900C4D527 /* IConfigurationWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IConfigurationWindow.h; path = games/controllers/windows/IConfigurationWindow.h; sourceTree = "<group>"; };
+		68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIAnalogStickButton.cpp; path = games/controllers/guicontrols/GUIAnalogStickButton.cpp; sourceTree = "<group>"; };
+		68AE5C101C92438E00C4D527 /* GUIAnalogStickButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIAnalogStickButton.h; path = games/controllers/guicontrols/GUIAnalogStickButton.h; sourceTree = "<group>"; };
+		68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerButton.cpp; path = games/controllers/guicontrols/GUIControllerButton.cpp; sourceTree = "<group>"; };
+		68AE5C121C92438E00C4D527 /* GUIControllerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerButton.h; path = games/controllers/guicontrols/GUIControllerButton.h; sourceTree = "<group>"; };
+		68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIFeatureButton.cpp; path = games/controllers/guicontrols/GUIFeatureButton.cpp; sourceTree = "<group>"; };
+		68AE5C141C92438E00C4D527 /* GUIFeatureButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIFeatureButton.h; path = games/controllers/guicontrols/GUIFeatureButton.h; sourceTree = "<group>"; };
+		68AE5C151C92438E00C4D527 /* GUIGameController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIGameController.cpp; path = games/controllers/guicontrols/GUIGameController.cpp; sourceTree = "<group>"; };
+		68AE5C161C92438E00C4D527 /* GUIGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIGameController.h; path = games/controllers/guicontrols/GUIGameController.h; sourceTree = "<group>"; };
+		68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIScalarFeatureButton.cpp; path = games/controllers/guicontrols/GUIScalarFeatureButton.cpp; sourceTree = "<group>"; };
+		68AE5C181C92438E00C4D527 /* GUIScalarFeatureButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIScalarFeatureButton.h; path = games/controllers/guicontrols/GUIScalarFeatureButton.h; sourceTree = "<group>"; };
+		68AE5C231C9243A000C4D527 /* Controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Controller.cpp; path = games/controllers/Controller.cpp; sourceTree = "<group>"; };
+		68AE5C241C9243A000C4D527 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = games/controllers/Controller.h; sourceTree = "<group>"; };
+		68AE5C251C9243A000C4D527 /* ControllerDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerDefinitions.h; path = games/controllers/ControllerDefinitions.h; sourceTree = "<group>"; };
+		68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerFeature.cpp; path = games/controllers/ControllerFeature.cpp; sourceTree = "<group>"; };
+		68AE5C271C9243A000C4D527 /* ControllerFeature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerFeature.h; path = games/controllers/ControllerFeature.h; sourceTree = "<group>"; };
+		68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerLayout.cpp; path = games/controllers/ControllerLayout.cpp; sourceTree = "<group>"; };
+		68AE5C291C9243A000C4D527 /* ControllerLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerLayout.h; path = games/controllers/ControllerLayout.h; sourceTree = "<group>"; };
+		68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerTranslator.cpp; path = games/controllers/ControllerTranslator.cpp; sourceTree = "<group>"; };
+		68AE5C2B1C9243A000C4D527 /* ControllerTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerTranslator.h; path = games/controllers/ControllerTranslator.h; sourceTree = "<group>"; };
+		68AE5C2C1C9243A000C4D527 /* ControllerTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerTypes.h; path = games/controllers/ControllerTypes.h; sourceTree = "<group>"; };
 		6E97BDBF0DA2B620003A2A89 /* EventClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventClient.h; sourceTree = "<group>"; };
 		6E97BDC00DA2B620003A2A89 /* EventPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventPacket.h; sourceTree = "<group>"; };
 		6E97BDC10DA2B620003A2A89 /* EventServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventServer.h; sourceTree = "<group>"; };
@@ -2710,6 +2858,8 @@
 		7C1409A7184015C6009F9411 /* InfoExpression.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoExpression.cpp; sourceTree = "<group>"; };
 		7C1409A8184015C8009F9411 /* InfoExpression.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoExpression.h; sourceTree = "<group>"; };
 		7C15DCBB1892481300FCE564 /* InfoBool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoBool.cpp; sourceTree = "<group>"; };
+		7C1870601CA1664D00114E45 /* PVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClient.cpp; sourceTree = "<group>"; };
+		7C1870611CA1664D00114E45 /* PVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClient.h; sourceTree = "<group>"; };
 		7C1A492115A962EE004AF4A4 /* SeekHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SeekHandler.cpp; sourceTree = "<group>"; };
 		7C1A492215A962EE004AF4A4 /* SeekHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeekHandler.h; sourceTree = "<group>"; };
 		7C1A495B15A96918004AF4A4 /* SaveFileStateJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SaveFileStateJob.h; sourceTree = "<group>"; };
@@ -2860,6 +3010,8 @@
 		7C99B6A3133D342100FC2B16 /* CircularCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularCache.h; sourceTree = "<group>"; };
 		7C99B7931340723F00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
 		7C99B7941340723F00FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
+		7CA220051C921F74000FA3CD /* DemuxMultiSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DemuxMultiSource.cpp; sourceTree = "<group>"; };
+		7CA220061C921F74000FA3CD /* DemuxMultiSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemuxMultiSource.h; sourceTree = "<group>"; };
 		7CAA204F1079C8160096DE39 /* BaseRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseRenderer.cpp; sourceTree = "<group>"; };
 		7CAA20501079C8160096DE39 /* BaseRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseRenderer.h; sourceTree = "<group>"; };
 		7CAA205B107AFC280096DE39 /* Job.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Job.h; sourceTree = "<group>"; };
@@ -3242,8 +3394,15 @@
 		7CD4F7EB1C60DBC10015214B /* VideoFileItemListModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFileItemListModifier.h; sourceTree = "<group>"; };
 		7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDTSCorrection.cpp; sourceTree = "<group>"; };
 		7CDAE9040FFCA3520040B25F /* DVDTSCorrection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDTSCorrection.h; sourceTree = "<group>"; };
+		7CE3FB8A1C9D3CCA00366A4C /* ServiceManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = ServiceManager.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		7CE3FB8B1C9D3CCA00366A4C /* ServiceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = ServiceManager.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
+		7CE3FB8E1C9D40EA00366A4C /* ServiceBroker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ServiceBroker.cpp; sourceTree = "<group>"; };
+		7CE3FB8F1C9D40EA00366A4C /* ServiceBroker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceBroker.h; sourceTree = "<group>"; };
 		7CEBD8A60F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpecialProtocolDirectory.cpp; sourceTree = "<group>"; };
 		7CEBD8A70F33A0D800CAF6AD /* SpecialProtocolDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpecialProtocolDirectory.h; sourceTree = "<group>"; };
+		7CEE107B1C970BB800E0D426 /* kodi_inputstream_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_inputstream_dll.h; path = "kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h"; sourceTree = "<group>"; };
+		7CEE107C1C970BB800E0D426 /* kodi_inputstream_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_inputstream_types.h; path = "kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h"; sourceTree = "<group>"; };
+		7CEE107D1C970BB800E0D426 /* libKODI_inputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libKODI_inputstream.h; path = "kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h"; sourceTree = "<group>"; };
 		7CEE587C1B5A3FFB007C2B5A /* AudioDSPSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioDSPSettings.cpp; sourceTree = "<group>"; };
 		7CF05049190A1D7200222135 /* FFmpeg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FFmpeg.cpp; sourceTree = "<group>"; };
 		7CF0504A190A1D7200222135 /* FFmpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFmpeg.h; sourceTree = "<group>"; };
@@ -3258,6 +3417,11 @@
 		7CF80DC819710DC2003B2B34 /* KeyboardLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardLayout.h; sourceTree = "<group>"; };
 		7CFC08361C5BA7D0000E5E73 /* DVDDemuxClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxClient.cpp; sourceTree = "<group>"; };
 		7CFC08371C5BA7D0000E5E73 /* DVDDemuxClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxClient.h; sourceTree = "<group>"; };
+		7CFEA2B01C98618400A0B60B /* BinaryAddonCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BinaryAddonCache.cpp; sourceTree = "<group>"; };
+		7CFEA2B11C98618400A0B60B /* BinaryAddonCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinaryAddonCache.h; sourceTree = "<group>"; };
+		80204F0F1C91CD3600E8C88B /* InputStreamMultiSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputStreamMultiSource.cpp; sourceTree = "<group>"; };
+		80204F101C91CD3600E8C88B /* InputStreamMultiSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStreamMultiSource.h; sourceTree = "<group>"; };
+		80204F111C91CD3600E8C88B /* InputStreamMultiStreams.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStreamMultiStreams.h; sourceTree = "<group>"; };
 		815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamRTMP.cpp; sourceTree = "<group>"; };
 		815EE6340E17F1DC009FBE3C /* DVDInputStreamRTMP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamRTMP.h; sourceTree = "<group>"; };
 		82F6F0EA16F269BB0081CC3C /* Buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Buffer.h; path = commons/Buffer.h; sourceTree = "<group>"; };
@@ -3287,10 +3451,16 @@
 		889B4D8D0E0EF86C00FAD25E /* RSSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSSDirectory.h; sourceTree = "<group>"; };
 		88ECB6580DE013C4003396A7 /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = /System/Library/Frameworks/DiskArbitration.framework; sourceTree = "<absolute>"; };
 		8DD76F7E0486A8DE00D96B5E /* Kodi */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Kodi; sourceTree = BUILT_PRODUCTS_DIR; };
+		9A2FAD681C972BE10049652A /* ContextMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenus.cpp; sourceTree = "<group>"; };
+		9A2FAD691C972BE10049652A /* ContextMenus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenus.h; sourceTree = "<group>"; };
 		9A73684F1C401F5F00CA169F /* DirectoryNodeInProgressTvShows.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirectoryNodeInProgressTvShows.cpp; sourceTree = "<group>"; };
 		9A7368501C401F5F00CA169F /* DirectoryNodeInProgressTvShows.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryNodeInProgressTvShows.h; sourceTree = "<group>"; };
 		9A999F1B1C67B77600E4E0D5 /* AddonBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonBuilder.cpp; sourceTree = "<group>"; };
 		9A999F1C1C67B77600E4E0D5 /* AddonBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonBuilder.h; sourceTree = "<group>"; };
+		9AA7E3E61C972CF4000B7863 /* ContextMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenus.cpp; sourceTree = "<group>"; };
+		9AA7E3E71C972CF4000B7863 /* ContextMenus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenus.h; sourceTree = "<group>"; };
+		9ABFE79F1C972D60002F1318 /* ContextMenus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenus.cpp; sourceTree = "<group>"; };
+		9ABFE7A01C972D60002F1318 /* ContextMenus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenus.h; sourceTree = "<group>"; };
 		9AC167B41C5ED478004F0C29 /* MusicFileItemListModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MusicFileItemListModifier.cpp; sourceTree = "<group>"; };
 		9AC167B51C5ED478004F0C29 /* MusicFileItemListModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicFileItemListModifier.h; sourceTree = "<group>"; };
 		AE4E87A517354C4A00D15206 /* XSLTUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XSLTUtils.cpp; sourceTree = "<group>"; };
@@ -3317,8 +3487,6 @@
 		B542632E19917D3500726998 /* params_check_macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = params_check_macros.h; sourceTree = "<group>"; };
 		C807114B135DB5CC002F601B /* InputOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputOperations.cpp; sourceTree = "<group>"; };
 		C807114C135DB5CC002F601B /* InputOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputOperations.h; sourceTree = "<group>"; };
-		C8482874156CFCD8005A996F /* PVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClient.cpp; sourceTree = "<group>"; };
-		C8482875156CFCD8005A996F /* PVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClient.h; sourceTree = "<group>"; };
 		C8482876156CFCD8005A996F /* PVRClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClients.cpp; sourceTree = "<group>"; };
 		C8482877156CFCD8005A996F /* PVRClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClients.h; sourceTree = "<group>"; };
 		C848287A156CFCD8005A996F /* PVRChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannel.cpp; sourceTree = "<group>"; };
@@ -3393,8 +3561,6 @@
 		C8482900156CFE4B005A996F /* Observer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Observer.h; sourceTree = "<group>"; };
 		C8482905156CFF24005A996F /* PVRDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDirectory.cpp; sourceTree = "<group>"; };
 		C8482906156CFF24005A996F /* PVRDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDirectory.h; sourceTree = "<group>"; };
-		C8482907156CFF24005A996F /* PVRFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRFile.cpp; sourceTree = "<group>"; };
-		C8482908156CFF24005A996F /* PVRFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRFile.h; sourceTree = "<group>"; };
 		C848290E156CFFA0005A996F /* DVDInputStreamPVRManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamPVRManager.cpp; sourceTree = "<group>"; };
 		C848290F156CFFA0005A996F /* DVDInputStreamPVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamPVRManager.h; sourceTree = "<group>"; };
 		C848291D156D003E005A996F /* TextSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSearch.cpp; sourceTree = "<group>"; };
@@ -3415,8 +3581,6 @@
 		DF02BA651A91065F006DCA16 /* VideoSyncOsx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoSyncOsx.h; path = videosync/VideoSyncOsx.h; sourceTree = "<group>"; };
 		DF033D361946612400BFC82E /* AEDeviceEnumerationOSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AEDeviceEnumerationOSX.cpp; path = Sinks/osx/AEDeviceEnumerationOSX.cpp; sourceTree = "<group>"; };
 		DF033D371946612400BFC82E /* AEDeviceEnumerationOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AEDeviceEnumerationOSX.h; path = Sinks/osx/AEDeviceEnumerationOSX.h; sourceTree = "<group>"; };
-		DF072532168734ED008DCAAD /* FFmpegVideoDecoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FFmpegVideoDecoder.cpp; sourceTree = "<group>"; };
-		DF072533168734ED008DCAAD /* FFmpegVideoDecoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFmpegVideoDecoder.h; sourceTree = "<group>"; };
 		DF0ABB71183A94A30018445D /* Utf8Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utf8Utils.cpp; sourceTree = "<group>"; };
 		DF0ABB72183A94A30018445D /* Utf8Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utf8Utils.h; sourceTree = "<group>"; };
 		DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
@@ -3886,8 +4050,8 @@
 		E36C29E90DA72486001F0C9D /* Fanart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Fanart.cpp; sourceTree = "<group>"; };
 		E38A06CC0D95AA5500FF8227 /* GUIDialogKaiToast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKaiToast.cpp; sourceTree = "<group>"; };
 		E38A06CD0D95AA5500FF8227 /* GUIDialogKaiToast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKaiToast.h; sourceTree = "<group>"; };
-		E38E14640D25F9F900618676 /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = "<group>"; };
-		E38E14650D25F9F900618676 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; };
+		E38E14640D25F9F900618676 /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = Application.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
+		E38E14650D25F9F900618676 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Application.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		E38E146E0D25F9F900618676 /* Autorun.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Autorun.cpp; sourceTree = "<group>"; };
 		E38E146F0D25F9F900618676 /* Autorun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Autorun.h; sourceTree = "<group>"; };
 		E38E14700D25F9F900618676 /* AutoSwitch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AutoSwitch.cpp; sourceTree = "<group>"; };
@@ -4939,6 +5103,8 @@
 		18B49FF01152BEEB001AF8A6 /* addons */ = {
 			isa = PBXGroup;
 			children = (
+				9A2FAD681C972BE10049652A /* ContextMenus.cpp */,
+				9A2FAD691C972BE10049652A /* ContextMenus.h */,
 				EDED2E7D1C878BDF000F5E80 /* binary */,
 				EDE8C7091C7F60C200A86ECC /* kodi-addon-dev-kit */,
 				9A999F1B1C67B77600E4E0D5 /* AddonBuilder.cpp */,
@@ -4962,6 +5128,8 @@
 				395C2A231AA4C32100EBC7AD /* AudioDecoder.h */,
 				7CF34D9D1930264A00D543C5 /* AudioEncoder.cpp */,
 				7CF34D9E1930264A00D543C5 /* AudioEncoder.h */,
+				7CFEA2B01C98618400A0B60B /* BinaryAddonCache.cpp */,
+				7CFEA2B11C98618400A0B60B /* BinaryAddonCache.h */,
 				DF54F8011B6580C8000FCBA4 /* ContextMenuAddon.cpp */,
 				DF54F8021B6580C8000FCBA4 /* ContextMenuAddon.h */,
 				18B49FF61152BFA5001AF8A6 /* DllAddon.h */,
@@ -4982,6 +5150,8 @@
 				395C2A081A9F06EB00EBC7AD /* LanguageResource.h */,
 				183FDF8811AF0B0500B81E9C /* PluginSource.cpp */,
 				183FDF8911AF0B0500B81E9C /* PluginSource.h */,
+				7C1870601CA1664D00114E45 /* PVRClient.cpp */,
+				7C1870611CA1664D00114E45 /* PVRClient.h */,
 				C85EB75A1174614E0008E5A5 /* Repository.cpp */,
 				C85EB75B1174614E0008E5A5 /* Repository.h */,
 				39B4F36E1B96F845009B2D88 /* RepositoryUpdater.cpp */,
@@ -5200,6 +5370,8 @@
 		18B7C853129423A7009E7A26 /* music */ = {
 			isa = PBXGroup;
 			children = (
+				9ABFE79F1C972D60002F1318 /* ContextMenus.cpp */,
+				9ABFE7A01C972D60002F1318 /* ContextMenus.h */,
 				431376A812D640B500680C15 /* dialogs */,
 				431376CC12D6421A00680C15 /* infoscanner */,
 				18B7C854129423A7009E7A26 /* tags */,
@@ -5256,6 +5428,7 @@
 		18B7C8C61294252E009E7A26 /* input */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BAB1C92419500C4D527 /* joysticks */,
 				E4991332174E5E5C00741B6D /* touch */,
 				18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */,
 				18B7C8CC12942546009E7A26 /* ButtonTranslator.h */,
@@ -5282,8 +5455,6 @@
 				18B7C8D012942546009E7A26 /* KeyboardStat.h */,
 				18B7C8D112942546009E7A26 /* MouseStat.cpp */,
 				18B7C8D212942546009E7A26 /* MouseStat.h */,
-				18B7C8D312942546009E7A26 /* SDLJoystick.cpp */,
-				18B7C8D412942546009E7A26 /* SDLJoystick.h */,
 				E38E1EAD0D25F9FD00618676 /* XBIRRemote.h */,
 				18B7C8D512942546009E7A26 /* XBMC_keyboard.h */,
 				7C779E31104A57E500F444C4 /* XBMC_keysym.h */,
@@ -5335,6 +5506,8 @@
 		1DAFDB7916DFDCA7007F8C68 /* virtual */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */,
+				68AE5BEA1C92422C00C4D527 /* PeripheralBusAddon.h */,
 				1DAFDB7A16DFDCA7007F8C68 /* PeripheralBusCEC.cpp */,
 				1DAFDB7B16DFDCA7007F8C68 /* PeripheralBusCEC.h */,
 			);
@@ -5774,14 +5947,14 @@
 		43FAC85D12D62F4300F67914 /* video */ = {
 			isa = PBXGroup;
 			children = (
+				9AA7E3E61C972CF4000B7863 /* ContextMenus.cpp */,
+				9AA7E3E71C972CF4000B7863 /* ContextMenus.h */,
 				3994425F1A8DD920006C39E9 /* jobs */,
 				43FAC88612D6363B00F67914 /* dialogs */,
 				DFA0E8C619FD6BFC00269A92 /* videosync */,
 				43FAC88812D6364800F67914 /* windows */,
 				7C62F24010505BC7002AD2C1 /* Bookmark.cpp */,
 				7C62F24110505BC7002AD2C1 /* Bookmark.h */,
-				DF072532168734ED008DCAAD /* FFmpegVideoDecoder.cpp */,
-				DF072533168734ED008DCAAD /* FFmpegVideoDecoder.h */,
 				E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */,
 				E38E18000D25F9FA00618676 /* GUIViewStateVideo.h */,
 				7C87B2CC162CE39600EF897D /* PlayerController.cpp */,
@@ -5911,6 +6084,131 @@
 			path = osx;
 			sourceTree = "<group>";
 		};
+		68AE5BA21C92410300C4D527 /* Peripheral */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */,
+				68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */,
+			);
+			name = Peripheral;
+			sourceTree = "<group>";
+		};
+		68AE5BAB1C92419500C4D527 /* joysticks */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BC71C9241E200C4D527 /* generic */,
+				68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */,
+				68AE5BAD1C9241DF00C4D527 /* DefaultJoystick.h */,
+				68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */,
+				68AE5BAF1C9241DF00C4D527 /* DriverPrimitive.h */,
+				68AE5BB01C9241DF00C4D527 /* IButtonMap.h */,
+				68AE5BB11C9241DF00C4D527 /* IButtonMapper.h */,
+				68AE5BB21C9241DF00C4D527 /* IDriverHandler.h */,
+				68AE5BB31C9241DF00C4D527 /* IInputHandler.h */,
+				68AE5BB41C9241DF00C4D527 /* IKeymapHandler.h */,
+				68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */,
+				68AE5BB61C9241DF00C4D527 /* JoystickMonitor.h */,
+				68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */,
+				68AE5BB81C9241DF00C4D527 /* JoystickTranslator.h */,
+				68AE5BB91C9241DF00C4D527 /* JoystickTypes.h */,
+				68AE5BBA1C9241DF00C4D527 /* JoystickUtils.h */,
+				68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */,
+				68AE5BBC1C9241DF00C4D527 /* KeymapHandler.h */,
+			);
+			name = joysticks;
+			sourceTree = "<group>";
+		};
+		68AE5BC71C9241E200C4D527 /* generic */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */,
+				68AE5BC91C9241F800C4D527 /* ButtonMapping.h */,
+				68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */,
+				68AE5BCB1C9241F800C4D527 /* FeatureHandling.h */,
+				68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */,
+				68AE5BCD1C9241F800C4D527 /* InputHandling.h */,
+			);
+			name = generic;
+			sourceTree = "<group>";
+		};
+		68AE5BD41C92420200C4D527 /* addons */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */,
+				68AE5BD61C92421800C4D527 /* AddonButtonMap.h */,
+				68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */,
+				68AE5BD81C92421800C4D527 /* AddonButtonMapping.h */,
+				68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */,
+				68AE5BDA1C92421800C4D527 /* AddonInputHandling.h */,
+				68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */,
+				68AE5BDC1C92421800C4D527 /* PeripheralAddon.h */,
+				68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */,
+				68AE5BDE1C92421800C4D527 /* PeripheralAddonTranslator.h */,
+			);
+			name = addons;
+			sourceTree = "<group>";
+		};
+		68AE5BF91C92431F00C4D527 /* games */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFA1C92433900C4D527 /* controllers */,
+			);
+			name = games;
+			sourceTree = "<group>";
+		};
+		68AE5BFA1C92433900C4D527 /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFB1C92435200C4D527 /* guicontrols */,
+				68AE5BFC1C92436500C4D527 /* windows */,
+				68AE5C231C9243A000C4D527 /* Controller.cpp */,
+				68AE5C241C9243A000C4D527 /* Controller.h */,
+				68AE5C251C9243A000C4D527 /* ControllerDefinitions.h */,
+				68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */,
+				68AE5C271C9243A000C4D527 /* ControllerFeature.h */,
+				68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */,
+				68AE5C291C9243A000C4D527 /* ControllerLayout.h */,
+				68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */,
+				68AE5C2B1C9243A000C4D527 /* ControllerTranslator.h */,
+				68AE5C2C1C9243A000C4D527 /* ControllerTypes.h */,
+			);
+			name = controllers;
+			sourceTree = "<group>";
+		};
+		68AE5BFB1C92435200C4D527 /* guicontrols */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */,
+				68AE5C101C92438E00C4D527 /* GUIAnalogStickButton.h */,
+				68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */,
+				68AE5C121C92438E00C4D527 /* GUIControllerButton.h */,
+				68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */,
+				68AE5C141C92438E00C4D527 /* GUIFeatureButton.h */,
+				68AE5C151C92438E00C4D527 /* GUIGameController.cpp */,
+				68AE5C161C92438E00C4D527 /* GUIGameController.h */,
+				68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */,
+				68AE5C181C92438E00C4D527 /* GUIScalarFeatureButton.h */,
+			);
+			name = guicontrols;
+			sourceTree = "<group>";
+		};
+		68AE5BFC1C92436500C4D527 /* windows */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */,
+				68AE5BFE1C92437900C4D527 /* GUIConfigurationWizard.h */,
+				68AE5BFF1C92437900C4D527 /* GUIControllerDefines.h */,
+				68AE5C001C92437900C4D527 /* GUIControllerList.cpp */,
+				68AE5C011C92437900C4D527 /* GUIControllerList.h */,
+				68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */,
+				68AE5C031C92437900C4D527 /* GUIControllerWindow.h */,
+				68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */,
+				68AE5C051C92437900C4D527 /* GUIFeatureList.h */,
+				68AE5C061C92437900C4D527 /* IConfigurationWindow.h */,
+			);
+			name = windows;
+			sourceTree = "<group>";
+		};
 		76F4C37B1C8E927A00A1E64B /* InputStream */ = {
 			isa = PBXGroup;
 			children = (
@@ -6648,8 +6946,6 @@
 		C8482872156CFCD8005A996F /* addons */ = {
 			isa = PBXGroup;
 			children = (
-				C8482874156CFCD8005A996F /* PVRClient.cpp */,
-				C8482875156CFCD8005A996F /* PVRClient.h */,
 				C8482876156CFCD8005A996F /* PVRClients.cpp */,
 				C8482877156CFCD8005A996F /* PVRClients.h */,
 			);
@@ -7375,6 +7671,7 @@
 				DF29BCD41B5D911700904347 /* events */,
 				431376E912D6439900680C15 /* dialogs */,
 				E38E16940D25F9FA00618676 /* filesystem */,
+				68AE5BF91C92431F00C4D527 /* games */,
 				18B7C3AA1294219F009E7A26 /* guilib */,
 				18B7C8C61294252E009E7A26 /* input */,
 				4367217312D6640E002508E6 /* interfaces */,
@@ -7458,6 +7755,10 @@
 				E38E1DEA0D25F9FD00618676 /* PlayListPlayer.h */,
 				E38E1DFE0D25F9FD00618676 /* SectionLoader.cpp */,
 				E38E1DFF0D25F9FD00618676 /* SectionLoader.h */,
+				7CE3FB8E1C9D40EA00366A4C /* ServiceBroker.cpp */,
+				7CE3FB8F1C9D40EA00366A4C /* ServiceBroker.h */,
+				7CE3FB8A1C9D3CCA00366A4C /* ServiceManager.cpp */,
+				7CE3FB8B1C9D3CCA00366A4C /* ServiceManager.h */,
 				E38E1E100D25F9FD00618676 /* SortFileItem.h */,
 				C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */,
 				7C8A14541154CB2600E5FCFA /* TextureCache.cpp */,
@@ -7689,6 +7990,8 @@
 		E38E15480D25F9F900618676 /* DVDDemuxers */ = {
 			isa = PBXGroup;
 			children = (
+				7CA220061C921F74000FA3CD /* DemuxMultiSource.h */,
+				7CA220051C921F74000FA3CD /* DemuxMultiSource.cpp */,
 				7C4CED9F1C5E681E00BAD6CE /* DVDDemuxPacket.h */,
 				7CFC08361C5BA7D0000E5E73 /* DVDDemuxClient.cpp */,
 				7CFC08371C5BA7D0000E5E73 /* DVDDemuxClient.h */,
@@ -7737,6 +8040,9 @@
 				815EE6340E17F1DC009FBE3C /* DVDInputStreamRTMP.h */,
 				E38E15740D25F9FA00618676 /* DVDStateSerializer.cpp */,
 				E38E15750D25F9FA00618676 /* DVDStateSerializer.h */,
+				80204F0F1C91CD3600E8C88B /* InputStreamMultiSource.cpp */,
+				80204F101C91CD3600E8C88B /* InputStreamMultiSource.h */,
+				80204F111C91CD3600E8C88B /* InputStreamMultiStreams.h */,
 			);
 			path = DVDInputStreams;
 			sourceTree = "<group>";
@@ -7969,8 +8275,6 @@
 				E38E17450D25F9FA00618676 /* PluginDirectory.h */,
 				C8482905156CFF24005A996F /* PVRDirectory.cpp */,
 				C8482906156CFF24005A996F /* PVRDirectory.h */,
-				C8482907156CFF24005A996F /* PVRFile.cpp */,
-				C8482908156CFF24005A996F /* PVRFile.h */,
 				E38E17460D25F9FA00618676 /* RarDirectory.cpp */,
 				E38E17470D25F9FA00618676 /* RarDirectory.h */,
 				DF93D6811444A8B0007C6459 /* RarFile.cpp */,
@@ -8685,12 +8989,20 @@
 				EDE8C70F1C7F618500A86ECC /* kodi_audiodec_dll.h */,
 				EDE8C7101C7F618500A86ECC /* kodi_audiodec_types.h */,
 				EDE8C7111C7F618500A86ECC /* kodi_audioengine_types.h */,
+				7CEE107B1C970BB800E0D426 /* kodi_inputstream_dll.h */,
+				7CEE107C1C970BB800E0D426 /* kodi_inputstream_types.h */,
+				68AE5BA71C92414B00C4D527 /* kodi_peripheral_callbacks.h */,
+				68AE5BA81C92414B00C4D527 /* kodi_peripheral_dll.h */,
+				68AE5BA91C92414B00C4D527 /* kodi_peripheral_types.h */,
+				68AE5BAA1C92414B00C4D527 /* kodi_peripheral_utils.hpp */,
 				EDE8C7121C7F618500A86ECC /* kodi_vfs_types.h */,
+				68AE5BA01C923E5300C4D527 /* kodi_vfs_utils.hpp */,
 				EDE8C7131C7F618500A86ECC /* libKODI_adsp.h */,
 				EDE8C7141C7F618500A86ECC /* libKODI_audioengine.h */,
 				EDE8C7151C7F618500A86ECC /* libKODI_guilib.h */,
 				EDE8C7161C7F618500A86ECC /* libXBMC_addon.h */,
 				EDE8C7171C7F618500A86ECC /* libXBMC_codec.h */,
+				7CEE107D1C970BB800E0D426 /* libKODI_inputstream.h */,
 				EDE8C7181C7F618500A86ECC /* libXBMC_pvr.h */,
 				EDE8C7191C7F618500A86ECC /* xbmc_addon_cpp_dll.h */,
 				EDE8C71A1C7F618500A86ECC /* xbmc_addon_dll.h */,
@@ -8738,6 +9050,7 @@
 				EDED2E821C878CF6000F5E80 /* Codec */,
 				EDED2E801C878CB4000F5E80 /* GUI */,
 				76F4C37B1C8E927A00A1E64B /* InputStream */,
+				68AE5BA21C92410300C4D527 /* Peripheral */,
 				EDED2E811C878CC1000F5E80 /* PVR */,
 			);
 			name = api1;
@@ -8924,9 +9237,14 @@
 		F5E1050C140AA38000175026 /* peripherals */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BD41C92420200C4D527 /* addons */,
 				F5E1050D140AA38000175026 /* bus */,
 				F5E1051A140AA38000175026 /* devices */,
 				F5E1052C140AA38000175026 /* dialogs */,
+				68AE5BF11C92431300C4D527 /* EventScanner.cpp */,
+				68AE5BF21C92431300C4D527 /* EventScanner.h */,
+				68AE5BF31C92431300C4D527 /* EventScanRate.cpp */,
+				68AE5BF41C92431300C4D527 /* EventScanRate.h */,
 				F5E10533140AA38000175026 /* Peripherals.cpp */,
 				F5E10534140AA38000175026 /* Peripherals.h */,
 				F5E10535140AA38000175026 /* PeripheralTypes.h */,
@@ -8969,6 +9287,8 @@
 				F5E10525140AA38000175026 /* PeripheralHID.h */,
 				1D638126161E211E003603ED /* PeripheralImon.cpp */,
 				1D638127161E211E003603ED /* PeripheralImon.h */,
+				68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */,
+				68AE5BEE1C92424300C4D527 /* PeripheralJoystick.h */,
 				F5E10526140AA38000175026 /* PeripheralNIC.cpp */,
 				F5E10527140AA38000175026 /* PeripheralNIC.h */,
 				F5E10528140AA38000175026 /* PeripheralNyxboard.cpp */,
@@ -9332,12 +9652,14 @@
 				E38E1F7B0D25F9FD00618676 /* DVDAudioCodecFFmpeg.cpp in Sources */,
 				E38E1F840D25F9FD00618676 /* DVDCodecUtils.cpp in Sources */,
 				E38E1F850D25F9FD00618676 /* DVDFactoryCodec.cpp in Sources */,
+				7CE3FB901C9D40EA00366A4C /* ServiceBroker.cpp in Sources */,
 				E38E1F880D25F9FD00618676 /* DVDOverlayCodecFFmpeg.cpp in Sources */,
 				E38E1F890D25F9FD00618676 /* DVDOverlayCodecText.cpp in Sources */,
 				E38E1F8D0D25F9FD00618676 /* DVDVideoCodecFFmpeg.cpp in Sources */,
 				E38E1F8F0D25F9FD00618676 /* DVDVideoPPFFmpeg.cpp in Sources */,
 				E38E1F910D25F9FD00618676 /* DVDDemux.cpp in Sources */,
 				7C8E023A1BA35D0B0072E8B2 /* PlayerBuiltins.cpp in Sources */,
+				80204F121C91CD3600E8C88B /* InputStreamMultiSource.cpp in Sources */,
 				E38E1F940D25F9FD00618676 /* DVDDemuxUtils.cpp in Sources */,
 				E38E1F970D25F9FD00618676 /* DVDDemuxSPU.cpp in Sources */,
 				E38E1F980D25F9FD00618676 /* DVDFactoryInputStream.cpp in Sources */,
@@ -9345,6 +9667,7 @@
 				DF6A0D841A4584E80075BBFC /* OverrideFile.cpp in Sources */,
 				E38E1F9A0D25F9FD00618676 /* DVDInputStreamFFmpeg.cpp in Sources */,
 				E38E1F9B0D25F9FD00618676 /* DVDInputStreamFile.cpp in Sources */,
+				68AE5C1D1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */,
 				E38E1F9D0D25F9FD00618676 /* DVDInputStreamMemory.cpp in Sources */,
 				E38E1F9E0D25F9FD00618676 /* DVDInputStreamNavigator.cpp in Sources */,
 				E38E1F9F0D25F9FD00618676 /* DVDStateSerializer.cpp in Sources */,
@@ -9371,6 +9694,7 @@
 				E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */,
 				E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */,
 				E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */,
+				68AE5C0B1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */,
 				E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */,
 				E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */,
 				EDED2E941C878EE0000F5E80 /* AddonCallbacksAddon.cpp in Sources */,
@@ -9394,6 +9718,7 @@
 				E38E20270D25F9FD00618676 /* IDirectory.cpp in Sources */,
 				E38E20280D25F9FD00618676 /* IFile.cpp in Sources */,
 				E38E20290D25F9FD00618676 /* iso9660.cpp in Sources */,
+				68AE5BEF1C92424300C4D527 /* PeripheralJoystick.cpp in Sources */,
 				39B4F3701B96F845009B2D88 /* RepositoryUpdater.cpp in Sources */,
 				E38E202A0D25F9FD00618676 /* ISO9660Directory.cpp in Sources */,
 				E38E20330D25F9FD00618676 /* MultiPathDirectory.cpp in Sources */,
@@ -9422,6 +9747,7 @@
 				E38E204B0D25F9FD00618676 /* MusicSearchDirectory.cpp in Sources */,
 				E38E204F0D25F9FD00618676 /* PlaylistDirectory.cpp in Sources */,
 				E38E20500D25F9FD00618676 /* PlaylistFileDirectory.cpp in Sources */,
+				68AE5C1B1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */,
 				E38E20510D25F9FD00618676 /* PluginDirectory.cpp in Sources */,
 				7CF3194B1BD2C65500A44A41 /* MusicInfoTagLoaderFFmpeg.cpp in Sources */,
 				E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */,
@@ -9439,6 +9765,7 @@
 				E38E20660D25F9FD00618676 /* DirectoryNodeRecentlyAddedEpisodes.cpp in Sources */,
 				DF4BF01D1A4EF3410053AC56 /* DVDDemuxCC.cpp in Sources */,
 				7C8E02281BA35D0B0072E8B2 /* GUIBuiltins.cpp in Sources */,
+				68AE5BC31C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */,
 				7CFC08381C5BA7D0000E5E73 /* DVDDemuxClient.cpp in Sources */,
 				E38E20670D25F9FD00618676 /* DirectoryNodeRecentlyAddedMovies.cpp in Sources */,
 				E38E20680D25F9FD00618676 /* DirectoryNodeRecentlyAddedMusicVideos.cpp in Sources */,
@@ -9458,6 +9785,7 @@
 				E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */,
 				E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */,
 				E38E207C0D25F9FD00618676 /* GUIDialogBusy.cpp in Sources */,
+				68AE5BBF1C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */,
 				E38E207D0D25F9FD00618676 /* GUIDialogButtonMenu.cpp in Sources */,
 				E38E207F0D25F9FD00618676 /* GUIDialogContextMenu.cpp in Sources */,
 				E38E20800D25F9FD00618676 /* GUIDialogFavourites.cpp in Sources */,
@@ -9494,6 +9822,7 @@
 				E38E20B20D25F9FD00618676 /* GUIWindowLoginScreen.cpp in Sources */,
 				E38E20B30D25F9FD00618676 /* GUIWindowMusicBase.cpp in Sources */,
 				E38E20B40D25F9FD00618676 /* GUIDialogMusicInfo.cpp in Sources */,
+				68AE5BBD1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */,
 				E38E20B50D25F9FD00618676 /* GUIWindowMusicNav.cpp in Sources */,
 				E38E20B70D25F9FD00618676 /* GUIWindowMusicPlaylist.cpp in Sources */,
 				395C29F61A98B44B00EBC7AD /* AddonModuleXbmcwsgi.cpp in Sources */,
@@ -9509,6 +9838,7 @@
 				E38E20C70D25F9FD00618676 /* GUIWindowSlideShow.cpp in Sources */,
 				E38E20C80D25F9FD00618676 /* GUIWindowStartup.cpp in Sources */,
 				E38E20C90D25F9FD00618676 /* GUIWindowSystemInfo.cpp in Sources */,
+				68AE5BC11C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */,
 				E38E20CA0D25F9FD00618676 /* GUIWindowVideoBase.cpp in Sources */,
 				E38E20CC0D25F9FD00618676 /* GUIDialogVideoInfo.cpp in Sources */,
 				E38E20CD0D25F9FD00618676 /* GUIWindowVideoNav.cpp in Sources */,
@@ -9586,6 +9916,7 @@
 				E38E22A10D25F9FE00618676 /* Picture.cpp in Sources */,
 				E38E22A20D25F9FE00618676 /* PictureInfoLoader.cpp in Sources */,
 				E38E22A30D25F9FE00618676 /* PictureInfoTag.cpp in Sources */,
+				68AE5BEB1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */,
 				E38E22A40D25F9FE00618676 /* PictureThumbLoader.cpp in Sources */,
 				E38E22AA0D25F9FE00618676 /* PlayListPlayer.cpp in Sources */,
 				E38E22B30D25F9FE00618676 /* SectionLoader.cpp in Sources */,
@@ -9633,6 +9964,7 @@
 				E38E25780D263BF600618676 /* unpack.cpp in Sources */,
 				E38E257C0D263C4400618676 /* rar.cpp in Sources */,
 				E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */,
+				68AE5BA51C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */,
 				E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */,
 				E3A4780A0D29029A00F3C3A6 /* GUIDialogCache.cpp in Sources */,
 				395C29ED1A98A16300EBC7AD /* HTTPPythonInvoker.cpp in Sources */,
@@ -9641,6 +9973,7 @@
 				395897151AAD94F00033D27C /* KeyboardLayoutManager.cpp in Sources */,
 				E36578880D3AA7B40033CC1C /* VideoPlayerCodec.cpp in Sources */,
 				E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */,
+				68AE5C071C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */,
 				E3DAAF8D0D6E1B0500F17647 /* SMBDirectory.cpp in Sources */,
 				E3E91FFD0D8C61DF002BF43D /* EventPacket.cpp in Sources */,
 				E3E91FFE0D8C61DF002BF43D /* EventServer.cpp in Sources */,
@@ -9678,6 +10011,7 @@
 				F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */,
 				397877D51AAAF87700F98A45 /* Speed.cpp in Sources */,
 				7C8E02341BA35D0B0072E8B2 /* OpticalBuiltins.cpp in Sources */,
+				68AE5BF51C92431300C4D527 /* EventScanner.cpp in Sources */,
 				DF29BCF71B5D911800904347 /* MediaLibraryEvent.cpp in Sources */,
 				2F4564D51970129A00396109 /* GUIFontCache.cpp in Sources */,
 				7CEBD8A80F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp in Sources */,
@@ -9701,6 +10035,7 @@
 				B5101B5819DFF8DD00294D1E /* BlurayFile.cpp in Sources */,
 				E49ACD9F10074A4000A86ECD /* ZeroconfBrowserOSX.cpp in Sources */,
 				DF6F52AE1AF6D03F001BC57D /* dacp.cpp in Sources */,
+				68AE5C2F1C9243A000C4D527 /* ControllerFeature.cpp in Sources */,
 				E49ACDD510074F9200A86ECD /* ZeroconfBrowser.cpp in Sources */,
 				F5D8EF5B103912A4004A11AB /* DVDSubtitleParserVplayer.cpp in Sources */,
 				7C8E02491BA35D0B0072E8B2 /* WeatherBuiltins.cpp in Sources */,
@@ -9745,6 +10080,7 @@
 				F5F244651110DC6B009126C6 /* FileOperationJob.cpp in Sources */,
 				DF0E4AC51AD597ED00A75430 /* VideoPlayerRadioRDS.cpp in Sources */,
 				F5F245EE1112C9AB009126C6 /* FileUtils.cpp in Sources */,
+				7C1870621CA1664D00114E45 /* PVRClient.cpp in Sources */,
 				F5A7A702112893E50059D6AA /* AnnouncementManager.cpp in Sources */,
 				F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */,
 				7C7B2B301134F36400713D6D /* mysqldataset.cpp in Sources */,
@@ -9767,6 +10103,7 @@
 				F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */,
 				7CF1FB0C123B1AF000B2CBCB /* Variant.cpp in Sources */,
 				C8D0B2AF1265A9A800F0C0AC /* SystemGlobals.cpp in Sources */,
+				68AE5C311C9243A000C4D527 /* ControllerLayout.cpp in Sources */,
 				7CBEBB8412912BA400431822 /* fstrcmp.c in Sources */,
 				184C472F1296BC6E0006DB3E /* Service.cpp in Sources */,
 				18B7C3841294203F009E7A26 /* AddonDatabase.cpp in Sources */,
@@ -9796,6 +10133,7 @@
 				18B7C7BB1294222E009E7A26 /* GUIControlProfiler.cpp in Sources */,
 				18B7C7BC1294222E009E7A26 /* GUIDialog.cpp in Sources */,
 				18B7C7BD1294222E009E7A26 /* GUIEditControl.cpp in Sources */,
+				68AE5BF71C92431300C4D527 /* EventScanRate.cpp in Sources */,
 				18B7C7BE1294222E009E7A26 /* GUIFadeLabelControl.cpp in Sources */,
 				18B7C7BF1294222E009E7A26 /* GUIFixedListContainer.cpp in Sources */,
 				18B7C7C01294222E009E7A26 /* GUIFont.cpp in Sources */,
@@ -9810,6 +10148,7 @@
 				4260D5C71B67BB8F003F6F2D /* GUIWindowSplash.cpp in Sources */,
 				18B7C7C91294222E009E7A26 /* GUILabelControl.cpp in Sources */,
 				18B7C7CA1294222E009E7A26 /* GUIListContainer.cpp in Sources */,
+				68AE5BE71C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */,
 				18B7C7CB1294222E009E7A26 /* GUIListGroup.cpp in Sources */,
 				18B7C7CC1294222E009E7A26 /* GUIListItem.cpp in Sources */,
 				18B7C7CD1294222E009E7A26 /* GUIListItemLayout.cpp in Sources */,
@@ -9868,7 +10207,6 @@
 				18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */,
 				18B7C8D912942546009E7A26 /* KeyboardStat.cpp in Sources */,
 				18B7C8DA12942546009E7A26 /* MouseStat.cpp in Sources */,
-				18B7C8DB12942546009E7A26 /* SDLJoystick.cpp in Sources */,
 				18B7C8E912942603009E7A26 /* Crc32.cpp in Sources */,
 				18B7C8EE12942613009E7A26 /* URIUtils.cpp in Sources */,
 				18B7C8F31294261F009E7A26 /* StringUtils.cpp in Sources */,
@@ -9916,10 +10254,12 @@
 				1840B75313993DA0007C848B /* JSONVariantWriter.cpp in Sources */,
 				18B700E113A6A5750009C1AF /* AddonVersion.cpp in Sources */,
 				F558F25613ABCF7800631E12 /* WinEventsOSX.mm in Sources */,
+				68AE5C191C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */,
 				F558F27B13ABD56600631E12 /* DirtyRegionSolvers.cpp in Sources */,
 				F558F27F13ABD57400631E12 /* DirtyRegionTracker.cpp in Sources */,
 				F558F29613ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */,
 				DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */,
+				68AE5C211C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */,
 				7C89619213B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
 				18ECC96213CF178D00A9ED6C /* StreamUtils.cpp in Sources */,
 				7C8E02401BA35D0B0072E8B2 /* PVRBuiltins.cpp in Sources */,
@@ -9969,11 +10309,13 @@
 				DFCA6ACB152245CD000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
 				DF93D69A1444A8B1007C6459 /* DirectoryCache.cpp in Sources */,
 				DF93D69B1444A8B1007C6459 /* FileCache.cpp in Sources */,
+				68AE5BE31C92421800C4D527 /* AddonInputHandling.cpp in Sources */,
 				3994427A1A8DD920006C39E9 /* VideoLibraryScanningJob.cpp in Sources */,
 				DF93D69C1444A8B1007C6459 /* CDDAFile.cpp in Sources */,
 				DF93D69D1444A8B1007C6459 /* CurlFile.cpp in Sources */,
 				DF93D69F1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */,
 				DF93D6A01444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */,
+				68AE5C2D1C9243A000C4D527 /* Controller.cpp in Sources */,
 				DF2401261B41A26F001E02DA /* ImageResource.cpp in Sources */,
 				DF93D6A11444A8B1007C6459 /* FileReaderFile.cpp in Sources */,
 				DF93D6A31444A8B1007C6459 /* ISOFile.cpp in Sources */,
@@ -10013,7 +10355,6 @@
 				76F4C37E1C8E92E000A1E64B /* AddonCallbacksInputStream.cpp in Sources */,
 				7C6EB330155BD1D40080368A /* ImageFile.cpp in Sources */,
 				7C6EB6FA155F32C30080368A /* HTTPImageHandler.cpp in Sources */,
-				C84828C0156CFCD8005A996F /* PVRClient.cpp in Sources */,
 				C84828C1156CFCD8005A996F /* PVRClients.cpp in Sources */,
 				C84828C3156CFCD8005A996F /* PVRChannel.cpp in Sources */,
 				C84828C4156CFCD8005A996F /* PVRChannelGroup.cpp in Sources */,
@@ -10029,6 +10370,7 @@
 				C84828CF156CFCD8005A996F /* GUIDialogPVRGuideSearch.cpp in Sources */,
 				C84828D0156CFCD8005A996F /* GUIDialogPVRRecordingInfo.cpp in Sources */,
 				C84828D1156CFCD8005A996F /* GUIDialogPVRTimerSettings.cpp in Sources */,
+				9ABFE7A11C972D60002F1318 /* ContextMenus.cpp in Sources */,
 				C84828D4156CFCD8005A996F /* PVRDatabase.cpp in Sources */,
 				C84828D5156CFCD8005A996F /* PVRGUIInfo.cpp in Sources */,
 				C84828D6156CFCD8005A996F /* PVRManager.cpp in Sources */,
@@ -10043,9 +10385,11 @@
 				C84828E2156CFCD8005A996F /* GUIWindowPVRRecordings.cpp in Sources */,
 				C84828E3156CFCD8005A996F /* GUIWindowPVRSearch.cpp in Sources */,
 				C84828E4156CFCD8005A996F /* GUIWindowPVRTimers.cpp in Sources */,
+				7CA220071C921F74000FA3CD /* DemuxMultiSource.cpp in Sources */,
 				C84828F5156CFD5E005A996F /* Epg.cpp in Sources */,
 				C84828F6156CFD5E005A996F /* EpgContainer.cpp in Sources */,
 				C84828F7156CFD5E005A996F /* EpgDatabase.cpp in Sources */,
+				68AE5C331C9243A000C4D527 /* ControllerTranslator.cpp in Sources */,
 				C84828F8156CFD5E005A996F /* EpgInfoTag.cpp in Sources */,
 				C84828F9156CFD5E005A996F /* EpgSearchFilter.cpp in Sources */,
 				C84828FA156CFD5E005A996F /* GUIEPGGridContainer.cpp in Sources */,
@@ -10054,7 +10398,6 @@
 				DFC6F4C11AFF7E300039A7FA /* rfft.cpp in Sources */,
 				7CD4F7EC1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */,
 				C8482909156CFF24005A996F /* PVRDirectory.cpp in Sources */,
-				C848290A156CFF24005A996F /* PVRFile.cpp in Sources */,
 				C8482910156CFFA0005A996F /* DVDInputStreamPVRManager.cpp in Sources */,
 				C848291F156D003E005A996F /* TextSearch.cpp in Sources */,
 				18E7CACB1578C26D001D4554 /* CDDARipJob.cpp in Sources */,
@@ -10065,6 +10408,7 @@
 				7C1A492315A962EE004AF4A4 /* SeekHandler.cpp in Sources */,
 				DF830D0C15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */,
 				DF830D1215BB262700602BE6 /* GUIKeyboardFactory.cpp in Sources */,
+				7CFEA2B21C98618400A0B60B /* BinaryAddonCache.cpp in Sources */,
 				36A9466315CF1FA600727135 /* DbUrl.cpp in Sources */,
 				3994427F1A8DD96F006C39E9 /* VideoLibraryQueue.cpp in Sources */,
 				36A9466715CF1FD200727135 /* MusicDbUrl.cpp in Sources */,
@@ -10108,6 +10452,7 @@
 				DFB25D3B163D4743006C4A48 /* LanguageHook.cpp in Sources */,
 				DFB25D3C163D4743006C4A48 /* ListItem.cpp in Sources */,
 				DFB25D3D163D4743006C4A48 /* ModuleXbmc.cpp in Sources */,
+				68AE5BD01C9241F800C4D527 /* FeatureHandling.cpp in Sources */,
 				DFB25D3E163D4743006C4A48 /* ModuleXbmcgui.cpp in Sources */,
 				DFB25D3F163D4743006C4A48 /* ModuleXbmcplugin.cpp in Sources */,
 				DFB25D40163D4743006C4A48 /* ModuleXbmcvfs.cpp in Sources */,
@@ -10132,10 +10477,11 @@
 				DF402A64164461B9001C56B8 /* LanguageHook.cpp in Sources */,
 				DF402A65164461B9001C56B8 /* swig.cpp in Sources */,
 				DF402A66164461B9001C56B8 /* XBPython.cpp in Sources */,
+				68AE5C0D1C92437900C4D527 /* GUIFeatureList.cpp in Sources */,
 				F5EDC48C1651A6F900B852D8 /* GroupUtils.cpp in Sources */,
 				7C7CEAF1165629530059C9EB /* AELimiter.cpp in Sources */,
 				DFB02DEA16629DBA00F37752 /* PyContext.cpp in Sources */,
-				DF072534168734ED008DCAAD /* FFmpegVideoDecoder.cpp in Sources */,
+				68AE5C1F1C92438E00C4D527 /* GUIGameController.cpp in Sources */,
 				7C8E02221BA35D0B0072E8B2 /* Builtins.cpp in Sources */,
 				395F6DE21A81FACF0088CC74 /* HTTPImageTransformationHandler.cpp in Sources */,
 				DF64FE3D16C07AAA00D028FB /* GUIViewControl.cpp in Sources */,
@@ -10151,6 +10497,7 @@
 				F56352BC16E5403400D21BAD /* GUIWindowSettingsCategory.cpp in Sources */,
 				F56352BE16E5403400D21BAD /* GUIWindowSettingsScreenCalibration.cpp in Sources */,
 				F56352BF16E5403400D21BAD /* GUIWindowTestPattern.cpp in Sources */,
+				7CE3FB8C1C9D3CCA00366A4C /* ServiceManager.cpp in Sources */,
 				F56352C816E5436900D21BAD /* AppParamParser.cpp in Sources */,
 				F56353BF16E9BB3500D21BAD /* BitstreamConverter.cpp in Sources */,
 				DFAF6A4F16EBAE3800D6AE12 /* RssManager.cpp in Sources */,
@@ -10182,9 +10529,12 @@
 				DFA8157E16713B1200E4E597 /* WakeOnAccess.cpp in Sources */,
 				7C973CFB1B5038580002A874 /* GUIDialogAudioDSPSettings.cpp in Sources */,
 				DF529BAE1741697B00523FB4 /* Environment.cpp in Sources */,
+				9A2FAD6A1C972BE10049652A /* ContextMenus.cpp in Sources */,
 				DFE4095B17417FDF00473BD9 /* LegacyPathTranslation.cpp in Sources */,
 				39C38CCA1BBFF1EE000F59F5 /* InputCodingTableKorean.cpp in Sources */,
 				0E3036EC1760F68A00D93596 /* FavouritesDirectory.cpp in Sources */,
+				68AE5BE11C92421800C4D527 /* AddonButtonMapping.cpp in Sources */,
+				68AE5C091C92437900C4D527 /* GUIControllerList.cpp in Sources */,
 				7C8E02461BA35D0B0072E8B2 /* SystemBuiltins.cpp in Sources */,
 				551C3A45175A12010051AAAD /* VDA.cpp in Sources */,
 				DFBB431B178B5E6F006CC20A /* CompileInfo.cpp in Sources */,
@@ -10199,6 +10549,7 @@
 				DFD882F817DD1A5B001516FE /* AddonPythonInvoker.cpp in Sources */,
 				DFD882E917DD189E001516FE /* StringValidation.cpp in Sources */,
 				F500E35617F3412C004FC217 /* WinEvents.cpp in Sources */,
+				68AE5BE51C92421800C4D527 /* PeripheralAddon.cpp in Sources */,
 				7C2612711825B6340086E04D /* DatabaseQuery.cpp in Sources */,
 				7C920CF9181669FF00DA1477 /* TextureOperations.cpp in Sources */,
 				DFEF0BAC180ADE6400AEAED1 /* FileItemListModification.cpp in Sources */,
@@ -10211,6 +10562,7 @@
 				7C4E6F721829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */,
 				7C140989183224B8009F9411 /* ISetting.cpp in Sources */,
 				7C14098C183224B8009F9411 /* ISettingControl.cpp in Sources */,
+				68AE5BDF1C92421800C4D527 /* AddonButtonMap.cpp in Sources */,
 				7C14098F183224B8009F9411 /* Setting.cpp in Sources */,
 				DF56EF241A798A5E00CAAEFB /* HttpRangeUtils.cpp in Sources */,
 				7C140992183224B8009F9411 /* SettingCategoryAccess.cpp in Sources */,
@@ -10218,6 +10570,7 @@
 				7C140998183224B8009F9411 /* SettingDependency.cpp in Sources */,
 				2AC7EB5B1C21F6BA00BDAA95 /* GUIWindowPVRTimersBase.cpp in Sources */,
 				7C14099B183224B8009F9411 /* SettingRequirement.cpp in Sources */,
+				68AE5BD21C9241F800C4D527 /* InputHandling.cpp in Sources */,
 				7C14099E183224B8009F9411 /* SettingSection.cpp in Sources */,
 				39C38CE11BCD600E000F59F5 /* FFmpegImage.cpp in Sources */,
 				7C1409A1183224B8009F9411 /* SettingsManager.cpp in Sources */,
@@ -10292,6 +10645,7 @@
 				7CCDA1F3192753E30074CF51 /* ConnectionManagerSCPD.cpp in Sources */,
 				7CCDA1FE192753E30074CF51 /* ContentDirectorySCPD.cpp in Sources */,
 				7CCDA209192753E30074CF51 /* ContentDirectorywSearchSCPD.cpp in Sources */,
+				68AE5BCE1C9241F800C4D527 /* ButtonMapping.cpp in Sources */,
 				EDED2E9B1C878F61000F5E80 /* AddonInterfaces.cpp in Sources */,
 				7CCDA214192753E30074CF51 /* PltDidl.cpp in Sources */,
 				7CCDA21D192753E30074CF51 /* PltFileMediaServer.cpp in Sources */,
@@ -10307,6 +10661,7 @@
 				228FA65D1C53F9D50023BBF0 /* InfoScanner.cpp in Sources */,
 				7CCDA78E192756250074CF51 /* NptBufferedStreams.cpp in Sources */,
 				7CCDA797192756250074CF51 /* NptCommon.cpp in Sources */,
+				9AA7E3E81C972CF4000B7863 /* ContextMenus.cpp in Sources */,
 				7CCDA7A0192756250074CF51 /* NptConsole.cpp in Sources */,
 				7CCDA7A3192756250074CF51 /* NptCrypto.cpp in Sources */,
 				7CCDA7A6192756250074CF51 /* NptDataBuffer.cpp in Sources */,
@@ -10330,6 +10685,7 @@
 				7CCDA7F1192756250074CF51 /* NptNetwork.cpp in Sources */,
 				7CCDA7FA192756250074CF51 /* NptQueue.cpp in Sources */,
 				7CCDA803192756250074CF51 /* NptResults.cpp in Sources */,
+				68AE5BC51C9241DF00C4D527 /* KeymapHandler.cpp in Sources */,
 				7CCDA806192756250074CF51 /* NptRingBuffer.cpp in Sources */,
 				395C29FB1A9CD20C00EBC7AD /* ContextMenuManager.cpp in Sources */,
 				7CCDA80F192756250074CF51 /* NptSimpleMessageQueue.cpp in Sources */,
@@ -10387,15 +10743,18 @@
 				DF4BF0181A4EF31E0053AC56 /* cc_decoder708.cpp in Sources */,
 				DF1D2DF41B6E85EE002BB9DB /* XbtManager.cpp in Sources */,
 				E499114F174E5CC300741B6D /* archive.cpp in Sources */,
+				68AE5BF01C92424400C4D527 /* PeripheralJoystick.cpp in Sources */,
 				E4991150174E5CC300741B6D /* arcread.cpp in Sources */,
 				E4991151174E5CC300741B6D /* cmddata.cpp in Sources */,
 				E4991152174E5CC300741B6D /* consio.cpp in Sources */,
 				E4991153174E5CC300741B6D /* crc.cpp in Sources */,
 				E4991154174E5CC300741B6D /* crypt.cpp in Sources */,
+				68AE5BC01C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */,
 				E4991155174E5CC300741B6D /* encname.cpp in Sources */,
 				E4991156174E5CC300741B6D /* errhnd.cpp in Sources */,
 				E4991157174E5CC300741B6D /* extinfo.cpp in Sources */,
 				E4991158174E5CC300741B6D /* extract.cpp in Sources */,
+				68AE5BCF1C9241F800C4D527 /* ButtonMapping.cpp in Sources */,
 				E4991159174E5CC300741B6D /* filcreat.cpp in Sources */,
 				E499115A174E5CC300741B6D /* file.cpp in Sources */,
 				E499115B174E5CC300741B6D /* filefn.cpp in Sources */,
@@ -10413,6 +10772,7 @@
 				E4991167174E5CC300741B6D /* rarvm.cpp in Sources */,
 				E4991168174E5CC300741B6D /* rawread.cpp in Sources */,
 				E4991169174E5CC300741B6D /* rdwrfn.cpp in Sources */,
+				68AE5C1C1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */,
 				E499116A174E5CC300741B6D /* recvol.cpp in Sources */,
 				E499116B174E5CC300741B6D /* resource.cpp in Sources */,
 				E499116C174E5CC300741B6D /* rijndael.cpp in Sources */,
@@ -10437,6 +10797,7 @@
 				E4991181174E5CE000741B6D /* AddonStatusHandler.cpp in Sources */,
 				E4991182174E5CE000741B6D /* AddonVersion.cpp in Sources */,
 				E4991183174E5CE000741B6D /* GUIDialogAddonInfo.cpp in Sources */,
+				68AE5C081C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */,
 				E4991184174E5CE000741B6D /* GUIDialogAddonSettings.cpp in Sources */,
 				E4991185174E5CE000741B6D /* GUIViewStateAddonBrowser.cpp in Sources */,
 				E4991186174E5CE000741B6D /* GUIWindowAddonBrowser.cpp in Sources */,
@@ -10513,6 +10874,7 @@
 				F597B05C18A804E0005AADAE /* DVDVideoCodec.cpp in Sources */,
 				E49911E4174E5D3700741B6D /* DVDInputStreamNavigator.cpp in Sources */,
 				E49911E5174E5D3700741B6D /* DVDInputStreamPVRManager.cpp in Sources */,
+				80204F131C91CD3600E8C88B /* InputStreamMultiSource.cpp in Sources */,
 				E49911E6174E5D3700741B6D /* DVDInputStreamRTMP.cpp in Sources */,
 				E49911E8174E5D3700741B6D /* DVDStateSerializer.cpp in Sources */,
 				E49911E9174E5D3E00741B6D /* DVDSubtitleParserSSA.cpp in Sources */,
@@ -10562,6 +10924,7 @@
 				E4991224174E5D5A00741B6D /* OverlayRendererUtil.cpp in Sources */,
 				E4991225174E5D5A00741B6D /* RenderCapture.cpp in Sources */,
 				E4991226174E5D5A00741B6D /* RenderManager.cpp in Sources */,
+				68AE5BC61C9241DF00C4D527 /* KeymapHandler.cpp in Sources */,
 				E4991228174E5D6100741B6D /* Database.cpp in Sources */,
 				E4991229174E5D6100741B6D /* dataset.cpp in Sources */,
 				E499122A174E5D6100741B6D /* mysqldataset.cpp in Sources */,
@@ -10577,6 +10940,7 @@
 				E4991233174E5D7E00741B6D /* GUIDialogBoxBase.cpp in Sources */,
 				E4991234174E5D7E00741B6D /* GUIDialogBusy.cpp in Sources */,
 				E4991235174E5D7E00741B6D /* GUIDialogButtonMenu.cpp in Sources */,
+				68AE5C301C9243A000C4D527 /* ControllerFeature.cpp in Sources */,
 				E4991236174E5D7E00741B6D /* GUIDialogCache.cpp in Sources */,
 				E4991237174E5D7E00741B6D /* GUIDialogContextMenu.cpp in Sources */,
 				395C29D61A98A11C00EBC7AD /* WsgiErrorStream.cpp in Sources */,
@@ -10607,10 +10971,13 @@
 				E499124D174E5D7E00741B6D /* GUIDialogVolumeBar.cpp in Sources */,
 				E499124E174E5D7E00741B6D /* GUIDialogYesNo.cpp in Sources */,
 				E499124F174E5D8F00741B6D /* AddonsDirectory.cpp in Sources */,
+				7CE3FB911C9D40EA00366A4C /* ServiceBroker.cpp in Sources */,
+				68AE5C2E1C9243A000C4D527 /* Controller.cpp in Sources */,
 				E4991253174E5D8F00741B6D /* BlurayDirectory.cpp in Sources */,
 				E4991254174E5D8F00741B6D /* CacheStrategy.cpp in Sources */,
 				E4991255174E5D8F00741B6D /* CDDADirectory.cpp in Sources */,
 				E4991256174E5D8F00741B6D /* CDDAFile.cpp in Sources */,
+				68AE5BC41C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */,
 				E4991257174E5D8F00741B6D /* CircularCache.cpp in Sources */,
 				E4991258174E5D8F00741B6D /* CurlFile.cpp in Sources */,
 				E499125B174E5D8F00741B6D /* DAVCommon.cpp in Sources */,
@@ -10638,6 +11005,7 @@
 				E4991274174E5D8F00741B6D /* ImageFile.cpp in Sources */,
 				E4991275174E5D8F00741B6D /* iso9660.cpp in Sources */,
 				E4991276174E5D8F00741B6D /* ISO9660Directory.cpp in Sources */,
+				68AE5BE81C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */,
 				E4991277174E5D8F00741B6D /* ISOFile.cpp in Sources */,
 				E4991278174E5D8F00741B6D /* LibraryDirectory.cpp in Sources */,
 				E4991279174E5D8F00741B6D /* MemBufferCache.cpp in Sources */,
@@ -10686,7 +11054,6 @@
 				E49912A1174E5D9900741B6D /* PluginDirectory.cpp in Sources */,
 				E49912A2174E5D9900741B6D /* PVRDirectory.cpp in Sources */,
 				395C29DC1A98A11C00EBC7AD /* WsgiResponse.cpp in Sources */,
-				E49912A3174E5D9900741B6D /* PVRFile.cpp in Sources */,
 				E49912A4174E5D9900741B6D /* RarDirectory.cpp in Sources */,
 				E49912A5174E5D9900741B6D /* RarFile.cpp in Sources */,
 				E49912A6174E5D9900741B6D /* RarManager.cpp in Sources */,
@@ -10728,6 +11095,7 @@
 				E49912CA174E5DA000741B6D /* DirectoryNodeRoot.cpp in Sources */,
 				E49912CB174E5DA000741B6D /* DirectoryNodeSeasons.cpp in Sources */,
 				DF1D2DEE1B6E85EE002BB9DB /* XbtDirectory.cpp in Sources */,
+				68AE5C341C9243A000C4D527 /* ControllerTranslator.cpp in Sources */,
 				E49912CC174E5DA000741B6D /* DirectoryNodeTitleMovies.cpp in Sources */,
 				E49912CD174E5DA000741B6D /* DirectoryNodeTitleMusicVideos.cpp in Sources */,
 				DFDE5D521AE5658200EE53AD /* PictureScalingAlgorithm.cpp in Sources */,
@@ -10736,6 +11104,8 @@
 				E49912D0174E5DA000741B6D /* QueryParams.cpp in Sources */,
 				E49912D1174E5DA000741B6D /* VideoDatabaseDirectory.cpp in Sources */,
 				E49912D2174E5DA000741B6D /* VirtualDirectory.cpp in Sources */,
+				68AE5BE21C92421800C4D527 /* AddonButtonMapping.cpp in Sources */,
+				68AE5BE01C92421800C4D527 /* AddonButtonMap.cpp in Sources */,
 				E49912D6174E5DA000741B6D /* ZeroconfDirectory.cpp in Sources */,
 				E49912D7174E5DA000741B6D /* ZipDirectory.cpp in Sources */,
 				E49912D8174E5DA000741B6D /* ZipFile.cpp in Sources */,
@@ -10763,6 +11133,7 @@
 				E49912EE174E5DAD00741B6D /* GUIControlProfiler.cpp in Sources */,
 				E49912EF174E5DAD00741B6D /* GUIDialog.cpp in Sources */,
 				E49912F0174E5DAD00741B6D /* GUIEditControl.cpp in Sources */,
+				68AE5BEC1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */,
 				E49912F1174E5DAD00741B6D /* GUIFadeLabelControl.cpp in Sources */,
 				E49912F2174E5DAD00741B6D /* GUIFixedListContainer.cpp in Sources */,
 				E49912F3174E5DAD00741B6D /* GUIFont.cpp in Sources */,
@@ -10820,6 +11191,7 @@
 				E499131E174E5DAD00741B6D /* GUIWindow.cpp in Sources */,
 				E499131F174E5DAD00741B6D /* GUIWindowManager.cpp in Sources */,
 				2F4564D61970129A00396109 /* GUIFontCache.cpp in Sources */,
+				68AE5BD31C9241F800C4D527 /* InputHandling.cpp in Sources */,
 				E4991320174E5DAD00741B6D /* GUIWrappingListContainer.cpp in Sources */,
 				E4991321174E5DAD00741B6D /* imagefactory.cpp in Sources */,
 				E4991322174E5DAD00741B6D /* IWindowManagerCallback.cpp in Sources */,
@@ -10850,6 +11222,7 @@
 				E4991351174E5EBE00741B6D /* FavouritesOperations.cpp in Sources */,
 				E4991352174E5EBE00741B6D /* FileItemHandler.cpp in Sources */,
 				E4991353174E5EBE00741B6D /* FileOperations.cpp in Sources */,
+				7CA220081C921F74000FA3CD /* DemuxMultiSource.cpp in Sources */,
 				E4991354174E5EBE00741B6D /* GUIOperations.cpp in Sources */,
 				E4991355174E5EBE00741B6D /* InputOperations.cpp in Sources */,
 				E4991356174E5EBE00741B6D /* JSONRPC.cpp in Sources */,
@@ -10895,6 +11268,7 @@
 				E499137A174E5F0E00741B6D /* MusicInfoScanner.cpp in Sources */,
 				E499137B174E5F0E00741B6D /* MusicInfoScraper.cpp in Sources */,
 				7C8E022C1BA35D0B0072E8B2 /* GUIContainerBuiltins.cpp in Sources */,
+				68AE5BF81C92431300C4D527 /* EventScanRate.cpp in Sources */,
 				DF54F8041B6580C8000FCBA4 /* ContextMenuAddon.cpp in Sources */,
 				E4991388174E5F0E00741B6D /* MusicInfoTag.cpp in Sources */,
 				E499138A174E5F0E00741B6D /* MusicInfoTagLoaderCDDA.cpp in Sources */,
@@ -10910,8 +11284,10 @@
 				E499139A174E5F0E00741B6D /* GUIWindowVisualisation.cpp in Sources */,
 				E499139B174E5F0E00741B6D /* Album.cpp in Sources */,
 				E499139C174E5F0E00741B6D /* Artist.cpp in Sources */,
+				68AE5C0E1C92437900C4D527 /* GUIFeatureList.cpp in Sources */,
 				E499139D174E5F0E00741B6D /* GUIViewStateMusic.cpp in Sources */,
 				E499139E174E5F0E00741B6D /* MusicDatabase.cpp in Sources */,
+				9A2FAD6B1C972BE10049652A /* ContextMenus.cpp in Sources */,
 				E499139F174E5F0E00741B6D /* MusicDbUrl.cpp in Sources */,
 				E49913A0174E5F0E00741B6D /* MusicInfoLoader.cpp in Sources */,
 				E49913A1174E5F0E00741B6D /* MusicThumbLoader.cpp in Sources */,
@@ -10984,6 +11360,7 @@
 				7C2ED53E1C7F7A9800C04032 /* ProcessInfo.cpp in Sources */,
 				E49913DB174E5F8D00741B6D /* PictureInfoLoader.cpp in Sources */,
 				E49913DC174E5F8D00741B6D /* PictureInfoTag.cpp in Sources */,
+				68AE5BBE1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */,
 				E49913DD174E5F8D00741B6D /* PictureThumbLoader.cpp in Sources */,
 				E49913DE174E5F8D00741B6D /* SlideShowPicture.cpp in Sources */,
 				E49913DF174E5F8D00741B6D /* PlayList.cpp in Sources */,
@@ -11007,7 +11384,6 @@
 				E49913F0174E5FB000741B6D /* GUIViewStatePrograms.cpp in Sources */,
 				7C8E023B1BA35D0B0072E8B2 /* PlayerBuiltins.cpp in Sources */,
 				E49913F1174E5FB000741B6D /* GUIWindowPrograms.cpp in Sources */,
-				E49913F2174E5FB000741B6D /* PVRClient.cpp in Sources */,
 				E49913F3174E5FB000741B6D /* PVRClients.cpp in Sources */,
 				E49913F4174E5FB000741B6D /* PVRChannel.cpp in Sources */,
 				E49913F5174E5FB000741B6D /* PVRChannelGroup.cpp in Sources */,
@@ -11038,12 +11414,15 @@
 				E499140F174E5FB900741B6D /* PVRDatabase.cpp in Sources */,
 				E4991410174E5FB900741B6D /* PVRGUIInfo.cpp in Sources */,
 				E4991411174E5FB900741B6D /* PVRManager.cpp in Sources */,
+				68AE5BE41C92421800C4D527 /* AddonInputHandling.cpp in Sources */,
+				68AE5C1A1C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */,
 				DFD7173A1C09FEC60025D964 /* DarwinUtils.mm in Sources */,
 				E4991415174E5FF000741B6D /* RenderSystemGLES.cpp in Sources */,
 				E4991416174E602700741B6D /* RenderSystem.cpp in Sources */,
 				E4991417174E603C00741B6D /* GUIControlSettings.cpp in Sources */,
 				E4991418174E603C00741B6D /* GUIDialogContentSettings.cpp in Sources */,
 				E499141A174E603C00741B6D /* GUIWindowSettings.cpp in Sources */,
+				68AE5BE61C92421800C4D527 /* PeripheralAddon.cpp in Sources */,
 				E499141B174E603C00741B6D /* GUIWindowSettingsCategory.cpp in Sources */,
 				E499141C174E603C00741B6D /* GUIWindowSettingsScreenCalibration.cpp in Sources */,
 				E499141D174E603C00741B6D /* GUIWindowTestPattern.cpp in Sources */,
@@ -11066,6 +11445,7 @@
 				E4991434174E604300741B6D /* DetectDVDType.cpp in Sources */,
 				E4991435174E604300741B6D /* IoSupport.cpp in Sources */,
 				E4991436174E604300741B6D /* MediaManager.cpp in Sources */,
+				68AE5BC21C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */,
 				E4991437174E604700741B6D /* Implementation.cpp in Sources */,
 				E4991438174E604700741B6D /* Atomics.cpp in Sources */,
 				E4991439174E604700741B6D /* Event.cpp in Sources */,
@@ -11126,6 +11506,7 @@
 				E4991471174E605900741B6D /* SeekHandler.cpp in Sources */,
 				42DAC16F1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */,
 				E4991472174E605900741B6D /* SortUtils.cpp in Sources */,
+				68AE5C0C1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */,
 				E4991473174E605900741B6D /* Splash.cpp in Sources */,
 				E4991474174E605900741B6D /* Stopwatch.cpp in Sources */,
 				E4991475174E605900741B6D /* StreamDetails.cpp in Sources */,
@@ -11154,8 +11535,8 @@
 				E499148D174E606500741B6D /* GUIWindowVideoBase.cpp in Sources */,
 				E499148E174E606500741B6D /* GUIWindowVideoNav.cpp in Sources */,
 				E499148F174E606600741B6D /* GUIWindowVideoPlaylist.cpp in Sources */,
+				7C1870631CA1664D00114E45 /* PVRClient.cpp in Sources */,
 				E4991490174E606600741B6D /* Bookmark.cpp in Sources */,
-				E4991491174E606600741B6D /* FFmpegVideoDecoder.cpp in Sources */,
 				E4991492174E606600741B6D /* GUIViewStateVideo.cpp in Sources */,
 				E4991493174E606600741B6D /* PlayerController.cpp in Sources */,
 				E4991494174E606600741B6D /* Teletext.cpp in Sources */,
@@ -11175,6 +11556,7 @@
 				E499149F174E606E00741B6D /* ViewStateSettings.cpp in Sources */,
 				E49914A0174E606E00741B6D /* WinEventsSDL.cpp in Sources */,
 				E49914A1174E606E00741B6D /* WinSystem.cpp in Sources */,
+				7CE3FB8D1C9D3CCA00366A4C /* ServiceManager.cpp in Sources */,
 				7CCA95CD1BC6E71D0091D308 /* GLSLOutput.cpp in Sources */,
 				E49914A2174E607200741B6D /* GUIMediaWindow.cpp in Sources */,
 				E49914A3174E607200741B6D /* GUIWindowDebugInfo.cpp in Sources */,
@@ -11188,6 +11570,7 @@
 				E49914A9174E607200741B6D /* GUIWindowScreensaverDim.cpp in Sources */,
 				E49914AA174E607200741B6D /* GUIWindowStartup.cpp in Sources */,
 				E49914AB174E607200741B6D /* GUIWindowSystemInfo.cpp in Sources */,
+				7CFEA2B31C98618400A0B60B /* BinaryAddonCache.cpp in Sources */,
 				7C8E022F1BA35D0B0072E8B2 /* GUIControlBuiltins.cpp in Sources */,
 				E49914AC174E607200741B6D /* GUIWindowWeather.cpp in Sources */,
 				DF91E93B1C0A21D60011084D /* xbmc.cpp in Sources */,
@@ -11235,6 +11618,7 @@
 				E4991554174E656E00741B6D /* CallbackFunction.cpp in Sources */,
 				E4991555174E656E00741B6D /* CallbackHandler.cpp in Sources */,
 				E4991556174E656E00741B6D /* Control.cpp in Sources */,
+				9AA7E3E91C972CF4000B7863 /* ContextMenus.cpp in Sources */,
 				E4991557174E656E00741B6D /* Dialog.cpp in Sources */,
 				DFEA4B521B5271EE00562321 /* ActiveAEDSPAddon.cpp in Sources */,
 				E4991558174E656E00741B6D /* File.cpp in Sources */,
@@ -11258,10 +11642,10 @@
 				E4991568174E656E00741B6D /* WindowDialogMixin.cpp in Sources */,
 				E4991569174E656E00741B6D /* WindowXML.cpp in Sources */,
 				E499156A174E65AB00741B6D /* ButtonTranslator.cpp in Sources */,
+				68AE5C0A1C92437900C4D527 /* GUIControllerList.cpp in Sources */,
 				E499156B174E65AB00741B6D /* InertialScrollingHandler.cpp in Sources */,
 				E499156D174E65AB00741B6D /* KeyboardStat.cpp in Sources */,
 				4260D5C81B67BB8F003F6F2D /* GUIWindowSplash.cpp in Sources */,
-				E499156E174E65AB00741B6D /* SDLJoystick.cpp in Sources */,
 				E499156F174E65AC00741B6D /* XBMC_keytable.cpp in Sources */,
 				E4991574174E661400741B6D /* WinEventsIOS.mm in Sources */,
 				E4991575174E661400741B6D /* WinSystemIOS.mm in Sources */,
@@ -11360,6 +11744,8 @@
 				7CD4F7ED1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */,
 				7CCDA16C192753E30074CF51 /* PltService.cpp in Sources */,
 				7CCDA175192753E30074CF51 /* PltSsdp.cpp in Sources */,
+				68AE5BD11C9241F800C4D527 /* FeatureHandling.cpp in Sources */,
+				68AE5BF61C92431300C4D527 /* EventScanner.cpp in Sources */,
 				7CCDA17E192753E30074CF51 /* PltStateVariable.cpp in Sources */,
 				7CCDA187192753E30074CF51 /* PltTaskManager.cpp in Sources */,
 				7CCDA190192753E30074CF51 /* PltThreadTask.cpp in Sources */,
@@ -11383,6 +11769,7 @@
 				DF923E5E1A11536A008CDB0C /* DataCacheCore.cpp in Sources */,
 				7CCDA227192753E30074CF51 /* PltMediaBrowser.cpp in Sources */,
 				7CCDA230192753E30074CF51 /* PltMediaCache.cpp in Sources */,
+				68AE5C221C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */,
 				7CCDA239192753E30074CF51 /* PltMediaItem.cpp in Sources */,
 				7CCDA242192753E30074CF51 /* PltMediaServer.cpp in Sources */,
 				7CCDA24B192753E30074CF51 /* PltSyncMediaBrowser.cpp in Sources */,
@@ -11395,6 +11782,7 @@
 				7CCDA7A1192756250074CF51 /* NptConsole.cpp in Sources */,
 				7CCDA7A4192756250074CF51 /* NptCrypto.cpp in Sources */,
 				7CCDA7A7192756250074CF51 /* NptDataBuffer.cpp in Sources */,
+				68AE5BA61C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */,
 				7CCDA7B0192756250074CF51 /* NptDebug.cpp in Sources */,
 				7CCDA7B9192756250074CF51 /* NptDigest.cpp in Sources */,
 				7CCDA7BC192756250074CF51 /* NptDynamicLibraries.cpp in Sources */,
@@ -11405,6 +11793,7 @@
 				DFD717371C09FEC60025D964 /* AutoPool.mm in Sources */,
 				7CCDA7DD192756250074CF51 /* NptList.cpp in Sources */,
 				7C8E02291BA35D0B0072E8B2 /* GUIBuiltins.cpp in Sources */,
+				68AE5C321C9243A000C4D527 /* ControllerLayout.cpp in Sources */,
 				7CCDA7E6192756250074CF51 /* NptLogging.cpp in Sources */,
 				7CCDA7E9192756250074CF51 /* NptMessaging.cpp in Sources */,
 				7CCDA7F2192756250074CF51 /* NptNetwork.cpp in Sources */,
@@ -11419,10 +11808,12 @@
 				DFD717291C09EDD70025D964 /* MessagePrinter.cpp in Sources */,
 				7CCDA834192756250074CF51 /* NptSystem.cpp in Sources */,
 				7CCDA83D192756250074CF51 /* NptThreads.cpp in Sources */,
+				9ABFE7A21C972D60002F1318 /* ContextMenus.cpp in Sources */,
 				7CCDA846192756250074CF51 /* NptTime.cpp in Sources */,
 				7CCDA84F192756250074CF51 /* NptTls.cpp in Sources */,
 				7CCDA852192756250074CF51 /* NptUri.cpp in Sources */,
 				7CCDA85B192756250074CF51 /* NptUtils.cpp in Sources */,
+				68AE5C201C92438E00C4D527 /* GUIGameController.cpp in Sources */,
 				7CCDA864192756250074CF51 /* NptXml.cpp in Sources */,
 				7CCDA86D192756250074CF51 /* NptZip.cpp in Sources */,
 				B5011E4219AF3B56005ADF89 /* PosixFile.cpp in Sources */,
@@ -11438,6 +11829,7 @@
 				7CCDAC8719275CA70074CF51 /* NptBsdNetwork.cpp in Sources */,
 				7CCDAC9019275CA70074CF51 /* NptBsdResolver.cpp in Sources */,
 				7CCDAC9319275CA70074CF51 /* NptBsdSockets.cpp in Sources */,
+				68AE5C1E1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */,
 				7CCDACA819275D1F0074CF51 /* NptStdcDebug.cpp in Sources */,
 				DF29BCFB1B5D911800904347 /* GUIViewStateEventLog.cpp in Sources */,
 				7CCDACB119275D1F0074CF51 /* NptStdcEnvironment.cpp in Sources */,

_service:download_url:master.tar.gz/Makefile.in Changed

@@ -11,7 +11,7 @@
 
 DVDPCODECS_DIRS= \
 	lib \
-	lib/libdvd 
+	lib/libdvd
 
 VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
                    xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
@@ -32,6 +32,7 @@
                    xbmc/addons/binary/interfaces/api1/Codec/addon-callbacks-codec.a \
                    xbmc/addons/binary/interfaces/api1/GUI/addon-callbacks-gui.a \
                    xbmc/addons/binary/interfaces/api1/InputStream/addon-callbacks-inputstream.a \
+                   xbmc/addons/binary/interfaces/api1/Peripheral/addon-callbacks-peripheral.a \
                    xbmc/addons/binary/interfaces/api1/PVR/addon-callbacks-pvr.a \
                    xbmc/cdrip/cdrip.a \
                    xbmc/contrib/kissfft/kissfft.a \
@@ -53,6 +54,9 @@
                    xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
                    xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
                    xbmc/filesystem/filesystem.a \
+                   xbmc/games/controllers/controllers.a \
+                   xbmc/games/controllers/guicontrols/controllerguicontrols.a \
+                   xbmc/games/controllers/windows/controllerwindows.a \
                    xbmc/guilib/guilib.a \
                    xbmc/input/input.a \
                    xbmc/interfaces/builtins/builtins.a \
@@ -76,6 +80,7 @@
                    xbmc/network/dacp/dacp.a \
                    xbmc/network/websocket/websocket.a \
                    xbmc/network/network.a \
+                   xbmc/peripherals/addons/peripheral-addons.a \
                    xbmc/peripherals/bus/peripheral-bus.a \
                    xbmc/peripherals/devices/peripheral-devices.a \
                    xbmc/peripherals/dialogs/peripheral-dialogs.a \
@@ -153,6 +158,8 @@
 INSTALL_FILTER += .*repository\.pvr-win32\.xbmc\.org.*
 INSTALL_FILTER += .*repository\.pvr-osx.*\.xbmc\.org.*
 ifeq (@USE_ANDROID@,1)
+DIRECTORY_ARCHIVES += xbmc/input/joysticks/input_joysticks.a
+DIRECTORY_ARCHIVES += xbmc/input/joysticks/generic/input_joysticks_generic.a
 DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
 DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
 DIRECTORY_ARCHIVES += xbmc/input/touch/generic/input_touch_generic.a
@@ -161,6 +168,8 @@
 DIRECTORY_ARCHIVES += xbmc/storage/android/storage_android.a
 DIRECTORY_ARCHIVES += xbmc/windowing/X11/windowing_X11.a
 else
+DIRECTORY_ARCHIVES += xbmc/input/joysticks/input_joysticks.a
+DIRECTORY_ARCHIVES += xbmc/input/joysticks/generic/input_joysticks_generic.a
 DIRECTORY_ARCHIVES += xbmc/input/linux/input_linux.a
 DIRECTORY_ARCHIVES += xbmc/input/touch/input_touch.a
 DIRECTORY_ARCHIVES += xbmc/input/touch/generic/input_touch_generic.a
@@ -203,7 +212,8 @@
 	lib/addons/library.xbmc.codec \
 	lib/addons/library.xbmc.pvr \
 	lib/addons/library.kodi.guilib \
-	lib/addons/library.kodi.inputstream
+	lib/addons/library.kodi.inputstream \
+	lib/addons/library.kodi.peripheral \
 
 ESTUARY_MEDIA=addons/skin.estuary/media
 SKIN_DIRS=$(ESTUARY_MEDIA)
@@ -325,6 +335,7 @@
 	$(MAKE) -C lib/addons/library.kodi.audioengine
 	$(MAKE) -C lib/addons/library.xbmc.codec
 	$(MAKE) -C lib/addons/library.kodi.guilib
+	$(MAKE) -C lib/addons/library.kodi.peripheral
 	$(MAKE) -C lib/addons/library.xbmc.pvr
 	$(MAKE) -C lib/addons/library.kodi.inputstream
 dvdpcodecs: dllloader

_service:download_url:master.tar.gz/addons/game.controller.default Added

_service:download_url:master.tar.gz/addons/game.controller.default/addon.xml Added

_service:download_url:master.tar.gz/addons/game.controller.default/layout.png Added

_service:download_url:master.tar.gz/addons/game.controller.default/layout.xml Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<layout name="default" label="30000" image="layout.png">
+  <face>
+    <button name="a" type="digital" label="30001" geometry="circle" x="651" y="266" radius="32"/>
+    <button name="b" type="digital" label="30002" geometry="circle" x="709" y="210" radius="32"/>
+    <button name="x" type="digital" label="30003" geometry="circle" x="583" y="210" radius="32"/>
+    <button name="y" type="digital" label="30004" geometry="circle" x="651" y="158" radius="32"/>
+    <button name="start" type="digital" label="30005" geometry="ellipse" x="478" y="227" rx="22" ry="16"/>
+    <button name="back" type="digital" label="30006" geometry="ellipse" x="290" y="227" rx="22" ry="16"/>
+    <button name="guide" type="digital" label="30007" geometry="circle" x="386" y="221" radius="50"/>
+    <button name="up" type="digital" label="30010" geometry="circle" x="117" y="234" r="52"/>
+    <button name="down" type="digital" label="30011" geometry="circle" x="500" y="342" r="52"/>
+    <button name="right" type="digital" label="30012" geometry="rectangle" x1="233" y1="288" x2="281" y2="332"/>
+    <button name="left" type="digital" label="30013" geometry="rectangle" x1="233" y1="353" x2="281" y2="397"/>
+    <button name="leftthumb" type="digital" label="30008" geometry="rectangle" x1="131" y1="0" x2="194" y2="40"/>
+    <button name="rightthumb" type="digital" label="30009" geometry="rectangle" x1="567" y1="0" x2="631" y2="40"/>
+  </face>
+  <shoulder>
+    <button name="leftbumper" type="digital" label="30014" geometry="rectangle" x1="272" y1="321" x2="316" y2="365"/>
+    <button name="rightbumper" type="digital" label="30015" geometry="rectangle" x1="198" y1="321" x2="242" y2="365"/>
+  </shoulder>
+  <triggers>
+    <button name="lefttrigger" type="analog" label="30016" geometry="rectangle" x1="36" y1="40" x2="207" y2="108"/>
+    <button name="righttrigger" type="analog" label="30017" geometry="rectangle" x1="556" y1="40" x2="728" y2="108"/>
+  </triggers>
+  <analogsticks>
+    <analogstick name="leftstick" label="30008" geometry="circle" x="500" y="342" r="52"/>
+    <analogstick name="rightstick" label="30009" geometry="circle" x="500" y="342" r="52"/>
+  </analogsticks>
+</layout>

_service:download_url:master.tar.gz/addons/game.controller.default/resources Added

_service:download_url:master.tar.gz/addons/game.controller.default/resources/language Added

_service:download_url:master.tar.gz/addons/game.controller.default/resources/language/resource.language.en_gb Added

_service:download_url:master.tar.gz/addons/game.controller.default/resources/language/resource.language.en_gb/strings.po Added

@@ -0,0 +1,90 @@
+# XBMC Media Center language file
+# Addon Name: Default controller
+# Addon id: game.controller.default
+# Addon Provider: Libretro Team
+msgid ""
+msgstr ""
+"Project-Id-Version: Libretro Clients\n"
+"Report-Msgid-Bugs-To: alanwww1@xbmc.org\n"
+"POT-Creation-Date: 2014-05-30 17:00+8\n"
+"PO-Revision-Date: 2014-05-30 17:00+8\n"
+"Last-Translator: XBMC Translation Team\n"
+"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#30000"
+msgid "Kodi"
+msgstr ""
+
+msgctxt "#30001"
+msgid "A"
+msgstr ""
+
+msgctxt "#30002"
+msgid "B"
+msgstr ""
+
+msgctxt "#30003"
+msgid "X"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Y"
+msgstr ""
+
+msgctxt "#30005"
+msgid "Start"
+msgstr ""
+
+msgctxt "#30006"
+msgid "Back"
+msgstr ""
+
+msgctxt "#30007"
+msgid "Guide"
+msgstr ""
+
+msgctxt "#30008"
+msgid "Left Stick"
+msgstr ""
+
+msgctxt "#30009"
+msgid "Right Stick"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Up"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Down"
+msgstr ""
+
+msgctxt "#30012"
+msgid "Right"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Left"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Left Shoulder"
+msgstr ""
+
+msgctxt "#30015"
+msgid "Right Shoulder"
+msgstr ""
+
+msgctxt "#30016"
+msgid "Left Trigger"
+msgstr ""
+
+msgctxt "#30017"
+msgid "Right Trigger"
+msgstr ""
+

_service:download_url:master.tar.gz/addons/kodi.game Added

_service:download_url:master.tar.gz/addons/kodi.game/addon.xml Added

_service:download_url:master.tar.gz/addons/kodi.game/controller.xsd Added

_service:download_url:master.tar.gz/addons/kodi.inputstream/addon.xml Changed

_service:download_url:master.tar.gz/addons/kodi.peripheral Added

_service:download_url:master.tar.gz/addons/kodi.peripheral/addon.xml Added

_service:download_url:master.tar.gz/addons/library.kodi.peripheral Added

_service:download_url:master.tar.gz/addons/library.kodi.peripheral/.gitignore Added

_service:download_url:master.tar.gz/addons/resource.language.en_gb/resources/strings.po Changed

@@ -2961,6 +2961,7 @@
 msgid "Browse for folder"
 msgstr ""
 
+#: xbmc/music/ContextMenus.h
 msgctxt "#658"
 msgid "Song information"
 msgstr ""
@@ -3961,11 +3962,6 @@
 msgid "Set plug-in thumb"
 msgstr ""
 
-#: xbmc/dialogs/GUIDialogContextMenu.cpp
-msgctxt "#1045"
-msgid "Add-on settings"
-msgstr ""
-
 msgctxt "#1046"
 msgid "Access points"
 msgstr ""
@@ -5027,6 +5023,7 @@
 msgid "Now playing - Videos"
 msgstr ""
 
+#: xbmc/music/ContextMenus.h
 msgctxt "#10523"
 msgid "Album information"
 msgstr ""
@@ -5104,7 +5101,12 @@
 msgid "Install date"
 msgstr ""
 
-#empty strings from id 12014 to 12020
+#: xbmc/addons/GUIViewStateAddonBrowser.cpp
+msgctxt "#12014"
+msgid "Last updated"
+msgstr ""
+
+#empty strings from id 12015 to 12020
 
 #. Label of various controls for starting playback from the beginning
 #: xbmc/Autorun.cpp
@@ -5121,7 +5123,12 @@
 msgid "Resume from %s"
 msgstr ""
 
-#empty strings from id 12023 to 12309
+#: xbmc/video/ContextMenus.cpp
+msgctxt "#12023"
+msgid "Play from beginning"
+msgstr ""
+
+#empty strings from id 12024 to 12309
 
 #: addons/skin.estuary/1080i/DialogNumeric.xml
 #: skin.estouchy
@@ -6239,7 +6246,7 @@
 
 #: xbmc/video/jobs/VideoLibraryRefreshingJob.cpp
 #: xbmc/video/windows/GUIWindowVideoBase.cpp
-#: xbmc/video/windows/GUIWindowVideoNav.cpp
+#: xbmc/video/ContextMenus.h
 msgctxt "#13346"
 msgid "Movie information"
 msgstr ""
@@ -6260,6 +6267,7 @@
 msgid "Current playlist"
 msgstr ""
 
+#: Not used anymore. Use #10523 instead.
 msgctxt "#13351"
 msgid "Album information"
 msgstr ""
@@ -8647,9 +8655,10 @@
 msgid "Information"
 msgstr ""
 
+#. message box text stating that a timer is already set for a given epg event.
 #: xbmc/pvr/windows/GUIWindowPVRBase.cpp
 msgctxt "#19034"
-msgid "Already started recording on this channel"
+msgid "There is already a timer set for this event"
 msgstr ""
 
 msgctxt "#19035"
@@ -8922,49 +8931,7 @@
 msgid "Unknown channel %u"
 msgstr ""
 
-msgctxt "#19086"
-msgid "Mo-__-__-__-__-__-__"
-msgstr ""
-
-msgctxt "#19087"
-msgid "__-Tu-__-__-__-__-__"
-msgstr ""
-
-msgctxt "#19088"
-msgid "__-__-We-__-__-__-__"
-msgstr ""
-
-msgctxt "#19089"
-msgid "__-__-__-Th-__-__-__"
-msgstr ""
-
-msgctxt "#19090"
-msgid "__-__-__-__-Fr-__-__"
-msgstr ""
-
-msgctxt "#19091"
-msgid "__-__-__-__-__-Sa-__"
-msgstr ""
-
-msgctxt "#19092"
-msgid "__-__-__-__-__-__-Su"
-msgstr ""
-
-msgctxt "#19093"
-msgid "Mo-Tu-We-Th-Fr-__-__"
-msgstr ""
-
-msgctxt "#19094"
-msgid "Mo-Tu-We-Th-Fr-Sa-__"
-msgstr ""
-
-msgctxt "#19095"
-msgid "Mo-Tu-We-Th-Fr-Sa-Su"
-msgstr ""
-
-msgctxt "#19096"
-msgid "__-__-__-__-__-Sa-Su"
-msgstr ""
+#empty strings from id 19086 to 19096
 
 msgctxt "#19097"
 msgid "Enter the name for the recording"
@@ -9645,15 +9612,7 @@
 msgid "Starting background threads"
 msgstr ""
 
-#: xbmc/pvr/addons/PVRClients.cpp
-msgctxt "#19240"
-msgid "No PVR add-on enabled"
-msgstr ""
-
-#: xbmc/pvr/addons/PVRClients.cpp
-msgctxt "#19241"
-msgid "The PVR manager has been enabled without any enabled PVR add-on. Enable at least one add-on in order to use the PVR functionality."
-msgstr ""
+#empty strings from id 19240 to 19241
 
 #. Label for context menu entry to open settings dialog for a timer
 #: xbmc/pvr/windows/GUIWindowPVRGuide.cpp
@@ -9663,6 +9622,8 @@
 
 #. Label for context menu entry to open settings dialog for a timer rule
 #: xbmc/pvr/windows/GUIWindowPVRGuide.cpp
+#: xbmc/pvr/windows/GUIWindowPVRSearch.cpp
+#: xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp
 msgctxt "#19243"
 msgid "Edit timer rule"
 msgstr ""
@@ -9932,7 +9893,15 @@
 msgid "Delete this recording permanently?"
 msgstr ""
 
-#empty strings from id 19295 to 19498
+#. Label for context menu entry to delete a timer rule
+#: xbmc/pvr/windows/GUIWindowPVRGuide.cpp
+#: xbmc/pvr/windows/GUIWindowPVRSearch.cpp
+#: xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp
+msgctxt "#19295"
+msgid "Delete timer rule"
+msgstr ""
+
+#empty strings from id 19296 to 19498
 
 #: xbmc/epg/Epg.cpp
 msgctxt "#19499"
@@ -11635,13 +11604,13 @@
 msgstr ""
 
 #: xbmc/video/jobs/VideoLibraryRefreshingJob.cpp
-#: xbmc/video/windows/GUIWindowVideoNav.cpp
+#: xbmc/video/ContextMenus.h
 msgctxt "#20351"
 msgid "TV show information"
 msgstr ""
 
 #: xbmc/video/jobs/VideoLibraryRefreshingJob.cpp
-#: xbmc/video/windows/GUIWindowVideoNav.cpp
+#: xbmc/video/ContextMenus.h
 msgctxt "#20352"
 msgid "Episode information"
 msgstr ""
@@ -11844,7 +11813,7 @@
 
 #: xbmc/music/windows/GUIWindowMusicNav.cpp
 #: xbmc/video/jobs/VideoLibraryRefreshingJob.cpp
-#: xbmc/video/windows/GUIWindowVideoNav.cpp
+#: xbmc/video/ContextMenus.h
 msgctxt "#20393"
 msgid "Music video information"
 msgstr ""
@@ -13180,6 +13149,7 @@
 msgid "Select artist"
 msgstr ""
 
+#: xbmc/music/ContextMenus.h
 msgctxt "#21891"
 msgid "Artist information"
 msgstr ""
@@ -13458,11 +13428,16 @@
 msgid "Add-on options"
 msgstr ""
 
+#: xbmc/addons/ContextMenus.h
 msgctxt "#24003"
 msgid "Add-on information"
 msgstr ""
 
-#empty string with id 24004
+#. Name of menu in the add-on browser
+#: xbmc/filesystem/AddonsDirectory.cpp
+msgctxt "#24004"
+msgid "Recently updated"
+msgstr ""
 
 #: xbmc/addons/Addon.cpp
 msgctxt "#24005"
@@ -13611,8 +13586,9 @@
 msgid "Install from repository"
 msgstr ""
 
-#: xbmc/addons/GUIViewStateAddonBrowser.cpp
 #: addons/skin.estuary/1080i/AddonBrowser.xml
+#: xbmc/addons/ContextMenus.h
+#: xbmc/addons/GUIViewStateAddonBrowser.cpp
 msgctxt "#24034"
 msgid "Check for updates"
 msgstr ""
@@ -14321,7 +14297,22 @@
 msgid "Chapter %u"
 msgstr ""
 
-#empty strings from id 25011 to 29800
+#: xbmc/cores/VideoPlayer/VideoPlayer.cpp
+msgctxt "#25011"
+msgid "Commercial"
+msgstr ""
+
+#: xbmc/cores/VideoPlayer/VideoPlayer.cpp
+msgctxt "#25012"
+msgid "Auto-skip off"
+msgstr ""
+
+#: xbmc/cores/VideoPlayer/VideoPlayer.cpp
+msgctxt "#25013"
+msgid "Auto-skip on"
+msgstr ""
+
+#empty strings from id 25014 to 29800
 
 #: unused
 msgctxt "#29801"
@@ -14818,7 +14809,49 @@
 msgid "Send present traffic messages around and can be handled from add-ons (nothing inside Kodi)"
 msgstr ""
 
-#empty strings from id 29988 to 33000
+#. Music role category
+#: system/library/music/musicroles/Arrangers.xml
+msgctxt "#29988"
+msgid "Arrangers"
+msgstr ""
+
+#. Music role category
+#: system/library/music/musicroles/Composers.xml
+msgctxt "#29989"
+msgid "Composers"
+msgstr ""
+
+#. Music role category
+#: system/library/music/musicroles/Conductors.xml
+msgctxt "#29990"
+msgid "Conductors"
+msgstr ""
+
+#. Music role category
+#: system/library/music/musicroles/DJ.xml
+msgctxt "#29991"
+msgid "DJ Mixers"
+msgstr ""
+
+#. Music role category
+#: system/library/music/musicroles/Lyricists.xml
+msgctxt "#29992"
+msgid "Lyricists"
+msgstr ""
+
+#. Music role category
+#: system/library/music/musicroles/Orchestras.xml
+msgctxt "#29993"
+msgid "Orchestras"
+msgstr ""
+
+#. Roles from music contributor
+#: system/library/music/musicroles/index.xml
+msgctxt "#29994"
+msgid "Roles"
+msgstr ""
+
+#empty strings from id 29995 to 33000
 #strings 30000 thru 30999 reserved for plug-ins and plug-in settings
 #strings 31000 thru 31999 reserved for skins
 #strings 32000 thru 32999 reserved for scripts
@@ -15495,7 +15528,151 @@
 msgid "Don't use the custom keymap for this device"
 msgstr ""
 
-#empty strings from id 35010 to 35099
+#. Name of add-ons extending the kodi.peripheral extension point
+#: xbmc/addons/Addon.cpp
+msgctxt "#35010"
+msgid "Peripheral libraries"
+msgstr ""
+
+#empty strings from id 35011 to 35048
+
+#. Name of game add-ons category
+#: xbmc/filesystem/AddonsDirectory.cpp
+msgctxt "#35049"
+msgid "Game add-ons"
+msgstr ""
+
+#. Name of controller add-ons
+#: addons/skin.confluence/720p/DialogGameControllers.xml
+#: xbmc/addons/Addon.cpp
+#: xbmc/games/controllers/windows/GUIControllerWindow.cpp
+msgctxt "#35050"
+msgid "Controller profiles"
+msgstr ""
+
+#empty strings from id 35051 to 35054
+
+#. Help text for controller window
+#: xbmc/games/controllers/windows/GUIControllerWindow.cpp
+msgctxt "#35055"
+msgid "Use the keyboard or remote to select a controller profile. Move to the buttons and select the first one. When prompted, press the button on your game controller that best matches what you see on the screen. If you make a mistake you can repeat the process."
+msgstr ""
+
+#. Title of error dialog shown when no joystick add-ons provide button mapping
+#: xbmc/games/controllers/windows/GUIControllerWindow.cpp
+msgctxt "#35056"
+msgid "Joystick support not found"
+msgstr ""
+
+#. Text of error dialog shown when no joystick add-ons provide button mapping
+#: xbmc/games/controllers/windows/GUIControllerWindow.cpp
+msgctxt "#35057"
+msgid "Controller configuration is disabled. Install the proper joystick support add-on."
+msgstr ""
+
+#. Title of controller configuration window
+#: addons/skin.confluence/720p/DialogGameControllers.xml
+msgctxt "#35058"
+msgid "Controller Configuration"
+msgstr ""
+
+#. Heading for controller buttons list in controller configuration window
+#: addons/skin.confluence/720p/DialogGameControllers.xml
+msgctxt "#35059"
+msgid "Buttons"
+msgstr ""
+
+#. Heading for prompt to reset a controller profile for all devices
+#: xbmc/games/controllers/windows/GUIControllerList.cpp
+msgctxt "#35060"
+msgid "Reset controller profile"
+msgstr ""
+
+#. Prompt to reset a controller profile for all devices
+#: xbmc/games/controllers/windows/GUIControllerList.cpp
+msgctxt "#35061"
+msgid "Would you like to reset this controller profile for all attached devices?"
+msgstr ""
+
+#. Notice that all controller profiles are installed
+#: xbmc/games/controllers/windows/GUIControllerWindow.cpp
+msgctxt "#35062"
+msgid "All available controller profiles are installed."
+msgstr ""
+
+#. Name of the setting that activates the controller configuration window
+#: system/settings/settings.xml
+msgctxt "#35063"
+msgid "Configure attached controllers"
+msgstr ""
+
+#. Description for the controller window setting
+#: system/settings/settings.xml
+msgctxt "#35064"
+msgid "Pair your controllers with the various input devices of different game systems."
+msgstr ""
+
+#empty strings from id 35065 to 35089
+
+#. Button prompt without timeout. %s - button name
+#: xbmc/games/controllers/guicontrols/GUIScalarFeatureButton.cpp
+msgctxt "#35090"
+msgid "Press %s"
+msgstr ""
+
+#. Button prompt with timeout. %s - button name, %d - seconds left in prompt
+#: xbmc/games/controllers/guicontrols/GUIScalarFeatureButton.cpp
+msgctxt "#35091"
+msgid "Press %s (%d)"
+msgstr ""
+
+#. Analog stick up prompt without timeout. %s - analog stick name
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35092"
+msgid "Move %s up"
+msgstr ""
+
+#. Analog stick up prompt with timeout. %s - analog stick name, %d - seconds left in prompt
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35093"
+msgid "Move %s up (%d)"
+msgstr ""
+
+#. Analog stick down prompt without timeout. %s - analog stick name
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35094"
+msgid "Move %s down"
+msgstr ""
+
+#. Analog stick down prompt with timeout. %s - analog stick name, %d - seconds left in prompt
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35095"
+msgid "Move %s down (%d)"
+msgstr ""
+
+#. Analog stick right prompt without timeout. %s - analog stick name
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35096"
+msgid "Move %s right"
+msgstr ""
+
+#. Analog stick right prompt with timeout. %s - analog stick name, %d - seconds left in prompt
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35097"
+msgid "Move %s right (%d)"
+msgstr ""
+
+#. Analog stick left prompt without timeout. %s - analog stick name
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35098"
+msgid "Move %s left"
+msgstr ""
+
+#. Analog stick left prompt with timeout. %s - analog stick name, %d - seconds left in prompt
+#: xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp
+msgctxt "#35099"
+msgid "Move %s left (%d)"
+msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#35100"
@@ -15535,7 +15712,13 @@
 msgid "Access denied."
 msgstr ""
 
-#empty strings from id 35509 to 35999
+#. connection state "connecting" (asynchronous addon start)
+#: xbmc/addons/AddonCallbacksPVR.cpp
+msgctxt "#35509"
+msgid "Connecting to backend."
+msgstr ""
+
+#empty strings from id 35510 to 35999
 
 #: xbmc/peripherals/devices/PeripheralCecAdapter.cpp
 msgctxt "#36000"
@@ -18536,29 +18719,35 @@
 #. Remixer of the song (if present)
 msgctxt "#38036"
 msgid "Remixer"
-msgstr "" 
+msgstr ""
 
 #. Arranger of the song (if present)
 msgctxt "#38037"
 msgid "Arranger"
-msgstr "" 
+msgstr ""
 
 #. Engineer of the song (if present)
 msgctxt "#38038"
 msgid "Engineer"
-msgstr "" 
+msgstr ""
 
 #. Producer of the song (if present)
 msgctxt "#38039"
 msgid "Producer"
-msgstr "" 
+msgstr ""
 
 #. DJMixer of the song (if present)
 msgctxt "#38040"
 msgid "DJMixer"
-msgstr "" 
+msgstr ""
 
 #. Mixer of the song (if present)
 msgctxt "#38041"
 msgid "Mixer"
-msgstr "" 
+msgstr ""
+
+#. Missing artist name
+#: music/MusicDatabase.cpp
+msgctxt "#38042"
+msgid "[Missing]"
+msgstr ""

_service:download_url:master.tar.gz/addons/skin.estouchy/addon.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estouchy" version="1.0.3" name="Estouchy" provider-name="Team Kodi">
+<addon id="skin.estouchy" version="1.0.6" name="Estouchy" provider-name="Team Kodi">
 	<requires>
 		<import addon="xbmc.gui" version="5.11.0"/>
 	</requires>
@@ -8,14 +8,33 @@
 		<res width="1706" height="960" aspect="16:9" default="true" folder="xml"/>
 	</extension>
 	<extension point="xbmc.addon.metadata">
+		<summary lang="bg_BG">Облик за устройства с екран чувствителен на допир</summary>
 		<summary lang="cs_CZ">Skin pro dotyková zařízení</summary>
+		<summary lang="de_DE">Skin für Touchscreen-Geräte</summary>
 		<summary lang="en_GB">Skin for touchscreen devices</summary>
+		<summary lang="en_US">Skin for touchscreen devices</summary>
 		<summary lang="fr_FR">Habillage pour les appareils à écran tactile</summary>
+		<summary lang="hu_HU">Felület érintőképernyős eszközöknek</summary>
+		<summary lang="it_IT">Skin per dispositivi touchscreen</summary>
 		<summary lang="lt_LT">Teminė išvaizda liečiamiesiems įrenginiams</summary>
+		<summary lang="ms_MY">Kulit untuk peranti skrin sentuh</summary>
+		<summary lang="nl_NL">Skin voor aanraakscherm apparaten</summary>
+		<summary lang="pt_BR">Skin para dispositivos com telas de toque</summary>
+		<summary lang="sk_SK">Grafický vzhľad pre zariadenia s dotykovým displejom</summary>
+		<summary lang="sv_SE">Skin för enheter med touchskärm</summary>
+		<summary lang="tr_TR">Dokunmatik ekranlı aygıtlar için dış görünüm</summary>
 		<description lang="cs_CZ">Skin navržený pro zařízení s dotykovou obrazovkou, jako jsou tablety a smartphony.</description>
 		<description lang="en_GB">Skin designed to be used on touchscreen devices like tablets and smartphones</description>
+		<description lang="en_US">Skin designed to be used on touchscreen devices like tablets and smartphones</description>
 		<description lang="fr_FR">Habillage conçu pour les appareils à écran tactile comme les tablettes et les téléphones</description>
+		<description lang="hu_HU">Egy érintőképernyős eszközökre, például táblagépekre és okostelefonokra tervezett felület</description>
+		<description lang="it_IT">Skin progettata per essere usata su dispositivi touchscreen come tablet e smartphone</description>
 		<description lang="lt_LT">Teminė išvaizda pritaikyta naudojimui įrenginiuose su liečiamaisiais ekranais, tokiuose kaip planšetiniai kompiuteriai ar išmanieji telefonai</description>
+		<description lang="ms_MY">Kulit direka untuk digunakan pada peranti berskrin sentuh seperti tablet dan telefon pintar</description>
+		<description lang="nl_NL">Skin ontworpen voor gebruik bij aanraakscherm apparaten zoals tablets en smartphones</description>
+		<description lang="pt_BR">Skin concebida para ser usada em dispositivos com telas de toque como tablets e smartphones</description>
+		<description lang="sk_SK">Grafický vzhľad určený pre použitie na dotykových zariadeniach ako sú tablety alebo mobilné telefóny</description>
+		<description lang="tr_TR">Bu dış görünüm tabletler ve akıllı telefonlar gibi dokunmatik ekranlı aygıtlarda kullanılmak üzere tasarlandı</description>
 		<platform>all</platform>
 		<license>Creative Commons Attribution-Share Alike 3.0 United States</license>
 		<forum>http://forum.kodi.tv/forumdisplay.php?fid=261</forum>

_service:download_url:master.tar.gz/addons/skin.estouchy/changelog.txt Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.bg_bg/strings.po Changed

@@ -152,6 +152,10 @@
 msgid "Download Subtitles"
 msgstr "Сваляне на субтитри"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Телетекст"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Стандартните (за облика)"
@@ -204,6 +208,14 @@
 msgid "Add-on Shortcut"
 msgstr "Кратък път на добавка"
 
+msgctxt "#31553"
+msgid "Use Custom Background"
+msgstr "Персонален фон"
+
+msgctxt "#31554"
+msgid "Background:"
+msgstr "Фон:"
+
 msgctxt "#31556"
 msgid "Live TV"
 msgstr "Телевизия"
@@ -223,3 +235,15 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Изтрий групата"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "За навигирането в Estouchy трябва да знаете 2 неща"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Логото на Kodi функционира като бутон водещ към началния екран."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Сега се възпроизвежда..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.cs_cz/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Pracuji..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Nedávné"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmy"
@@ -176,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Spravovat vaši knihovnu videa · Nastavit možnosti přehrávání videa · Změnit možnosti výpisu videa · Nastavit font titulků"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Spravuj hudební knihovnu · Nastav možnosti přehrávání hudby · Změň možnosti hudebních seznamů · Nastav odesílání skladeb"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Nastavit možnosti výpisu obrázků · Nastavit promítání"
@@ -220,6 +228,10 @@
 msgid "Add-on Shortcut"
 msgstr "Zkratka rozšíření"
 
+msgctxt "#31552"
+msgid "SYNC"
+msgstr "SYNCHRONIZUJ"
+
 msgctxt "#31553"
 msgid "Use Custom Background"
 msgstr "Použít vlastní pozadí"
@@ -228,6 +240,10 @@
 msgid "Background:"
 msgstr "Pozadí:"
 
+msgctxt "#31555"
+msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
+msgstr "Konfiguruj nastavení TV · Změň celoobrazovkové info · Spravuj nastaveni EPG"
+
 msgctxt "#31556"
 msgid "Live TV"
 msgstr "Televize"

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.de_de/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.en_us/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Working..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Recent"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Movies"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Login"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Updated:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "FAST FORWARD"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Download Subtitles"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletext"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skin default"
@@ -168,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Set picture listing options · Configure slideshows"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Select your Kodi user Profile[CR]to login and continue"
@@ -263,3 +283,23 @@
 msgctxt "#31565"
 msgid "Show deleted"
 msgstr "Show deleted"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "First Run"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "There are two things to know about navigating Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Now Playing Title..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.fr_ca/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.fr_fr/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.he_il/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.hu_hu/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Dolgozom..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Új"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmek"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Bejelentkezés"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Frissítve:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "ELŐRETEKERÉS"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Felirat letöltése"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletext"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Felszín alapértelmezése"
@@ -166,7 +178,11 @@
 
 msgctxt "#31401"
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
-msgstr "Filmkönyvtár beállítása · Filmlejátszási opciók · Filmlistázási opciók · Feliratok betűtípusa"
+msgstr "Filmkönyvtár kezelése · Filmlejátszási opciók · Filmlistázási opciók · Feliratok betűtípusa"
+
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Zenekönyvtár kezelése · Zenelejátszási opciók · Zenelistázási opciók · Zenebeküldés beállítása"
 
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Kijelző beállítása / kalibrálása · Hangkimenet beállítása · Távvzérlés beállítása · Energiagazdálkodási opciók · Debug · Mesterzár beállítása"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Telepített kiegészítők kezelése · Kiegészítők böngészése és telepítése a kodi.tv-ről · Kiegészítőbeállítások módosítása"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Az Kodi profilod kiválasztása[CR]bejelentkezéshez és folytatás"
@@ -255,3 +275,31 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Csoport törlése"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "Rejtettek megjelenítése"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "Töröltek megjelenítése"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Első indítás"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Két dolgot kell tudni az Estouchy navigációjáról"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "A Kodi logó „OTTHON” gombként működik. Amikor megérinted, viszzakerülsz a kezdőképernyőre."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Amikor hangot vagy videót játszol le, az elem címe a képernyő tetején jelenik meg. A megérintése a teljes képernyős vizualizációhoz vagy a videóablakhoz vezet."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Most játszott cím…"

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.it_it/strings.po Changed

@@ -34,7 +34,7 @@
 
 msgctxt "#31006"
 msgid "Visualization Presets"
-msgstr "Preset Visualizzazione"
+msgstr "Preset visualizzazione"
 
 msgctxt "#31007"
 msgid "Context Menu"
@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "In corso..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Recente"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Film"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Login"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Aggiornato:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "AVANZ. VELOCE"
@@ -78,7 +86,7 @@
 
 msgctxt "#31049"
 msgid "End Time"
-msgstr "Tempo Finale"
+msgstr "Termina alle"
 
 msgctxt "#31050"
 msgid "Sort: Ascending"
@@ -102,7 +110,7 @@
 
 msgctxt "#31058"
 msgid "System music files"
-msgstr "Files musicali di sistema"
+msgstr "File musicali di sistema"
 
 msgctxt "#31059"
 msgid "Current playlist"
@@ -122,7 +130,7 @@
 
 msgctxt "#31300"
 msgid "Current Temp"
-msgstr "Temperatura Corrente"
+msgstr "Temperatura attuale"
 
 msgctxt "#31301"
 msgid "Last Updated"
@@ -134,7 +142,7 @@
 
 msgctxt "#31309"
 msgid "Memory Used:"
-msgstr "Memoria Usata:"
+msgstr "Memoria usata:"
 
 msgctxt "#31320"
 msgid "Last Logged In"
@@ -142,19 +150,23 @@
 
 msgctxt "#31322"
 msgid "Aired"
-msgstr "In Onda"
+msgstr "Trasmessa"
 
 msgctxt "#31355"
 msgid "Video Menu"
-msgstr "Menu video"
+msgstr "Menu Video"
 
 msgctxt "#31356"
 msgid "Download Subtitles"
 msgstr "Scarica Sottotitoli"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletext"
+
 msgctxt "#31390"
 msgid "Skin default"
-msgstr "Skin di default"
+msgstr "Predefinito Skin"
 
 msgctxt "#31391"
 msgid "Arial based"
@@ -168,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Gestisci la tua Libreria Video · Cambia impostazioni di riproduzione dei video · Cambia impostazioni per le liste video · Imposta i fonts dei sottotitoli"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Gestisci la tua libreria musicale · Imposta le opzioni di riproduzione · Cambia le impostazioni per le liste audio · Imposta invio canzone"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Cambia impostazioni per le liste delle immagini · Configura lo slideshow"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Imposta e calibra il video · Configura l'uscita audio · Imposta i controllo remoti · Imposta le opzioni di risparmio energetico · Abilita il Debug · Imposta il master lock"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Gestisci i tuoi Add-on installati · Sfoglia e installa Add-on da kodi.tv · Modifica impostazioni Add-on"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Scegli il tuo profilo utente di Kodi[CR]per fare il login e continuare"
@@ -263,3 +283,23 @@
 msgctxt "#31565"
 msgid "Show deleted"
 msgstr "Mostra cancellati"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Primo avvio"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Ci sono due cose da sapere sulla navigazione in Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Il logo Kodi funziona come un pulsante 'HOME'. Ogni volta che lo tocchi, sarai riportato alla schermata home."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Mentre riproduci audio o video, il titolo dell'elemento apparirà in cima allo schermo. Toccandolo sarai portato alla visualizzazione a schermo intero o alla finestra del video."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Titolo in riproduzione..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.ms_my/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Berfungsi..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Baru-baru Ini"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Cereka"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Daftar Masuk"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Dikemaskini:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "MAJU PANTAS"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Muat Turun Sarikata"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teleteks"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Lalai Kulit"
@@ -168,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Urus pustaka video anda · Tetapkan pilihan main balik video · Ubah pilihan penyenaraian video · Tetapkan fon sarikata"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Urus pustaka muzik anda · Tetapkan pilihan main balik muzik · Ubah pilihan penyenaraian muzik · Pasang penyerahan lagu"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Tetapkan pilihan penyenaraian gambar · Konfigur paparan slaid"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Sedia dan tentukur paparan · Konfigur output audio · Persediaan kawalan jauh · Tetapkan pilihan penjimatan kuasa · Benarkan penyahpepijatan · Persediaan kunci master"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Urus tambahan terpasang anda · Layar dan pasang tambahan dari kodi.tv · Ubahsuai tetapan tambahan"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Pilih Profil pengguna Kodi anda[CR]untuk daftar masuk dan teruskan"
@@ -255,3 +275,31 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Padam Kumpulan"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "Tunjuk tersembunyi"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "Tunjuk dipadam"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Jalan Kali Pertama"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Terdapat dua perkara yang perlu diketahui berkenaan menavigasi Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Fungsi logo Kodi sebagai butang 'RUMAH'. Bilamana anda menyentuhnya, anda akan kembali ke skrin rumah."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Bila anda memainkan audio atau video, tajuk item akan muncul di bahagian atas skrin. Menyentuhnya akan membawa anda ke pengvisualan berskrin penuh atau tetingkap video."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Kini Memainkan Tajuk..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.nl_nl/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Bezig..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Recent"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Speelfilms"
@@ -66,7 +70,11 @@
 
 msgctxt "#31038"
 msgid "Login"
-msgstr "Log-in"
+msgstr "Inloggen"
+
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Geüpdated:"
 
 msgctxt "#31044"
 msgid "FAST FORWARD"
@@ -94,7 +102,7 @@
 
 msgctxt "#31056"
 msgid "Save playlist"
-msgstr "Save afspeellijst"
+msgstr "Bewaar afspeellijst"
 
 msgctxt "#31057"
 msgid "Close playlist"
@@ -126,11 +134,11 @@
 
 msgctxt "#31301"
 msgid "Last Updated"
-msgstr "Laatste update"
+msgstr "Laatst geüpdatet"
 
 msgctxt "#31303"
 msgid "Data provider"
-msgstr "Data provider"
+msgstr "Gegevens aanbieder"
 
 msgctxt "#31309"
 msgid "Memory Used:"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Ondertitels downloaden"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletekst"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Standaard Skin"
@@ -162,15 +174,19 @@
 
 msgctxt "#31400"
 msgid "Change the skin · Set language and region · Change file listing options · Set up a screensaver"
-msgstr "Verander je Skin · Instellen van Taal en Land · Verander bestandslijst opties · Stel een screensaver in"
+msgstr "Verander je Skin · Instellen van Taal en Land · Verander bestandslijst opties · Stel een schermbeveiliging in"
 
 msgctxt "#31401"
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
-msgstr "Manage je video bibliotheek · Afspeelopties voor Video · Verander videolijst opties · Stel ondertitel font in"
+msgstr "Beheer je video bibliotheek · Afspeelopties voor Video · Verander videolijst opties · Stel ondertitel lettertype in"
+
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Beheer uw muziekbibliotheek · Configureer muziekafspeelopties · Wijzig muziek lijst opties - Configureer nummer indienen"
 
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
-msgstr "Stel fotolijst opties in · Configureer diashow"
+msgstr "Stel fotolijst opties in · Configureer diavoorstelling"
 
 msgctxt "#31404"
 msgid "Set three cities to collect weather information"
@@ -178,15 +194,19 @@
 
 msgctxt "#31405"
 msgid "Setup control of Kodi via UPnP and HTTP · Configure file sharing · Set internet access options"
-msgstr "Instellingen voor bedienen Kodi via UPnP en HTTP  · nstellingen voor delen van bestanden · Internet instellingen"
+msgstr "Instellingen voor bedienen Kodi via UPnP en HTTP  · instellingen voor delen van bestanden · Internet instellingen"
 
 msgctxt "#31406"
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Instellen en kalibreren van scherm · Configureer geluidsuitgang · Instellen van afstandsbediening · Instellingen voor energiebesparing · Zet debugging aan · Instellingen voor vergrendeling"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Beheer uw geïnstalleerde add-ons · Zoek naar en installeer add-ons van Kodi.tv - Wijzig add-on instellingen"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
-msgstr "Kies je Kodi gebruikersprofiel[CR]om door te gaan"
+msgstr "Kies je Kodi gebruikersprofiel[CR]om in te loggen en door te gaan"
 
 msgctxt "#31500"
 msgid "Home Menu Catagory Buttons"
@@ -222,7 +242,7 @@
 
 msgctxt "#31555"
 msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
-msgstr "Configureer TV instellingen · Verander volledig scherm info · beer EPG data instellingen"
+msgstr "Configureer TV instellingen · Verander volledig scherm info · beheer EPG gegens instellingen"
 
 msgctxt "#31556"
 msgid "Live TV"
@@ -230,7 +250,7 @@
 
 msgctxt "#31557"
 msgid "Hide video background"
-msgstr "In achtergrond spelende video verbergen"
+msgstr "Verberg video achtergrond"
 
 msgctxt "#31558"
 msgid "Hide visualization background"
@@ -263,3 +283,23 @@
 msgctxt "#31565"
 msgid "Show deleted"
 msgstr "Toon verwijderde"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Eerste sessie"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Er zijn twee dingen om te weten over navigatie bij Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Het Kodi logo functioneert als een 'HOME' knop. Wanneer u deze aanraakt wordt u terug gebracht naar het startscherm."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Wanneer u audio of video afspeelt dan zal de item titel verschijnen bovenaan het scherm. Deze aanraken brengt u naar de scherm vullende weergave of video scherm."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Nu spelende titel..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.pl_pl/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Uruchamianie"
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Najnowsze"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmy"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Użytkownik"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Zaktualizowano:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "DO PRZODU"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Pobierz napisy"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletekst"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Domyślne dla skóry"
@@ -168,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Biblioteka wideo · Odtwarzanie · Akceleracja[CR]Listy wideo · Napisy"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Biblioteka muzyki · Odtwarzanie · Listy utworów  · CD-Audio"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Listy obrazów · Pokaz slajdów"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Wyświetlanie obrazu · Odtwarzanie dźwięku · Urządzenia wejściowe · Zdalne sterowanie · Oszczędzanie energii · Diagnostyka · Blokady"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Zarządzanie zainstalowanymi dodatkami · Przeglądanie i instalowanie dodatków · Ustawienia dodatków"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Wybierz profil użytkownika[CR]do zalogowania, aby kontynuować"
@@ -263,3 +283,7 @@
 msgctxt "#31565"
 msgid "Show deleted"
 msgstr "Pokazuj usunięte"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Pierwsze uruchomienie"

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.pt_br/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Trabalhando..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Recente"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmes"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Login"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Atualizado:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "Avanço Rápido"
@@ -172,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Gerencie sua coleção de vídeo · Definir opções de reprodução de vídeo · Alterar as opções de listagem Vídeo · Setar fontes para legendas"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Gerencia sua coleção de músicas - Ajustes as opções de reprodução de música - Altere as opções de listar músicas - Submenu ajustes de música"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Defina as opções de listagem de imagens · Configure slideshows"
@@ -188,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Configurar e calibrar displays · Configurar saída de áudio · Configurar controles remotos · Setar opções poupar energia · Ligar debugging · Configurar bloqueio Master"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Gerencie seus addons instalados. Navegue e instale addons via repositório do kodi.tv - Altere ajustes dos addons"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Selecione seu perfil de usuário no Kodi[CR] para logar-se e continuar"
@@ -259,3 +275,31 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Apagar Grupo"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "Mostrar oculto"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "Mostrar deletado"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Primeira execução"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "Existem 2 situações que precisam saber sobre como navegar na Estouchy"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "As funções do logotipo do Kodi atua como um botão \"HOME\". Sempre que você tocá-lo, você será levado de volta à tela inicial."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Quando você estiver reproduzindo áudio ou vídeo, o título do item aparece no topo da tela. Tocá-lo irá levá-lo para a visualização em tela cheia ou janela de vídeo."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Reproduzindo Agora Título..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.ro_ro/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.ru_ru/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.sk_sk/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Pracuje sa..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Nedávne"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmy"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Prihlasovavie meno"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Aktualizované:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "RÝCHLO VPRED"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Stiahnuť titulky"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teletext"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Predvolený vzhľad"
@@ -168,6 +180,10 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Spravovať zbierku videí · Nastaviť možnosti prehrávania videa · Zmeniť možnosti výpisu videí · Nastaviť font tituliek"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Správa hudobnej knižnice · Nastavenie volieb prehrávania hudby · Zmena volieb prehrávania hudby · Služby pre odosielanie informácií o prehrávaných skladbách"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Zmeniť možnosti výpisu obrázkov · Nastaviť prezentáciu"
@@ -184,6 +200,10 @@
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr "Nastaviť a kalibrovať obrazovku · Nastaviť zvukový výstup · Nastaviť diaľkové ovládanie · Nastaviť možnosti úspory energie · Povoliť ladenie · Nastaviť rodičovský zámok"
 
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Správa nainštalovaných doplnkov · Prezeranie a inštalácia doplnkov z kodi.tv · Úprava nastavení doplnkov"
+
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
 msgstr "Prihlásenie užívateľa[CR]Pokračujte výberom profilu"
@@ -208,10 +228,42 @@
 msgid "Add-on Shortcut"
 msgstr "Odkaz Rozšírení"
 
+msgctxt "#31552"
+msgid "SYNC"
+msgstr "SYNCHRONIZOVAŤ"
+
+msgctxt "#31553"
+msgid "Use Custom Background"
+msgstr "Použiť vlastné pozadie"
+
+msgctxt "#31554"
+msgid "Background:"
+msgstr "Pozadie:"
+
+msgctxt "#31555"
+msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
+msgstr "Upraviť nastavenia TV · Zmeniť informácie na celej obrazovke · Spravovať nastavenia údajov EPG"
+
 msgctxt "#31556"
 msgid "Live TV"
 msgstr "Živé TV vysielanie"
 
+msgctxt "#31557"
+msgid "Hide video background"
+msgstr "Skyť video v pozadí"
+
+msgctxt "#31558"
+msgid "Hide visualization background"
+msgstr "Skryť vizualizačné pozadie"
+
+msgctxt "#31559"
+msgid "Channel settings"
+msgstr "Nastavenia kanálov"
+
+msgctxt "#31560"
+msgid "Available groups"
+msgstr "Dostupné skupiny"
+
 msgctxt "#31561"
 msgid "Add Group"
 msgstr "Pridať skupinu"
@@ -223,3 +275,31 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Odstrániť skupinu"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "Ukázať skryté"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "Ukázať vymazané"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "Prvé spustenie"
+
+msgctxt "#31901"
+msgid "There are two things to know about navigating Estouchy"
+msgstr "O navigácii v Estouchy musíte vedieť dve veci"
+
+msgctxt "#31902"
+msgid "The Kodi logo functions as a 'HOME' button. Whenever you touch it, you will be taken back to the home screen."
+msgstr "Logo Kodi funguje ako tlačidlo „DOMOV“. Kedykoľvek sa ho dotknete, zobrazí sa domovská obrazovka."
+
+msgctxt "#31903"
+msgid "When you are playing audio or video, the item title will appear at the top of the screen. Touching it will take you to the fullscreen visualization or video window."
+msgstr "Počas prehrávania zvuku alebo videa sa v hornej časti obrazovky zobrazí názov prehrávaného prvku. Ak sa ho dotknete, aktivujete vizualizáciu na celej obrazovke alebo okno s prehrávaním videa."
+
+msgctxt "#31904"
+msgid "Now Playing Title..."
+msgstr "Práve sa prehráva titul..."

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.sr_rs@latin/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.sv_se/strings.po Changed

@@ -44,6 +44,10 @@
 msgid "Working..."
 msgstr "Arbetar..."
 
+msgctxt "#31011"
+msgid "Recent"
+msgstr "Senaste"
+
 msgctxt "#31013"
 msgid "Movies"
 msgstr "Filmer"
@@ -68,6 +72,10 @@
 msgid "Login"
 msgstr "Logga in"
 
+msgctxt "#31039"
+msgid "Updated:"
+msgstr "Uppdaterad:"
+
 msgctxt "#31044"
 msgid "FAST FORWARD"
 msgstr "SPOLA FRAMÅT"
@@ -152,6 +160,10 @@
 msgid "Download Subtitles"
 msgstr "Ladda ner undertexter"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Texttv"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Skalstandard"
@@ -212,6 +224,14 @@
 msgid "SYNC"
 msgstr "SYNKRONISERA"
 
+msgctxt "#31553"
+msgid "Use Custom Background"
+msgstr "Använd en anpassad bakgrund"
+
+msgctxt "#31554"
+msgid "Background:"
+msgstr "Bakgrund:"
+
 msgctxt "#31556"
 msgid "Live TV"
 msgstr "Live-TV"
@@ -220,6 +240,10 @@
 msgid "Hide video background"
 msgstr "Dölj videobakgrund"
 
+msgctxt "#31559"
+msgid "Channel settings"
+msgstr "Kanal-inställningar"
+
 msgctxt "#31560"
 msgid "Available groups"
 msgstr "Tillgängliga grupper"
@@ -235,3 +259,11 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Ta bort grupp"
+
+msgctxt "#31564"
+msgid "Show hidden"
+msgstr "Visa dolda"
+
+msgctxt "#31565"
+msgid "Show deleted"
+msgstr "Visa borttagna"

_service:download_url:master.tar.gz/addons/skin.estouchy/language/resource.language.tr_tr/strings.po Changed

@@ -26,7 +26,7 @@
 
 msgctxt "#31004"
 msgid "Caps[CR]Lock"
-msgstr "Caps[CR]Lock"
+msgstr "Büyük Harf[CR]Kilidi"
 
 msgctxt "#31005"
 msgid "Visualization Options"
@@ -38,7 +38,7 @@
 
 msgctxt "#31007"
 msgid "Context Menu"
-msgstr "Kabuk Menü"
+msgstr "İçerik Menüsü"
 
 msgctxt "#31009"
 msgid "Working..."
@@ -50,7 +50,7 @@
 
 msgctxt "#31014"
 msgid "Episodes"
-msgstr "Bölüm"
+msgstr "Bölümler"
 
 msgctxt "#31016"
 msgid "Albums"
@@ -152,6 +152,10 @@
 msgid "Download Subtitles"
 msgstr "Altyazıları İndir"
 
+msgctxt "#31358"
+msgid "Teletext"
+msgstr "Teleteks"
+
 msgctxt "#31390"
 msgid "Skin default"
 msgstr "Dış görünüm varsayılanı"
@@ -168,13 +172,17 @@
 msgid "Manage your video library · Set video playback options · Change video listing options · Set subtitle fonts"
 msgstr "Video kitaplığınızı yönetin · Video oynatma seçeneklerini belirle · Video listeleme seçeneklerini değiştir · Altyazı yazı tiplerini belirle"
 
+msgctxt "#31402"
+msgid "Manage your music library · Set music playback options · Change music listing options · Setup song submission"
+msgstr "Müzik kitaplığınızı yönetin · Müzik çalma seçeneklerini belirle · Müzik listeleme seçeneklerini değiştir · Şarkı gönderimini ayarla"
+
 msgctxt "#31403"
 msgid "Set picture listing options · Configure slideshows"
 msgstr "Fotoğraf listeleme seçeneklerini belirle · Slayt gösterilerini yapılandır"
 
 msgctxt "#31404"
 msgid "Set three cities to collect weather information"
-msgstr "Hava durumu bilgisi almak için üç şehir seçin"
+msgstr "Hava durumu bilgisi almak için üç şehir belirleyin"
 
 msgctxt "#31405"
 msgid "Setup control of Kodi via UPnP and HTTP · Configure file sharing · Set internet access options"
@@ -182,7 +190,11 @@
 
 msgctxt "#31406"
 msgid "Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
-msgstr "Ekranları kur ve kalibre et · Ses çıkışını yapılandır · Uzaktan yönetimi kur · Güç tasarruf seçeneklerini belirle · Hata ayıklamayı etkinleştir · Yönetici kilidini kur"
+msgstr "Ekranları kur ve ayarla · Ses çıkışını yapılandır · Uzaktan yönetimi kur · Güç tasarruf seçeneklerini belirle · Hata ayıklamayı etkinleştir · Yönetici kilidini kur"
+
+msgctxt "#31407"
+msgid "Manage your installed add-ons · Browse for and install add-ons from kodi.tv · Modify add-on settings"
+msgstr "Yüklü eklentilerinizi yönetin · kodi.tv sitesindeki uygulamalara gözatın ve yükleyin · Eklenti ayarlarını değiştirin"
 
 msgctxt "#31421"
 msgid "Select your Kodi user Profile[CR]to login and continue"
@@ -190,11 +202,11 @@
 
 msgctxt "#31500"
 msgid "Home Menu Catagory Buttons"
-msgstr "Ev Menüsü Kategori Butonları"
+msgstr "Ana Menü Kategori Düğmeleri"
 
 msgctxt "#31501"
 msgid "Home Page Add-on Quick Links"
-msgstr "Anasayfa Eklenti Hızlı Bağlantılar"
+msgstr "Giriş Sayfası Hızlı Eklenti Bağlantıları"
 
 msgctxt "#31502"
 msgid "Miscellaneous Options"
@@ -214,11 +226,11 @@
 
 msgctxt "#31553"
 msgid "Use Custom Background"
-msgstr "Özel Arkaplan Kullan"
+msgstr "Özel Arka Plan Kullan"
 
 msgctxt "#31554"
 msgid "Background:"
-msgstr "Arkaplan:"
+msgstr "Arka plan:"
 
 msgctxt "#31555"
 msgid "Configure TV settings · Change full screen info · Manage EPG data settings"
@@ -230,11 +242,11 @@
 
 msgctxt "#31557"
 msgid "Hide video background"
-msgstr "Video arkaplanı gizle"
+msgstr "Arka plan videoyu gizle"
 
 msgctxt "#31558"
 msgid "Hide visualization background"
-msgstr "Görselleştirme arkaplanını gizle"
+msgstr "Arka plan görselleştirmesini gizle"
 
 msgctxt "#31559"
 msgid "Channel settings"
@@ -255,3 +267,7 @@
 msgctxt "#31563"
 msgid "Delete Group"
 msgstr "Grubu Sil"
+
+msgctxt "#31900"
+msgid "First Run"
+msgstr "İlk Çalıştırma"

_service:download_url:master.tar.gz/addons/skin.estouchy/media/DefaultUser.png Added

_service:download_url:master.tar.gz/addons/skin.estouchy/media/defaulticons/DefaultAddonGame.png Added

_service:download_url:master.tar.gz/addons/skin.estouchy/media/defaulticons/DefaultAddonPeripheral.png Added

_service:download_url:master.tar.gz/addons/skin.estouchy/media/defaulticons/DefaultGameAddons.png Added

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/AddonBrowser.xml Changed

@@ -13,40 +13,40 @@
 			<description>Window label</description>
 			<include>MediaWindowTitleCommons</include>
 			<label>$LOCALIZE[24001]$INFO[Container.FolderName, - ]</label>
-			<visible>!StringCompare(ListItem.Path,addons://)</visible>
+			<visible>!String.IsEqual(ListItem.Path,addons://)</visible>
 		</control>
 		<control type="label">
 			<description>Window label</description>
 			<include>MediaWindowTitleCommons</include>
 			<label>$LOCALIZE[24001] - $LOCALIZE[31039] $INFO[Window(AddonBrowser).Property(Updated)]</label>
-			<visible>StringCompare(ListItem.Path,addons://)</visible>
+			<visible>String.IsEqual(ListItem.Path,addons://)</visible>
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="layout-width" value="306"/>
 			</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="layout-width" value="363"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1230"/>
 				<param name="label2-posx" value="1360r"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="790"/>
 				<param name="label2-posx" value="920r"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width-movies" value="1350"/>
 				<param name="textbox-width-episodes" value="1250"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width-movies" value="910"/>
 				<param name="textbox-width-episodes" value="810"/>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/CustomFirstRun.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogAddonInfo.xml Changed

@@ -194,7 +194,7 @@
 					<aligny>center</aligny>
 					<font>font20_title</font>
 					<textcolor>selected</textcolor>
-					<visible>IsEmpty(ListItem.AddonBroken)</visible>
+					<visible>String.IsEmpty(ListItem.AddonBroken)</visible>
 				</control>
 				<control type="textbox">
 					<description>Disclaimer</description>
@@ -206,7 +206,7 @@
 					<label fallback="231">$INFO[ListItem.AddonDisclaimer]</label>
 					<textcolor>selected</textcolor>
 					<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-					<visible>IsEmpty(ListItem.AddonBroken)</visible>
+					<visible>String.IsEmpty(ListItem.AddonBroken)</visible>
 				</control>
 				<control type="label">
 					<description>Broken label</description>
@@ -220,7 +220,7 @@
 					<aligny>center</aligny>
 					<font>font20_title</font>
 					<textcolor>selected</textcolor>
-					<visible>!IsEmpty(ListItem.AddonBroken)</visible>
+					<visible>!String.IsEmpty(ListItem.AddonBroken)</visible>
 				</control>
 				<control type="textbox">
 					<description>Reason label</description>
@@ -234,7 +234,7 @@
 					<aligny>center</aligny>
 					<textcolor>selected</textcolor>
 					<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-					<visible>!IsEmpty(ListItem.AddonBroken)</visible>
+					<visible>!String.IsEmpty(ListItem.AddonBroken)</visible>
 				</control>
 			</control>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogConfirm.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogExtendedProgressBar.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogGameControllers.xml Added

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+	<defaultcontrol always="true">3</defaultcontrol>
+	<include>16x9_xPos_Relocation</include>
+	<include>Window_OpenClose_Animation_Zoom</include>
+	<coordinates>
+		<posx>75</posx>
+		<posy>90</posy>
+	</coordinates>
+	<controls>
+		<include>BehindDialogFadeOut</include>
+		<control type="image">
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>1130</width>
+			<height>60</height>
+			<texture border="5">dialog_header.png</texture>
+		</control>
+		<control type="label">
+			<posx>20</posx>
+			<posy>0</posy>
+			<include>WindowTitleCommons</include>
+			<width>1130</width>
+			<label>$LOCALIZE[35058]</label>
+		</control>
+		<control type="group">
+			<posx>1060</posx>
+			<posy>0</posy>
+			<include>DialogCloseButtonCommons</include>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>60</posy>
+			<width>1130</width>
+			<height>720</height>
+			<texture>dialog_back.png</texture>
+		</control>
+		<control type="label">
+			<posx>0</posx>
+			<posy>60</posy>
+			<width>300</width>
+			<height>50</height>
+			<label>35050</label>
+			<font>font25</font>
+			<align>center</align>
+			<aligny>center</aligny>
+		</control>
+		<control type="image">
+			<posx>0</posx>
+			<posy>110</posy>
+			<width>300</width>
+			<height>552</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="grouplist" id="3">
+			<posx>0</posx>
+			<posy>110</posy>
+			<width>300</width>
+			<height>553</height>
+			<pagecontrol>60</pagecontrol>
+			<itemgap>-1</itemgap>
+			<onleft>5</onleft>
+			<onright>60</onright>
+			<onup>9000</onup>
+			<ondown>9000</ondown>
+		</control>
+		<control type="button" id="10">
+			<posx>0</posx>
+			<posy>0</posy>
+			<height>70</height>
+			<font>font25</font>
+		</control>
+		<control type="scrollbar" id="60">
+			<posx>310</posx>
+			<posy>140</posy>
+			<width>10</width>
+			<height>493</height>
+			<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
+			<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
+			<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
+			<textureslidernib>blank.png</textureslidernib>
+			<textureslidernibfocus>blank.png</textureslidernibfocus>
+			<onleft>3</onleft>
+			<onright>5</onright>
+			<ondown>60</ondown>
+			<onup>60</onup>
+			<showonepage>false</showonepage>
+			<orientation>vertical</orientation>
+			<animation effect="fade" time="150">Visible</animation>
+			<animation effect="fade" time="150">Hidden</animation>
+		</control>
+		<control type="gamecontroller" id="31">
+			<left>340</left>
+			<top>150</top>
+			<width>450</width>
+			<height>286</height>
+			<include>VisibleFadeEffect</include>
+		</control>
+		<control type="label">
+			<posx>800</posx>
+			<posy>60</posy>
+			<width>300</width>
+			<height>50</height>
+			<label>35059</label>
+			<font>font25</font>
+			<align>center</align>
+			<aligny>center</aligny>
+		</control>
+		<control type="image">
+			<posx>800</posx>
+			<posy>110</posy>
+			<width>300</width>
+			<height>552</height>
+			<texture colordiffuse="40000000">panel.png</texture>
+		</control>
+		<control type="grouplist" id="5">
+			<posx>800</posx>
+			<posy>110</posy>
+			<width>300</width>
+			<height>553</height>
+			<pagecontrol>61</pagecontrol>
+			<itemgap>-1</itemgap>
+			<onleft>3</onleft>
+			<onright>61</onright>
+			<onup>9000</onup>
+			<ondown>9000</ondown>
+		</control>
+		<control type="button" id="7">
+			<posx>0</posx>
+			<posy>0</posy>
+			<height>70</height>
+			<font>font25</font>
+		</control>
+		<control type="scrollbar" id="61">
+			<posx>1110</posx>
+			<posy>140</posy>
+			<width>10</width>
+			<height>493</height>
+			<texturesliderbackground colordiffuse="30FFFFFF">white.png</texturesliderbackground>
+			<texturesliderbar colordiffuse="grey">white.png</texturesliderbar>
+			<texturesliderbarfocus colordiffuse="blue">white.png</texturesliderbarfocus>
+			<textureslidernib>blank.png</textureslidernib>
+			<textureslidernibfocus>blank.png</textureslidernibfocus>
+			<onleft>5</onleft>
+			<onright>3</onright>
+			<ondown>60</ondown>
+			<onup>60</onup>
+			<showonepage>false</showonepage>
+			<orientation>vertical</orientation>
+			<animation effect="fade" time="150">Visible</animation>
+			<animation effect="fade" time="150">Hidden</animation>
+		</control>
+		<control type="grouplist" id="9000">
+			<posx>0</posx>
+			<posy>710</posy>
+			<width>1130</width>
+			<height>60</height>
+			<itemgap>5</itemgap>
+			<align>center</align>
+			<orientation>horizontal</orientation>
+			<onup>3</onup>
+			<ondown>3</ondown>
+			<control type="button" id="18">
+				<description>OK button</description>
+				<width>200</width>
+				<include>ButtonInfoDialogsCommonValues</include>
+				<label>186</label>
+			</control>
+			<control type="button" id="19">
+				<description>Reset button</description>
+				<width>200</width>
+				<include>ButtonInfoDialogsCommonValues</include>
+				<label>10035</label>
+			</control>
+			<control type="button" id="20">
+				<description>More</description>
+				<width>200</width>
+				<include>ButtonInfoDialogsCommonValues</include>
+				<label>21452</label>
+			</control>
+			<control type="button" id="17">
+				<description>Help button</description>
+				<width>200</width>
+				<include>ButtonInfoDialogsCommonValues</include>
+				<label>10043</label>
+			</control>
+		</control>
+	</controls>
+</window>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogMusicInfo.xml Changed

@@ -122,109 +122,109 @@
 						<label>$LOCALIZE[557]:</label>
 						<label2>$INFO[ListItem.Artist]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Artist)</visible>
+						<visible>!String.IsEmpty(ListItem.Artist)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[558]:</label>
 						<label2>$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Album)</visible>
+						<visible>!String.IsEmpty(ListItem.Album)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[175]:</label>
 						<label2>$INFO[ListItem.Mood]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Mood)</visible>
+						<visible>!String.IsEmpty(ListItem.Mood)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[562]:</label>
 						<label2>$INFO[ListItem.Year]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Year)</visible>
+						<visible>!String.IsEmpty(ListItem.Year)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[554]:</label>
 						<label2>$INFO[ListItem.TrackNumber]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.TrackNumber)</visible>
+						<visible>!String.IsEmpty(ListItem.TrackNumber)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[563]:</label>
 						<label2>$INFO[ListItem.RatingAndVotes]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
+						<visible>!String.IsEmpty(ListItem.RatingAndVotes)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38018]:</label>
 						<label2>$INFO[ListItem.Userrating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Userrating)</visible>
+						<visible>!String.IsEmpty(ListItem.Userrating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[29903]:</label>
 						<label2>$INFO[ListItem.Property(Role.Composer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Composer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Composer))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[29905]:</label>
 						<label2>$INFO[ListItem.Property(Role.Conductor)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Conductor))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Conductor))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38034]:</label>
 						<label2>$INFO[ListItem.Property(Role.Orchestra)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Orchestra))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Orchestra))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38035]:</label>
 						<label2>$INFO[ListItem.Property(Role.Lyricist)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Lyricist))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Lyricist))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38036]:</label>
 						<label2>$INFO[ListItem.Property(Role.Remixer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Remixer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Remixer))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38037]:</label>
 						<label2>$INFO[ListItem.Property(Role.Arranger)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Arranger))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Arranger))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38038]:</label>
 						<label2>$INFO[ListItem.Property(Role.Engineer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Engineer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Engineer))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38039]:</label>
 						<label2>$INFO[ListItem.Property(Role.Producer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Producer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Producer))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38040]:</label>
 						<label2>$INFO[ListItem.Property(Role.DJMixer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.DJMixer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.DJMixer))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38041]:</label>
 						<label2>$INFO[ListItem.Property(Role.Mixer)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Role.Mixer))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Role.Mixer))</visible>
 					</item>
 				</content>
 			</control>
@@ -342,49 +342,49 @@
 						<label>$LOCALIZE[557]:</label>
 						<label2>$INFO[ListItem.Artist]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Artist)</visible>
+						<visible>!String.IsEmpty(ListItem.Artist)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[563]:</label>
 						<label2>$INFO[ListItem.Rating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Rating)</visible>
+						<visible>!String.IsEmpty(ListItem.Rating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[175]:</label>
 						<label2>$INFO[ListItem.Property(Album_Mood)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Album_Mood))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Album_Mood))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[176]:</label>
 						<label2>$INFO[ListItem.Property(Album_Style)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Album_Style))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Album_Style))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21895]:</label>
 						<label2>$INFO[ListItem.Property(Album_Theme)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Album_Theme))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Album_Theme))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21899]:</label>
 						<label2>$INFO[ListItem.Property(Album_Label)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Album_Label))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Album_Label))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[562]:</label>
 						<label2>$INFO[ListItem.Year]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Year)</visible>
+						<visible>!String.IsEmpty(ListItem.Year)</visible>
 					</item>
 				</content>
 			</control>
@@ -502,49 +502,49 @@
 						<label>$LOCALIZE[21893]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Born)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Born))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Born))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21894]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Formed)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Formed))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Formed))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[175]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Mood)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Mood))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Mood))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[176]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Style)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Style))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Style))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21897]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Died)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Died))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Died))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21896]:</label>
 						<label2>$INFO[ListItem.Property(Artist_Disbanded)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_Disbanded))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_Disbanded))</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[21898]:</label>
 						<label2>$INFO[ListItem.Property(Artist_YearsActive)]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Property(Artist_YearsActive))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Artist_YearsActive))</visible>
 					</item>
 				</content>
 			</control>
@@ -561,7 +561,7 @@
 			<pagecontrol>-</pagecontrol>
 			<scrolltime>200</scrolltime>
 			<include>VisibleFadeEffect</include>
-			<visible>[Container.Content(Artists) + !IsEmpty(Window.Property(ShowAlbumList))] | [Container.Content(Albums) + !IsEmpty(Window.Property(ShowSongList))]</visible>
+			<visible>[Container.Content(Artists) + !String.IsEmpty(Window.Property(ShowAlbumList))] | [Container.Content(Albums) + !String.IsEmpty(Window.Property(ShowSongList))]</visible>
 			<itemlayout condition="Container.Content(Albums)" height="60" width="1000">
 				<control type="image">
 					<posx>0</posx>
@@ -712,9 +712,9 @@
 				<alttexturenofocus>button_nofocus.png</alttexturenofocus>
 				<label>21888</label>
 				<altlabel>19033</altlabel>
-				<usealttexture>!IsEmpty(Window.Property(ShowAlbumList))</usealttexture>
-				<onclick condition="IsEmpty(Window.Property(ShowAlbumList))">SetProperty(ShowAlbumList, show)</onclick>
-				<onclick condition="!IsEmpty(Window.Property(ShowAlbumList))">ClearProperty(ShowAlbumList)</onclick>
+				<usealttexture>!String.IsEmpty(Window.Property(ShowAlbumList))</usealttexture>
+				<onclick condition="String.IsEmpty(Window.Property(ShowAlbumList))">SetProperty(ShowAlbumList, show)</onclick>
+				<onclick condition="!String.IsEmpty(Window.Property(ShowAlbumList))">ClearProperty(ShowAlbumList)</onclick>
 				<visible>Container.Content(Artists)</visible>
 			</control>
 			<control type="togglebutton" id="900">
@@ -725,9 +725,9 @@
 				<alttexturenofocus>button_nofocus.png</alttexturenofocus>
 				<label>182</label>
 				<altlabel>19033</altlabel>
-				<usealttexture>!IsEmpty(Window.Property(ShowSongList))</usealttexture>
-				<onclick condition="IsEmpty(Window.Property(ShowSongList))">SetProperty(ShowSongList, show)</onclick>
-				<onclick condition="!IsEmpty(Window.Property(ShowSongList))">ClearProperty(ShowSongList)</onclick>
+				<usealttexture>!String.IsEmpty(Window.Property(ShowSongList))</usealttexture>
+				<onclick condition="String.IsEmpty(Window.Property(ShowSongList))">SetProperty(ShowSongList, show)</onclick>
+				<onclick condition="!String.IsEmpty(Window.Property(ShowSongList))">ClearProperty(ShowSongList)</onclick>
 				<visible>Container.Content(Albums)</visible>
 			</control>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogNotification.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogPVRChannelManager.xml Changed

@@ -22,7 +22,7 @@
 			<include>WindowTitleCommons</include>
 			<width>1130</width>
 			<label>$LOCALIZE[19199] - $LOCALIZE[19023]</label>
-			<visible>IsEmpty(Window.Property(IsRadio))</visible>
+			<visible>String.IsEmpty(Window.Property(IsRadio))</visible>
 		</control>
 		<control type="label">
 			<posx>20</posx>
@@ -30,7 +30,7 @@
 			<include>WindowTitleCommons</include>
 			<width>1130</width>
 			<label>$LOCALIZE[19199] - $LOCALIZE[19024]</label>
-			<visible>!IsEmpty(Window.Property(IsRadio))</visible>
+			<visible>!String.IsEmpty(Window.Property(IsRadio))</visible>
 		</control>
 		<control type="group">
 			<posx>1060</posx>
@@ -269,7 +269,7 @@
 				<description>TV/Radio Button</description>
 				<width>250</width>
 				<include>ButtonInfoDialogsCommonValues</include>
-				<usealttexture>!IsEmpty(Window.Property(IsRadio))</usealttexture>
+				<usealttexture>!String.IsEmpty(Window.Property(IsRadio))</usealttexture>
 				<alttexturefocus>list_focus.png</alttexturefocus>
 				<alttexturenofocus>button_nofocus.png</alttexturenofocus>
 				<label>19024</label>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogPVRGroupManager.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogPVRRadioRDSInfo.xml Changed

@@ -107,115 +107,115 @@
 					<label>$LOCALIZE[557]:</label>
 					<label2>$INFO[RDS.Artist]</label2>
 					<onclick>noop</onclick>
-					<visible>IsEmpty(RDS.Band)</visible>
+					<visible>String.IsEmpty(RDS.Band)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29901]:</label>
 					<label2>$INFO[RDS.Band]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Band)</visible>
+					<visible>!String.IsEmpty(RDS.Band)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[556]:</label>
 					<label2>$INFO[RDS.Title]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Title)</visible>
+					<visible>!String.IsEmpty(RDS.Title)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[558]:</label>
 					<label2>$INFO[RDS.Album]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Album)</visible>
+					<visible>!String.IsEmpty(RDS.Album)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[569]:</label>
 					<label2>$INFO[RDS.Comment]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Comment)</visible>
+					<visible>!String.IsEmpty(RDS.Comment)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29903]:</label>
 					<label2>$INFO[RDS.Composer]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Composer)</visible>
+					<visible>!String.IsEmpty(RDS.Composer)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29905]:</label>
 					<label2>$INFO[RDS.Conductor]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.Conductor)</visible>
+					<visible>!String.IsEmpty(RDS.Conductor)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29902]:</label>
 					<label2>$INFO[RDS.ProgStyle]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgStyle)</visible>
+					<visible>!String.IsEmpty(RDS.ProgStyle)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29906]:</label>
 					<label2>$INFO[RDS.ProgHost]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgHost)</visible>
+					<visible>!String.IsEmpty(RDS.ProgHost)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[19148]:</label>
 					<label2>$INFO[RDS.ProgStation]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgStation)</visible>
+					<visible>!String.IsEmpty(RDS.ProgStation)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29907]:</label>
 					<label2>$INFO[RDS.ProgEditStaff]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgEditStaff)</visible>
+					<visible>!String.IsEmpty(RDS.ProgEditStaff)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[19030]:</label>
 					<label2>$INFO[RDS.ProgNow]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgNow)</visible>
+					<visible>!String.IsEmpty(RDS.ProgNow)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[19031]:</label>
 					<label2>$INFO[RDS.ProgNext]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgNext)</visible>
+					<visible>!String.IsEmpty(RDS.ProgNext)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29910]:</label>
 					<label2>$INFO[RDS.PhoneStudio]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.PhoneStudio)</visible>
+					<visible>!String.IsEmpty(RDS.PhoneStudio)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29911]:</label>
 					<label2>$INFO[RDS.EmailStudio]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.EmailStudio)</visible>
+					<visible>!String.IsEmpty(RDS.EmailStudio)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29912]:</label>
 					<label2>$INFO[RDS.SMSStudio]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.SMSStudio)</visible>
+					<visible>!String.IsEmpty(RDS.SMSStudio)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29914]:</label>
 					<label2>$INFO[RDS.ProgHomepage]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.ProgHomepage)</visible>
+					<visible>!String.IsEmpty(RDS.ProgHomepage)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29910]:</label>
 					<label2>$INFO[RDS.PhoneHotline]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.PhoneHotline)</visible>
+					<visible>!String.IsEmpty(RDS.PhoneHotline)</visible>
 				</item>
 				<item>
 					<label>$LOCALIZE[29911]:</label>
 					<label2>$INFO[RDS.EmailHotline]</label2>
 					<onclick>noop</onclick>
-					<visible>!IsEmpty(RDS.EmailHotline)</visible>
+					<visible>!String.IsEmpty(RDS.EmailHotline)</visible>
 				</item>
 			</content>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/DialogVideoInfo.xml Changed

@@ -173,67 +173,67 @@
 						<label>$LOCALIZE[20339]:</label>
 						<label2>$INFO[ListItem.Director]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Director)</visible>
+						<visible>!String.IsEmpty(ListItem.Director)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20417]:</label>
 						<label2>$INFO[ListItem.Writer]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Writer)</visible>
+						<visible>!String.IsEmpty(ListItem.Writer)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[572]:</label>
 						<label2>$INFO[ListItem.Studio]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Studio)</visible>
+						<visible>!String.IsEmpty(ListItem.Studio)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[562]:</label>
 						<label2>$INFO[ListItem.Year]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Year)</visible>
+						<visible>!String.IsEmpty(ListItem.Year)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[2050]:</label>
 						<label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Duration)</visible>
+						<visible>!String.IsEmpty(ListItem.Duration)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[563]:</label>
 						<label2>$INFO[ListItem.RatingAndVotes]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
+						<visible>!String.IsEmpty(ListItem.RatingAndVotes)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38018]:</label>
 						<label2>$INFO[ListItem.UserRating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.UserRating)</visible>
+						<visible>!String.IsEmpty(ListItem.UserRating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[202]:</label>
 						<label2>$INFO[ListItem.TagLine]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.TagLine)</visible>
+						<visible>!String.IsEmpty(ListItem.TagLine)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20074]:</label>
 						<label2>$INFO[ListItem.mpaa]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.mpaa)</visible>
+						<visible>!String.IsEmpty(ListItem.mpaa)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[15311]</label>
 						<label2>$INFO[ListItem.FilenameAndPath]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
+						<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
 					</item>
 				</content>
 			</control>
@@ -302,43 +302,43 @@
 						<label>$LOCALIZE[20360]:</label>
 						<label2>$INFO[listitem.episode] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Episode)</visible>
+						<visible>!String.IsEmpty(ListItem.Episode)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[31322]:</label>
 						<label2>$INFO[ListItem.Premiered]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Premiered)</visible>
+						<visible>!String.IsEmpty(ListItem.Premiered)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[562]:</label>
 						<label2>$INFO[ListItem.Year]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Year)</visible>
+						<visible>!String.IsEmpty(ListItem.Year)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[563]:</label>
 						<label2>$INFO[ListItem.Rating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Rating)</visible>
+						<visible>!String.IsEmpty(ListItem.Rating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38018]:</label>
 						<label2>$INFO[ListItem.UserRating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.UserRating)</visible>
+						<visible>!String.IsEmpty(ListItem.UserRating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[15311]</label>
 						<label2>$INFO[ListItem.FilenameAndPath]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
+						<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
 					</item>
 				</content>
 			</control>
@@ -407,67 +407,67 @@
 						<label>$LOCALIZE[20364]:</label>
 						<label2>$INFO[ListItem.TVShowTitle]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.TVShowTitle)</visible>
+						<visible>!String.IsEmpty(ListItem.TVShowTitle)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20373]:</label>
 						<label2>$INFO[ListItem.Season]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Season)</visible>
+						<visible>!String.IsEmpty(ListItem.Season)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20359]:</label>
 						<label2>$INFO[ListItem.Episode]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Episode)</visible>
+						<visible>!String.IsEmpty(ListItem.Episode)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[31322]:</label>
 						<label2>$INFO[ListItem.Premiered]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Premiered)</visible>
+						<visible>!String.IsEmpty(ListItem.Premiered)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20339]:</label>
 						<label2>$INFO[ListItem.Director]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Director)</visible>
+						<visible>!String.IsEmpty(ListItem.Director)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20417]:</label>
 						<label2>$INFO[ListItem.Writer]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Writer)</visible>
+						<visible>!String.IsEmpty(ListItem.Writer)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[2050]:</label>
 						<label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Duration)</visible>
+						<visible>!String.IsEmpty(ListItem.Duration)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[563]:</label>
 						<label2>$INFO[ListItem.Rating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Rating)</visible>
+						<visible>!String.IsEmpty(ListItem.Rating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38018]:</label>
 						<label2>$INFO[ListItem.UserRating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.UserRating)</visible>
+						<visible>!String.IsEmpty(ListItem.UserRating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[15311]</label>
 						<label2>$INFO[ListItem.FilenameAndPath]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
+						<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
 					</item>
 				</content>
 			</control>
@@ -536,61 +536,61 @@
 						<label>$LOCALIZE[557]:</label>
 						<label2>$INFO[ListItem.Artist]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Artist)</visible>
+						<visible>!String.IsEmpty(ListItem.Artist)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[558]:</label>
 						<label2>$INFO[ListItem.Album]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Album)</visible>
+						<visible>!String.IsEmpty(ListItem.Album)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[515]:</label>
 						<label2>$INFO[ListItem.Genre]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Genre)</visible>
+						<visible>!String.IsEmpty(ListItem.Genre)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[572]:</label>
 						<label2>$INFO[ListItem.Studio]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Studio)</visible>
+						<visible>!String.IsEmpty(ListItem.Studio)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20417]:</label>
 						<label2>$INFO[ListItem.Writer]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Writer)</visible>
+						<visible>!String.IsEmpty(ListItem.Writer)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[20339]:</label>
 						<label2>$INFO[ListItem.Director]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Director)</visible>
+						<visible>!String.IsEmpty(ListItem.Director)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[562]:</label>
 						<label2>$INFO[ListItem.Year]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Year)</visible>
+						<visible>!String.IsEmpty(ListItem.Year)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[2050]:</label>
 						<label2>$INFO[ListItem.Duration] $LOCALIZE[12391]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.Duration)</visible>
+						<visible>!String.IsEmpty(ListItem.Duration)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[38018]:</label>
 						<label2>$INFO[ListItem.UserRating]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.UserRating)</visible>
+						<visible>!String.IsEmpty(ListItem.UserRating)</visible>
 					</item>
 					<item>
 						<label>$LOCALIZE[15311]</label>
 						<label2>$INFO[ListItem.FilenameAndPath]</label2>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(ListItem.FilenameAndPath)</visible>
+						<visible>!String.IsEmpty(ListItem.FilenameAndPath)</visible>
 					</item>
 				</content>
 			</control>
@@ -713,7 +713,7 @@
 				<width>195</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<label>20410</label>
-				<visible>!IsEmpty(ListItem.Trailer)</visible>
+				<visible>!String.IsEmpty(ListItem.Trailer)</visible>
 			</control>
 			<control type="button" id="7">
 				<description>Rating button</description>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/EventLog.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/Home.xml Changed

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
-	<onload condition="IsEmpty(Skin.String(FirstRun))">ActivateWindow(1111)</onload>
+	<onload condition="String.IsEmpty(Skin.String(FirstRun))">ActivateWindow(1111)</onload>
 	<controls>
 		<control type="label">
 			<posx>-10</posx>
@@ -16,8 +16,8 @@
 		<include>Footer</include>
 		<control type="group">
 			<include>Window_OpenClose_Animation</include>
-			<animation effect="slide" start="0,0" end="106,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
-			<visible>Library.HasContent(Movies) | Library.HasContent(TVShows) | Library.HasContent(Music) | IntegerGreaterThan(Container(2400).NumItems,0)</visible>
+			<animation effect="slide" start="0,0" end="106,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
+			<visible>Library.HasContent(Movies) | Library.HasContent(TVShows) | Library.HasContent(Music) | Integer.IsGreater(Container(2400).NumItems,0)</visible>
 			<control type="button">
 				<posx>509r</posx>
 				<posy>120</posy>
@@ -122,15 +122,15 @@
 						<onclick>Control.Move(9010,1)</onclick>
 						<icon>-</icon>
 						<thumb>-</thumb>
-						<visible>IntegerGreaterThan(Container(2400).NumItems,0)</visible>
+						<visible>Integer.IsGreater(Container(2400).NumItems,0)</visible>
 					</item>
 				</content>
 			</control>
 		</control>
 		<control type="group">
-			<animation effect="slide" start="0,0" end="212,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !IntegerGreaterThan(Container(2400).NumItems,0)">Conditional</animation>
-			<animation effect="slide" start="0,0" end="323,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !IntegerGreaterThan(Container(2400).NumItems,0)">Conditional</animation>
-			<include condition="StringCompare(Skin.AspectRatio,16:9)" name="HomeMenu">
+			<animation effect="slide" start="0,0" end="212,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation>
+			<animation effect="slide" start="0,0" end="323,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + !Library.HasContent(Movies) + !Library.HasContent(TVShows) + !Library.HasContent(Music) + !Integer.IsGreater(Container(2400).NumItems,0)">Conditional</animation>
+			<include condition="String.IsEqual(Skin.AspectRatio,16:9)" name="HomeMenu">
 				<param name="panel-width">1000</param>
 				<param name="layout-width">500</param>
 				<param name="list-width">480</param>
@@ -142,7 +142,7 @@
 				<param name="iconback-posx">383</param>
 				<param name="iconback-width">98</param>
 			</include>
-			<include condition="StringCompare(Skin.AspectRatio,4:3)" name="HomeMenu">
+			<include condition="String.IsEqual(Skin.AspectRatio,4:3)" name="HomeMenu">
 				<param name="panel-width">832</param>
 				<param name="layout-width">416</param>
 				<param name="list-width">400</param>
@@ -160,9 +160,9 @@
 				<posy>185r</posy>
 				<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation>
 				<animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation>
-				<animation effect="slide" start="0,0" end="60,0" time="0" condition="StringCompare(Container(9002).NumItems,4)">conditional</animation>
-				<animation effect="slide" start="0,0" end="120,0" time="0" condition="StringCompare(Container(9002).NumItems,3)">conditional</animation>
-				<animation effect="slide" start="0,0" end="-100,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="60,0" time="0" condition="String.IsEqual(Container(9002).NumItems,4)">conditional</animation>
+				<animation effect="slide" start="0,0" end="120,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation>
+				<animation effect="slide" start="0,0" end="-100,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 				<width>802</width>
 				<height>120</height>
 				<onleft>9002</onleft>
@@ -218,7 +218,7 @@
 						<label>20126</label>
 						<onclick>System.LogOff</onclick>
 						<icon>icon_button_logoff.png</icon>
-						<visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
+						<visible>System.HasLoginScreen | Integer.IsGreater(System.ProfileCount,1)</visible>
 					</item>
 					<item>
 						<label>5</label>
@@ -244,11 +244,11 @@
 				</content>
 			</control>
 		</control>
-		<include condition="StringCompare(Skin.AspectRatio,16:9)" name="HomeRecentlyAddedInfo">
+		<include condition="String.IsEqual(Skin.AspectRatio,16:9)" name="HomeRecentlyAddedInfo">
 			<param name="group-posx">640r</param>
 			<param name="panel-width">630</param>
 		</include>
-		<include condition="StringCompare(Skin.AspectRatio,4:3)" name="HomeRecentlyAddedInfo">
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)" name="HomeRecentlyAddedInfo">
 			<param name="group-posx">430r</param>
 			<param name="panel-width">420</param>
 		</include>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/Includes.xml Changed

@@ -45,8 +45,8 @@
 		<value condition="Window.IsVisible(VideoOSD)">$LOCALIZE[31049] $INFO[Player.FinishTime]</value>
 	</variable>
 	<variable name="PosterThumb">
-		<value condition="!IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
-		<value condition="IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Art(poster)]</value>
+		<value condition="String.IsEmpty(ListItem.Art(poster))">$INFO[ListItem.Icon]</value>
 	</variable>
 	<variable name="PVRListLabel">
 		<value condition="![Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)]">$INFO[ListItem.Label]</value>
@@ -75,7 +75,7 @@
 		<value condition="Player.Seeking + !Player.DisplayAfterSeek">[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</value>
 		<value condition="Player.Seeking">$INFO[Player.SeekTime]</value>
 		<value condition="Player.DisplayAfterSeek + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekOffset]</value>
-		<value condition="!IsEmpty(Player.SeekStepSize) + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekStepSize]</value>
+		<value condition="!String.IsEmpty(Player.SeekStepSize) + ![Player.Forwarding | Player.Rewinding]">[UPPERCASE]$LOCALIZE[773][/UPPERCASE] $INFO[Player.SeekStepSize]</value>
 	</variable>
 	<variable name="Speed">
 		<value condition="Player.Forwarding2x | Player.Rewinding2x">2x</value>
@@ -90,8 +90,8 @@
 	</variable>
 
 	<include name="ScreenWidth">
-		<include condition="StringCompare(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include>
-		<include condition="StringCompare(Skin.AspectRatio,4:3)">ScreenWidth-4x3</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,16:9)">ScreenWidth-16x9</include>
+		<include condition="String.IsEqual(Skin.AspectRatio,4:3)">ScreenWidth-4x3</include>
 	</include>
 
 	<include name="ScreenWidth-16x9">
@@ -183,7 +183,7 @@
 			<texture>black.png</texture>
 			<colordiffuse>70000000</colordiffuse>
 			<include>VisibleFadeEffect</include>
-			<visible>[!IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible>
+			<visible>[!String.IsEmpty(ListItem.Art(fanart)) + !Player.HasMedia] | [!Skin.HasSetting(HideVizBackground) + Player.HasAudio] | [!Skin.HasSetting(HideVideoBackground) + Player.HasVideo + !Window.IsVisible(TVChannels) + !Window.IsVisible(RadioChannels) + !Window.IsVisible(TVGuide) + !Window.IsVisible(RadioGuide) + !Window.IsVisible(TVSearch) + !Window.IsVisible(RadioSearch) + !Window.IsVisible(TVTimers) + !Window.IsVisible(RadioTimers) + !Window.IsVisible(TVTimerRules) + !Window.IsVisible(RadioTimerRules) + !Window.IsVisible(TVRecordings) + !Window.IsVisible(RadioRecordings)]</visible>
 		</control>
 	</include>
 	<include name="Header">
@@ -226,7 +226,7 @@
 			<texturefocus>-</texturefocus>
 			<texturenofocus>-</texturenofocus>
 			<onclick>ActivateWindow(weather)</onclick>
-			<visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
+			<visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
 		</control>
 		<control type="grouplist">
 			<include>VisibleFadeEffect</include>
@@ -304,7 +304,7 @@
 			<aligny>center</aligny>
 			<textoffsetx>0</textoffsetx>
 			<label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label>
-			<visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
+			<visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
 		</control>
 		<control type="image">
 			<description>Weather</description>
@@ -314,7 +314,7 @@
 			<aspectratio align="left">keep</aspectratio>
 			<texture colordiffuse="blue">weather/$INFO[Window(Weather).Property(Current.FanartCode)].png</texture>
 			<animation effect="fade" time="300">VisibleChange</animation>
-			<visible>!IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
+			<visible>!String.IsEmpty(Window(Weather).Property(Current.Temperature)) + !Player.HasMedia</visible>
 		</control>
 	</include>
 	<include name="BehindDialogFadeOut">
@@ -355,7 +355,7 @@
 			<visible>Control.IsVisible(60) + ![[Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)] + Control.IsVisible(10)]</visible>
 			<animation effect="slide" start="40,0" end="0,0" time="400">Visible</animation>
 			<animation effect="slide" start="0,0" end="40,0" time="400">Hidden</animation>
-			<animation effect="slide" start="0,0" end="-7,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+			<animation effect="slide" start="0,0" end="-7,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 			<control type="scrollbar" id="60">
 				<posx>8</posx>
 				<posy>40</posy>
@@ -450,8 +450,8 @@
 				</item>
 				<item>
 					<label>5</label>
-					<onclick condition="IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick>
-					<onclick condition="!IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick>
+					<onclick condition="String.IsEmpty(Window(Home).Property(PopupMenuVisible))">SetProperty(PopupMenuVisible,Show,Home)</onclick>
+					<onclick condition="!String.IsEmpty(Window(Home).Property(PopupMenuVisible))">ClearProperty(PopupMenuVisible,Home)</onclick>
 					<icon>icon_button_settings.png</icon>
 					<visible>![Window.IsVisible(MusicPlaylist) | Window.IsVisible(VideoPlaylist)]</visible>
 				</item>
@@ -461,11 +461,11 @@
 	<include name="BottomMenuLayout">
 		<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(Home)">WindowClose</animation>
 		<animation effect="fade" end="100" start="0" time="300" condition="Window.Previous(Home)">WindowOpen</animation>
-		<animation effect="slide" start="0,0" end="120,0" time="0" condition="StringCompare(Container(9002).NumItems,5)">conditional</animation>
-		<animation effect="slide" start="0,0" end="240,0" time="0" condition="StringCompare(Container(9002).NumItems,4)">conditional</animation>
-		<animation effect="slide" start="0,0" end="360,0" time="0" condition="StringCompare(Container(9002).NumItems,3)">conditional</animation>
-		<animation effect="slide" start="0,0" end="480,0" time="0" condition="StringCompare(Container(9002).NumItems,2)">conditional</animation>
-		<animation effect="slide" start="0,0" end="600,0" time="0" condition="StringCompare(Container(9002).NumItems,1)">conditional</animation>
+		<animation effect="slide" start="0,0" end="120,0" time="0" condition="String.IsEqual(Container(9002).NumItems,5)">conditional</animation>
+		<animation effect="slide" start="0,0" end="240,0" time="0" condition="String.IsEqual(Container(9002).NumItems,4)">conditional</animation>
+		<animation effect="slide" start="0,0" end="360,0" time="0" condition="String.IsEqual(Container(9002).NumItems,3)">conditional</animation>
+		<animation effect="slide" start="0,0" end="480,0" time="0" condition="String.IsEqual(Container(9002).NumItems,2)">conditional</animation>
+		<animation effect="slide" start="0,0" end="600,0" time="0" condition="String.IsEqual(Container(9002).NumItems,1)">conditional</animation>
 		<posx>730r</posx>
 		<posy>78r</posy>
 		<width>802</width>
@@ -761,7 +761,7 @@
 	<include name="ScrollOffsetLabel">
 		<control type="group">
 			<include>16x9_xPos_Relocation</include>
-			<visible>Container.Scrolling + [StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556])]</visible>
+			<visible>Container.Scrolling + [String.IsEqual(Container.SortMethod,$LOCALIZE[551]) | String.IsEqual(Container.SortMethod,$LOCALIZE[561]) | String.IsEqual(Container.SortMethod,$LOCALIZE[558]) | String.IsEqual(Container.SortMethod,$LOCALIZE[557]) | String.IsEqual(Container.SortMethod,$LOCALIZE[556])]</visible>
 			<animation effect="fade" time="100">Visible</animation>
 			<animation effect="fade" time="300">Hidden</animation>
 			<posx>600</posx>
@@ -861,7 +861,7 @@
 					</item>
 					<item>
 						<label>-</label>
-						<onclick>ActivateWindow(Videos)</onclick>
+						<onclick>ActivateWindow(Video,Root,Return)</onclick>
 						<icon>icon_menu_videos.png</icon>
 						<visible>!Skin.HasSetting(HideHomeButtonVideo)</visible>
 					</item>
@@ -899,7 +899,7 @@
 				<width>$PARAM[list-width]</width>
 				<height>620</height>
 				<texture>panel.png</texture>
-				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 			</control>
 			<control type="image">
 				<description>Menu Panel</description>
@@ -908,7 +908,7 @@
 				<width>$PARAM[list-width]</width>
 				<height>620</height>
 				<texture>panel.png</texture>
-				<animation effect="slide" start="0,0" end="-104,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 			</control>
 			<control type="image">
 				<posx>40</posx>
@@ -916,11 +916,11 @@
 				<width>$PARAM[list-width]</width>
 				<height>155</height>
 				<texture border="40,0,40,5">list_nofocus.png</texture>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation>
-				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
-				<visible>!IntegerGreaterThan(Container(9000).NumItems,6)</visible>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation>
+				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
+				<visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible>
 			</control>
 			<control type="image">
 				<posx>540</posx>
@@ -928,11 +928,11 @@
 				<width>$PARAM[list-width]</width>
 				<height>155</height>
 				<texture border="40,0,40,5">list_nofocus.png</texture>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation>
-				<animation effect="slide" start="0,0" end="-104,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
-				<visible>!IntegerGreaterThan(Container(9000).NumItems,6)</visible>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation>
+				<animation effect="slide" start="0,0" end="-104,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
+				<visible>!Integer.IsGreater(Container(9000).NumItems,6)</visible>
 			</control>
 			<control type="panel" id="9000">
 				<posx>40</posx>
@@ -946,10 +946,10 @@
 				<pagecontrol>-</pagecontrol>
 				<scrolltime>300</scrolltime>
 				<orientation>vertical</orientation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,2)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,4)">conditional</animation>
-				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!IntegerGreaterThan(Container(9000).NumItems,6)">conditional</animation>
-				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,2)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,4)">conditional</animation>
+				<animation effect="slide" start="0,0" end="0,77" time="0" condition="!Integer.IsGreater(Container(9000).NumItems,6)">conditional</animation>
+				<animation effect="slide" start="0,0" end="-20,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 				<itemlayout height="155" width="$PARAM[layout-width]">
 					<control type="image">
 						<posx>$PARAM[icon-posx-left]</posx>
@@ -1037,7 +1037,7 @@
 		</item>
 		<item id="3">
 			<label>20342</label>
-			<onclick>ActivateWindow(Videos,MovieTitles,Return)</onclick>
+			<onclick>ActivateWindow(Video,MovieTitles,Return)</onclick>
 			<icon>icon_menu_movies.png</icon>
 			<thumb>-</thumb>
 			<visible>Library.HasContent(Movies)</visible>
@@ -1045,7 +1045,7 @@
 		</item>
 		<item id="4">
 			<label>20343</label>
-			<onclick>ActivateWindow(Videos,TVShowTitles,Return)</onclick>
+			<onclick>ActivateWindow(Video,TVShowTitles,Return)</onclick>
 			<icon>icon_menu_tvshows.png</icon>
 			<thumb>-</thumb>
 			<visible>Library.HasContent(TVShows)</visible>
@@ -1053,7 +1053,7 @@
 		</item>
 		<item id="5">
 			<label>3</label>
-			<onclick>ActivateWindow(Videos)</onclick>
+			<onclick>ActivateWindow(Video,Root,Return)</onclick>
 			<icon>icon_menu_videos.png</icon>
 			<thumb>-</thumb>
 			<visible>!Skin.HasSetting(HideHomeButtonVideo)</visible>
@@ -1091,7 +1091,7 @@
 	</include>
 	<include name="PopupMenu">
 		<control type="group">
-			<visible>!IsEmpty(Window(Home).Property(PopupMenuVisible))</visible>
+			<visible>!String.IsEmpty(Window(Home).Property(PopupMenuVisible))</visible>
 			<include>VisibleFadeEffect</include>
 			<animation effect="fade" time="250">WindowClose</animation>
 			<control type="button">
@@ -1256,7 +1256,7 @@
 			<include>MenuButtonCommonValues</include>
 			<label>13350</label>
 			<onclick>ActivateWindow(musicplaylist)</onclick>
-			<visible>!StringCompare(Playlist.Length(music),0)</visible>
+			<visible>!String.IsEqual(Playlist.Length(music),0)</visible>
 		</control>
 	</include>
 	<include name="MusicOSDMenu">
@@ -1398,45 +1398,45 @@
 			<include>MenuButtonCommonValues</include>
 			<label>19019</label>
 			<onclick condition="Window.IsVisible(TVChannels) | Window.IsVisible(RadioChannels)">NextChannelGroup</onclick>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick>
 		</control>
 		<control type="button" id="202">
 			<include>MenuButtonCommonValues</include>
 			<label>22020</label>
 			<onclick condition="Window.IsVisible(TVGuide) | Window.IsVisible(RadioGuide)">NextChannelGroup</onclick>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVGuide)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioGuide)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVGuide)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioGuide)</onclick>
 		</control>
 		<control type="button" id="203">
 			<include>MenuButtonCommonValues</include>
 			<label>19163</label>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVRecordings)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioRecordings)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVRecordings)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioRecordings)</onclick>
 		</control>
 		<control type="button" id="204">
 			<include>MenuButtonCommonValues</include>
 			<label>19040</label>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimers)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimers)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimers)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimers)</onclick>
 		</control>
 		<control type="button" id="205">
 			<include>MenuButtonCommonValues</include>
 			<label>19138</label>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimerRules)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimerRules)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVTimerRules)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioTimerRules)</onclick>
 		</control>
 		<control type="button" id="206">
 			<include>MenuButtonCommonValues</include>
 			<label>137</label>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVSearch)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioSearch)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVSearch)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioSearch)</onclick>
 		</control>
 		<control type="button" id="207">
 			<include>MenuButtonCommonValues</include>
 			<label>$VAR[PVRSwitch]</label>
-			<onclick condition="IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick>
-			<onclick condition="!IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick>
+			<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(RadioChannels)</onclick>
+			<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ReplaceWindow(TVChannels)</onclick>
 		</control>
 		<control type="radiobutton" id="6">
 			<textwidth>240</textwidth>
@@ -1512,7 +1512,7 @@
 			<include>MenuButtonCommonValues</include>
 			<label>13350</label>
 			<onclick>ActivateWindow(videoplaylist)</onclick>
-			<visible>!StringCompare(Playlist.Length(video),0)</visible>
+			<visible>!String.IsEqual(Playlist.Length(video),0)</visible>
 		</control>
 	</include>
 	<include name="VideoOSDMenu">
@@ -1604,7 +1604,7 @@
 		</control>
 	</include>
 	<include name="16x9_xPos_Relocation">
-		<animation effect="slide" start="0,0" end="213,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9)">conditional</animation>
+		<animation effect="slide" start="0,0" end="213,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9)">conditional</animation>
 	</include>
 	<include name="Window_OpenClose_Animation">
 		<animation effect="fade" time="250">WindowOpen</animation>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/IncludesCodecFlagging.xml Changed

@@ -15,7 +15,7 @@
 			<aspectratio align="left">keep</aspectratio>
 			<texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
 			
-			<visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
+			<visible>![String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]</visible>
 		</control>
 		<control type="image">
 			<description>Divx Codec Image</description>
@@ -23,7 +23,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/divx.png</texture>
-			<visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
+			<visible>[String.StartsWith(ListItem.VideoCodec,div) | String.IsEqual(ListItem.VideoCodec,dx50)]</visible>
 		</control>
 	</include>
 	<include name="VideoTypeHackFlaggingConditions">
@@ -33,7 +33,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/bluray.png</texture>
-			<visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
+			<visible>[String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
 		</control>
 		<control type="image">
 			<description>HDDVD Image</description>
@@ -41,7 +41,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/hddvd.png</texture>
-			<visible>substring(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible>
+			<visible>String.Contains(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible>
 		</control>
 		<control type="image">
 			<description>DVD Image</description>
@@ -49,7 +49,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/dvd.png</texture>
-			<visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
+			<visible>[String.Contains(ListItem.FilenameAndPath,dvd) + ![String.Contains(ListItem.FilenameAndPath,hddvd) | String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
 		</control>
 		<control type="image">
 			<description>TV Types Image</description>
@@ -57,7 +57,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/TV.png</texture>
-			<visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
+			<visible>[String.Contains(ListItem.FilenameAndPath,pdtv) | String.Contains(ListItem.FilenameAndPath,hdtv) | String.Contains(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
 		</control>
 		<control type="image">
 			<description>VHS Image</description>
@@ -65,7 +65,7 @@
 			<height>44</height>
 			<aspectratio align="left">keep</aspectratio>
 			<texture>flagging/video/vhs.png</texture>
-			<visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
+			<visible>String.Contains(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
 		</control>
 	</include>
 	<include name="AudioCodecFlaggingConditions">

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/IncludesHomeRecentlyAdded.xml Changed

@@ -109,7 +109,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.1.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.1.Title))</visible>
 						</item>
 						<item id="2">
 							<label>$INFO[Window.Property(LatestMovie.2.Title)]</label>
@@ -117,7 +117,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.2.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.2.Title))</visible>
 						</item>
 						<item id="3">
 							<label>$INFO[Window.Property(LatestMovie.3.Title)]</label>
@@ -125,7 +125,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.3.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.3.Title))</visible>
 						</item>
 						<item id="4">
 							<label>$INFO[Window.Property(LatestMovie.4.Title)]</label>
@@ -133,7 +133,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.4.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.4.Title))</visible>
 						</item>
 						<item id="5">
 							<label>$INFO[Window.Property(LatestMovie.5.Title)]</label>
@@ -141,7 +141,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.5.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.5.Title))</visible>
 						</item>
 						<item id="6">
 							<label>$INFO[Window.Property(LatestMovie.6.Title)]</label>
@@ -149,7 +149,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.6.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.6.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.6.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.6.Title))</visible>
 						</item>
 						<item id="7">
 							<label>$INFO[Window.Property(LatestMovie.7.Title)]</label>
@@ -157,7 +157,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.7.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.7.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.7.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.7.Title))</visible>
 						</item>
 						<item id="8">
 							<label>$INFO[Window.Property(LatestMovie.8.Title)]</label>
@@ -165,7 +165,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.8.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.8.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.8.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.8.Title))</visible>
 						</item>
 						<item id="9">
 							<label>$INFO[Window.Property(LatestMovie.9.Title)]</label>
@@ -173,7 +173,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.9.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.9.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.9.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.9.Title))</visible>
 						</item>
 						<item id="10">
 							<label>$INFO[Window.Property(LatestMovie.10.Title)]</label>
@@ -181,7 +181,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.10.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.10.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.10.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.10.Title))</visible>
 						</item>
 						<item id="11">
 							<label>$INFO[Window.Property(LatestMovie.11.Title)]</label>
@@ -189,7 +189,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.11.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.11.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.11.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.11.Title))</visible>
 						</item>
 						<item id="12">
 							<label>$INFO[Window.Property(LatestMovie.12.Title)]</label>
@@ -197,7 +197,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.12.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.12.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestMovie.12.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestMovie.12.Title))</visible>
 						</item>
 					</content>
 				</control>
@@ -211,7 +211,7 @@
 						<effect type="zoom" start="100" end="50" center="auto" easing="in" tween="quadratic" time="400" />
 						<effect type="fade" start="100" end="0" time="400" />
 					</animation>
-					<animation effect="slide" start="0,0" end="30,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
+					<animation effect="slide" start="0,0" end="30,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
 					<posx>40</posx>
 					<posy>0</posy>
 					<width>$PARAM[panel-width]</width>
@@ -322,7 +322,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible>
 						</item>
 						<item id="2">
 							<label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label>
@@ -331,7 +331,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible>
 						</item>
 						<item id="3">
 							<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
@@ -340,7 +340,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible>
 						</item>
 						<item id="4">
 							<label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label>
@@ -349,7 +349,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible>
 						</item>
 						<item id="5">
 							<label>$INFO[Window.Property(LatestEpisode.5.EpisodeTitle)]</label>
@@ -358,7 +358,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.5.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.5.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible>
 						</item>
 						<item id="6">
 							<label>$INFO[Window.Property(LatestEpisode.6.EpisodeTitle)]</label>
@@ -367,7 +367,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.6.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.6.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible>
 						</item>
 						<item id="7">
 							<label>$INFO[Window.Property(LatestEpisode.7.EpisodeTitle)]</label>
@@ -376,7 +376,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.7.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.7.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible>
 						</item>
 						<item id="8">
 							<label>$INFO[Window.Property(LatestEpisode.8.EpisodeTitle)]</label>
@@ -385,7 +385,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.8.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.8.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible>
 						</item>
 						<item id="9">
 							<label>$INFO[Window.Property(LatestEpisode.9.EpisodeTitle)]</label>
@@ -394,7 +394,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.9.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.9.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible>
 						</item>
 						<item id="10">
 							<label>$INFO[Window.Property(LatestEpisode.10.EpisodeTitle)]</label>
@@ -403,7 +403,7 @@
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.10.Path)])</onclick>
 							<icon>-</icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.10.Thumb)]</thumb>
-							<visible>!IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible>
 						</item>
 					</content>
 				</control>
@@ -500,7 +500,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.1.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.1.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.1.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.1.Title))</visible>
 						</item>
 						<item id="2">
 							<label>$INFO[Window.Property(LatestAlbum.2.Title)]</label>
@@ -508,7 +508,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.2.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.2.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.2.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.2.Title))</visible>
 						</item>
 						<item id="3">
 							<label>$INFO[Window.Property(LatestAlbum.3.Title)]</label>
@@ -516,7 +516,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.3.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.3.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.3.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.3.Title))</visible>
 						</item>
 						<item id="4">
 							<label>$INFO[Window.Property(LatestAlbum.4.Title)]</label>
@@ -524,7 +524,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.4.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.4.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.4.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.4.Title))</visible>
 						</item>
 						<item id="5">
 							<label>$INFO[Window.Property(LatestAlbum.5.Title)]</label>
@@ -532,7 +532,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.5.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.5.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.5.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.5.Title))</visible>
 						</item>
 						<item id="6">
 							<label>$INFO[Window.Property(LatestAlbum.6.Title)]</label>
@@ -540,7 +540,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.6.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.6.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.6.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.6.Title))</visible>
 						</item>
 						<item id="7">
 							<label>$INFO[Window.Property(LatestAlbum.7.Title)]</label>
@@ -548,7 +548,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.7.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.7.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.7.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.7.Title))</visible>
 						</item>
 						<item id="8">
 							<label>$INFO[Window.Property(LatestAlbum.8.Title)]</label>
@@ -556,7 +556,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.8.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.8.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.8.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.8.Title))</visible>
 						</item>
 						<item id="9">
 							<label>$INFO[Window.Property(LatestAlbum.9.Title)]</label>
@@ -564,7 +564,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.9.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.9.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.9.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.9.Title))</visible>
 						</item>
 						<item id="10">
 							<label>$INFO[Window.Property(LatestAlbum.10.Title)]</label>
@@ -572,7 +572,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.10.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.10.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.10.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.10.Title))</visible>
 						</item>
 						<item id="11">
 							<label>$INFO[Window.Property(LatestAlbum.11.Title)]</label>
@@ -580,7 +580,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.11.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.11.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.11.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.11.Title))</visible>
 						</item>
 						<item id="12">
 							<label>$INFO[Window.Property(LatestAlbum.12.Title)]</label>
@@ -588,7 +588,7 @@
 							<onclick>ActivateWindow(MusicLibrary,$INFO[Window.Property(LatestAlbum.12.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestAlbum.12.Thumb)]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Window.Property(LatestAlbum.12.Title))</visible>
+							<visible>!String.IsEmpty(Window.Property(LatestAlbum.12.Title))</visible>
 						</item>
 					</content>
 				</control>
@@ -685,7 +685,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton1)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton1))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton1))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton1))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton2))]</label>
@@ -693,7 +693,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton2)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton2))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton2))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton2))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton3))]</label>
@@ -701,7 +701,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton3)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton3))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton3))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton3))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton4))]</label>
@@ -709,7 +709,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton4)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton4))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton4))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton4))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton5))]</label>
@@ -717,7 +717,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton5)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton5))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton5))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton5))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton6))]</label>
@@ -725,7 +725,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton6)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton6))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton6))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton6))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton7))]</label>
@@ -733,7 +733,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton7)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton7))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton7))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton7))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton8))]</label>
@@ -741,7 +741,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton8)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton8))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton8))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton8))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton9))]</label>
@@ -749,7 +749,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton9)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton9))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton9))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton9))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton10))]</label>
@@ -757,7 +757,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton10)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton10))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton10))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton10))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton11))]</label>
@@ -765,7 +765,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton11)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton11))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton11))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton11))</visible>
 						</item>
 						<item>
 							<label>$INFO[system.addontitle(Skin.String(HomeAddonButton12))]</label>
@@ -773,7 +773,7 @@
 							<onclick>RunAddon($INFO[Skin.String(HomeAddonButton12)])</onclick>
 							<icon>$INFO[system.addonicon(Skin.String(HomeAddonButton12))]</icon>
 							<thumb>-</thumb>
-							<visible>!IsEmpty(Skin.String(HomeAddonButton12))</visible>
+							<visible>!String.IsEmpty(Skin.String(HomeAddonButton12))</visible>
 						</item>
 					</content>
 				</control>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MusicVisualisation.xml Changed

@@ -21,59 +21,5 @@
 			<include>ScreenWidth</include>
 			<height>960</height>
 		</control>
-		
-		<control type="group" id="0">
-			<posx>0</posx>
-			<posy>50</posy>
-			<visible>Player.ShowCodec + ![Window.IsVisible(VisualisationSettings) | Window.IsVisible(VisualisationPresetList)]</visible>
-			<animation effect="fade" time="200">VisibleChange</animation>
-			<control type="image">
-				<description>media info background image</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<include>ScreenWidth</include>
-				<height>105</height>
-				<colordiffuse>AAFFFFFF</colordiffuse>
-				<texture>grey.png</texture>
-			</control>
-			<control type="label">
-				<description>row 1 label</description>
-				<posx>50</posx>
-				<posy>10</posy>
-				<label>-</label>
-				<align>left</align>
-				<label>$INFO[musicplayer.Codec,$LOCALIZE[21446]: ,]$INFO[musicplayer.Bitrate, · $LOCALIZE[623]: ,kbps]$INFO[musicplayer.bitspersample, · $LOCALIZE[612]: ,bit]$INFO[musicplayer.Samplerate, · $LOCALIZE[613]: ,kHz]$INFO[musicplayer.Channels, · $LOCALIZE[21444]: ]</label>
-				<font>font16</font>
-			</control>
-			<control type="label">
-				<description>row 2 label</description>
-				<posx>50</posx>
-				<posy>40</posy>
-				<label>-</label>
-				<align>left</align>
-				<label>$INFO[Visualisation.Name] [I][COLOR=blue]($LOCALIZE[20166])[/COLOR][/I] · fps: $INFO[System.FPS]</label>
-				<font>font16</font>
-				<visible>Visualisation.Locked</visible>
-			</control>
-			<control type="label">
-				<description>Unlocked row 2 label</description>
-				<posx>50</posx>
-				<posy>40</posy>
-				<label>-</label>
-				<align>left</align>
-				<label>$INFO[Visualisation.Name] · fps: $INFO[System.FPS]</label>
-				<font>font16</font>
-				<visible>!Visualisation.Locked</visible>
-			</control>
-			<control type="label">
-				<description>row 3 label</description>
-				<posx>50</posx>
-				<posy>70</posy>
-				<label>-</label>
-				<align>left</align>
-				<label>$LOCALIZE[13388]: $INFO[Visualisation.Preset]</label>
-				<font>font16</font>
-			</control>
-		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyMusicNav.xml Changed

@@ -16,30 +16,30 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="layout-width" value="306"/>
 			</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="layout-width" value="363"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1230"/>
 				<param name="label2-posx" value="1360r"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="790"/>
 				<param name="label2-posx" value="920r"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width-movies" value="1350"/>
 				<param name="textbox-width-episodes" value="1250"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width-movies" value="910"/>
 				<param name="textbox-width-episodes" value="810"/>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPVRChannels.xml Changed

@@ -19,27 +19,27 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 			</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-id" value="50"/>
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1400"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-id" value="50"/>
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="960"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width" value="1160"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width" value="720"/>
 			</include>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPVRGuide.xml Changed

@@ -22,53 +22,53 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="PVREPG" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVREPG" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 			</include>
-			<include name="PVREPG" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVREPG" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 			</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 			</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-id" value="11"/>
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1400"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-id" value="11"/>
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="960"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-id" value="12"/>
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1400"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-id" value="12"/>
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="960"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-id" value="13"/>
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1400"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-id" value="13"/>
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="960"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width" value="1160"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width" value="720"/>
 			</include>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPVRRecordings.xml Changed

@@ -16,27 +16,27 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 			</include>
-			<include name="PVRBack" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRBack" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-id" value="50"/>
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1400"/>
 			</include>
-			<include name="PVRList" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="PVRList" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-id" value="50"/>
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="960"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,16:9)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,16:9)">
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width" value="1160"/>
 			</include>
-			<include name="PVRInfo" condition="StringCompare(Skin.AspectRatio,4:3)">
+			<include name="PVRInfo" condition="String.IsEqual(Skin.AspectRatio,4:3)">
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width" value="720"/>
 			</include>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPVRSearch.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPVRTimers.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPics.xml Changed

@@ -16,20 +16,20 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="layout-width" value="306"/>
 			</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="layout-width" value="363"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1230"/>
 				<param name="label2-posx" value="1360r"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="790"/>
 				<param name="label2-posx" value="920r"/>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPlaylist.xml Changed

@@ -15,30 +15,30 @@
 		</control>
 		<control type="group">
 			<include>Window_OpenClose_Animation_Zoom</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="layout-width" value="306"/>
 			</include>
-			<include name="Thumbnail" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Thumbnail" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="layout-width" value="363"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="label-width" value="1230"/>
 				<param name="label2-posx" value="1360r"/>
 			</include>
-			<include name="List" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="List" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="label-width" value="790"/>
 				<param name="label2-posx" value="920r"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,16:9)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,16:9)"> 
 				<param name="panel-width" value="1530"/>
 				<param name="textbox-width-movies" value="1350"/>
 				<param name="textbox-width-episodes" value="1250"/>
 			</include>
-			<include name="Wide" condition="StringCompare(Skin.AspectRatio,4:3)"> 
+			<include name="Wide" condition="String.IsEqual(Skin.AspectRatio,4:3)"> 
 				<param name="panel-width" value="1090"/>
 				<param name="textbox-width-movies" value="910"/>
 				<param name="textbox-width-episodes" value="810"/>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyPrograms.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyVideoNav.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/MyWeather.xml Changed

@@ -247,7 +247,7 @@
 			<control type="group">
 				<posx>600</posx>
 				<posy>130</posy>
-				<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Title))</visible>
+				<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day0.Title))</visible>
 				<control type="image">
 					<posx>20</posx>
 					<posy>20</posy>
@@ -303,7 +303,7 @@
 							<align>center</align>
 							<aligny>center</aligny>
 							<label>[COLOR=grey]$LOCALIZE[419][/COLOR][CR][B]$INFO[ListItem.Property(HighTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+							<visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible>
 						</control>
 						<control type="label">
 							<posx>210</posx>
@@ -315,7 +315,7 @@
 							<align>center</align>
 							<aligny>center</aligny>
 							<label>[COLOR=grey]$LOCALIZE[418][/COLOR][CR][B]$INFO[ListItem.Property(LowTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+							<visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible>
 						</control>
 						<control type="textbox">
 							<posx>20</posx>
@@ -364,7 +364,7 @@
 							<align>center</align>
 							<aligny>center</aligny>
 							<label>[COLOR=grey]$LOCALIZE[419][/COLOR][CR][B]$INFO[ListItem.Property(HighTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+							<visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible>
 						</control>
 						<control type="label">
 							<posx>210</posx>
@@ -376,7 +376,7 @@
 							<align>center</align>
 							<aligny>center</aligny>
 							<label>[COLOR=grey]$LOCALIZE[418][/COLOR][CR][B]$INFO[ListItem.Property(LowTemp)][/B]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+							<visible>!String.IsEmpty(ListItem.Property(HighTemp))</visible>
 						</control>
 						<control type="textbox">
 							<posx>20</posx>
@@ -404,7 +404,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day0.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day0.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day1.Title)]</label>
@@ -414,7 +414,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day1.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day1.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day2.Title)]</label>
@@ -424,7 +424,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day2.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day2.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day3.Title)]</label>
@@ -434,7 +434,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day3.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day3.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day4.Title)]</label>
@@ -444,7 +444,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day4.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day4.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day5.Title)]</label>
@@ -454,7 +454,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day5.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day5.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day5.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day6.Title)]</label>
@@ -464,7 +464,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day6.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day6.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day6.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day7.Title)]</label>
@@ -474,7 +474,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day7.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day7.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day7.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day8.Title)]</label>
@@ -484,7 +484,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day8.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day8.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day8.Title))</visible>
 						</item>
 						<item>
 							<label>$INFO[Window.Property(Day9.Title)]</label>
@@ -494,7 +494,7 @@
 							<property name="Outlook">$INFO[Window.Property(Day9.Outlook)]</property>
 							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
 							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day9.Title))</visible>
+							<visible>Weather.IsFetched + !String.IsEmpty(Window.Property(Day9.Title))</visible>
 						</item>
 					</content>
 				</control>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/SettingsCategory.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/SettingsProfile.xml Changed

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/SettingsSystemInfo.xml Changed

@@ -140,7 +140,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(2))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(2))</visible>
 				</control>
 				<control type="label" id="2">
 					<description>Label 2</description>
@@ -159,7 +159,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(3))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(3))</visible>
 				</control>
 				<control type="label" id="3">
 					<description>Label 3</description>
@@ -178,7 +178,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(4))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(4))</visible>
 				</control>
 				<control type="label" id="4">
 					<description>Label 4</description>
@@ -197,7 +197,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(5))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(5))</visible>
 				</control>
 				<control type="label" id="5">
 					<description>Label 5</description>
@@ -216,7 +216,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(6))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(6))</visible>
 				</control>
 				<control type="label" id="6">
 					<description>Label 6</description>
@@ -235,7 +235,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(7))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(7))</visible>
 				</control>
 				<control type="label" id="7">
 					<description>Label 7</description>
@@ -254,7 +254,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(8))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(8))</visible>
 				</control>
 				<control type="label" id="8">
 					<description>Label 8</description>
@@ -273,7 +273,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(9))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(9))</visible>
 				</control>
 				<control type="label" id="9">
 					<description>Label 9</description>
@@ -292,7 +292,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(10))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(10))</visible>
 				</control>
 				<control type="label" id="10">
 					<description>Label 10</description>
@@ -311,7 +311,7 @@
 					<width>880</width>
 					<height>60</height>
 					<texture border="40,0,40,5">list_nofocus.png</texture>
-					<visible>!IsEmpty(Control.GetLabel(11))</visible>
+					<visible>!String.IsEmpty(Control.GetLabel(11))</visible>
 				</control>
 				<control type="label" id="11">
 					<description>Label 11</description>

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/ViewsList.xml Changed

@@ -37,7 +37,7 @@
 					<height>62</height>
 					<texture background="true">$VAR[PosterThumb]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>4</posx>
@@ -46,7 +46,7 @@
 					<height>62</height>
 					<texture background="true">defaulticons/$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="label">
 					<posx>75</posx>
@@ -82,7 +82,7 @@
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
 					<animation effect="slide" start="0" end ="100,0" time="0" condition="Container.Content(Albums)">Conditional</animation>
-					<visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !SubString(ListItem.Label,..)</visible>
+					<visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !String.Contains(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<description>Rating value</description>
@@ -92,7 +92,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
-					<visible>Container.Content(Songs) + !SubString(ListItem.Label,..)</visible>
+					<visible>Container.Content(Songs) + !String.Contains(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>110r</posx>
@@ -138,7 +138,7 @@
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.AddonStatus,, - ]$INFO[ListItem.AddonVersion]</label>
 					<animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation>
-					<visible>Window.IsVisible(AddonBrowser) + !stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + !String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible>
 				</control>
 				<control type="label">
 					<posx>$PARAM[label2-posx]</posx>
@@ -151,7 +151,7 @@
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.AddonVersion]</label>
 					<animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible>
 				</control>
 				<control type="image">
 					<posx>50r</posx>
@@ -160,7 +160,7 @@
 					<height>30</height>
 					<aspectratio>keep</aspectratio>
 					<texture>OverlayWatched.png</texture>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible>
 				</control>
 			</itemlayout>
 			<focusedlayout height="70" width="$PARAM[panel-width]" condition="!Window.IsVisible(EventLog)">
@@ -179,7 +179,7 @@
 					<height>62</height>
 					<texture background="true">$VAR[PosterThumb]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | [Container.Content(Addons) + !ListItem.IsFolder] | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>4</posx>
@@ -188,7 +188,7 @@
 					<height>62</height>
 					<texture background="true">defaulticons/$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Container.Content(Addons) + ListItem.IsFolder] | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="label">
 					<posx>75</posx>
@@ -224,7 +224,7 @@
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/]</texture>
 					<animation effect="slide" start="0" end ="100,0" time="0" condition="Container.Content(Albums)">Conditional</animation>
-					<visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !SubString(ListItem.Label,..)</visible>
+					<visible>[Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos) | Container.Content(Albums)] + !String.Contains(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<description>Rating value</description>
@@ -234,7 +234,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/]</texture>
-					<visible>Container.Content(Songs) + !SubString(ListItem.Label,..)</visible>
+					<visible>Container.Content(Songs) + !String.Contains(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>110r</posx>
@@ -280,7 +280,7 @@
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.AddonStatus,, - ]$INFO[ListItem.AddonVersion]</label>
 					<animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation>
-					<visible>Window.IsVisible(AddonBrowser) + !stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + !String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible>
 				</control>
 				<control type="label">
 					<posx>$PARAM[label2-posx]</posx>
@@ -293,7 +293,7 @@
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.AddonVersion]</label>
 					<animation effect="slide" start="0" end ="60,0" time="0" condition="True">Conditional</animation>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.AddonStatus,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.AddonStatus,$LOCALIZE[305])</visible>
 				</control>
 				<control type="image">
 					<posx>50r</posx>
@@ -302,7 +302,7 @@
 					<height>30</height>
 					<aspectratio>keep</aspectratio>
 					<texture>OverlayWatched.png</texture>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible>
 				</control>
 			</focusedlayout>
 			<itemlayout height="90" width="$PARAM[panel-width]" condition="Window.IsVisible(EventLog)">

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/ViewsThumbnail.xml Changed

@@ -14,9 +14,9 @@
 			<pagecontrol>60</pagecontrol>
 			<scrolltime>200</scrolltime>
 			<preloaditems>4</preloaditems>
-			<animation effect="slide" start="0,0" end="-1,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3)">Conditional</animation>
-			<animation effect="slide" start="0,0" end="-1,0" time="0" condition="StringCompare(Skin.AspectRatio,16:9) + Container.Content(Episodes)">Conditional</animation>
-			<animation effect="slide" start="0,0" end="28,0" time="0" condition="StringCompare(Skin.AspectRatio,4:3) + Container.Content(Episodes)">Conditional</animation>
+			<animation effect="slide" start="0,0" end="-1,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3)">Conditional</animation>
+			<animation effect="slide" start="0,0" end="-1,0" time="0" condition="String.IsEqual(Skin.AspectRatio,16:9) + Container.Content(Episodes)">Conditional</animation>
+			<animation effect="slide" start="0,0" end="28,0" time="0" condition="String.IsEqual(Skin.AspectRatio,4:3) + Container.Content(Episodes)">Conditional</animation>
 			<itemlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218">
 				<control type="image">
 					<posx>10</posx>
@@ -32,7 +32,7 @@
 					<height>200</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>scale</aspectratio>
-					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>67</posx>
@@ -41,7 +41,7 @@
 					<height>86</height>
 					<texture background="true">defaulticons/$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>10</posx>
@@ -68,7 +68,7 @@
 					<height>30</height>
 					<aspectratio>keep</aspectratio>
 					<texture>OverlayWatched.png</texture>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible>
 				</control>
 			</itemlayout>
 			<focusedlayout condition="!Container.Content(Movies) + !Container.Content(Seasons) + !Container.Content(Episodes) + !Container.Content(TVShows) + !Container.Content(MusicVideos)" height="250" width="218">
@@ -86,7 +86,7 @@
 					<height>200</height>
 					<texture background="true">$INFO[Listitem.Icon]</texture>
 					<aspectratio>scale</aspectratio>
-					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !IsEmpty(Container.FolderPath)]</visible>
+					<visible>Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs) | Container.Content(Addons) | Container.Content(Actors) | Container.Content(Sets) | [Window.IsVisible(Pictures) + !String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>67</posx>
@@ -95,7 +95,7 @@
 					<height>86</height>
 					<texture background="true">defaulticons/$INFO[Listitem.Icon]</texture>
 					<aspectratio>keep</aspectratio>
-					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + IsEmpty(Container.FolderPath)]</visible>
+					<visible>[Container.Content() + !Window.IsVisible(Pictures)] | Container.Content(Files) | Container.Content(Genres) | Container.Content(Years) | Container.Content(Directors) | Container.Content(Studios) | Container.Content(Countries) | Container.Content(Tags) | [Window.IsVisible(Pictures) + String.IsEmpty(Container.FolderPath)]</visible>
 				</control>
 				<control type="image">
 					<posx>10</posx>
@@ -122,7 +122,7 @@
 					<height>30</height>
 					<aspectratio>keep</aspectratio>
 					<texture>OverlayWatched.png</texture>
-					<visible>Window.IsVisible(AddonBrowser) + stringcompare(ListItem.Label2,$LOCALIZE[305])</visible>
+					<visible>Window.IsVisible(AddonBrowser) + String.IsEqual(ListItem.Label2,$LOCALIZE[305])</visible>
 				</control>
 			</focusedlayout>
 			<itemlayout condition="Container.Content(Movies) | Container.Content(Seasons) | Container.Content(TVShows)" height="375" width="218">

_service:download_url:master.tar.gz/addons/skin.estouchy/xml/ViewsWide.xml Changed

@@ -80,9 +80,9 @@
 					<width>200</width>
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
-					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
+					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
 					<animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation>
-					<visible>!StringCompare(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -183,9 +183,9 @@
 					<width>200</width>
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
-					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
+					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
 					<animation effect="slide" start="0,0" end="60,0" time="0" condition="Container.Content(TVShows) | container.Content(Seasons)">Conditional</animation>
-					<visible>!StringCompare(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -300,7 +300,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -406,7 +406,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..)</visible>
 				</control>
 				<control type="image">
 					<posx>100r</posx>
@@ -513,7 +513,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..) + Container.Content(Albums)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Albums)</visible>
 				</control>
 				<control type="image">
 					<description>Rating value</description>
@@ -523,7 +523,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..) + Container.Content(Songs)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Songs)</visible>
 				</control>
 				<control type="textbox">
 					<posx>250</posx>
@@ -553,7 +553,7 @@
 					<font>font25</font>
 					<align>justify</align>
 					<label>$INFO[ListItem.Comment]</label>
-					<visible>Container.Content(Songs) + !IsEmpty(ListItem.Comment)</visible>
+					<visible>Container.Content(Songs) + !String.IsEmpty(ListItem.Comment)</visible>
 				</control>
 				<control type="textbox">
 					<posx>250</posx>
@@ -563,7 +563,7 @@
 					<font>font25</font>
 					<align>justify</align>
 					<label>$INFO[ListItem.Album,$LOCALIZE[558]: ][CR]$INFO[ListItem.Tracknumber,$LOCALIZE[554]: ][CR]$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label>
-					<visible>Container.Content(Songs) + IsEmpty(ListItem.Comment)</visible>
+					<visible>Container.Content(Songs) + String.IsEmpty(ListItem.Comment)</visible>
 				</control>
 			</itemlayout>
 			<focusedlayout condition="Container.Content(Artists) | Container.Content(Albums) | Container.Content(Songs)" height="240" width="$PARAM[panel-width]">
@@ -636,7 +636,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.Rating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..) + Container.Content(Albums)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Albums)</visible>
 				</control>
 				<control type="image">
 					<description>Rating value</description>
@@ -646,7 +646,7 @@
 					<height>25</height>
 					<aspectratio align="left">keep</aspectratio>
 					<texture fallback="rating/0.png">$INFO[ListItem.UserRating,rating/,.png]</texture>
-					<visible>!StringCompare(ListItem.Label,..) + Container.Content(Songs)</visible>
+					<visible>!String.IsEqual(ListItem.Label,..) + Container.Content(Songs)</visible>
 				</control>
 				<control type="textbox">
 					<posx>250</posx>
@@ -678,7 +678,7 @@
 					<align>justify</align>
 					<label>$INFO[ListItem.Comment]</label>
 					<autoscroll delay="2000" time="2000" repeat="2000">True</autoscroll>
-					<visible>Container.Content(Songs) + !IsEmpty(ListItem.Comment)</visible>
+					<visible>Container.Content(Songs) + !String.IsEmpty(ListItem.Comment)</visible>
 				</control>
 				<control type="textbox">
 					<posx>250</posx>
@@ -689,7 +689,7 @@
 					<align>justify</align>
 					<label>$INFO[ListItem.Album,$LOCALIZE[558]: ][CR]$INFO[ListItem.Tracknumber,$LOCALIZE[554]: ][CR]$INFO[ListItem.Duration,$LOCALIZE[180]: ]</label>
 					<autoscroll delay="2000" time="2000" repeat="2000">True</autoscroll>
-					<visible>Container.Content(Songs) + IsEmpty(ListItem.Comment)</visible>
+					<visible>Container.Content(Songs) + String.IsEmpty(ListItem.Comment)</visible>
 				</control>
 			</focusedlayout>
 			<itemlayout condition="Container.Content(Addons)" height="240" width="$PARAM[panel-width]">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/AddonBrowser.xml Changed

@@ -1,74 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol always="true">52</defaultcontrol>
+	<defaultcontrol always="true">50</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
 	<views>50,52,55</views>
 	<menucontrol>9000</menucontrol>
 	<controls>
 		<include>DefaultBackground</include>
 		<include>CommonScrollbars</include>
-		<control type="group" id="100">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation)">Conditional</animation>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_52_IconWall</include>
 			<include>View_55_WideList</include>
-		</control>
-		<control type="group">
-			<include>OpenClose_Left</include>
-			<visible>Control.IsVisible(55)</visible>
-			<visible>Container.Content(addons)</visible>
-			<include>Visible_Left</include>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<control type="grouplist" id="9000">
-				<top>90</top>
-				<include name="MediaMenuListCommon">
-					<param name="viewtype_button_vis" value="False" />
-				</include>
-				<control type="label" id="201">
-					<include>MediaMenuLabelCommon</include>
-					<label>$LOCALIZE[31021]</label>
-				</control>
-				<control type="radiobutton" id="7">
-					<description>Hide foreign</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[25001]</label>
-					<visible>Control.IsEnabled(7)</visible>
-				</control>
-				<control type="radiobutton" id="8">
-					<description>Hide incompatible</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[24999]</label>
-					<visible>Control.IsEnabled(8)</visible>
-				</control>
-				<control type="button" id="9">
-					<description>Check for repository updates</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[24034]</label>
-				</control>
-				<control type="button" id="5">
-					<description>Addon settings</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[10004]</label>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<visible>Control.IsVisible(55)</visible>
+				<visible>Container.Content(addons)</visible>
+				<include>Visible_Left</include>
+				<include>ListThumbInfoPanel</include>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>90</top>
+					<include>MediaMenuListCommon</include>
+					<control type="label" id="201">
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31021]</label>
+					</control>
+					<control type="radiobutton" id="7">
+						<description>Hide foreign</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[25001]</label>
+						<visible>Control.IsEnabled(7)</visible>
+					</control>
+					<control type="radiobutton" id="8">
+						<description>Hide incompatible</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[24999]</label>
+						<visible>Control.IsEnabled(8)</visible>
+					</control>
+					<control type="button" id="9">
+						<description>Check for repository updates</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[24034]</label>
+					</control>
+					<control type="button" id="5">
+						<description>Addon settings</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[10004]</label>
+					</control>
+					<include>MediaMenuNowPlaying</include>
 				</control>
-				<include>MediaMenuNowPlaying</include>
 			</control>
-		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[24001]" />
-			<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
-		</include>
-		<include>BottomBar</include>
-		<control type="group">
-			<top>1002</top>
-			<visible>ControlGroup(9000).HasFocus | Control.HasFocus(6130)</visible>
-			<include name="InfoDialogTopBarInfo">
-				<param name="main_label" value="$INFO[Window(AddonBrowser).Property(Updated)]" />
-				<param name="sub_label" value="$LOCALIZE[31069]" />
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[24001]" />
+				<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
 			</include>
+			<include>BottomBar</include>
+			<control type="group">
+				<top>1002</top>
+				<visible>$EXP[sidebar_focused]</visible>
+				<include name="LeftAlignedInfo">
+					<param name="main_label" value="$INFO[Window(AddonBrowser).Property(Updated)]" />
+					<param name="sub_label" value="$LOCALIZE[31069]" />
+				</include>
+			</control>
 		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Custom_1100_AddonLauncher.xml Changed

@@ -1,22 +1,344 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="1100">
-	<defaultcontrol always="true">9000</defaultcontrol>
+	<defaultcontrol>9000</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
-		<include name="SettingsPanel">
-			<param name="content" value="AddonLauncherItems" />
-		</include>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[24001]" />
-			<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
-		</include>
-		<include name="InfoList">
-			<param name="path" value="addons://outdated/" />
-			<param name="height" value="1" />
-			<param name="width" value="1" />
-			<param name="list_id" value="8000" />
-			<param name="item_label" value="" />
-		</include>
-		<include>BottomBar</include>
+		<control type="multiimage">
+			<depth>DepthBackground</depth>
+			<include>FullScreenDimensions</include>
+			<aspectratio>scale</aspectratio>
+			<fadetime>600</fadetime>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+			<animation effect="fade" time="400">VisibleChange</animation>
+			<imagepath background="true" colordiffuse="35FFFFFF">$VAR[AddonsFanartVar]</imagepath>
+			<visible>!Player.HasMedia</visible>
+		</control>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+			<control type="group">
+				<left>90</left>
+				<top>185</top>
+				<include>OpenClose_Left</include>
+				<control type="image">
+					<left>-20</left>
+					<top>-20</top>
+					<width>424</width>
+					<height>660</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
+				</control>
+				<control type="list" id="9000">
+					<left>1</left>
+					<top>1</top>
+					<width>382</width>
+					<height>671</height>
+					<pagecontrol>70</pagecontrol>
+					<onup>700</onup>
+					<ondown>700</ondown>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),video) + Control.IsVisible(500)">500</onright>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),music) + Control.IsVisible(501)">501</onright>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),addons) + Control.IsVisible(502)">502</onright>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),pictures) + Control.IsVisible(503)">503</onright>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),outdated) + Control.IsVisible(504)">504</onright>
+					<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),android) + Control.IsVisible(506)">506</onright>
+					<scrolltime tween="cubic" easing="out">500</scrolltime>
+					<focusedlayout height="120">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>382</width>
+							<height>120</height>
+							<texture border="90,3,90,3">lists/separator.png</texture>
+						</control>
+						<control type="group">
+							<control type="image">
+								<left>0</left>
+								<top>0</top>
+								<width>382</width>
+								<height>120</height>
+								<texture>lists/focus.png</texture>
+								<animation effect="fade" start="100" end="50" time="0">Unfocus</animation>
+							</control>
+							<control type="label">
+								<left>20</left>
+								<top>55</top>
+								<height>70</height>
+								<width>350</width>
+								<aligny>center</aligny>
+								<align>center</align>
+								<font>font12</font>
+								<label>$INFO[ListItem.Label]</label>
+								<shadowcolor>text_shadow</shadowcolor>
+							</control>
+							<control type="image">
+								<left>0</left>
+								<top>-10</top>
+								<width>382</width>
+								<aspectratio>keep</aspectratio>
+								<height>120</height>
+								<texture>$INFO[ListItem.Art(thumb)]</texture>
+							</control>
+						</control>
+					</focusedlayout>
+					<itemlayout height="120">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>382</width>
+							<height>120</height>
+							<texture border="90,3,90,3">lists/separator.png</texture>
+						</control>
+						<control type="label">
+							<left>20</left>
+							<top>55</top>
+							<height>70</height>
+							<width>350</width>
+							<aligny>center</aligny>
+							<align>center</align>
+							<font>font12</font>
+							<label>$INFO[ListItem.Label]</label>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+						<control type="image">
+							<left>0</left>
+							<top>-10</top>
+							<width>382</width>
+							<aspectratio>keep</aspectratio>
+							<height>120</height>
+							<texture>$INFO[ListItem.Art(thumb)]</texture>
+						</control>
+					</itemlayout>
+					<content>
+						<item id="1">
+							<label>$LOCALIZE[1037]</label>
+							<onclick>ActivateWindow(videos,addons://sources/video/,return)</onclick>
+							<thumb>icons/settings/video.png</thumb>
+							<property name="id">video</property>
+							<property name="path">addons://sources/video/</property>
+						</item>
+						<item id="2">
+							<label>$LOCALIZE[1038]</label>
+							<onclick>ActivateWindow(music,addons://sources/audio/,return)</onclick>
+							<thumb>icons/settings/music.png</thumb>
+							<property name="id">music</property>
+							<property name="path">addons://sources/audio/</property>
+						</item>
+						<item id="3">
+							<label>$LOCALIZE[1043]</label>
+							<onclick>ActivateWindow(programs,addons://sources/executable/,return)</onclick>
+							<thumb>icons/settings/appearance.png</thumb>
+							<property name="id">addons</property>
+							<property name="path">addons://sources/executable/</property>
+						</item>
+						<item id="4">
+							<label>$LOCALIZE[1043]</label>
+							<onclick>ActivateWindow(programs,androidapps://,return)</onclick>
+							<thumb>icons/settings/android.png</thumb>
+							<property name="id">android</property>
+							<property name="path">androidapps://</property>
+							<visible>System.Platform.Android</visible>
+						</item>
+						<item id="5">
+							<label>$LOCALIZE[1039]</label>
+							<onclick>ActivateWindow(pictures,addons://sources/image/,return)</onclick>
+							<thumb>icons/settings/pictures.png</thumb>
+							<property name="id">pictures</property>
+							<property name="path">addons://sources/executable/</property>
+						</item>
+						
+					</content>
+				</control>
+			</control>
+			<control type="grouplist" id="700">
+				<orientation>horizontal</orientation>
+				<itemgap>-22</itemgap>
+				<left>70</left>
+				<top>795</top>
+				<onup>SetFocus(9000,99)</onup>
+				<onup>9000</onup>
+				<ondown>14200</ondown>
+				<include>OpenClose_Left</include>
+				<onright>400</onright>
+				<usecontrolcoords>true</usecontrolcoords>
+				<control type="radiobutton" id="801">
+					<width>157</width>
+					<height>110</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<onclick>ActivateWindow(addonbrowser,root)</onclick>
+					<font>font10</font>
+					<label>-</label>
+					<textoffsetx>40</textoffsetx>
+					<textwidth>230</textwidth>
+					<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+					<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+					<radioposx>55</radioposx>
+					<radioposy>0</radioposy>
+					<radiowidth>40</radiowidth>
+					<radioheight>40</radioheight>
+					<textureradioonfocus>icons/submenu/add-ons.png</textureradioonfocus>
+					<textureradioonnofocus>icons/submenu/add-ons.png</textureradioonnofocus>
+					<textureradioofffocus>icons/submenu/add-ons.png</textureradioofffocus>
+					<textureradiooffnofocus>icons/submenu/add-ons.png</textureradiooffnofocus>
+				</control>
+				<control type="radiobutton" id="802">
+					<width>157</width>
+					<height>110</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick>
+					<font>font10</font>
+					<label>-</label>
+					<textoffsetx>40</textoffsetx>
+					<textwidth>230</textwidth>
+					<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+					<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+					<radioposx>35</radioposx>
+					<radioposy>0</radioposy>
+					<radiowidth>40</radiowidth>
+					<radioheight>40</radioheight>
+					<enable>Integer.IsGreater(Container(8000).NumItems,0)</enable>
+					<textureradioonfocus>icons/submenu/updatelibrary.png</textureradioonfocus>
+					<textureradioonnofocus>icons/submenu/updatelibrary.png</textureradioonnofocus>
+					<textureradioofffocus>icons/submenu/updatelibrary.png</textureradioofffocus>
+					<textureradiooffnofocus>icons/submenu/updatelibrary.png</textureradiooffnofocus>
+					<textureradioondisabled colordiffuse="disabled">icons/submenu/updatelibrary.png</textureradioondisabled>
+					<textureradiooffdisabled colordiffuse="disabled">icons/submenu/updatelibrary.png</textureradiooffdisabled>
+				</control>
+				<control type="radiobutton" id="803">
+					<width>157</width>
+					<height>110</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<onclick>ActivateWindow(systemsettings,addons)</onclick>
+					<font>font10</font>
+					<label>-</label>
+					<textoffsetx>40</textoffsetx>
+					<textwidth>230</textwidth>
+					<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+					<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+					<radioposx>55</radioposx>
+					<radioposy>0</radioposy>
+					<radiowidth>40</radiowidth>
+					<radioheight>40</radioheight>
+					<textureradioonfocus>icons/settings.png</textureradioonfocus>
+					<textureradioonnofocus>icons/settings.png</textureradioonnofocus>
+					<textureradioofffocus>icons/settings.png</textureradioofffocus>
+					<textureradiooffnofocus>icons/settings.png</textureradiooffnofocus>
+				</control>
+				<control type="label" id="804">
+					<left>-217</left>
+					<top>20</top>
+					<height>70</height>
+					<width>100</width>
+					<aligny>center</aligny>
+					<align>center</align>
+					<font>font20_title</font>
+					<label>$VAR[AddonCountLabel]</label>
+					<shadowcolor>text_shadow</shadowcolor>
+				</control>
+			</control>
+			<control type="group" id="400">
+				<include>OpenClose_Right</include>
+				<include name="AddonLauncherPanel">
+					<param name="container_id" value="500" />
+					<param name="visible" value="Container(9000).HasFocus(1)" />
+					<param name="container_path" value="addons://sources/video/" />
+					<param name="container_target" value="videos" />
+				</include>
+				<include name="AddonLauncherPanel">
+					<param name="container_id" value="501" />
+					<param name="visible" value="Container(9000).HasFocus(2)" />
+					<param name="container_path" value="addons://sources/audio/" />
+					<param name="container_target" value="music" />
+				</include>
+				<include name="AddonLauncherPanel">
+					<param name="container_id" value="502" />
+					<param name="visible" value="Container(9000).HasFocus(3)" />
+					<param name="container_path" value="addons://sources/executable/" />
+					<param name="container_target" value="programs" />
+				</include>
+				<include name="AddonLauncherPanel" condition="System.Platform.Android">
+					<param name="container_id" value="506" />
+					<param name="visible" value="Container(9000).HasFocus(4)" />
+					<param name="container_path" value="androidapps://" />
+					<param name="container_target" value="programs" />
+				</include>
+				<include name="AddonLauncherPanel">
+					<param name="container_id" value="503" />
+					<param name="visible" value="Container(9000).HasFocus(5)" />
+					<param name="container_path" value="addons://sources/image/" />
+					<param name="container_target" value="pictures" />
+				</include>
+				
+			</control>
+			<control type="scrollbar" id="531">
+				<left>1907</left>
+				<top>80</top>
+				<width>13</width>
+				<height>919</height>
+				<onleft>400</onleft>
+				<onright>noop</onright>
+				<orientation>vertical</orientation>
+				<texturesliderbackground colordiffuse="22FFFFFF">colors/white.png</texturesliderbackground>
+				<animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation>
+				<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
+				<animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
+			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[24001]" />
+				<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
+			</include>
+			<include>BottomBar</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="500" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="501" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="502" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="503" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="504" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="UpDownArrows">
+				<param name="container_id" value="505" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<include name="InfoList">
+				<param name="path" value="addons://outdated/" />
+				<param name="height" value="1" />
+				<param name="width" value="1" />
+				<param name="list_id" value="8000" />
+				<param name="item_label" value="" />
+			</include>
+		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Custom_1102_TextViewer.xml Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window type="dialog" id="1102">
-	<defaultcontrol always="true">3000</defaultcontrol>
+	<defaultcontrol always="true">1000</defaultcontrol>
 	<include>Animation_DialogPopupOpenClose</include>
 	<controls>
 		<control type="group">
@@ -28,6 +28,12 @@
 				<onup>3000</onup>
 			</control>
 		</control>
+		<control type="button" id="1000">
+			<include>HiddenObject</include>
+			<onclick>Action(Close)</onclick>
+			<onup>PageUp(3000)</onup>
+			<ondown>PageDown(3000)</ondown>
+		</control>
 		<control type="button">
 			<left>936</left>
 			<top>113</top>
@@ -37,7 +43,7 @@
 			<onclick>Up</onclick>
 			<texturefocus colordiffuse="button_focus" flipy="true">overlays/arrowdown.png</texturefocus>
 			<texturenofocus colordiffuse="button_focus" flipy="true">overlays/arrowdown.png</texturenofocus>
-			<visible>Control.IsVisible(3000) + IntegerGreaterThan(Container(2000).CurrentPage,1)</visible>
+			<visible>Control.IsVisible(3000) + Integer.IsGreater(Container(2000).CurrentPage,1)</visible>
 			<animation delay="80" effect="fade" time="120">VisibleChange</animation>
 		</control>
 		<control type="button">
@@ -49,7 +55,7 @@
 			<onclick>Down</onclick>
 			<texturefocus colordiffuse="button_focus">overlays/arrowdown.png</texturefocus>
 			<texturenofocus colordiffuse="button_focus">overlays/arrowdown.png</texturenofocus>
-			<visible>Control.IsVisible(3000) + !StringCompare(Container(2000).CurrentPage,Container(2000).NumPages)</visible>
+			<visible>Control.IsVisible(3000) + !Integer.IsEqual(Container(2000).CurrentPage,Container(2000).NumPages)</visible>
 			<animation delay="80" effect="fade" time="120">VisibleChange</animation>
 		</control>
 	</controls>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Custom_1105_MusicOSDSettings.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Custom_1106_VideoOSDSettings.xml Deleted

@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="1106">
-	<defaultcontrol always="true">5000</defaultcontrol>
-	<coordinates>
-		<left>660</left>
-		<top>220</top>
-	</coordinates>
-	<include>Animation_DialogPopupOpenClose</include>
-	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="600" />
-			<param name="DialogBackgroundHeight" value="550" />
-			<param name="DialogHeaderLabel" value="$LOCALIZE[5]" />
-			<param name="DialogHeaderId" value="" />
-		</include>
-		<control type="list" id="5000">
-			<left>2</left>
-			<top>107</top>
-			<width>596</width>
-			<height>660</height>
-			<onup>5000</onup>
-			<ondown>5000</ondown>
-			<onleft>99</onleft>
-			<onright>61</onright>
-			<include name="DefaultSimpleListLayout">
-				<param name="width" value="600" />
-				<param name="list_id" value="5000" />
-				<param name="align" value="center" />
-			</include>
-			<content>
-				<item>
-					<label>$LOCALIZE[13396]</label>
-					<onclick>Dialog.Close(all)</onclick>
-					<onclick>ActivateWindow(osdaudiosettings)</onclick>
-				</item>
-				<item>
-					<label>$LOCALIZE[13395]</label>
-					<onclick>Dialog.Close(all)</onclick>
-					<onclick>ActivateWindow(osdvideosettings)</onclick>
-				</item>
-				<item>
-					<label>$LOCALIZE[15020]</label>
-					<onclick>Dialog.Close(all)</onclick>
-					<onclick>ActivateWindow(AudioDSPManager)</onclick>
-					<visible>system.getbool(audiooutput.dspaddonsenabled)</visible>
-				</item>
-
-				<item>
-					<label>$LOCALIZE[31091]</label>
-					<onclick>Dialog.Close(all)</onclick>
-					<onclick>ActivateWindow(SubtitleSearch)</onclick>
-					<visible>!VideoPlayer.Content(livetv)</visible>
-				</item>
-			</content>
-		</control>
-	</controls>
-</window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Custom_1109_TopBarOverlay.xml Changed

@@ -5,13 +5,82 @@
     <animation effect="fade" start="0" end="100" time="100">WindowOpen</animation>
     <animation effect="fade" start="100" end="0" time="100">WindowClose</animation>
     <controls>
-        <include name="TopBar">
-            <param name="time_sublabel" value="$INFO[Player.FinishTime,$LOCALIZE[31080]: ]" />
-            <param name="breadcrumbs_icon" value="icons/settings/video.png" />
-        </include>
-        <include name="InfoDialogTopBarInfo">
-            <param name="main_label" value="$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year, ([COLOR button_focus],[/COLOR])]" />
-            <param name="sub_label" value="$VAR[OSDSubLabelVar]" />
-        </include>
+        <control type="group">
+            <animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
+            <depth>DepthBars</depth>
+            <control type="image">
+                <left>0</left>
+                <top>0</top>
+                <width>1920</width>
+                <height>80</height>
+                <texture>frame/InfoBar.png</texture>
+            </control>
+            <control type="image">
+                <top>10</top>
+                <width>80</width>
+                <height>80</height>
+                <texture colordiffuse="button_focus">icons/settings/video.png</texture>
+            </control>
+            <control type="grouplist">
+                <left>85</left>
+                <description>Left side of top bar</description>
+                <width>900</width>
+                <height>100</height>
+                <orientation>horizontal</orientation>
+                <usecontrolcoords>true</usecontrolcoords>
+                <control type="label">
+                    <label>$INFO[VideoPlayer.Title]$INFO[VideoPlayer.Year, ([COLOR button_focus],[/COLOR])]</label>
+                    <include>BreadcrumbsLabel</include>
+                </control>
+            </control>
+            <control type="label">
+                <top>40</top>
+                <label>$VAR[OSDSubLabelVar]</label>
+                <font>font10</font>
+                <left>85</left>
+                <shadowcolor>text_shadow</shadowcolor>
+                <height>100</height>
+                <width>auto</width>
+            </control>
+            <control type="group">
+                <visible>!Window.IsVisible(extendedprogressdialog)</visible>
+                <animation effect="fade" time="150">VisibleChange</animation>
+                <control type="grouplist">
+                    <description>Right side of top bar</description>
+                    <right>85</right>
+                    <width>500</width>
+                    <height>100</height>
+                    <align>right</align>
+                    <orientation>horizontal</orientation>
+                    <usecontrolcoords>true</usecontrolcoords>
+                    <include condition="Skin.HasSetting(show_weatherinfo)">TopWeatherIcon</include>
+                    <control type="label">
+                        <include>BreadcrumbsLabel</include>
+                        <label>$INFO[System.Time]</label>
+                    </control>
+                </control>
+                <control type="image">
+                    <right>25</right>
+                    <top>20</top>
+                    <height>40</height>
+                    <width>40</width>
+                    <texture colordiffuse="button_focus">frame/clock.png</texture>
+                    <animation effect="fade" time="300">Visible</animation>
+                    <animation effect="fade" time="150">Hidden</animation>
+                    <aspectratio>keep</aspectratio>
+                    <visible>!Window.IsActive(volumebar)</visible>
+                </control>
+                <control type="label">
+                    <top>40</top>
+                    <label>$INFO[Player.FinishTime,$LOCALIZE[31080]: ]</label>
+                    <font>font10</font>
+                    <left>1340</left>
+                    <shadowcolor>text_shadow</shadowcolor>
+                    <height>100</height>
+                    <width>500</width>
+                    <align>right</align>
+                </control>
+            </control>
+        </control>
     </controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogAddonInfo.xml Changed

@@ -1,38 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload condition="!ListItem.Property(addon.isinstalled) + Window.IsActive(addonbrowser)">SetFocus(6)</onload>
+	<onload>SetProperty(infobackground,$INFO[ListItem.Art(fanart)],home)</onload>
+	<onunload>ClearProperty(infobackground,home)</onunload>
 	<controls>
 		<control type="group">
 			<include>OpenClose_Right</include>
 			<control type="button">
-				<left>815</left>
+				<left>770</left>
 				<top>162</top>
-				<width>1000</width>
-				<height>509</height>
-				<aligny>bottom</aligny>
-				<font>font_textbox</font>
+				<width>1040</width>
+				<height>559</height>
 				<label>-</label>
 			</control>
-			<control type="label">
-				<left>865</left>
+			<control type="textbox">
+				<left>840</left>
 				<top>200</top>
 				<width>900</width>
-				<height>396</height>
-				<wrapmultiline>true</wrapmultiline>
-				<font>font12</font>
-				<label>$INFO[ListItem.AddonSummary,[B],[/B][CR]][COLOR=white]$INFO[ListItem.AddonDescription][/COLOR][COLOR=white][CR]$INFO[ListItem.AddonDisclaimer,[CR][CR]$LOCALIZE[24052]: ][/COLOR]</label>
+				<height>380</height>
+				<font>font_textbox</font>
+				<label>$INFO[ListItem.AddonSummary,[B],[/B][CR]][COLOR=white]$INFO[ListItem.AddonDescription][/COLOR][COLOR=white][CR][/COLOR]</label>
+				<textcolor>button_focus</textcolor>
+			</control>
+			<control type="textbox">
+				<left>840</left>
+				<top>610</top>
+				<width>900</width>
+				<height>70</height>
+				<font>font_textbox</font>
+				<label fallback="31008">$INFO[ListItem.AddonDisclaimer,$LOCALIZE[24052]: ]</label>
 				<textcolor>button_focus</textcolor>
 			</control>
+			<control type="image">
+				<left>790</left>
+				<top>600</top>
+				<width>1000</width>
+				<height>3</height>
+				<texture colordiffuse="button_focus" border="2">dialogs/separator-grey.png</texture>
+			</control>
 			<control type="grouplist" id="9000">
-				<left>88</left>
-				<top>770</top>
-				<width>1920</width>
-				<height>768</height>
+				<left>90</left>
+				<top>820</top>
+				<width>1740</width>
+				<height>300</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
-				<align>left</align>
+				<align>center</align>
 				<itemgap>-18</itemgap>
 				<orientation>horizontal</orientation>
 				<include name="InfoDialogButton">
@@ -61,70 +77,75 @@
 					<radioposy>14</radioposy>
 					<radiowidth>100</radiowidth>
 					<font>font12</font>
+					<visible>Control.IsEnabled(13)</visible>
 				</control>
 				<include name="InfoDialogButton">
 					<param name="id" value="10" />
 					<param name="icon" value="icons/infodialogs/changelog.png" />
 					<param name="label" value="$LOCALIZE[24036]" />
 				</include>
-				<include name="InfoDialogButton">
+				<include name="InfoDialogToggleButton">
 					<param name="id" value="7" />
-					<param name="icon" value="icons/infodialogs/disable.png" />
-					<param name="label" value="$LOCALIZE[24021]" />
+					<param name="icon_on" value="icons/infodialogs/disable.png" />
+					<param name="icon_off" value="icons/infodialogs/enabled.png" />
+					<param name="selected" value="!String.StartsWith(Control.GetLabel(7),$LOCALIZE[24022]) | !Window.IsActive(addonbrowser)" />
+					<param name="label" value="" />
+				</include>
+				<include name="InfoDialogToggleButton">
+					<param name="id" value="6" />
+					<param name="icon_on" value="icons/infodialogs/uninstall.png" />
+					<param name="icon_off" value="icons/infodialogs/install.png" />
+					<param name="selected" value="ListItem.Property(addon.isinstalled) | !Window.IsActive(addonbrowser)" />
+					<param name="label" value="" />
 				</include>
-				<control type="radiobutton" id="6">
-					<width>262</width>
-					<height>140</height>
-					<align>center</align>
-					<aligny>top</aligny>
-					<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
-					<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
-					<textoffsetx>35</textoffsetx>
-					<textoffsety>76</textoffsety>
-					<radioposx>110</radioposx>
-					<radioposy>14</radioposy>
-					<radiowidth>44</radiowidth>
-					<font>font12</font>
-					<textureradioonfocus colordiffuse="D0FFFFFF">icons/infodialogs/uninstall.png</textureradioonfocus>
-					<textureradioonnofocus colordiffuse="D0FFFFFF">icons/infodialogs/uninstall.png</textureradioonnofocus>
-					<textureradioondisabled colordiffuse="disabled">icons/infodialogs/uninstall.png</textureradioondisabled>
-					<textureradioofffocus colordiffuse="D0FFFFFF">icons/infodialogs/install.png</textureradioofffocus>
-					<textureradiooffnofocus colordiffuse="D0FFFFFF">icons/infodialogs/install.png</textureradiooffnofocus>
-					<textureradiooffdisabled colordiffuse="disabled">icons/infodialogs/install.png</textureradiooffdisabled>
-					<selected>ListItem.Property(addon.isinstalled) | !Window.IsActive(addonbrowser)</selected>
-				</control>
 			</control>
 		</control>
 		<control type="group">
 			<include>OpenClose_Left</include>
-			<visible>Window.IsActive(eventlog) | Window.IsActive(home)</visible>
-			<include>Visible_Left</include>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<include name="InfoDialogTopBarInfo">
-			<param name="main_label" value="$INFO[ListItem.AddonName]" />
-			<param name="sub_label" value="$INFO[ListItem.AddonVersion,[COLOR button_focus],[/COLOR]]$INFO[ListItem.AddonCreator, $LOCALIZE[31071] ]" />
-		</include>
-		<control type="group">
-			<visible>!IsEmpty(ListItem.AddonBroken)</visible>
-			<include>OpenClose_Fade</include>
+			<left>120</left>
+			<control type="image">
+				<top>162</top>
+				<width>559</width>
+				<height>559</height>
+				<aspectratio>scale</aspectratio>
+				<texture colordiffuse="border_alpha">colors/black.png</texture>
+				<bordertexture border="20">overlays/shadow.png</bordertexture>
+				<bordersize>20</bordersize>
+			</control>
 			<control type="image">
-				<left>114</left>
+				<left>24</left>
 				<top>186</top>
-				<width>461</width>
-				<height>461</height>
-				<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
+				<width>511</width>
+				<height>511</height>
+				<aspectratio aligny="top">scale</aspectratio>
+				<fadetime>300</fadetime>
+				<texture background="true" fallback="DefaultFolderSquare.png">$INFO[ListItem.Art(thumb)]</texture>
 			</control>
-			<control type="textbox">
-				<left>130</left>
-				<top>190</top>
-				<width>420</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<height>400</height>
-				<label>$LOCALIZE[24096]</label>
-				<font>font24_title</font>
+			<control type="group">
+				<visible>!String.IsEmpty(ListItem.AddonBroken)</visible>
+				<include>OpenClose_Fade</include>
+				<control type="image">
+					<left>24</left>
+					<top>186</top>
+					<width>511</width>
+					<height>511</height>
+					<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
+				</control>
+				<control type="textbox">
+					<left>24</left>
+					<top>186</top>
+					<width>511</width>
+					<height>511</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<label>$LOCALIZE[24096]</label>
+					<font>font24_title</font>
+				</control>
 			</control>
 		</control>
+		<include name="InfoDialogTopBarInfo">
+			<param name="main_label" value="$INFO[ListItem.AddonName]" />
+			<param name="sub_label" value="$INFO[ListItem.AddonVersion,[COLOR grey],[/COLOR]]$INFO[ListItem.AddonCreator, $LOCALIZE[31071] ]" />
+		</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogAddonSettings.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogBusy.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogButtonMenu.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogConfirm.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogExtendedProgressBar.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogFavourites.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogFullScreenInfo.xml Changed

@@ -92,7 +92,7 @@
 					<textoffsetx>40</textoffsetx>
 					<onclick>Close</onclick>
 					<label>$LOCALIZE[206]</label>
-					<visible>!IsEmpty(VideoPlayer.CastAndRole)</visible>
+					<visible>!String.IsEmpty(VideoPlayer.CastAndRole)</visible>
 				</control>
 				<control type="button" id="5555">
 					<width>auto</width>
@@ -260,21 +260,21 @@
 						<width>150</width>
 						<height>56</height>
 						<aspectratio align="right">scale</aspectratio>
-						<visible>!IsEmpty(ADSP.MasterOwnIcon)</visible>
+						<visible>!String.IsEmpty(ADSP.MasterOwnIcon)</visible>
 						<texture>$INFO[ADSP.MasterOwnIcon]</texture>
 					</control>
 					<control type="image">
 						<width>150</width>
 						<height>56</height>
 						<aspectratio align="center">scale</aspectratio>
-						<visible>IsEmpty(ADSP.MasterOverrideIcon)</visible>
+						<visible>String.IsEmpty(ADSP.MasterOverrideIcon)</visible>
 						<texture>$INFO[VideoPlayer.AudioCodec,flags/audio/,.png]</texture>
 					</control>
 					<control type="image">
 						<width>150</width>
 						<height>56</height>
 						<aspectratio align="right">scale</aspectratio>
-						<visible>!IsEmpty(ADSP.MasterOverrideIcon)</visible>
+						<visible>!String.IsEmpty(ADSP.MasterOverrideIcon)</visible>
 						<texture>$INFO[ADSP.MasterOverrideIcon]</texture>
 					</control>
 					<control type="image">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogGameControllers.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogKeyboard.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogMusicInfo.xml Changed

@@ -1,45 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload>SetProperty(infobackground,$INFO[ListItem.Art(fanart)],home)</onload>
+	<onunload>ClearProperty(infobackground,home)</onunload>
 	<controls>
 		<control type="group">
+			<include>OpenClose_Left</include>
+			<top>158</top>
+			<left>40</left>
+			<control type="image">
+				<width>615</width>
+				<height>615</height>
+				<aspectratio>scale</aspectratio>
+				<texture colordiffuse="border_alpha">colors/black.png</texture>
+				<bordertexture border="20">overlays/shadow.png</bordertexture>
+				<bordersize>20</bordersize>
+			</control>
+			<control type="image">
+				<left>24</left>
+				<top>24</top>
+				<width>567</width>
+				<height>567</height>
+				<aspectratio aligny="top">scale</aspectratio>
+				<fadetime>300</fadetime>
+				<texture background="true" fallback="DefaultFolderSquare.png">$INFO[ListItem.Art(thumb)]</texture>
+			</control>
+		</control>
+		<control type="group">
 			<include>OpenClose_Right</include>
 			<include>Visible_Right</include>
+			<left>80</left>
 			<visible>![Window.Is(songinformation) + Window.IsActive(musicinformation)]</visible>
 			<control type="group">
-				<animation effect="fade" start="0" end="100" time="100" delay="300">WindowOpen</animation>
-				<animation effect="fade" start="100" end="0" time="0">WindowClose</animation>
-				<control type="image">
-					<left>90</left>
-					<top>162</top>
-					<width>509</width>
-					<height>509</height>
-					<aspectratio>scale</aspectratio>
-					<texture colordiffuse="border_alpha">colors/black.png</texture>
-					<bordertexture border="20">overlays/shadow.png</bordertexture>
-					<bordersize>20</bordersize>
-				</control>
-				<control type="image">
-					<left>114</left>
-					<top>186</top>
-					<width>461</width>
-					<height>461</height>
-					<aspectratio aligny="top">scale</aspectratio>
-					<fadetime>300</fadetime>
-					<texture background="true" fallback="DefaultFolderSquare.png">$INFO[ListItem.Art(thumb)]</texture>
-				</control>
-			</control>
-			<control type="group">
-				<visible>StringCompare(Container(50).NumItems,0) + IsEmpty(Control.GetLabel(400))</visible>
+				<visible>Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(Control.GetLabel(400))</visible>
 				<top>160</top>
 				<control type="button" id="130">
 					<left>586</left>
-					<width>1254</width>
-					<height>520</height>
-					<textoffsetx>40</textoffsetx>
-					<textoffsety>20</textoffsety>
-					<aligny>bottom</aligny>
-					<font>font_textbox</font>
+					<width>1190</width>
+					<height>610</height>
 					<onup>50</onup>
 					<ondown>9000</ondown>
 					<label>-</label>
@@ -47,27 +45,27 @@
 				<control type="image">
 					<left>614</left>
 					<top>30</top>
-					<width>1194</width>
-					<height>460</height>
+					<width>1130</width>
+					<height>550</height>
 					<aspectratio aligny="top">scale</aspectratio>
 					<texture fallback="special://skin/extras/home-images/music.jpg">$INFO[ListItem.Art(fanart)]</texture>
-					<visible>IsEmpty(Control.GetLabel(400))</visible>
+					<visible>String.IsEmpty(Control.GetLabel(400))</visible>
 				</control>
 				<control type="group">
-					<visible>IsEmpty(Control.GetLabel(400)) + IsEmpty(ListItem.Art(fanart))</visible>
+					<visible>String.IsEmpty(Control.GetLabel(400)) + String.IsEmpty(ListItem.Art(fanart))</visible>
 					<control type="image">
 						<left>614</left>
 						<top>30</top>
-						<width>1194</width>
-						<height>460</height>
+						<width>1130</width>
+						<height>550</height>
 						<aspectratio>scale</aspectratio>
 						<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
 					</control>
 					<control type="textbox">
 						<left>614</left>
 						<top>30</top>
-						<width>1194</width>
-						<height>460</height>
+						<width>1130</width>
+						<height>550</height>
 						<align>center</align>
 						<aligny>center</aligny>
 						<font>font30_title</font>
@@ -76,51 +74,46 @@
 				</control>
 			</control>
 			<control type="group">
-				<visible>!StringCompare(Container(50).NumItems,0) | !IsEmpty(Control.GetLabel(400))</visible>
+				<visible>!Integer.IsEqual(Container(50).NumItems,0) | !String.IsEmpty(Control.GetLabel(400))</visible>
 				<top>454</top>
 				<control type="button" id="130">
 					<onup>50</onup>
 					<ondown>9000</ondown>
 					<left>586</left>
 					<top>-295</top>
-					<width>1254</width>
+					<width>1190</width>
 					<height>320</height>
-					<textoffsetx>40</textoffsetx>
-					<textoffsety>20</textoffsety>
-					<aligny>bottom</aligny>
-					<font>font_textbox</font>
 					<label>-</label>
-					<visible>StringCompare(Container(50).NumItems,0)</visible>
+					<visible>Integer.IsEqual(Container(50).NumItems,0)</visible>
 				</control>
 				<control type="button" id="130">
 					<onup>50</onup>
 					<ondown>9000</ondown>
 					<left>586</left>
-					<width>1254</width>
+					<width>1190</width>
 					<height>320</height>
-					<textoffsetx>40</textoffsetx>
-					<textoffsety>20</textoffsety>
-					<aligny>bottom</aligny>
-					<font>font_textbox</font>
 					<label>-</label>
+					<onclick>SetProperty(TextViewer_Header,$LOCALIZE[21821],home)</onclick>
+					<onclick>SetProperty(TextViewer_Text,$ESCVAR[MusicInfoTextboxVar],home)</onclick>
+					<onclick>ActivateWindow(1102)</onclick>
 				</control>
 				<control type="group">
-					<animation effect="slide" start="0,0" end="0,-295" time="0" condition="StringCompare(Container(50).NumItems,0)">Conditional</animation>
-					<visible>[!StringCompare(Container(50).NumItems,0) + IsEmpty(Control.GetLabel(400))] | [StringCompare(Container(50).NumItems,0) + !IsEmpty(Control.GetLabel(400))]</visible>
+					<animation effect="slide" start="0,0" end="0,-295" time="0" condition="Integer.IsEqual(Container(50).NumItems,0)">Conditional</animation>
+					<visible>[!Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(Control.GetLabel(400))] | [Integer.IsEqual(Container(50).NumItems,0) + !String.IsEmpty(Control.GetLabel(400))]</visible>
 					<control type="image">
 						<left>614</left>
 						<top>30</top>
-						<width>1194</width>
+						<width>1130</width>
 						<height>260</height>
 						<aspectratio aligny="top">scale</aspectratio>
 						<texture fallback="special://skin/extras/home-images/music.jpg">$INFO[ListItem.Art(fanart)]</texture>
 					</control>
 					<control type="group">
-						<visible>IsEmpty(ListItem.Art(fanart))</visible>
+						<visible>String.IsEmpty(ListItem.Art(fanart))</visible>
 						<control type="image">
 							<left>614</left>
 							<top>30</top>
-							<width>1194</width>
+							<width>1130</width>
 							<height>260</height>
 							<aspectratio>scale</aspectratio>
 							<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
@@ -128,7 +121,7 @@
 						<control type="textbox">
 							<left>614</left>
 							<top>30</top>
-							<width>1194</width>
+							<width>1130</width>
 							<height>260</height>
 							<align>center</align>
 							<aligny>center</aligny>
@@ -141,25 +134,25 @@
 			<control type="label" id="400">
 				<left>620</left>
 				<top>480</top>
-				<width>1170</width>
+				<width>1100</width>
 				<height>240</height>
 				<wrapmultiline>true</wrapmultiline>
-				<font>font12</font>
+				<font>font_textbox</font>
 				<label>$VAR[MusicInfoTextboxVar]</label>
 				<textcolor>button_focus</textcolor>
 			</control>
 			<control type="panel" id="50">
 				<left>585</left>
 				<top>170</top>
-				<width>1260</width>
+				<width>1190</width>
 				<height>360</height>
 				<ondown>130</ondown>
 				<onup>9000</onup>
 				<orientation>horizontal</orientation>
-				<itemlayout height="72.5" width="630" condition="Container.Content(albums)">
+				<itemlayout height="72.5" width="595" condition="Container.Content(albums)">
 					<control type="image">
 						<top>-10</top>
-						<width>626</width>
+						<width>595</width>
 						<height>100</height>
 						<texture border="40">buttons/button-nofo.png</texture>
 					</control>
@@ -178,11 +171,11 @@
 						<include>UserRatingCircle</include>
 					</control>
 				</itemlayout>
-				<focusedlayout height="72.5" width="630" condition="Container.Content(albums)">
+				<focusedlayout height="72.5" width="595" condition="Container.Content(albums)">
 					<control type="group">
 						<control type="image">
 							<top>-10</top>
-							<width>626</width>
+							<width>595</width>
 							<height>100</height>
 							<texture border="40">buttons/button-theme-fo.png</texture>
 						</control>
@@ -202,18 +195,18 @@
 						</control>
 					</control>
 				</focusedlayout>
-				<itemlayout height="360" width="249" condition="Container.Content(artists)">
+				<itemlayout height="360" width="236" condition="Container.Content(artists)">
 					<control type="image">
 						<top>-10</top>
-						<width>262</width>
+						<width>250</width>
 						<height>312</height>
 						<texture border="40">buttons/button-nofo.png</texture>
 					</control>
 					<control type="image">
-						<left>35</left>
+						<left>30</left>
 						<top>21</top>
-						<width>188</width>
-						<height>188</height>
+						<width>190</width>
+						<height>190</height>
 						<texture border="2" fallback="DefaultFolderSquare.png" background="true">$INFO[ListItem.Thumb]</texture>
 						<aspectratio>keep</aspectratio>
 						<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
@@ -235,21 +228,21 @@
 						<include>UserRatingCircle</include>
 					</control>
 				</itemlayout>
-				<focusedlayout height="360" width="249" condition="Container.Content(artists)">
+				<focusedlayout height="360" width="236" condition="Container.Content(artists)">
 					<control type="group">
 						<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
 						<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
 						<control type="image">
 							<top>-10</top>
-							<width>262</width>
+							<width>250</width>
 							<height>312</height>
 							<texture border="40">buttons/button-nofo.png</texture>
 						</control>
 						<control type="image">
-							<left>35</left>
+							<left>30</left>
 							<top>21</top>
-							<width>188</width>
-							<height>188</height>
+							<width>190</width>
+							<height>190</height>
 							<texture border="2" fallback="DefaultFolderSquare.png" background="true">$INFO[ListItem.Thumb]</texture>
 							<aspectratio>keep</aspectratio>
 							<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
@@ -273,8 +266,8 @@
 						<control type="image">
 							<left>15</left>
 							<top>5</top>
-							<width>230</width>
-							<height>276</height>
+							<width>220</width>
+							<height>278</height>
 							<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
 							<animation effect="fade" start="100" end="0" time="200">Unfocus</animation>
 						</control>
@@ -282,20 +275,20 @@
 				</focusedlayout>
 			</control>
 			<control type="grouplist" id="9000">
-				<left>585</left>
-				<top>768</top>
-				<width>1260</width>
-				<height>768</height>
+				<left>10</left>
+				<top>820</top>
+				<width>1740</width>
+				<height>300</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 				<onup>130</onup>
 				<ondown>50</ondown>
 				<align>center</align>
-				<itemgap>-13</itemgap>
+				<itemgap>0</itemgap>
 				<orientation>horizontal</orientation>
 				<control type="group" id="420">
 					<width>262</width>
-					<visible>Stringcompare(ListItem.DBType,album) | Stringcompare(ListItem.DBType,song)</visible>
+					<visible>String.IsEqual(ListItem.DBType,album) | String.IsEqual(ListItem.DBType,song)</visible>
 					<control type="button" id="7">
 						<include name="VideoInfoButtonsCommon">
 							<param name="icon" value="" />
@@ -304,8 +297,8 @@
 						<onup>130</onup>
 						<onleft>440</onleft>
 						<onright>120</onright>
-						<onup condition="IntegerGreaterThan(Container(5000).CurrentItem,3)">210</onup>
-						<onup condition="!IntegerGreaterThan(Container(5000).CurrentItem,3)">138</onup>
+						<onup condition="Integer.IsGreater(Container(5000).CurrentItem,3)">210</onup>
+						<onup condition="!Integer.IsGreater(Container(5000).CurrentItem,3)">138</onup>
 					</control>
 					<control type="label">
 						<label>$INFO[ListItem.UserRating]</label>
@@ -322,7 +315,7 @@
 						<width>48</width>
 						<height>48</height>
 						<align>center</align>
-						<visible>IsEmpty(ListItem.UserRating)</visible>
+						<visible>String.IsEmpty(ListItem.UserRating)</visible>
 					</control>
 				</control>
 				<control type="radiobutton" id="120">
@@ -330,10 +323,10 @@
 						<param name="icon" value="icons/infodialogs/image.png" />
 					</include>
 					<label>$LOCALIZE[31028]</label>
-					<enable>!IsEmpty(ListItem.Art(fanart))</enable>
+					<enable>!String.IsEmpty(ListItem.Art(fanart))</enable>
 					<onclick>SetProperty(fanart,$ESCINFO[ListItem.Art(fanart)],home)</onclick>
 					<onclick>ActivateWindow(1104)</onclick>
-					<visible>Stringcompare(ListItem.DBType,artist) | Stringcompare(ListItem.DBType,album)</visible>
+					<visible>String.IsEqual(ListItem.DBType,artist) | String.IsEqual(ListItem.DBType,album)</visible>
 				</control>
 				<include name="InfoDialogButton">
 					<param name="id" value="6" />
@@ -357,20 +350,20 @@
 					</include>
 					<onclick>Action(close)</onclick>
 					<visible>System.hasAddon(script.extendedinfo)</visible>
-					<onclick condition="!Stringcompare(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick>
-					<onclick condition="Stringcompare(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick>
+					<onclick condition="!String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Album])</onclick>
+					<onclick condition="String.IsEqual(ListItem.DBType,song)">RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Artist] $INFO[ListItem.Title])</onclick>
 				</control>
 			</control>
 			<include name="LeftRightArrows">
 				<param name="list_id" value="50" />
 				<param name="left_posx" value="574" />
-				<param name="right_posx" value="1840" />
+				<param name="right_posx" value="1780" />
 				<param name="posy" value="300" />
 				<param name="visible" value="true" />
 			</include>
 		</control>
 		<control type="group">
-			<visible>Stringcompare(ListItem.DBType,artist)</visible>
+			<visible>String.IsEqual(ListItem.DBType,artist)</visible>
 			<include name="InfoDialogTopBarInfo">
 				<param name="main_label" value="$INFO[ListItem.Artist]" />
 				<param name="sub_label" value="$INFO[ListItem.Genre]" />
@@ -378,18 +371,18 @@
 			</include>
 		</control>
 		<control type="group">
-			<visible>Stringcompare(ListItem.DBType,album)</visible>
+			<visible>String.IsEqual(ListItem.DBType,album)</visible>
 			<include name="InfoDialogTopBarInfo">
-				<param name="main_label" value="$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]" />
+				<param name="main_label" value="$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])]" />
 				<param name="sub_label" value="$INFO[ListItem.Artist]" />
 				<param name="id" value="33334" />
 			</include>
 		</control>
 		<control type="group">
-			<visible>Stringcompare(ListItem.DBType,song) + !Window.IsActive(musicinformation)</visible>
+			<visible>String.IsEqual(ListItem.DBType,song) + !Window.IsActive(musicinformation)</visible>
 			<include name="InfoDialogTopBarInfo">
 				<param name="main_label" value="[COLOR button_focus]$INFO[ListItem.TrackNumber]. [/COLOR]$INFO[ListItem.Title]" />
-				<param name="sub_label" value="$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]" />
+				<param name="sub_label" value="$INFO[ListItem.Artist,, - ]$INFO[ListItem.Album]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])]" />
 				<param name="id" value="33335" />
 			</include>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogNotification.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPVRChannelManager.xml Changed

@@ -51,7 +51,7 @@
 						<height>68</height>
 						<texture colordiffuse="selected">colors/white.png</texture>
 						<animation effect="fade" end="20" time="0" condition="true">Conditional</animation>
-						<visible>!IsEmpty(ListItem.Property(Changed))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Changed))</visible>
 					</control>
 					<control type="image">
 						<left>0</left>
@@ -88,7 +88,7 @@
 						<height>68</height>
 						<texture colordiffuse="selected">colors/white.png</texture>
 						<animation effect="fade" end="20" time="0" condition="true">Conditional</animation>
-						<visible>!IsEmpty(ListItem.Property(Changed))</visible>
+						<visible>!String.IsEmpty(ListItem.Property(Changed))</visible>
 					</control>
 					<control type="image">
 						<left>0</left>
@@ -239,7 +239,7 @@
 					<aligny>center</aligny>
 					<label>$LOCALIZE[19024]</label>
 					<altlabel>$LOCALIZE[19023]</altlabel>
-					<usealttexture>!IsEmpty(Window.Property(IsRadio))</usealttexture>
+					<usealttexture>!String.IsEmpty(Window.Property(IsRadio))</usealttexture>
 				</control>
 			</control>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPVRChannelsOSD.xml Changed

@@ -68,7 +68,7 @@
 				<control type="label">
 					<left>5</left>
 					<top>0</top>
-					<width>70</width>
+					<width>80</width>
 					<height>110</height>
 					<font>font24_title</font>
 					<align>center</align>
@@ -86,7 +86,7 @@
 					<visible>ListItem.IsRecording</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>5</top>
 					<width>350</width>
 					<height>40</height>
@@ -94,7 +94,7 @@
 					<label>$INFO[ListItem.Label]</label>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>46</top>
 					<width>350</width>
 					<height>20</height>
@@ -102,10 +102,10 @@
 					<textcolor>grey</textcolor>
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.Title]</label>
-					<visible>IsEmpty(Listitem.Icon)</visible>
+					<visible>String.IsEmpty(Listitem.Icon)</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>46</top>
 					<width>300</width>
 					<height>20</height>
@@ -113,10 +113,10 @@
 					<textcolor>grey</textcolor>
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.Title]</label>
-					<visible>!IsEmpty(Listitem.Icon)</visible>
+					<visible>!String.IsEmpty(Listitem.Icon)</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>75</top>
 					<width>90</width>
 					<height>20</height>
@@ -178,7 +178,7 @@
 				<control type="label">
 					<left>5</left>
 					<top>0</top>
-					<width>70</width>
+					<width>80</width>
 					<height>110</height>
 					<font>font24_title</font>
 					<align>center</align>
@@ -196,7 +196,7 @@
 					<visible>ListItem.IsRecording</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>5</top>
 					<width>350</width>
 					<height>40</height>
@@ -204,7 +204,7 @@
 					<label>$INFO[ListItem.Label]</label>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>46</top>
 					<width>350</width>
 					<height>20</height>
@@ -212,10 +212,10 @@
 					<textcolor>grey</textcolor>
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.Title]</label>
-					<visible>IsEmpty(Listitem.Icon)</visible>
+					<visible>String.IsEmpty(Listitem.Icon)</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>46</top>
 					<width>300</width>
 					<height>20</height>
@@ -223,10 +223,10 @@
 					<textcolor>grey</textcolor>
 					<aligny>center</aligny>
 					<label>$INFO[ListItem.Title]</label>
-					<visible>!IsEmpty(Listitem.Icon)</visible>
+					<visible>!String.IsEmpty(Listitem.Icon)</visible>
 				</control>
 				<control type="label">
-					<left>80</left>
+					<left>90</left>
 					<top>75</top>
 					<width>90</width>
 					<height>20</height>
@@ -301,7 +301,7 @@
 			<font>font12</font>
 			<textcolor>grey</textcolor>
 			<aligny>center</aligny>
-			<label>[COLOR button_focus][B]&lt;&gt;[/B][/COLOR]  Groups</label>
+			<label>[COLOR button_focus][B]&lt;&gt;[/B][/COLOR]  $LOCALIZE[19146]</label>
 		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPVRGuideSearch.xml Changed

@@ -3,13 +3,13 @@
 	<defaultcontrol always="true">9</defaultcontrol>
 	<coordinates>
 		<left>100</left>
-		<top>65</top>
+		<top>150</top>
 	</coordinates>
 	<include>Animation_DialogPopupOpenClose</include>
 	<controls>
 		<include name="DialogBackgroundCommons">
 			<param name="DialogBackgroundWidth" value="1720" />
-			<param name="DialogBackgroundHeight" value="900" />
+			<param name="DialogBackgroundHeight" value="780" />
 			<param name="DialogHeaderLabel" value="$LOCALIZE[19142]" />
 			<param name="DialogHeaderId" value="2" />
 		</include>
@@ -40,7 +40,7 @@
 			<left>10</left>
 			<top>210</top>
 			<width>1400</width>
-			<height>680</height>
+			<height>548</height>
 			<texture border="40">buttons/dialogbutton-nofo.png</texture>
 		</control>
 		<control type="grouplist" id="5000">
@@ -54,65 +54,49 @@
 			<control type="radiobutton" id="10">
 				<description>Include Description</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19134]</label>
 			</control>
 			<control type="radiobutton" id="11">
 				<description>Case Sensitive</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19135]</label>
 			</control>
 			<control type="edit" id="14">
 				<description>Start Date</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19128]</label>
 			</control>
 			<control type="edit" id="15">
 				<description>Stop Date</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19129]</label>
 			</control>
 			<control type="spincontrolex" id="18">
 				<description>Genre</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[515]</label>
 			</control>
 			<control type="radiobutton" id="20">
 				<description>Include unknown Genres</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19132]</label>
 			</control>
 			<control type="radiobutton" id="22">
 				<description>FTA only</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19123]</label>
 			</control>
 			<control type="radiobutton" id="24">
 				<description>Ignore Timers</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19124]</label>
 			</control>
 		</control>
@@ -125,65 +109,49 @@
 			<control type="spincontrolex" id="12">
 				<description>Min Duration</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19130]</label>
 			</control>
 			<control type="spincontrolex" id="13">
 				<description>Max Duration</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19131]</label>
 			</control>
 			<control type="edit" id="16">
 				<description>Start time</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19126]</label>
 			</control>
 			<control type="edit" id="17">
 				<description>Stop time</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19127]</label>
 			</control>
 			<control type="radiobutton" id="19">
 				<description>avoid repeats</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19121]</label>
 			</control>
 			<control type="spincontrolex" id="21">
 				<description>Groups</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19141]</label>
 			</control>
 			<control type="spincontrolex" id="23">
 				<description>Channels</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19148]</label>
 			</control>
 			<control type="radiobutton" id="27">
 				<description>Ignore Recordings</description>
 				<width>670</width>
-				<include name="DefaultSettingButton">
-					<param name="height" value="75" />
-				</include>
+				<include>DefaultSettingButton</include>
 				<label>$LOCALIZE[19125]</label>
 			</control>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPVRInfo.xml Changed

@@ -1,49 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload>SetProperty(infobackground,$INFO[ListItem.Art(fanart)],home)</onload>
+	<onunload>ClearProperty(infobackground,home)</onunload>
 	<controls>
-		<control type="group">
+		<control type="image">
 			<include>OpenClose_Left</include>
-			<control type="image">
-				<left>114</left>
-				<top>186</top>
-				<width>461</width>
-				<height>461</height>
-				<aspectratio>keep</aspectratio>
-				<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
-				<bordersize>4</bordersize>
-				<texture fallback="DefaultTVShowsSquare.png">$INFO[ListItem.Icon]</texture>
-			</control>
-			<control type="image">
-				<left>90</left>
-				<top>650</top>
-				<width>509</width>
-				<height>258</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
-			</control>
-			<control type="label">
-				<left>130</left>
-				<top>700</top>
-				<width>1030</width>
-				<height>30</height>
-				<font>font24_title</font>
-				<label>$INFO[Listitem.ChannelName]</label>
-				<aligny>center</aligny>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="textbox">
-				<left>130</left>
-				<top>740</top>
-				<width>1030</width>
-				<height>150</height>
-				<font>font12</font>
-				<label>$INFO[ListItem.StartTime] - $INFO[ListItem.EndTime] ($INFO[ListItem.Duration])[CR]$INFO[ListItem.StartDate]</label>
-				<aligny>top</aligny>
-				<shadowcolor>black</shadowcolor>
-			</control>
+			<left>114</left>
+			<top>236</top>
+			<width>461</width>
+			<height>461</height>
+			<aspectratio>keep</aspectratio>
+			<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
+			<bordersize>4</bordersize>
+			<texture fallback="DefaultTVShowsSquare.png">$INFO[ListItem.Icon]</texture>
 		</control>
 		<control type="group">
-			<top>180</top>
+			<top>230</top>
 			<left>50</left>
 			<include>OpenClose_Right</include>
 			<control type="button" id="61">
@@ -62,29 +35,18 @@
 			</control>
 			<control type="textbox" id="400">
 				<left>660</left>
-				<top>80</top>
+				<top>20</top>
 				<width>1050</width>
-				<height>368</height>
+				<height>425</height>
 				<align>justify</align>
-				<font>font12</font>
-				<label>$INFO[ListItem.Season, [COLOR button_focus]S[/COLOR]]$INFO[ListItem.Episode, [COLOR button_focus]E[/COLOR],: ]$INFO[ListItem.EpisodeName,[B],[/B][CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:[/COLOR] ,[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]:[/COLOR] ,[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]:[/COLOR] ,[CR]]$INFO[ListItem.Cast,[COLOR button_focus]$LOCALIZE[206]:[/COLOR] ,[CR]][CR]$INFO[ListItem.Plot]</label>
+				<font>font_textbox</font>
+				<label>$INFO[ListItem.StartTime] - $INFO[ListItem.EndTime] ($INFO[ListItem.Duration])[CR]$INFO[ListItem.StartDate][CR]$INFO[ListItem.Season, [COLOR button_focus]S[/COLOR]]$INFO[ListItem.Episode, [COLOR button_focus]E[/COLOR],: ]$INFO[ListItem.EpisodeName,[B],[/B][CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:[/COLOR] ,[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]:[/COLOR] ,[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]:[/COLOR] ,[CR]]$INFO[ListItem.Cast,[COLOR button_focus]$LOCALIZE[206]:[/COLOR] ,[CR]][CR]$INFO[ListItem.Plot]</label>
 				<autoscroll time="3000" delay="4000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
 			</control>
-			<control type="label">
-				<description>header label</description>
-				<left>660</left>
-				<top>20</top>
-				<width>1050</width>
-				<height>30</height>
-				<font>font30_title</font>
-				<label>$INFO[Listitem.Title]</label>
-				<aligny>center</aligny>
-				<shadowcolor>black</shadowcolor>
-			</control>
 			<control type="grouplist" id="9000">
-				<left>600</left>
-				<top>588</top>
-				<width>1170</width>
+				<left>150</left>
+				<top>600</top>
+				<width>1520</width>
 				<height>160</height>
 				<itemgap>10</itemgap>
 				<align>center</align>
@@ -136,8 +98,9 @@
 			</control>
 		</control>
 		<include name="InfoDialogTopBarInfo">
-			<param name="main_label" value="$INFO[ListItem.ChannelName]" />
-			<param name="sub_label" value="$INFO[ListItem.Title]$INFO[ListItem.Season, [COLOR button_focus]S[/COLOR]]$INFO[ListItem.Episode, [COLOR button_focus]E[/COLOR]]" />
+			<param name="main_label" value="$INFO[ListItem.Title]$INFO[ListItem.Season, ]$INFO[ListItem.Episode,[COLOR grey]x[/COLOR]]" />
+			<param name="sub_label" value="$INFO[ListItem.ChannelName]" />
+			<param name="posy" value="40" />
 		</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPVRRadioRDSInfo.xml Changed

@@ -17,7 +17,7 @@
 			<description>Normal song info group</description>
 			<left>0</left>
 			<top>70</top>
-			<visible>IsEmpty(RDS.IsClassical)</visible>
+			<visible>String.IsEmpty(RDS.IsClassical)</visible>
 			<control type="label">
 				<left>10</left>
 				<top>0</top>
@@ -27,7 +27,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[557]:</label>
-				<visible>IsEmpty(RDS.Band)</visible>
+				<visible>String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -38,7 +38,7 @@
 				<label fallback="161">$INFO[RDS.Artist]</label>
 				<scrollout>false</scrollout>
 				<pauseatend>2000</pauseatend>
-				<visible>IsEmpty(RDS.Band)</visible>
+				<visible>String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="label">
 				<left>10</left>
@@ -49,7 +49,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29901]:</label>
-				<visible>!IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -60,7 +60,7 @@
 				<label>$INFO[RDS.Band]</label>
 				<scrollout>false</scrollout>
 				<pauseatend>2000</pauseatend>
-				<visible>!IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="label">
 				<left>385</left>
@@ -71,7 +71,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[557]:</label>
-				<visible>!IsEmpty(RDS.Artist) + !IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Artist) + !String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>535</left>
@@ -80,7 +80,7 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$INFO[RDS.Artist]</label>
-				<visible>!IsEmpty(RDS.Artist) + !IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Artist) + !String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="label">
 				<left>10</left>
@@ -111,7 +111,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29902]:</label>
-				<visible>!IsEmpty(RDS.ProgStyle)</visible>
+				<visible>!String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -120,14 +120,14 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$INFO[RDS.ProgStyle]</label>
-				<visible>!IsEmpty(RDS.ProgStyle)</visible>
+				<visible>!String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 		</control>
 		<control type="group">
 			<description>Classic concert music group</description>
 			<left>0</left>
 			<top>70</top>
-			<visible>!IsEmpty(RDS.IsClassical)</visible>
+			<visible>!String.IsEmpty(RDS.IsClassical)</visible>
 			<control type="label">
 				<left>10</left>
 				<top>0</top>
@@ -177,7 +177,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29904]:</label>
-				<visible>IsEmpty(RDS.Band) + !IsEmpty(RDS.Artist)</visible>
+				<visible>String.IsEmpty(RDS.Band) + !String.IsEmpty(RDS.Artist)</visible>
 			</control>
 			<control type="textbox">
 				<left>160</left>
@@ -187,7 +187,7 @@
 				<pagecontrol>-</pagecontrol>
 				<label fallback="161">$INFO[RDS.Artist]</label>
 				<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-				<visible>IsEmpty(RDS.Band) + !IsEmpty(RDS.Artist)</visible>
+				<visible>String.IsEmpty(RDS.Band) + !String.IsEmpty(RDS.Artist)</visible>
 			</control>
 			<control type="label">
 				<left>10</left>
@@ -198,7 +198,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29901]:</label>
-				<visible>!IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -209,7 +209,7 @@
 				<label>$INFO[RDS.Band]</label>
 				<scrollout>false</scrollout>
 				<pauseatend>2000</pauseatend>
-				<visible>!IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="label">
 				<left>385</left>
@@ -220,7 +220,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29904]:</label>
-				<visible>!IsEmpty(RDS.Artist) + !IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Artist) + !String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="textbox">
 				<left>535</left>
@@ -230,7 +230,7 @@
 				<pagecontrol>-</pagecontrol>
 				<label>$INFO[RDS.Artist]</label>
 				<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
-				<visible>!IsEmpty(RDS.Artist) + !IsEmpty(RDS.Band)</visible>
+				<visible>!String.IsEmpty(RDS.Artist) + !String.IsEmpty(RDS.Band)</visible>
 			</control>
 			<control type="label">
 				<left>10</left>
@@ -241,7 +241,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29905]:</label>
-				<visible>!IsEmpty(RDS.Conductor)</visible>
+				<visible>!String.IsEmpty(RDS.Conductor)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -252,7 +252,7 @@
 				<label fallback="161">$INFO[RDS.Conductor]</label>
 				<scrollout>false</scrollout>
 				<pauseatend>2000</pauseatend>
-				<visible>!IsEmpty(RDS.Conductor)</visible>
+				<visible>!String.IsEmpty(RDS.Conductor)</visible>
 			</control>
 			<control type="label">
 				<left>10</left>
@@ -263,7 +263,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29902]:</label>
-				<visible>IsEmpty(RDS.Conductor) + !IsEmpty(RDS.ProgStyle)</visible>
+				<visible>String.IsEmpty(RDS.Conductor) + !String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>160</left>
@@ -272,7 +272,7 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$INFO[RDS.ProgStyle]</label>
-				<visible>IsEmpty(RDS.Conductor) + !IsEmpty(RDS.ProgStyle)</visible>
+				<visible>String.IsEmpty(RDS.Conductor) + !String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 			<control type="label">
 				<left>385</left>
@@ -283,7 +283,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29902]:</label>
-				<visible>!IsEmpty(RDS.Conductor) + !IsEmpty(RDS.ProgStyle)</visible>
+				<visible>!String.IsEmpty(RDS.Conductor) + !String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 			<control type="fadelabel">
 				<left>535</left>
@@ -292,7 +292,7 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$INFO[RDS.ProgStyle]</label>
-				<visible>!IsEmpty(RDS.Conductor) + !IsEmpty(RDS.ProgStyle)</visible>
+				<visible>!String.IsEmpty(RDS.Conductor) + !String.IsEmpty(RDS.ProgStyle)</visible>
 			</control>
 		</control>
 		<control type="label">
@@ -304,7 +304,7 @@
 			<aligny>center</aligny>
 			<textcolor>button_focus</textcolor>
 			<label>$LOCALIZE[558]:</label>
-			<visible>!IsEmpty(RDS.Album)</visible>
+			<visible>!String.IsEmpty(RDS.Album)</visible>
 		</control>
 		<control type="fadelabel">
 			<left>535</left>
@@ -316,7 +316,7 @@
 			<label>$INFO[RDS.Album]</label>
 			<scrollout>false</scrollout>
 			<pauseatend>2000</pauseatend>
-			<visible>!IsEmpty(RDS.Album)</visible>
+			<visible>!String.IsEmpty(RDS.Album)</visible>
 		</control>
 		<control type="label">
 			<left>10</left>
@@ -327,7 +327,7 @@
 			<aligny>center</aligny>
 			<textcolor>button_focus</textcolor>
 			<label>$LOCALIZE[29906]:</label>
-			<visible>!IsEmpty(RDS.ProgHost)</visible>
+			<visible>!String.IsEmpty(RDS.ProgHost)</visible>
 		</control>
 		<control type="fadelabel">
 			<left>160</left>
@@ -337,7 +337,7 @@
 			<align>left</align>
 			<aligny>center</aligny>
 			<label>$INFO[RDS.ProgHost]</label>
-			<visible>!IsEmpty(RDS.ProgHost)</visible>
+			<visible>!String.IsEmpty(RDS.ProgHost)</visible>
 		</control>
 		<control type="label">
 			<left>385</left>
@@ -348,7 +348,7 @@
 			<aligny>center</aligny>
 			<textcolor>button_focus</textcolor>
 			<label>$LOCALIZE[569]:</label>
-			<visible>!IsEmpty(RDS.Comment)</visible>
+			<visible>!String.IsEmpty(RDS.Comment)</visible>
 		</control>
 		<control type="fadelabel">
 			<left>535</left>
@@ -360,7 +360,7 @@
 			<label>$INFO[RDS.Comment]</label>
 			<scrollout>false</scrollout>
 			<pauseatend>2000</pauseatend>
-			<visible>!IsEmpty(RDS.Comment)</visible>
+			<visible>!String.IsEmpty(RDS.Comment)</visible>
 		</control>
 		<control type="label">
 			<left>10</left>
@@ -390,7 +390,7 @@
 			<aligny>center</aligny>
 			<textcolor>button_focus</textcolor>
 			<label>$LOCALIZE[29907]:</label>
-			<visible>!IsEmpty(RDS.ProgEditStaff)</visible>
+			<visible>!String.IsEmpty(RDS.ProgEditStaff)</visible>
 		</control>
 		<control type="fadelabel">
 			<left>535</left>
@@ -400,7 +400,7 @@
 			<align>left</align>
 			<aligny>center</aligny>
 			<label>$INFO[RDS.ProgEditStaff]</label>
-			<visible>!IsEmpty(RDS.ProgEditStaff)</visible>
+			<visible>!String.IsEmpty(RDS.ProgEditStaff)</visible>
 		</control>
 		<control type="grouplist">
 			<left>10</left>
@@ -418,7 +418,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29908]:</label>
-				<visible>!IsEmpty(RDS.ProgNow) | !IsEmpty(RDS.ProgNext)</visible>
+				<visible>!String.IsEmpty(RDS.ProgNow) | !String.IsEmpty(RDS.ProgNext)</visible>
 			</control>
 			<control type="label">
 				<description>Studio basename</description>
@@ -428,7 +428,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29909]:</label>
-				<visible>!IsEmpty(RDS.PhoneStudio) | !IsEmpty(RDS.EmailStudio) | !IsEmpty(RDS.SMSStudio)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneStudio) | !String.IsEmpty(RDS.EmailStudio) | !String.IsEmpty(RDS.SMSStudio)</visible>
 			</control>
 		</control>
 		<control type="grouplist">
@@ -442,35 +442,35 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[19030]:</label>
-				<visible>!IsEmpty(RDS.ProgNow)</visible>
+				<visible>!String.IsEmpty(RDS.ProgNow)</visible>
 			</control>
 			<control type="label">
 				<width>160</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[19031]:</label>
-				<visible>!IsEmpty(RDS.ProgNext)</visible>
+				<visible>!String.IsEmpty(RDS.ProgNext)</visible>
 			</control>
 			<control type="label">
 				<width>95</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[29910]:</label>
-				<visible>!IsEmpty(RDS.PhoneStudio)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneStudio)</visible>
 			</control>
 			<control type="label">
 				<width>95</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[29911]:</label>
-				<visible>!IsEmpty(RDS.EmailStudio)</visible>
+				<visible>!String.IsEmpty(RDS.EmailStudio)</visible>
 			</control>
 			<control type="label">
 				<width>95</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[29912]:</label>
-				<visible>!IsEmpty(RDS.SMSStudio)</visible>
+				<visible>!String.IsEmpty(RDS.SMSStudio)</visible>
 			</control>
 		</control>
 		<control type="grouplist">
@@ -485,7 +485,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.ProgNow]</label>
-				<visible>!IsEmpty(RDS.ProgNow)</visible>
+				<visible>!String.IsEmpty(RDS.ProgNow)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>620</width>
@@ -493,7 +493,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.ProgNext]</label>
-				<visible>!IsEmpty(RDS.ProgNext)</visible>
+				<visible>!String.IsEmpty(RDS.ProgNext)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>215</width>
@@ -501,7 +501,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.PhoneStudio]</label>
-				<visible>!IsEmpty(RDS.PhoneStudio)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneStudio)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>215</width>
@@ -509,7 +509,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.EmailStudio]</label>
-				<visible>!IsEmpty(RDS.EmailStudio)</visible>
+				<visible>!String.IsEmpty(RDS.EmailStudio)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>215</width>
@@ -517,7 +517,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.SMSStudio]</label>
-				<visible>!IsEmpty(RDS.SMSStudio)</visible>
+				<visible>!String.IsEmpty(RDS.SMSStudio)</visible>
 			</control>
 		</control>
 		<control type="grouplist">
@@ -533,7 +533,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29913]:</label>
-				<visible>!IsEmpty(RDS.PhoneHotline) | !IsEmpty(RDS.EmailHotline)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneHotline) | !String.IsEmpty(RDS.EmailHotline)</visible>
 			</control>
 			<control type="label">
 				<left>385</left>
@@ -544,7 +544,7 @@
 				<aligny>center</aligny>
 				<textcolor>button_focus</textcolor>
 				<label>$LOCALIZE[29914]:</label>
-				<visible>!IsEmpty(RDS.ProgHomepage)</visible>
+				<visible>!String.IsEmpty(RDS.ProgHomepage)</visible>
 			</control>
 		</control>
 		<control type="grouplist">
@@ -558,21 +558,21 @@
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[29910]:</label>
-				<visible>!IsEmpty(RDS.PhoneHotline)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneHotline)</visible>
 			</control>
 			<control type="label">
 				<width>160</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$LOCALIZE[29911]:</label>
-				<visible>!IsEmpty(RDS.EmailHotline)</visible>
+				<visible>!String.IsEmpty(RDS.EmailHotline)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>320</width>
 				<height>25</height>
 				<aligny>center</aligny>
 				<label>$INFO[RDS.ProgHomepage]</label>
-				<visible>!IsEmpty(RDS.ProgHomepage)</visible>
+				<visible>!String.IsEmpty(RDS.ProgHomepage)</visible>
 			</control>
 		</control>
 		<control type="grouplist">
@@ -587,7 +587,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.PhoneHotline]</label>
-				<visible>!IsEmpty(RDS.PhoneHotline)</visible>
+				<visible>!String.IsEmpty(RDS.PhoneHotline)</visible>
 			</control>
 			<control type="fadelabel">
 				<width>248</width>
@@ -595,7 +595,7 @@
 				<aligny>center</aligny>
 				<textcolor>grey</textcolor>
 				<label>$INFO[RDS.EmailHotline]</label>
-				<visible>!IsEmpty(RDS.EmailHotline)</visible>
+				<visible>!String.IsEmpty(RDS.EmailHotline)</visible>
 			</control>
 		</control>
 		<control type="group">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogPictureInfo.xml Changed

@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload>SetProperty(infobackground,$INFO[ListItem.FolderPath],home)</onload>
+	<onunload>ClearProperty(infobackground,home)</onunload>
 	<controls>
 		<control type="group">
 			<include>OpenClose_Left</include>
+				<top>160</top>
 			<control type="image">
 				<left>70</left>
-				<top>130</top>
 				<width>1280</width>
 				<height>820</height>
 				<texture border="22">dialogs/dialog-bg.png</texture>
 			</control>
 			<control type="image">
 				<left>120</left>
-				<top>180</top>
+				<top>50</top>
 				<width>1180</width>
 				<height>720</height>
 				<aspectratio aligny="center">keep</aspectratio>
@@ -24,10 +26,10 @@
 		</control>
 		<control type="group">
 			<include>OpenClose_Right</include>
+			<top>160</top>
 			<control type="image">
 				<description>background image</description>
 				<right>70</right>
-				<top>130</top>
 				<width>510</width>
 				<height>820</height>
 				<texture border="22">dialogs/dialog-bg.png</texture>
@@ -35,26 +37,20 @@
 			<include name="UpDownArrows">
 				<param name="container_id" value="5" />
 				<param name="posx" value="1590" />
-				<param name="up_posy" value="110" />
-				<param name="down_posy" value="950" />
+				<param name="up_posy" value="-20" />
+				<param name="down_posy" value="820" />
 			</include>
 			<control type="group" id="9000">
 			<control type="scrollbar" id="60">
 				<left>1840</left>
-				<top>150</top>
+				<top>20</top>
 				<width>12</width>
 				<height>780</height>
-				<onleft>Dialog.Close(all,true)</onleft>
-				<onleft>Action(left)</onleft>
-				<onleft>info</onleft>
-				<onright>Dialog.Close(all,true)</onright>
-				<onright>Action(right)</onright>
-				<onright>info</onright>
 				<orientation>vertical</orientation>
 			</control>
 			<control type="list" id="5">
 				<right>70</right>
-				<top>160</top>
+				<top>30</top>
 				<width>480</width>
 				<height>750</height>
 				<orientation>vertical</orientation>
@@ -120,7 +116,7 @@
 		</control>
 		<include name="InfoDialogTopBarInfo">
 			<param name="main_label" value="$INFO[ListItem.Label]" />
-			<param name="sub_label" value="$INFO[ListItem.PictureDate]" />
+			<param name="sub_label" value="$INFO[ListItem.PictureDateTime]" />
 		</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogSelect.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogSettings.xml Changed

@@ -7,79 +7,83 @@
 	</coordinates>
 	<include>Animation_DialogPopupOpenClose</include>
 	<controls>
-		<include name="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="1520" />
-			<param name="DialogBackgroundHeight" value="870" />
-			<param name="DialogHeaderLabel" value="-" />
-			<param name="DialogHeaderId" value="2" />
-		</include>
-		<control type="image">
-			<left>10</left>
-			<top>80</top>
-			<width>1200</width>
-			<height>790</height>
-			<texture border="40">buttons/dialogbutton-nofo.png</texture>
-		</control>
-		<control type="grouplist" id="5">
-			<description>control area</description>
-			<left>29</left>
-			<top>100</top>
-			<width>1160</width>
-			<height>750</height>
-			<onleft>9000</onleft>
-			<onright>9000</onright>
-			<onup>5</onup>
-			<ondown>5</ondown>
-		</control>
-		<control type="button" id="7">
-			<description>Default Button</description>
-			<include>DefaultSettingButton</include>
-		</control>
-		<control type="radiobutton" id="8">
-			<description>Default RadioButton</description>
-			<include>DefaultSettingButton</include>
-		</control>
-		<control type="spincontrolex" id="9">
-			<description>Default SpinControlex</description>
-			<include>DefaultSettingButton</include>
-		</control>
-		<control type="image" id="11">
-			<description>separator image</description>
-			<height>3</height>
-			<texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
-		</control>
-		<control type="edit" id="12">
-			<include>DefaultSettingButton</include>
-		</control>
-		<control type="sliderex" id="13">
-			<description>Default Slider</description>
-			<include>DefaultSettingButton</include>
-		</control>
-		<control type="label" id="14">
-			<description>Default Label</description>
-			<include>DefaultSettingLabel</include>
-		</control>
-		<control type="grouplist" id="9000">
-			<left>1210</left>
-			<top>92</top>
-			<orientation>vertical</orientation>
-			<width>300</width>
-			<height>250</height>
-			<itemgap>-10</itemgap>
-			<onleft>5</onleft>
-			<onright>5</onright>
-			<include name="DefaultDialogButton">
-				<param name="id" value="28" />
-				<param name="label" value="-" />
-			</include>
-			<include name="DefaultDialogButton">
-				<param name="id" value="29" />
-				<param name="label" value="-" />
-			</include>
-			<include name="DefaultDialogButton">
-				<param name="id" value="30" />
-				<param name="label" value="-" />
+		<control type="group">
+			<include>Animation_DialogPopupVisible</include>
+			<visible>!Window.IsVisible(sliderdialog)</visible>
+			<include name="DialogBackgroundCommons">
+				<param name="DialogBackgroundWidth" value="1520" />
+				<param name="DialogBackgroundHeight" value="870" />
+				<param name="DialogHeaderLabel" value="-" />
+				<param name="DialogHeaderId" value="2" />
 			</include>
+			<control type="image">
+				<left>10</left>
+				<top>80</top>
+				<width>1200</width>
+				<height>790</height>
+				<texture border="40">buttons/dialogbutton-nofo.png</texture>
+			</control>
+			<control type="grouplist" id="5">
+				<description>control area</description>
+				<left>29</left>
+				<top>100</top>
+				<width>1160</width>
+				<height>750</height>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+				<onup>5</onup>
+				<ondown>5</ondown>
+			</control>
+			<control type="button" id="7">
+				<description>Default Button</description>
+				<include>DefaultSettingButton</include>
+			</control>
+			<control type="radiobutton" id="8">
+				<description>Default RadioButton</description>
+				<include>DefaultSettingButton</include>
+			</control>
+			<control type="spincontrolex" id="9">
+				<description>Default SpinControlex</description>
+				<include>DefaultSettingButton</include>
+			</control>
+			<control type="image" id="11">
+				<description>separator image</description>
+				<height>3</height>
+				<texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
+			</control>
+			<control type="edit" id="12">
+				<include>DefaultSettingButton</include>
+			</control>
+			<control type="sliderex" id="13">
+				<description>Default Slider</description>
+				<include>DefaultSettingButton</include>
+			</control>
+			<control type="label" id="14">
+				<description>Default Label</description>
+				<include>DefaultSettingLabel</include>
+			</control>
+			<control type="grouplist" id="9000">
+				<left>1210</left>
+				<top>92</top>
+				<orientation>vertical</orientation>
+				<width>300</width>
+				<height>250</height>
+				<itemgap>-10</itemgap>
+				<onleft>5</onleft>
+				<onright>5</onright>
+				<include name="DefaultDialogButton">
+					<param name="id" value="28" />
+					<param name="label" value="-" />
+				</include>
+				<include name="DefaultDialogButton">
+					<param name="id" value="29" />
+					<param name="label" value="-" />
+				</include>
+				<include name="DefaultDialogButton">
+					<param name="id" value="30" />
+					<param name="label" value="-" />
+				</include>
+			</control>
 		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogTextViewer.xml Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <window>
-	<defaultcontrol always="true">3000</defaultcontrol>
+	<defaultcontrol always="true">1000</defaultcontrol>
 	<include>Animation_DialogPopupOpenClose</include>
 	<controls>
 		<control type="group">
@@ -27,6 +27,12 @@
 				<onup>3000</onup>
 			</control>
 		</control>
+		<control type="button" id="1000">
+			<include>HiddenObject</include>
+			<onclick>Action(Close)</onclick>
+			<onup>PageUp(3000)</onup>
+			<ondown>PageDown(3000)</ondown>
+		</control>
 		<control type="button">
 			<left>936</left>
 			<top>113</top>
@@ -36,7 +42,7 @@
 			<texturenofocus colordiffuse="button_focus" flipy="true">overlays/arrowdown.png</texturenofocus>
 			<onclick>SetFocus(3000)</onclick>
 			<onclick>Up</onclick>
-			<visible>Control.IsVisible(3000) + IntegerGreaterThan(Container(5).CurrentPage,1)</visible>
+			<visible>Control.IsVisible(3000) + Integer.IsGreater(Container(5).CurrentPage,1)</visible>
 			<animation delay="80" effect="fade" time="120">VisibleChange</animation>
 		</control>
 		<control type="button">
@@ -48,7 +54,7 @@
 			<onclick>Down</onclick>
 			<texturefocus colordiffuse="button_focus">overlays/arrowdown.png</texturefocus>
 			<texturenofocus colordiffuse="button_focus">overlays/arrowdown.png</texturenofocus>
-			<visible>Control.IsVisible(3000) + !StringCompare(Container(5).CurrentPage,Container(5).NumPages)</visible>
+			<visible>Control.IsVisible(3000) + !Integer.IsEqual(Container(5).CurrentPage,Container(5).NumPages)</visible>
 			<animation delay="80" effect="fade" time="120">VisibleChange</animation>
 		</control>
 		<control type="label">
@@ -62,7 +68,7 @@
 			<aligny>center</aligny>
 			<label>$LOCALIZE[31035] [COLOR=button_focus]$INFO[Container(5).CurrentPage]/$INFO[Container(5).NumPages][/COLOR]</label>
 			<wrapmultiline>true</wrapmultiline>
-			<visible>IntegerGreaterThan(Container(5).NumPages,1)</visible>
+			<visible>Integer.IsGreater(Container(5).NumPages,1)</visible>
 		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/DialogVideoInfo.xml Changed

@@ -1,563 +1,540 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">8</defaultcontrol>
+	<onload>SetProperty(infobackground,$INFO[ListItem.Art(fanart)],home)</onload>
+	<onunload>ClearProperty(infobackground,home)</onunload>
 	<controls>
 		<control type="group">
-			<top>180</top>
-			<left>106</left>
-			<animation effect="fade" start="100" end="0" time="0">WindowClose</animation>
-			<visible>!Container.Content(files)</visible>
-			<include condition="Window.IsActive(home)">OpenClose_Left</include>
-			<control type="image">
-				<top>-16</top>
-				<left>-16</left>
-				<width>506</width>
-				<height>741</height>
-				<texture>colors/black.png</texture>
-				<bordertexture border="20">overlays/shadow.png</bordertexture>
-				<bordersize>20</bordersize>
-				<animation effect="fade" start="0" end="100" time="100" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation>
-			</control>
-			<control type="image">
-				<left>4</left>
-				<top>4</top>
-				<width>466</width>
-				<height>701</height>
-				<aspectratio>scale</aspectratio>
-				<texture fallback="DefaultVideo.png">$VAR[PosterVar]</texture>
-				<animation effect="fade" start="0" end="100" time="0" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation>
-			</control>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsVisible(script-ExtendedInfo Script-DialogVideoInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-DialogInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-VideoList.xml)">Conditional</animation>
 			<control type="group">
-				<visible>Stringcompare(ListItem.DBType,episode) + !IsEmpty(ListItem.Thumb)</visible>
+				<top>150</top>
+				<left>66</left>
+				<include>OpenClose_Left</include>
+				<control type="image">
+					<top>-16</top>
+					<left>-16</left>
+					<width>566</width>
+					<height>841</height>
+					<texture>colors/black.png</texture>
+					<bordertexture border="20">overlays/shadow.png</bordertexture>
+					<bordersize>20</bordersize>
+				</control>
 				<control type="image">
 					<left>4</left>
 					<top>4</top>
-					<width>466</width>
-					<height>701</height>
+					<width>526</width>
+					<height>801</height>
+					<aspectratio>scale</aspectratio>
+					<texture fallback="DefaultVideo.png">$VAR[PosterVar]</texture>
+				</control>
+				<control type="group">
+					<visible>String.IsEqual(ListItem.DBType,episode) + !String.IsEmpty(ListItem.Thumb)</visible>
+					<control type="image">
+						<left>4</left>
+						<top>4</top>
+						<width>526</width>
+						<height>801</height>
+						<aspectratio>stretch</aspectratio>
+						<texture colordiffuse="AAFFFFFF" fallback="DefaultVideo.png">colors/black.png</texture>
+					</control>
+					<control type="image">
+						<left>14</left>
+						<top>4</top>
+						<width>506</width>
+						<height>801</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Thumb]</texture>
+						<bordertexture border="20">overlays/shadow.png</bordertexture>
+						<bordersize>20</bordersize>
+					</control>
+				</control>
+			</control>
+			<control type="group">
+				<top>184</top>
+				<left>70</left>
+				<visible>Stringcompare(ListItem.DBType,musicvideo)</visible>
+				<include>OpenClose_Left</include>
+				<control type="image">
+					<width>526</width>
+					<height>801</height>
 					<aspectratio>stretch</aspectratio>
-					<texture colordiffuse="AAFFFFFF" fallback="DefaultVideo.png">colors/black.png</texture>
-					<animation effect="fade" start="0" end="100" time="300" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation>
+					<texture colordiffuse="FF555555">DefaultVideo.png</texture>
 				</control>
 				<control type="image">
-					<left>14</left>
-					<top>4</top>
-					<width>446</width>
-					<height>701</height>
+					<left>10</left>
+					<width>506</width>
+					<height>801</height>
 					<aspectratio>keep</aspectratio>
 					<texture>$INFO[ListItem.Thumb]</texture>
-					<animation effect="fade" start="0" end="100" time="300" delay="300" condition="!Window.IsActive(home)">WindowOpen</animation>
 					<bordertexture border="20">overlays/shadow.png</bordertexture>
 					<bordersize>20</bordersize>
 				</control>
 			</control>
-		</control>
-		<control type="group">
-			<top>184</top>
-			<left>110</left>
-			<visible>Container.Content(mixed)</visible>
-			<include>OpenClose_Left</include>
-			<control type="image">
-				<width>466</width>
-				<height>701</height>
-				<aspectratio>stretch</aspectratio>
-				<texture colordiffuse="FF555555">DefaultVideo.png</texture>
-			</control>
-			<control type="image">
-				<left>10</left>
-				<width>446</width>
-				<height>701</height>
-				<aspectratio>keep</aspectratio>
-				<texture>$INFO[ListItem.Thumb]</texture>
-				<bordertexture border="20">overlays/shadow.png</bordertexture>
-				<bordersize>20</bordersize>
-			</control>
-		</control>
-		<control type="group">
-			<include>OpenClose_Right</include>
-			<left>590</left>
-			<control type="group" id="140">
-				<top>468</top>
-				<control type="button" id="138">
-					<width>754</width>
-					<height>310</height>
-					<textoffsetx>40</textoffsetx>
-					<textoffsety>20</textoffsety>
-					<aligny>bottom</aligny>
-					<label></label>
-					<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick>
-					<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick>
-					<onclick condition="!IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick>
-					<onup>50</onup>
-					<onleft>138</onleft>
-					<onright>138</onright>
-					<ondown>5000</ondown>
-					<visible>IntegerGreaterThan(Container(4000).NumItems,0)</visible>
-				</control>
-				<control type="image">
-					<left>735</left>
-					<width>513</width>
-					<height>310</height>
-					<aligny>bottom</aligny>
-					<texture border="40">buttons/button-nofo.png</texture>
-					<visible>IntegerGreaterThan(Container(4000).NumItems,0)</visible>
+			<control type="group">
+				<include>OpenClose_Right</include>
+				<left>620</left>
+				<top>-30</top>
+				<control type="group" id="140">
+					<top>468</top>
+					<control type="button" id="138">
+						<width>754</width>
+						<height>410</height>
+						<textoffsetx>40</textoffsetx>
+						<textoffsety>20</textoffsety>
+						<aligny>bottom</aligny>
+						<label></label>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick>
+						<onup>50</onup>
+						<onleft>138</onleft>
+						<onright>138</onright>
+						<ondown>5000</ondown>
+						<visible>Integer.IsGreater(Container(4000).NumItems,0)</visible>
+					</control>
+					<control type="image">
+						<left>735</left>
+						<width>513</width>
+						<height>410</height>
+						<aligny>bottom</aligny>
+						<texture border="40">buttons/button-nofo.png</texture>
+						<visible>Integer.IsGreater(Container(4000).NumItems,0)</visible>
+					</control>
+					<control type="button" id="139">
+						<width>1245</width>
+						<height>410</height>
+						<textoffsetx>40</textoffsetx>
+						<textoffsety>20</textoffsety>
+						<aligny>bottom</aligny>
+						<label></label>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick>
+						<onclick condition="!String.IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick>
+						<onup>50</onup>
+						<onleft>139</onleft>
+						<onright>139</onright>
+						<ondown>5000</ondown>
+						<visible>!Integer.IsGreater(Container(4000).NumItems,0)</visible>
+					</control>
+					<control type="textbox">
+						<left>40</left>
+						<top>25</top>
+						<width>670</width>
+						<height>343</height>
+						<font>font_textbox</font>
+						<label fallback="19055">$INFO[ListItem.Plot]</label>
+						<autoscroll delay="10000" time="5000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
+						<visible>Integer.IsGreater(Container(4000).NumItems,0)</visible>
+					</control>
+					<control type="textbox">
+						<left>40</left>
+						<top>25</top>
+						<width>1165</width>
+						<height>343</height>
+						<font>font_textbox</font>
+						<label fallback="19055">$INFO[ListItem.Plot]</label>
+						<autoscroll delay="10000" time="5000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
+						<visible>!Integer.IsGreater(Container(4000).NumItems,0)</visible>
+					</control>
 				</control>
-				<control type="button" id="139">
-					<width>1245</width>
-					<height>310</height>
-					<textoffsetx>40</textoffsetx>
-					<textoffsety>20</textoffsety>
-					<aligny>bottom</aligny>
-					<label></label>
-					<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick>
-					<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick>
-					<onclick condition="!IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick>
-					<onup>50</onup>
-					<onleft>139</onleft>
-					<onright>139</onright>
+				<control type="grouplist" id="4000">
+					<orientation>vertical</orientation>
+					<left>730</left>
+					<top>488</top>
+					<height>355</height>
+					<itemgap>-8</itemgap>
 					<ondown>5000</ondown>
-					<visible>!IntegerGreaterThan(Container(4000).NumItems,0)</visible>
+					<onup>50</onup>
+					<onright>140</onright>
+					<onleft>140</onleft>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="147" />
+						<param name="label" value="$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR]]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Director)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="148" />
+						<param name="label" value="$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR]]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Writer)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="149" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[563]: [/COLOR]$INFO[ListItem.RatingAndVotes]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.RatingAndVotes)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="150" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[515]: [/COLOR]$INFO[ListItem.Genre]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Genre) + Stringcompare(ListItem.DBType,movie)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="151" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[180]: [/COLOR]$INFO[ListItem.Duration] $LOCALIZE[31060]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Duration)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="152" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[21875]: [/COLOR]$INFO[ListItem.Country]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Country)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="153" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[29909]: [/COLOR]$INFO[ListItem.Studio]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Studio)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="154" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[20416]: [/COLOR]$INFO[ListItem.Premiered]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Premiered)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="155" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[31048]: [/COLOR]$INFO[ListItem.Season,, $LOCALIZE[36905]]$INFO[ListItem.Episode, (, $LOCALIZE[20453])]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Season) + !Stringcompare(ListItem.DBType,episode)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="156" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[31017]: [/COLOR]$INFO[ListItem.Mpaa]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Mpaa)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="157" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[20141]: [/COLOR]$INFO[ListItem.Set]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Set)" />
+					</include>
+					<include name="InfoDialogMetadata">
+						<param name="control_id" value="157" />
+						<param name="label" value="[COLOR button_focus]$LOCALIZE[20459]: [/COLOR]$INFO[ListItem.Tag]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Tag)" />
+					</include>
 				</control>
-				<control type="textbox">
-					<left>40</left>
-					<top>25</top>
-					<width>670</width>
-					<height>242</height>
-					<font>font12</font>
-					<label fallback="19055">$INFO[ListItem.TagLine,[B],[CR][/B]]$INFO[ListItem.Plot]</label>
-					<autoscroll delay="10000" time="5000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
-					<visible>IntegerGreaterThan(Container(4000).NumItems,0)</visible>
+				<control type="image">
+					<left>17</left>
+					<top>185</top>
+					<width>1210</width>
+					<height>283</height>
+					<aspectratio>scale</aspectratio>
+					<texture colordiffuse="A0FFFFFF">colors/black.png</texture>
 				</control>
 				<control type="textbox">
-					<left>40</left>
-					<top>25</top>
-					<width>1165</width>
-					<height>217</height>
-					<font>font12</font>
-					<label fallback="19055">$INFO[ListItem.Plot]</label>
-					<autoscroll delay="10000" time="5000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
-					<visible>!IntegerGreaterThan(Container(4000).NumItems,0)</visible>
-				</control>
-			</control>
-			<control type="grouplist" id="4000">
-				<orientation>vertical</orientation>
-				<left>730</left>
-				<top>488</top>
-				<height>310</height>
-				<itemgap>-8</itemgap>
-				<ondown>5000</ondown>
-				<onup>50</onup>
-				<onright>140</onright>
-				<onleft>140</onleft>
-				<control type="button" id="147">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
+					<left>17</left>
+					<top>185</top>
+					<width>1210</width>
+					<height>283</height>
+					<align>center</align>
 					<aligny>center</aligny>
-					<font>font10</font>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<label>$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR]]</label>
-					<visible>!IsEmpty(ListItem.Director)</visible>
+					<font>font24_title</font>
+					<label>$LOCALIZE[31079]</label>
+					<visible>Integer.IsEqual(Container(50).NumItems,0) + String.IsEmpty(ListItem.Art(tvshow.banner)) + String.IsEmpty(ListItem.Art(banner))</visible>
 				</control>
-				<control type="button" id="131">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<label>$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]: [/COLOR]]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<onclick condition="System.hasAddon(script.extendedinfo)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[ListItem.Writer])</onclick>
-					<visible>!IsEmpty(ListItem.Writer)</visible>
-				</control>
-				<control type="button" id="136">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<label>[COLOR button_focus]$LOCALIZE[563]: [/COLOR]$INFO[ListItem.RatingAndVotes]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<onclick>noop</onclick>
-					<visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
-				</control>
-				<control type="button" id="144">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<label>[COLOR button_focus]$LOCALIZE[180]: [/COLOR]$INFO[ListItem.Duration] $LOCALIZE[31060]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<onclick>noop</onclick>
-					<visible>!IsEmpty(ListItem.Duration)</visible>
-				</control>
-				<control type="button" id="145">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<label>[COLOR button_focus]$LOCALIZE[21875]: [/COLOR]$INFO[ListItem.Country]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<onclick>noop</onclick>
-					<visible>!IsEmpty(ListItem.Country)</visible>
-				</control>
-				<control type="button" id="146">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<label>[COLOR button_focus]$LOCALIZE[29909]: [/COLOR]$INFO[ListItem.Studio]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<onclick>noop</onclick>
-					<visible>!IsEmpty(ListItem.Studio)</visible>
-				</control>
-				<control type="button" id="135">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<textcolor>button_focus</textcolor>
-					<label>$LOCALIZE[20416]: [COLOR white]$INFO[ListItem.Premiered,][/COLOR]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<visible>!IsEmpty(ListItem.Premiered)</visible>
-				</control>
-				<control type="button" id="210">
-					<width>505</width>
-					<height>45</height>
-					<textoffsetx>40</textoffsetx>
-					<font>font10</font>
-					<aligny>center</aligny>
-					<textcolor>button_focus</textcolor>
-					<label>$LOCALIZE[31048]: [COLOR white]$INFO[ListItem.Season,, $LOCALIZE[36905]]$INFO[ListItem.Episode, (, $LOCALIZE[20453])][/COLOR]</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-					<visible>!IsEmpty(ListItem.Season)</visible>
+				<control type="image">
+					<left>77</left>
+					<top>185</top>
+					<width>1090</width>
+					<height>283</height>
+					<fadetime>150</fadetime>
+					<aspectratio>keep</aspectratio>
+					<texture>$VAR[BannerVar]</texture>
+					<visible>Integer.IsEqual(Container(50).NumItems,0)</visible>
 				</control>
-			</control>
-			<control type="image">
-				<left>17</left>
-				<top>185</top>
-				<width>1210</width>
-				<height>283</height>
-				<aspectratio>scale</aspectratio>
-				<texture colordiffuse="A0FFFFFF">colors/black.png</texture>
-			</control>
-			<control type="textbox">
-				<left>17</left>
-				<top>185</top>
-				<width>1210</width>
-				<height>283</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font24_title</font>
-				<label>$LOCALIZE[31079]</label>
-				<visible>StringCompare(Container(50).NumItems,0) + IsEmpty(ListItem.Art(tvshow.banner)) + IsEmpty(ListItem.Art(banner))</visible>
-			</control>
-			<control type="image">
-				<left>77</left>
-				<top>185</top>
-				<width>1090</width>
-				<height>283</height>
-				<fadetime>150</fadetime>
-				<aspectratio>keep</aspectratio>
-				<texture>$VAR[BannerVar]</texture>
-				<visible>StringCompare(Container(50).NumItems,0)</visible>
-			</control>
-			<control type="list" id="50">
-				<top>158</top>
-				<width>1235</width>
-				<height>370</height>
-				<onleft>50</onleft>
-				<onright>50</onright>
-				<onup condition="System.hasAddon(script.extendedinfo) + Control.HasFocus(50)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup>
-				<onup condition="!System.hasAddon(script.extendedinfo)">InstallAddon(script.extendedinfo)</onup>
-				<ondown>140</ondown>
-				<scrolltime>200</scrolltime>
-				<orientation>horizontal</orientation>
-				<itemlayout height="370" width="245">
-					<control type="group">
-						<top>10</top>
-						<control type="image">
-							<top>0</top>
-							<width>264</width>
-							<height>317</height>
-							<texture>DefaultActor.png</texture>
-							<aspectratio aligny="center">scale</aspectratio>
-							<bordertexture border="20">overlays/shadow.png</bordertexture>
-							<bordersize>20</bordersize>
+				<control type="list" id="50">
+					<top>158</top>
+					<width>1235</width>
+					<height>370</height>
+					<onleft>50</onleft>
+					<onright>50</onright>
+					<onup condition="System.hasAddon(script.extendedinfo) + Control.HasFocus(50)">RunScript(script.extendedinfo,info=extendedactorinfo,name=$INFO[Container(50).ListItem.Label])</onup>
+					<onup condition="!System.hasAddon(script.extendedinfo)">InstallAddon(script.extendedinfo)</onup>
+					<ondown>140</ondown>
+					<scrolltime>200</scrolltime>
+					<orientation>horizontal</orientation>
+					<itemlayout height="370" width="245">
+						<control type="group">
+							<top>10</top>
+							<control type="image">
+								<top>0</top>
+								<width>264</width>
+								<height>317</height>
+								<texture>DefaultActor.png</texture>
+								<aspectratio aligny="center">scale</aspectratio>
+								<bordertexture border="20">overlays/shadow.png</bordertexture>
+								<bordersize>20</bordersize>
+							</control>
+							<control type="image">
+								<top>20</top>
+								<left>20</left>
+								<width>224</width>
+								<height>277</height>
+								<texture fallback="DefaultActor.png">$INFO[ListItem.Thumb]</texture>
+								<aspectratio aligny="center">scale</aspectratio>
+							</control>
+							<control type="image">
+								<left>20</left>
+								<width>224</width>
+								<height>62</height>
+								<top>235</top>
+								<texture>colors/black.png</texture>
+								<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
+							</control>
+							<control type="label">
+								<left>25</left>
+								<width>214</width>
+								<height>67</height>
+								<top>218</top>
+								<align>center</align>
+								<aligny>center</aligny>
+								<font>font10</font>
+								<label>$INFO[ListItem.Label]</label>
+							</control>
+							<control type="label">
+								<left>25</left>
+								<width>214</width>
+								<height>67</height>
+								<top>245</top>
+								<align>center</align>
+								<aligny>center</aligny>
+								<font>font10</font>
+								<textcolor>grey</textcolor>
+								<label>$INFO[ListItem.Label2]</label>
+							</control>
 						</control>
-						<control type="image">
-							<top>20</top>
-							<left>20</left>
-							<width>224</width>
-							<height>277</height>
-							<texture fallback="DefaultActor.png">$INFO[ListItem.Thumb]</texture>
-							<aspectratio aligny="center">scale</aspectratio>
-						</control>
-						<control type="image">
-							<left>20</left>
-							<width>224</width>
-							<height>62</height>
-							<top>235</top>
-							<texture>colors/black.png</texture>
-							<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
+					</itemlayout>
+					<focusedlayout height="370" width="245">
+						<control type="group">
+							<left>0</left>
+							<top>10</top>
+							<control type="image">
+								<top>0</top>
+								<width>264</width>
+								<height>317</height>
+								<texture>DefaultActor.png</texture>
+								<aspectratio aligny="center">scale</aspectratio>
+								<bordertexture border="20">overlays/shadow.png</bordertexture>
+								<bordersize>20</bordersize>
+							</control>
+							<control type="image">
+								<top>20</top>
+								<left>20</left>
+								<width>224</width>
+								<height>277</height>
+								<texture>$INFO[ListItem.Thumb]</texture>
+								<aspectratio aligny="center">scale</aspectratio>
+							</control>
+							<control type="image">
+								<left>20</left>
+								<width>224</width>
+								<height>62</height>
+								<top>235</top>
+								<texture>colors/black.png</texture>
+								<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
+							</control>
+							<control type="label">
+								<left>25</left>
+								<width>214</width>
+								<height>67</height>
+								<top>218</top>
+								<align>center</align>
+								<aligny>center</aligny>
+								<font>font10</font>
+								<scroll>true</scroll>
+								<label>$INFO[ListItem.Label]</label>
+							</control>
+							<control type="label">
+								<left>25</left>
+								<width>214</width>
+								<height>67</height>
+								<top>245</top>
+								<align>center</align>
+								<aligny>center</aligny>
+								<font>font10</font>
+								<textcolor>grey</textcolor>
+								<scroll>true</scroll>
+								<label>$INFO[ListItem.Label2]</label>
+							</control>
+							<control type="image">
+								<left>18</left>
+								<top>20</top>
+								<width>230</width>
+								<height>280</height>
+								<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+								<visible>Control.HasFocus(50)</visible>
+							</control>
 						</control>
-						<control type="label">
-							<left>25</left>
-							<width>214</width>
-							<height>67</height>
-							<top>218</top>
-							<align>center</align>
-							<aligny>center</aligny>
-							<font>font10</font>
-							<label>$INFO[ListItem.Label]</label>
+					</focusedlayout>
+				</control>
+				<control type="grouplist" id="5000">
+					<left>0</left>
+					<top>864</top>
+					<width>1246</width>
+					<height>400</height>
+					<onleft>5000</onleft>
+					<onright>5000</onright>
+					<onup>140</onup>
+					<ondown condition="!Integer.IsGreater(Container(5000).Position,4)">SetFocus(50,$INFO[Container(5000).Position])</ondown>
+					<ondown condition="Integer.IsGreater(Container(5000).Position,4)">SetFocus(50,4)</ondown>
+					<itemgap>-16</itemgap>
+					<align>center</align>
+					<orientation>horizontal</orientation>
+					<scrolltime tween="quadratic">200</scrolltime>
+					<include name="InfoDialogButton">
+						<param name="id" value="8" />
+						<param name="icon" value="icons/infodialogs/play.png" />
+						<param name="label" value="$LOCALIZE[208]" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="11" />
+						<param name="icon" value="icons/infodialogs/trailer.png" />
+						<param name="label" value="$LOCALIZE[20410]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Trailer) + ![String.StartsWith(Container.FolderPath,plugin://) + String.Contains(Container.FolderPath,trailer)]" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="441" />
+						<param name="icon" value="icons/infodialogs/cinema.png" />
+						<param name="onclick_1" value="Dialog.Close(MovieInformation)" />
+						<param name="onclick_2" value="RunScript(script.cinemavision,experience)" />
+						<param name="label" value="$LOCALIZE[31003]" />
+						<param name="visible" value="System.HasAddon(script.cinemavision) + [String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,season) | String.IsEqual(ListItem.DBType,episode)]" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="440" />
+						<param name="icon" value="icons/infodialogs/trailer.png" />
+						<param name="label" value="$LOCALIZE[31090]" />
+						<param name="onclick_1" value="Action(close)" />
+						<param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title] $INFO[ListItem.Year])" />
+						<param name="visible" value="System.hasAddon(script.extendedinfo) + String.IsEqual(ListItem.DBType,movie) + !Control.IsVisible(11)" />
+					</include>
+					<control type="group" id="400">
+						<width>262</width>
+						<visible>Control.IsEnabled(7)</visible>
+						<control type="button" id="7">
+							<include name="VideoInfoButtonsCommon">
+								<param name="icon" value="" />
+							</include>
+							<label>$LOCALIZE[31033]</label>
+							<onleft>440</onleft>
+							<onright>101</onright>
+							<onup>140</onup>
+							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,1)">SetFocus(50,0)</ondown>
+							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,2)">SetFocus(50,1)</ondown>
+							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,3)">SetFocus(50,2)</ondown>
+							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,4)">SetFocus(50,3)</ondown>
+							<ondown condition="Integer.IsEqual(Container(5000).CurrentItem,5)">SetFocus(50,4)</ondown>
 						</control>
 						<control type="label">
-							<left>25</left>
-							<width>214</width>
-							<height>67</height>
-							<top>245</top>
+							<label>$INFO[ListItem.UserRating]</label>
+							<font>font30_title</font>
+							<left>0</left>
+							<top>18</top>
+							<width>262</width>
 							<align>center</align>
-							<aligny>center</aligny>
-							<font>font10</font>
-							<textcolor>grey</textcolor>
-							<label>$INFO[ListItem.Label2]</label>
-						</control>
-					</control>
-				</itemlayout>
-				<focusedlayout height="370" width="245">
-					<control type="group">
-						<left>0</left>
-						<top>10</top>
-						<control type="image">
-							<top>0</top>
-							<width>264</width>
-							<height>317</height>
-							<texture>DefaultActor.png</texture>
-							<aspectratio aligny="center">scale</aspectratio>
-							<bordertexture border="20">overlays/shadow.png</bordertexture>
-							<bordersize>20</bordersize>
 						</control>
 						<control type="image">
-							<top>20</top>
-							<left>20</left>
-							<width>224</width>
-							<height>277</height>
-							<texture>$INFO[ListItem.Thumb]</texture>
-							<aspectratio aligny="center">scale</aspectratio>
-						</control>
-						<control type="image">
-							<left>20</left>
-							<width>224</width>
-							<height>62</height>
-							<top>235</top>
-							<texture>colors/black.png</texture>
-							<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
-						</control>
-						<control type="label">
-							<left>25</left>
-							<width>214</width>
-							<height>67</height>
-							<top>218</top>
-							<align>center</align>
-							<aligny>center</aligny>
-							<font>font10</font>
-							<scroll>true</scroll>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="label">
-							<left>25</left>
-							<width>214</width>
-							<height>67</height>
-							<top>245</top>
+							<texture>icons/infodialogs/rating.png</texture>
+							<left>107</left>
+							<top>24</top>
+							<width>48</width>
+							<height>48</height>
 							<align>center</align>
-							<aligny>center</aligny>
-							<font>font10</font>
-							<textcolor>grey</textcolor>
-							<scroll>true</scroll>
-							<label>$INFO[ListItem.Label2]</label>
-						</control>
-						<control type="image">
-							<left>18</left>
-							<top>20</top>
-							<width>230</width>
-							<height>280</height>
-							<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
-							<visible>Control.HasFocus(50)</visible>
+							<visible>String.IsEmpty(ListItem.UserRating)</visible>
 						</control>
 					</control>
-				</focusedlayout>
-			</control>
-			<control type="grouplist" id="5000">
-				<left>0</left>
-				<top>764</top>
-				<width>1246</width>
-				<height>400</height>
-				<onleft>5000</onleft>
-				<onright>5000</onright>
-				<onup>140</onup>
-				<ondown condition="!IntegerGreaterThan(Container(5000).Position,4)">SetFocus(50,$INFO[Container(5000).Position])</ondown>
-				<ondown condition="IntegerGreaterThan(Container(5000).Position,4)">SetFocus(50,4)</ondown>
-				<itemgap>-16</itemgap>
-				<align>center</align>
-				<orientation>horizontal</orientation>
-				<scrolltime tween="quadratic">200</scrolltime>
-				<include name="InfoDialogButton">
-					<param name="id" value="8" />
-					<param name="icon" value="icons/infodialogs/launch.png" />
-					<param name="label" value="$LOCALIZE[208]" />
-				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="11" />
-					<param name="icon" value="icons/infodialogs/trailer.png" />
-					<param name="label" value="$LOCALIZE[20410]" />
-					<param name="visible" value="!IsEmpty(ListItem.Trailer) + ![substring(Container.FolderPath,plugin://) + substring(Container.FolderPath,trailer)]" />
+					<include name="InfoDialogButton">
+						<param name="id" value="101" />
+						<param name="icon" value="icons/infodialogs/info.png" />
+						<param name="label" value="$LOCALIZE[31034]" />
+						<param name="onclick_1" value="RunScript(script.extendedinfo,info=openinfodialog)" />
+						<param name="visible" value="System.hasAddon(script.extendedinfo)" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="102" />
+						<param name="icon" value="icons/infodialogs/image.png" />
+						<param name="label" value="$LOCALIZE[31028]" />
+						<param name="onclick_1" value="SetProperty(fanart,$ESCINFO[ListItem.Art(fanart)],home)" />
+						<param name="onclick_2" value="ActivateWindow(1104)" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Art(fanart))" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="13" />
+						<param name="icon" value="icons/infodialogs/director.png" />
+						<param name="label" value="$LOCALIZE[31123]" />
+						<param name="visible" value="!String.IsEmpty(ListItem.Director)" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="10" />
+						<param name="icon" value="icons/infodialogs/choose_image.png" />
+						<param name="label" value="$LOCALIZE[13511]" />
+					</include>
+					<include name="InfoDialogButton">
+						<param name="id" value="6" />
+						<param name="icon" value="icons/infodialogs/update.png" />
+						<param name="label" value="$LOCALIZE[184]" />
+						<param name="visible" value="Control.IsEnabled(6)" />
+					</include>
+				</control>
+				<include name="LeftRightArrows">
+					<param name="list_id" value="5000" />
+					<param name="left_posx" value="-15" />
+					<param name="right_posx" value="1240" />
+					<param name="posy" value="924" />
+					<param name="visible" value="true" />
 				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="440" />
-					<param name="icon" value="icons/infodialogs/trailer.png" />
-					<param name="label" value="$LOCALIZE[31090]" />
-					<param name="onclick_1" value="Action(close)" />
-					<param name="onclick_2" value="RunScript(script.extendedinfo,info=youtubebrowser,id=$INFO[ListItem.Title] $INFO[ListItem.Year])" />
-					<param name="visible" value="System.hasAddon(script.extendedinfo) + Stringcompare(ListItem.DBType,movie) + !Control.IsVisible(11)" />
+				<include name="LeftRightArrows">
+					<param name="list_id" value="50" />
+					<param name="left_posx" value="-15" />
+					<param name="right_posx" value="1240" />
+					<param name="posy" value="320" />
+					<param name="visible" value="true" />
 				</include>
-				<control type="group" id="400">
-					<width>262</width>
-					<visible>Control.IsEnabled(7)</visible>
-					<control type="button" id="7">
-						<include name="VideoInfoButtonsCommon">
-							<param name="icon" value="" />
-						</include>
-						<label>$LOCALIZE[31033]</label>
-						<onleft>440</onleft>
-						<onright>101</onright>
-						<onup condition="IntegerGreaterThan(Container(5000).CurrentItem,3)">210</onup>
-						<onup condition="!IntegerGreaterThan(Container(5000).CurrentItem,3)">140</onup>
-						<ondown condition="Stringcompare(Container(5000).CurrentItem,1)">SetFocus(50,0)</ondown>
-						<ondown condition="Stringcompare(Container(5000).CurrentItem,2)">SetFocus(50,1)</ondown>
-						<ondown condition="Stringcompare(Container(5000).CurrentItem,3)">SetFocus(50,2)</ondown>
-						<ondown condition="Stringcompare(Container(5000).CurrentItem,4)">SetFocus(50,3)</ondown>
-						<ondown condition="Stringcompare(Container(5000).CurrentItem,5)">SetFocus(50,4)</ondown>
+			</control>
+			<control type="group">
+				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<top>980</top>
+				<include>MediaFlags</include>
+				<control type="group">
+					<visible>Control.HasFocus(50)</visible>
+					<animation effect="fade" time="200">VisibleChange</animation>
+					<top>19</top>
+					<left>700</left>
+					<control type="image">
+						<left>17</left>
+						<width>44</width>
+						<height>44</height>
+						<animation effect="rotate" end="-90" center="40,23" time="0" condition="true">Conditional</animation>
+						<texture colordiffuse="button_focus">frame/menu-nofo.png</texture>
 					</control>
 					<control type="label">
-						<label>$INFO[ListItem.UserRating]</label>
-						<font>font30_title</font>
-						<left>0</left>
-						<top>18</top>
-						<width>262</width>
-						<align>center</align>
+						<left>74</left>
+						<width>500</width>
+						<height>44</height>
+						<shadowcolor>text_shadow</shadowcolor>
+						<label>$LOCALIZE[31125]</label>
 					</control>
+				</control>
+				<control type="group">
+					<visible>Control.HasFocus(138)</visible>
+					<animation effect="fade" time="200">VisibleChange</animation>
+					<top>19</top>
+					<left>700</left>
 					<control type="image">
-						<texture>icons/infodialogs/rating.png</texture>
-						<left>107</left>
-						<top>24</top>
-						<width>48</width>
-						<height>48</height>
-						<align>center</align>
-						<visible>IsEmpty(ListItem.UserRating)</visible>
+						<left>17</left>
+						<width>44</width>
+						<height>44</height>
+						<texture colordiffuse="button_focus">frame/menu-fo.png</texture>
+					</control>
+					<control type="label">
+						<left>74</left>
+						<width>500</width>
+						<height>44</height>
+						<shadowcolor>text_shadow</shadowcolor>
+						<label>$LOCALIZE[31126]</label>
 					</control>
 				</control>
-				<include name="InfoDialogButton">
-					<param name="id" value="101" />
-					<param name="icon" value="icons/infodialogs/info.png" />
-					<param name="label" value="$LOCALIZE[31034]" />
-					<param name="onclick_1" value="RunScript(script.extendedinfo,info=openinfodialog)" />
-					<param name="visible" value="System.hasAddon(script.extendedinfo)" />
-				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="102" />
-					<param name="icon" value="icons/infodialogs/image.png" />
-					<param name="label" value="$LOCALIZE[31028]" />
-					<param name="onclick_1" value="SetProperty(fanart,$ESCINFO[ListItem.Art(fanart)],home)" />
-					<param name="onclick_2" value="ActivateWindow(1104)" />
-					<param name="visible" value="!IsEmpty(ListItem.Art(fanart))" />
-				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="13" />
-					<param name="icon" value="icons/infodialogs/director.png" />
-					<param name="label" value="$LOCALIZE[31123]" />
-					<param name="visible" value="!IsEmpty(ListItem.Director)" />
-				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="10" />
-					<param name="icon" value="icons/infodialogs/choose_image.png" />
-					<param name="label" value="$LOCALIZE[13511]" />
-				</include>
-				<include name="InfoDialogButton">
-					<param name="id" value="6" />
-					<param name="icon" value="icons/infodialogs/update.png" />
-					<param name="label" value="$LOCALIZE[184]" />
-					<param name="visible" value="Control.IsEnabled(6)" />
-				</include>
 			</control>
-			<include name="LeftRightArrows">
-				<param name="list_id" value="5000" />
-				<param name="left_posx" value="-15" />
-				<param name="right_posx" value="1240" />
-				<param name="posy" value="824" />
-				<param name="visible" value="true" />
+			<include name="InfoDialogTopBarInfo">
+				<param name="main_label" value="$VAR[VideoInfoMainLabelVar]" />
+				<param name="sub_label" value="$VAR[VideoInfoSubLabelVar]" />
 			</include>
-			<include name="LeftRightArrows">
-				<param name="list_id" value="50" />
-				<param name="left_posx" value="-15" />
-				<param name="right_posx" value="1240" />
-				<param name="posy" value="320" />
-				<param name="visible" value="true" />
-			</include>
-		</control>
-		<control type="group">
-			<include>MediaFlags</include>
-		</control>
-		<include name="InfoDialogTopBarInfo">
-			<param name="main_label" value="$VAR[VideoInfoMainLabelVar]" />
-			<param name="sub_label" value="$VAR[VideoInfoSubLabelVar]" />
-		</include>
-		<control type="group">
-			<visible>Control.HasFocus(50)</visible>
-			<animation effect="fade" time="200">VisibleChange</animation>
-			<top>1019</top>
-			<control type="image">
-				<left>17</left>
-				<width>44</width>
-				<height>44</height>
-				<animation effect="rotate" end="-90" center="40,23" time="0" condition="true">Conditional</animation>
-				<texture colordiffuse="button_focus">frame/menu-nofo.png</texture>
-			</control>
-			<control type="label">
-				<left>74</left>
-				<width>500</width>
-				<height>44</height>
-				<shadowcolor>text_shadow</shadowcolor>
-				<label>$LOCALIZE[31125]</label>
-			</control>
-		</control>
-		<control type="group">
-			<visible>Control.HasFocus(138)</visible>
-			<animation effect="fade" time="200">VisibleChange</animation>
-			<top>1019</top>
-			<control type="image">
-				<left>17</left>
-				<width>44</width>
-				<height>44</height>
-				<texture colordiffuse="button_focus">frame/menu-fo.png</texture>
-			</control>
-			<control type="label">
-				<left>74</left>
-				<width>500</width>
-				<height>44</height>
-				<shadowcolor>text_shadow</shadowcolor>
-				<label>$LOCALIZE[31126]</label>
-			</control>
 		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/EventLog.xml Changed

@@ -5,35 +5,37 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<control type="grouplist" id="9000">
 				<include>OpenClose_Left</include>
 				<orientation>vertical</orientation>
 				<itemgap>-8.5</itemgap>
-				<left>110</left>
+				<left>90</left>
 				<top>162</top>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
 				<onleft>50</onleft>
 				<onright>50</onright>
+				<usecontrolcoords>true</usecontrolcoords>
 				<control type="togglebutton" id="4">
-					<width>350</width>
-					<height>199</height>
+					<width>420</width>
+					<height>110</height>
 					<align>center</align>
 					<aligny>top</aligny>
 					<font>font12</font>
 					<textoffsetx>20</textoffsetx>
-					<textoffsety>130</textoffsety>
+					<textoffsety>35</textoffsety>
 					<label>$LOCALIZE[31032]: $LOCALIZE[584]</label>
 					<altlabel>$LOCALIZE[31032]: $LOCALIZE[585]</altlabel>
 				</control>
 				<control type="group" id="4100">
 					<height>0</height>
 					<control type="image">
-						<top>-150</top>
+						<left>40</left>
+						<top>-68</top>
 						<width>350</width>
-						<height>70</height>
-						<aspectratio>keep</aspectratio>
+						<height>40</height>
+						<aspectratio align="left">keep</aspectratio>
 						<texture>icons/eventlog/order.png</texture>
 					</control>
 				</control>
@@ -43,21 +45,35 @@
 					<param name="label" value="" />
 					<param name="icon" value="icons/eventlog/settings.png" />
 				</include>
-				<include name="PlaylistWindowButton">
-					<param name="control_id" value="22" />
-					<param name="onclick" value="" />
-					<param name="label" value="$LOCALIZE[190]" />
-					<param name="icon" value="icons/eventlog/levels.png" />
-				</include>
+				<control type="radiobutton" id="22">
+					<width>420</width>
+					<height>110</height>
+					<align>center</align>
+					<aligny>top</aligny>
+					<font>font12</font>
+					<textoffsetx>20</textoffsetx>
+					<textoffsety>35</textoffsety>
+					<radioposx>-1</radioposx>
+				</control>
 				<include name="PlaylistWindowButton">
 					<param name="control_id" value="20" />
 					<param name="onclick" value="" />
 					<param name="label" value="$LOCALIZE[192]" />
 					<param name="icon" value="DefaultIconError.png" />
 				</include>
+				<control type="image">
+					<left>40</left>
+					<top>0</top>
+					<width>340</width>
+					<height>360</height>
+					<aspectratio aligny="bottom">keep</aspectratio>
+					<texture fallback="DefaultVideo.png">$INFO[ListItem.Icon]</texture>
+					<bordertexture border="20">overlays/shadow.png</bordertexture>
+					<bordersize>20</bordersize>
+				</control>
 			</control>
 			<control type="group">
-				<left>250</left>
+				<left>300</left>
 				<visible>Control.IsVisible(50)</visible>
 				<include>OpenClose_Right</include>
 				<control type="image">
@@ -71,7 +87,7 @@
 					<left>230</left>
 					<top>182</top>
 					<width>1260</width>
-					<height>9000</height>
+					<height>700</height>
 					<onleft>9000</onleft>
 					<onright>60</onright>
 					<onup>50</onup>
@@ -79,19 +95,19 @@
 					<viewtype label="535">list</viewtype>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime>200</scrolltime>
-					<itemlayout height="115" width="1260">
+					<itemlayout height="90" width="1260">
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
 							<width>1260</width>
-							<height>115</height>
+							<height>90</height>
 							<texture border="90,3,90,3">lists/separator.png</texture>
 						</control>
 						<control type="image">
 							<left>5</left>
 							<top>5</top>
-							<width>105</width>
-							<height>105</height>
+							<width>80</width>
+							<height>80</height>
 							<texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
 							<aspectratio>scale</aspectratio>
 							<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
@@ -101,25 +117,26 @@
 							<left>125</left>
 							<top>0</top>
 							<width>870</width>
-							<height>50</height>
+							<height>35</height>
 							<aligny>center</aligny>
-							<label>[B]$INFO[ListItem.Label][/B]</label>
+							<font>font12</font>
+							<label>$INFO[ListItem.Label]</label>
 						</control>
 						<control type="textbox">
 							<left>125</left>
-							<top>40</top>
+							<top>34</top>
 							<width>870</width>
-							<height>70</height>
-							<font>font10</font>
+							<height>60</height>
+							<font>font10_title</font>
 							<textcolor>grey</textcolor>
-							<aligny>center</aligny>
+							<aligny>top</aligny>
 							<label>$INFO[ListItem.Property(Event.Description)]</label>
 						</control>
 						<control type="label">
 							<left>125</left>
 							<top>0</top>
 							<width>1120</width>
-							<height>50</height>
+							<height>35</height>
 							<font>font12</font>
 							<textcolor>button_focus</textcolor>
 							<align>right</align>
@@ -127,12 +144,12 @@
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="115" width="1260">
+					<focusedlayout height="90" width="1260">
 						<control type="image">
 							<left>0</left>
 							<top>0</top>
 							<width>1260</width>
-							<height>115</height>
+							<height>90</height>
 							<texture border="90,3,90,3">lists/separator.png</texture>
 							<visible>!Control.HasFocus(50)</visible>
 						</control>
@@ -140,15 +157,15 @@
 							<left>0</left>
 							<top>0</top>
 							<width>1260</width>
-							<height>115</height>
+							<height>90</height>
 							<texture>lists/focus.png</texture>
 							<visible>Control.HasFocus(50)</visible>
 						</control>
 						<control type="image">
 							<left>5</left>
 							<top>5</top>
-							<width>105</width>
-							<height>105</height>
+							<width>80</width>
+							<height>80</height>
 							<texture border="4" fallback="DefaultAddon.png">$INFO[Listitem.Icon]</texture>
 							<aspectratio>scale</aspectratio>
 							<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
@@ -158,25 +175,26 @@
 							<left>125</left>
 							<top>0</top>
 							<width>870</width>
-							<height>50</height>
+							<height>35</height>
 							<aligny>center</aligny>
-							<label>[B]$INFO[ListItem.Label][/B]</label>
+							<font>font12</font>
+							<label>$INFO[ListItem.Label]</label>
 						</control>
 						<control type="textbox">
 							<left>125</left>
-							<top>40</top>
+							<top>34</top>
 							<width>870</width>
-							<height>70</height>
-							<font>font10</font>
+							<height>60</height>
+							<font>font10_title</font>
 							<textcolor>grey</textcolor>
-							<aligny>center</aligny>
+							<aligny>top</aligny>
 							<label>$INFO[ListItem.Property(Event.Description)]</label>
 						</control>
 						<control type="label">
 							<left>125</left>
 							<top>0</top>
 							<width>1120</width>
-							<height>50</height>
+							<height>35</height>
 							<font>font12</font>
 							<textcolor>button_focus</textcolor>
 							<align>right</align>
@@ -185,20 +203,20 @@
 						</control>
 					</focusedlayout>
 				</control>
-				<include name="UpDownArrows">
-					<param name="container_id" value="50" />
-					<param name="visible" value="!System.HasModalDialog" />
-				</include>
-				<control type="scrollbar" id="60">
-					<right>0</right>
-					<top>80</top>
-					<width>12</width>
-					<height>920</height>
-					<onleft>50</onleft>
-					<onright>9000</onright>
-					<orientation>vertical</orientation>
-					<visible>Control.IsVisible(50)</visible>
-				</control>
+			</control>
+			<include name="UpDownArrows">
+				<param name="container_id" value="50" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<control type="scrollbar" id="60">
+				<right>0</right>
+				<top>80</top>
+				<width>12</width>
+				<height>920</height>
+				<onleft>50</onleft>
+				<onright>9000</onright>
+				<orientation>vertical</orientation>
+				<visible>Control.IsVisible(50)</visible>
 			</control>
 		</control>
 		<include name="TopBar">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Font.xml Changed

@@ -5,7 +5,7 @@
 		<font>
 			<name>font10</name>
 			<filename>Lato-Regular.ttf</filename>
-			<size>23</size>
+			<size>24</size>
 		</font>
 		<font>
 			<name>font12</name>
@@ -13,13 +13,6 @@
 			<size>25</size>
 		</font>
 		<font>
-			<name>font_textbox</name>
-			<filename>Lato-Regular.ttf</filename>
-			<size>27</size>
-			<aspect>0.9</aspect>
-			<linespacing>1.17</linespacing>
-		</font>
-		<font>
 			<name>font13</name>
 			<filename>Lato-Regular.ttf</filename>
 			<size>30</size>
@@ -44,11 +37,17 @@
 			<filename>Lato-Regular.ttf</filename>
 			<size>27</size>
 		</font>
+		<font>
+			<name>font_textbox</name>
+			<filename>Lato-Regular.ttf</filename>
+			<size>26</size>
+			<linespacing>1.2</linespacing>
+		</font>
 		
 		<font>
 			<name>font10_title</name>
 			<filename>Lato-Bold.ttf</filename>
-			<size>18</size>
+			<size>20</size>
 		</font>
 		<font>
 			<name>font12_title</name>
@@ -97,7 +96,7 @@
 		</font>
 		<font>
 			<name>Mono30</name>
-			<filename>Anonymous Pro.ttf</filename>
+			<filename>AnonymousPro.ttf</filename>
 			<size>30</size>
 		</font>
 	</fontset>
@@ -138,6 +137,12 @@
 			<filename>arial.ttf</filename>
 			<size>24</size>
 		</font>
+		<font>
+			<name>font_textbox</name>
+			<filename>Lato-Regular.ttf</filename>
+			<size>26</size>
+			<linespacing>1.2</linespacing>
+		</font>
 		
 		<font>
 			<name>font10_title</name>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Home.xml Changed

@@ -2,8 +2,9 @@
 <window>
 	<menucontrol>9000</menucontrol>
 	<defaultcontrol>9000</defaultcontrol>
-	<backgroundcolor>background</backgroundcolor>
+	
+	<backgroundcolor>background</backgroundcolor>
 	<controls>
 		<control type="button" id="20000">
 			<include>HiddenObject</include>
@@ -25,1147 +26,1147 @@
 			<include>FullScreenDimensions</include>
 			<aspectratio>scale</aspectratio>
 			<fadetime>600</fadetime>
-			<animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation>
+			<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
 			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
 			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
 			<animation effect="fade" time="400">VisibleChange</animation>
-			<imagepath background="true" colordiffuse="20FFFFFF">$VAR[HomeFanartVar]</imagepath>
+			<imagepath background="true" colordiffuse="35FFFFFF">$VAR[HomeFanartVar]</imagepath>
 			<visible>!Player.HasMedia</visible>
 		</control>
-		<control type="group" id="2000">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<animation type="Conditional" condition="Control.IsVisible(20000)" reversible="false">
-				<effect type="slide" end="0,20" time="60" tween="sine" />
-				<effect type="slide" end="0,-20" time="180" tween="sine" delay="80" />
-			</animation>
-			<animation type="Conditional" condition="Control.IsVisible(20001)" reversible="false">
-				<effect type="slide" end="0,-20" time="60" tween="sine" />
-				<effect type="slide" end="0,20" time="180" tween="sine" delay="80" />
-			</animation>
-			<top>78</top>
-			<left>20</left>
-			<include>OpenClose_Right</include>
-			<control type="group" id="5000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),movies)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="5888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(5001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(5200).NumItems,0)">SetFocus(5200)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(5100).NumItems,0)">SetFocus(5100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-				</control>
-				<control type="grouplist" id="5001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<itemgap>-2</itemgap>
-					<include name="SubMenu">
-						<param name="list_id" value="5900"/>
-						<param name="ondown_id" value="5100"/>
-						<param name="visible" value="Library.HasContent(movies)"/>
-						<param name="item1_onclick" value="ActivateWindow(videos,RecentlyAddedMovies,return)" />
-						<param name="item1_icon" value="recentlyadded.png" />
-						<param name="item1_label" value="$LOCALIZE[20386]" />
-						<param name="item2_onclick" value="ActivateWindow(videos,MovieYears,return)" />
-						<param name="item2_icon" value="years.png" />
-						<param name="item2_label" value="$LOCALIZE[652]" />
-						<param name="item3_onclick" value="ActivateWindow(videos,MovieSets,return)" />
-						<param name="item3_icon" value="sets.png" />
-						<param name="item3_label" value="$LOCALIZE[31075]" />
-						<param name="item4_onclick" value="ActivateWindow(videos,MovieGenres,return)" />
-						<param name="item4_icon" value="genres.png" />
-						<param name="item4_label" value="$LOCALIZE[135]" />
-						<param name="item5_onclick" value="ActivateWindow(videos,MovieActors,return)" />
-						<param name="item5_icon" value="actors.png" />
-						<param name="item5_label" value="$LOCALIZE[344]" />
-						<param name="item6_onclick" value="ActivateWindow(videos,MovieTags,return)" />
-						<param name="item6_icon" value="tags.png" />
-						<param name="item6_label" value="$LOCALIZE[20459]" />
-						<param name="item7_onclick" value="ActivateWindow(videos,library://video/movies/,return)" />
-						<param name="item7_icon" value="media.png" />
-						<param name="item7_label" value="$LOCALIZE[31074]" />
-						<param name="item8_onclick" value="UpdateLibrary(video)" />
-						<param name="item8_icon" value="updatelibrary.png" />
-						<param name="item8_label" value="$LOCALIZE[653]" />
-					</include>
-					<include name="WidgetListMovies">
-						<param name="content_path" value="special://skin/playlists/inprogress_movies.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31010]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="5100"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[Container(5100).ListItem.Dbid])"/>
-						<param name="onup_id" value="5900"/>
-						<param name="ondown_id" value="5200"/>
-					</include>
-					<include name="WidgetListMovies">
-						<param name="content_path" value="videodb://recentlyaddedmovies/"/>
-						<param name="widget_header" value="$LOCALIZE[20386]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="5200"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[Container(5200).ListItem.Dbid])"/>
-						<param name="onup_id" value="5100"/>
-						<param name="ondown_id" value="5300"/>
-					</include>
-					<include name="WidgetListMovies">
-						<param name="content_path" value="special://skin/playlists/unwatched_movies.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31007]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="5300"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[Container(5300).ListItem.Dbid])"/>
-						<param name="onup_id" value="5200"/>
-						<param name="ondown_id" value="5400"/>
-					</include>
-					<include name="WidgetListMovies">
-						<param name="content_path" value="special://skin/playlists/random_movies.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31006]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="5400"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedinfo,dbid=$INFO[Container(5400).ListItem.Dbid])"/>
-						<param name="onup_id" value="5300"/>
-						<param name="ondown_id" value="20001"/>
-					</include>
-					<include name="ImageWidgetHeader">
-						<param name="widget_header" value="$LOCALIZE[342]" />
-						<param name="visible" value="!Library.HasContent(movies)"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/movie.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31104]" />
-						<param name="button_label" value="$LOCALIZE[31110]" />
-						<param name="button_onclick" value="ActivateWindow(videos,files,return)"/>
-						<param name="button_id" value="5500"/>
-						<param name="visible" value="!Library.HasContent(movies)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMovieButton)"/>
-					</include>
-				</control>
-			</control>
-			<control type="group" id="6000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),tv)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="6888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(6001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(6200).NumItems,0)">SetFocus(6200)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(6100).NumItems,0)">SetFocus(6100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-				</control>
-				<control type="grouplist" id="6001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="6900"/>
-						<param name="ondown_id" value="6100"/>
-						<param name="visible" value="Library.HasContent(tvshows)"/>
-						<param name="item1_onclick" value="ActivateWindow(Videos,RecentlyAddedEpisodes,return)" />
-						<param name="item1_icon" value="recentlyadded.png" />
-						<param name="item1_label" value="$LOCALIZE[20387]" />
-						<param name="item2_onclick" value="ActivateWindow(Videos,TVShowYears,return)" />
-						<param name="item2_icon" value="years.png" />
-						<param name="item2_label" value="$LOCALIZE[652]" />
-						<param name="item3_onclick" value="ActivateWindow(Videos,TVShowTitles,return)" />
-						<param name="item3_icon" value="title.png" />
-						<param name="item3_label" value="$LOCALIZE[31073]" />
-						<param name="item4_onclick" value="ActivateWindow(Videos,TVShowGenres,return)" />
-						<param name="item4_icon" value="genres.png" />
-						<param name="item4_label" value="$LOCALIZE[135]" />
-						<param name="item5_onclick" value="ActivateWindow(Videos,TVShowActors,return)" />
-						<param name="item5_icon" value="actors.png" />
-						<param name="item5_label" value="$LOCALIZE[344]" />
-						<param name="item6_onclick" value="ActivateWindow(Videos,TVShowTags,return)" />
-						<param name="item6_icon" value="tags.png" />
-						<param name="item6_label" value="$LOCALIZE[20459]" />
-						<param name="item7_onclick" value="ActivateWindow(videos,library://video/tvshows/)" />
-						<param name="item7_icon" value="media.png" />
-						<param name="item7_label" value="$LOCALIZE[31074]" />
-						<param name="item8_onclick" value="UpdateLibrary(video)" />
-						<param name="item8_icon" value="updatelibrary.png" />
-						<param name="item8_label" value="$LOCALIZE[653]" />
-					</include>
-					<include name="WidgetListEpisodes">
-						<param name="content_path" value="videodb://inprogresstvshows"/>
-						<param name="sortby" value="lastplayed"/>
-						<param name="sortorder" value="descending"/>
-						<param name="widget_header" value="$LOCALIZE[626]"/>
-						<param name="item_image" value="$VAR[TVShowWidgetImageVar]" />
-						<param name="widget_target" value="videos"/>
-						<param name="second_label" value="$LOCALIZE[16102]: $INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ]" />
-						<param name="list_id" value="6100"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[Container(6100).ListItem.Dbid])"/>
-						<param name="onup_id" value="6900"/>
-						<param name="ondown_id" value="6200"/>
-					</include>
-					<include name="WidgetListEpisodes">
-						<param name="content_path" value="videodb://recentlyaddedepisodes/"/>
-						<param name="widget_header" value="$LOCALIZE[20387]"/>
-						<param name="item_image" value="$INFO[ListItem.Art(thumb)]" />
-						<param name="widget_target" value="videos"/>
-						<param name="second_label" value="[COLOR button_focus]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode][/COLOR] $INFO[ListItem.Title]" />
-						<param name="list_id" value="6200"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedepisodeinfo,tvshow=$INFO[Container(6200).ListItem.TvShowTitle],season=$INFO[Container(6200).ListItem.season],episode=$INFO[Container(6200).ListItem.episode])"/>
-						<param name="onup_id" value="6100"/>
-						<param name="ondown_id" value="6300"/>
-					</include>
-					<include name="WidgetListEpisodes">
-						<param name="content_path" value="special://skin/playlists/unwatched_tvshows.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31122]"/>
-						<param name="item_image" value="$VAR[TVShowWidgetImageVar]" />
-						<param name="widget_target" value="videos"/>
-						<param name="second_label" value="$LOCALIZE[20360]: $INFO[ListItem.Property(TotalEpisodes)]" />
-						<param name="list_id" value="6300"/>
-						<param name="list_oninfo" value="RunScript(script.extendedinfo,info=extendedtvinfo,dbid=$INFO[Container(6300).ListItem.Dbid])"/>
-						<param name="onup_id" value="6200"/>
-						<param name="ondown_id" value="20001"/>
-					</include>
-					<include name="ImageWidgetHeader">
-						<param name="widget_header" value="$LOCALIZE[20343]" />
-						<param name="visible" value="!Library.HasContent(tvshows)"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31104]" />
-						<param name="button_label" value="$LOCALIZE[31110]" />
-						<param name="button_onclick" value="ActivateWindow(videos,files,return)"/>
-						<param name="button_id" value="6400"/>
-						<param name="visible" value="!Library.HasContent(tvshows)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVShowButton)"/>
-					</include>
-				</control>
-			</control>
-			<control type="group" id="7000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),music)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="7888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(7001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(7100).NumItems,0)">SetFocus(7100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-				</control>
-				<control type="grouplist" id="7001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="7900"/>
-						<param name="ondown_id" value="7100"/>
-						<param name="item1_onclick" value="ActivateWindow(Music,RecentlyAddedAlbums,return)" />
-						<param name="item1_icon" value="recentlyadded.png" />
-						<param name="item1_label" value="$LOCALIZE[359]" />
-						<param name="item1_vis" value="Library.HasContent(music)" />
-						<param name="item2_onclick" value="ActivateWindow(Music,Artists,return)" />
-						<param name="item2_icon" value="actors.png" />
-						<param name="item2_label" value="$LOCALIZE[133]" />
-						<param name="item2_vis" value="Library.HasContent(music)" />
-						<param name="item3_onclick" value="ActivateWindow(Music,Albums,return)" />
-						<param name="item3_icon" value="albums.png" />
-						<param name="item3_label" value="$LOCALIZE[132]" />
-						<param name="item3_vis" value="Library.HasContent(music)" />
-						<param name="item4_onclick" value="ActivateWindow(Music,Top100,return)" />
-						<param name="item4_icon" value="top100.png" />
-						<param name="item4_label" value="$LOCALIZE[271]" />
-						<param name="item4_vis" value="Library.HasContent(music)" />
-						<param name="item5_onclick" value="ActivateWindow(Music,Files,return)" />
-						<param name="item5_icon" value="files.png" />
-						<param name="item5_label" value="$LOCALIZE[744]" />
-						<param name="item6_onclick" value="ActivateWindow(music,Playlists,return)" />
-						<param name="item6_icon" value="playlists.png" />
-						<param name="item6_label" value="$LOCALIZE[136]" />
-						<param name="item7_onclick" value="ActivateWindow(Music,root)" />
-						<param name="item7_icon" value="media.png" />
-						<param name="item7_label" value="$LOCALIZE[31074]" />
-						<param name="item8_onclick" value="UpdateLibrary(music)" />
-						<param name="item8_icon" value="updatelibrary.png" />
-						<param name="item8_label" value="$LOCALIZE[653]" />
-						<param name="item8_vis" value="Library.HasContent(music)" />
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="musicdb://recentlyplayedalbums"/>
-						<param name="widget_header" value="$LOCALIZE[517]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7100"/>
-						<param name="onup_id" value="7900"/>
-						<param name="ondown_id" value="7200"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="musicdb://recentlyaddedalbums/"/>
-						<param name="widget_header" value="$LOCALIZE[359]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7200"/>
-						<param name="onup_id" value="7100"/>
-						<param name="ondown_id" value="7300"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="special://skin/playlists/random_albums.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31012]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7300"/>
-						<param name="onup_id" value="7200"/>
-						<param name="ondown_id" value="7400"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="special://skin/playlists/random_artists.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31013]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7400"/>
-						<param name="onup_id" value="7300"/>
-						<param name="ondown_id" value="7500"/>
-						<param name="single_label" value="$INFO[ListItem.Label]"/>
-						<param name="main_label" value=""/>
-						<param name="sub_label" value=""/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="special://skin/playlists/unplayed_albums.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31014]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7500"/>
-						<param name="onup_id" value="7400"/>
-						<param name="ondown_id" value="7600"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="special://skin/playlists/mostplayed_albums.xsp"/>
-						<param name="widget_header" value="$LOCALIZE[31011]"/>
-						<param name="widget_target" value="music"/>
-						<param name="list_id" value="7600"/>
-						<param name="onup_id" value="7500"/>
-						<param name="ondown_id" value="20001"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/music.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31104]" />
-						<param name="button_label" value="$LOCALIZE[31110]" />
-						<param name="button_onclick" value="ActivateWindow(music,files)"/>
-						<param name="button_id" value="7600"/>
-						<param name="onup_id" value="7500"/>
-						<param name="visible" value="!Library.HasContent(music)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicButton)"/>
-					</include>
-				</control>
-			</control>
-			<control type="group" id="8000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),addons)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="8888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(8001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(8100).NumItems,0)">SetFocus(8100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+			<control type="group" id="2000">
+				<animation type="Conditional" condition="Control.IsVisible(20000)" reversible="false">
+					<effect type="slide" end="0,20" time="60" tween="sine" />
+					<effect type="slide" end="0,-20" time="180" tween="sine" delay="80" />
+				</animation>
+				<animation type="Conditional" condition="Control.IsVisible(20001)" reversible="false">
+					<effect type="slide" end="0,-20" time="60" tween="sine" />
+					<effect type="slide" end="0,20" time="180" tween="sine" delay="80" />
+				</animation>
+				<top>78</top>
+				<left>20</left>
+				<include>OpenClose_Right</include>
+				<control type="group" id="5000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),movies)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="5888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(5001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(5200).NumItems,0)">SetFocus(5200)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(5100).NumItems,0)">SetFocus(5100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="5001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<itemgap>-2</itemgap>
+						<include name="SubMenu">
+							<param name="list_id" value="5900"/>
+							<param name="ondown_id" value="5100"/>
+							<param name="visible" value="Library.HasContent(movies)"/>
+							<param name="item1_onclick" value="ActivateWindow(videos,RecentlyAddedMovies,return)" />
+							<param name="item1_icon" value="recentlyadded.png" />
+							<param name="item1_label" value="$LOCALIZE[20386]" />
+							<param name="item2_onclick" value="ActivateWindow(videos,MovieYears,return)" />
+							<param name="item2_icon" value="years.png" />
+							<param name="item2_label" value="$LOCALIZE[652]" />
+							<param name="item3_onclick" value="ActivateWindow(videos,MovieSets,return)" />
+							<param name="item3_icon" value="sets.png" />
+							<param name="item3_label" value="$LOCALIZE[31075]" />
+							<param name="item4_onclick" value="ActivateWindow(videos,MovieGenres,return)" />
+							<param name="item4_icon" value="genres.png" />
+							<param name="item4_label" value="$LOCALIZE[135]" />
+							<param name="item5_onclick" value="ActivateWindow(videos,MovieActors,return)" />
+							<param name="item5_icon" value="actors.png" />
+							<param name="item5_label" value="$LOCALIZE[344]" />
+							<param name="item6_onclick" value="ActivateWindow(videos,MovieTags,return)" />
+							<param name="item6_icon" value="tags.png" />
+							<param name="item6_label" value="$LOCALIZE[20459]" />
+							<param name="item7_onclick" value="ActivateWindow(videos,library://video/movies/,return)" />
+							<param name="item7_icon" value="media.png" />
+							<param name="item7_label" value="$LOCALIZE[31074]" />
+							<param name="item8_onclick" value="UpdateLibrary(video)" />
+							<param name="item8_icon" value="updatelibrary.png" />
+							<param name="item8_label" value="$LOCALIZE[653]" />
+						</include>
+						<include name="WidgetListMovies">
+							<param name="content_path" value="special://skin/playlists/inprogress_movies.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31010]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="5100"/>
+							<param name="onup_id" value="5900"/>
+							<param name="ondown_id" value="5200"/>
+						</include>
+						<include name="WidgetListMovies">
+							<param name="content_path" value="videodb://recentlyaddedmovies/"/>
+							<param name="widget_header" value="$LOCALIZE[20386]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="5200"/>
+							<param name="onup_id" value="5100"/>
+							<param name="ondown_id" value="5300"/>
+						</include>
+						<include name="WidgetListMovies">
+							<param name="content_path" value="special://skin/playlists/unwatched_movies.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31007]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="5300"/>
+							<param name="onup_id" value="5200"/>
+							<param name="ondown_id" value="5400"/>
+						</include>
+						<include name="WidgetListMovies">
+							<param name="content_path" value="special://skin/playlists/random_movies.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31006]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="5400"/>
+							<param name="onup_id" value="5300"/>
+							<param name="ondown_id" value="20001"/>
+						</include>
+						<include name="ImageWidgetHeader">
+							<param name="widget_header" value="$LOCALIZE[342]" />
+							<param name="visible" value="!Library.HasContent(movies)"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/movie.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31104]" />
+							<param name="button_label" value="$LOCALIZE[31110]" />
+							<param name="button_onclick" value="ActivateWindow(videos,files,return)"/>
+							<param name="button_id" value="5500"/>
+							<param name="visible" value="!Library.HasContent(movies)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMovieButton)"/>
+						</include>
+					</control>
 				</control>
-				<control type="grouplist" id="8001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="8900"/>
-						<param name="ondown_id" value="8100"/>
-						<param name="item1_onclick" value="ActivateWindow(addonbrowser,root)" />
-						<param name="item1_icon" value="add-ons.png" />
-						<param name="item1_label" value="$LOCALIZE[10040]" />
-						<param name="item2_onclick" value="ActivateWindow(systemsettings,addons)" />
-						<param name="item2_icon" value="settings.png" />
-						<param name="item2_label" value="$LOCALIZE[1045]" />
-						<param name="item3_vis" value="False" />
-						<param name="item4_vis" value="False" />
-						<param name="item5_vis" value="False" />
-						<param name="item6_vis" value="False" />
-						<param name="item7_vis" value="False" />
-						<param name="item8_vis" value="False" />
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="addons://sources/video/"/>
-						<param name="widget_header" value="$LOCALIZE[1037]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="sortby" value="lastused"/>
-						<param name="sortorder" value="descending"/>
-						<param name="list_id" value="8100"/>
-						<param name="onup_id" value="8900"/>
-						<param name="ondown_id" value="8200"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="addons://sources/audio/"/>
-						<param name="widget_header" value="$LOCALIZE[1038]"/>
-						<param name="widget_target" value="music"/>
-						<param name="sortby" value="lastused"/>
-						<param name="sortorder" value="descending"/>
-						<param name="list_id" value="8200"/>
-						<param name="onup_id" value="8100"/>
-						<param name="ondown_id" value="8300"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="addons://sources/executable/"/>
-						<param name="widget_header" value="$LOCALIZE[1043]"/>
-						<param name="widget_target" value="programs"/>
-						<param name="sortby" value="lastused"/>
-						<param name="sortorder" value="descending"/>
-						<param name="list_id" value="8300"/>
-						<param name="onup_id" value="8200"/>
-						<param name="ondown_id" value="8400"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="androidapp://sources/apps/"/>
-						<param name="widget_header" value="$LOCALIZE[20244]"/>
-						<param name="widget_target" value="programs"/>
-						<param name="sortby" value="lastused"/>
-						<param name="sortorder" value="descending"/>
-						<param name="list_id" value="8400"/>
-						<param name="onup_id" value="8300"/>
-						<param name="ondown_id" value="8500"/>
-					</include>
-					<include name="WidgetListSquare">
-						<param name="content_path" value="addons://sources/image/"/>
-						<param name="widget_header" value="$LOCALIZE[1039]"/>
-						<param name="widget_target" value="pictures"/>
-						<param name="sortby" value="lastused"/>
-						<param name="sortorder" value="descending"/>
-						<param name="list_id" value="8500"/>
-						<param name="onup_id" value="8400"/>
-						<param name="ondown_id" value="20001"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31119]" />
-						<param name="button_label" value="$LOCALIZE[31118]" />
-						<param name="button_onclick" value="ActivateWindow(addonbrowser)"/>
-						<param name="button_id" value="8600"/>
-						<param name="visible" value="!IntegerGreaterThan(Container(8100).NumItems,0) + !IntegerGreaterThan(Container(8200).NumItems,0) + !IntegerGreaterThan(Container(8300).NumItems,0) + !IntegerGreaterThan(Container(8400).NumItems,0) + !IntegerGreaterThan(Container(8500).NumItems,0)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/>
-					</include>
+				<control type="group" id="6000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),tvshows)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="6888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(6001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(6200).NumItems,0)">SetFocus(6200)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(6100).NumItems,0)">SetFocus(6100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="6001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="6900"/>
+							<param name="ondown_id" value="6100"/>
+							<param name="visible" value="Library.HasContent(tvshows)"/>
+							<param name="item1_onclick" value="ActivateWindow(Videos,RecentlyAddedEpisodes,return)" />
+							<param name="item1_icon" value="recentlyadded.png" />
+							<param name="item1_label" value="$LOCALIZE[20387]" />
+							<param name="item2_onclick" value="ActivateWindow(Videos,TVShowYears,return)" />
+							<param name="item2_icon" value="years.png" />
+							<param name="item2_label" value="$LOCALIZE[652]" />
+							<param name="item3_onclick" value="ActivateWindow(Videos,TVShowTitles,return)" />
+							<param name="item3_icon" value="title.png" />
+							<param name="item3_label" value="$LOCALIZE[31073]" />
+							<param name="item4_onclick" value="ActivateWindow(Videos,TVShowGenres,return)" />
+							<param name="item4_icon" value="genres.png" />
+							<param name="item4_label" value="$LOCALIZE[135]" />
+							<param name="item5_onclick" value="ActivateWindow(Videos,TVShowActors,return)" />
+							<param name="item5_icon" value="actors.png" />
+							<param name="item5_label" value="$LOCALIZE[344]" />
+							<param name="item6_onclick" value="ActivateWindow(Videos,TVShowTags,return)" />
+							<param name="item6_icon" value="tags.png" />
+							<param name="item6_label" value="$LOCALIZE[20459]" />
+							<param name="item7_onclick" value="ActivateWindow(videos,library://video/tvshows/)" />
+							<param name="item7_icon" value="media.png" />
+							<param name="item7_label" value="$LOCALIZE[31074]" />
+							<param name="item8_onclick" value="UpdateLibrary(video)" />
+							<param name="item8_icon" value="updatelibrary.png" />
+							<param name="item8_label" value="$LOCALIZE[653]" />
+						</include>
+						<include name="WidgetListEpisodes">
+							<param name="content_path" value="videodb://inprogresstvshows"/>
+							<param name="sortby" value="lastplayed"/>
+							<param name="sortorder" value="descending"/>
+							<param name="widget_header" value="$LOCALIZE[626]"/>
+							<param name="item_image" value="$VAR[TVShowWidgetImageVar]" />
+							<param name="widget_target" value="videos"/>
+							<param name="second_label" value="$LOCALIZE[16102]: $INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ]" />
+							<param name="list_id" value="6100"/>
+							<param name="onup_id" value="6900"/>
+							<param name="ondown_id" value="6200"/>
+						</include>
+						<include name="WidgetListEpisodes">
+							<param name="content_path" value="videodb://recentlyaddedepisodes/"/>
+							<param name="widget_header" value="$LOCALIZE[20387]"/>
+							<param name="item_image" value="$INFO[ListItem.Art(thumb)]" />
+							<param name="widget_target" value="videos"/>
+							<param name="second_label" value="[COLOR button_focus]$INFO[ListItem.Season,,x]$INFO[ListItem.Episode][/COLOR] $INFO[ListItem.Title]" />
+							<param name="list_id" value="6200"/>
+							<param name="onup_id" value="6100"/>
+							<param name="ondown_id" value="6300"/>
+						</include>
+						<include name="WidgetListEpisodes">
+							<param name="content_path" value="special://skin/playlists/unwatched_tvshows.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31122]"/>
+							<param name="item_image" value="$VAR[TVShowWidgetImageVar]" />
+							<param name="widget_target" value="videos"/>
+							<param name="second_label" value="$LOCALIZE[20360]: $INFO[ListItem.Property(TotalEpisodes)]" />
+							<param name="list_id" value="6300"/>
+							<param name="onup_id" value="6200"/>
+							<param name="ondown_id" value="20001"/>
+						</include>
+						<include name="ImageWidgetHeader">
+							<param name="widget_header" value="$LOCALIZE[20343]" />
+							<param name="visible" value="!Library.HasContent(tvshows)"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31104]" />
+							<param name="button_label" value="$LOCALIZE[31110]" />
+							<param name="button_onclick" value="ActivateWindow(videos,files,return)"/>
+							<param name="button_id" value="6400"/>
+							<param name="visible" value="!Library.HasContent(tvshows)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoTVShowButton)"/>
+						</include>
+					</control>
 				</control>
-			</control>
-			<control type="group" id="11000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),videos)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="11888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(11001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(11100).NumItems,0)">SetFocus(11100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+				<control type="group" id="7000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),music)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="7888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(7001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(7100).NumItems,0)">SetFocus(7100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="7001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="7900"/>
+							<param name="ondown_id" value="7100"/>
+							<param name="item1_onclick" value="ActivateWindow(Music,RecentlyAddedAlbums,return)" />
+							<param name="item1_icon" value="recentlyadded.png" />
+							<param name="item1_label" value="$LOCALIZE[359]" />
+							<param name="item1_vis" value="Library.HasContent(music)" />
+							<param name="item2_onclick" value="ActivateWindow(Music,Artists,return)" />
+							<param name="item2_icon" value="actors.png" />
+							<param name="item2_label" value="$LOCALIZE[133]" />
+							<param name="item2_vis" value="Library.HasContent(music)" />
+							<param name="item3_onclick" value="ActivateWindow(Music,Albums,return)" />
+							<param name="item3_icon" value="albums.png" />
+							<param name="item3_label" value="$LOCALIZE[132]" />
+							<param name="item3_vis" value="Library.HasContent(music)" />
+							<param name="item4_onclick" value="ActivateWindow(Music,Top100,return)" />
+							<param name="item4_icon" value="top100.png" />
+							<param name="item4_label" value="$LOCALIZE[271]" />
+							<param name="item4_vis" value="Library.HasContent(music)" />
+							<param name="item5_onclick" value="ActivateWindow(Music,Files,return)" />
+							<param name="item5_icon" value="files.png" />
+							<param name="item5_label" value="$LOCALIZE[744]" />
+							<param name="item6_onclick" value="ActivateWindow(music,Playlists,return)" />
+							<param name="item6_icon" value="playlists.png" />
+							<param name="item6_label" value="$LOCALIZE[136]" />
+							<param name="item7_onclick" value="ActivateWindow(Music,root)" />
+							<param name="item7_icon" value="media.png" />
+							<param name="item7_label" value="$LOCALIZE[31074]" />
+							<param name="item8_onclick" value="UpdateLibrary(music)" />
+							<param name="item8_icon" value="updatelibrary.png" />
+							<param name="item8_label" value="$LOCALIZE[653]" />
+							<param name="item8_vis" value="Library.HasContent(music)" />
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="musicdb://recentlyplayedalbums"/>
+							<param name="widget_header" value="$LOCALIZE[517]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7100"/>
+							<param name="onup_id" value="7900"/>
+							<param name="ondown_id" value="7200"/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="musicdb://recentlyaddedalbums/"/>
+							<param name="widget_header" value="$LOCALIZE[359]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7200"/>
+							<param name="onup_id" value="7100"/>
+							<param name="ondown_id" value="7300"/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="special://skin/playlists/random_albums.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31012]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7300"/>
+							<param name="onup_id" value="7200"/>
+							<param name="ondown_id" value="7400"/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="special://skin/playlists/random_artists.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31013]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7400"/>
+							<param name="onup_id" value="7300"/>
+							<param name="ondown_id" value="7500"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="special://skin/playlists/unplayed_albums.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31014]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7500"/>
+							<param name="onup_id" value="7400"/>
+							<param name="ondown_id" value="7600"/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="special://skin/playlists/mostplayed_albums.xsp"/>
+							<param name="widget_header" value="$LOCALIZE[31011]"/>
+							<param name="widget_target" value="music"/>
+							<param name="list_id" value="7600"/>
+							<param name="onup_id" value="7500"/>
+							<param name="ondown_id" value="20001"/>
+							<param name="sortby" value="playcount"/>
+							<param name="sortorder" value="descending"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/music.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31104]" />
+							<param name="button_label" value="$LOCALIZE[31110]" />
+							<param name="button_onclick" value="ActivateWindow(music,files)"/>
+							<param name="button_id" value="7600"/>
+							<param name="onup_id" value="7500"/>
+							<param name="visible" value="!Library.HasContent(music)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoMusicButton)"/>
+						</include>
+					</control>
 				</control>
-				<control type="grouplist" id="11001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="11900"/>
-						<param name="ondown_id" value="11100"/>
-						<param name="item1_onclick" value="ActivateWindow(Videos,Files,return)" />
-						<param name="item1_icon" value="files.png" />
-						<param name="item1_label" value="$LOCALIZE[744]" />
-						<param name="item2_onclick" value="ActivateWindow(Videos,special://videoplaylists/,return)" />
-						<param name="item2_icon" value="playlists.png" />
-						<param name="item2_label" value="$LOCALIZE[136]" />
-						<param name="item3_onclick" value="PlayDVD" />
-						<param name="item3_icon" value="dvd.png" />
-						<param name="item3_label" value="$LOCALIZE[31076]" />
-						<param name="item3_vis" value="System.HasMediadvd" />
-						<param name="item4_onclick" value="ActivateWindow(videos,root,return)" />
-						<param name="item4_icon" value="videos.png" />
-						<param name="item4_label" value="$LOCALIZE[31074]" />
-						<param name="item5_vis" value="False" />
-						<param name="item6_vis" value="False" />
-						<param name="item7_vis" value="False" />
-						<param name="item8_vis" value="False" />
-					</include>
-					<include name="WidgetListText">
-						<param name="content_path" value="sources://video/"/>
-						<param name="widget_header" value="$LOCALIZE[20094]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="11100"/>
-						<param name="onup_id" value="11900"/>
-						<param name="ondown_id" value="11200"/>
-					</include>
-					<include name="WidgetListText">
-						<param name="content_path" value="special://videoplaylists/"/>
-						<param name="widget_header" value="$LOCALIZE[136]"/>
-						<param name="widget_target" value="videos"/>
-						<param name="list_id" value="11200"/>
-						<param name="onup_id" value="11100"/>
-						<param name="ondown_id" value="20001"/>
-						<param name="icon" value="icons/defaulticons/DefaultPlaylist.png"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31105]" />
-						<param name="button_label" value="$LOCALIZE[31110]" />
-						<param name="button_onclick" value="ActivateWindow(videos,root)"/>
-						<param name="button_id" value="11300"/>
-						<param name="onup_id" value="11200"/>
-						<param name="visible" value="!IntegerGreaterThan(Container(11200).NumItems,0) + !IntegerGreaterThan(Container(11100).NumItems,0)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/>
-					</include>
+				<control type="group" id="8000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),addons)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="8888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(8001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(8100).NumItems,0)">SetFocus(8100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="8001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="8900"/>
+							<param name="ondown_id" value="8100"/>
+							<param name="item1_onclick" value="ActivateWindow(addonbrowser,root)" />
+							<param name="item1_icon" value="add-ons.png" />
+							<param name="item1_label" value="$LOCALIZE[10040]" />
+							<param name="item2_onclick" value="ActivateWindow(systemsettings,addons)" />
+							<param name="item2_icon" value="settings.png" />
+							<param name="item2_label" value="$LOCALIZE[1045]" />
+							<param name="item3_vis" value="False" />
+							<param name="item4_vis" value="False" />
+							<param name="item5_vis" value="False" />
+							<param name="item6_vis" value="False" />
+							<param name="item7_vis" value="False" />
+							<param name="item8_vis" value="False" />
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="addons://sources/video/"/>
+							<param name="widget_header" value="$LOCALIZE[1037]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="sortby" value="lastused"/>
+							<param name="sortorder" value="descending"/>
+							<param name="list_id" value="8100"/>
+							<param name="onup_id" value="8900"/>
+							<param name="ondown_id" value="8200"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="addons://sources/audio/"/>
+							<param name="widget_header" value="$LOCALIZE[1038]"/>
+							<param name="widget_target" value="music"/>
+							<param name="sortby" value="lastused"/>
+							<param name="sortorder" value="descending"/>
+							<param name="list_id" value="8200"/>
+							<param name="onup_id" value="8100"/>
+							<param name="ondown_id" value="8300"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="addons://sources/executable/"/>
+							<param name="widget_header" value="$LOCALIZE[1043]"/>
+							<param name="widget_target" value="programs"/>
+							<param name="sortby" value="lastused"/>
+							<param name="sortorder" value="descending"/>
+							<param name="list_id" value="8300"/>
+							<param name="onup_id" value="8200"/>
+							<param name="ondown_id" value="8400"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="androidapp://sources/apps/"/>
+							<param name="widget_header" value="$LOCALIZE[20244]"/>
+							<param name="widget_target" value="programs"/>
+							<param name="sortby" value="lastused"/>
+							<param name="sortorder" value="descending"/>
+							<param name="list_id" value="8400"/>
+							<param name="onup_id" value="8300"/>
+							<param name="ondown_id" value="8500"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+							<param name="visible" value="System.Platform.Android"/>
+						</include>
+						<include name="WidgetListSquare">
+							<param name="content_path" value="addons://sources/image/"/>
+							<param name="widget_header" value="$LOCALIZE[1039]"/>
+							<param name="widget_target" value="pictures"/>
+							<param name="sortby" value="lastused"/>
+							<param name="sortorder" value="descending"/>
+							<param name="list_id" value="8500"/>
+							<param name="onup_id" value="8400"/>
+							<param name="ondown_id" value="20001"/>
+							<param name="single_label" value="$INFO[ListItem.Label]"/>
+							<param name="main_label" value=""/>
+							<param name="sub_label" value=""/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/add-ons.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31119]" />
+							<param name="button_label" value="$LOCALIZE[31118]" />
+							<param name="button_onclick" value="ActivateWindow(addonbrowser)"/>
+							<param name="button_id" value="8600"/>
+							<param name="visible" value="!Integer.IsGreater(Container(8100).NumItems,0) + !Integer.IsGreater(Container(8200).NumItems,0) + !Integer.IsGreater(Container(8300).NumItems,0) + !Integer.IsGreater(Container(8400).NumItems,0) + !Integer.IsGreater(Container(8500).NumItems,0)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoProgramsButton)"/>
+						</include>
+					</control>
 				</control>
-			</control>
-			<control type="group" id="12000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),livetv)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="12888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(12001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(12100).NumItems,0)">SetFocus(12100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+				<control type="group" id="11000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),video)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="11888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(11001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(11100).NumItems,0)">SetFocus(11100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="11001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="11900"/>
+							<param name="ondown_id" value="11100"/>
+							<param name="item1_onclick" value="ActivateWindow(Videos,Files,return)" />
+							<param name="item1_icon" value="files.png" />
+							<param name="item1_label" value="$LOCALIZE[744]" />
+							<param name="item2_onclick" value="ActivateWindow(Videos,special://videoplaylists/,return)" />
+							<param name="item2_icon" value="playlists.png" />
+							<param name="item2_label" value="$LOCALIZE[136]" />
+							<param name="item3_onclick" value="PlayDVD" />
+							<param name="item3_icon" value="dvd.png" />
+							<param name="item3_label" value="$LOCALIZE[31076]" />
+							<param name="item3_vis" value="System.HasMediadvd" />
+							<param name="item4_onclick" value="ActivateWindow(videos,root,return)" />
+							<param name="item4_icon" value="videos.png" />
+							<param name="item4_label" value="$LOCALIZE[31074]" />
+							<param name="item5_vis" value="False" />
+							<param name="item6_vis" value="False" />
+							<param name="item7_vis" value="False" />
+							<param name="item8_vis" value="False" />
+						</include>
+						<include name="WidgetListText">
+							<param name="content_path" value="sources://video/"/>
+							<param name="widget_header" value="$LOCALIZE[20094]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="11100"/>
+							<param name="onup_id" value="11900"/>
+							<param name="ondown_id" value="11200"/>
+						</include>
+						<include name="WidgetListText">
+							<param name="content_path" value="special://videoplaylists/"/>
+							<param name="widget_header" value="$LOCALIZE[136]"/>
+							<param name="widget_target" value="videos"/>
+							<param name="list_id" value="11200"/>
+							<param name="onup_id" value="11100"/>
+							<param name="ondown_id" value="20001"/>
+							<param name="icon" value="icons/defaulticons/DefaultPlaylist.png"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/tv.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31105]" />
+							<param name="button_label" value="$LOCALIZE[31110]" />
+							<param name="button_onclick" value="ActivateWindow(videos,root)"/>
+							<param name="button_id" value="11300"/>
+							<param name="onup_id" value="11200"/>
+							<param name="visible" value="!Control.IsVisible(11100) + !Control.IsVisible(11200)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoVideosButton)"/>
+						</include>
+					</control>
 				</control>
-				<control type="grouplist" id="12001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<usecontrolcoords>true</usecontrolcoords>
-					<include name="SubMenu">
-						<param name="list_id" value="12900"/>
-						<param name="ondown_id" value="12200"/>
-						<param name="item1_onclick" value="ActivateWindow(TVChannels)" />
-						<param name="item1_icon" value="channels.png" />
-						<param name="item1_label" value="$LOCALIZE[19019]" />
-						<param name="item2_onclick" value="ActivateWindow(TVGuide)" />
-						<param name="item2_icon" value="guide.png" />
-						<param name="item2_label" value="$LOCALIZE[19069]" />
-						<param name="item3_onclick" value="ActivateWindow(TVRecordings)" />
-						<param name="item3_icon" value="recordings.png" />
-						<param name="item3_label" value="$LOCALIZE[19017]" />
-						<param name="item4_onclick" value="ActivateWindow(TVTimers)" />
-						<param name="item4_icon" value="timers.png" />
-						<param name="item4_label" value="$LOCALIZE[19040]" />
-						<param name="item5_onclick" value="ActivateWindow(TVTimerRules)" />
-						<param name="item5_icon" value="timer-rules.png" />
-						<param name="item5_label" value="$LOCALIZE[19138]" />
-						<param name="item6_onclick" value="ActivateWindow(TVSearch)" />
-						<param name="item6_icon" value="tv-search.png" />
-						<param name="item6_label" value="$LOCALIZE[137]" />
-						<param name="item7_vis" value="False" />
-						<param name="item8_vis" value="False" />
-					</include>
-					<include name="WidgetListChannels">
-						<param name="content_path" value="pvr://channels/tv/All channels/"/>
-						<param name="widget_header" value="$LOCALIZE[31016]"/>
-						<param name="widget_target" value="pvr"/>
-						<param name="list_id" value="12200"/>
-						<param name="onup_id" value="12900"/>
-						<param name="ondown_id" value="20001"/>
-						<param name="height" value="540"/>
-					</include>
-					<control type="grouplist">
-						<height>218</height>
-						<left>478</left>
-						<top>36</top>
-						<orientation>horizontal</orientation>
-						<align>right</align>
-						<width>1360</width>
-						<control type="group">
-							<width>680</width>
-							<visible>PVR.IsRecording</visible>
-							<include name="PVRWidget">
-								<param name="icon" value="$INFO[PVR.NowRecordingChannelIcon]" />
-								<param name="header" value="$LOCALIZE[19158]" />
-								<param name="label1" value="$INFO[PVR.NowRecordingDateTime,$LOCALIZE[19126] - ]" />
-								<param name="label2" value="$INFO[PVR.NowRecordingTitle][CR][COLOR=grey]$INFO[PVR.NowRecordingChannel][/COLOR]" />
-							</include>
-						</control>
-						<control type="group">>
-							<visible>PVR.HasNonRecordingTimer</visible>
-							<width>680</width>
-							<include name="PVRWidget">
-								<param name="icon" value="$INFO[PVR.NextRecordingChannelIcon]" />
-								<param name="header" value="$LOCALIZE[19157]" />
-								<param name="label1" value="$INFO[PVR.NextRecordingDateTime,$LOCALIZE[19126] - ]" />
-								<param name="label2" value="$INFO[PVR.NextRecordingTitle][CR][COLOR=grey]$INFO[PVR.NextRecordingChannel][/COLOR]" />
-							</include>
+				<control type="group" id="12000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),livetv)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="12888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(12001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(12100).NumItems,0)">SetFocus(12100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="12001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<usecontrolcoords>true</usecontrolcoords>
+						<include name="SubMenu">
+							<param name="list_id" value="12900"/>
+							<param name="ondown_id" value="12200"/>
+							<param name="item1_onclick" value="ActivateWindow(TVChannels)" />
+							<param name="item1_icon" value="channels.png" />
+							<param name="item1_label" value="$LOCALIZE[19019]" />
+							<param name="item2_onclick" value="ActivateWindow(TVGuide)" />
+							<param name="item2_icon" value="guide.png" />
+							<param name="item2_label" value="$LOCALIZE[19069]" />
+							<param name="item3_onclick" value="ActivateWindow(TVRecordings)" />
+							<param name="item3_icon" value="recordings.png" />
+							<param name="item3_label" value="$LOCALIZE[19017]" />
+							<param name="item4_onclick" value="ActivateWindow(TVTimers)" />
+							<param name="item4_icon" value="timers.png" />
+							<param name="item4_label" value="$LOCALIZE[19040]" />
+							<param name="item5_onclick" value="ActivateWindow(TVTimerRules)" />
+							<param name="item5_icon" value="timer-rules.png" />
+							<param name="item5_label" value="$LOCALIZE[19138]" />
+							<param name="item6_onclick" value="ActivateWindow(TVSearch)" />
+							<param name="item6_icon" value="tv-search.png" />
+							<param name="item6_label" value="$LOCALIZE[137]" />
+							<param name="item7_vis" value="False" />
+							<param name="item8_vis" value="False" />
+						</include>
+						<include name="WidgetListChannels" condition="PVR.HasTVChannels">
+							<param name="content_path" value="pvr://channels/tv/All channels/"/>
+							<param name="widget_header" value="$LOCALIZE[31016]"/>
+							<param name="widget_target" value="pvr"/>
+							<param name="list_id" value="12200"/>
+							<param name="onup_id" value="12900"/>
+							<param name="ondown_id" value="20001"/>
+							<param name="height" value="540"/>
+						</include>
+						<control type="grouplist">
+							<height>218</height>
+							<left>478</left>
+							<top>36</top>
+							<orientation>horizontal</orientation>
+							<align>right</align>
+							<width>1360</width>
+							<control type="group">
+								<width>680</width>
+								<visible>PVR.IsRecording</visible>
+								<include name="PVRWidget">
+									<param name="icon" value="$INFO[PVR.NowRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19158]" />
+									<param name="label1" value="$INFO[PVR.NowRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.NowRecordingTitle][CR][COLOR=grey]$INFO[PVR.NowRecordingChannel][/COLOR]" />
+								</include>
+							</control>
+							<control type="group">>
+								<visible>PVR.HasNonRecordingTimer</visible>
+								<width>680</width>
+								<include name="PVRWidget">
+									<param name="icon" value="$INFO[PVR.NextRecordingChannelIcon]" />
+									<param name="header" value="$LOCALIZE[19157]" />
+									<param name="label1" value="$INFO[PVR.NextRecordingDateTime,$LOCALIZE[19126] - ]" />
+									<param name="label2" value="$INFO[PVR.NextRecordingTitle][CR][COLOR=grey]$INFO[PVR.NextRecordingChannel][/COLOR]" />
+								</include>
+							</control>
 						</control>
 					</control>
 				</control>
-			</control>
-			<control type="group" id="13000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),radio)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="13888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(13001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(13100).NumItems,0)">SetFocus(13100)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
-				</control>
-				<control type="grouplist" id="13001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="13900"/>
-						<param name="ondown_id" value="13200"/>
-						<param name="item1_onclick" value="ActivateWindow(RadioChannels)" />
-						<param name="item1_icon" value="channels.png" />
-						<param name="item1_label" value="$LOCALIZE[19019]" />
-						<param name="item2_onclick" value="ActivateWindow(RadioGuide)" />
-						<param name="item2_icon" value="guide.png" />
-						<param name="item2_label" value="$LOCALIZE[19069]" />
-						<param name="item3_onclick" value="ActivateWindow(RadioRecordings)" />
-						<param name="item3_icon" value="recordings.png" />
-						<param name="item3_label" value="$LOCALIZE[19017]" />
-						<param name="item4_onclick" value="ActivateWindow(RadioTimers)" />
-						<param name="item4_icon" value="timers.png" />
-						<param name="item4_label" value="$LOCALIZE[19040]" />
-						<param name="item5_onclick" value="ActivateWindow(RadioTimerRules)" />
-						<param name="item5_icon" value="timer-rules.png" />
-						<param name="item5_label" value="$LOCALIZE[19138]" />
-						<param name="item6_onclick" value="ActivateWindow(RadioSearch)" />
-						<param name="item6_icon" value="tv-search.png" />
-						<param name="item6_label" value="$LOCALIZE[137]" />
-						<param name="item7_vis" value="False" />
-						<param name="item8_vis" value="False" />
-					</include>
-					<include name="WidgetListChannels">
-						<param name="content_path" value="pvr://channels/radio/All channels/"/>
-						<param name="widget_header" value="$LOCALIZE[31018]"/>
-						<param name="widget_target" value="files"/>
-						<param name="list_id" value="13200"/>
-						<param name="onup_id" value="13900"/>
-						<param name="ondown_id" value="20001"/>
-					</include>
-				</control>
-			</control>
-			<control type="group" id="15000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),weather)</visible>
-				<include>Visible_Right_Delayed</include>
-				<control type="button" id="15888">
-					<width>1</width>
-					<height>1</height>
-					<label>-</label>
-					<onfocus>SetFocus(15001)</onfocus>
-					<onfocus condition="IntegerGreaterThan(Container(15100).NumItems,0)">SetFocus(15100)</onfocus>
-					<onfocus condition="IsEmpty(Weather.Plugin)">SetFocus(15300)</onfocus>
-					<onclick>noop</onclick>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+				<control type="group" id="13000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),radio)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="13888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(13001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(13100).NumItems,0)">SetFocus(13100)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="13001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="13900"/>
+							<param name="ondown_id" value="13200"/>
+							<param name="item1_onclick" value="ActivateWindow(RadioChannels)" />
+							<param name="item1_icon" value="channels.png" />
+							<param name="item1_label" value="$LOCALIZE[19019]" />
+							<param name="item2_onclick" value="ActivateWindow(RadioGuide)" />
+							<param name="item2_icon" value="guide.png" />
+							<param name="item2_label" value="$LOCALIZE[19069]" />
+							<param name="item3_onclick" value="ActivateWindow(RadioRecordings)" />
+							<param name="item3_icon" value="recordings.png" />
+							<param name="item3_label" value="$LOCALIZE[19017]" />
+							<param name="item4_onclick" value="ActivateWindow(RadioTimers)" />
+							<param name="item4_icon" value="timers.png" />
+							<param name="item4_label" value="$LOCALIZE[19040]" />
+							<param name="item5_onclick" value="ActivateWindow(RadioTimerRules)" />
+							<param name="item5_icon" value="timer-rules.png" />
+							<param name="item5_label" value="$LOCALIZE[19138]" />
+							<param name="item6_onclick" value="ActivateWindow(RadioSearch)" />
+							<param name="item6_icon" value="tv-search.png" />
+							<param name="item6_label" value="$LOCALIZE[137]" />
+							<param name="item7_vis" value="False" />
+							<param name="item8_vis" value="False" />
+						</include>
+						<include name="WidgetListChannels" condition="PVR.HasRadioChannels">
+							<param name="content_path" value="pvr://channels/radio/All channels/"/>
+							<param name="widget_header" value="$LOCALIZE[31018]"/>
+							<param name="widget_target" value="files"/>
+							<param name="list_id" value="13200"/>
+							<param name="onup_id" value="13900"/>
+							<param name="ondown_id" value="20001"/>
+						</include>
+					</control>
 				</control>
-				<control type="grouplist" id="15001">
-					<orientation>vertical</orientation>
-					<height>922</height>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<include name="SubMenu">
-						<param name="list_id" value="15900"/>
-						<param name="ondown_id" value="15100"/>
-						<param name="item1_onclick" value="Weather.Refresh" />
-						<param name="item1_icon" value="updatelibrary.png" />
-						<param name="item1_label" value="$LOCALIZE[184]" />
-						<param name="item2_onclick" value="Weather.LocationPrevious" />
-						<param name="item2_icon" value="location-previous.png" />
-						<param name="item2_label" value="$LOCALIZE[31077]" />
-						<param name="item3_onclick" value="Weather.LocationNext" />
-						<param name="item3_icon" value="location-next.png" />
-						<param name="item3_label" value="$LOCALIZE[31078]" />
-						<param name="item4_onclick" value="ActivateWindow(weathersettings)" />
-						<param name="item4_icon" value="weather-settings.png" />
-						<param name="item4_label" value="$LOCALIZE[1390]" />
-						<param name="item5_vis" value="False" />
-						<param name="item6_vis" value="False" />
-						<param name="item7_vis" value="False" />
-						<param name="item8_vis" value="False" />
-						<param name="visible" value="!IsEmpty(Weather.plugin)"/>
-					</include>
-					<control type="group" id="16678">
-						<description>Weather info</description>
-						<height>380</height>
-						<visible>!IsEmpty(Weather.plugin)</visible>
-						<control type="image">
-							<top>2</top>
-							<left>480</left>
-							<width>1360</width>
+				<control type="group" id="15000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),weather)</visible>
+					<include>Visible_Right_Delayed</include>
+					<control type="button" id="15888">
+						<width>1</width>
+						<height>1</height>
+						<label>-</label>
+						<onfocus>SetFocus(15001)</onfocus>
+						<onfocus condition="Integer.IsGreater(Container(15100).NumItems,0)">SetFocus(15100)</onfocus>
+						<onfocus condition="String.IsEmpty(Weather.Plugin)">SetFocus(15300)</onfocus>
+						<onclick>noop</onclick>
+						<texturefocus>-</texturefocus>
+						<texturenofocus>-</texturenofocus>
+					</control>
+					<control type="grouplist" id="15001">
+						<orientation>vertical</orientation>
+						<height>922</height>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<include name="SubMenu">
+							<param name="list_id" value="15900"/>
+							<param name="ondown_id" value="15100"/>
+							<param name="item1_onclick" value="Weather.Refresh" />
+							<param name="item1_icon" value="updatelibrary.png" />
+							<param name="item1_label" value="$LOCALIZE[184]" />
+							<param name="item2_onclick" value="Weather.LocationPrevious" />
+							<param name="item2_icon" value="location-previous.png" />
+							<param name="item2_label" value="$LOCALIZE[31077]" />
+							<param name="item3_onclick" value="Weather.LocationNext" />
+							<param name="item3_icon" value="location-next.png" />
+							<param name="item3_label" value="$LOCALIZE[31078]" />
+							<param name="item4_onclick" value="ActivateWindow(weathersettings)" />
+							<param name="item4_icon" value="weather-settings.png" />
+							<param name="item4_label" value="$LOCALIZE[1390]" />
+							<param name="item5_vis" value="False" />
+							<param name="item6_vis" value="False" />
+							<param name="item7_vis" value="False" />
+							<param name="item8_vis" value="False" />
+							<param name="visible" value="!String.IsEmpty(Weather.plugin)"/>
+						</include>
+						<control type="group" id="16678">
+							<description>Weather info</description>
 							<height>380</height>
-							<texture border="22">dialogs/dialog-bg.png</texture>
-						</control>
-						<control type="image">
-							<top>20</top>
-							<left>530</left>
-							<width>150</width>
-							<height>150</height>
-							<texture>$INFO[Weather.conditions]</texture>
-						</control>
-						<control type="label">
-							<left>990</left>
-							<top>110</top>
-							<aligny>center</aligny>
-							<height>24</height>
-							<width>800</width>
-							<align>right</align>
-							<font>font14</font>
-							<label>$INFO[Weather.Conditions] - $INFO[Weather.Temperature]</label>
-						</control>
-						<control type="label">
-							<left>990</left>
-							<top>50</top>
-							<aligny>center</aligny>
-							<height>24</height>
-							<width>800</width>
-							<align>right</align>
-							<font>font35_title</font>
-							<label>$INFO[Weather.Location]</label>
-						</control>
-						<control type="grouplist">
-							<top>215</top>
-							<left>540</left>
-							<orientation>horizontal</orientation>
-							<include name="WeatherIcon">
-								<param name="label" value="$INFO[Window(weather).Property(Current.Wind)]" />
-								<param name="texture" value="icons/weather/wind.png" />
-								<param name="header" value="404" />
-							</include>
-							<include name="WeatherIcon">
-								<param name="label" value="$INFO[Window(weather).Property(Current.Humidity)]" />
-								<param name="texture" value="icons/weather/humidity.png" />
-								<param name="header" value="406" />
-							</include>
-							<include name="WeatherIcon">
-								<param name="label" value="$INFO[Window(weather).Property(Current.Precipitation)]" />
-								<param name="texture" value="icons/weather/rain.png" />
-								<param name="header" value="33021" />
-							</include>
-							<include name="WeatherIcon">
-								<param name="label" value="$INFO[Window(weather).Property(Today.Sunrise)]" />
-								<param name="texture" value="icons/weather/sunrise.png" />
-								<param name="header" value="405" />
-							</include>
-							<include name="WeatherIcon">
-								<param name="label" value="$INFO[Window(weather).Property(Today.Sunset)]" />
-								<param name="texture" value="icons/weather/sunset.png" />
-								<param name="header" value="403" />
-							</include>
+							<visible>!String.IsEmpty(Weather.plugin)</visible>
+							<control type="image">
+								<top>2</top>
+								<left>480</left>
+								<width>1360</width>
+								<height>380</height>
+								<texture border="22">dialogs/dialog-bg.png</texture>
+							</control>
+							<control type="image">
+								<top>20</top>
+								<left>530</left>
+								<width>150</width>
+								<height>150</height>
+								<texture>$INFO[Weather.conditions]</texture>
+							</control>
+							<control type="label">
+								<left>990</left>
+								<top>110</top>
+								<aligny>center</aligny>
+								<height>24</height>
+								<width>800</width>
+								<align>right</align>
+								<font>font14</font>
+								<label>$INFO[Weather.Conditions] - $INFO[Weather.Temperature]</label>
+							</control>
+							<control type="label">
+								<left>990</left>
+								<top>50</top>
+								<aligny>center</aligny>
+								<height>24</height>
+								<width>800</width>
+								<align>right</align>
+								<font>font35_title</font>
+								<label>$INFO[Weather.Location]</label>
+							</control>
+							<control type="grouplist">
+								<top>215</top>
+								<left>540</left>
+								<orientation>horizontal</orientation>
+								<align>justify</align>
+								<itemgap>-50</itemgap>
+								<include name="WeatherIcon">
+									<param name="label" value="Window(weather).Property(Current.Wind)" />
+									<param name="texture" value="icons/weather/wind.png" />
+									<param name="header" value="404" />
+								</include>
+								<include name="WeatherIcon">
+									<param name="label" value="Window(weather).Property(Current.Humidity)" />
+									<param name="texture" value="icons/weather/humidity.png" />
+									<param name="header" value="406" />
+								</include>
+								<include name="WeatherIcon">
+									<param name="label" value="Window(weather).Property(Current.Precipitation)" />
+									<param name="texture" value="icons/weather/rain.png" />
+									<param name="header" value="33021" />
+								</include>
+								<include name="WeatherIcon">
+									<param name="label" value="Window(weather).Property(Today.Sunrise)" />
+									<param name="texture" value="icons/weather/sunrise.png" />
+									<param name="header" value="405" />
+								</include>
+								<include name="WeatherIcon">
+									<param name="label" value="Window(weather).Property(Today.Sunset)" />
+									<param name="texture" value="icons/weather/sunset.png" />
+									<param name="header" value="403" />
+								</include>
+							</control>
 						</control>
+						<include name="WeatherWidget">
+							<param name="content_include" value="HourlyItems" />
+							<param name="list_id" value="15100" />
+							<param name="onup_id" value="15900" />
+							<param name="ondown_id" value="15200" />
+							<param name="widget_header" value="$LOCALIZE[33036]"/>
+							<param name="visible" value="!String.IsEmpty(Window(weather).Property(Hourly.IsFetched))" />
+						</include>
+						<include name="WeatherWidget">
+							<param name="content_include" value="DailyItems" />
+							<param name="list_id" value="15200" />
+							<param name="onup_id" value="15100" />
+							<param name="ondown_id" value="20001" />
+							<param name="widget_header" value="$LOCALIZE[31019]"/>
+							<param name="visible" value="!String.IsEmpty(Window(weather).Property(Daily.IsFetched))" />
+						</include>
+						<include name="ImageWidgetHeader">
+							<param name="widget_header" value="$LOCALIZE[12600]" />
+							<param name="visible" value="String.IsEmpty(Weather.plugin)"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/weather.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31120]" />
+							<param name="button_label" value="$LOCALIZE[31121]" />
+							<param name="button_onclick" value="ActivateWindow(weathersettings)"/>
+							<param name="button_id" value="15300"/>
+							<param name="visible" value="String.IsEmpty(Weather.plugin)"/>
+							<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoWeatherButton)"/>
+						</include>
 					</control>
-					<include name="WeatherWidget">
-						<param name="content_include" value="HourlyItems" />
-						<param name="list_id" value="15100" />
-						<param name="onup_id" value="15900" />
-						<param name="ondown_id" value="15200" />
-						<param name="widget_header" value="$LOCALIZE[33036]"/>
-						<param name="visible" value="!IsEmpty(Window(weather).Property(Hourly.IsFetched))" />
-					</include>
-					<include name="WeatherWidget">
-						<param name="content_include" value="DailyItems" />
-						<param name="list_id" value="15200" />
-						<param name="onup_id" value="15100" />
-						<param name="ondown_id" value="20001" />
-						<param name="widget_header" value="$LOCALIZE[31019]"/>
-						<param name="visible" value="!IsEmpty(Window(weather).Property(Daily.IsFetched))" />
-					</include>
-					<include name="ImageWidgetHeader">
-						<param name="widget_header" value="$LOCALIZE[12600]" />
-						<param name="visible" value="IsEmpty(Weather.plugin)"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/weather.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31120]" />
-						<param name="button_label" value="$LOCALIZE[31121]" />
-						<param name="button_onclick" value="ActivateWindow(weathersettings)"/>
-						<param name="button_id" value="15300"/>
-						<param name="visible" value="IsEmpty(Weather.plugin)"/>
-						<param name="button2_onclick" value="Skin.SetBool(HomeMenuNoWeatherButton)"/>
-					</include>
 				</control>
-			</control>
-			<control type="group" id="4000">
-				<visible>Stringcompare(Container(9000).ListItem.Property(id),pictures)</visible>
-				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<include>Visible_Right_Delayed</include>
-				<control type="grouplist" id="4001">
-					<orientation>vertical</orientation>
-					<include name="ImageWidgetHeader">
-						<param name="widget_header" value="$LOCALIZE[1]" />
-						<param name="visible" value="true"/>
-					</include>
-					<include name="ImageWidget">
-						<param name="image_path" value="special://skin/extras/home-images/pictures.jpg"/>
-						<param name="text_label" value="$LOCALIZE[31111]" />
-						<param name="button_label" value="" />
-						<param name="button_onclick" value="ActivateWindow(pictures)"/>
-						<param name="button_id" value="4100"/>
-						<param name="visible" value="true"/>
-						<param name="visible_1" value="False"/>
-						<param name="visible_2" value="False"/>
-					</include>
+				<control type="group" id="4000">
+					<visible>String.IsEqual(Container(9000).ListItem.Property(id),pictures)</visible>
+					<scrolltime tween="cubic" easing="out">500</scrolltime>
+					<include>Visible_Right_Delayed</include>
+					<control type="grouplist" id="4001">
+						<orientation>vertical</orientation>
+						<include name="ImageWidgetHeader">
+							<param name="widget_header" value="$LOCALIZE[1]" />
+							<param name="visible" value="true"/>
+						</include>
+						<include name="ImageWidget">
+							<param name="image_path" value="special://skin/extras/home-images/pictures.jpg"/>
+							<param name="text_label" value="$LOCALIZE[31111]" />
+							<param name="button_label" value="" />
+							<param name="button_onclick" value="ActivateWindow(pictures)"/>
+							<param name="button_id" value="4100"/>
+							<param name="visible" value="true"/>
+							<param name="visible_1" value="False"/>
+							<param name="visible_2" value="False"/>
+						</include>
+					</control>
 				</control>
 			</control>
-		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="" />
-			<param name="breadcrumbs_icon" value="" />
-		</include>
-		<control type="group">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<control type="image">
-				<animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
-				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-				<left>20</left>
-				<top>10</top>
-				<aspectratio>keep</aspectratio>
-				<width>56</width>
-				<height>56</height>
-				<texture colordiffuse="button_focus">icons/logo.png</texture>
-			</control>
-			<control type="image">
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="" />
+				<param name="breadcrumbs_icon" value="" />
+			</include>
+			<control type="group">
+				<animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
 				<animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
 				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-				<left>60</left>
-				<top>20</top>
-				<aspectratio>keep</aspectratio>
-				<width>192</width>
-				<height>36</height>
-				<texture>icons/logo-text.png</texture>
-			</control>
-		</control>
-		<include>BottomBar</include>
-		<control type="group">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<include>OpenClose_Left</include>
-			<control type="radiobutton" id="900">
-				<left>37</left>
-				<top>94</top>
-				<width>420</width>
-				<height>110</height>
-				<onup>14200</onup>
-				<ondown>SetFocus(9000,0)</ondown>
-				<ondown>9000</ondown>
-				<onright>2000</onright>
-				<aligny>center</aligny>
-				<onclick>ActivateWindow(1107)</onclick>
-				<font>font14</font>
-				<label>-</label>
-				<radioposx>338</radioposx>
-				<textoffsetx>40</textoffsetx>
-				<radioposy>0</radioposy>
-				<radiowidth>40</radiowidth>
-				<radioheight>40</radioheight>
-				<textureradioonfocus>icons/search.png</textureradioonfocus>
-				<textureradioonnofocus>icons/search.png</textureradioonnofocus>
-				<textureradioofffocus>icons/search.png</textureradioofffocus>
-				<textureradiooffnofocus>icons/search.png</textureradiooffnofocus>
-			</control>
-			<control type="label">
-				<left>77</left>
-				<top>91</top>
-				<width>520</width>
-				<height>110</height>
-				<aligny>center</aligny>
-				<font>font14</font>
-				<scrollout>false</scrollout>
-				<pauseatend>5000</pauseatend>
-				<label>$LOCALIZE[31001]...</label>
+				<control type="image">
+					<left>20</left>
+					<top>10</top>
+					<aspectratio>keep</aspectratio>
+					<width>56</width>
+					<height>56</height>
+					<texture colordiffuse="button_focus">icons/logo.png</texture>
+				</control>
+				<control type="image">
+					<left>60</left>
+					<top>20</top>
+					<aspectratio>keep</aspectratio>
+					<width>192</width>
+					<height>36</height>
+					<texture>icons/logo-text.png</texture>
+				</control>
 			</control>
+			<include>BottomBar</include>
 			<control type="group">
-				<left>53</left>
-				<top>204</top>
-				<control type="image">
-					<left>-20</left>
-					<top>-20</top>
-					<width>424</width>
-					<height>711</height>
-					<texture border="22">dialogs/dialog-bg.png</texture>
+				<include>OpenClose_Left</include>
+				<control type="radiobutton" id="900">
+					<left>37</left>
+					<top>94</top>
+					<width>420</width>
+					<height>110</height>
+					<onup>14200</onup>
+					<ondown>SetFocus(9000,0)</ondown>
+					<ondown>9000</ondown>
+					<onright>2000</onright>
+					<aligny>center</aligny>
+					<onclick>ActivateWindow(1107)</onclick>
+					<font>font14</font>
+					<label>$LOCALIZE[31001]</label>
+					<textwidth>300</textwidth>
+					<radioposx>338</radioposx>
+					<textoffsetx>40</textoffsetx>
+					<radioposy>0</radioposy>
+					<radiowidth>40</radiowidth>
+					<radioheight>40</radioheight>
+					<textureradioonfocus>icons/search.png</textureradioonfocus>
+					<textureradioonnofocus>icons/search.png</textureradioonnofocus>
+					<textureradioofffocus>icons/search.png</textureradioofffocus>
+					<textureradiooffnofocus>icons/search.png</textureradiooffnofocus>
 				</control>
-				<control type="list" id="9000">
-					<left>1</left>
-					<top>1</top>
-					<width>382</width>
-					<height>671</height>
-					<pagecontrol>70</pagecontrol>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),movies) + Control.IsVisible(5000)">5000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),tv) + Control.IsVisible(6000)">6000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),music) + Control.IsVisible(7000)">7000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),addons) + Control.IsVisible(8000)">8000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),videos) + Control.IsVisible(11000)">11000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),livetv) + Control.IsVisible(12000)">12000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),radio) + Control.IsVisible(13000)">13000</onright>
-					<onright condition="Stringcompare(Container(9000).ListItem.Property(id),weather) + Control.IsVisible(15000)">15000</onright>
-					<onup>900</onup>
-					<ondown>700</ondown>
-					<scrolltime tween="cubic" easing="out">500</scrolltime>
-					<focusedlayout height="74">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>390</width>
-							<height>75</height>
-							<texture border="90,3,90,3">lists/separator.png</texture>
-						</control>
-						<control type="group">
-							<animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
+				<control type="group">
+					<left>53</left>
+					<top>204</top>
+					<control type="image">
+						<left>-20</left>
+						<top>-20</top>
+						<width>424</width>
+						<height>711</height>
+						<texture border="22">dialogs/dialog-bg.png</texture>
+					</control>
+					<control type="list" id="9000">
+						<left>1</left>
+						<top>1</top>
+						<width>382</width>
+						<height>671</height>
+						<pagecontrol>70</pagecontrol>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),movies) + Control.IsVisible(5000)">5000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),tvshows) + Control.IsVisible(6000)">6000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),music) + Control.IsVisible(7000)">7000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),addons) + Control.IsVisible(8000)">8000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),video) + Control.IsVisible(11000)">11000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),livetv) + Control.IsVisible(12000)">12000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),radio) + Control.IsVisible(13000)">13000</onright>
+						<onright condition="String.IsEqual(Container(9000).ListItem.Property(id),weather) + Control.IsVisible(15000)">15000</onright>
+						<onup>900</onup>
+						<ondown>700</ondown>
+						<scrolltime tween="cubic" easing="out">500</scrolltime>
+						<focusedlayout height="74">
 							<control type="image">
 								<left>0</left>
 								<top>0</top>
 								<width>390</width>
-								<height>73</height>
-								<texture>lists/focus.png</texture>
-								<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)">Conditional</animation>
+								<height>75</height>
+								<texture border="90,3,90,3">lists/separator.png</texture>
+							</control>
+							<control type="group">
+								<animation effect="fade" start="100" end="0" time="0">UnFocus</animation>
+								<control type="image">
+									<left>0</left>
+									<top>0</top>
+									<width>390</width>
+									<height>73</height>
+									<texture>lists/focus.png</texture>
+									<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)">Conditional</animation>
+								</control>
+								<control type="image">
+									<left>-3</left>
+									<top>1</top>
+									<width>70</width>
+									<height>70</height>
+									<texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture>
+									<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
+								</control>
+								<control type="image">
+									<left>-5</left>
+									<top>0</top>
+									<width>68</width>
+									<height>74</height>
+									<texture colordiffuse="51FFFFFF">colors/black.png</texture>
+									<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)">Conditional</animation>
+								</control>
+							</control>
+							<control type="image">
+								<left>-3</left>
+								<top>1</top>
+								<width>70</width>
+								<height>70</height>
+								<texture>$INFO[ListItem.Art(thumb)]</texture>
 							</control>
 							<control type="image">
 								<left>-3</left>
 								<top>1</top>
 								<width>70</width>
 								<height>70</height>
+								<animation effect="fade" start="0" end="100" time="200" delay="200" condition="!System.HasModalDialog">Conditional</animation>
+								<animation effect="fade" start="100" end="0" time="0" condition="System.HasModalDialog">Conditional</animation>
 								<texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture>
 								<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
+								<visible>!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)</visible>
+							</control>
+							<control type="label">
+								<left>74</left>
+								<top>0</top>
+								<height>70</height>
+								<width>560</width>
+								<aligny>center</aligny>
+								<font>font14</font>
+								<label>$INFO[ListItem.Label]</label>
+								<shadowcolor>text_shadow</shadowcolor>
+								<visible>!String.IsEmpty(ListItem.Label2)</visible>
+								<animation effect="slide" start="0,0" end="0,-13" time="150" delay="400">Focus</animation>
+								<animation effect="slide" start="0,-13" end="0,0" time="300" delay="200">UnFocus</animation>
 							</control>
+							<control type="label">
+								<left>74</left>
+								<top>0</top>
+								<height>70</height>
+								<width>560</width>
+								<aligny>center</aligny>
+								<font>font14</font>
+								<label>$INFO[ListItem.Label]</label>
+								<shadowcolor>text_shadow</shadowcolor>
+								<visible>IsEmpty(ListItem.Label2)</visible>
+							</control>
+							<control type="label">
+								<left>74</left>
+								<top>17</top>
+								<height>70</height>
+								<width>560</width>
+								<aligny>center</aligny>
+								<font>font10</font>
+								<label>$INFO[ListItem.Label2]</label>
+								<shadowcolor>text_shadow</shadowcolor>
+								<visible>Control.HasFocus(9000)</visible>
+								<animation effect="fade" time="300">VisibleChange</animation>
+								<animation effect="fade" start="0" end="100" time="150" delay="500">Focus</animation>
+								<animation effect="fade" start="100" end="0" time="300">UnFocus</animation>
+							</control>
+						</focusedlayout>
+						<itemlayout height="74">
 							<control type="image">
-								<left>-5</left>
+								<left>0</left>
 								<top>0</top>
-								<width>68</width>
-								<height>74</height>
-								<texture colordiffuse="51FFFFFF">colors/black.png</texture>
-								<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)">Conditional</animation>
+								<width>390</width>
+								<height>75</height>
+								<texture border="90,3,90,3">lists/separator.png</texture>
 							</control>
-						</control>
-						<control type="image">
-							<left>-3</left>
-							<top>1</top>
-							<width>70</width>
-							<height>70</height>
-							<texture>$INFO[ListItem.Art(thumb)]</texture>
-						</control>
-						<control type="image">
-							<left>-3</left>
-							<top>1</top>
-							<width>70</width>
-							<height>70</height>
-							<animation effect="fade" start="0" end="100" time="200" delay="200" condition="!System.HasModalDialog">Conditional</animation>
-							<animation effect="fade" start="100" end="0" time="0" condition="System.HasModalDialog">Conditional</animation>
-							<texture colordiffuse="button_focus">$INFO[ListItem.Art(thumb)]</texture>
-							<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
-							<visible>!Control.HasFocus(9000) + !Control.HasFocus(900) + !ControlGroup(700).HasFocus + !Control.HasFocus(14200)</visible>
-						</control>
-						<control type="label">
-							<left>74</left>
-							<top>0</top>
-							<height>70</height>
-							<width>560</width>
-							<aligny>center</aligny>
-							<font>font14</font>
-							<label>$INFO[ListItem.Label]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-							<visible>!IsEmpty(ListItem.Label2)</visible>
-							<animation effect="slide" start="0,0" end="0,-13" time="150" delay="400">Focus</animation>
-							<animation effect="slide" start="0,-13" end="0,0" time="300" delay="200">UnFocus</animation>
-						</control>
-						<control type="label">
-							<left>74</left>
-							<top>0</top>
-							<height>70</height>
-							<width>560</width>
-							<aligny>center</aligny>
-							<font>font14</font>
-							<label>$INFO[ListItem.Label]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-							<visible>IsEmpty(ListItem.Label2)</visible>
-						</control>
-						<control type="label">
-							<left>74</left>
-							<top>17</top>
-							<height>70</height>
-							<width>560</width>
-							<aligny>center</aligny>
-							<font>font10</font>
-							<label>$INFO[ListItem.Label2]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-							<visible>Control.HasFocus(9000)</visible>
-							<animation effect="fade" time="300">VisibleChange</animation>
-							<animation effect="fade" start="0" end="100" time="150" delay="500">Focus</animation>
-							<animation effect="fade" start="100" end="0" time="300">UnFocus</animation>
-						</control>
-					</focusedlayout>
-					<itemlayout height="74">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>390</width>
-							<height>75</height>
-							<texture border="90,3,90,3">lists/separator.png</texture>
-						</control>
-						<control type="label">
-							<left>74</left>
-							<top>0</top>
-							<height>70</height>
-							<width>560</width>
-							<aligny>center</aligny>
-							<font>font14</font>
-							<label>$INFO[ListItem.Label]</label>
-							<shadowcolor>text_shadow</shadowcolor>
-						</control>
-						<control type="image">
-							<left>-3</left>
-							<top>1</top>
-							<width>70</width>
-							<height>70</height>
-							<texture>$INFO[ListItem.Art(thumb)]</texture>
-						</control>
-					</itemlayout>
-					<content>
-						<item>
-							<label>$LOCALIZE[342]</label>
-							<label2>$LOCALIZE[16102]: $INFO[Window(home).Property(movies.watched)]$INFO[Window(home).Property(movies.Count), / ]</label2>
-							<onclick condition="Library.HasContent(movies)">ActivateWindow(Videos,MovieTitles,return)</onclick>
-							<onclick condition="!Library.HasContent(movies)">ActivateWindow(Videos,Files,return)</onclick>
-							<thumb>icons/home/movies.png</thumb>
-							<property name="id">movies</property>
-							<visible>!Skin.HasSetting(HomeMenuNoMovieButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[20343]</label>
-							<label2>$LOCALIZE[16102]: $INFO[Window(home).Property(episodes.watched)]$INFO[Window(home).Property(episodes.Count), / ]</label2>
-							<onclick condition="Library.HasContent(tvshows)">ActivateWindow(Videos,TVShowTitles,return)</onclick>
-							<onclick condition="!Library.HasContent(tvshows)">ActivateWindow(Videos,Files,return)</onclick>
-							<thumb>icons/home/tv.png</thumb>
-							<property name="id">tv</property>
-							<visible>!Skin.HasSetting(HomeMenuNoTVShowButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[2]</label>
-							<label2>$LOCALIZE[133]: $INFO[Window(Home).Property(Music.ArtistsCount)]</label2>
-							<onclick>ActivateWindow(Music,root,return)</onclick>
-							<thumb>icons/home/music.png</thumb>
-							<property name="id">music</property>
-							<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[19020]</label>
-							<label2>$INFO[Pvr.BackendChannels,$LOCALIZE[19019]: ]</label2>
-							<onclick>ActivateWindow(TVChannels)</onclick>
-							<thumb>icons/home/livetv.png</thumb>
-							<property name="id">livetv</property>
-							<visible>PVR.HasTVChannels</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[19021]</label>
-							<label2>$INFO[Pvr.BackendChannels,$LOCALIZE[19019]: ]</label2>
-							<onclick>ActivateWindow(RadioChannels)</onclick>
-							<thumb>icons/home/radio.png</thumb>
-							<property name="id">radio</property>
-							<visible>PVR.HasRadioChannels</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[24001]</label>
-							<onclick>ActivateWindow(1100)</onclick>
-							<thumb>icons/home/addons.png</thumb>
-							<property name="id">addons</property>
-							<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[1]</label>
-							<onclick>ActivateWindow(Pictures)</onclick>
-							<thumb>icons/home/pictures.png</thumb>
-							<property name="id">pictures</property>
-							<visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[3]</label>
-							<onclick>ActivateWindow(Videos,root)</onclick>
-							<thumb>icons/home/videos.png</thumb>
-							<property name="id">videos</property>
-							<visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible>
-						</item>
-						<item>
-							<label>$LOCALIZE[8]</label>
-							<label2>$INFO[Window(Weather).Property(WeatherProvider)]</label2>
-							<onclick>ActivateWindow(Weather)</onclick>
-							<thumb>icons/home/weather.png</thumb>
-							<property name="id">weather</property>
-							<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
-						</item>
-					</content>
+							<control type="label">
+								<left>74</left>
+								<top>0</top>
+								<height>70</height>
+								<width>560</width>
+								<aligny>center</aligny>
+								<font>font14</font>
+								<label>$INFO[ListItem.Label]</label>
+								<shadowcolor>text_shadow</shadowcolor>
+							</control>
+							<control type="image">
+								<left>-3</left>
+								<top>1</top>
+								<width>70</width>
+								<height>70</height>
+								<texture>$INFO[ListItem.Art(thumb)]</texture>
+							</control>
+						</itemlayout>
+						<content>
+							<item>
+								<label>$LOCALIZE[342]</label>
+								<label2>$LOCALIZE[16102]: $INFO[Window(home).Property(movies.watched)]$INFO[Window(home).Property(movies.Count), / ]</label2>
+								<onclick condition="Library.HasContent(movies)">ActivateWindow(Videos,MovieTitles,return)</onclick>
+								<onclick condition="!Library.HasContent(movies)">ActivateWindow(Videos,Files,return)</onclick>
+								<thumb>icons/home/movies.png</thumb>
+								<property name="id">movies</property>
+								<visible>!Skin.HasSetting(HomeMenuNoMovieButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[20343]</label>
+								<label2>$LOCALIZE[16102]: $INFO[Window(home).Property(episodes.watched)]$INFO[Window(home).Property(episodes.Count), / ]</label2>
+								<onclick condition="Library.HasContent(tvshows)">ActivateWindow(Videos,TVShowTitles,return)</onclick>
+								<onclick condition="!Library.HasContent(tvshows)">ActivateWindow(Videos,Files,return)</onclick>
+								<thumb>icons/home/tv.png</thumb>
+								<property name="id">tvshows</property>
+								<visible>!Skin.HasSetting(HomeMenuNoTVShowButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[2]</label>
+								<label2>$LOCALIZE[133]: $INFO[Window(Home).Property(Music.ArtistsCount)]</label2>
+								<onclick>ActivateWindow(Music,root,return)</onclick>
+								<thumb>icons/home/music.png</thumb>
+								<property name="id">music</property>
+								<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[19020]</label>
+								<onclick>ActivateWindow(TVChannels)</onclick>
+								<thumb>icons/home/livetv.png</thumb>
+								<property name="id">livetv</property>
+								<visible>PVR.HasTVChannels</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[19021]</label>
+								<onclick>ActivateWindow(RadioChannels)</onclick>
+								<thumb>icons/home/radio.png</thumb>
+								<property name="id">radio</property>
+								<visible>PVR.HasRadioChannels</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[24001]</label>
+								<onclick>ActivateWindow(1100)</onclick>
+								<thumb>icons/home/addons.png</thumb>
+								<property name="id">addons</property>
+								<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[1]</label>
+								<onclick>ActivateWindow(Pictures)</onclick>
+								<thumb>icons/home/pictures.png</thumb>
+								<property name="id">pictures</property>
+								<visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[3]</label>
+								<onclick>ActivateWindow(Videos,root)</onclick>
+								<thumb>icons/home/videos.png</thumb>
+								<property name="id">video</property>
+								<visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible>
+							</item>
+							<item>
+								<label>$LOCALIZE[8]</label>
+								<onclick>ActivateWindow(Weather)</onclick>
+								<thumb>icons/home/weather.png</thumb>
+								<property name="id">weather</property>
+								<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
+							</item>
+						</content>
+					</control>
+				</control>
+				<control type="grouplist" id="700">
+					<orientation>horizontal</orientation>
+					<itemgap>-17</itemgap>
+					<left>36</left>
+					<top>878</top>
+					<onup>SetFocus(9000,99)</onup>
+					<onup>9000</onup>
+					<ondown>14200</ondown>
+					<onright>2000</onright>
+					<include name="BottomMainMenuItem">
+						<param name="control_id" value="801" />
+						<param name="onclick" value="ActivateWindow(filemanager)" />
+						<param name="icon" value="icons/filemanager.png" />
+					</include>
+					<include name="BottomMainMenuItem">
+						<param name="control_id" value="802" />
+						<param name="onclick" value="ActivateWindow(settings)" />
+						<param name="icon" value="icons/settings.png" />
+					</include>
+					<include name="BottomMainMenuItem">
+						<param name="control_id" value="803" />
+						<param name="onclick" value="ActivateWindow(favourites)" />
+						<param name="icon" value="icons/favourites.png" />
+					</include>
+					<include name="BottomMainMenuItem">
+						<param name="control_id" value="804" />
+						<param name="onclick" value="ActivateWindow(shutdownmenu)" />
+						<param name="icon" value="icons/power.png" />
+					</include>
 				</control>
 			</control>
-			<control type="grouplist" id="700">
-				<orientation>horizontal</orientation>
-				<itemgap>-17</itemgap>
-				<left>36</left>
-				<top>878</top>
-				<onup>SetFocus(9000,99)</onup>
-				<onup>9000</onup>
-				<ondown>14200</ondown>
-				<onright>2000</onright>
-				<include name="BottomMainMenuItem">
-					<param name="control_id" value="801" />
-					<param name="onclick" value="ActivateWindow(filemanager)" />
-					<param name="icon" value="icons/filemanager.png" />
-				</include>
-				<include name="BottomMainMenuItem">
-					<param name="control_id" value="802" />
-					<param name="onclick" value="ActivateWindow(settings)" />
-					<param name="icon" value="icons/settings.png" />
-				</include>
-				<include name="BottomMainMenuItem">
-					<param name="control_id" value="803" />
-					<param name="onclick" value="ActivateWindow(favourites)" />
-					<param name="icon" value="icons/favourites.png" />
-				</include>
-				<include name="BottomMainMenuItem">
-					<param name="control_id" value="804" />
-					<param name="onclick" value="ActivateWindow(shutdownmenu)" />
-					<param name="icon" value="icons/power.png" />
-				</include>
+			<control type="group">
+				<animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
+				<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+				<control type="radiobutton" id="14200">
+					<top>995</top>
+					<left>35</left>
+					<width>420</width>
+					<height>95</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<onclick>FullScreen</onclick>
+					<label>$LOCALIZE[244]</label>
+					<ondown>900</ondown>
+					<onup>700</onup>
+					<radioposx>338</radioposx>
+					<textoffsetx>40</textoffsetx>
+					<radioposy>0</radioposy>
+					<radiowidth>34</radiowidth>
+					<radioheight>34</radioheight>
+					<texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus>
+					<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
+					<textureradioonfocus>icons/now-playing/fullscreen.png</textureradioonfocus>
+					<textureradioonnofocus>icons/now-playing/fullscreen.png</textureradioonnofocus>
+					<textureradioofffocus>icons/now-playing/fullscreen.png</textureradioofffocus>
+					<textureradiooffnofocus>icons/now-playing/fullscreen.png</textureradiooffnofocus>
+					<selected>!Player.Paused</selected>
+					<visible>Player.hasMedia</visible>
+				</control>
+				<control type="rss">
+					<left>0</left>
+					<top>1041</top>
+					<height>30</height>
+					<width>1920</width>
+					<font>font12</font>
+					<urlset>1</urlset>
+					<titlecolor>button_focus</titlecolor>
+					<shadowcolor>text_shadow</shadowcolor>
+					<headlinecolor>FFC0C0C0</headlinecolor>
+					<textcolor>white</textcolor>
+					<visible>!Player.hasMedia</visible>
+				</control>
 			</control>
 		</control>
-		<control type="radiobutton" id="14200">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<top>995</top>
-			<left>35</left>
-			<width>420</width>
-			<height>95</height>
-			<align>left</align>
-			<aligny>center</aligny>
-			<onclick>FullScreen</onclick>
-			<label>$LOCALIZE[244]</label>
-			<ondown>900</ondown>
-			<onup>700</onup>
-			<radioposx>338</radioposx>
-			<textoffsetx>40</textoffsetx>
-			<radioposy>0</radioposy>
-			<radiowidth>34</radiowidth>
-			<radioheight>34</radioheight>
-			<textureradioonfocus>icons/now-playing/fullscreen.png</textureradioonfocus>
-			<textureradioonnofocus>icons/now-playing/fullscreen.png</textureradioonnofocus>
-			<textureradioofffocus>icons/now-playing/fullscreen.png</textureradioofffocus>
-			<textureradiooffnofocus>icons/now-playing/fullscreen.png</textureradiooffnofocus>
-			<selected>!Player.Paused</selected>
-			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
-			<visible>Player.hasMedia</visible>
-		</control>
-		<control type="rss">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<left>0</left>
-			<top>1041</top>
-			<height>30</height>
-			<width>1920</width>
-			<font>font12</font>
-			<urlset>1</urlset>
-			<titlecolor>button_focus</titlecolor>
-			<shadowcolor>text_shadow</shadowcolor>
-			<headlinecolor>FFC0C0C0</headlinecolor>
-			<textcolor>white</textcolor>
-			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
-			<visible>!Player.hasMedia</visible>
-		</control>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes.xml Changed

@@ -28,9 +28,14 @@
 	<constant name="DepthBars">0.12</constant>
 	<constant name="DepthBackground">-0.80</constant>
 	<constant name="DepthSideBlade">0.10</constant>
+	<constant name="bg_alpha">79</constant>
+	<expression name="infodialog_active">Window.IsActive(musicinformation) | Window.IsActive(movieinformation) | Window.IsActive(addoninformation) | Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo) | Window.IsActive(pictureinfo) | Window.IsVisible(script-ExtendedInfo Script-DialogVideoInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-DialogInfo.xml) | Window.IsVisible(script-ExtendedInfo Script-VideoList.xml)</expression>
+	<expression name="sidebar_focused">[ControlGroup(9000).HasFocus | Control.HasFocus(6130)]</expression>
 	<include name="CommonScrollbars">
 		<control type="group">
+			<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
 			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="System.HasModalDialog">Conditional</animation>
+			<animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation>
 			<control type="scrollbar" id="531">
 				<left>1907</left>
 				<top>80</top>
@@ -43,8 +48,6 @@
 				<animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation>
 				<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
 				<visible>Control.IsVisible(52) | Control.IsVisible(500) | Control.IsVisible(55) | Control.IsVisible(501)</visible>
-				<animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation>
-				<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
 			</control>
 			<control type="scrollbar" id="5199">
 				<left>0</left>
@@ -58,8 +61,7 @@
 				<visible>Control.IsVisible(51) | Control.IsVisible(53)</visible>
 				<animation effect="fade" start="0" end="100" time="200" delay="300">Visible</animation>
 				<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
-				<animation effect="fade" start="0" end="100" delay="300" time="320">WindowOpen</animation>
-				<animation effect="fade" start="100" end="0" time="150">WindowClose</animation>
+				<animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
 			</control>
 		</control>
 	</include>
@@ -77,7 +79,7 @@
 		<param name="animation">False</param>
 		<definition>
 			<control type="group">
-				<visible>!IsEmpty(ListItem.UserRating)</visible>
+				<visible>!String.IsEmpty(ListItem.UserRating)</visible>
 				<animation effect="fade" time="200" condition="$PARAM[animation]">VisibleChange</animation>
 				<control type="image">
 					<left>8</left>
@@ -286,7 +288,7 @@
 	</include>
 	<include name="PicsInfoLine">
 		<control type="grouplist">
-			<visible>!IsEmpty($PARAM[value])</visible>
+			<visible>!String.IsEmpty($PARAM[value])</visible>
 			<height>40</height>
 			<orientation>horizontal</orientation>
 			<width>500</width>
@@ -366,7 +368,7 @@
 	</include>
 	<include name="InfoFlag">
 		<control type="group">
-			<width>160</width>
+			<width>180</width>
 			<visible>$PARAM[visible]</visible>
 			<control type="image">
 				<left>0</left>
@@ -376,7 +378,7 @@
 			</control>
 			<control type="label">
 				<left>40</left>
-				<width>270</width>
+				<width>150</width>
 				<height>32</height>
 				<font>font12</font>
 				<label>$PARAM[label]</label>
@@ -384,7 +386,7 @@
 		</control>
 	</include>
 	<include name="MediaFlag">
-		<param name="width">110</param>
+		<param name="width">115</param>
 		<param name="height">60</param>
 		<definition>
 			<control type="image">
@@ -398,7 +400,7 @@
 	</include>
 	<include name="MediaFlags">
 		<top>898</top>
-		<visible>Skin.HasSetting(show_mediaflags) | Window.IsActive(movieinformation)</visible>
+		<visible>Skin.HasSetting(show_mediaflags)</visible>
 		<animation effect="fade" time="200">VisibleChange</animation>
 		<control type="grouplist">
 			<orientation>horizontal</orientation>
@@ -414,21 +416,22 @@
 		</control>
 		<control type="grouplist">
 			<orientation>horizontal</orientation>
-			<left>100</left>
+			<right>100</right>
 			<itemgap>5</itemgap>
 			<width>1720</width>
 			<align>right</align>
 			<include name="MediaFlag">
-				<param name="texture" value="$INFO[ListItem.VideoCodec,flags/videocodec/,.png]" />
+				<param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" />
 			</include>
 			<include name="MediaFlag">
-				<param name="texture" value="$INFO[ListItem.VideoAspect,flags/aspectratio/,.png]" />
+				<param name="texture" value="$VAR[ResolutionFlagVar]" />
 			</include>
 		</control>
 	</include>
 	<include name="WeatherIcon">
 		<control type="group">
 			<width>268</width>
+			<visible>!String.IsEmpty($PARAM[label])</visible>
 			<control type="image">
 				<left>50</left>
 				<width>60</width>
@@ -442,7 +445,7 @@
 				<font>font12</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$PARAM[label]</label>
+				<label>$INFO[$PARAM[label]]</label>
 				<shadowcolor>black</shadowcolor>
 			</control>
 		</control>
@@ -573,249 +576,43 @@
 			</control>
 		</definition>
 	</include>
-	<include name="SettingsPanel">
-		<control type="panel" id="9000">
-			<left>92</left>
-			<top>140</top>
-			<width>1850</width>
-			<height>819</height>
+	<include name="AddonLauncherPanel">
+		<control type="panel" id="$PARAM[container_id]">
+			<left>520</left>
+			<top>175</top>
+			<width>1360</width>
+			<height>720</height>
 			<onleft>9000</onleft>
-			<onright>9000</onright>
-			<onup>9000</onup>
-			<ondown>9000</ondown>
-			<include>OpenClose_Right</include>
-			<itemlayout height="270" width="440">
-				<control type="image">
-					<width>400</width>
-					<height>250</height>
-					<texture border="40">buttons/button-nofo.png</texture>
-				</control>
-				<control type="image">
-					<left>19</left>
-					<top>179</top>
-					<width>359</width>
-					<height>50</height>
-					<texture colordiffuse="border_alpha">colors/black.png</texture>
-				</control>
-				<control type="image">
-					<left>80</left>
-					<top>10</top>
-					<width>240</width>
-					<height>240</height>
-					<texture>$INFO[ListItem.Icon]</texture>
-					<align>center</align>
-				</control>
-				<control type="label">
-					<left>0</left>
-					<top>185</top>
-					<width>400</width>
-					<height>400</height>
-					<font>font12</font>
-					<label>$INFO[ListItem.Label]</label>
-					<align>center</align>
-				</control>
+			<onright>531</onright>
+			<include>Visible_Right_Delayed</include>
+			<visible>$PARAM[visible]</visible>
+			<onup>$PARAM[container_id]</onup>
+			<ondown>$PARAM[container_id]</ondown>
+			<preloaditems>1</preloaditems>
+			<pagecontrol>531</pagecontrol>
+			<scrolltime tween="cubic" easing="out">500</scrolltime>
+			<itemlayout height="360" width="320">
+				<include>InfoWallMusicLayout</include>
 			</itemlayout>
-			<focusedlayout height="270" width="440">
+			<focusedlayout height="360" width="320">
 				<control type="group">
-					<depth>DepthContentPopout</depth>
-					<animation type="Focus" reversible="false">
-						<effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" />
-					</animation>
-					<animation type="UnFocus" reversible="false">
-						<effect type="zoom" center="auto" start="108" end="100" time="250" tween="sine" />
-					</animation>
-					<control type="image">
-						<width>400</width>
-						<height>250</height>
-						<texture border="40">buttons/button-nofo.png</texture>
-					</control>
+					<animation effect="zoom" start="100" end="105" time="200" tween="sine" easing="inout" center="160,180">Focus</animation>
+					<animation effect="zoom" start="105" end="100" time="200" tween="sine" easing="inout" center="160,180">UnFocus</animation>
+					<include>InfoWallMusicLayout</include>
 					<control type="image">
-						<width>400</width>
-						<height>250</height>
-						<texture border="40">buttons/button-theme-fo.png</texture>
-						<animation effect="fade" start="100" end="0" time="0">Unfocus</animation>
-					</control>
-					<control type="image">
-						<left>19</left>
-						<top>179</top>
-						<width>359</width>
-						<height>50</height>
-						<texture colordiffuse="border_alpha">colors/black.png</texture>
-					</control>
-					<control type="image">
-						<left>80</left>
-						<top>10</top>
-						<width>240</width>
-						<height>240</height>
-						<texture>$INFO[ListItem.Icon]</texture>
-						<align>center</align>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>185</top>
-						<width>400</width>
-						<height>400</height>
-						<font>font12</font>
-						<label>$INFO[ListItem.Label]</label>
-						<align>center</align>
+						<left>15</left>
+						<top>5</top>
+						<width>288</width>
+						<height>348</height>
+						<texture border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+						<animation effect="fade" start="100" end="0" time="200">Unfocus</animation>
 					</control>
 				</control>
 			</focusedlayout>
-			<include>$PARAM[content]</include>
+			<content sortby="$PARAM[sortby]" sortorder="$PARAM[sortorder]" target="$PARAM[container_target]">$PARAM[container_path]</content>
 		</control>
 	</include>
-	<include name="AddonLauncherItems">
-		<content>
-			<item>
-				<label>$LOCALIZE[1037]</label>
-				<onclick>ActivateWindow(videos,addons://sources/video/,return)</onclick>
-				<icon>icons/settings/video.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[1038]</label>
-				<onclick>ActivateWindow(music,addons://sources/audio/,return)</onclick>
-				<icon>icons/settings/music.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[0]</label>
-				<onclick>ActivateWindow(programs,addons://sources/executable/,return)</onclick>
-				<icon>icons/settings/appearance.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[20244]</label>
-				<onclick>ActivateWindow(programs,androidapps://,return)</onclick>
-				<icon>icons/settings/android.png</icon>
-				<visible>System.Platform.Android</visible>
-			</item>
-			<item>
-				<label>$LOCALIZE[1039]</label>
-				<onclick>ActivateWindow(pictures,addons://sources/image/,return)</onclick>
-				<icon>icons/settings/pictures.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[31059]</label>
-				<onclick>ActivateWindow(addonbrowser,addons://outdated/,return)</onclick>
-				<icon>icons/settings/update-available.png</icon>
-				<visible>!Stringcompare(Container(8000).NumItems,0)</visible>
-			</item>
-			<item>
-				<label>$LOCALIZE[21452]</label>
-				<onclick>ActivateWindow(addonbrowser,addons://all/,return)</onclick>
-				<icon>icons/settings/addons.png</icon>
-			</item>
-		</content>
-	</include>
-	<include name="SettingsItems">
-		<content>
-			<item>
-				<label>$LOCALIZE[20094]</label>
-				<onclick>ActivateWindow(1103)</onclick>
-				<icon>icons/settings/filemanager.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[480]</label>
-				<onclick>ActivateWindow(AppearanceSettings)</onclick>
-				<icon>icons/settings/appearance.png</icon>
-			</item>^
-			<item>
-				<label>$LOCALIZE[157]</label>
-				<onclick>ActivateWindow(VideosSettings)</onclick>
-				<icon>icons/settings/video.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[2]</label>
-				<onclick>ActivateWindow(MusicSettings)</onclick>
-				<icon>icons/settings/music.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[1]</label>
-				<onclick>ActivateWindow(PicturesSettings)</onclick>
-				<icon>icons/settings/pictures.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[8]</label>
-				<onclick>ActivateWindow(WeatherSettings)</onclick>
-				<icon>icons/settings/weather.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[14036]</label>
-				<onclick>ActivateWindow(ServiceSettings)</onclick>
-				<icon>icons/settings/network.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[13000]</label>
-				<onclick>ActivateWindow(SystemSettings)</onclick>
-				<icon>icons/settings/system.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[19020]</label>
-				<onclick>ActivateWindow(PVRSettings)</onclick>
-				<icon>icons/settings/livetv.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[13200]</label>
-				<onclick>ActivateWindow(Profiles)</onclick>
-				<icon>icons/settings/profiles.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[138]</label>
-				<onclick>ActivateWindow(systeminfo)</onclick>
-				<icon>icons/settings/sysinfo.png</icon>
-			</item>
-			<item>
-				<label>$LOCALIZE[20077]</label>
-				<onclick>ActivateWindow(SkinSettings)</onclick>
-				<icon>icons/settings/skin.png</icon>
-			</item>
-		</content>
-	</include>
-	<include name="PlaylistWindowButtons">
-		<param name="width">350</param>
-		<definition>
-			<control type="group">
-				<include>OpenClose_Left</include>
-				<control type="grouplist" id="700">
-					<orientation>vertical</orientation>
-					<itemgap>-9</itemgap>
-					<left>100</left>
-					<top>165</top>
-					<onup>700</onup>
-					<ondown>700</ondown>
-					<onleft>50</onleft>
-					<onright>50</onright>
-					<include name="PlaylistWindowButton">
-						<param name="control_id" value="20" />
-						<param name="onclick" value="" />
-						<param name="label" value="$LOCALIZE[191]$INFO[Playlist.Random, : ]" />
-						<param name="icon" value="osd/fullscreen/buttons/random-on.png" />
-						<param name="width" value="$PARAM[width]" />
-					</include>
-					<include name="PlaylistWindowButton">
-						<param name="control_id" value="26" />
-						<param name="onclick" value="" />
-						<param name="label" value="" />
-						<param name="icon" value="osd/fullscreen/buttons/repeat-all.png" />
-						<param name="width" value="$PARAM[width]" />
-					</include>
-					<include name="PlaylistWindowButton">
-						<param name="control_id" value="21" />
-						<param name="onclick" value="" />
-						<param name="label" value="$LOCALIZE[190]" />
-						<param name="icon" value="osd/fullscreen/buttons/record.png" />
-						<param name="width" value="$PARAM[width]" />
-					</include>
-					<include name="PlaylistWindowButton">
-						<param name="control_id" value="22" />
-						<param name="onclick" value="" />
-						<param name="label" value="$LOCALIZE[192]" />
-						<param name="icon" value="DefaultIconError.png" />
-						<param name="width" value="$PARAM[width]" />
-					</include>
-				</control>
-			</control>
-		</definition>
-	</include>
-	<include name="InfoDialogTopBarInfo">
+	<include name="LeftAlignedInfo">
 		<param name="id">33333</param>
 		<definition>
 			<control type="grouplist">
@@ -834,7 +631,7 @@
 					<shadowcolor>text_shadow</shadowcolor>
 					<height>35</height>
 					<scroll>true</scroll>
-					<animation effect="slide" start="0,0" end="0,15" time="0" condition="IsEmpty(Control.GetLabel($PARAM[id]))">Conditional</animation>
+					<animation effect="slide" start="0,0" end="0,15" time="0" condition="String.IsEmpty(Control.GetLabel($PARAM[id]))">Conditional</animation>
 				</control>
 				<control type="label" id="$PARAM[id]">
 					<label>$PARAM[sub_label]</label>
@@ -847,6 +644,41 @@
 			</control>
 		</definition>
 	</include>
+	<include name="InfoDialogTopBarInfo">
+		<param name="id">33333</param>
+		<param name="posy">20</param>
+		<definition>
+			<control type="grouplist">
+				<left>60</left>
+				<top>$PARAM[posy]</top>
+				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<width>1800</width>
+				<height>150</height>
+				<itemgap>0</itemgap>
+				<orientation>vertical</orientation>
+				<control type="label">
+					<width>1800</width>
+					<label>$PARAM[main_label]</label>
+					<font>font35_title</font>
+					<shadowcolor>text_shadow</shadowcolor>
+					<height>65</height>
+					<align>center</align>
+					<scroll>true</scroll>
+					<animation effect="slide" start="0,0" end="0,15" time="0" condition="String.IsEmpty(Control.GetLabel($PARAM[id]))">Conditional</animation>
+				</control>
+				<control type="label" id="$PARAM[id]">
+					<label>$PARAM[sub_label]</label>
+					<font>font13</font>
+					<left>85</left>
+					<shadowcolor>text_shadow</shadowcolor>
+					<align>center</align>
+					<height>100</height>
+					<width>1800</width>
+				</control>
+			</control>
+		</definition>
+	</include>
 	<include name="UpDownArrows">
 		<param name="up_posy">134</param>
 		<param name="down_posy">910</param>
@@ -1044,6 +876,7 @@
 		<param name="time_sublabel">$INFO[System.Date]</param>
 		<definition>
 			<control type="group">
+				<animation effect="slide" end="0,-90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
 				<depth>DepthBars</depth>
 				<animation effect="fade" start="0" end="100" time="300" condition="[Window.Previous(fullscreenvideo) | Window.Previous(startup)] + !Window.IsVisible(1109)">WindowOpen</animation>
 				<control type="image">
@@ -1052,7 +885,7 @@
 					<width>1920</width>
 					<height>80</height>
 					<texture>frame/InfoBar.png</texture>
-					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation>
+					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration)">WindowClose</animation>
 				</control>
 				<control type="image">
 					<top>10</top>
@@ -1066,8 +899,8 @@
 					<top>0</top>
 					<width>120</width>
 					<height>100</height>
-					<onclick condition="!IsEmpty(Container.FolderPath)">Container.Update(" ",replace)</onclick>
-					<onclick condition="IsEmpty(Container.FolderPath)">Action(Back)</onclick>
+					<onclick condition="!String.IsEmpty(Container.FolderPath)">Container.Update(" ",replace)</onclick>
+					<onclick condition="String.IsEmpty(Container.FolderPath)">Action(Back)</onclick>
 					<texturefocus>-</texturefocus>
 					<texturenofocus>-</texturenofocus>
 				</control>
@@ -1078,18 +911,20 @@
 					<height>100</height>
 					<orientation>horizontal</orientation>
 					<usecontrolcoords>true</usecontrolcoords>
-					<visible>!Window.isActive(movieinformation) + !Window.isActive(addoninformation) + !Window.isActive(pictureinfo) + !Window.isActive(musicinformation) + !Window.isActive(songinformation) + !Window.IsActive(pvrguideinfo) + !Window.IsActive(pvrrecordinginfo)</visible>
-					<animation effect="fade" time="150">VisibleChange</animation>
 					<animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
 					<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+					<animation effect="slide" end="0,12" time="200" reversible="true" condition="String.IsEmpty(Container.SortMethod)">Conditional</animation>
 					<control type="label">
 						<label>$PARAM[breadcrumbs_label]</label>
-						<animation effect="slide" end="0,12" time="200" reversible="true" condition="IsEmpty(Container.SortMethod)">Conditional</animation>
 						<include>BreadcrumbsLabel</include>
 					</control>
 					<control type="label">
+						<label>$INFO[Container.ShowTitle, / ]</label>
+						<include>BreadcrumbsLabel</include>
+						<visible>!String.IsEmpty(Container.ShowTitle) + !String.IsEqual(Container.ShowTitle,Container.FolderName)</visible>
+					</control>
+					<control type="label">
 						<label>$INFO[Container.FolderName, / ]</label>
-						<animation effect="slide" end="0,12" time="200" reversible="true" condition="IsEmpty(Container.SortMethod)">Conditional</animation>
 						<include>BreadcrumbsLabel</include>
 						<visible>![Container.Content() + Window.IsActive(videos)]</visible>
 						<visible>![Window.IsActive(PVR) | Window.IsActive(MyPVRTimers.xml)]</visible>
@@ -1097,7 +932,7 @@
 					<control type="label">
 						<label>$INFO[Control.GetLabel(10),: ]</label>
 						<include>BreadcrumbsLabel</include>
-						<visible>!Stringcompare(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos)</visible>
+						<visible>!String.IsEqual(Control.GetLabel(10),$LOCALIZE[16100]) + Window.IsActive(videos)</visible>
 					</control>
 					<control type="label">
 						<label> ($LOCALIZE[31052])</label>
@@ -1113,54 +948,51 @@
 					<shadowcolor>text_shadow</shadowcolor>
 					<height>100</height>
 					<width>auto</width>
-					<visible>!IsEmpty(Container.SortMethod)</visible>
-					<visible>!Window.isActive(movieinformation) + !Window.isActive(addoninformation) + !Window.isActive(pictureinfo) + !Window.isActive(musicinformation) + !Window.isActive(songinformation) + !Window.IsActive(pvrguideinfo) + !Window.IsActive(pvrrecordinginfo)</visible>
+					<visible>!String.IsEmpty(Container.SortMethod)</visible>
 					<animation effect="fade" time="150">VisibleChange</animation>
 					<animation effect="fade" start="0" end="100" time="300">WindowOpen</animation>
 					<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 				</control>
-				<control type="grouplist">
-					<description>Right side of top bar</description>
-					<left>1340</left>
-					<width>500</width>
-					<height>100</height>
-					<align>right</align>
-					<orientation>horizontal</orientation>
-					<usecontrolcoords>true</usecontrolcoords>
-					<animation effect="fade" start="0" end="100" time="300" condition="Window.IsActive(fullscreenvideo)">WindowOpen</animation>
-					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation>
-					<animation effect="fade" time="150">VisibleChange</animation>
-					<visible>!Window.IsVisible(extendedprogressdialog)</visible>
-					<include condition="Skin.HasSetting(show_weatherinfo) | Window.IsActive(skinsettings)">TopWeatherIcon</include>
-					<control type="label">
-						<include>BreadcrumbsLabel</include>
-						<label>$INFO[System.Time]</label>
-					</control>
-				</control>
 				<control type="group">
 					<visible>!Window.IsVisible(extendedprogressdialog)</visible>
 					<animation effect="fade" time="150">VisibleChange</animation>
-					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation>
-					<control type="image">
-						<right>25</right>
-						<top>20</top>
-						<height>40</height>
-						<width>40</width>
-						<texture colordiffuse="button_focus">frame/clock.png</texture>
-						<animation effect="fade" time="300">Visible</animation>
-						<animation effect="fade" time="150">Hidden</animation>
-						<aspectratio>keep</aspectratio>
-						<visible>!Window.IsActive(volumebar)</visible>
-					</control>
-					<control type="label">
-						<top>40</top>
-						<label>$PARAM[time_sublabel]</label>
-						<font>font10</font>
-						<left>1340</left>
-						<shadowcolor>text_shadow</shadowcolor>
-						<height>100</height>
+					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration)">WindowClose</animation>
+					<control type="grouplist">
+						<description>Right side of top bar</description>
+						<right>85</right>
 						<width>500</width>
+						<height>100</height>
 						<align>right</align>
+						<orientation>horizontal</orientation>
+						<usecontrolcoords>true</usecontrolcoords>
+						<include condition="Skin.HasSetting(show_weatherinfo) | Window.IsActive(skinsettings)">TopWeatherIcon</include>
+						<control type="label">
+							<include>BreadcrumbsLabel</include>
+							<label>$INFO[System.Time]</label>
+						</control>
+					</control>
+					<control type="group">
+						<control type="image">
+							<right>25</right>
+							<top>20</top>
+							<height>40</height>
+							<width>40</width>
+							<texture colordiffuse="button_focus">frame/clock.png</texture>
+							<animation effect="fade" time="300">Visible</animation>
+							<animation effect="fade" time="150">Hidden</animation>
+							<aspectratio>keep</aspectratio>
+							<visible>!Window.IsActive(volumebar)</visible>
+						</control>
+						<control type="label">
+							<top>40</top>
+							<label>$PARAM[time_sublabel]</label>
+							<font>font10</font>
+							<left>1340</left>
+							<shadowcolor>text_shadow</shadowcolor>
+							<height>100</height>
+							<width>500</width>
+							<align>right</align>
+						</control>
 					</control>
 				</control>
 			</control>
@@ -1175,7 +1007,7 @@
 			<textoffsetx>0</textoffsetx>
 			<onclick>ActivateWindow(weather)</onclick>
 			<label>$INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label>
-			<visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![stringcompare(Weather.FanartCode,na) + substring(Weather.Conditions,/)]</visible>
+			<visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na) + String.Contains(Weather.Conditions,/)]</visible>
 		</control>
 		<control type="image">
 			<top>4</top>
@@ -1184,7 +1016,7 @@
 			<fadetime>300</fadetime>
 			<aspectratio align="left">keep</aspectratio>
 			<texture colordiffuse="button_focus">weather/small/$INFO[Weather.FanartCode].png</texture>
-			<visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![stringcompare(Weather.FanartCode,na) + substring(Weather.Conditions,/)]</visible>
+			<visible>Skin.HasSetting(show_weatherinfo) + Weather.IsFetched + ![String.IsEqual(Weather.FanartCode,na) + String.Contains(Weather.Conditions,/)]</visible>
 		</control>
 	</include>
 	<include name="BreadcrumbsLabel">
@@ -1196,7 +1028,6 @@
 		<align>left</align>
 	</include>
 	<include name="DefaultBackground">
-		<param name="fanart">$VAR[MediaFanartVar]</param>
 		<definition>
 			<control type="videowindow">
 				<depth>DepthBackground</depth>
@@ -1205,37 +1036,40 @@
 			</control>
 			<control type="visualisation">
 				<include>FullScreenDimensions</include>
-				<visible>Player.HasAudio + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
+				<visible>Player.HasAudio + String.IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
 			</control>
-			<control type="image">
-				<depth>DepthBackground</depth>
-				<include>FullScreenDimensions</include>
-				<aspectratio>scale</aspectratio>
-				<animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation>
-				<animation effect="fade" start="100" end="75" time="0" condition="Player.HasMedia + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))">Conditional</animation>
-				<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup)">WindowOpen</animation>
-				<texture fallback="special://skin/extras/backgrounds/SKINDEFAULT.jpg">$VAR[GlobalFanartVar]</texture>
-			</control>
-			<control type="image">
-				<depth>DepthBackground</depth>
-				<include>FullScreenDimensions</include>
-				<aspectratio>scale</aspectratio>
-				<fadetime>400</fadetime>
-				<animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation>
-				<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
-				<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
-				<animation effect="fade" time="400">VisibleChange</animation>
-				<texture background="true" colordiffuse="40FFFFFF">$PARAM[fanart]</texture>
-				<visible>!Player.HasMedia | !IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
+			<control type="group">
+				<animation effect="zoom" center="960,540" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
+				<control type="image">
+					<depth>DepthBackground</depth>
+					<include>FullScreenDimensions</include>
+					<aspectratio>scale</aspectratio>
+					<animation effect="fade" start="100" end="bg_alpha" time="0" condition="Player.HasMedia + String.IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))">Conditional</animation>
+					<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup)">WindowOpen</animation>
+					<texture fallback="special://skin/extras/backgrounds/SKINDEFAULT.jpg">$VAR[GlobalFanartVar]</texture>
+				</control>
+				<control type="image">
+					<depth>DepthBackground</depth>
+					<include>FullScreenDimensions</include>
+					<aspectratio>scale</aspectratio>
+					<fadetime>400</fadetime>
+					<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
+					<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
+					<animation effect="fade" time="400">VisibleChange</animation>
+					<texture background="true" colordiffuse="35FFFFFF">$VAR[MediaFanartVar]</texture>
+					<visible>!Player.HasMedia | !String.IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
+				</control>
 			</control>
 		</definition>
 	</include>
 	<include name="BottomBar">
 		<param name="PageLabel">$VAR[BottomBarPageLabel]</param>
+		<param name="info_visible">False</param>
 		<definition>
 			<control type="group">
+				<animation effect="slide" end="0,90" time="300" tween="sine" easing="inout" condition="$EXP[infodialog_active]">conditional</animation>
 				<depth>DepthBars</depth>
-				<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(visualisation)">WindowClose</animation>
+				<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(visualisation) | Window.Next(screencalibration)">WindowClose</animation>
 				<animation effect="fade" start="0" end="100" time="300" condition="Window.Previous(fullscreenvideo) | Window.Previous(startup) | Window.Previous(visualisation)">WindowOpen</animation>
 				<control type="image">
 					<left>0</left>
@@ -1243,26 +1077,48 @@
 					<width>1920</width>
 					<height>80</height>
 					<texture flipy="true">frame/InfoBar.png</texture>
-					<animation effect="fade" start="100" end="0" time="300" condition="Window.Next(screencalibration) | Window.IsActive(fullscreenvideo)">WindowClose</animation>
 				</control>
 				<control type="group">
-					<visible>Window.IsMedia + !Window.IsActive(eventlog) + !Window.IsActive(musicplaylisteditor) + !Window.IsActive(MyPlaylist.xml)</visible>
+					<visible>$PARAM[info_visible]</visible>
 					<visible>!System.HasModalDialog</visible>
 					<animation effect="fade" time="400">VisibleChange</animation>
 					<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
 					<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
 					<top>1019</top>
-					<control type="button">
-						<left>17</left>
-						<width>44</width>
-						<height>44</height>
-						<animation effect="rotate" end="-90" center="40,23" time="200" reversible="true" condition="Control.IsVisible(51) | Control.IsVisible(53) | Control.IsVisible(502)">Conditional</animation>
-						<texturefocus colordiffuse="button_focus">frame/menu-nofo.png</texturefocus>
-						<texturenofocus colordiffuse="button_focus">frame/menu-nofo.png</texturenofocus>
-						<animation effect="fade" time="200">VisibleChange</animation>
-						<onclick>SetFocus(9000)</onclick>
-						<visible>!Control.IsVisible(6160)</visible>
-						<visible>!ControlGroup(9000).HasFocus + !Control.HasFocus(6130)</visible>
+					<control type="group">
+						<visible>!$EXP[sidebar_focused]</visible>
+						<control type="button">
+							<left>17</left>
+							<width>44</width>
+							<height>44</height>
+							<animation effect="rotate" end="-90" center="40,23" time="200" reversible="true" condition="Control.IsVisible(51) | Control.IsVisible(53) | Control.IsVisible(502)">Conditional</animation>
+							<texturefocus colordiffuse="button_focus">frame/menu-nofo.png</texturefocus>
+							<texturenofocus colordiffuse="button_focus">frame/menu-nofo.png</texturenofocus>
+							<animation effect="fade" time="200">VisibleChange</animation>
+							<onclick>SetFocus(9000)</onclick>
+							<visible>!Control.IsVisible(6160)</visible>
+						</control>
+						<control type="button" id="6160">
+							<left>17</left>
+							<width>44</width>
+							<height>44</height>
+							<texturefocus colordiffuse="button_focus">icons/menu.png</texturefocus>
+							<texturenofocus colordiffuse="button_focus">icons/menu.png</texturenofocus>
+							<animation effect="fade" time="200">VisibleChange</animation>
+							<onclick>SetFocus(9000)</onclick>
+							<visible>Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)</visible>
+						</control>
+						<control type="button">
+							<left>74</left>
+							<width>300</width>
+							<height>44</height>
+							<shadowcolor>text_shadow</shadowcolor>
+							<label>$LOCALIZE[33063]</label>
+							<onclick>SetFocus(9000)</onclick>
+							<texturefocus>-</texturefocus>
+							<texturenofocus>-</texturenofocus>
+							<animation effect="fade" time="225">VisibleChange</animation>
+						</control>
 					</control>
 					<control type="image">
 						<left>17</left>
@@ -1270,37 +1126,14 @@
 						<height>44</height>
 						<texture colordiffuse="button_focus">frame/menu-fo.png</texture>
 						<animation effect="fade" time="200">VisibleChange</animation>
-						<visible>ControlGroup(9000).HasFocus | Control.HasFocus(6130)</visible>
-						<visible>!Player.HasMedia | !IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
-					</control>
-					<control type="button" id="6160">
-						<left>17</left>
-						<width>44</width>
-						<height>44</height>
-						<texturefocus colordiffuse="button_focus">icons/menu.png</texturefocus>
-						<texturenofocus colordiffuse="button_focus">icons/menu.png</texturenofocus>
-						<animation effect="fade" time="200">VisibleChange</animation>
-						<onclick>SetFocus(9000)</onclick>
-						<visible>Window.IsActive(MyPVRGuide.xml) + Control.IsVisible(10)</visible>
-						<visible>!ControlGroup(9000).HasFocus + !Control.HasFocus(6130)</visible>
-					</control>
-					<control type="button">
-						<left>74</left>
-						<width>300</width>
-						<height>44</height>
-						<shadowcolor>text_shadow</shadowcolor>
-						<label>$LOCALIZE[33063]</label>
-						<onclick>SetFocus(9000)</onclick>
-						<texturefocus>-</texturefocus>
-						<texturenofocus>-</texturenofocus>
-						<animation effect="fade" time="225">VisibleChange</animation>
-						<visible>!ControlGroup(9000).HasFocus + !Control.HasFocus(6130)</visible>
+						<visible>$EXP[sidebar_focused]</visible>
+						<visible>!Player.HasMedia | !String.IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
 					</control>
 				</control>
 				<control type="group">
 					<left>450</left>
 					<top>1005</top>
-					<visible>Player.HasMedia + IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
+					<visible>Player.HasMedia + String.IsEmpty(Window(videolibrary).Property(PlayingBackgroundMedia))</visible>
 					<animation effect="fade" time="200">VisibleChange</animation>
 					<control type="grouplist">
 						<orientation>horizontal</orientation>
@@ -1308,7 +1141,7 @@
 						<align>center</align>
 						<itemgap>5</itemgap>
 						<usecontrolcoords>true</usecontrolcoords>
-						<animation effect="slide" start="0,0" end="0,15" time="0" condition="IsEmpty(Control.GetLabel(7700))">conditional</animation>
+						<animation effect="slide" start="0,0" end="0,15" time="0" condition="String.IsEmpty(Control.GetLabel(7700))">conditional</animation>
 						<width>1020</width>
 						<control type="image">
 							<top>8</top>
@@ -1348,7 +1181,7 @@
 					<visible>!System.HasModalDialog</visible>
 					<visible>Container.Scrolling</visible>
 					<visible>!Container.Content(seasons)</visible>
-					<visible>StringCompare(Container.SortMethod,$LOCALIZE[551]) | StringCompare(Container.SortMethod,$LOCALIZE[561]) | StringCompare(Container.SortMethod,$LOCALIZE[558]) | StringCompare(Container.SortMethod,$LOCALIZE[557]) | StringCompare(Container.SortMethod,$LOCALIZE[556]) | StringCompare(Container.SortMethod,$LOCALIZE[563])</visible>
+					<visible>String.IsEqual(Container.SortMethod,$LOCALIZE[551]) | String.IsEqual(Container.SortMethod,$LOCALIZE[561]) | String.IsEqual(Container.SortMethod,$LOCALIZE[558]) | String.IsEqual(Container.SortMethod,$LOCALIZE[557]) | String.IsEqual(Container.SortMethod,$LOCALIZE[556]) | String.IsEqual(Container.SortMethod,$LOCALIZE[563])</visible>
 					<animation effect="fade" start="0" end="100" time="200" reversible="true">VisibleChange</animation>
 					<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
 				</control>
@@ -1377,7 +1210,7 @@
 						<aspectratio>keep</aspectratio>
 						<texture colordiffuse="button_focus">frame/item-count.png</texture>
 						<animation effect="fade" time="200">VisibleChange</animation>
-						<visible>!IsEmpty(Container.NumItems)</visible>
+						<visible>!String.IsEmpty(Container.NumItems)</visible>
 						<animation effect="fade" start="100" end="0" time="250" delay="200" reversible="true" condition="Control.IsVisible(23000)">Conditional</animation>
 						<animation effect="fade" start="0" end="100" time="250" reversible="true" delay="200" condition="!Control.IsVisible(23000)">Conditional</animation>
 					</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes_Animations.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes_Buttons.xml Changed

@@ -7,7 +7,7 @@
 		<textureradiooffnofocus>$PARAM[texture]</textureradiooffnofocus>
 		<textureradioondisabled colordiffuse="disabled">$PARAM[texture]</textureradioondisabled>
 		<textureradiooffdisabled colordiffuse="disabled">$PARAM[texture]</textureradiooffdisabled>
-		<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
+		<texturefocus>-</texturefocus>
 		<width>125</width>
 		<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
 		<height>123</height>
@@ -18,19 +18,34 @@
 		<radioposx>0</radioposx>
 		<radioposy>0</radioposy>
 	</include>
+	<include name="InfoDialogMetadata">
+		<control type="button" id="$PARAM[control_id]">
+			<width>505</width>
+			<height>45</height>
+			<textoffsetx>40</textoffsetx>
+			<aligny>center</aligny>
+			<font>font10</font>
+			<texturefocus>-</texturefocus>
+			<texturenofocus>-</texturenofocus>
+			<onclick>noop</onclick>
+			<label>$PARAM[label]</label>
+			<visible>$PARAM[visible]</visible>
+		</control>
+	</include>
 	<include name="DefaultSettingButton">
-		<param name="height">75</param>
+		<param name="height">63</param>
 		<param name="textoffsetx">40</param>
 		<definition>
 			<textoffsetx>$PARAM[textoffsetx]</textoffsetx>
 			<top>0</top>
 			<height>$PARAM[height]</height>
 			<aligny>center</aligny>
+			<font>fontContextMenu</font>
 			<textcolor>white</textcolor>
 			<invalidcolor>invalid</invalidcolor>
 			<selectedcolor>selected</selectedcolor>
 			<texturefocus>lists/focus.png</texturefocus>
-			<texturenofocus border="40">lists/separator.png</texturenofocus>
+			<texturenofocus border="5">lists/separator.png</texturenofocus>
 		</definition>
 	</include>
 	<include name="DefaultSettingLabel">
@@ -105,29 +120,183 @@
 		<font>font16</font>
 	</include>
 	<include name="PlaylistWindowButton">
-		<param name="width">350</param>
+		<param name="width">420</param>
 		<definition>
 			<control type="button" id="$PARAM[control_id]">
 				<width>$PARAM[width]</width>
-				<height>199</height>
-				<align>center</align>
+				<height>110</height>
+				<align>left</align>
 				<aligny>top</aligny>
-				<font>font12</font>
-				<textoffsetx>20</textoffsetx>
-				<textoffsety>130</textoffsety>
+				<font>font10</font>
+				<textoffsetx>100</textoffsetx>
+				<textwidth>200</textwidth>
+				<textoffsety>35</textoffsety>
 				<label>$PARAM[label]</label>
 				<selectedcolor>white</selectedcolor>
 			</control>
 			<control type="group" id="$PARAM[control_id]100">
 				<height>0</height>
 				<control type="image">
-					<top>-150</top>
+					<left>40</left>
+					<top>-70</top>
 					<width>$PARAM[width]</width>
-					<height>70</height>
-					<aspectratio>keep</aspectratio>
+					<height>40</height>
+					<aspectratio align="left">keep</aspectratio>
 					<texture>$PARAM[icon]</texture>
 				</control>
 			</control>
 		</definition>
 	</include>
+	<include name="PlaylistWindowButtons">
+		<param name="width">350</param>
+		<definition>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<control type="grouplist" id="700">
+					<orientation>vertical</orientation>
+					<itemgap>-9</itemgap>
+					<left>100</left>
+					<top>165</top>
+					<onup>700</onup>
+					<ondown>700</ondown>
+					<onleft>50</onleft>
+					<onright>50</onright>
+					<include name="PlaylistWindowButton">
+						<param name="control_id" value="20" />
+						<param name="onclick" value="" />
+						<param name="label" value="$LOCALIZE[191]$INFO[Playlist.Random, : ]" />
+						<param name="icon" value="osd/fullscreen/buttons/random-on.png" />
+						<param name="width" value="$PARAM[width]" />
+					</include>
+					<include name="PlaylistWindowButton">
+						<param name="control_id" value="26" />
+						<param name="onclick" value="" />
+						<param name="label" value="" />
+						<param name="icon" value="osd/fullscreen/buttons/repeat-all.png" />
+						<param name="width" value="$PARAM[width]" />
+					</include>
+					<include name="PlaylistWindowButton">
+						<param name="control_id" value="21" />
+						<param name="onclick" value="" />
+						<param name="label" value="$LOCALIZE[190]" />
+						<param name="icon" value="icons/playlist/save.png" />
+						<param name="width" value="$PARAM[width]" />
+					</include>
+					<include name="PlaylistWindowButton">
+						<param name="control_id" value="22" />
+						<param name="onclick" value="" />
+						<param name="label" value="$LOCALIZE[192]" />
+						<param name="icon" value="DefaultIconError.png" />
+						<param name="width" value="$PARAM[width]" />
+					</include>
+				</control>
+			</control>
+		</definition>
+	</include>
+	<include name="BottomMainMenuItem">
+		<param name="height">110</param>
+		<definition>
+			<control type="radiobutton" id="$PARAM[control_id]">
+				<width>118</width>
+				<height>$PARAM[height]</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<onclick>$PARAM[onclick]</onclick>
+				<font>-</font>
+				<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+				<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+				<radioposx>38</radioposx>
+				<radioposy>0</radioposy>
+				<radiowidth>40</radiowidth>
+				<radioheight>40</radioheight>
+				<textureradioonfocus>$PARAM[icon]</textureradioonfocus>
+				<textureradioonnofocus>$PARAM[icon]</textureradioonnofocus>
+				<textureradioofffocus>$PARAM[icon]</textureradioofffocus>
+				<textureradiooffnofocus>$PARAM[icon]</textureradiooffnofocus>
+			</control>
+		</definition>
+	</include>
+	<include name="VideoInfoButtonsCommon">
+		<param name="width">262</param>
+		<definition>
+			<width>$PARAM[width]</width>
+			<height>142</height>
+			<align>center</align>
+			<aligny>top</aligny>
+			<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+			<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+			<textoffsetx>35</textoffsetx>
+			<textoffsety>78</textoffsety>
+			<radioposx>108</radioposx>
+			<radioposy>13</radioposy>
+			<radiowidth>48</radiowidth>
+			<font>font12</font>
+			<textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus>
+			<textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus>
+			<textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus>
+			<textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus>
+			<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled>
+			<textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled>
+		</definition>
+	</include>
+	<include name="InfoDialogButton">
+		<param name="width">262</param>
+		<definition>
+			<control type="radiobutton" id="$PARAM[id]">
+				<width>$PARAM[width]</width>
+				<height>142</height>
+				<align>center</align>
+				<aligny>top</aligny>
+				<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+				<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+				<textoffsetx>35</textoffsetx>
+				<textoffsety>78</textoffsety>
+				<radioposx>108</radioposx>
+				<radioposy>13</radioposy>
+				<radiowidth>48</radiowidth>
+				<font>font12</font>
+				<textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus>
+				<textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus>
+				<textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus>
+				<textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus>
+				<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled>
+				<textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled>
+				<label>$PARAM[label]</label>
+				<onclick>$PARAM[onclick_1]</onclick>
+				<onclick>$PARAM[onclick_2]</onclick>
+				<visible>$PARAM[visible]</visible>
+				<animation effect="fade" start="100" end="0" time="300" delay="300">Hidden</animation>
+			</control>
+		</definition>
+	</include>
+	<include name="InfoDialogToggleButton">
+		<param name="width">262</param>
+		<definition>
+			<control type="radiobutton" id="$PARAM[id]">
+				<width>$PARAM[width]</width>
+				<height>142</height>
+				<align>center</align>
+				<aligny>top</aligny>
+				<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
+				<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
+				<textoffsetx>35</textoffsetx>
+				<textoffsety>78</textoffsety>
+				<radioposx>108</radioposx>
+				<radioposy>13</radioposy>
+				<radiowidth>48</radiowidth>
+				<font>font12</font>
+				<textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon_on]</textureradioonfocus>
+				<textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon_on]</textureradioonnofocus>
+				<textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon_off]</textureradioofffocus>
+				<textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon_off]</textureradiooffnofocus>
+				<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon_off]</textureradiooffdisabled>
+				<textureradioondisabled colordiffuse="disabled">$PARAM[icon_on]</textureradioondisabled>
+				<selected>$PARAM[selected]</selected>
+				<label>$PARAM[label]</label>
+				<onclick>$PARAM[onclick_1]</onclick>
+				<onclick>$PARAM[onclick_2]</onclick>
+				<visible>$PARAM[visible]</visible>
+			</control>
+		</definition>
+	</include>
 </includes>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes_Home.xml Changed

@@ -37,93 +37,18 @@
 			<shadowcolor>black</shadowcolor>
 		</control>
 	</include>
-	<include name="BottomMainMenuItem">
-		<param name="height">110</param>
-		<definition>
-			<control type="radiobutton" id="$PARAM[control_id]">
-				<width>118</width>
-				<height>$PARAM[height]</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<onclick>$PARAM[onclick]</onclick>
-				<font>-</font>
-				<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
-				<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
-				<radioposx>38</radioposx>
-				<radioposy>0</radioposy>
-				<radiowidth>40</radiowidth>
-				<radioheight>40</radioheight>
-				<textureradioonfocus>$PARAM[icon]</textureradioonfocus>
-				<textureradioonnofocus>$PARAM[icon]</textureradioonnofocus>
-				<textureradioofffocus>$PARAM[icon]</textureradioofffocus>
-				<textureradiooffnofocus>$PARAM[icon]</textureradiooffnofocus>
-			</control>
-		</definition>
-	</include>
-	<include name="VideoInfoButtonsCommon">
-		<param name="width">262</param>
-		<definition>
-			<width>$PARAM[width]</width>
-			<height>142</height>
-			<align>center</align>
-			<aligny>top</aligny>
-			<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
-			<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
-			<textoffsetx>35</textoffsetx>
-			<textoffsety>78</textoffsety>
-			<radioposx>108</radioposx>
-			<radioposy>13</radioposy>
-			<radiowidth>48</radiowidth>
-			<font>font12</font>
-			<textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus>
-			<textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus>
-			<textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus>
-			<textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus>
-			<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled>
-			<textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled>
-		</definition>
-	</include>
-	<include name="InfoDialogButton">
-		<param name="width">262</param>
-		<definition>
-			<control type="radiobutton" id="$PARAM[id]">
-				<width>$PARAM[width]</width>
-				<height>142</height>
-				<align>center</align>
-				<aligny>top</aligny>
-				<texturefocus border="40">buttons/button-theme-fo.png</texturefocus>
-				<texturenofocus border="40">buttons/button-nofo.png</texturenofocus>
-				<textoffsetx>35</textoffsetx>
-				<textoffsety>78</textoffsety>
-				<radioposx>108</radioposx>
-				<radioposy>13</radioposy>
-				<radiowidth>48</radiowidth>
-				<font>font12</font>
-				<textureradioonfocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonfocus>
-				<textureradioonnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioonnofocus>
-				<textureradioofffocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradioofffocus>
-				<textureradiooffnofocus colordiffuse="D0FFFFFF">$PARAM[icon]</textureradiooffnofocus>
-				<textureradiooffdisabled colordiffuse="disabled">$PARAM[icon]</textureradiooffdisabled>
-				<textureradioondisabled colordiffuse="disabled">$PARAM[icon]</textureradioondisabled>
-				<label>$PARAM[label]</label>
-				<onclick>$PARAM[onclick_1]</onclick>
-				<onclick>$PARAM[onclick_2]</onclick>
-				<visible>$PARAM[visible]</visible>
-			</control>
-		</definition>
-	</include>
 	<include name="SubMenu">
 		<control type="group">
 			<height>110</height>
 			<visible>$PARAM[visible]</visible>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,1)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,2)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,3)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,4)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,5)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,6)">conditional</animation>
-			<animation effect="slide" end="110,0" time="0" condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,7)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,1)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,2)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,3)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,4)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,5)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,6)">conditional</animation>
+			<animation effect="slide" end="110,0" time="0" condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,7)">conditional</animation>
 			<control type="label">
 				<left>235</left>
 				<top>53</top>
@@ -240,7 +165,7 @@
 			<height>404</height>
 			<left>0</left>
 			<top>0</top>
-			<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+			<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 			<include name="LeftRightArrows">
 				<param name="posy" value="221" />
 				<param name="list_id" value="$PARAM[list_id]" />
@@ -258,16 +183,15 @@
 				<top>60</top>
 				<width>1385</width>
 				<height>400</height>
-				<oninfo>$PARAM[list_oninfo]</oninfo>
 				<scrolltime tween="cubic" easing="out">500</scrolltime>
 				<orientation>horizontal</orientation>
 				<onleft>9000</onleft>
 				<onright>noop</onright>
-				<onup condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
-				<onup condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
+				<onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
+				<onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
 				<onup>$PARAM[onup_id]</onup>
-				<ondown condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-				<ondown condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
+				<ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
+				<ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
 				<ondown>$PARAM[ondown_id]</ondown>
 				<onback>SetFocus(9000)</onback>
 				<preloaditems>1</preloaditems>
@@ -318,25 +242,26 @@
 							</control>
 							<control type="image">
 								<left>0</left>
-								<visible>!Stringcompare(ListItem.PercentPlayed,0)</visible>
+								<visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible>
 								<width>200</width>
 								<height>35</height>
 								<texture>colors/black.png</texture>
 								<animation effect="fade" start="0" end="70" time="50">Focus</animation>
 							</control>
 							<control type="label">
-								<left>20</left>
-								<top>244</top>
-								<width>160</width>
+								<left>10</left>
+								<top>242</top>
+								<width>180</width>
+								<scroll>true</scroll>
 								<label>$INFO[ListItem.Label]</label>
 								<font>font10</font>
 								<shadowcolor>text_shadow</shadowcolor>
 								<align>center</align>
 							</control>
 							<control type="label">
-								<left>20</left>
+								<left>10</left>
 								<top>266</top>
-								<width>160</width>
+								<width>180</width>
 								<label>$INFO[ListItem.Rating,, [COLOR=44FFFFFF]/[/COLOR] ]$INFO[ListItem.Year]</label>
 								<font>font10</font>
 								<textcolor>button_focus</textcolor>
@@ -349,7 +274,7 @@
 								<width>160</width>
 								<height>13</height>
 								<info>ListItem.PercentPlayed</info>
-								<visible>!Stringcompare(ListItem.PercentPlayed,0)</visible>
+								<visible>!Integer.IsEqual(ListItem.PercentPlayed,0)</visible>
 							</control>
 							<control type="image">
 								<left>0</left>
@@ -473,7 +398,7 @@
 				<height>405</height>
 				<left>0</left>
 				<top>0</top>
-				<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+				<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 				<include name="LeftRightArrows">
 					<param name="posy" value="210" />
 					<param name="list_id" value="$PARAM[list_id]" />
@@ -498,7 +423,6 @@
 					<onup>Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
 					<onup>$PARAM[onup_id]</onup>
 					<ondown>Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-					<oninfo>$PARAM[list_oninfo]</oninfo>]
 					<ondown>$PARAM[ondown_id]</ondown>
 					<onback>SetFocus(9000)</onback>
 					<preloaditems>1</preloaditems>
@@ -520,7 +444,7 @@
 						</control>
 						<control type="label">
 							<left>30</left>
-							<top>255</top>
+							<top>253</top>
 							<width>288</width>
 							<label>$PARAM[second_label]</label>
 							<font>font10</font>
@@ -564,7 +488,7 @@
 							<control type="group">
 								<left>20</left>
 								<top>20</top>
-								<visible>!Stringcompare(ListItem.PercentPlayed,0) + Control.HasFocus($PARAM[list_id])</visible>
+								<visible>!Integer.IsEqual(ListItem.PercentPlayed,0) + Control.HasFocus($PARAM[list_id])</visible>
 								<animation effect="fade" start="0" end="100" time="200">Focus</animation>
 								<animation effect="fade" start="100" end="0" time="0">Unfocus</animation>
 								<control type="image">
@@ -584,9 +508,10 @@
 							</control>
 							<control type="label">
 								<left>30</left>
-								<top>255</top>
+								<top>253</top>
 								<width>288</width>
 								<label>$PARAM[second_label]</label>
+								<scroll>true</scroll>
 								<font>font10</font>
 								<shadowcolor>text_shadow</shadowcolor>
 								<align>center</align>
@@ -595,6 +520,7 @@
 								<left>30</left>
 								<top>279</top>
 								<width>288</width>
+								<scroll>true</scroll>
 								<label>$INFO[ListItem.TVShowTitle]</label>
 								<font>font10</font>
 								<shadowcolor>text_shadow</shadowcolor>
@@ -621,14 +547,16 @@
 		<param name="height">405</param>
 		<param name="sub_label">$INFO[ListItem.Label]</param>
 		<param name="sortby"></param>
+		<param name="visible">True</param>
 		<param name="sortorder">ascending</param>
-		<param name="main_label">$INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Artist]$INFO[ListItem.AddonVersion,[COLOR button_focus],[/COLOR]]</param>
+		<param name="main_label">$INFO[ListItem.Year,[COLOR button_focus], - [/COLOR]]$INFO[ListItem.Artist]</param>
 		<definition>
 			<control type="group">
 				<description>Square Widget including header and arrows</description>
 				<height>$PARAM[height]</height>
 				<left>0</left>
-				<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+				<visible>$PARAM[visible]</visible>
+				<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 				<include name="LeftRightArrows">
 					<param name="posy" value="200" />
 					<param name="list_id" value="$PARAM[list_id]" />
@@ -650,11 +578,11 @@
 					<orientation>horizontal</orientation>
 					<onleft>9000</onleft>
 					<onright>noop</onright>
-					<onup condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
-					<onup condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
+					<onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
+					<onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
 					<onup>$PARAM[onup_id]</onup>
-					<ondown condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-					<ondown condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
+					<ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
+					<ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
 					<ondown>$PARAM[ondown_id]</ondown>
 					<onback>SetFocus(9000)</onback>
 					<preloaditems>1</preloaditems>
@@ -681,7 +609,7 @@
 							</control>
 							<control type="label">
 								<left>20</left>
-								<top>240</top>
+								<top>238</top>
 								<width>260</width>
 								<label>$PARAM[sub_label]</label>
 								<font>font10</font>
@@ -690,7 +618,7 @@
 							</control>
 							<control type="label">
 								<left>20</left>
-								<top>264</top>
+								<top>266</top>
 								<width>260</width>
 								<label>$PARAM[main_label]</label>
 								<font>font10</font>
@@ -698,9 +626,9 @@
 								<align>center</align>
 							</control>
 							<control type="textbox">
-								<left>20</left>
-								<top>240</top>
-								<width>260</width>
+								<left>10</left>
+								<top>237</top>
+								<width>280</width>
 								<height>60</height>
 								<aligny>center</aligny>
 								<label>$PARAM[single_label]</label>
@@ -740,27 +668,29 @@
 									<texture colordiffuse="AAFFFFFF">colors/black.png</texture>
 								</control>
 								<control type="label">
-									<left>20</left>
-									<top>240</top>
-									<width>260</width>
+									<left>10</left>
+									<top>238</top>
+									<width>280</width>
 									<label>$PARAM[sub_label]</label>
 									<font>font10</font>
+									<scroll>true</scroll>
 									<shadowcolor>text_shadow</shadowcolor>
 									<align>center</align>
 								</control>
 								<control type="label">
-									<left>20</left>
-									<top>264</top>
-									<width>260</width>
+									<left>10</left>
+									<top>266</top>
+									<width>280</width>
 									<font>font10</font>
+									<scroll>true</scroll>
 									<label>$PARAM[main_label]</label>
 									<shadowcolor>text_shadow</shadowcolor>
 									<align>center</align>
 								</control>
 								<control type="textbox">
-									<left>20</left>
-									<top>240</top>
-									<width>260</width>
+									<left>10</left>
+									<top>237</top>
+									<width>280</width>
 									<height>60</height>
 									<aligny>center</aligny>
 									<label>$PARAM[single_label]</label>
@@ -798,7 +728,7 @@
 				<height>$PARAM[height]</height>
 				<left>0</left>
 				<top>0</top>
-				<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+				<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 				<control type="label">
 					<left>500</left>
 					<top>15</top>
@@ -820,11 +750,11 @@
 					<orientation>horizontal</orientation>
 					<onleft>9000</onleft>
 					<onright>noop</onright>
-					<onup condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
-					<onup condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
+					<onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
+					<onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
 					<onup>$PARAM[onup_id]</onup>
-					<ondown condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-					<ondown condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
+					<ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
+					<ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
 					<ondown>$PARAM[ondown_id]</ondown>
 					<onback>SetFocus(9000)</onback>
 					<preloaditems>1</preloaditems>
@@ -926,7 +856,7 @@
 				<height>$PARAM[height]</height>
 				<left>0</left>
 				<top>0</top>
-				<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+				<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 				<control type="label">
 					<left>500</left>
 					<top>15</top>
@@ -948,11 +878,11 @@
 					<orientation>horizontal</orientation>
 					<onleft>9000</onleft>
 					<onright>noop</onright>
-					<onup condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
-					<onup condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
+					<onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
+					<onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
 					<onup>$PARAM[onup_id]</onup>
-					<ondown condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-					<ondown condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
+					<ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
+					<ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
 					<ondown>$PARAM[ondown_id]</ondown>
 					<onback>SetFocus(9000)</onback>
 					<preloaditems>1</preloaditems>
@@ -1057,7 +987,7 @@
 			<height>432</height>
 			<left>0</left>
 			<top>0</top>
-			<visible>IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
+			<visible>Integer.IsGreater(Container($PARAM[list_id]).NumItems,0) | Container($PARAM[list_id]).IsUpdating</visible>
 			<visible>$PARAM[visible]</visible>
 			<control type="image">
 				<left>445</left>
@@ -1097,11 +1027,11 @@
 				<orientation>horizontal</orientation>
 				<onleft>9000</onleft>
 				<onright>noop</onright>
-				<onup condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
-				<onup condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
+				<onup condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[list_id]).Position])</onup>
+				<onup condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[onup_id],$INFO[Container($PARAM[ondown_id]).Position])</onup>
 				<onup>$PARAM[onup_id]</onup>
-				<ondown condition="IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
-				<ondown condition="!IntegerGreaterThan(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
+				<ondown condition="Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[list_id]).Position])</ondown>
+				<ondown condition="!Integer.IsGreater(Container($PARAM[list_id]).NumItems,0)">Control.SetFocus($PARAM[ondown_id],$INFO[Container($PARAM[onup_id]).Position])</ondown>
 				<ondown>$PARAM[ondown_id]</ondown>
 				<onback>SetFocus(9000)</onback>
 				<preloaditems>1</preloaditems>
@@ -1210,7 +1140,7 @@
 			<item>
 				<icon>resource://resource.images.weathericons.default/na.png</icon>
 				<onclick>noop</onclick>
-				<visible>IsEmpty(Window(weather).Property(Hourly.IsFetched))</visible>
+				<visible>String.IsEmpty(Window(weather).Property(Hourly.IsFetched))</visible>
 			</item>
 			<include name="WeatherHourlyItem">
 				<param name="item_index" value="1" />
@@ -1249,7 +1179,7 @@
 			<item>
 				<icon>resource://resource.images.weathericons.default/na.png</icon>
 				<onclick>noop</onclick>
-				<visible>IsEmpty(Window(weather).Property(Daily.IsFetched))</visible>
+				<visible>String.IsEmpty(Window(weather).Property(Daily.IsFetched))</visible>
 			</item>
 			<include name="WeatherDailyItem">
 				<param name="item_index" value="1" />
@@ -1327,7 +1257,7 @@
 			<property name="FanartCode">$INFO[Window(weather).Property(Hourly.$PARAM[item_index].FanartCode)]</property>
 			<thumb>resource://resource.images.weathericons.default/$INFO[Window(weather).Property(Hourly.$PARAM[item_index].OutlookIcon)]</thumb>
 			<onclick>noop</onclick>
-			<visible>!IsEmpty(Window(weather).Property(Hourly.$PARAM[item_index].Outlook))</visible>
+			<visible>!String.IsEmpty(Window(weather).Property(Hourly.$PARAM[item_index].Outlook))</visible>
 		</item>
 	</include>
 	<include name="WeatherDailyItem">
@@ -1342,7 +1272,7 @@
 			<property name="FanartCode">$INFO[Window(weather).Property(Daily.$PARAM[item_index].FanartCode)]</property>
 			<thumb>resource://resource.images.weathericons.default/$INFO[Window(weather).Property(Daily.$PARAM[item_index].OutlookIcon)]</thumb>
 			<onclick>noop</onclick>
-			<visible>!IsEmpty(Window(weather).Property(Daily.$PARAM[item_index].Outlook))</visible>
+			<visible>!String.IsEmpty(Window(weather).Property(Daily.$PARAM[item_index].Outlook))</visible>
 		</item>
 	</include>
 	<include name="WeatherMapItem">
@@ -1352,7 +1282,7 @@
 			<icon>$INFO[Window(weather).Property(Map.$PARAM[item_id].Area)]</icon>
 			<property name="Layer">$INFO[Window(weather).Property(Map.$PARAM[item_id].Layer)]</property>
 			<onclick>noop</onclick>
-			<visible>Weather.IsFetched + !IsEmpty(Window(weather).Property(Map.$PARAM[item_id].Area)) + !IsEmpty(Window(weather).Property(Map.IsFetched))</visible>
+			<visible>Weather.IsFetched + !String.IsEmpty(Window(weather).Property(Map.$PARAM[item_id].Area)) + !String.IsEmpty(Window(weather).Property(Map.IsFetched))</visible>
 		</item>
 	</include>
 </includes>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes_MediaMenu.xml Changed

@@ -34,8 +34,8 @@
 				<textureradioofffocus>$PARAM[icon]</textureradioofffocus>
 				<textureradiooffnofocus>$PARAM[icon]</textureradiooffnofocus>
 				<textureradiooffdisabled colordiffuse="button_focus">$PARAM[icon]</textureradiooffdisabled>
-				<onclick condition="IsEmpty(Window.Property(IsRadio))">ActivateWindow(TV$PARAM[area])</onclick>
-				<onclick condition="!IsEmpty(Window.Property(IsRadio))">ActivateWindow(Radio$PARAM[area])</onclick>
+				<onclick condition="String.IsEmpty(Window.Property(IsRadio))">ActivateWindow(TV$PARAM[area])</onclick>
+				<onclick condition="!String.IsEmpty(Window.Property(IsRadio))">ActivateWindow(Radio$PARAM[area])</onclick>
 				<enable>!Window.IsActive(TV$PARAM[area]) + !Window.IsActive(Radio$PARAM[area])</enable>
 			</control>
 		</definition>
@@ -150,7 +150,7 @@
 					<include>MediaMenuItemsCommon</include>
 					<label>$LOCALIZE[31032]</label>
 					<label2>[B]$INFO[Container.SortOrder][/B]</label2>
-					<onclick>Container.SortDirection</onclick>
+					<onclick>Container.SetSortDirection</onclick>
 					<visible>!Window.IsActive(MyPVRGuide.xml)</visible>
 				</control>
 				<control type="button" id="6051">
@@ -207,7 +207,7 @@
 						<onleft>14100</onleft>
 						<onup>8</onup>
 						<ondown>6056</ondown>
-						<visible>Player.HasMedia + [ControlGroup(9000).HasFocus | Control.HasFocus(6130)]</visible>
+						<visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible>
 						<visible>!System.HasModalDialog</visible>
 						<include name="BottomMainMenuItem">
 							<param name="control_id" value="14101" />
@@ -252,11 +252,11 @@
 	<include name="MediaMenuCommon">
 		<include>OpenClose_Left</include>
 		<depth>DepthSideBlade</depth>
-		<animation type="Conditional" condition="ControlGroup(9000).HasFocus | Control.HasFocus(6130)">
+		<animation type="Conditional" condition="$EXP[sidebar_focused]">
 			<effect type="fade" start="0" end="100" time="300" tween="sine" easing="out" />
 			<effect type="slide" start="-320" end="0" time="400" tween="cubic" easing="out" />
 		</animation>
-		<animation type="Conditional" condition="!ControlGroup(9000).HasFocus + !Control.HasFocus(6130)">
+		<animation type="Conditional" condition="!$EXP[sidebar_focused]">
 			<effect type="fade" start="100" end="0" time="300" tween="sine" easing="in" />
 			<effect type="slide" start="0" end="-320" time="300" tween="cubic" easing="in" />
 		</animation>
@@ -285,7 +285,7 @@
 			<itemgap>-17</itemgap>
 			<left>5</left>
 			<onleft>14100</onleft>
-			<visible>Player.HasMedia + [ControlGroup(9000).HasFocus | Control.HasFocus(6130)]</visible>
+			<visible>Player.HasMedia + [$EXP[sidebar_focused]]</visible>
 			<visible>!System.HasModalDialog</visible>
 			<include name="BottomMainMenuItem">
 				<param name="control_id" value="14101" />
@@ -314,7 +314,6 @@
 		</control>
 	</include>
 	<include name="MediaMenuListCommon">
-		<param name="viewtype_button_vis">true</param>
 		<definition>
 			<left>0</left>
 			<top>100</top>
@@ -333,7 +332,7 @@
 				<include>MediaMenuItemsCommon</include>
 				<label>$LOCALIZE[31023]</label>
 				<label2>[B]$INFO[Container.Viewmode][/B]</label2>
-				<enable>$PARAM[viewtype_button_vis]</enable>
+				<enable>Integer.IsGreater(Container.ViewCount,1)</enable>
 				<onclick>Container.NextViewMode</onclick>
 			</control>
 			<control type="button" id="6053">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Includes_PVR.xml Changed

@@ -294,7 +294,7 @@
 		<control type="group">
 			<left>1220</left>
 			<top>180</top>
-			<visible>!IsEmpty(ListItem.Date)</visible>
+			<visible>!String.IsEmpty(ListItem.Date)</visible>
 			<visible>Control.IsVisible($PARAM[container_id])</visible>
 			<include>Visible_Right</include>
 			<include>OpenClose_Right</include>
@@ -332,7 +332,7 @@
 				<width>560</width>
 				<height>262</height>
 				<font>font12</font>
-				<visible>!StringCompare(ListItem.StartTime,ListItem.EndTime)</visible>
+				<visible>!String.IsEqual(ListItem.StartTime,ListItem.EndTime)</visible>
 				<label>$INFO[ListItem.StartTime]</label>
 			</control>
 			<control type="label">
@@ -341,7 +341,7 @@
 				<height>262</height>
 				<align>right</align>
 				<font>font12</font>
-				<visible>!StringCompare(ListItem.StartTime,ListItem.EndTime)</visible>
+				<visible>!String.IsEqual(ListItem.StartTime,ListItem.EndTime)</visible>
 				<label>$INFO[ListItem.EndTime]</label>
 			</control>
 			<control type="label">
@@ -392,37 +392,14 @@
 			<font>font12</font>
 			<label>$PARAM[bottom_label2]</label>
 		</control>
-		<control type="textbox" id="4380">
+		<control type="textbox">
 			<top>254</top>
 			<width>560</width>
-			<height>307</height>
+			<height>367</height>
 			<align>left</align>
 			<font>font12</font>
 			<label>$INFO[ListItem.Plot]</label>
 		</control>
-		<control type="grouplist" id="4300">
-			<left>0</left>
-			<top>545</top>
-			<align>center</align>
-			<orientation>horizontal</orientation>
-			<width>560</width>
-			<onleft>60</onleft>
-			<onright>50</onright>
-			<control type="button" id="4301">
-				<width>auto</width>
-				<height>95</height>
-				<textoffsetx>30</textoffsetx>
-				<label>$LOCALIZE[31047]</label>
-				<font>font12</font>
-				<texturefocus border="40">buttons/dialogbutton-fo.png</texturefocus>
-				<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
-				<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Header,$LOCALIZE[207],home)</onclick>
-				<onclick condition="!IsEmpty(ListItem.Plot)">SetProperty(TextViewer_Text,$ESCINFO[ListItem.Plot],home)</onclick>
-				<onclick condition="!IsEmpty(ListItem.Plot)">ActivateWindow(1102)</onclick>
-				<onclick>SetFocus(50)</onclick>
-				<visible>IntegerGreaterThan(Container(4380).NumPages,1)</visible>
-			</control>
-		</control>
 		<control type="textbox">
 			<top>330</top>
 			<width>560</width>
@@ -430,7 +407,7 @@
 			<align>center</align>
 			<font>font24_title</font>
 			<label>$LOCALIZE[19055]</label>
-			<visible>IsEmpty(Listitem.Plot) + IsEmpty(Listitem.Genre)</visible>
+			<visible>String.IsEmpty(Listitem.Plot) + String.IsEmpty(Listitem.Genre)</visible>
 		</control>
 	</include>
 </includes>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MusicOSD.xml Changed

@@ -42,7 +42,7 @@
 					<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
 					<textureradioofffocus colordiffuse="button_focus">osd/fullscreen/buttons/pause.png</textureradioofffocus>
 					<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
-					<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
+					<texturefocus>-</texturefocus>
 					<width>125</width>
 					<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
 					<height>123</height>
@@ -64,7 +64,7 @@
 						<param name="texture" value="osd/fullscreen/buttons/next.png"/>
 					</include>
 					<onclick>PlayerControl(Next)</onclick>
-					<visible>IntegerGreaterThan(Playlist.Length(music),1)</visible>
+					<visible>Integer.IsGreater(Playlist.Length(music),1)</visible>
 				</control>
 			</control>
 			<control type="grouplist" id="202">
@@ -121,7 +121,7 @@
 					<textureradiooffnofocus>osd/fullscreen/buttons/random-off.png</textureradiooffnofocus>
 					<textureradioondisabled colordiffuse="disabled">osd/fullscreen/buttons/random-on.png</textureradioondisabled>
 					<textureradiooffdisabled colordiffuse="disabled">osd/fullscreen/buttons/random-off.png</textureradiooffdisabled>
-					<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
+					<texturefocus>-</texturefocus>
 					<width>125</width>
 					<height>123</height>
 					<radiowidth>74</radiowidth>
@@ -141,10 +141,10 @@
 						<param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/>
 					</include>
 					<onclick>Close</onclick>
-					<onclick condition="!IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
-					<onclick condition="IsEmpty(Skin.String(LyricScript_Path))">Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick>
-					<onclick condition="IsEmpty(Skin.String(LyricScript_Path))">Close</onclick>
-					<onclick condition="IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
+					<onclick condition="!String.IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
+					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick>
+					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">Close</onclick>
+					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
 				</control>
 				<control type="radiobutton" id="5000">
 					<include name="OSDButton">
@@ -188,32 +188,32 @@
 			</control>
 			<control type="slider">
 				<left>30</left>
-				<top>-40</top>
+				<top>-30</top>
 				<width>1858</width>
-				<height>50</height>
+				<height>30</height>
 				<onup>8010</onup>
 				<ondown>650</ondown>
 				<controloffsetx>75</controloffsetx>
 				<controloffsety>0</controloffsety>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib>osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
+				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+				<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 				<info>Player.Progress</info>
 				<action>seek</action>
 				<visible>!Control.HasFocus(87)</visible>
 			</control>
 			<control type="slider">
 				<left>30</left>
-				<top>-40</top>
+				<top>-30</top>
 				<width>1858</width>
-				<height>50</height>
+				<height>30</height>
 				<onup>8010</onup>
 				<ondown>650</ondown>
 				<controloffsetx>75</controloffsetx>
 				<controloffsety>0</controloffsety>
-				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-				<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
-				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
+				<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+				<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+				<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
 				<info>Player.Progress</info>
 				<action>seek</action>
 				<visible>Control.HasFocus(87)</visible>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MusicVisualisation.xml Changed

@@ -16,14 +16,14 @@
 			<fadetime>400</fadetime>
 			<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
 			<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
-			<texture background="true" colordiffuse="40FFFFFF">$INFO[Player.Art(fanart)]</texture>
+			<texture background="true" colordiffuse="35FFFFFF">$INFO[Player.Art(fanart)]</texture>
 		</control>
 		<control type="image">
 			<texture fallback="special://skin/extras/backgrounds/SKINDEFAULT.jpg">$VAR[GlobalFanartVar]</texture>
 			<width>1920</width>
 			<height>1080</height>
 			<aspectratio align="center">scale</aspectratio>
-			<animation effect="fade" start="100" end="50" time="0" condition="!IsEmpty(Player.Art(fanart)) | !IsEmpty(Visualisation.Name)">Conditional</animation>
+			<animation effect="fade" start="100" end="50" time="0" condition="!String.IsEmpty(Player.Art(fanart)) | !String.IsEmpty(Visualisation.Name)">Conditional</animation>
 		</control>
 		<control type="image">
 			<left>33</left>
@@ -94,7 +94,7 @@
 				<texture background="true" border="2">$INFO[Player.Art(fanart)]</texture>
 				<bordertexture colordiffuse="border_alpha">colors/black.png</bordertexture>
 				<bordersize>4</bordersize>
-				<visible>!IsEmpty(Player.Art(fanart))</visible>
+				<visible>!String.IsEmpty(Player.Art(fanart))</visible>
 				<visible>![Window.IsActive(VisualisationSettings) | Window.IsActive(VisualisationPresetList)]</visible>
 				<animation effect="fade" start="0" end="100" delay="400" time="200">Visible</animation>
 				<animation effect="fade" end="0" time="200">Hidden</animation>
@@ -115,7 +115,7 @@
 					<label>[B][UPPERCASE]$LOCALIZE[31024][/UPPERCASE][/B][CR]$INFO[MusicPlayer.Offset(1).Title][COLOR grey]$INFO[MusicPlayer.Offset(1).Artist, - ,][/COLOR][COLOR button_focus]$INFO[MusicPlayer.Offset(1).Duration, - ,][/COLOR][CR]$INFO[MusicPlayer.Offset(2).Title][COLOR grey]$INFO[MusicPlayer.Offset(2).Artist, - ,][/COLOR][COLOR button_focus]$INFO[MusicPlayer.Offset(2).Duration, - ,][/COLOR][CR]$INFO[MusicPlayer.Offset(3).Title][COLOR grey]$INFO[MusicPlayer.Offset(3).Artist, - ,][/COLOR][COLOR button_focus]$INFO[MusicPlayer.Offset(3).Duration, - ,][/COLOR]</label>
 					<textcolor>button_focus</textcolor>
 					<font>font12</font>
-					<visible>!IsEmpty(MusicPlayer.Offset(1).Title)</visible>
+					<visible>!String.IsEmpty(MusicPlayer.Offset(1).Title)</visible>
 				</control>
 				<control type="image">
 					<left>91</left>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyMusicNav.xml Changed

@@ -7,118 +7,119 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<include>CommonScrollbars</include>
-		<control type="group" id="100">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation) | Window.IsActive(musicinformation) | Window.IsActive(songinformation)">Conditional</animation>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_52_IconWall</include>
 			<include>View_53_Shift</include>
 			<include>View_54_InfoWall</include>
 			<include>View_55_WideList</include>
 			<include>View_500_SmallThumb</include>
-		</control>
-		<control type="group">
-			<include>OpenClose_Left</include>
-			<visible>Control.IsVisible(50) | Control.IsVisible(55) | Window.IsActive(musicinformation) | [Control.IsVisible(500) + Window.IsActive(addoninformation)]</visible>
-			<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(files) | Container.Content(directors)</visible>
-			<include>Visible_Left</include>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<control type="group">
-			<include>OpenClose_Right</include>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(musicinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<visible>[Control.IsVisible(50) | Control.Isvisible(54)] + !IsEmpty(ListItem.DBID)</visible>
-			<include>Visible_Right</include>
-			<visible>Container.Content(albums) | Container.Content(artists)</visible>
-			<control type="image">
-				<right>90</right>
-				<top>162</top>
-				<width>509</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
-			</control>
-			<control type="textbox">
-				<right>130</right>
-				<top>194</top>
-				<width>429</width>
-				<height>388</height>
-				<font>font12</font>
-				<label>$INFO[ListItem.Property(artist_description)]$INFO[ListItem.Property(album_description),[CR]]</label>
-			</control>
-			<control type="textbox">
-				<right>130</right>
-				<top>360</top>
-				<width>429</width>
-				<height>413</height>
-				<align>center</align>
-				<font>font24_title</font>
-				<label>$LOCALIZE[19055]</label>
-				<visible>IsEmpty(Listitem.Property(artist_description)) + IsEmpty(Listitem.Property(album_description)) + !ListItem.IsParentFolder</visible>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<visible>Control.IsVisible(50) | Control.IsVisible(55)</visible>
+				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(files) | Container.Content(directors)</visible>
+				<include>Visible_Left</include>
+				<include>ListThumbInfoPanel</include>
 			</control>
-			<control type="image">
-				<right>113</right>
-				<top>614</top>
-				<width>463</width>
-				<height>270</height>
-				<aspectratio aligny="top">scale</aspectratio>
-				<fadetime>300</fadetime>
-				<texture background="true" fallback="DefaultFolder.png">$VAR[ListInfoBoxImageVar]</texture>
-			</control>
-		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<control type="grouplist" id="9000">
-				<top>90</top>
-				<include name="MediaMenuListCommon">
-					<param name="viewtype_button_vis" value="Container.Content(artists) | Container.Content(albums) | Container.Content(musicvideos) | Container.Content(addons)" />
-				</include>
-				<control type="radiobutton" id="710">
-					<label>$LOCALIZE[31112]</label>
-					<include>MediaMenuItemsCommon</include>
-					<onclick>Skin.ToggleSetting(small_list)</onclick>
-					<selected>Skin.HasSetting(small_list)</selected>
-					<visible>Container.Content(songs)</visible>
+			<control type="group">
+				<include>OpenClose_Right</include>
+				<visible>[Control.IsVisible(50) | Control.Isvisible(54)] + !String.IsEmpty(ListItem.DBID)</visible>
+				<include>Visible_Right</include>
+				<visible>Container.Content(albums) | Container.Content(artists)</visible>
+				<control type="image">
+					<right>90</right>
+					<top>162</top>
+					<width>509</width>
+					<height>746</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
 				</control>
-				<control type="label" id="203">
-					<description>Actions</description>
-					<include>MediaMenuLabelCommon</include>
-					<label>$LOCALIZE[31020]</label>
+				<control type="textbox">
+					<right>130</right>
+					<top>194</top>
+					<width>429</width>
+					<height>388</height>
+					<font>font12</font>
+					<label>$INFO[ListItem.Property(artist_description)]$INFO[ListItem.Property(album_description),[CR]]</label>
 				</control>
-				<control type="button" id="619">
-					<include>MediaMenuItemsCommon</include>
-					<label>$VAR[LibraryScanLabelVar]</label>
-					<onclick>UpdateLibrary(music)</onclick>
+				<control type="textbox">
+					<right>130</right>
+					<top>360</top>
+					<width>429</width>
+					<height>413</height>
+					<align>center</align>
+					<font>font24_title</font>
+					<label>$LOCALIZE[19055]</label>
+					<visible>String.IsEmpty(Listitem.Property(artist_description)) + String.IsEmpty(Listitem.Property(album_description)) + !ListItem.IsParentFolder</visible>
 				</control>
-				<control type="radiobutton" id="16">
-					<label>$LOCALIZE[589]</label>
-					<include>MediaMenuItemsCommon</include>
+				<control type="image">
+					<right>113</right>
+					<top>614</top>
+					<width>463</width>
+					<height>270</height>
+					<aspectratio aligny="top">scale</aspectratio>
+					<fadetime>300</fadetime>
+					<texture background="true" fallback="DefaultFolder.png">$VAR[ListInfoBoxImageVar]</texture>
 				</control>
-				<control type="button" id="612">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31056]</label>
-					<onclick>ActivateWindow(musicplaylist)</onclick>
-					<visible>IntegerGreaterThan(Playlist.Length(music),0)</visible>
-				</control>
-				<control type="button" id="621">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[21452]</label>
-					<onclick>ActivateWindow(addonbrowser,addons://more/audio/,return)</onclick>
-					<visible>Container.Content(addons)</visible>
-				</control>
-				<control type="button" id="622">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31117]</label>
-					<onclick condition="System.HasAddon(plugin.library.node.editor)">ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=music,return)</onclick>
-					<onclick condition="!System.HasAddon(plugin.library.node.editor)">InstallAddon(plugin.library.node.editor)</onclick>
-					<visible>Container.Content() + IsEmpty(Container.PluginName)</visible>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>90</top>
+					<include>MediaMenuListCommon</include>
+					<control type="label" id="203">
+						<description>Actions</description>
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31020]</label>
+					</control>
+					<control type="togglebutton" id="619">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[653]</label>
+						<onclick>UpdateLibrary(music)</onclick>
+						<visible>!Container.Content(addons)</visible>
+						<altlabel>$LOCALIZE[13353]</altlabel>
+						<usealttexture>library.isscanningmusic</usealttexture>
+					</control>
+					<control type="radiobutton" id="16">
+						<label>$LOCALIZE[589]</label>
+						<include>MediaMenuItemsCommon</include>
+					</control>
+					<control type="button" id="612">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31056]</label>
+						<onclick>ActivateWindow(musicplaylist)</onclick>
+						<visible>Integer.IsGreater(Playlist.Length(music),0)</visible>
+					</control>
+					<control type="button" id="621">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[21452]</label>
+						<onclick>ActivateWindow(addonbrowser,addons://more/audio/,return)</onclick>
+						<visible>Container.Content(addons)</visible>
+					</control>
+					<control type="button" id="624">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[10140]</label>
+						<onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick>
+						<visible>!String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<control type="button" id="622">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31117]</label>
+						<onclick condition="System.HasAddon(plugin.library.node.editor)">ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=music,return)</onclick>
+						<onclick condition="!System.HasAddon(plugin.library.node.editor)">InstallAddon(plugin.library.node.editor)</onclick>
+						<visible>Container.Content() + String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<include>MediaMenuNowPlaying</include>
 				</control>
-				<include>MediaMenuNowPlaying</include>
 			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[2]" />
+				<param name="breadcrumbs_icon" value="icons/settings/music.png" />
+			</include>
+			<include name="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[2]" />
-			<param name="breadcrumbs_icon" value="icons/settings/music.png" />
-		</include>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPVRChannels.xml Changed

@@ -7,7 +7,7 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<control type="group">
 				<include>OpenClose_Left</include>
 				<left>110</left>
@@ -76,6 +76,7 @@
 							<height>58</height>
 							<width>800</width>
 							<aligny>center</aligny>
+							<font>fontContextMenu</font>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
 						<control type="label">
@@ -131,6 +132,7 @@
 							<height>58</height>
 							<width>800</width>
 							<aligny>center</aligny>
+							<font>fontContextMenu</font>
 							<label>$INFO[ListItem.Label]</label>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
@@ -206,7 +208,7 @@
 							<height>77</height>
 							<width>750</width>
 							<aligny>top</aligny>
-							<animation effect="slide" start="0,0" end="0,18" time="0" condition="IsEmpty(ListItem.Title)">Conditional</animation>
+							<animation effect="slide" start="0,0" end="0,18" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
 							<label>$INFO[ListItem.Label]</label>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
@@ -275,7 +277,7 @@
 							<width>750</width>
 							<aligny>top</aligny>
 							<label>$INFO[ListItem.Label]</label>
-							<animation effect="slide" start="0,0" end="0,18" time="0" condition="IsEmpty(ListItem.Title)">Conditional</animation>
+							<animation effect="slide" start="0,0" end="0,18" time="0" condition="String.IsEmpty(ListItem.Title)">Conditional</animation>
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 						<control type="label">
@@ -310,7 +312,7 @@
 					<width>12</width>
 					<height>706</height>
 					<onleft>50</onleft>
-					<onright>4301</onright>
+					<onright>50</onright>
 					<orientation>vertical</orientation>
 				</control>
 			</control>
@@ -332,17 +334,17 @@
 				<param name="down_posy" value="912" />
 				<param name="visible" value="!System.HasModalDialog" />
 			</include>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<include>PVRSideBar</include>
+			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="TV$INFO[Control.GetLabel(29), / ]$INFO[Control.GetLabel(30), / ]" />
+				<param name="breadcrumbs_icon" value="icons/settings/tvremote.png" />
+			</include>
+			<include>BottomBar</include>
 		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<include>PVRSideBar</include>
-		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="TV$INFO[Control.GetLabel(29), / ]$INFO[Control.GetLabel(30), / ]" />
-			<param name="breadcrumbs_icon" value="icons/settings/tvremote.png" />
-		</include>
-		<include>BottomBar</include>
 		<control type="label" id="29">
 			<font>-</font>
 			<include>HiddenObject</include>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPVRGuide.xml Changed

@@ -7,7 +7,7 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group" id="50">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<control type="group">
 				<description>Guide Timeline</description>
 				<visible>Control.IsVisible(10)</visible>
@@ -163,7 +163,7 @@
 						<aspectratio align="center" aligny="top">keep</aspectratio>
 						<fadetime>400</fadetime>
 						<texture>$INFO[ListItem.PlotOutline]</texture>
-						<visible>SubString(ListItem.PlotOutline,http://,Left) | SubString(ListItem.PlotOutline,https://,Left)</visible>
+						<visible>String.StartsWith(ListItem.PlotOutline,http://) | String.StartsWith(ListItem.PlotOutline,https://)</visible>
 					</control>
 					<control type="image">
 						<left>125</left>
@@ -320,7 +320,7 @@
 			<control type="group">
 				<left>1220</left>
 				<top>150</top>
-				<visible>!IsEmpty(ListItem.ChannelName)</visible>
+				<visible>!String.IsEmpty(ListItem.ChannelName)</visible>
 				<visible>Control.IsVisible(13)</visible>
 				<include>Visible_Right</include>
 				<include>OpenClose_Right</include>
@@ -329,20 +329,20 @@
 					<param name="bottom_label2" value="$INFO[ListItem.NextStartTime]" />
 				</include>
 			</control>
-		</control>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<include name="PVRSideBar">
-				<param name="group_label2" value="$INFO[Control.GetLabel(30)]" />
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<include name="PVRSideBar">
+					<param name="group_label2" value="$INFO[Control.GetLabel(30)]" />
+				</include>
+			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]" />
+				<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
+			</include>
+			<include name="BottomBar">
+				<param name="PageLabel" value="$INFO[Container.NumItems,$LOCALIZE[19019]: ]" />
 			</include>
 		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$INFO[Control.GetLabel(29)] - $INFO[Control.GetLabel(30)]" />
-			<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
-		</include>
-		<include name="BottomBar">
-			<param name="PageLabel" value="$INFO[Container.NumItems,$LOCALIZE[19019]: ]" />
-		</include>
 		<control type="label" id="29">
 			<font>-</font>
 			<include>HiddenObject</include>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPVRRecordings.xml Changed

@@ -7,272 +7,273 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
-			<left>110</left>
-			<top>180</top>
-			<include>OpenClose_Left</include>
-			<control type="image">
-				<description>background image</description>
-				<left>-20</left>
-				<top>-20</top>
-				<width>1090</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+			<control type="group">
+				<left>110</left>
+				<top>180</top>
+				<include>OpenClose_Left</include>
+				<control type="image">
+					<description>background image</description>
+					<left>-20</left>
+					<top>-20</top>
+					<width>1090</width>
+					<height>746</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
+				</control>
+				<control type="list" id="50">
+					<left>2</left>
+					<top>3</top>
+					<width>1046</width>
+					<height>700</height>
+					<onleft>9000</onleft>
+					<onright>73</onright>
+					<onup>50</onup>
+					<ondown>50</ondown>
+					<pagecontrol>73</pagecontrol>
+					<scrolltime>200</scrolltime>
+					<focusedlayout height="70">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>1050</width>
+							<height>70</height>
+							<texture border="90,3,90,3">lists/separator.png</texture>
+						</control>
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>1050</width>
+							<height>70</height>
+							<texture>lists/focus.png</texture>
+							<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(50)">Conditional</animation>
+						</control>
+						<control type="image">
+							<left>10</left>
+							<top>10</top>
+							<width>50</width>
+							<height>50</height>
+							<texture background="true">icons/defaulticons/$INFO[ListItem.Icon]</texture>
+						</control>
+						<control type="label">
+							<left>60</left>
+							<textoffsetx>15</textoffsetx>
+							<top>0</top>
+							<height>70</height>
+							<width>1050</width>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+						</control>
+						<control type="label">
+							<left>0</left>
+							<textoffsetx>15</textoffsetx>
+							<top>0</top>
+							<height>70</height>
+							<width>1050</width>
+							<align>right</align>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$INFO[ListItem.Date]</label>
+							<textcolor>white</textcolor>
+						</control>
+					</focusedlayout>
+					<itemlayout height="70">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>1050</width>
+							<height>70</height>
+							<texture border="90,3,90,3">lists/separator.png</texture>
+						</control>
+						<control type="image">
+							<left>10</left>
+							<top>10</top>
+							<width>50</width>
+							<height>50</height>
+							<texture background="true">icons/defaulticons/$INFO[ListItem.Icon]</texture>
+						</control>
+						<control type="label">
+							<left>60</left>
+							<textoffsetx>15</textoffsetx>
+							<top>0</top>
+							<height>70</height>
+							<width>1050</width>
+							<aligny>center</aligny>
+							<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+						</control>
+						<control type="label">
+							<left>0</left>
+							<textoffsetx>15</textoffsetx>
+							<top>0</top>
+							<height>70</height>
+							<width>1050</width>
+							<align>right</align>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$INFO[ListItem.Date]</label>
+							<textcolor>grey</textcolor>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+					</itemlayout>
+				</control>
+				<control type="scrollbar" id="73">
+					<left>1055</left>
+					<top>1</top>
+					<width>12</width>
+					<height>704</height>
+					<onleft>50</onleft>
+					<onright>50</onright>
+					<orientation>vertical</orientation>
+				</control>
 			</control>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo)">Conditional</animation>
-			<control type="list" id="50">
-				<left>2</left>
-				<top>3</top>
-				<width>1046</width>
-				<height>700</height>
-				<onleft>9000</onleft>
-				<onright>73</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
-				<pagecontrol>73</pagecontrol>
-				<scrolltime>200</scrolltime>
-				<focusedlayout height="70">
+			<control type="group">
+				<left>1220</left>
+				<top>180</top>
+				<include>Visible_Right</include>
+				<include>OpenClose_Right</include>
+				<control type="group">
+					<visible>!ListItem.IsFolder</visible>
 					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>1050</width>
-						<height>70</height>
-						<texture border="90,3,90,3">lists/separator.png</texture>
+						<left>-40</left>
+						<top>-20</top>
+						<width>644</width>
+						<height>170</height>
+						<texture border="22">dialogs/dialog-bg.png</texture>
 					</control>
 					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>1050</width>
-						<height>70</height>
-						<texture>lists/focus.png</texture>
-						<animation effect="fade" start="100" end="0" time="0" condition="!Control.HasFocus(50)">Conditional</animation>
+						<left>-40</left>
+						<top>130</top>
+						<width>644</width>
+						<height>520</height>
+						<texture border="22">dialogs/dialog-bg.png</texture>
+					</control>
+					<control type="group">
+						<left>150</left>
+						<top>40</top>
+						<control type="label">
+							<top>20</top>
+							<width>560</width>
+							<height>262</height>
+							<align>left</align>
+							<font>font12</font>
+							<wrapmultiline>true</wrapmultiline>
+							<label>$INFO[ListItem.Date][CR]$INFO[ListItem.Duration]</label>
+						</control>
+						<control type="label">
+							<top>-30</top>
+							<width>560</width>
+							<height>262</height>
+							<textcolor>button_focus</textcolor>
+							<font>font24_title</font>
+							<label>$INFO[ListItem.ChannelName]</label>
+						</control>
 					</control>
 					<control type="image">
-						<left>10</left>
-						<top>10</top>
-						<width>50</width>
-						<height>50</height>
-						<texture background="true">icons/defaulticons/$INFO[ListItem.Icon]</texture>
+						<left>-20</left>
+						<top>15</top>
+						<width>150</width>
+						<height>100</height>
+						<fadetime>200</fadetime>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Icon]</texture>
 					</control>
 					<control type="label">
-						<left>60</left>
-						<textoffsetx>15</textoffsetx>
-						<top>0</top>
-						<height>70</height>
-						<width>1050</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
+						<top>154</top>
+						<width>560</width>
+						<height>262</height>
+						<textcolor>button_focus</textcolor>
+						<font>font24_title</font>
+						<label>$INFO[ListItem.Title]</label>
 					</control>
 					<control type="label">
-						<left>0</left>
-						<textoffsetx>15</textoffsetx>
-						<top>0</top>
-						<height>70</height>
-						<width>1050</width>
-						<align>right</align>
-						<aligny>center</aligny>
+						<top>210</top>
+						<width>560</width>
+						<height>262</height>
+						<label>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:[/COLOR] ]</label>
 						<font>font12</font>
-						<label>$INFO[ListItem.Date]</label>
-						<textcolor>white</textcolor>
-					</control>
-				</focusedlayout>
-				<itemlayout height="70">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>1050</width>
-						<height>70</height>
-						<texture border="90,3,90,3">lists/separator.png</texture>
 					</control>
-					<control type="image">
-						<left>10</left>
-						<top>10</top>
-						<width>50</width>
-						<height>50</height>
-						<texture background="true">icons/defaulticons/$INFO[ListItem.Icon]</texture>
-					</control>
-					<control type="label">
-						<left>60</left>
-						<textoffsetx>15</textoffsetx>
-						<top>0</top>
-						<height>70</height>
-						<width>1050</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]$INFO[ListItem.EpisodeName, (,)]</label>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<textoffsetx>15</textoffsetx>
-						<top>0</top>
-						<height>70</height>
-						<width>1050</width>
-						<align>right</align>
-						<aligny>center</aligny>
+					<control type="textbox">
+						<top>254</top>
+						<width>560</width>
+						<height>362</height>
+						<align>justify</align>
+						<label>$INFO[ListItem.Plot]</label>
 						<font>font12</font>
-						<label>$INFO[ListItem.Date]</label>
-						<textcolor>grey</textcolor>
-						<shadowcolor>text_shadow</shadowcolor>
 					</control>
-				</itemlayout>
-			</control>
-			<control type="scrollbar" id="73">
-				<left>1055</left>
-				<top>1</top>
-				<width>12</width>
-				<height>704</height>
-				<onleft>50</onleft>
-				<onright>50</onright>
-				<orientation>vertical</orientation>
-			</control>
-		</control>
-		<control type="group">
-			<left>1220</left>
-			<top>180</top>
-			<include>Visible_Right</include>
-			<include>OpenClose_Right</include>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(pvrguideinfo) | Window.IsActive(pvrrecordinginfo)">Conditional</animation>
-			<control type="group">
-				<visible>!ListItem.IsFolder</visible>
-				<control type="image">
-					<left>-40</left>
-					<top>-20</top>
-					<width>644</width>
-					<height>170</height>
-					<texture border="22">dialogs/dialog-bg.png</texture>
 				</control>
 				<control type="image">
 					<left>-40</left>
-					<top>130</top>
+					<top>632</top>
 					<width>644</width>
-					<height>520</height>
+					<height>94</height>
 					<texture border="22">dialogs/dialog-bg.png</texture>
 				</control>
+				<control type="label">
+					<description>Disk usage text</description>
+					<top>660</top>
+					<width>600</width>
+					<height>20</height>
+					<label>$INFO[PVR.backenddiskspace]</label>
+					<shadowcolor>black</shadowcolor>
+					<font>font12</font>
+					<visible>!Integer.IsGreater(PVR.backenddiskspaceprogr,100)</visible>
+				</control>
+				<control type="progress">
+					<description>Disk usage bar</description>
+					<left>460</left>
+					<top>673</top>
+					<width>100</width>
+					<height>12</height>
+					<info>PVR.backenddiskspaceprogr</info>
+					<visible>!Integer.IsGreater(PVR.backenddiskspaceprogr,100)</visible>
+				</control>
 				<control type="group">
-					<left>150</left>
-					<top>40</top>
-					<control type="label">
-						<top>20</top>
-						<width>560</width>
-						<height>262</height>
-						<align>left</align>
-						<font>font12</font>
-						<wrapmultiline>true</wrapmultiline>
-						<label>$INFO[ListItem.Date][CR]$INFO[ListItem.Duration]</label>
+					<visible>ListItem.IsFolder</visible>
+					<control type="image">
+						<left>-40</left>
+						<top>-20</top>
+						<width>644</width>
+						<height>670</height>
+						<texture border="22">dialogs/dialog-bg.png</texture>
 					</control>
 					<control type="label">
-						<top>-30</top>
+						<top>10</top>
 						<width>560</width>
 						<height>262</height>
-						<textcolor>button_focus</textcolor>
-						<font>font24_title</font>
-						<label>$INFO[ListItem.ChannelName]</label>
+						<label>$LOCALIZE[19076] ($INFO[Container(5000).NumItems,[B],[/B] $LOCALIZE[31036]])</label>
+						<font>font16</font>
+						<visible>ListItem.IsFolder</visible>
+					</control>
+					<control type="group">
+						<left>-10</left>
+						<top>60</top>
+						<visible>ListItem.IsFolder</visible>
+						<include name="InfoList">
+							<param name="path" value="$INFO[ListItem.Path]/$INFO[ListItem.Label]" />
+							<param name="height" value="362" />
+							<param name="width" value="560" />
+							<param name="font" value="font12" />
+							<param name="item_label" value="$INFO[ListItem.Duration,[COLOR button_focus],[/COLOR]  -  ]$INFO[ListItem.Label]" />
+						</include>
 					</control>
 				</control>
-				<control type="image">
-					<left>-20</left>
-					<top>15</top>
-					<width>150</width>
-					<height>100</height>
-					<fadetime>200</fadetime>
-					<aspectratio>keep</aspectratio>
-					<texture>$INFO[ListItem.Icon]</texture>
-				</control>
-				<control type="label">
-					<top>154</top>
-					<width>560</width>
-					<height>262</height>
-					<textcolor>button_focus</textcolor>
-					<font>font24_title</font>
-					<label>$INFO[ListItem.Title]</label>
-				</control>
-				<control type="label">
-					<top>210</top>
-					<width>560</width>
-					<height>262</height>
-					<label>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:[/COLOR] ]</label>
-					<font>font12</font>
-				</control>
-				<control type="textbox">
-					<top>254</top>
-					<width>560</width>
-					<height>362</height>
-					<align>justify</align>
-					<label>$INFO[ListItem.Plot]</label>
-					<font>font12</font>
-				</control>
-			</control>
-			<control type="image">
-				<left>-40</left>
-				<top>632</top>
-				<width>644</width>
-				<height>94</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
 			</control>
-			<control type="label">
-				<description>Disk usage text</description>
-				<top>660</top>
-				<width>600</width>
-				<height>20</height>
-				<label>$INFO[PVR.backenddiskspace]</label>
-				<shadowcolor>black</shadowcolor>
-				<font>font12</font>
-				<visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<include>PVRSideBar</include>
 			</control>
-			<control type="progress">
-				<description>Disk usage bar</description>
-				<left>460</left>
-				<top>673</top>
-				<width>100</width>
-				<height>12</height>
-				<info>PVR.backenddiskspaceprogr</info>
-				<visible>!IntegerGreaterThan(PVR.backenddiskspaceprogr,100)</visible>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[19017]" />
+				<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
+			</include>
+			<control type="label" id="29">
+				<font>-</font>
+				<include>HiddenObject</include>
 			</control>
-			<control type="group">
-				<visible>ListItem.IsFolder</visible>
-				<control type="image">
-					<left>-40</left>
-					<top>-20</top>
-					<width>644</width>
-					<height>670</height>
-					<texture border="22">dialogs/dialog-bg.png</texture>
-				</control>
-				<control type="label">
-					<top>10</top>
-					<width>560</width>
-					<height>262</height>
-					<label>Folder ($INFO[Container(5000).NumItems,[B],[/B] items])</label>
-					<font>font16</font>
-					<visible>ListItem.IsFolder</visible>
-				</control>
-				<control type="group">
-					<left>-10</left>
-					<top>60</top>
-					<visible>ListItem.IsFolder</visible>
-					<include name="InfoList">
-						<param name="path" value="$INFO[ListItem.Path]/$INFO[ListItem.Label]" />
-						<param name="height" value="362" />
-						<param name="width" value="560" />
-						<param name="font" value="font12" />
-						<param name="item_label" value="$INFO[ListItem.Duration,[COLOR button_focus],[/COLOR]  -  ]$INFO[ListItem.Label]" />
-					</include>
-				</control>
+			<control type="label" id="30">
+				<font>-</font>
+				<include>HiddenObject</include>
 			</control>
+			<include>BottomBar</include>
 		</control>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<include>PVRSideBar</include>
-		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[19017]" />
-			<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
-		</include>
-		<control type="label" id="29">
-			<font>-</font>
-			<include>HiddenObject</include>
-		</control>
-		<control type="label" id="30">
-			<font>-</font>
-			<include>HiddenObject</include>
-		</control>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPVRSearch.xml Changed

@@ -7,182 +7,185 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<control type="group">
-			<description>TV Search group</description>
-			<visible>Control.IsVisible(50)</visible>
-			<include>OpenClose_Left</include>
-			<include>Visible_Left</include>
-			<control type="image">
-				<description>background image</description>
-				<left>90</left>
-				<top>160</top>
-				<width>1090</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
-			</control>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<control type="group">
-				<left>110</left>
-				<top>180</top>
-				<control type="list" id="50">
-					<left>0</left>
-					<top>3</top>
-					<width>1050</width>
-					<height>700</height>
-					<onup>50</onup>
-					<ondown>50</ondown>
-					<onleft>9000</onleft>
-					<onright>77</onright>
-					<pagecontrol>77</pagecontrol>
-					<scrolltime>200</scrolltime>
-					<itemlayout height="100">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>1050</width>
-							<height>101</height>
-							<texture border="90,3,90,3">lists/separator.png</texture>
-						</control>
-						<control type="label">
-							<visible>IsEmpty(ListItem.Date)</visible>
-							<left>120</left>
-							<top>0</top>
-							<width>650</width>
-							<height>100</height>
-							<font>font24_title</font>
-							<aligny>center</aligny>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="group">
-							<visible>!IsEmpty(ListItem.Date)</visible>
+				<description>TV Search group</description>
+				<visible>Control.IsVisible(50)</visible>
+				<include>OpenClose_Left</include>
+				<include>Visible_Left</include>
+				<control type="image">
+					<description>background image</description>
+					<left>90</left>
+					<top>160</top>
+					<width>1090</width>
+					<height>746</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
+				</control>
+				<control type="group">
+					<left>110</left>
+					<top>180</top>
+					<control type="list" id="50">
+						<left>0</left>
+						<top>3</top>
+						<width>1050</width>
+						<height>700</height>
+						<onup>50</onup>
+						<ondown>50</ondown>
+						<onleft>9000</onleft>
+						<onright>77</onright>
+						<pagecontrol>77</pagecontrol>
+						<scrolltime>200</scrolltime>
+						<itemlayout height="100">
 							<control type="image">
-								<left>25</left>
-								<top>10</top>
-								<width>80</width>
-								<height>80</height>
-								<texture fallback="DefaultTVShowsSquare.png">$INFO[Listitem.Art(thumb)]</texture>
-								<aspectratio>keep</aspectratio>
-								<visible>!IsEmpty(ListItem.Icon)</visible>
-							</control>
-							<control type="label">
-								<left>120</left>
-								<top>10</top>
-								<width>890</width>
-								<height>100</height>
-								<aligny>top</aligny>
-								<label>$INFO[ListItem.ChannelName][COLOR button_focus]$INFO[ListItem.Label, - ][/COLOR]</label>
+								<left>0</left>
+								<top>0</top>
+								<width>1050</width>
+								<height>101</height>
+								<texture border="90,3,90,3">lists/separator.png</texture>
 							</control>
 							<control type="label">
+								<visible>String.IsEmpty(ListItem.Date)</visible>
 								<left>120</left>
-								<top>20</top>
-								<width>350</width>
+								<top>0</top>
+								<width>650</width>
 								<height>100</height>
-								<font>font12</font>
+								<font>font24_title</font>
 								<aligny>center</aligny>
-								<label>$INFO[ListItem.Date]</label>
+								<label>$INFO[ListItem.Label]</label>
 							</control>
-							<control type="image">
-								<left>980</left>
-								<top>50</top>
-								<width>50</width>
-								<height>50</height>
-								<texture>$VAR[PVRStatusImageVar]</texture>
+							<control type="group">
+								<visible>!String.IsEmpty(ListItem.Date)</visible>
+								<control type="image">
+									<left>25</left>
+									<top>10</top>
+									<width>80</width>
+									<height>80</height>
+									<texture fallback="DefaultTVShowsSquare.png">$INFO[Listitem.Art(thumb)]</texture>
+									<aspectratio>keep</aspectratio>
+									<visible>!String.IsEmpty(ListItem.Icon)</visible>
+								</control>
+								<control type="label">
+									<left>120</left>
+									<top>10</top>
+									<width>890</width>
+									<height>100</height>
+									<aligny>top</aligny>
+									<label>$INFO[ListItem.ChannelName][COLOR button_focus]$INFO[ListItem.Label, - ][/COLOR]</label>
+								</control>
+								<control type="label">
+									<left>120</left>
+									<top>20</top>
+									<width>350</width>
+									<height>100</height>
+									<font>font12</font>
+									<aligny>center</aligny>
+									<label>$INFO[ListItem.Date]</label>
+								</control>
+								<control type="image">
+									<left>980</left>
+									<top>50</top>
+									<width>50</width>
+									<height>50</height>
+									<texture>$VAR[PVRStatusImageVar]</texture>
+								</control>
 							</control>
-						</control>
-					</itemlayout>
-					<focusedlayout height="100">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>1050</width>
-							<height>101</height>
-							<texture border="90,3,90,3">lists/separator.png</texture>
-							<visible>!Control.HasFocus(50)</visible>
-						</control>
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>1050</width>
-							<height>101</height>
-							<texture>lists/focus.png</texture>
-							<visible>Control.HasFocus(50)</visible>
-						</control>
-						<control type="label">
-							<visible>IsEmpty(ListItem.Date)</visible>
-							<left>120</left>
-							<top>0</top>
-							<width>650</width>
-							<height>100</height>
-							<font>font24_title</font>
-							<aligny>center</aligny>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="group">
-							<visible>!IsEmpty(ListItem.Date)</visible>
+						</itemlayout>
+						<focusedlayout height="100">
 							<control type="image">
-								<left>25</left>
-								<top>10</top>
-								<width>80</width>
-								<height>80</height>
-								<texture fallback="DefaultTVShowsSquare.png">$INFO[Listitem.Art(thumb)]</texture>
-								<aspectratio>keep</aspectratio>
-								<visible>!IsEmpty(ListItem.Icon)</visible>
+								<left>0</left>
+								<top>0</top>
+								<width>1050</width>
+								<height>101</height>
+								<texture border="90,3,90,3">lists/separator.png</texture>
+								<visible>!Control.HasFocus(50)</visible>
 							</control>
-							<control type="label">
-								<left>120</left>
-								<top>10</top>
-								<width>890</width>
-								<height>100</height>
-								<aligny>top</aligny>
-								<label>$INFO[ListItem.ChannelName][COLOR button_focus]$INFO[ListItem.Label, - ][/COLOR]</label>
+							<control type="image">
+								<left>0</left>
+								<top>0</top>
+								<width>1050</width>
+								<height>101</height>
+								<texture>lists/focus.png</texture>
+								<visible>Control.HasFocus(50)</visible>
 							</control>
 							<control type="label">
+								<visible>String.IsEmpty(ListItem.Date)</visible>
 								<left>120</left>
-								<top>20</top>
-								<width>350</width>
+								<top>0</top>
+								<width>650</width>
 								<height>100</height>
-								<font>font12</font>
+								<font>font24_title</font>
 								<aligny>center</aligny>
-								<label>$INFO[ListItem.Date]</label>
+								<label>$INFO[ListItem.Label]</label>
 							</control>
-							<control type="image">
-								<left>980</left>
-								<top>50</top>
-								<width>50</width>
-								<height>50</height>
-								<texture>$VAR[PVRStatusImageVar]</texture>
+							<control type="group">
+								<visible>!String.IsEmpty(ListItem.Date)</visible>
+								<control type="image">
+									<left>25</left>
+									<top>10</top>
+									<width>80</width>
+									<height>80</height>
+									<texture fallback="DefaultTVShowsSquare.png">$INFO[Listitem.Art(thumb)]</texture>
+									<aspectratio>keep</aspectratio>
+									<visible>!String.IsEmpty(ListItem.Icon)</visible>
+								</control>
+								<control type="label">
+									<left>120</left>
+									<top>10</top>
+									<width>890</width>
+									<height>100</height>
+									<aligny>top</aligny>
+									<label>$INFO[ListItem.ChannelName][COLOR button_focus]$INFO[ListItem.Label, - ][/COLOR]</label>
+								</control>
+								<control type="label">
+									<left>120</left>
+									<top>20</top>
+									<width>350</width>
+									<height>100</height>
+									<font>font12</font>
+									<aligny>center</aligny>
+									<label>$INFO[ListItem.Date]</label>
+								</control>
+								<control type="image">
+									<left>980</left>
+									<top>50</top>
+									<width>50</width>
+									<height>50</height>
+									<texture>$VAR[PVRStatusImageVar]</texture>
+								</control>
 							</control>
-						</control>
-					</focusedlayout>
-				</control>
-				<control type="scrollbar" id="77">
-					<left>1055</left>
-					<top>0</top>
-					<width>12</width>
-					<height>710</height>
-					<onleft>50</onleft>
-					<onright>104</onright>
-					<orientation>vertical</orientation>
+						</focusedlayout>
+					</control>
+					<control type="scrollbar" id="77">
+						<left>1055</left>
+						<top>0</top>
+						<width>12</width>
+						<height>710</height>
+						<onleft>50</onleft>
+						<onright>104</onright>
+						<orientation>vertical</orientation>
+					</control>
 				</control>
 			</control>
-		</control>
-		<control type="group">
-			<left>1220</left>
-			<top>180</top>
-			<visible>!IsEmpty(ListItem.Date)</visible>
-			<include>Visible_Right</include>
-			<include>OpenClose_Right</include>
-			<include name="PVRInfoPanel">
-				<param name="bottom_label1" value="$INFO[ListItem.NextTitle,[COLOR button_focus]$LOCALIZE[19031]:[/COLOR] ]" />
-				<param name="bottom_label2" value="$INFO[ListItem.NextStartTime]" />
+			<control type="group">
+				<left>1220</left>
+				<top>180</top>
+				<visible>!String.IsEmpty(ListItem.Date)</visible>
+				<include>Visible_Right</include>
+				<include>OpenClose_Right</include>
+				<include name="PVRInfoPanel">
+					<param name="bottom_label1" value="$INFO[ListItem.NextTitle,[COLOR button_focus]$LOCALIZE[19031]:[/COLOR] ]" />
+					<param name="bottom_label2" value="$INFO[ListItem.NextStartTime]" />
+				</include>
+			</control>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<include>PVRSideBar</include>
+			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[137]" />
+				<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
 			</include>
+			<include>BottomBar</include>
 		</control>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<include>PVRSideBar</include>
-		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[137]" />
-			<param name="breadcrumbs_icon" value="icons/settings/tvguide.png" />
-		</include>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPVRTimers.xml Changed

@@ -46,11 +46,11 @@
 							<height>100</height>
 							<font>font24_title</font>
 							<aligny>center</aligny>
-							<visible>IsEmpty(ListItem.Date)</visible>
+							<visible>String.IsEmpty(ListItem.Date)</visible>
 							<label>$INFO[ListItem.Label]</label>
 						</control>
 						<control type="group">
-							<visible>!IsEmpty(ListItem.Date)</visible>
+							<visible>!String.IsEmpty(ListItem.Date)</visible>
 							<control type="label">
 								<left>30</left>
 								<top>10</top>
@@ -84,7 +84,7 @@
 								<width>120</width>
 								<height>75</height>
 								<texture>$VAR[TVTimerRadioButtonTexture]</texture>
-								<visible>!IsEmpty(ListItem.ChannelName)</visible>
+								<visible>!String.IsEmpty(ListItem.ChannelName)</visible>
 							</control>
 						</control>
 					</itemlayout>
@@ -113,10 +113,10 @@
 							<font>font24_title</font>
 							<aligny>center</aligny>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>IsEmpty(ListItem.Date)</visible>
+							<visible>String.IsEmpty(ListItem.Date)</visible>
 						</control>
 						<control type="group">
-							<visible>!IsEmpty(ListItem.Date)</visible>
+							<visible>!String.IsEmpty(ListItem.Date)</visible>
 							<control type="label">
 								<left>30</left>
 								<top>10</top>
@@ -150,7 +150,7 @@
 								<width>120</width>
 								<height>75</height>
 								<texture>$VAR[TVTimerRadioButtonTexture]</texture>
-								<visible>!IsEmpty(ListItem.ChannelName)</visible>
+								<visible>!String.IsEmpty(ListItem.ChannelName)</visible>
 							</control>
 						</control>
 					</focusedlayout>
@@ -168,7 +168,7 @@
 			<control type="group">
 				<left>1220</left>
 				<top>180</top>
-				<visible>!IsEmpty(ListItem.Date)</visible>
+				<visible>!String.IsEmpty(ListItem.Date)</visible>
 				<include>Visible_Right</include>
 				<include>OpenClose_Right</include>
 				<include name="PVRInfoPanel">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPics.xml Changed

@@ -5,12 +5,10 @@
 	<views>50,52,53,54,55,500</views>
 	<menucontrol>9000</menucontrol>
 	<controls>
-		<include name="DefaultBackground">
-			<param name="fanart" value="$INFO[ListItem.FolderPath]" />
-		</include>
+		<include>DefaultBackground</include>
 		<include>CommonScrollbars</include>
-		<control type="group" id="100">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation) | Window.IsActive(pictureinfo)">Conditional</animation>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_52_IconWall</include>
 			<include>View_53_Shift</include>
@@ -191,60 +189,64 @@
 					</include>
 				</control>
 			</control>
-		</control>
-		<control type="group">
-			<include>OpenClose_Left</include>
-			<visible>Window.IsActive(addoninformation) | Control.IsVisible(50) | Control.IsVisible(55)</visible>
-			<include>Visible_Left</include>
-			<visible>!Container.Content()</visible>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<control type="grouplist" id="9000">
-				<top>90</top>
-				<include name="MediaMenuListCommon">
-					<param name="viewtype_button_vis" value="Container.Content(images) | Container.Content(addons)" />
-				</include>
-				<control type="label" id="203">
-					<description>Actions</description>
-					<include>MediaMenuLabelCommon</include>
-					<label>$LOCALIZE[31020]</label>
-				</control>
-				<control type="button" id="6">
-					<label>$LOCALIZE[13317]</label>
-					<include>MediaMenuItemsCommon</include>
-				</control>
-				<control type="button" id="7">
-					<label>$LOCALIZE[13318]</label>
-					<include>MediaMenuItemsCommon</include>
-				</control>
-				<control type="radiobutton" id="9">
-					<label>$LOCALIZE[13319]</label>
-					<include>MediaMenuItemsCommon</include>
-				</control>
-				<control type="button" id="622">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31124]</label>
-					<onclick condition="System.HasAddon(script.maps.browser)">RunScript(script.maps.browser,folder=$INFO[Container.FolderPath])</onclick>
-					<onclick condition="!System.HasAddon(script.maps.browser)">InstallAddon(script.maps.browser)</onclick>
-					<visible>Container.Content(images) + IsEmpty(Container.PluginName)</visible>
-				</control>
-				<control type="button" id="621">
-					<description>Get more</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[21452]</label>
-					<onclick>ActivateWindow(addonbrowser,addons://more/image/,return)</onclick>
-					<visible>Container.Content(addons)</visible>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<visible>Control.IsVisible(50) | Control.IsVisible(55)</visible>
+				<include>Visible_Left</include>
+				<visible>!Container.Content()</visible>
+				<include>ListThumbInfoPanel</include>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>90</top>
+					<include>MediaMenuListCommon</include>
+					<control type="label" id="203">
+						<description>Actions</description>
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31020]</label>
+					</control>
+					<control type="button" id="6">
+						<label>$LOCALIZE[13317]</label>
+						<include>MediaMenuItemsCommon</include>
+					</control>
+					<control type="button" id="7">
+						<label>$LOCALIZE[13318]</label>
+						<include>MediaMenuItemsCommon</include>
+					</control>
+					<control type="radiobutton" id="9">
+						<label>$LOCALIZE[13319]</label>
+						<include>MediaMenuItemsCommon</include>
+					</control>
+					<control type="button" id="622">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31124]</label>
+						<onclick condition="System.HasAddon(script.maps.browser)">RunScript(script.maps.browser,folder=$INFO[Container.FolderPath])</onclick>
+						<onclick condition="!System.HasAddon(script.maps.browser)">InstallAddon(script.maps.browser)</onclick>
+						<visible>Container.Content(images) + String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<control type="button" id="624">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[10140]</label>
+						<onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick>
+						<visible>!String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<control type="button" id="621">
+						<description>Get more</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[21452]</label>
+						<onclick>ActivateWindow(addonbrowser,addons://more/image/,return)</onclick>
+						<visible>Container.Content(addons)</visible>
+					</control>
+					<include>MediaMenuNowPlaying</include>
 				</control>
-				<include>MediaMenuNowPlaying</include>
 			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[1213]" />
+				<param name="breadcrumbs_icon" value="icons/settings/pictures.png" />
+			</include>
+			<include>BottomBar</include>
 		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[1213]" />
-			<param name="breadcrumbs_icon" value="icons/settings/pictures.png" />
-		</include>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPlaylist.xml Changed

@@ -5,130 +5,145 @@
 	<views>50</views>
 	<controls>
 		<include>DefaultBackground</include>
-		<include name="PlaylistWindowButtons">
-			<param name="width" value="220" />
-		</include>
 		<control type="group">
-			<include>OpenClose_Right</include>
-			<left>320</left>
-			<top>182</top>
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
+			<include name="PlaylistWindowButtons">
+				<param name="width" value="400" />
+			</include>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<control type="image">
+					<left>100</left>
+					<top>550</top>
+					<width>400</width>
+					<height>358</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
+				</control>
+			</control>
+			<control type="group">
+				<include>OpenClose_Right</include>
+				<left>510</left>
+				<top>182</top>
+				<control type="image">
+					<description>background image</description>
+					<left>-20</left>
+					<top>-20</top>
+					<width>843</width>
+					<height>746</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
+				</control>
+				<control type="panel" id="50">
+					<left>2</left>
+					<top>3</top>
+					<width>800</width>
+					<height>700</height>
+					<scrolltime tween="cubic" easing="out">500</scrolltime>
+					<orientation>vertical</orientation>
+					<onleft>700</onleft>
+					<onright>60</onright>
+					<onup>50</onup>
+					<ondown>50</ondown>
+					<pagecontrol>60</pagecontrol>
+					<viewtype label="List">list</viewtype>
+					<preloaditems>1</preloaditems>
+					<focusedlayout height="63" width="800">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>800</width>
+							<height>63</height>
+							<texture>lists/focus.png</texture>
+						</control>
+						<control type="label">
+							<left>30</left>
+							<top>0</top>
+							<height>63</height>
+							<width>680</width>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$INFO[ListItem.Label]</label>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+						<control type="label">
+							<left>90</left>
+							<top>0</top>
+							<height>63</height>
+							<width>680</width>
+							<align>right</align>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$VAR[PlaylistLabel2Var]</label>
+							<textcolor>grey</textcolor>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+					</focusedlayout>
+					<itemlayout height="63" width="800">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>800</width>
+							<height>63</height>
+							<texture border="90,3,90,3">lists/separator.png</texture>
+						</control>
+						<control type="label">
+							<left>30</left>
+							<top>0</top>
+							<height>63</height>
+							<width>680</width>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$INFO[ListItem.Label]</label>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+						<control type="label">
+							<left>90</left>
+							<top>0</top>
+							<height>63</height>
+							<width>680</width>
+							<align>right</align>
+							<aligny>center</aligny>
+							<font>font12</font>
+							<label>$VAR[PlaylistLabel2Var]</label>
+							<textcolor>grey</textcolor>
+							<shadowcolor>text_shadow</shadowcolor>
+						</control>
+					</itemlayout>
+				</control>
+				<control type="scrollbar" id="60">
+					<left>1005</left>
+					<top>0</top>
+					<width>12</width>
+					<height>704</height>
+					<onleft>50</onleft>
+					<onright>700</onright>
+					<orientation>vertical</orientation>
+				</control>
+			</control>
 			<control type="image">
-				<description>background image</description>
-				<left>-20</left>
-				<top>-20</top>
-				<width>1040</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
+				<include>OpenClose_Right</include>
+				<visible>Window.IsActive(videoplaylist)</visible>
+				<top>163</top>
+				<left>1324</left>
+				<width>506</width>
+				<height>742</height>
+				<fadetime>200</fadetime>
+				<aspectratio aligny="bottom">keep</aspectratio>
+				<texture fallback="DefaultVideo.png" background="true">$VAR[PosterVar]</texture>
+				<bordertexture border="20">overlays/shadow.png</bordertexture>
+				<bordersize>20</bordersize>
 			</control>
-			<control type="panel" id="50">
-				<left>2</left>
-				<top>3</top>
-				<width>1000</width>
-				<height>700</height>
-				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<orientation>vertical</orientation>
-				<onleft>700</onleft>
-				<onright>60</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
-				<pagecontrol>60</pagecontrol>
-				<viewtype label="List">list</viewtype>
-				<preloaditems>1</preloaditems>
-				<focusedlayout height="70" width="1000">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>996</width>
-						<height>70</height>
-						<texture>lists/focus.png</texture>
-					</control>
-					<control type="label">
-						<left>30</left>
-						<top>0</top>
-						<height>70</height>
-						<width>880</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Artist,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Title]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="label">
-						<left>90</left>
-						<top>0</top>
-						<height>70</height>
-						<width>880</width>
-						<align>right</align>
-						<aligny>center</aligny>
-						<font>font12</font>
-						<label>$VAR[PlaylistLabel2Var]</label>
-						<textcolor>grey</textcolor>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-				</focusedlayout>
-				<itemlayout height="70" width="1000">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>996</width>
-						<height>71</height>
-						<texture border="90,3,90,3">lists/separator.png</texture>
-					</control>
-					<control type="label">
-						<left>30</left>
-						<top>0</top>
-						<height>70</height>
-						<width>880</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Artist,[COLOR button_focus],[/COLOR] - ]$INFO[ListItem.Title]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="label">
-						<left>90</left>
-						<top>0</top>
-						<height>70</height>
-						<width>880</width>
-						<align>right</align>
-						<aligny>center</aligny>
-						<font>font12</font>
-						<label>$VAR[PlaylistLabel2Var]</label>
-						<textcolor>grey</textcolor>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-				</itemlayout>
+			<control type="group">
+				<left>1230</left>
+				<visible>Window.IsActive(musicplaylist)</visible>
+				<include>OpenClose_Right</include>
+				<include>ListThumbInfoPanel</include>
 			</control>
-			<control type="scrollbar" id="60">
-				<left>1005</left>
-				<top>0</top>
-				<width>12</width>
-				<height>704</height>
-				<onleft>50</onleft>
-				<onright>700</onright>
-				<orientation>vertical</orientation>
+			<control type="group">
+				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<include>MediaFlags</include>
 			</control>
 		</control>
-		<control type="image">
-			<include>OpenClose_Right</include>
-			<visible>Window.IsActive(videoplaylist)</visible>
-			<top>163</top>
-			<left>1324</left>
-			<width>506</width>
-			<height>742</height>
-			<fadetime>200</fadetime>
-			<aspectratio aligny="bottom">keep</aspectratio>
-			<texture fallback="DefaultVideo.png" background="true">$VAR[PosterVar]</texture>
-			<bordertexture border="20">overlays/shadow.png</bordertexture>
-			<bordersize>20</bordersize>
-		</control>
-		<control type="group">
-			<left>1230</left>
-			<visible>Window.IsActive(musicplaylist)</visible>
-			<include>OpenClose_Right</include>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<control type="group">
-			<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-			<include>MediaFlags</include>
-		</control>
 		<include name="TopBar" condition="Window.IsActive(videoplaylist)">
 			<param name="breadcrumbs_label" value="$LOCALIZE[31065]" />
 			<param name="breadcrumbs_icon" value="icons/settings/video.png" />

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyPrograms.xml Changed

@@ -7,47 +7,53 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<include>CommonScrollbars</include>
-		<control type="group" id="100">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(addoninformation)">Conditional</animation>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_52_IconWall</include>
 			<include>View_55_WideList</include>
 			<include>View_500_SmallThumb</include>
-		</control>
-		<control type="group">
-			<include>OpenClose_Left</include>
-			<include>Visible_Left</include>
-			<visible>Control.IsVisible(55) | Window.IsActive(addoninformation)</visible>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<control type="grouplist" id="9000">
-				<top>90</top>
-				<include name="MediaMenuListCommon">
-					<param name="viewtype_button_vis" value="Container.Content(addons)" />
-				</include>
-				<control type="label" id="203">
-					<description>Actions</description>
-					<include>MediaMenuLabelCommon</include>
-					<label>$LOCALIZE[31020]</label>
-					<visible>Control.IsVisible(621)</visible>
-				</control>
-				<control type="button" id="621">
-					<description>Get more</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[21452]</label>
-					<onclick>ActivateWindow(addonbrowser,addons://more/executable/,return)</onclick>
-					<visible>Container.Content(addons)</visible>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<include>Visible_Left</include>
+				<visible>Control.IsVisible(55)</visible>
+				<include>ListThumbInfoPanel</include>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>90</top>
+					<include>MediaMenuListCommon</include>
+					<control type="label" id="203">
+						<description>Actions</description>
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31020]</label>
+						<visible>Control.IsVisible(621)</visible>
+					</control>
+					<control type="button" id="624">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[10140]</label>
+						<onclick>Addon.OpenSettings($INFO[Container.PluginName])</onclick>
+						<visible>!String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<control type="button" id="621">
+						<description>Get more</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[21452]</label>
+						<onclick>ActivateWindow(addonbrowser,addons://more/executable/,return)</onclick>
+						<visible>Container.Content(addons)</visible>
+					</control>
 				</control>
+				<include>MediaMenuNowPlaying</include>
 			</control>
-			<include>MediaMenuNowPlaying</include>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$LOCALIZE[10001]" />
+				<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
+			</include>
+			<include name="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$LOCALIZE[10001]" />
-			<param name="breadcrumbs_icon" value="icons/settings/addons.png" />
-		</include>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyVideoNav.xml Changed

@@ -7,8 +7,8 @@
 	<controls>
 		<include>DefaultBackground</include>
 		<include>CommonScrollbars</include>
-		<control type="group" id="100">
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
+		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="$EXP[infodialog_active]">Conditional</animation>
 			<include>View_50_List</include>
 			<include>View_51_Poster</include>
 			<include>View_52_IconWall</include>
@@ -17,252 +17,249 @@
 			<include>View_55_WideList</include>
 			<include>View_500_SmallThumb</include>
 			<include>View_501_Banner</include>
-		</control>
-		<include>View_502_FanArt</include>
-		<control type="group">
-			<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
-			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-			<include>MediaFlags</include>
-			<visible>!Window.IsActive(movieinformation)</visible>
-		</control>
-		<control type="group">
-			<include>OpenClose_Left</include>
-			<visible>Control.IsVisible(55) | [Control.IsVisible(500) + Window.IsActive(addoninformation)]</visible>
-			<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(addons) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos)</visible>
-			<visible>!Window.IsActive(movieinformation)</visible>
-			<include>Visible_Left</include>
-			<include>ListThumbInfoPanel</include>
-		</control>
-		<control type="group">
-			<include>OpenClose_Right</include>
-			<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-			<visible>[Control.IsVisible(50) | Control.Isvisible(54)] + !IsEmpty(ListItem.DBID)</visible>
-			<include>Visible_Right</include>
-			<visible>Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos)</visible>
-			<control type="image">
-				<right>90</right>
-				<top>162</top>
-				<width>509</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
-			</control>
-			<control type="label">
-				<right>130</right>
-				<top>194</top>
-				<width>429</width>
-				<height>338</height>
-				<font>font13_title</font>
-				<label>$INFO[ListItem.Label]</label>
-				<visible>Control.IsVisible(54) | ListItem.IsCollection</visible>
-			</control>
-			<control type="textbox">
-				<right>130</right>
-				<top>245</top>
-				<width>429</width>
-				<height>338</height>
-				<font>font12</font>
-				<visible>Control.IsVisible(54)</visible>
-				<label>$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR],[CR]]$INFO[ListItem.Plot]</label>
-			</control>
-			<control type="textbox">
-				<right>130</right>
-				<top>194</top>
-				<width>429</width>
-				<height>398</height>
-				<font>font12</font>
-				<visible>!Control.IsVisible(54)</visible>
-				<label>$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]: [/COLOR],[CR]]$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label>
-			</control>
-			<control type="textbox">
-				<right>130</right>
-				<top>360</top>
-				<width>429</width>
-				<height>413</height>
-				<align>center</align>
-				<font>font24_title</font>
-				<label>$LOCALIZE[19055]</label>
-				<visible>IsEmpty(Listitem.Plot) + IsEmpty(Listitem.Tagline) + !ListItem.IsCollection + !ListItem.IsParentFolder</visible>
-			</control>
+			<include>View_502_FanArt</include>
 			<control type="group">
-				<left>1350</left>
-				<top>244</top>
-				<visible>ListItem.IsCollection</visible>
-				<include name="InfoList">
-					<param name="height" value="322" />
-					<param name="width" value="429" />
-					<param name="sortby" value="year" />
-					<param name="sortorder" value="descending" />
-					<param name="font" value="font12" />
-				</include>
+				<animation effect="fade" start="0" end="100" time="300" delay="300">WindowOpen</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<include>MediaFlags</include>
 			</control>
-			<control type="image">
-				<right>113</right>
-				<top>614</top>
-				<width>463</width>
-				<height>270</height>
-				<aspectratio aligny="top">scale</aspectratio>
-				<fadetime>300</fadetime>
-				<texture background="true" fallback="DefaultFolder.png">$VAR[ListInfoBoxImageVar]</texture>
+			<control type="group">
+				<include>OpenClose_Left</include>
+				<visible>Control.IsVisible(55)</visible>
+				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(addons) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos)</visible>
+				<include>Visible_Left</include>
+				<include>ListThumbInfoPanel</include>
 			</control>
 			<control type="group">
-				<visible>!ListItem.IsCollection</visible>
+				<include>OpenClose_Right</include>
+				<visible>[Control.IsVisible(50) | Control.Isvisible(54)] + !String.IsEmpty(ListItem.DBID)</visible>
+				<include>Visible_Right</include>
+				<visible>Container.Content(sets) | Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(musicvideos)</visible>
 				<control type="image">
-					<right>113</right>
-					<top>838</top>
-					<width>463</width>
-					<height>46</height>
-					<texture colordiffuse="B0FFFFFF">colors/black.png</texture>
-				</control>
-				<control type="grouplist">
-					<top>845</top>
 					<right>90</right>
-					<orientation>horizontal</orientation>
-					<width>470</width>
-					<include name="InfoFlag">
-						<param name="visible" value="!IsEmpty(ListItem.Year) + IsEmpty(ListItem.Premiered)" />
-						<param name="icon" value="lists/year.png" />
-						<param name="label" value="$INFO[ListItem.Year]" />
-					</include>
-					<include name="InfoFlag">
-						<param name="visible" value="!IsEmpty(ListItem.duration)" />
-						<param name="icon" value="frame/clock.png" />
-						<param name="label" value="$INFO[ListItem.Duration,, min]" />
-					</include>
-					<include name="InfoFlag">
-						<param name="visible" value="!IsEmpty(ListItem.Property(TotalEpisodes))" />
-						<param name="icon" value="lists/played-total.png" />
-						<param name="label" value="$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]" />
-					</include>
-					<include name="InfoFlag">
-						<param name="visible" value="!IsEmpty(ListItem.rating)" />
-						<param name="icon" value="lists/rating.png" />
-						<param name="label" value="$INFO[ListItem.Rating]" />
-					</include>
+					<top>162</top>
+					<width>509</width>
+					<height>746</height>
+					<texture border="22">dialogs/dialog-bg.png</texture>
 				</control>
-			</control>
-		</control>
-		<control type="group">
-			<top>180</top>
-			<left>106</left>
-			<visible>Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(actors) | Container.Content(directors)</visible>
-			<visible>!Control.IsVisible(502)</visible>
-			<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(55) | Window.IsActive(movieinformation)</visible>
-			<include>OpenClose_Left</include>
-			<include>Visible_Left</include>
-			<control type="image">
-				<top>-16</top>
-				<left>-16</left>
-				<width>506</width>
-				<height>741</height>
-				<texture>colors/black.png</texture>
-				<bordertexture border="20">overlays/shadow.png</bordertexture>
-				<bordersize>20</bordersize>
-				<animation effect="fade" start="100" end="0" time="100" delay="300" condition="Window.IsActive(movieinformation)" reversible="false">Conditional</animation>
-			</control>
-			<control type="image">
-				<left>4</left>
-				<top>4</top>
-				<width>466</width>
-				<height>701</height>
-				<fadetime>200</fadetime>
-				<aspectratio>scale</aspectratio>
-				<texture fallback="DefaultVideo.png" background="true">$VAR[PosterVar]</texture>
-			</control>
-			<control type="image">
-				<left>1</left>
-				<top>1</top>
-				<width>472</width>
-				<height>706</height>
-				<texture background="true" border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
-				<animation effect="fade" time="200">VisibleChange</animation>
-				<visible>Control.HasFocus(51) + !Window.IsActive(movieinformation)</visible>
-			</control>
-			<control type="group">
-				<left>415</left>
-				<top>10</top>
-				<include name="UserRatingCircle">
-					<param name="animation" value="True" />
-				</include>
-				<visible>[Control.IsVisible(51) | Control.IsVisible(50) | Control.IsVisible(55)]+ !Window.IsActive(movieinformation)</visible>
-				<animation effect="fade" start="0" end="100" time="200" delay="200">Visible</animation>
-				<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
-			</control>
-		</control>
-		<include>MediaMenuMouseOverlay</include>
-		<control type="group">
-			<include>MediaMenuCommon</include>
-			<control type="grouplist" id="9000">
-				<top>90</top>
-				<include name="MediaMenuListCommon">
-					<param name="viewtype_button_vis" value="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(artists) | Container.Content(albums) | Container.Content(mixed) | Container.Content(musicvideos) | Container.Content(addons)" />
-				</include>
-				<control type="button" id="10">
-					<description>Watched Toggle</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[20367]</label>
-					<label2>[B]$INFO[Container.NumItems][/B]</label2>
-					<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.content(seasons) | Container.Content(episodes)</visible>
+				<control type="label">
+					<right>130</right>
+					<top>194</top>
+					<width>429</width>
+					<height>338</height>
+					<font>font13_title</font>
+					<label>$INFO[ListItem.Label]</label>
+					<visible>Control.IsVisible(54) | ListItem.IsCollection</visible>
+				</control>
+				<control type="textbox">
+					<right>130</right>
+					<top>245</top>
+					<width>429</width>
+					<height>338</height>
+					<font>font12</font>
+					<visible>Control.IsVisible(54)</visible>
+					<label>$INFO[ListItem.Plot]</label>
+				</control>
+				<control type="textbox">
+					<right>130</right>
+					<top>194</top>
+					<width>429</width>
+					<height>398</height>
+					<font>font12</font>
+					<visible>!Control.IsVisible(54)</visible>
+					<label>$INFO[ListItem.Tagline,[B],[/B][CR]]$INFO[ListItem.Plot]</label>
 				</control>
-				<control type="label" id="203">
-					<include>MediaMenuLabelCommon</include>
-					<label>$LOCALIZE[31020]</label>
+				<control type="textbox">
+					<right>130</right>
+					<top>360</top>
+					<width>429</width>
+					<height>413</height>
+					<align>center</align>
+					<font>font24_title</font>
+					<label>$LOCALIZE[19055]</label>
+					<visible>String.IsEmpty(Listitem.Plot) + String.IsEmpty(Listitem.Tagline) + !ListItem.IsCollection + !ListItem.IsParentFolder</visible>
+				</control>
+				<control type="group">
+					<left>1350</left>
+					<top>244</top>
+					<visible>ListItem.IsCollection</visible>
+					<include name="InfoList">
+						<param name="height" value="322" />
+						<param name="width" value="429" />
+						<param name="sortby" value="year" />
+						<param name="sortorder" value="descending" />
+						<param name="font" value="font12" />
+					</include>
 				</control>
-				<control type="radiobutton" id="16">
-					<description>PartyMode</description>
-					<label>$LOCALIZE[589]</label>
-					<include>MediaMenuItemsCommon</include>
-					<visible>Container.Content(MusicVideos)</visible>
+				<control type="image">
+					<right>113</right>
+					<top>614</top>
+					<width>463</width>
+					<height>270</height>
+					<aspectratio aligny="top">scale</aspectratio>
+					<fadetime>300</fadetime>
+					<texture background="true" fallback="DefaultFolder.png">$VAR[ListInfoBoxImageVar]</texture>
 				</control>
-				<control type="radiobutton" id="11">
-					<description>Unlock Shares</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[20336]</label>
-					<onclick>xbmc.mastermode</onclick>
-					<selected>system.ismaster</selected>
-					<visible>system.haslocks</visible>
+				<control type="group">
+					<visible>!ListItem.IsCollection</visible>
+					<control type="image">
+						<right>113</right>
+						<top>838</top>
+						<width>463</width>
+						<height>46</height>
+						<texture colordiffuse="B0FFFFFF">colors/black.png</texture>
+					</control>
+					<control type="grouplist">
+						<top>845</top>
+						<right>140</right>
+						<orientation>horizontal</orientation>
+						<width>380</width>
+						<align>center</align>
+						<include name="InfoFlag">
+							<param name="visible" value="!String.IsEmpty(ListItem.duration)" />
+							<param name="icon" value="frame/clock.png" />
+							<param name="label" value="$INFO[ListItem.Duration,, $LOCALIZE[31132]]" />
+						</include>
+						<include name="InfoFlag">
+							<param name="visible" value="!String.IsEmpty(ListItem.Property(TotalEpisodes))" />
+							<param name="icon" value="lists/played-total.png" />
+							<param name="label" value="$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]" />
+						</include>
+						<include name="InfoFlag">
+							<param name="visible" value="!String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.Premiered)" />
+							<param name="icon" value="lists/year.png" />
+							<param name="label" value="$INFO[ListItem.Year]" />
+						</include>
+						<include name="InfoFlag">
+							<param name="visible" value="!String.IsEmpty(ListItem.Premiered) + String.IsEmpty(ListItem.Property(TotalEpisodes))" />
+							<param name="icon" value="lists/year.png" />
+							<param name="label" value="$INFO[ListItem.Premiered]" />
+						</include>
+					</control>
 				</control>
-				<control type="togglebutton" id="619">
-					<description>Update library</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[653]</label>
-					<onclick>UpdateLibrary(video)</onclick>
-					<altlabel>$LOCALIZE[13353]</altlabel>
-					<usealttexture>library.isscanningvideo</usealttexture>
+			</control>
+			<control type="group">
+				<top>180</top>
+				<left>106</left>
+				<visible>Container.Content(movies) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(sets) | Container.Content(actors) | Container.Content(directors)</visible>
+				<visible>!Control.IsVisible(502)</visible>
+				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(55)</visible>
+				<include>OpenClose_Left</include>
+				<include>Visible_Left</include>
+				<control type="image">
+					<top>-16</top>
+					<left>-16</left>
+					<width>506</width>
+					<height>741</height>
+					<texture>colors/black.png</texture>
+					<bordertexture border="20">overlays/shadow.png</bordertexture>
+					<bordersize>20</bordersize>
 				</control>
-				<control type="button" id="612">
-					<description>Go to playlist</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31056]</label>
-					<onclick>ActivateWindow(videoplaylist)</onclick>
-					<visible>IntegerGreaterThan(Playlist.Length(video),0)</visible>
+				<control type="image">
+					<left>4</left>
+					<top>4</top>
+					<width>466</width>
+					<height>701</height>
+					<fadetime>200</fadetime>
+					<aspectratio>scale</aspectratio>
+					<texture fallback="DefaultVideo.png" background="true">$VAR[PosterVar]</texture>
 				</control>
-				<control type="button" id="621">
-					<description>Get more</description>
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[21452]</label>
-					<onclick>ActivateWindow(addonbrowser,addons://more/video/,return)</onclick>
-					<visible>Container.Content(addons)</visible>
+				<control type="image">
+					<left>1</left>
+					<top>1</top>
+					<width>472</width>
+					<height>706</height>
+					<texture background="true" border="8" colordiffuse="button_focus">buttons/thumbnail_focused.png</texture>
+					<animation effect="fade" time="200">VisibleChange</animation>
+					<visible>Control.HasFocus(51)</visible>
 				</control>
-				<control type="button" id="622">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31117]</label>
-					<onclick condition="System.HasAddon(plugin.library.node.editor)">ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=video,return)</onclick>
-					<onclick condition="!System.HasAddon(plugin.library.node.editor)">InstallAddon(plugin.library.node.editor)</onclick>
-					<visible>Container.Content() + IsEmpty(Container.PluginName)</visible>
+				<control type="group">
+					<left>415</left>
+					<top>10</top>
+					<include name="UserRatingCircle">
+						<param name="animation" value="True" />
+					</include>
+					<visible>Control.IsVisible(51) | Control.IsVisible(50) | Control.IsVisible(55)</visible>
+					<animation effect="fade" start="0" end="100" time="200" delay="200">Visible</animation>
+					<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
 				</control>
-				<control type="button" id="623">
-					<include>MediaMenuItemsCommon</include>
-					<label>$LOCALIZE[31009]</label>
-					<onclick>InstallAddon(resource.images.studios.white)</onclick>
-					<visible>Container.Content(studios) + !System.HasAddon(resource.images.studios.white)</visible>
+			</control>
+			<include>MediaMenuMouseOverlay</include>
+			<control type="group">
+				<include>MediaMenuCommon</include>
+				<control type="grouplist" id="9000">
+					<top>90</top>
+					<include>MediaMenuListCommon</include>
+					<control type="button" id="10">
+						<description>Watched Toggle</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[20367]</label>
+						<label2>[B]$INFO[Container.NumItems][/B]</label2>
+						<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.content(seasons) | Container.Content(episodes)</visible>
+					</control>
+					<control type="label" id="203">
+						<include>MediaMenuLabelCommon</include>
+						<label>$LOCALIZE[31020]</label>
+					</control>
+					<control type="radiobutton" id="16">
+						<description>PartyMode</description>
+						<label>$LOCALIZE[589]</label>
+						<include>MediaMenuItemsCommon</include>
+						<visible>Container.Content(MusicVideos)</visible>
+					</control>
+					<control type="radiobutton" id="11">
+						<description>Unlock Shares</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[20336]</label>
+						<onclick>xbmc.mastermode</onclick>
+						<selected>system.ismaster</selected>
+						<visible>system.haslocks</visible>
+					</control>
+					<control type="togglebutton" id="619">
+						<description>Update library</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[653]</label>
+						<onclick>UpdateLibrary(video)</onclick>
+						<altlabel>$LOCALIZE[13353]</altlabel>
+						<usealttexture>library.isscanningvideo</usealttexture>
+					</control>
+					<control type="button" id="612">
+						<description>Go to playlist</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31056]</label>
+						<onclick>ActivateWindow(videoplaylist)</onclick>
+						<visible>IntegerGreaterThan(Playlist.Length(video),0)</visible>
+					</control>
+					<control type="button" id="621">
+						<description>Get more</description>
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[21452]</label>
+						<onclick>ActivateWindow(addonbrowser,addons://more/video/,return)</onclick>
+						<visible>Container.Content(addons)</visible>
+					</control>
+					<control type="button" id="622">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31117]</label>
+						<onclick condition="System.HasAddon(plugin.library.node.editor)">ActivateWindow(programs,plugin://plugin.library.node.editor/?ltype=video,return)</onclick>
+						<onclick condition="!System.HasAddon(plugin.library.node.editor)">InstallAddon(plugin.library.node.editor)</onclick>
+						<visible>Container.Content() + String.IsEmpty(Container.PluginName)</visible>
+					</control>
+					<control type="button" id="623">
+						<include>MediaMenuItemsCommon</include>
+						<label>$LOCALIZE[31009]</label>
+						<onclick>InstallAddon(resource.images.studios.white)</onclick>
+						<visible>Container.Content(studios) + !System.HasAddon(resource.images.studios.white)</visible>
+					</control>
+					<include>MediaMenuNowPlaying</include>
 				</control>
-				<include>MediaMenuNowPlaying</include>
 			</control>
+			<include name="TopBar">
+				<param name="breadcrumbs_label" value="$VAR[BreadcrumbsVideoVar]" />
+				<param name="breadcrumbs_icon" value="icons/settings/video.png" />
+			</include>
+			<include name="BottomBar">
+				<param name="info_visible" value="true" />
+			</include>
 		</control>
-		<include name="TopBar">
-			<param name="breadcrumbs_label" value="$VAR[BreadcrumbsVideoVar]" />
-			<param name="breadcrumbs_icon" value="icons/settings/video.png" />
-		</include>
-		<include>BottomBar</include>
 	</controls>
 </window>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/MyWeather.xml Changed

@@ -22,8 +22,8 @@
 				<depth>DepthBackground</depth>
 				<include>FullScreenDimensions</include>
 				<aspectratio>scale</aspectratio>
-				<animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation>
-				<animation effect="fade" start="100" end="75" time="0" condition="Player.HasMedia">Conditional</animation>
+				<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>
 				<texture fallback="special://skin/extras/backgrounds/SKINDEFAULT.jpg">$VAR[GlobalFanartVar]</texture>
 			</control>
@@ -32,11 +32,11 @@
 				<include>FullScreenDimensions</include>
 				<aspectratio>scale</aspectratio>
 				<fadetime>400</fadetime>
-				<animation effect="zoom" center="auto" end="102,102" time="0" condition="IntegerGreaterThan(System.StereoscopicMode,0)">conditional</animation>
+				<animation effect="zoom" center="auto" end="102,102" time="0" condition="Integer.IsGreater(System.StereoscopicMode,0)">conditional</animation>
 				<animation effect="fade" start="0" end="100" time="400">WindowOpen</animation>
 				<animation effect="fade" start="100" end="0" time="300">WindowClose</animation>
 				<animation effect="fade" time="400">VisibleChange</animation>
-				<imagepath background="true" colordiffuse="40FFFFFF">$VAR[WeatherFanartVar]</imagepath>
+				<imagepath background="true" colordiffuse="35FFFFFF">$VAR[WeatherFanartVar]</imagepath>
 				<visible>!Player.HasMedia</visible>
 			</control>
 		<control type="group">
@@ -81,7 +81,7 @@
 					<item id="4">
 						<label>$LOCALIZE[33035]</label>
 						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window(weather).Property(Map.IsFetched))</visible>
+						<visible>!String.IsEmpty(Window(weather).Property(Map.IsFetched))</visible>
 					</item>
 				</content>
 			</control>
@@ -522,27 +522,27 @@
 					<left>70</left>
 					<orientation>horizontal</orientation>
 					<include name="WeatherIcon">
-						<param name="label" value="$INFO[Window(weather).Property(Current.Wind)]" />
+						<param name="label" value="Window(weather).Property(Current.Wind)" />
 						<param name="texture" value="icons/weather/wind.png" />
 						<param name="header" value="$LOCALIZE[404]" />
 					</include>
 					<include name="WeatherIcon">
-						<param name="label" value="$INFO[Window(weather).Property(Current.Humidity)]" />
+						<param name="label" value="Window(weather).Property(Current.Humidity)" />
 						<param name="texture" value="icons/weather/humidity.png" />
 						<param name="header" value="$LOCALIZE[406]" />
 					</include>
 					<include name="WeatherIcon">
-						<param name="label" value="$INFO[Window(weather).Property(Current.Precipitation)]" />
+						<param name="label" value="Window(weather).Property(Current.Precipitation)" />
 						<param name="texture" value="icons/weather/rain.png" />
 						<param name="header" value="$LOCALIZE[33021]" />
 					</include>
 					<include name="WeatherIcon">
-						<param name="label" value="$INFO[Window(weather).Property(Today.Sunrise)]" />
+						<param name="label" value="Window(weather).Property(Today.Sunrise)" />
 						<param name="texture" value="icons/weather/sunrise.png" />
 						<param name="header" value="$LOCALIZE[405]" />
 					</include>
 					<include name="WeatherIcon">
-						<param name="label" value="$INFO[Window(weather).Property(Today.Sunset)]" />
+						<param name="label" value="Window(weather).Property(Today.Sunset)" />
 						<param name="texture" value="icons/weather/sunset.png" />
 						<param name="header" value="$LOCALIZE[403]" />
 					</include>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/PlayerControls.xml Changed

@@ -148,7 +148,7 @@
 				<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
 				<textureradioofffocus colordiffuse="button_focus">osd/fullscreen/buttons/pause.png</textureradioofffocus>
 				<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
-				<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
+				<texturefocus>-</texturefocus>
 				<width>125</width>
 				<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
 				<height>123</height>
@@ -170,7 +170,7 @@
 					<param name="texture" value="osd/fullscreen/buttons/next.png"/>
 				</include>
 				<onclick>PlayerControl(Next)</onclick>
-				<visible>!VideoPlayer.Content(livetv) + [IntegerGreaterThan(Playlist.Length(video),1) | IntegerGreaterThan(Playlist.Length(music),1)]</visible>
+				<visible>!VideoPlayer.Content(livetv) + [Integer.IsGreater(Playlist.Length(video),1) | Integer.IsGreater(Playlist.Length(music),1)]</visible>
 			</control>
 			<control type="group" id="699">
 				<width>125</width>
@@ -207,7 +207,7 @@
 				<textureradiooffnofocus>osd/fullscreen/buttons/random-off.png</textureradiooffnofocus>
 				<textureradioondisabled colordiffuse="disabled">osd/fullscreen/buttons/random-on.png</textureradioondisabled>
 				<textureradiooffdisabled colordiffuse="disabled">osd/fullscreen/buttons/random-off.png</textureradiooffdisabled>
-				<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
+				<texturefocus>-</texturefocus>
 				<width>125</width>
 				<height>123</height>
 				<radiowidth>74</radiowidth>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Settings.xml Changed

@@ -3,9 +3,156 @@
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<controls>
 		<include>DefaultBackground</include>
-		<include name="SettingsPanel">
-			<param name="content" value="SettingsItems" />
-		</include>
+		<control type="panel" id="9000">
+			<left>92</left>
+			<top>140</top>
+			<width>1850</width>
+			<height>819</height>
+			<onleft>9000</onleft>
+			<onright>9000</onright>
+			<onup>9000</onup>
+			<ondown>9000</ondown>
+			<include>OpenClose_Right</include>
+			<itemlayout height="270" width="440">
+				<control type="image">
+					<width>400</width>
+					<height>250</height>
+					<texture border="40">buttons/button-nofo.png</texture>
+				</control>
+				<control type="image">
+					<left>19</left>
+					<top>179</top>
+					<width>359</width>
+					<height>50</height>
+					<texture colordiffuse="border_alpha">colors/black.png</texture>
+				</control>
+				<control type="image">
+					<left>80</left>
+					<top>10</top>
+					<width>240</width>
+					<height>240</height>
+					<texture>$INFO[ListItem.Icon]</texture>
+					<align>center</align>
+				</control>
+				<control type="label">
+					<left>0</left>
+					<top>185</top>
+					<width>400</width>
+					<height>400</height>
+					<font>font12</font>
+					<label>$INFO[ListItem.Label]</label>
+					<align>center</align>
+				</control>
+			</itemlayout>
+			<focusedlayout height="270" width="440">
+				<control type="group">
+					<depth>DepthContentPopout</depth>
+					<animation type="Focus" reversible="false">
+						<effect type="zoom" center="auto" start="100" end="108" time="250" tween="sine" />
+					</animation>
+					<animation type="UnFocus" reversible="false">
+						<effect type="zoom" center="auto" start="108" end="100" time="250" tween="sine" />
+					</animation>
+					<control type="image">
+						<width>400</width>
+						<height>250</height>
+						<texture border="40">buttons/button-nofo.png</texture>
+					</control>
+					<control type="image">
+						<width>400</width>
+						<height>250</height>
+						<texture border="40">buttons/button-theme-fo.png</texture>
+						<animation effect="fade" start="100" end="0" time="0">Unfocus</animation>
+					</control>
+					<control type="image">
+						<left>19</left>
+						<top>179</top>
+						<width>359</width>
+						<height>50</height>
+						<texture colordiffuse="border_alpha">colors/black.png</texture>
+					</control>
+					<control type="image">
+						<left>80</left>
+						<top>10</top>
+						<width>240</width>
+						<height>240</height>
+						<texture>$INFO[ListItem.Icon]</texture>
+						<align>center</align>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>185</top>
+						<width>400</width>
+						<height>400</height>
+						<font>font12</font>
+						<label>$INFO[ListItem.Label]</label>
+						<align>center</align>
+					</control>
+				</control>
+			</focusedlayout>
+			<content>
+				<item>
+					<label>$LOCALIZE[20094]</label>
+					<onclick>ActivateWindow(1103)</onclick>
+					<icon>icons/settings/filemanager.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[480]</label>
+					<onclick>ActivateWindow(AppearanceSettings)</onclick>
+					<icon>icons/settings/appearance.png</icon>
+				</item>^
+				<item>
+					<label>$LOCALIZE[157]</label>
+					<onclick>ActivateWindow(VideosSettings)</onclick>
+					<icon>icons/settings/video.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[2]</label>
+					<onclick>ActivateWindow(MusicSettings)</onclick>
+					<icon>icons/settings/music.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[1]</label>
+					<onclick>ActivateWindow(PicturesSettings)</onclick>
+					<icon>icons/settings/pictures.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[8]</label>
+					<onclick>ActivateWindow(WeatherSettings)</onclick>
+					<icon>icons/settings/weather.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[14036]</label>
+					<onclick>ActivateWindow(ServiceSettings)</onclick>
+					<icon>icons/settings/network.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[13000]</label>
+					<onclick>ActivateWindow(SystemSettings)</onclick>
+					<icon>icons/settings/system.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[19020]</label>
+					<onclick>ActivateWindow(PVRSettings)</onclick>
+					<icon>icons/settings/livetv.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[13200]</label>
+					<onclick>ActivateWindow(Profiles)</onclick>
+					<icon>icons/settings/profiles.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[138]</label>
+					<onclick>ActivateWindow(systeminfo)</onclick>
+					<icon>icons/settings/sysinfo.png</icon>
+				</item>
+				<item>
+					<label>$LOCALIZE[20077]</label>
+					<onclick>ActivateWindow(SkinSettings)</onclick>
+					<icon>icons/settings/skin.png</icon>
+				</item>
+			</content>
+		</control>
 		<include name="TopBar">
 			<param name="breadcrumbs_label" value="$LOCALIZE[5]" />
 			<param name="breadcrumbs_icon" value="icons/settings/settings.png" />

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/SettingsCategory.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/SettingsProfile.xml Changed

@@ -109,7 +109,7 @@
 						<top>275</top>
 						<width>305</width>
 						<height>100</height>
-						<font>font12</font>
+						<font>font10</font>
 						<textcolor>grey</textcolor>
 						<align>center</align>
 						<aligny>top</aligny>
@@ -117,11 +117,11 @@
 					</control>
 					<control type="label">
 						<left>10</left>
-						<top>305</top>
+						<top>300</top>
 						<width>305</width>
 						<height>100</height>
 						<textcolor>grey</textcolor>
-						<font>font12</font>
+						<font>font10</font>
 						<align>center</align>
 						<aligny>top</aligny>
 						<label fallback="13170">$INFO[ListItem.Label2]</label>
@@ -159,17 +159,17 @@
 						<width>305</width>
 						<height>100</height>
 						<textcolor>grey</textcolor>
-						<font>font12</font>
+						<font>font10</font>
 						<align>center</align>
 						<aligny>top</aligny>
 						<label>$LOCALIZE[31029]:</label>
 					</control>
 					<control type="label">
 						<left>10</left>
-						<top>305</top>
+						<top>300</top>
 						<width>305</width>
 						<height>100</height>
-						<font>font12</font>
+						<font>font10</font>
 						<textcolor>grey</textcolor>
 						<align>center</align>
 						<aligny>top</aligny>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/SettingsSystemInfo.xml Changed

@@ -203,6 +203,7 @@
 					<width>auto</width>
 					<height>50</height>
 					<aligny>bottom</aligny>
+					<font>font12</font>
 					<textoffsety>10</textoffsety>
 					<label>$LOCALIZE[144]</label>
 					<shadowcolor>black</shadowcolor>
@@ -212,6 +213,7 @@
 					<height>50</height>
 					<aligny>bottom</aligny>
 					<textoffsety>10</textoffsety>
+					<font>font12</font>
 					<width>auto</width>
 					<textcolor>button_focus</textcolor>
 					<shadowcolor>black</shadowcolor>
@@ -220,7 +222,7 @@
 			<control type="grouplist">
 				<description>Build date</description>
 				<itemgap>10</itemgap>
-				<top>765</top>
+				<top>755</top>
 				<align>left</align>
 				<left>900</left>
 				<orientation>horizontal</orientation>
@@ -229,11 +231,13 @@
 					<width>auto</width>
 					<height>25</height>
 					<label>$LOCALIZE[174]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
 				</control>
 				<control type="label" id="53">
 					<description>Kodi Build Date</description>
 					<width>auto</width>
+					<font>font12</font>
 					<textcolor>button_focus</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/SkinSettings.xml Changed

@@ -6,189 +6,208 @@
 		<include>DefaultBackground</include>
 		<control type="group">
 			<left>110</left>
-			<top>0</top>
-			<control type="group">
-				<include>OpenClose_Left</include>
-				<control type="image">
-					<description>Menu Panel</description>
-					<left>-20</left>
-					<top>138</top>
-					<width>440</width>
-					<height>792</height>
-					<texture border="22">dialogs/dialog-bg.png</texture>
+			<include>OpenClose_Left</include>
+			<control type="image">
+				<description>Menu Panel</description>
+				<left>-20</left>
+				<top>138</top>
+				<width>440</width>
+				<height>792</height>
+				<texture border="22">dialogs/dialog-bg.png</texture>
+			</control>
+			<control type="list" id="9000">
+				<description>button area</description>
+				<left>0</left>
+				<top>160</top>
+				<width>400</width>
+				<height>700</height>
+				<onleft>10000</onleft>
+				<onright>10000</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<include name="DefaultSimpleListLayout">
+					<param name="align" value="center" />
+					<param name="width" value="400" />
+					<param name="height" value="120" />
+					<param name="list_id" value="9000" />
+				</include>
+				<content>
+					<item id="1">
+						<label>$LOCALIZE[128]</label>
+						<onclick>noop</onclick>
+					</item>
+					<item id="2">
+						<label>$LOCALIZE[31061]</label>
+						<onclick>noop</onclick>
+					</item>
+				</content>
+			</control>
+		</control>
+		<control type="group" id="10000">
+			<left>110</left>
+			<include>OpenClose_Right</include>
+			<control type="image">
+				<left>420</left>
+				<top>138</top>
+				<width>1300</width>
+				<height>792</height>
+				<texture border="22">dialogs/dialog-bg.png</texture>
+			</control>
+			<control type="image">
+				<left>442</left>
+				<top>802</top>
+				<width>1256</width>
+				<height>3</height>
+				<texture colordiffuse="button_focus" border="2">dialogs/separator.png</texture>
+			</control>
+			<include name="UpDownArrows">
+				<param name="container_id" value="600" />
+				<param name="posx" value="1045" />
+				<param name="up_posy" value="130" />
+				<param name="down_posy" value="910" />
+				<param name="visible" value="!System.HasModalDialog" />
+			</include>
+			<control type="grouplist" id="600">
+				<left>442</left>
+				<top>160</top>
+				<width>1256</width>
+				<height>610</height>
+				<onleft>9000</onleft>
+				<onright>60</onright>
+				<onup>600</onup>
+				<ondown>600</ondown>
+				<visible>Container(9000).HasFocus(1)</visible>
+				<control type="radiobutton" id="601">
+					<label>$LOCALIZE[31095]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(no_slide_animations)</selected>
+					<onclick>Skin.ToggleSetting(no_slide_animations)</onclick>
+				</control>
+				<control type="radiobutton" id="602">
+					<label>$LOCALIZE[20189]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.ToggleSetting(autoscroll)</onclick>
+					<selected>Skin.HasSetting(autoscroll)</selected>
+				</control>
+				<control type="radiobutton" id="603">
+					<label>$LOCALIZE[31093]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.ToggleSetting(show_weatherinfo)</onclick>
+					<selected>Skin.HasSetting(show_weatherinfo)</selected>
+				</control>
+				<control type="radiobutton" id="604">
+					<label>$LOCALIZE[31094]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.ToggleSetting(show_mediaflags)</onclick>
+					<selected>Skin.HasSetting(show_mediaflags)</selected>
+				</control>
+				<control type="radiobutton" id="605">
+					<label>$LOCALIZE[31002]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.ToggleSetting(no_fanart)</onclick>
+					<selected>!Skin.HasSetting(no_fanart)</selected>
+				</control>
+				<control type="button" id="608">
+					<label>$LOCALIZE[31131]</label>
+					<label2>$INFO[Skin.String(HomeFanart.name)]</label2>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick condition="System.HasAddon(script.image.resource.select)">RunScript(script.image.resource.select,property=HomeFanart&amp;type=resource.images.skinbackgrounds)</onclick>
+					<onclick condition="!System.HasAddon(script.image.resource.select)">InstallAddon(script.image.resource.select)</onclick>
+					<enable>!Skin.HasSetting(no_fanart)</enable>
+				</control>
+				<control type="radiobutton" id="606">
+					<label>$LOCALIZE[31108]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.ToggleSetting(use_custom_bg)</onclick>
+					<selected>Skin.HasSetting(use_custom_bg)</selected>
 				</control>
-				<control type="list" id="9000">
-					<description>button area</description>
-					<left>0</left>
-					<top>160</top>
-					<width>400</width>
-					<height>700</height>
-					<onleft>10000</onleft>
-					<onright>10000</onright>
-					<onup>9000</onup>
-					<ondown>9000</ondown>
-					<include name="DefaultSimpleListLayout">
-						<param name="align" value="center" />
-						<param name="width" value="400" />
-						<param name="height" value="120" />
-						<param name="list_id" value="9000" />
-					</include>
-					<content>
-						<item id="1">
-							<label>$LOCALIZE[128]</label>
-							<onclick>noop</onclick>
-						</item>
-						<item id="2">
-							<label>$LOCALIZE[31061]</label>
-							<onclick>noop</onclick>
-						</item>
-					</content>
+				<control type="button" id="607">
+					<label>$LOCALIZE[31109]</label>
+					<label2>$INFO[Skin.String(custom_background)]</label2>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<onclick>Skin.SetImage(custom_background)</onclick>
+					<enable>Skin.HasSetting(use_custom_bg)</enable>
 				</control>
 			</control>
-			<control type="group" id="10000">
-				<include>OpenClose_Right</include>
-				<control type="image">
-					<left>420</left>
-					<top>138</top>
-					<width>1300</width>
-					<height>792</height>
-					<texture border="22">dialogs/dialog-bg.png</texture>
+			<control type="grouplist" id="610">
+				<left>442</left>
+				<top>160</top>
+				<width>1256</width>
+				<height>610</height>
+				<onleft>9000</onleft>
+				<onright>60</onright>
+				<onup>610</onup>
+				<ondown>610</ondown>
+				<visible>Container(9000).HasFocus(2)</visible>
+				<control type="radiobutton" id="611">
+					<label>$LOCALIZE[342]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoMovieButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoMovieButton)</onclick>
 				</control>
-				<control type="image">
-					<left>442</left>
-					<top>802</top>
+				<control type="radiobutton" id="612">
+					<label>$LOCALIZE[20343]</label>
 					<width>1256</width>
-					<height>3</height>
-					<texture colordiffuse="button_focus" border="2">dialogs/separator.png</texture>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoTVShowButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoTVShowButton)</onclick>
 				</control>
-				<include name="UpDownArrows">
-					<param name="container_id" value="600" />
-					<param name="posx" value="1045" />
-					<param name="up_posy" value="130" />
-					<param name="down_posy" value="910" />
-					<param name="visible" value="!System.HasModalDialog" />
-				</include>
-				<control type="grouplist" id="600">
-					<left>442</left>
-					<top>160</top>
+				<control type="radiobutton" id="613">
+					<label>$LOCALIZE[2]</label>
 					<width>1256</width>
-					<height>610</height>
-					<onleft>9000</onleft>
-					<onright>60</onright>
-					<onup>600</onup>
-					<ondown>600</ondown>
-					<visible>Container(9000).HasFocus(1)</visible>
-					<control type="radiobutton" id="601">
-						<label>$LOCALIZE[31095]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(no_slide_animations)</selected>
-						<onclick>Skin.ToggleSetting(no_slide_animations)</onclick>
-					</control>
-					<control type="radiobutton" id="602">
-						<label>$LOCALIZE[20189]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.ToggleSetting(autoscroll)</onclick>
-						<selected>Skin.HasSetting(autoscroll)</selected>
-					</control>
-					<control type="radiobutton" id="603">
-						<label>$LOCALIZE[31093]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.ToggleSetting(show_weatherinfo)</onclick>
-						<selected>Skin.HasSetting(show_weatherinfo)</selected>
-					</control>
-					<control type="radiobutton" id="604">
-						<label>$LOCALIZE[31094]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.ToggleSetting(show_mediaflags)</onclick>
-						<selected>Skin.HasSetting(show_mediaflags)</selected>
-					</control>
-					<control type="radiobutton" id="605">
-						<label>$LOCALIZE[31002]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.ToggleSetting(no_fanart)</onclick>
-						<selected>Skin.HasSetting(no_fanart)</selected>
-					</control>
-					<control type="radiobutton" id="606">
-						<label>$LOCALIZE[31108]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.ToggleSetting(use_custom_bg)</onclick>
-						<selected>Skin.HasSetting(use_custom_bg)</selected>
-					</control>
-					<control type="button" id="607">
-						<label>$LOCALIZE[31109]</label>
-						<label2>$INFO[Skin.String(custom_background)]</label2>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<onclick>Skin.SetImage(custom_background)</onclick>
-						<enable>!Skin.HasSetting(use_custom_bg)</enable>
-					</control>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoMusicButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoMusicButton)</onclick>
 				</control>
-				<control type="grouplist" id="610">
-					<left>442</left>
-					<top>160</top>
+				<control type="radiobutton" id="614">
+					<label>$LOCALIZE[24001]</label>
 					<width>1256</width>
-					<height>610</height>
-					<onleft>9000</onleft>
-					<onright>60</onright>
-					<onup>610</onup>
-					<ondown>610</ondown>
-					<visible>Container(9000).HasFocus(2)</visible>
-					<control type="radiobutton" id="611">
-						<label>$LOCALIZE[342]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoMovieButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoMovieButton)</onclick>
-					</control>
-					<control type="radiobutton" id="612">
-						<label>$LOCALIZE[20343]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoTVShowButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoTVShowButton)</onclick>
-					</control>
-					<control type="radiobutton" id="613">
-						<label>$LOCALIZE[2]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoMusicButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoMusicButton)</onclick>
-					</control>
-					<control type="radiobutton" id="614">
-						<label>$LOCALIZE[24001]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoProgramsButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoProgramsButton)</onclick>
-					</control>
-					<control type="radiobutton" id="615">
-						<label>$LOCALIZE[1]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoPicturesButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoPicturesButton)</onclick>
-					</control>
-					<control type="radiobutton" id="616">
-						<label>$LOCALIZE[3]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoVideosButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoVideosButton)</onclick>
-					</control>
-					<control type="radiobutton" id="617">
-						<label>$LOCALIZE[8]</label>
-						<width>1256</width>
-						<include>DefaultSettingButton</include>
-						<selected>!Skin.HasSetting(HomeMenuNoWeatherButton)</selected>
-						<onclick>Skin.ToggleSetting(HomeMenuNoWeatherButton)</onclick>
-					</control>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoProgramsButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoProgramsButton)</onclick>
 				</control>
+				<control type="radiobutton" id="615">
+					<label>$LOCALIZE[1]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoPicturesButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoPicturesButton)</onclick>
+				</control>
+				<control type="radiobutton" id="616">
+					<label>$LOCALIZE[3]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoVideosButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoVideosButton)</onclick>
+				</control>
+				<control type="radiobutton" id="617">
+					<label>$LOCALIZE[8]</label>
+					<width>1256</width>
+					<include>DefaultSettingButton</include>
+					<selected>!Skin.HasSetting(HomeMenuNoWeatherButton)</selected>
+					<onclick>Skin.ToggleSetting(HomeMenuNoWeatherButton)</onclick>
+				</control>
+			</control>
+			<control type="textbox" id="6">
+				<description>description area</description>
+				<left>480</left>
+				<top>810</top>
+				<width>1150</width>
+				<height>83</height>
+				<font>font12</font>
+				<align>justify</align>
+				<textcolor>button_focus</textcolor>
+				<label>$VAR[SkinSettingsHelpTextVar]</label>
+				<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
 			</control>
 		</control>
 		<include name="TopBar">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/Variables.xml Changed

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 	<variable name="TVTimerRadioButtonTexture">
-		<value condition="!StringCompare(ListItem.Comment,$LOCALIZE[305])">buttons/radio-button-on.png</value>
+		<value condition="!String.IsEqual(ListItem.Comment,$LOCALIZE[305])">buttons/radio-button-on.png</value>
 		<value>buttons/radio-button-off.png</value>
 	</variable>
 	<variable name="PVRStatusImageVar">
@@ -26,6 +26,19 @@
 		<value condition="Window.IsActive(musicplaylist)">$INFO[ListItem.Duration]</value>
 		<value>$INFO[ListItem.Duration,, $LOCALIZE[12391]]</value>
 	</variable>
+	<variable name="AddonCountLabel">
+		<value condition="Integer.IsGreater(Container(8000).NumItems,10)">&gt;9</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,9)">9</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,8)">8</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,7)">7</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,6)">6</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,5)">5</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,4)">4</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,3)">3</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,2)">2</value>
+		<value condition="Integer.IsGreater(Container(8000).NumItems,1)">1</value>
+		<value>[COLOR grey]0[/COLOR]</value>
+	</variable>
 	<variable name="MusicInfoTextboxVar">
 		<value condition="Container.Content(songs)">$INFO[ListItem.ContributorAndRole,[B]$LOCALIZE[31128][/B][CR][COLOR=white],[/COLOR]]</value>
 		<value condition="Container.Content(albums)">$INFO[ListItem.Property(Album_Description),[B]$LOCALIZE[183][/B][CR][COLOR=white],[/COLOR]]</value>
@@ -38,7 +51,7 @@
 		<value condition="Player.HasAudio">$INFO[MusicPlayer.Artist]</value>
 	</variable>
 	<variable name="GlobalFanartVar">
-		<value condition="Skin.HasSetting(use_custom_bg) + !IsEmpty(Skin.String(custom_background))">$INFO[Skin.String(custom_background)]</value>
+		<value condition="Skin.HasSetting(use_custom_bg) + !String.IsEmpty(Skin.String(custom_background))">$INFO[Skin.String(custom_background)]</value>
 		<value>special://skin/extras/backgrounds/$INFO[Skin.CurrentTheme].jpg</value>
 	</variable>
 	<variable name="FullScreenInfoTextBoxVar">
@@ -52,31 +65,31 @@
 		<value>icons/now-playing/play.png</value>
 	</variable>
 	<variable name="NowPlayingPosterVar">
-		<value condition="!IsEmpty(Player.Art(poster))">$INFO[Player.Art(poster)]</value>
-		<value condition="!IsEmpty(Player.Art(tvshow.poster))">$INFO[Player.Art(tvshow.poster)]</value>
-		<value condition="IsEmpty(Player.Art(thumb)) + VideoPlayer.Content(livetv)">DefaultTVShowsSquare.png</value>
+		<value condition="!String.IsEmpty(Player.Art(poster))">$INFO[Player.Art(poster)]</value>
+		<value condition="!String.IsEmpty(Player.Art(tvshow.poster))">$INFO[Player.Art(tvshow.poster)]</value>
+		<value condition="String.IsEmpty(Player.Art(thumb)) + VideoPlayer.Content(livetv)">DefaultTVShowsSquare.png</value>
 		<value>$INFO[Player.Art(thumb)]</value>
 	</variable>
 	<variable name="ShiftThumbVar">
 		<value condition="ListItem.IsParentFolder">DefaultFolderBack.png</value>
-		<value condition="IsEmpty(Listitem.Thumb) + [Container.Content(albums) | Container.Content(artists)]">DefaultAudio.png</value>
-		<value condition="ListItem.IsFolder + IsEmpty(ListItem.Thumb)">DefaultFolder.png</value>
+		<value condition="String.IsEmpty(Listitem.Thumb) + [Container.Content(albums) | Container.Content(artists)]">DefaultAudio.png</value>
+		<value condition="ListItem.IsFolder + String.IsEmpty(ListItem.Thumb)">DefaultFolder.png</value>
 		<value>$INFO[ListItem.Thumb]</value>
 	</variable>
 	<variable name="IconWallThumbVar">
 		<value condition="Container.Content(studios)">$INFO[ListItem.Label,resource://resource.images.studios.white/,.png]</value>
-		<value condition="SubString(ListItem.Icon,Default,left)">$INFO[ListItem.Icon,icons/defaulticons/]</value>
+		<value condition="String.StartsWith(ListItem.Icon,Default)">$INFO[ListItem.Icon,icons/defaulticons/]</value>
 		<value>$INFO[ListItem.Thumb]</value>
 	</variable>
 	<variable name="ListLabel2Var">
-		<value condition="StringCompare(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Year]</value>
+		<value condition="String.IsEqual(Container.SortMethod,$LOCALIZE[556])">$INFO[ListItem.Year]</value>
 		<value>$INFO[ListItem.Label2]</value>
 	</variable>
 	<variable name="ShiftLeftTextBoxVar">
 		<value condition="Window.IsActive(pictures)">$INFO[ListItem.Property(description),,[CR]]$INFO[ListItem.PictureDatetime,[COLOR button_focus]$LOCALIZE[552]:  [/COLOR],[CR]]$INFO[ListItem.PictureResolution,[COLOR button_focus]$LOCALIZE[169]:  [/COLOR],[CR]]$INFO[ListItem.PictureCamMake,[COLOR button_focus]$LOCALIZE[31041]:  [/COLOR],[CR]]$INFO[ListItem.PictureCamModel,[COLOR button_focus]$LOCALIZE[21823]:  [/COLOR],[CR]]</value>
 		<value condition="Container.Content(artists)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:  [/COLOR],[CR]]$INFO[ListItem.Property(Artist_YearsActive),[COLOR button_focus]$LOCALIZE[21898]:  [/COLOR],[CR]]$INFO[ListItem.Property(Artist_Style),[COLOR button_focus]$LOCALIZE[736]:  [/COLOR],[CR]]</value>
 		<value condition="Container.Content(albums)">$INFO[ListItem.Year,[COLOR button_focus]$LOCALIZE[345]:  [/COLOR],[CR]]$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:  [/COLOR],[CR]]$INFO[ListItem.Property(album_label),[COLOR button_focus]$LOCALIZE[21899]:  [/COLOR],[CR]]$INFO[ListItem.Property(album_style),[COLOR button_focus]$LOCALIZE[736]:  [/COLOR],[CR]]</value>
-		<value condition="Stringcompare(Listitem.DBType,season) | Stringcompare(Listitem.DBType,tvshow)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:  [/COLOR],[CR]]$INFO[ListItem.Property(NumEpisodes),[COLOR button_focus]$LOCALIZE[20360]:  [/COLOR]]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[31064]: ,)]$INFO[ListItem.Premiered,[CR][COLOR button_focus]$LOCALIZE[20416]:  [/COLOR]]</value>
+		<value condition="String.IsEqual(Listitem.DBType,season) | String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:  [/COLOR],[CR]]$INFO[ListItem.Property(NumEpisodes),[COLOR button_focus]$LOCALIZE[20360]:  [/COLOR]]$INFO[ListItem.Property(UnWatchedEpisodes), ($LOCALIZE[31064]: ,)]$INFO[ListItem.Premiered,[CR][COLOR button_focus]$LOCALIZE[20416]:  [/COLOR]]</value>
 		<value>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]:  [/COLOR],[CR]]$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]:  [/COLOR],[CR]]$INFO[ListItem.Writer,[COLOR button_focus]$LOCALIZE[20417]:  [/COLOR],[CR]]$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]:  [/COLOR], $LOCALIZE[31060][CR]]$INFO[ListItem.Premiered,[COLOR button_focus]$LOCALIZE[20416]:  [/COLOR]]</value>
 	</variable>
 	<variable name="ShiftRightTextBoxVar">
@@ -91,11 +104,11 @@
 	</variable>
 	<variable name="BannerArtVar">
 		<value condition="ListItem.IsParentFolder">DefaultBackBanner.png</value>
-		<value condition="!IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="FanartImageVar">
-		<value condition="ListItem.IsParentFolder">DefaultBackFanart.png</value>
+		<value condition="ListItem.IsParentFolder">special://skin/extras/home-images/movie.jpg</value>
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="MusicInfoListHeaderVar">
@@ -117,7 +130,7 @@
 	</variable>
 	<variable name="TVShowWidgetImageVar">
 		<value condition="ListItem.IsParentFolder">DefaultBackFanart.png</value>
-		<value condition="!IsEmpty(ListItem.Art(landscape))">$INFO[ListItem.Art(landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(landscape))">$INFO[ListItem.Art(landscape)]</value>
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="ListInfoBoxImageVar">
@@ -127,35 +140,40 @@
 	</variable>
 	<variable name="AddonsLabel2Var">
 		<value condition="ListItem.Property(addon.downloading)">$INFO[ListItem.Property(addon.status)]</value>
-		<value condition="!Stringcompare(Container.SortMethod,$LOCALIZE[551])">$INFO[ListItem.Label2]</value>
+		<value condition="!String.IsEqual(Container.SortMethod,$LOCALIZE[551])">$INFO[ListItem.Label2]</value>
 		<value>$INFO[ListItem.AddonCreator,, - ]$INFO[ListItem.AddonVersion]</value>
 	</variable>
 	<variable name="AddonsListIconVar">
-
+
 		<value condition="ListItem.IsParentFolder">-</value>
-		<value condition="ListItem.Property(addon.downloading)">icons/infodialogs/install.png</value>
-		<value condition="ListItem.Property(addon.isinstalled) + !ListItem.Property(addon.isenabled) + Window.IsActive(addonbrowser)">icons/infodialogs/disable.png</value>
-		<value condition="ListItem.Property(addon.hasupdate)">icons/infodialogs/update.png</value>
+		<value condition="ListItem.Property(addon.downloading)">icons/addonstatus/install.png</value>
+		<value condition="ListItem.Property(addon.isinstalled) + !ListItem.Property(addon.isenabled) + Window.IsActive(addonbrowser)">icons/addonstatus/disable.png</value>
+		<value condition="ListItem.Property(addon.hasupdate)">icons/addonstatus/update.png</value>
 		<value condition="ListItem.Property(addon.isinstalled)">OverlayWatched.png</value>
 		<value>OverlayUnwatched.png</value>
 	</variable>
 	<variable name="AudioDSPIconVar">
-		<value condition="!IsEmpty(ADSP.MasterOverrideIcon)">$INFO[ADSP.MasterOverrideIcon]</value>
+		<value condition="!String.IsEmpty(ADSP.MasterOverrideIcon)">$INFO[ADSP.MasterOverrideIcon]</value>
 		<value condition="Player.HasVideo">$INFO[VideoPlayer.AudioCodec,flags/audiocodec/,.png]</value>
 		<value condition="Player.HasAudio">$INFO[MusicPlayer.Codec,flags/audiocodec/,.png]</value>
 	</variable>
+	<variable name="ResolutionFlagVar">
+		<value condition="ListItem.IsStereoscopic">flags/videoresolution/3D.png</value>
+		<value condition="Integer.IsGreater(ListItem.VideoResolution,1080)">flags/videoresolution/4K.png</value>
+		<value>$INFO[ListItem.VideoResolution,flags/videoresolution/,.png]</value>
+	</variable>
 	<variable name="BannerVar">
-		<value condition="!IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(banner))">$INFO[ListItem.Art(banner)]</value>
 		<value>$INFO[ListItem.Art(tvshow.banner)]</value>
 	</variable>
 	<variable name="PosterVar">
 		<value condition="ListItem.IsParentFolder">DefaultFolderBack.png</value>
-		<value condition="!IsEmpty(Container.Art(season.poster)) + Container.Content(episodes)">$INFO[Container.Art(season.poster)]</value>
-		<value condition="!IsEmpty(Container.Art(tvshow.poster)) + Container.Content(episodes)">$INFO[Container.Art(tvshow.poster)]</value>
-		<value condition="!IsEmpty(Container.Art(tvshow.poster)) + Container.Content(seasons) + Window.IsActive(movieinformation)">$INFO[Container.Art(tvshow.poster)]</value>
+		<value condition="!String.IsEmpty(Container.Art(season.poster)) + Container.Content(episodes)">$INFO[Container.Art(season.poster)]</value>
+		<value condition="!String.IsEmpty(Container.Art(tvshow.poster)) + Container.Content(episodes)">$INFO[Container.Art(tvshow.poster)]</value>
+		<value condition="!String.IsEmpty(Container.Art(tvshow.poster)) + Container.Content(seasons) + Window.IsActive(movieinformation)">$INFO[Container.Art(tvshow.poster)]</value>
 		<value condition="Container.Content(actors) | Container.Content(directors)">$INFO[Container.ListItem.Art(thumb)]</value>
-		<value condition="!IsEmpty(ListItem.Art(tvshow.poster)) + !Container.Content(seasons)">$INFO[ListItem.Art(tvshow.poster)]</value>
+		<value condition="!String.IsEmpty(ListItem.Art(tvshow.poster)) + !Container.Content(seasons)">$INFO[ListItem.Art(tvshow.poster)]</value>
 		<value>$INFO[ListItem.Art(poster)]</value>
 	</variable>
 	<variable name="ListPosterVar">
@@ -163,7 +181,7 @@
 		<value>$INFO[ListItem.Art(poster)]</value>
 	</variable>
 	<variable name="BannerLabel2Var">
-		<value condition="Stringcompare(Listitem.DBType,tvshow)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value>
+		<value condition="String.IsEqual(Listitem.DBType,tvshow)">$INFO[ListItem.Property(WatchedEpisodes)]$INFO[ListItem.Property(TotalEpisodes), / ,]</value>
 		
 	</variable>
@@ -176,7 +194,7 @@
 	</variable>
 	<variable name="SeekLabel">
 		<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking + !Player.DisplayAfterSeek">$LOCALIZE[112]</value>
-		<value condition="!IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[773][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
+		<value condition="!String.IsEmpty(Player.SeekStepSize) + ![player.forwarding | player.rewinding]">$LOCALIZE[773][COLOR=grey] $INFO[Player.SeekStepSize][/COLOR]</value>
 		<value condition="Player.DisplayAfterSeek + ![player.forwarding | player.rewinding]">$LOCALIZE[773][COLOR=grey] $INFO[Player.SeekOffset][/COLOR]</value>
 		<value condition="!Player.DisplayAfterSeek + Player.Seeking">$LOCALIZE[773]</value>
 		<value condition="Player.Forwarding">$LOCALIZE[31039] $VAR[VideoPlayerForwardRewindVar]</value>
@@ -187,11 +205,8 @@
 		<value>$INFO[Player.Time]$INFO[Player.Duration, / ]</value>
 	</variable>
 	<variable name="VideoOSDHelpTextVar">
-		<value condition="Control.HasFocus(87) + Player.Rewinding">$LOCALIZE[31050]</value>
-		<value condition="Control.HasFocus(87) + Player.Forwarding">$LOCALIZE[31051]</value>
+		<value condition="Control.HasFocus(87) + [Player.Rewinding | Player.Forwarding]">$LOCALIZE[31050]</value>
 		<value condition="Control.HasFocus(70011)">$LOCALIZE[20060]</value>
-		<value condition="Control.HasFocus(701)">$LOCALIZE[13396]</value>
-		<value condition="Control.HasFocus(702)">$LOCALIZE[13395]</value>
 		<value condition="Control.HasFocus(700)">$LOCALIZE[298]</value>
 		<value condition="Control.HasFocus(703)">$LOCALIZE[31106]</value>
 		<value condition="Control.HasFocus(704)">$LOCALIZE[24012]</value>
@@ -201,9 +216,7 @@
 		<value condition="Control.HasFocus(70043)">$LOCALIZE[5]</value>
 		<value condition="Control.HasFocus(255)">$LOCALIZE[36501]</value>
 		<value condition="Control.HasFocus(606)">$LOCALIZE[264]</value>
-		<value condition="ControlGroup(201).HasFocus + Player.SeekEnabled">$LOCALIZE[31049]</value>
-		<value condition="Player.SeekEnabled">$LOCALIZE[31054]</value>
-		<value condition="!Player.SeekEnabled">$LOCALIZE[36044]</value>
+		<value condition="ControlGroup(6000).HasFocus + Player.SeekEnabled">$LOCALIZE[31054]</value>
 	</variable>
 	<variable name="MusicOSDHelpTextVar">
 		<value condition="Control.HasFocus(620)">$LOCALIZE[31033]$INFO[MusicPlayer.UserRating, : ]</value>
@@ -212,78 +225,95 @@
 		<value condition="Control.HasFocus(703)">$LOCALIZE[24013]</value>
 		<value condition="Control.HasFocus(5000)">$LOCALIZE[10004]</value>
 	</variable>
+	<variable name="SkinSettingsHelpTextVar">
+		<value condition="Container(9000).HasFocus(1)">$LOCALIZE[31129]</value>
+		<value condition="Container(9000).HasFocus(2)">$LOCALIZE[31130]</value>
+	</variable>
 	<variable name="DSPManagerHelpTextVar">
 		<value condition="Control.HasFocus(20)">$INFO[Container(20).ListItem.Property(Description)]</value>
 		<value condition="Control.HasFocus(21)">$INFO[Container(21).ListItem.Property(Description)]</value>
 		<value>$INFO[Container(9000).ListItem.Label2]</value>
 	</variable>
 	<variable name="VolumeIconVar">
-		<value condition="IntegerGreaterThan(Control.GetLabel(20),66)">dialogs/volume/volume.png</value>
-		<value condition="IntegerGreaterThan(Control.GetLabel(20),33)">dialogs/volume/volume2.png</value>
+		<value condition="Integer.IsGreater(Control.GetLabel(20),66)">dialogs/volume/volume.png</value>
+		<value condition="Integer.IsGreater(Control.GetLabel(20),33)">dialogs/volume/volume2.png</value>
 		<value condition="player.passthrough">dialogs/volume/volume.png</value>
 		<value condition="Player.Muted">dialogs/volume/mute.png</value>
 		<value>dialogs/volume/volume1.png</value>
 	</variable>
-	<variable name="MediaInfoOverlayVar">
-		<value condition="ListItem.IsCollection">icons/lists/Set.png</value>
-		<value condition="ListItem.IsStereoscopic">icons/lists/3D.png</value>
-		<value>$INFO[ListItem.VideoResolution,icons/lists/,.png]</value>
-	</variable>
 	<variable name="ListSubLabelVar">
 		<value condition="ListItem.IsCollection">$INFO[Container(5000).NumItems]</value>
 		<value>$INFO[ListItem.Year]</value>
 	</variable>
 	<variable name="VideoInfoMainLabelVar">
-		<value condition="!IsEmpty(ListItem.Title)">$INFO[ListItem.Title]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]</value>
-		<value>$INFO[ListItem.Label]$INFO[ListItem.Year, ([COLOR button_focus],[/COLOR])]</value>
+		<value condition="!String.IsEmpty(ListItem.Title)">$INFO[ListItem.Title]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])]</value>
+		<value>$INFO[ListItem.Label]$INFO[ListItem.Year, ([COLOR grey],[/COLOR])]</value>
 	</variable>
 	<variable name="VideoInfoSubLabelVar">
-		<value condition="Container.Content(episodes)">$INFO[ListItem.Season,[COLOR button_focus]S,[/COLOR]]$INFO[ListItem.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[ListItem.TVShowTitle]</value>
+		<value condition="Stringcompare(ListItem.DBType,episode)">$INFO[ListItem.Season]$INFO[ListItem.Episode,[COLOR grey]x[/COLOR],: ]$INFO[ListItem.TVShowTitle]</value>
+		<value condition="Stringcompare(ListItem.DBType,movie)">$INFO[ListItem.Tagline]</value>
 		<value>$INFO[ListItem.Genre]</value>
 	</variable>
 	<variable name="OSDSubLabelVar">
 		<value condition="VideoPlayer.Content(episodes)">$INFO[VideoPlayer.Season,[COLOR button_focus]S,[/COLOR]]$INFO[VideoPlayer.Episode,[COLOR button_focus]E,: [/COLOR]]$INFO[VideoPlayer.TVShowTitle]</value>
 		<value>$INFO[VideoPlayer.Genre]</value>
 	</variable>
+	<variable name="AddonsFanartVar">
+		<value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value>
+		<value condition="$EXP[infodialog_active]">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="!String.IsEmpty(Container(500).ListItem.Art(fanart)) + Control.HasFocus(500)">$INFO[Container(500).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(501).ListItem.Art(fanart)) + Control.HasFocus(501)">$INFO[Container(501).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(502).ListItem.Art(fanart)) + Control.HasFocus(502)">$INFO[Container(502).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(503).ListItem.Art(fanart)) + Control.HasFocus(503)">$INFO[Container(503).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(504).ListItem.Art(fanart)) + Control.HasFocus(504)">$INFO[Container(504).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(505).ListItem.Art(fanart)) + Control.HasFocus(505)">$INFO[Container(505).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value>
+		<value>-</value>
+	</variable>
 	<variable name="HomeFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value>
-		<value condition="!IsEmpty(Container(5100).ListItem.Art(fanart)) + Control.HasFocus(5100)">$INFO[Container(5100).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(5200).ListItem.Art(fanart)) + Control.HasFocus(5200)">$INFO[Container(5200).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(5300).ListItem.Art(fanart)) + Control.HasFocus(5300)">$INFO[Container(5300).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(5400).ListItem.Art(fanart)) + Control.HasFocus(5400)">$INFO[Container(5400).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(6100).ListItem.Art(fanart)) + Control.HasFocus(6100)">$INFO[Container(6100).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(6200).ListItem.Art(fanart)) + Control.HasFocus(6200)">$INFO[Container(6200).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(6300).ListItem.Art(fanart)) + Control.HasFocus(6300)">$INFO[Container(6300).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(6400).ListItem.Art(fanart)) + Control.HasFocus(6400)">$INFO[Container(6400).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(7100).ListItem.Art(fanart)) + Control.HasFocus(7100)">$INFO[Container(7100).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(7200).ListItem.Art(fanart)) + Control.HasFocus(7200)">$INFO[Container(7200).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(7300).ListItem.Art(fanart)) + Control.HasFocus(7300)">$INFO[Container(7300).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(7400).ListItem.Art(fanart)) + Control.HasFocus(7400)">$INFO[Container(7400).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(8100).ListItem.Art(fanart)) + Control.HasFocus(8100)">$INFO[Container(8100).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(8200).ListItem.Art(fanart)) + Control.HasFocus(8200)">$INFO[Container(8200).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(8300).ListItem.Art(fanart)) + Control.HasFocus(8300)">$INFO[Container(8300).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(8400).ListItem.Art(fanart)) + Control.HasFocus(8400)">$INFO[Container(8400).ListItem.Art(fanart)]</value>
-		<value condition="!IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15100).ListItem.Property(FanartCode)]</value>
-		<value condition="!IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15200).ListItem.Property(FanartCode)]</value>
+		<value condition="$EXP[infodialog_active]">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="!String.IsEmpty(Container(5100).ListItem.Art(fanart)) + Control.HasFocus(5100)">$INFO[Container(5100).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(5200).ListItem.Art(fanart)) + Control.HasFocus(5200)">$INFO[Container(5200).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(5300).ListItem.Art(fanart)) + Control.HasFocus(5300)">$INFO[Container(5300).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(5400).ListItem.Art(fanart)) + Control.HasFocus(5400)">$INFO[Container(5400).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(6100).ListItem.Art(fanart)) + Control.HasFocus(6100)">$INFO[Container(6100).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(6200).ListItem.Art(fanart)) + Control.HasFocus(6200)">$INFO[Container(6200).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(6300).ListItem.Art(fanart)) + Control.HasFocus(6300)">$INFO[Container(6300).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(6400).ListItem.Art(fanart)) + Control.HasFocus(6400)">$INFO[Container(6400).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(7100).ListItem.Art(fanart)) + Control.HasFocus(7100)">$INFO[Container(7100).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(7200).ListItem.Art(fanart)) + Control.HasFocus(7200)">$INFO[Container(7200).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(7300).ListItem.Art(fanart)) + Control.HasFocus(7300)">$INFO[Container(7300).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(7400).ListItem.Art(fanart)) + Control.HasFocus(7400)">$INFO[Container(7400).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(8100).ListItem.Art(fanart)) + Control.HasFocus(8100)">$INFO[Container(8100).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(8200).ListItem.Art(fanart)) + Control.HasFocus(8200)">$INFO[Container(8200).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(8300).ListItem.Art(fanart)) + Control.HasFocus(8300)">$INFO[Container(8300).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(8400).ListItem.Art(fanart)) + Control.HasFocus(8400)">$INFO[Container(8400).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(8500).ListItem.Art(fanart)) + Control.HasFocus(8500)">$INFO[Container(8500).ListItem.Art(fanart)]</value>
+		<value condition="!String.IsEmpty(Container(15100).ListItem.Property(FanartCode)) + Control.HasFocus(15100)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15100).ListItem.Property(FanartCode)]</value>
+		<value condition="!String.IsEmpty(Container(15200).ListItem.Property(FanartCode)) + Control.HasFocus(15200)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Container(15200).ListItem.Property(FanartCode)]</value>
+		<value condition="!String.IsEmpty(Skin.String(HomeFanart.path))">$INFO[Skin.String(HomeFanart.path)]$INFO[Container(9000).ListItem.Property(id)]$INFO[Skin.String(HomeFanart.ext)]</value>
 		<value>-</value>
 	</variable>
 	<variable name="MediaFanartVar">
 		<value condition="Skin.HasSetting(no_fanart)">$VAR[GlobalFanartVar]</value>
-		<value condition="!IsEmpty(Container.Art(tvshow.fanart))">$INFO[Container.Art(tvshow.fanart)]</value>
-		<value condition="!IsEmpty(Container.Art(artist.fanart))">$INFO[Container.Art(artist.fanart)]</value>
-		<value condition="!IsEmpty(Container.Art(fanart))">$INFO[Container.Art(fanart)]</value>
+		<value condition="$EXP[infodialog_active]">$INFO[Window(home).Property(infobackground)]</value>
+		<value condition="Window.IsActive(pictures) + String.IsEmpty(ListItem.Art(fanart))">$INFO[ListItem.FolderPath]</value>
+		<value condition="!String.IsEmpty(Container.Art(tvshow.fanart))">$INFO[Container.Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.Art(artist.fanart))">$INFO[Container.Art(artist.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.Art(fanart))">$INFO[Container.Art(fanart)]</value>
 		<value>$INFO[ListItem.Art(fanart)]</value>
 	</variable>
 	<variable name="WeatherFanartVar">
-		<value condition="!IsEmpty(Window(weather).Property(current.fanartcode)) + Skin.HasSetting(WeatherFanart.multi)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(current.fanartcode)]</value>
+		<value condition="!String.IsEmpty(Window(weather).Property(current.fanartcode)) + Skin.HasSetting(WeatherFanart.multi)">$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(current.fanartcode)]</value>
 		<value>$INFO[Skin.String(WeatherFanart.path)]$INFO[Window(weather).Property(fanartcode)]$INFO[Skin.String(WeatherFanart.ext)]</value>
 	</variable>
 	<variable name="ListWatchedIconVar">
 		<value condition="ListItem.IsPlaying">overlays/watched/OverlayPlaying-List.png</value>
-		<value condition="ListItem.IsParentFolder">-</value>
-		<value condition="!IsEmpty(ListItem.Overlay)">$INFO[ListItem.Overlay]</value>
- -->		<value>OverlayUnwatched.png</value>
+		<value condition="ListItem.IsParentFolder">-</value>
+			<value condition="ListItem.IsResumable">overlays/watched/resume.png</value>
+		<value condition="!String.IsEmpty(ListItem.Overlay)">$INFO[ListItem.Overlay]</value>
+		<value>OverlayUnwatched.png</value>
 	</variable>
 	<variable name="SettingsSectionIcon">
 		<value condition="Window.IsActive(picturessettings)">icons/settings/pictures.png</value>
@@ -298,9 +328,9 @@
 	</variable>
 	
 	<variable name="BreadcrumbsVideoVar">
-		<value condition="Container.Content(movies) | Substring(container.folderpath,library://video/movies/,left) | Substring(container.folderpath,videodb://movies,left)">$LOCALIZE[20342]</value>
-		<value condition="Container.Content(musicvideos) | Substring(container.folderpath,library://video/musicvideos/,left) | Substring(container.folderpath,videodb://musicvideos,left)">$LOCALIZE[20389]</value>
-		<value condition="Container.Content(tvshows) | Substring(container.folderpath,library://video/tvshows/,left) | Substring(container.folderpath,videodb://tvshows,left)">$LOCALIZE[20343]</value>
+		<value condition="Container.Content(movies) | String.StartsWith(container.folderpath,library://video/movies/) | String.StartsWith(container.folderpath,videodb://movies)">$LOCALIZE[20342]</value>
+		<value condition="Container.Content(musicvideos) | String.StartsWith(container.folderpath,library://video/musicvideos/) | String.StartsWith(container.folderpath,videodb://musicvideos)">$LOCALIZE[20389]</value>
+		<value condition="Container.Content(tvshows) | String.StartsWith(container.folderpath,library://video/tvshows/) | String.StartsWith(container.folderpath,videodb://tvshows)">$LOCALIZE[20343]</value>
 		<value condition="Container.Content(seasons)">$LOCALIZE[20343]</value>
 		<value condition="Container.Content(episodes)">$LOCALIZE[20343]</value>
 		<value>$LOCALIZE[3]</value>
@@ -314,16 +344,11 @@
 		<value>FFFFFFFF</value>
 	</variable>
 	<variable name="BottomBarPageLabel">
-		<value condition="Control.HasFocus(60) | Control.HasFocus(5199) | Control.HasFocus(531) | Control.HasFocus(533)">[COLOR button_focus]$INFO[Container.CurrentPage,, / ]$INFO[Container.NumPages][/COLOR]</value>
+		<value condition="Control.HasFocus(600) | Control.HasFocus(50600) | Control.HasFocus(502600) | Control.HasFocus(5199) | Control.HasFocus(531) | Control.HasFocus(533)">[COLOR button_focus]$INFO[Container.CurrentPage,, / ]$INFO[Container.NumPages][/COLOR]</value>
 		<value>$INFO[Container.CurrentItem,, / ]$INFO[Container.NumItems]</value>
 	</variable>
-	<variable name="LibraryScanLabelVar">
-		<value condition="Window.IsActive(videos) + library.IsScanningVideo">$LOCALIZE[13353]</value>
-		<value condition="Window.IsActive(musiclibrary) + library.IsScanningMusic">$LOCALIZE[13353]</value>
-		<value>$LOCALIZE[653]</value>
-	</variable>
 	<variable name="PVRChannelMgrHeader">
-		<value condition="!IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value>
+		<value condition="!String.IsEmpty(Window.Property(IsRadio))">$LOCALIZE[19199] - $LOCALIZE[19024]</value>
 		<value>$LOCALIZE[19199] - $LOCALIZE[19023]</value>
 	</variable>
 	<variable name="FileManagerImageVar">

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/VideoOSD.xml Changed

@@ -16,264 +16,418 @@
 			<onclick>Action(close)</onclick>
 		</control>
 		<control type="group">
-			<top>900</top>
-			<visible>!Window.IsVisible(fullscreeninfo) + !Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(PVROSDChannels) + !Window.IsActive(PVROSDGuide)</visible>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(OSDAudioDSPSettings) | Window.IsVisible(VideoBookmarks)]</visible>
 			<animation effect="fade" end="100" time="200">WindowOpen</animation>
 			<animation effect="fade" time="200">VisibleChange</animation>
 			<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
-			<control type="image">
-				<left>10</left>
-				<top>-110</top>
-				<width>1900</width>
-				<height>270</height>
-				<texture border="40">buttons/dialogbutton-nofo.png</texture>
-			</control>
-			<control type="label">
-				<left>30</left>
-				<top>-90</top>
-				<align>right</align>
-				<textoffsetx>20</textoffsetx>
-				<aligny>center</aligny>
-				<width>1858</width>
-				<height>60</height>
-				<label>$VAR[VideoOSDHelpTextVar]</label>
-			</control>
-			<control type="label">
-				<left>30</left>
-				<top>-90</top>
-				<width>1858</width>
-				<height>60</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$VAR[SeekLabel]</label>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="grouplist" id="201">
-				<left>50</left>
-				<top>10</top>
-				<width>1920</width>
-				<height>135</height>
-				<align>left</align>
-				<itemgap>-20</itemgap>
-				<scrolltime tween="sine">200</scrolltime>
-				<orientation>horizontal</orientation>
-				<onup condition="Player.SeekEnabled">87</onup>
-				<ondown>close</ondown>
-				<onleft>70043</onleft>
-				<onright>70011</onright>
-				<control type="radiobutton" id="600">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/previous.png"/>
-					</include>
-					<onclick>PlayerControl(Previous)</onclick>
-					<visible>!VideoPlayer.Content(livetv)</visible>
-				</control>
-				<control type="radiobutton" id="602">
-					<textureradioonfocus colordiffuse="button_focus">osd/fullscreen/buttons/play.png</textureradioonfocus>
-					<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
-					<textureradioofffocus colordiffuse="button_focus">osd/fullscreen/buttons/pause.png</textureradioofffocus>
-					<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
-					<texturefocus colordiffuse="button_focus">osd/buttons/focus.png</texturefocus>
-					<width>125</width>
-					<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
-					<height>123</height>
-					<radiowidth>80</radiowidth>
-					<radioheight>80</radioheight>
-					<font>-</font>
-					<texturenofocus>-</texturenofocus>
-					<selected>Player.Paused</selected>
-					<onclick>PlayerControl(Play)</onclick>
-					<visible>Player.PauseEnabled</visible>
-				</control>
-				<control type="radiobutton" id="603">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/stop.png"/>
-					</include>
-					<onclick>PlayerControl(Stop)</onclick>
-				</control>
-				<control type="radiobutton" id="605">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/next.png"/>
-					</include>
-					<onclick>PlayerControl(Next)</onclick>
-					<visible>!VideoPlayer.Content(livetv) + IntegerGreaterThan(Playlist.Length(video),1)</visible>
-				</control>
-				<control type="radiobutton" id="606">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/record.png"/>
-					</include>
-					<selected>Player.Recording</selected>
-					<onclick>PlayerControl(Record)</onclick>
-					<enable>Player.CanRecord</enable>
-					<visible>VideoPlayer.Content(livetv)</visible>
-					<animation effect="fade" start="100" end="50" time="0" condition="!Player.CanRecord">Conditional</animation>
-				</control>
-			</control>
-			<control type="grouplist" id="202">
-				<left>50</left>
-				<top>10</top>
-				<width>1820</width>
-				<height>135</height>
-				<align>right</align>
-				<itemgap>-20</itemgap>
-				<scrolltime tween="sine">200</scrolltime>
-				<orientation>horizontal</orientation>
-				<onup condition="Player.SeekEnabled">87</onup>
-				<ondown>noop</ondown>
-				<onleft>606</onleft>
-				<onright>600</onright>
-				<control type="radiobutton" id="70011">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/information.png"/>
-					</include>
-					<onclick>ActivateWindow(fullscreeninfo)</onclick>
-				</control>
-				<control type="radiobutton" id="70040">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/channels.png"/>
-					</include>
-					<onclick>Dialog.Close(VideoOSD)</onclick>
-					<onclick>ActivateWindow(PVROSDChannels)</onclick>
-					<visible>VideoPlayer.Content(livetv)</visible>
-				</control>
-				<control type="radiobutton" id="70041">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/guide.png"/>
-					</include>
-					<onclick>Dialog.Close(VideoOSD)</onclick>
-					<onclick>ActivateWindow(PVROSDGuide)</onclick>
-					<visible>VideoPlayer.Content(livetv)</visible>
-				</control>
-				<control type="radiobutton" id="700">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/bookmarks.png"/>
-					</include>
-					<onclick>ActivateWindow(videobookmarks)</onclick>
-					<visible>!VideoPlayer.Content(livetv)</visible>
-				</control>
-				<control type="radiobutton" id="804">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/home.png"/>
-					</include>
-					<onclick>PlayerControl(ShowVideoMenu)</onclick>
-					<visible>VideoPlayer.HasMenu</visible>
-				</control>
-				<control type="radiobutton" id="703">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/teletext.png"/>
-					</include>
-					<onclick>Dialog.Close(VideoOSD)</onclick>
-					<onclick>ActivateWindow(Teletext)</onclick>
-					<visible>VideoPlayer.Content(livetv)</visible>
-				</control>
-				<control type="radiobutton" id="704">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/>
-					</include>
-					<onclick condition="VideoPlayer.HasSubtitles">showsubtitles</onclick>
-					<visible>VideoPlayer.HasSubtitles</visible>
-				</control>
-				<control type="radiobutton" id="255">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/stereoscopic.png"/>
-					</include>
-					<visible>VideoPlayer.IsStereoscopic</visible>
+			<control type="group">
+				<top>900</top>
+				<visible>!Window.IsVisible(fullscreeninfo) + !Window.IsActive(osdaudiosettings) + !Window.IsActive(osdvideosettings) + !Window.IsActive(PVROSDChannels) + !Window.IsActive(PVROSDGuide)</visible>
+				<animation effect="fade" end="100" time="200">WindowOpen</animation>
+				<animation effect="fade" time="200">VisibleChange</animation>
+				<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
+				<control type="image">
+					<left>10</left>
+					<top>-110</top>
+					<width>1900</width>
+					<height>270</height>
+					<texture border="40">buttons/dialogbutton-nofo.png</texture>
 				</control>
-				<control type="radiobutton" id="70043">
-					<include name="OSDButton">
-						<param name="texture" value="osd/fullscreen/buttons/settings.png"/>
-					</include>
-					<onclick>Close</onclick>
-					<onclick>ActivateWindow(1106)</onclick>
+				<control type="label">
+					<left>30</left>
+					<top>20</top>
+					<align>right</align>
+					<textoffsetx>20</textoffsetx>
+					<aligny>center</aligny>
+					<width>1858</width>
+					<height>60</height>
+					<label>$VAR[VideoOSDHelpTextVar]</label>
 				</control>
-			</control>
-			<control type="group">
-				<top>-20</top>
 				<control type="label">
 					<left>30</left>
-					<top>60</top>
+					<top>20</top>
 					<width>1858</width>
-					<height>75</height>
+					<height>60</height>
 					<align>center</align>
-					<aligny>bottom</aligny>
-					<label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
-					<font>font30</font>
+					<aligny>center</aligny>
+					<label>$VAR[SeekLabel]</label>
 					<shadowcolor>black</shadowcolor>
 				</control>
-				<control type="progress">
-					<animation effect="fade" end="0" time="200">WindowClose</animation>
-					<left>30</left>
-					<top>-10</top>
-					<width>1858</width>
-					<height>30</height>
-					<info>Player.ProgressCache</info>
-					<texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
-					<midtexture colordiffuse="button_focus">colors/white50.png</midtexture>
-					<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
+				<control type="grouplist" id="201">
+					<left>20</left>
+					<top>-90</top>
+					<width>1920</width>
+					<height>135</height>
+					<align>left</align>
+					<itemgap>-20</itemgap>
+					<scrolltime tween="sine">200</scrolltime>
+					<orientation>horizontal</orientation>
+					<ondown condition="Player.SeekEnabled">87</ondown>
+					<onup>noop</onup>
+					<onleft>70043</onleft>
+					<onright>70011</onright>
+					<control type="radiobutton" id="600">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/previous.png"/>
+						</include>
+						<onclick>PlayerControl(Previous)</onclick>
+						<visible>!VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="602">
+						<textureradioonfocus colordiffuse="button_focus">osd/fullscreen/buttons/play.png</textureradioonfocus>
+						<textureradioonnofocus>osd/fullscreen/buttons/play.png</textureradioonnofocus>
+						<textureradioofffocus colordiffuse="button_focus">osd/fullscreen/buttons/pause.png</textureradioofffocus>
+						<textureradiooffnofocus>osd/fullscreen/buttons/pause.png</textureradiooffnofocus>
+						<texturefocus>-</texturefocus>
+						<width>125</width>
+						<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
+						<height>123</height>
+						<radiowidth>80</radiowidth>
+						<radioheight>80</radioheight>
+						<font>-</font>
+						<texturenofocus>-</texturenofocus>
+						<selected>Player.Paused</selected>
+						<onclick>PlayerControl(Play)</onclick>
+						<visible>Player.PauseEnabled</visible>
+					</control>
+					<control type="radiobutton" id="603">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/stop.png"/>
+						</include>
+						<onclick>PlayerControl(Stop)</onclick>
+					</control>
+					<control type="radiobutton" id="605">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/next.png"/>
+						</include>
+						<onclick>PlayerControl(Next)</onclick>
+						<visible>!VideoPlayer.Content(livetv) + Integer.IsGreater(Playlist.Length(video),1)</visible>
+					</control>
+					<control type="radiobutton" id="804">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/home.png"/>
+						</include>
+						<onclick>PlayerControl(ShowVideoMenu)</onclick>
+						<visible>VideoPlayer.HasMenu</visible>
+					</control>
+					<control type="radiobutton" id="606">
+						<textureradioonfocus colordiffuse="button_focus">osd/fullscreen/buttons/record-white.png</textureradioonfocus>
+						<textureradioonnofocus>osd/fullscreen/buttons/record-white.png</textureradioonnofocus>
+						<textureradioofffocus colordiffuse="button_focus">osd/fullscreen/buttons/record.png</textureradioofffocus>
+						<textureradiooffnofocus>osd/fullscreen/buttons/record.png</textureradiooffnofocus>
+						<texturefocus>-</texturefocus>
+						<width>125</width>
+						<animation center="62,62" effect="zoom" end="100" reversible="false" start="95" time="480" tween="back">Focus</animation>
+						<height>123</height>
+						<radiowidth>74</radiowidth>
+						<radioheight>74</radioheight>
+						<font>-</font>
+						<texturenofocus>-</texturenofocus>
+						<radioposx>0</radioposx>
+						<radioposy>0</radioposy>
+						<selected>!Player.Recording | Control.HasFocus(606)</selected>
+						<onclick>PlayerControl(Record)</onclick>
+						<visible>Player.CanRecord</visible>
+						<visible>VideoPlayer.Content(livetv)</visible>
+					</control>
 				</control>
-				<control type="progress" id="23">
-					<animation effect="fade" end="0" time="200">WindowClose</animation>
-					<left>30</left>
-					<top>-10</top>
-					<width>1858</width>
-					<height>30</height>
-					<info>Player.Progress</info>
-					<texturebg border="3" colordiffuse="80FFFFFF">colors/white50.png</texturebg>
-					<midtexture colordiffuse="button_focus">colors/white50.png</midtexture>
+				<control type="grouplist" id="202">
+					<right>50</right>
+					<top>-90</top>
+					<width>1800</width>
+					<height>135</height>
+					<align>right</align>
+					<itemgap>-20</itemgap>
+					<scrolltime tween="sine">200</scrolltime>
+					<orientation>horizontal</orientation>
+					<ondown condition="Player.SeekEnabled">87</ondown>
+					<onup condition="Control.HasFocus(70043)">11000</onup>
+					<onup condition="Control.HasFocus(704)">12000</onup>
+					<onup condition="Control.HasFocus(255)">13000</onup>
+					<onleft>606</onleft>
+					<onright>600</onright>
+					<control type="radiobutton" id="70011">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/information.png"/>
+						</include>
+						<onclick>ActivateWindow(fullscreeninfo)</onclick>
+					</control>
+					<control type="radiobutton" id="70040">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/channels.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(PVROSDChannels)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="70041">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/guide.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(PVROSDGuide)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="700">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/bookmarks.png"/>
+						</include>
+						<onclick>ActivateWindow(videobookmarks)</onclick>
+						<visible>!VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="703">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/teletext.png"/>
+						</include>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(Teletext)</onclick>
+						<visible>VideoPlayer.Content(livetv)</visible>
+					</control>
+					<control type="radiobutton" id="704">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/settings-subtitle.png"/>
+						</include>
+					</control>
+					<control type="radiobutton" id="255">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/stereoscopic.png"/>
+						</include>
+						<visible>VideoPlayer.IsStereoscopic</visible>
+					</control>
+					<control type="radiobutton" id="70043">
+						<include name="OSDButton">
+							<param name="texture" value="osd/fullscreen/buttons/settings.png"/>
+						</include>
+						<onclick>SetFocus(11000)</onclick>
+					</control>
 				</control>
-				<control type="button" id="87">
-					<include>HiddenObject</include>
-					<onup condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onup>
-					<onup>201</onup>
-					<ondown condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</ondown>
-					<ondown>201</ondown>
-					<onright>PlayerControl(Forward)</onright>
-					<onleft>PlayerControl(Rewind)</onleft>
-					<visible>Player.SeekEnabled</visible>
-					<onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick>
+				<control type="group" id="6000">
+					<top>90</top>
+					<control type="label">
+						<left>30</left>
+						<top>-140</top>
+						<width>1858</width>
+						<height>75</height>
+						<align>center</align>
+						<aligny>bottom</aligny>
+						<label>$INFO[Player.Time]$INFO[Player.Duration, / ]</label>
+						<font>font30</font>
+						<shadowcolor>black</shadowcolor>
+					</control>
+					<control type="progress">
+						<animation effect="fade" end="0" time="200">WindowClose</animation>
+						<left>30</left>
+						<top>-10</top>
+						<width>1858</width>
+						<height>30</height>
+						<info>Player.ProgressCache</info>
+						<texturebg border="3" colordiffuse="00FFFFFF">colors/white50.png</texturebg>
+						<midtexture colordiffuse="button_focus">colors/white50.png</midtexture>
+						<animation effect="fade" start="100" end="80" time="0" condition="true">Conditional</animation>
+					</control>
+					<control type="progress" id="23">
+						<animation effect="fade" end="0" time="200">WindowClose</animation>
+						<left>30</left>
+						<top>-10</top>
+						<width>1858</width>
+						<height>30</height>
+						<info>Player.Progress</info>
+						<texturebg border="3" colordiffuse="80FFFFFF">colors/white50.png</texturebg>
+						<midtexture colordiffuse="button_focus">colors/white50.png</midtexture>
+					</control>
+					<control type="button" id="87">
+						<include>HiddenObject</include>
+						<onup>201</onup>
+						<onunfocus condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onunfocus>
+						<ondown>201</ondown>
+						<onright>PlayerControl(Forward)</onright>
+						<onleft>PlayerControl(Rewind)</onleft>
+						<visible>Player.SeekEnabled</visible>
+						<onclick condition="Player.Forwarding | Player.Rewinding">PlayerControl(Play)</onclick>
+					</control>
+					<control type="slider">
+						<left>30</left>
+						<top>-10</top>
+						<width>1858</width>
+						<height>30</height>
+						<onup>8010</onup>
+						<ondown>650</ondown>
+						<controloffsetx>75</controloffsetx>
+						<controloffsety>0</controloffsety>
+						<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+						<textureslidernib>osd/progress/nub_leftright.png</textureslidernib>
+						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+						<info>Player.Progress</info>
+						<action>seek</action>
+						<visible>!Control.HasFocus(87)</visible>
+					</control>
+					<control type="slider">
+						<left>30</left>
+						<top>-10</top>
+						<width>1858</width>
+						<height>30</height>
+						<onup>8010</onup>
+						<ondown>650</ondown>
+						<controloffsetx>75</controloffsetx>
+						<controloffsety>0</controloffsety>
+						<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_leftright.png</texturesliderbar>
+						<textureslidernib colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernib>
+						<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_leftright.png</textureslidernibfocus>
+						<info>Player.Progress</info>
+						<action>seek</action>
+						<visible>Control.HasFocus(87)</visible>
+					</control>
 				</control>
-				<control type="slider">
-					<left>30</left>
-					<top>-20</top>
-					<width>1858</width>
-					<height>50</height>
-					<onup>8010</onup>
-					<ondown>650</ondown>
-					<controloffsetx>75</controloffsetx>
-					<controloffsety>0</controloffsety>
-					<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-					<textureslidernib>osd/progress/nub_bar.png</textureslidernib>
-					<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
-					<info>Player.Progress</info>
-					<action>seek</action>
-					<visible>!Control.HasFocus(87)</visible>
+			</control>
+			<control type="group" id="11000">
+				<left>1400</left>
+				<top>520</top>
+				<visible>Control.hasFocus(70043) | ControlGroup(11000).HasFocus</visible>
+				<include>Visible_Right</include>
+				<control type="image">
+					<width>510</width>
+					<height>297</height>
+					<texture border="40">buttons/dialogbutton-nofo.png</texture>
 				</control>
-				
-				<control type="slider">
-					<left>30</left>
-					<top>-20</top>
-					<width>1858</width>
-					<height>50</height>
-					<onup>8010</onup>
-					<ondown>650</ondown>
-					<controloffsetx>75</controloffsetx>
-					<controloffsety>0</controloffsety>
-					<texturesliderbar colordiffuse="00FFFFFF">osd/progress/nub_bar.png</texturesliderbar>
-					<textureslidernib colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernib>
-					<textureslidernibfocus colordiffuse="button_focus">osd/progress/nub_bar.png</textureslidernibfocus>
-					<info>Player.Progress</info>
-					<action>seek</action>
-					<visible>Control.HasFocus(87)</visible>
+				<control type="grouplist" id="11100">
+					<left>20</left>
+					<top>20</top>
+					<width>470</width>
+					<height>260</height>
+					<itemgap>0</itemgap>
+					<onleft>70043</onleft>
+					<onright>70043</onright>
+					<onup>70043</onup>
+					<ondown>70043</ondown>
+					<orientation>vertical</orientation>
+					<control type="button" id="11101">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[13396]</label>
+						<onclick>ActivateWindow(osdaudiosettings)</onclick>
+					</control>
+					<control type="button" id="11102">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[13395]</label>
+						<onclick>ActivateWindow(osdvideosettings)</onclick>
+					</control>
+					<control type="button" id="11103">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[15020]</label>
+						<onclick>ActivateWindow(AudioDSPManager)</onclick>
+					</control>
+					<control type="button" id="11104">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[31112]</label>
+						<label2>[COLOR button_focus]$INFO[VideoPlayer.AudioLanguage][/COLOR]</label2>
+						<onclick>AudioNextLanguage</onclick>
+					</control>
+				</control>
+			</control>
+			<control type="group" id="12000">
+				<left>1400</left>
+				<top>520</top>
+				<visible>Control.HasFocus(704) | ControlGroup(12000).HasFocus</visible>
+				<include>Visible_Right</include>
+				<control type="image">
+					<width>510</width>
+					<height>297</height>
+					<texture border="40">buttons/dialogbutton-nofo.png</texture>
+				</control>
+				<control type="grouplist" id="12100">
+					<left>20</left>
+					<top>20</top>
+					<width>470</width>
+					<height>260</height>
+					<itemgap>0</itemgap>
+					<onleft>704</onleft>
+					<onright>704</onright>
+					<onup>704</onup>
+					<ondown>704</ondown>
+					<orientation>vertical</orientation>
+					<control type="button" id="12101">
+						<description>Download with Subtitles script</description>
+						<width>470</width>
+						<label>33003</label>
+						<include>DefaultSettingButton</include>
+						<onclick>Close</onclick>
+						<onclick>Dialog.Close(VideoOSD)</onclick>
+						<onclick>ActivateWindow(SubtitleSearch)</onclick>
+						<enable>!VideoPlayer.Content(LiveTV)</enable>
+					</control>
+					<control type="button" id="12102">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[22006]</label>
+						<onclick>SubtitleDelay</onclick>
+						<enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable>
+					</control>
+					<control type="button" id="12103">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[31051]</label>
+						<label2>[COLOR button_focus]$INFO[VideoPlayer.SubtitlesLanguage][/COLOR]</label2>
+						<onclick>CycleSubtitle</onclick>
+						<enable>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</enable>
+					</control>
+					<control type="radiobutton" id="12104">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[449]</label>
+						<radioposx>350</radioposx>
+						<onclick>ShowSubtitles</onclick>
+						<selected>VideoPlayer.SubtitlesEnabled + VideoPlayer.HasSubtitles</selected>
+						<enable>VideoPlayer.HasSubtitles</enable>
+					</control>
+				</control>
+			</control>
+			<control type="group" id="13000">
+				<left>1400</left>
+				<top>583</top>
+				<visible>Control.HasFocus(255) | ControlGroup(13000).HasFocus</visible>
+				<include>Visible_Right</include>
+				<control type="image">
+					<width>510</width>
+					<height>234</height>
+					<texture border="40">buttons/dialogbutton-nofo.png</texture>
+				</control>
+				<control type="grouplist" id="13100">
+					<left>20</left>
+					<top>20</top>
+					<width>470</width>
+					<height>260</height>
+					<itemgap>0</itemgap>
+					<onleft>255</onleft>
+					<onright>255</onright>
+					<onup>255</onup>
+					<ondown>255</ondown>
+					<orientation>vertical</orientation>
+					<control type="radiobutton" id="13101">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<radioposx>350</radioposx>
+						<label>$LOCALIZE[24022]</label>
+						<onclick>ToggleStereoMode</onclick>
+						<selected>Integer.IsGreater(System.StereoscopicMode,0)</selected>
+					</control>
+					<control type="button" id="13102">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<label>$LOCALIZE[31004]</label>
+						<label2>$INFO[VideoPlayer.StereoscopicMode]</label2>
+						<onclick>StereoMode</onclick>
+					</control>
+					<control type="radiobutton" id="13103">
+						<width>470</width>
+						<include>DefaultSettingButton</include>
+						<radioposx>350</radioposx>
+						<label>$LOCALIZE[31005]</label>
+						<onclick>StereoModeToMono</onclick>
+						<selected>Integer.IsEqual(System.StereoscopicMode,9)</selected>
+					</control>
 				</control>
 			</control>
 		</control>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_500_SmallThumb.xml Changed

@@ -18,7 +18,7 @@
 				<width>70</width>
 				<height>32</height>
 				<align>center</align>
-				<font>font_textbox</font>
+				<font>font10</font>
 				<selectedcolor>white</selectedcolor>
 				<label fallback="-">$INFO[$PARAM[infolabel]]</label>
 			</control>
@@ -189,8 +189,8 @@
 						<label>$VAR[SongTitleVar]</label>
 					</control>
 					<control type="group">
-						<visible>!IsEmpty(ListItem.label2)</visible>
-						<visible>!Stringcompare(Container.SortMethod,$LOCALIZE[38018]) + !Stringcompare(Container.SortMethod,$LOCALIZE[20359]) + !Stringcompare(Container.SortMethod,$LOCALIZE[551])</visible>
+						<visible>!String.IsEmpty(ListItem.label2)</visible>
+						<visible>!String.IsEqual(Container.SortMethod,$LOCALIZE[38018]) + !String.IsEqual(Container.SortMethod,$LOCALIZE[20359]) + !String.IsEqual(Container.SortMethod,$LOCALIZE[551])</visible>
 						<control type="image">
 							<left>11</left>
 							<top>19</top>
@@ -258,8 +258,8 @@
 							<label>$VAR[SongTitleVar]</label>
 						</control>
 						<control type="group">
-							<visible>!IsEmpty(ListItem.label2)</visible>
-							<visible>!Stringcompare(Container.SortMethod,$LOCALIZE[38018]) + !Stringcompare(Container.SortMethod,$LOCALIZE[20359]) + !Stringcompare(Container.SortMethod,$LOCALIZE[551])</visible>
+							<visible>!String.IsEmpty(ListItem.label2)</visible>
+							<visible>!String.IsEqual(Container.SortMethod,$LOCALIZE[38018]) + !String.IsEqual(Container.SortMethod,$LOCALIZE[20359]) + !String.IsEqual(Container.SortMethod,$LOCALIZE[551])</visible>
 							<control type="image">
 								<left>11</left>
 								<top>19</top>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_501_Banner.xml Changed

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_502_FanArt.xml Changed

@@ -1,272 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 	<include name="View_502_FanArt">
-		<include name="LeftRightArrows">
-			<param name="list_id" value="502" />
-			<param name="left_posx" value="45" />
-			<param name="right_posx" value="1849" />
-			<param name="posy" value="513" />
+		<include name="UpDownArrows">
+			<param name="container_id" value="502" />
+			<param name="visible" value="!System.HasModalDialog" />
 		</include>
 		<control type="group">
 			<description>Fanart Viewtype</description>
+			<left>90</left>
+			<top>167</top>
 			<control type="group">
 				<include>OpenClose_Right</include>
-				<left>100</left>
-				<top>167</top>
 				<visible>Control.IsVisible(502)</visible>
 				<include>Visible_Right</include>
 				<control type="image">
-					<left>-16</left>
-					<top>-10</top>
-					<width>1754</width>
-					<height>758</height>
+					<left>720</left>
+					<top>-4</top>
+					<width>1046</width>
+					<height>750</height>
 					<texture border="22">dialogs/dialog-bg.png</texture>
-					<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
 				</control>
-				<control type="fixedlist" id="502">
-					<left>11</left>
-					<top>5</top>
-					<width>1700</width>
-					<height>732</height>
-					<onleft>502</onleft>
-					<onright>502</onright>
-					<onup>9000</onup>
-					<ondown>9000</ondown>
-					<viewtype label="20445">bigicon</viewtype>
-					<preloaditems>2</preloaditems>
-					<pagecontrol>5021</pagecontrol>
-					<scrolltime tween="cubic">800</scrolltime>
-					<orientation>horizontal</orientation>
-					<visible>Container.Content(movies) | Container.Content(tvshows)</visible>
-					<itemlayout width="1700" height="690">
-						<control type="image">
-							<left>0</left>
-							<top>12</top>
-							<width>466</width>
-							<height>702</height>
-							<fadetime>200</fadetime>
-							<aspectratio>scale</aspectratio>
-							<texture fallback="DefaultVideo.png" colordiffuse="FF555555" background="true">$VAR[PosterVar]</texture>
-						</control>
-						<control type="image">
-							<left>475</left>
-							<top>12</top>
-							<width>1225</width>
-							<height>702</height>
-							<texture border="2" fallback="DefaultVideo.png" background="true">$VAR[FanartImageVar]</texture>
-							<aspectratio align="center">scale</aspectratio>
-						</control>
-						<control type="group">
-							<left>1650</left>
-							<top>20</top>
-							<include>UserRatingCircle</include>
-						</control>
-						<control type="image">
-							<left>475</left>
-							<top>634</top>
-							<width>1225</width>
-							<height>80</height>
-							<texture colordiffuse="button_focus">colors/white.png</texture>
-						</control>
-						<control type="image">
-							<left>501</left>
-							<top>650</top>
-							<width>48</width>
-							<height>48</height>
-							<texture>$VAR[ListWatchedIconVar]</texture>
-						</control>
-						<control type="label">
-							<left>565</left>
-							<top>662</top>
-							<width>1160</width>
-							<height>20</height>
-							<font>font24_title</font>
-							<aligny>center</aligny>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="image">
-							<right>226</right>
-							<top>656</top>
-							<width>32</width>
-							<height>32</height>
-							<texture>lists/played-total.png</texture>
-							<visible>Stringcompare(Listitem.dbtype,tvshow)</visible>
-						</control>
-						<control type="label">
-							<left>444</left>
-							<top>662</top>
-							<width>1160</width>
-							<height>20</height>
-							<font>font24_title</font>
-							<align>right</align>
-							<aligny>center</aligny>
-							<visible>Stringcompare(Listitem.dbtype,movie)</visible>
-							<label>$INFO[ListItem.Year]</label>
-						</control>
-						<control type="image">
-							<right>35</right>
-							<top>649</top>
-							<width>50</width>
-							<height>50</height>
-							<aspectratio>keep</aspectratio>
-							<animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation>
-							<texture>$VAR[MediaInfoOverlayVar]</texture>
-						</control>
-					</itemlayout>
-					<focusedlayout width="1700" height="690">
-						<control type="group">
-							<control type="image">
-								<left>0</left>
-								<top>12</top>
-								<width>466</width>
-								<height>702</height>
-								<fadetime>200</fadetime>
-								<aspectratio>scale</aspectratio>
-								<texture>colors/black.png</texture>
-							</control>
-							<control type="image">
-								<left>0</left>
-								<top>12</top>
-								<width>466</width>
-								<height>702</height>
-								<fadetime>200</fadetime>
-								<aspectratio>scale</aspectratio>
-								<animation effect="fade" start="100" end="35" time="200" condition="!Window.IsActive(movieinformation)">Conditional</animation>
-								<texture fallback="DefaultVideo.png" background="true">$VAR[PosterVar]</texture>
-							</control>
-							<control type="group">
-								<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-								<control type="image">
-									<left>475</left>
-									<top>12</top>
-									<width>1225</width>
-									<height>702</height>
-									<texture border="2" fallback="DefaultVideo.png" background="true">$VAR[FanartImageVar]</texture>
-									<aspectratio align="center">scale</aspectratio>
-								</control>
-								<control type="group">
-									<left>1650</left>
-									<top>20</top>
-									<include>UserRatingCircle</include>
-								</control>
-								<control type="image">
-									<left>475</left>
-									<top>634</top>
-									<width>1225</width>
-									<height>80</height>
-									<visible>!Control.HasFocus(502)</visible>
-									<animation effect="fade" time="200">VisibleChange</animation>
-									<texture colordiffuse="A0000000">colors/black.png</texture>
-								</control>
-								<control type="image">
-									<left>475</left>
-									<top>634</top>
-									<width>1225</width>
-									<height>80</height>
-									<visible>Control.HasFocus(502)</visible>
-									<animation effect="fade" start="0" end="80" time="0" condition="true">Conditional</animation>
-									<texture colordiffuse="button_focus">colors/white.png</texture>
-									<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
-								</control>
-								<control type="image">
-									<left>501</left>
-									<top>650</top>
-									<width>48</width>
-									<height>48</height>
-									<texture>$VAR[ListWatchedIconVar]</texture>
-								</control>
-								<control type="label">
-									<left>565</left>
-									<top>662</top>
-									<width>1160</width>
-									<height>20</height>
-									<font>font24_title</font>
-									<aligny>center</aligny>
-									<label>$INFO[ListItem.Label]</label>
-								</control>
-								<control type="label">
-									<left>444</left>
-									<top>662</top>
-									<width>1160</width>
-									<height>20</height>
-									<font>font24_title</font>
-									<align>right</align>
-									<aligny>center</aligny>
-									<visible>Stringcompare(Listitem.dbtype,movie)</visible>
-									<label>$INFO[ListItem.Year]</label>
-								</control>
-								<control type="image">
-									<right>35</right>
-									<top>649</top>
-									<width>50</width>
-									<height>50</height>
-									<aspectratio>keep</aspectratio>
-									<animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation>
-									<texture>$VAR[MediaInfoOverlayVar]</texture>
-								</control>
-							</control>
-						</control>
-					</focusedlayout>
+				<control type="image">
+					<left>747</left>
+					<top>24</top>
+					<width>992</width>
+					<height>558</height>
+					<fadetime>300</fadetime>
+					<texture border="2" fallback="DefaultVideo.png" background="true">$VAR[FanartImageVar]</texture>
+					<aspectratio align="center" aligny="bottom">keep</aspectratio>
+				</control>
+				<control type="group">
+					<left>1650</left>
+					<top>20</top>
+					<include>UserRatingCircle</include>
+				</control>
+				<control type="image">
+					<left>747</left>
+					<top>582</top>
+					<width>992</width>
+					<height>136</height>
+					<texture colordiffuse="A0000000">colors/black.png</texture>
+				</control>
+				<control type="textbox">
+					<left>757</left>
+					<top>589</top>
+					<width>972</width>
+					<height>121</height>
+					<font>font12</font>
+					<label>$INFO[ListItem.Plot]</label>
 				</control>
 			</control>
 			<control type="group">
-				<include>OpenClose_Right</include>
-				<left>100</left>
-				<top>167</top>
+				<include>OpenClose_Left</include>
+				<top>18</top>
 				<visible>Control.IsVisible(502)</visible>
-				<animation effect="fade" start="100" end="0" time="200" tween="sine" condition="Window.IsActive(movieinformation) | Window.IsActive(addoninformation)">Conditional</animation>
-				<animation type="Visible">
-					<effect type="fade" start="0" end="100" delay="400" time="300" />
-				</animation>
-				<control type="group">
-					<visible>!Container(502).OnNext + !Container(502).OnPrevious + !Container(502).Scrolling</visible>
-					<animation type="Visible">
-						<effect type="fade" start="0" end="100" delay="800" time="300" />
-					</animation>
-					<control type="image">
-						<left>30</left>
-						<top>664</top>
-						<width>32</width>
-						<height>32</height>
-						<texture>lists/rating.png</texture>
-						<visible>!IsEmpty(ListItem.RatingAndVotes)</visible>
-					</control>
-					<control type="label">
-						<left>76</left>
-						<top>661</top>
-						<width>230</width>
-						<height>32</height>
-						<font>font12</font>
-						<label>$INFO[ListItem.RatingAndVotes]</label>
-					</control>
-					<control type="image">
-						<right>135</right>
-						<top>663</top>
-						<width>32</width>
-						<height>32</height>
-						<texture>lists/played-total.png</texture>
-						<visible>Stringcompare(Listitem.dbtype,tvshow)</visible>
-					</control>
-					<control type="label">
-						<right>197</right>
-						<top>667</top>
-						<width>800</width>
-						<height>20</height>
-						<font>font24_title</font>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$VAR[BannerLabel2Var]</label>
-					</control>
-					<control type="textbox">
-						<left>30</left>
-						<top>35</top>
-						<width>420</width>
-						<height>598</height>
-						<font>font_textbox</font>
-						<autoscroll time="3000" delay="7000" repeat="5000">true</autoscroll>
-						<label>$INFO[ListItem.Tagline,[COLOR button_focus][B],[/B][/COLOR][CR]]$INFO[ListItem.Plot]</label>
-					</control>
-				</control>
+				<include>Visible_Left</include>
+				<include name="ListContainer">
+					<param name="list_id" value="502" />
+					<param name="viewtype_label" value="$LOCALIZE[20445]" />
+				</include>
 			</control>
 		</control>
 	</include>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_50_List.xml Changed

@@ -11,133 +11,141 @@
 			<top>182</top>
 			<visible>Control.IsVisible(50)</visible>
 			<include>Visible_Right</include>
-			<control type="image" id="5059">
-				<description>background image</description>
-				<left>-20</left>
-				<top>-20</top>
-				<width>754</width>
-				<height>746</height>
-				<texture border="22">dialogs/dialog-bg.png</texture>
-			</control>
-			<control type="list" id="50">
-				<left>2</left>
-				<top>3</top>
-				<width>710</width>
-				<height>700</height>
-				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<orientation>vertical</orientation>
-				<pagecontrol>60</pagecontrol>
-				<onleft>9000</onleft>
-				<onright>60</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
-				<viewtype label="535">list</viewtype>
-				<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)</visible>
-				<focusedlayout height="70" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>710</width>
-						<height>71</height>
-						<texture border="90,3,90,3">lists/separator.png</texture>
-						<visible>!Control.HasFocus(50)</visible>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>710</width>
-						<height>69</height>
-						<texture>lists/focus.png</texture>
-						<visible>Control.HasFocus(50)</visible>
-					</control>
-					<control type="label">
-						<left>70</left>
-						<top>0</top>
-						<height>70</height>
-						<width>560</width>
-						<aligny>center</aligny>
-						<scroll>true</scroll>
-						<label>$INFO[ListItem.Label]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="label">
-						<left>135</left>
-						<top>0</top>
-						<height>70</height>
-						<width>555</width>
-						<align>right</align>
-						<aligny>center</aligny>
-						<font>font12</font>
-						<label>$VAR[ListLabel2Var]</label>
-						<animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="image">
-						<left>21</left>
-						<top>20</top>
-						<width>32</width>
-						<height>32</height>
-						<texture>$VAR[ListWatchedIconVar]</texture>
-						<animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation>
-					</control>
-					<control type="image">
-						<left>21</left>
-						<top>20</top>
-						<width>32</width>
-						<height>32</height>
-						<texture colordiffuse="button_focus">$VAR[ListWatchedIconVar]</texture>
-						<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
-						<animation effect="fade" time="150">VisibleChange</animation>
-						<visible>!Control.HasFocus(50)</visible>
-					</control>
-				</focusedlayout>
-				<itemlayout height="70" condition="Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons)">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>710</width>
-						<height>71</height>
-						<texture border="90,3,90,3">lists/separator.png</texture>
-					</control>
-					<control type="label">
-						<left>70</left>
-						<top>0</top>
-						<height>70</height>
-						<width>560</width>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="label">
-						<left>135</left>
-						<top>0</top>
-						<height>70</height>
-						<width>555</width>
-						<align>right</align>
-						<aligny>center</aligny>
-						<font>font12</font>
-						<label>$VAR[ListLabel2Var]</label>
-						<textcolor>grey</textcolor>
-						<shadowcolor>text_shadow</shadowcolor>
-					</control>
-					<control type="image">
-						<left>21</left>
-						<top>20</top>
-						<width>32</width>
-						<height>32</height>
-						<texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture>
-					</control>
-				</itemlayout>
-			</control>
-			<control type="scrollbar" id="60">
-				<left>720</left>
-				<top>0</top>
-				<width>12</width>
-				<height>706</height>
-				<onleft>50</onleft>
-				<onright>50</onright>
-				<orientation>vertical</orientation>
-			</control>
+			<include name="ListContainer">
+				<param name="list_id" value="50" />
+				<param name="viewtype_label" value="$LOCALIZE[535]" />
+			</include>
+		</control>
+	</include>
+	<include name="ListContainer">
+		<control type="image">
+			<description>background image</description>
+			<left>-20</left>
+			<top>-20</top>
+			<width>754</width>
+			<height>746</height>
+			<texture border="22">dialogs/dialog-bg.png</texture>
+		</control>
+		<control type="list" id="$PARAM[list_id]">
+			<left>2</left>
+			<top>3</top>
+			<width>710</width>
+			<height>700</height>
+			<scrolltime tween="cubic" easing="out">500</scrolltime>
+			<orientation>vertical</orientation>
+			<pagecontrol>$PARAM[list_id]600</pagecontrol>
+			<onleft>9000</onleft>
+			<onright>$PARAM[list_id]600</onright>
+			<onup>$PARAM[list_id]</onup>
+			<ondown>$PARAM[list_id]</ondown>
+			<viewtype label="$PARAM[viewtype_label]">list</viewtype>
+			<visible>Container.Content(movies) | Container.Content(sets) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)</visible>
+			<focusedlayout height="63">
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>710</width>
+					<height>63</height>
+					<texture border="90,3,90,3">lists/separator.png</texture>
+					<visible>!Control.HasFocus($PARAM[list_id])</visible>
+				</control>
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>710</width>
+					<height>69</height>
+					<texture>lists/focus.png</texture>
+					<visible>Control.HasFocus($PARAM[list_id])</visible>
+				</control>
+				<control type="label">
+					<left>70</left>
+					<top>0</top>
+					<height>63</height>
+					<width>560</width>
+					<aligny>center</aligny>
+					<scroll>true</scroll>
+					<font>fontContextMenu</font>
+					<label>$INFO[ListItem.Label]</label>
+					<shadowcolor>text_shadow</shadowcolor>
+				</control>
+				<control type="label">
+					<left>135</left>
+					<top>0</top>
+					<height>63</height>
+					<width>555</width>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<label>$VAR[ListLabel2Var]</label>
+					<animation effect="fade" start="70" end="100" time="300" reversible="false">Focus</animation>
+					<shadowcolor>text_shadow</shadowcolor>
+				</control>
+				<control type="image">
+					<left>21</left>
+					<top>20</top>
+					<width>32</width>
+					<height>32</height>
+					<texture>$VAR[ListWatchedIconVar]</texture>
+					<animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation>
+				</control>
+				<control type="image">
+					<left>21</left>
+					<top>20</top>
+					<width>32</width>
+					<height>32</height>
+					<texture colordiffuse="button_focus">$VAR[ListWatchedIconVar]</texture>
+					<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
+					<animation effect="fade" time="150">VisibleChange</animation>
+					<visible>!Control.HasFocus($PARAM[list_id])</visible>
+				</control>
+			</focusedlayout>
+			<itemlayout height="63">
+				<control type="image">
+					<left>0</left>
+					<top>0</top>
+					<width>710</width>
+					<height>63</height>
+					<texture border="90,3,90,3">lists/separator.png</texture>
+				</control>
+				<control type="label">
+					<left>70</left>
+					<top>0</top>
+					<height>63</height>
+					<width>560</width>
+					<aligny>center</aligny>
+					<font>fontContextMenu</font>
+					<label>$INFO[ListItem.Label]</label>
+					<shadowcolor>text_shadow</shadowcolor>
+				</control>
+				<control type="label">
+					<left>135</left>
+					<top>0</top>
+					<height>63</height>
+					<width>555</width>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font12</font>
+					<label>$VAR[ListLabel2Var]</label>
+					<textcolor>grey</textcolor>
+					<shadowcolor>text_shadow</shadowcolor>
+				</control>
+				<control type="image">
+					<left>21</left>
+					<top>20</top>
+					<width>32</width>
+					<height>32</height>
+					<texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture>
+				</control>
+			</itemlayout>
+		</control>
+		<control type="scrollbar" id="$PARAM[list_id]600">
+			<left>720</left>
+			<top>0</top>
+			<width>12</width>
+			<height>706</height>
+			<onleft>$PARAM[list_id]</onleft>
+			<onright>$PARAM[list_id]</onright>
+			<orientation>vertical</orientation>
 		</control>
 	</include>
 	<include name="ListThumbInfoPanel">
@@ -164,11 +172,9 @@
 			<left>520</left>
 			<top>200</top>
 			<include>UserRatingCircle</include>
-			<visible>!Window.IsActive(musicinformation) + !Window.IsActive(songinformation)</visible>
 		</control>
 		<control type="group">
-			<visible>!Window.IsActive(addoninformation)</visible>
-			<animation effect="fade" time="200">VisibleChange</animation>
+			<animation effect="fade" start="100" end="0" time="0" condition="Control.IsVisible(500) + Container.Content(addons)">Conditional</animation>
 			<control type="image">
 				<left>90</left>
 				<top>650</top>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_51_Poster.xml Changed

@@ -120,25 +120,16 @@
 					<shadowcolor>text_shadow</shadowcolor>
 				</control>
 				<control type="label">
-					<right>200</right>
+					<right>130</right>
 					<top>400</top>
 					<width>1160</width>
 					<height>40</height>
 					<label>$VAR[ListSubLabelVar]</label>
-					<animation effect="slide" start="0,0" end="70,0" time="0" condition="Stringcompare(ListItem.DBType,tvshow) | Stringcompare(ListItem.DBType,season)">Conditional</animation>
 					<font>font30_title</font>
 					<textcolor>button_focus</textcolor>
 					<shadowcolor>text_shadow</shadowcolor>
 					<align>right</align>
 				</control>
-				<control type="image">
-					<right>130</right>
-					<top>410</top>
-					<width>48</width>
-					<height>48</height>
-					<aspectratio>keep</aspectratio>
-					<texture>$VAR[MediaInfoOverlayVar]</texture>
-				</control>
 				<control type="grouplist">
 					<orientation>vertical</orientation>
 					<left>645</left>
@@ -150,7 +141,7 @@
 						<height>38</height>
 						<label>$INFO[ListItem.Duration,[COLOR button_focus]$LOCALIZE[180]: [/COLOR], $LOCALIZE[31060]]</label>
 						<shadowcolor>text_shadow</shadowcolor>
-						<visible>!IsEmpty(ListItem.Duration)</visible>
+						<visible>!String.IsEmpty(ListItem.Duration)</visible>
 					</control>
 					<control type="label">>
 						<font>font12</font>
@@ -158,7 +149,7 @@
 						<height>38</height>
 						<label>$INFO[ListItem.Director,[COLOR button_focus]$LOCALIZE[20339]: [/COLOR]]</label>
 						<shadowcolor>text_shadow</shadowcolor>
-						<visible>!IsEmpty(ListItem.Director)</visible>
+						<visible>!String.IsEmpty(ListItem.Director)</visible>
 					</control>
 					<control type="label">
 						<font>font12</font>
@@ -166,7 +157,7 @@
 						<height>38</height>
 						<label>$INFO[ListItem.Genre,[COLOR button_focus]$LOCALIZE[515]: [/COLOR]]</label>
 						<shadowcolor>text_shadow</shadowcolor>
-						<visible>[IsEmpty(ListItem.Director) | IsEmpty(ListItem.Duration)] + !IsEmpty(ListItem.Genre)</visible>
+						<visible>[String.IsEmpty(ListItem.Director) | String.IsEmpty(ListItem.Duration)] + !String.IsEmpty(ListItem.Genre)</visible>
 					</control>
 					<control type="label">>
 						<font>font12</font>
@@ -174,7 +165,7 @@
 						<height>38</height>
 						<label>$INFO[ListItem.Season,[COLOR button_focus]$LOCALIZE[33054]: [/COLOR],]$INFO[ListItem.Episode,  •  [COLOR button_focus] $LOCALIZE[20360]: [/COLOR],]</label>
 						<shadowcolor>text_shadow</shadowcolor>
-						<visible>!IsEmpty(ListItem.Season)</visible>
+						<visible>!String.IsEmpty(ListItem.Season)</visible>
 					</control>
 					<control type="textbox">
 						<width>1150</width>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_52_IconWall.xml Changed

@@ -20,9 +20,9 @@
 				<onup>52</onup>
 				<ondown>52</ondown>
 				<scrolltime tween="cubic" easing="out">500</scrolltime>
-				<visible>Container.Content() | Container.Content(tags) | Container.Content(years) | Container.Content(genres) | Container.Content(countries) | Container.Content(studios) | Container.Content(playlists)</visible>
+				<visible>Container.Content() | Container.Content(tags) | Container.Content(years) | Container.Content(genres) | Container.Content(countries) | Container.Content(studios) | Container.Content(playlists) | Container.Content(unknown)</visible>
 				<viewtype label="31099">icon</viewtype>
-				<itemlayout height="248" width="440" condition="Container.Content() | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]">
+				<itemlayout height="248" width="440" condition="Container.Content() | Container.Content(unknown) | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]">
 					<control type="group">
 						<top>2</top>
 						<control type="image">
@@ -53,7 +53,7 @@
 							<height>50</height>
 							<aspectratio>keep</aspectratio>
 							<texture>$INFO[ListItem.Overlay]</texture>
-							<visible>!SubString(ListItem.Overlay,watched.png,right)</visible>
+							<visible>!String.EndsWith(ListItem.Overlay,watched.png)</visible>
 						</control>
 						<control type="textbox">
 							<left>25</left>
@@ -67,7 +67,7 @@
 						</control>
 					</control>
 				</itemlayout>
-				<focusedlayout height="248" width="440" condition="Container.Content() | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]">
+				<focusedlayout height="248" width="440" condition="Container.Content() | Container.Content(unknown) | Container.Content(tags) | Container.Content(files) | Container.Content(playlists) | [Container.Content(studios) + System.HasAddon(resource.images.studios.white)]">
 					<control type="group">
 						<depth>DepthContentPopout</depth>
 						<animation type="Focus" reversible="false">
@@ -104,7 +104,7 @@
 							<height>50</height>
 							<aspectratio>keep</aspectratio>
 							<texture>$INFO[ListItem.Overlay]</texture>
-							<visible>!SubString(ListItem.Overlay,watched.png,right)</visible>
+							<visible>!String.EndsWith(ListItem.Overlay,watched.png)</visible>
 						</control>
 						<control type="image">
 							<left>19</left>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_53_Shift.xml Changed

@@ -32,17 +32,13 @@
 					<visible>Control.HasFocus(53)</visible>
 					<animation effect="fade" time="200">VisibleChange</animation>
 					<texture colordiffuse="button_focus">colors/white.png</texture>
-					<animation effect="slide" start="0,0" end="-344,0" time="300" tween="sine" easing="inout" condition="Stringcompare(Container.Position,1) | Stringcompare(Container.Position,0)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="-344,0" time="300" tween="sine" easing="inout" condition="Stringcompare(Container.Position,0)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="344,0" time="300" tween="sine" easing="inout" condition="Stringcompare(Container.Position,3) | Stringcompare(Container.Position,4)">Conditional</animation>
-					<animation effect="slide" start="0,0" end="344,0" time="300" tween="sine" easing="inout" condition="Stringcompare(Container.Position,4)">Conditional</animation>
-				</control>
+					<animation effect="slide" start="0,0" end="-344,0" time="300" tween="sine" easing="inout" condition="Integer.IsEqual(Container.Position,1) | Integer.IsEqual(Container.Position,0)">Conditional</animation>
+					<animation effect="slide" start="0,0" end="-344,0" time="300" tween="sine" easing="inout" condition="Integer.IsEqual(Container.Position,0)">Conditional</animation>
+					<animation effect="slide" start="0,0" end="344,0" time="300" tween="sine" easing="inout" condition="Integer.IsEqual(Container.Position,3) | Integer.IsEqual(Container.Position,4)">Conditional</animation>
+					<animation effect="slide" start="0,0" end="344,0" time="300" tween="sine" easing="inout" condition="Integer.IsEqual(Container.Position,4)">Conditional</animation>
+				</control>
 				<control type="fixedlist" id="53">
-					<left>110</left>
+					<left>110</left>
 					<top>0</top>
 					<width>1700</width>
 					<height>600</height>
@@ -137,8 +133,8 @@
 	</include>
 	<include name="ShiftTextbox">
 		<control type="group">
-			<animation effect="fade" time="200" start="0" end="100" condition="!IsEmpty(Control.GetLabel($PARAM[textbox_id]))">Conditional</animation>
-			<animation effect="fade" time="200" start="100" end="0" condition="IsEmpty(Control.GetLabel($PARAM[textbox_id]))">Conditional</animation>
+			<animation effect="fade" time="200" start="0" end="100" condition="!String.IsEmpty(Control.GetLabel($PARAM[textbox_id]))">Conditional</animation>
+			<animation effect="fade" time="200" start="100" end="0" condition="String.IsEmpty(Control.GetLabel($PARAM[textbox_id]))">Conditional</animation>
 			<control type="image">
 				<top>-20</top>
 				<left>90</left>

_service:download_url:master.tar.gz/addons/skin.estuary/1080i/View_55_WideList.xml Changed

@@ -33,12 +33,12 @@
 				<ondown>55</ondown>
 				<viewtype label="$LOCALIZE[31107]">list</viewtype>
 				<visible>Container.Content(artists) | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed) | Container.Content(musicvideos)</visible>
-				<focusedlayout height="70" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed)">
+				<focusedlayout height="63" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed)">
 					<control type="image">
 						<left>0</left>
 						<top>0</top>
 						<width>1096</width>
-						<height>71</height>
+						<height>63</height>
 						<texture border="90,3,90,3">lists/separator.png</texture>
 						<visible>!Control.HasFocus(55)</visible>
 					</control>
@@ -46,14 +46,14 @@
 						<left>0</left>
 						<top>0</top>
 						<width>1396</width>
-						<height>69</height>
+						<height>63</height>
 						<texture>lists/focus.png</texture>
 						<visible>Control.HasFocus(55)</visible>
 					</control>
 					<control type="label">
 						<left>13</left>
 						<top>2</top>
-						<height>70</height>
+						<height>63</height>
 						<width>70</width>
 						<aligny>center</aligny>
 						<font>font12</font>
@@ -64,9 +64,10 @@
 					<control type="label">
 						<left>95</left>
 						<top>0</top>
-						<height>70</height>
+						<height>63</height>
 						<width>960</width>
 						<aligny>center</aligny>
+						<font>fontContextMenu</font>
 						<scroll>true</scroll>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
@@ -74,7 +75,7 @@
 					<control type="label">
 						<left>90</left>
 						<top>0</top>
-						<height>70</height>
+						<height>63</height>
 						<width>1090</width>
 						<align>right</align>
 						<aligny>center</aligny>
@@ -88,7 +89,7 @@
 						<top>20</top>
 						<width>32</width>
 						<height>32</height>
-						<visible>IsEmpty(ListItem.Year)</visible>
+						<visible>String.IsEmpty(ListItem.Year)</visible>
 						<texture>$VAR[ListWatchedIconVar]</texture>
 						<animation effect="fade" start="30" end="100" time="300" reversible="false">Focus</animation>
 					</control>
@@ -96,25 +97,25 @@
 						<left>21</left>
 						<top>20</top>
 						<width>32</width>
-						<visible>IsEmpty(ListItem.Year)</visible>
+						<visible>String.IsEmpty(ListItem.Year)</visible>
 						<height>32</height>
 						<texture colordiffuse="button_focus">$VAR[ListWatchedIconVar]</texture>
 						<animation effect="fade" start="0" end="100" time="300" reversible="false">Focus</animation>
 						<visible>!Control.HasFocus(55)</visible>
 					</control>
 				</focusedlayout>
-				<itemlayout height="70" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed)">
+				<itemlayout height="63" condition="Container.Content(artists) | Container.Content(albums) | Container.Content(actors) | Container.Content(directors) | Container.Content(files) | Container.Content(mixed)">
 					<control type="image">
 						<left>0</left>
 						<top>0</top>
 						<width>1396</width>
-						<height>71</height>
+						<height>63</height>
 						<texture border="90,3,90,3">lists/separator.png</texture>
 					</control>
 					<control type="label">
 						<left>13</left>
 						<top>2</top>
-						<height>70</height>
+						<height>63</height>
 						<width>70</width>
 						<aligny>center</aligny>
 						<font>font12</font>
@@ -125,16 +126,17 @@
 					<control type="label">
 						<left>95</left>
 						<top>0</top>
-						<height>70</height>
+						<height>63</height>
 						<width>960</width>
 						<aligny>center</aligny>
+						<font>fontContextMenu</font>
 						<label>$INFO[ListItem.Label]</label>
 						<shadowcolor>text_shadow</shadowcolor>
 					</control>
 					<control type="label">
 						<left>90</left>
 						<top>0</top>
-						<height>70</height>
+						<height>63</height>
 						<width>1090</width>
 						<align>right</align>
 						<aligny>center</aligny>
@@ -146,7 +148,7 @@
 					<control type="image">
 						<left>21</left>
 						<top>20</top>
-						<visible>IsEmpty(ListItem.Year) + IsEmpty(ListItem.AddonVersion)</visible>
+						<visible>String.IsEmpty(ListItem.Year) + String.IsEmpty(ListItem.AddonVersion)</visible>
 						<width>32</width>
 						<height>32</height>
 						<texture colordiffuse="grey">$VAR[ListWatchedIconVar]</texture>
@@ -158,122 +160,29 @@
 		</control>
 	</include>
 	<include name="SongsListLayout">
-		<focusedlayout height="70" condition="Container.Content(songs) + !Skin.HasSetting(small_list)">
+		<focusedlayout height="63" condition="Container.Content(songs)">
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1096</width>
-				<height>71</height>
+				<height>63</height>
 				<texture border="90,3,90,3">lists/separator.png</texture>
 			</control>
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1396</width>
-				<height>69</height>
+				<height>63</height>
 				<texture>lists/focus.png</texture>
 				<visible>Control.hasFocus(55)</visible>
 			</control>
 			<control type="label">
 				<left>12</left>
 				<top>-2</top>
-				<height>70</height>
+				<height>63</height>
 				<width>70</width>
 				<align>center</align>
 				<aligny>center</aligny>
-				<font>font30_title</font>
-				<label>$INFO[ListItem.TrackNumber]</label>
-				<textcolor>button_focus</textcolor>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-			<control type="label">
-				<left>95</left>
-				<top>0</top>
-				<height>70</height>
-				<width>860</width>
-				<aligny>center</aligny>
-				<scroll>true</scroll>
-				<label>$VAR[SongTitleVar]</label>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-			<control type="label">
-				<left>90</left>
-				<top>0</top>
-				<height>70</height>
-				<width>1090</width>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<label>$INFO[ListItem.Label2]</label>
-				<textcolor>grey</textcolor>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-		</focusedlayout>
-		<itemlayout height="70" condition="Container.Content(songs) + !Skin.HasSetting(small_list)">
-			<control type="image">
-				<left>0</left>
-				<top>0</top>
-				<width>1396</width>
-				<height>71</height>
-				<texture border="90,3,90,3">lists/separator.png</texture>
-			</control>
-			<control type="label">
-				<left>12</left>
-				<top>-2</top>
-				<height>70</height>
-				<width>70</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font30_title</font>
-				<label>$INFO[ListItem.TrackNumber]</label>
-				<textcolor>button_focus</textcolor>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-			<control type="label">
-				<left>95</left>
-				<top>0</top>
-				<height>70</height>
-				<width>960</width>
-				<aligny>center</aligny>
-				<label>$VAR[SongTitleVar]</label>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-			<control type="label">
-				<left>90</left>
-				<top>0</top>
-				<height>70</height>
-				<width>1090</width>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<label>$INFO[ListItem.Label2]</label>
-				<textcolor>grey</textcolor>
-				<shadowcolor>text_shadow</shadowcolor>
-			</control>
-		</itemlayout>
-		<focusedlayout height="50" condition="Container.Content(songs) + Skin.HasSetting(small_list)">
-			<control type="image">
-				<left>0</left>
-				<top>0</top>
-				<width>1096</width>
-				<height>50</height>
-				<texture border="90,3,90,3">lists/separator.png</texture>
-			</control>
-			<control type="image">
-				<left>0</left>
-				<top>0</top>
-				<width>1396</width>
-				<height>50</height>
-				<texture>lists/focus.png</texture>
-				<visible>Control.hasFocus(55)</visible>
-			</control>
-			<control type="label">
-				<left>12</left>
-				<top>-2</top>
-				<height>50</height>
-				<width>52</width>
-				<align>center</align>
-				<aligny>center</aligny>
 				<font>font24_title</font>
 				<label>$INFO[ListItem.TrackNumber]</label>
 				<textcolor>button_focus</textcolor>
@@ -282,18 +191,18 @@
 			<control type="label">
 				<left>95</left>
 				<top>0</top>
-				<height>50</height>
+				<height>63</height>
 				<width>860</width>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
+				<font>fontContextMenu</font>
 				<label>$VAR[SongTitleVar]</label>
-				<font>font12</font>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
 				<left>90</left>
 				<top>0</top>
-				<height>50</height>
+				<height>63</height>
 				<width>1090</width>
 				<align>right</align>
 				<aligny>center</aligny>
@@ -303,19 +212,19 @@
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 		</focusedlayout>
-		<itemlayout height="50" condition="Container.Content(songs) + Skin.HasSetting(small_list)">
+		<itemlayout height="63" condition="Container.Content(songs)">
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1396</width>
-				<height>50</height>
+				<height>63</height>
 				<texture border="90,3,90,3">lists/separator.png</texture>
 			</control>
 			<control type="label">
 				<left>12</left>
 				<top>-2</top>
-				<height>50</height>
-				<width>52</width>
+				<height>63</height>
+				<width>70</width>
 				<align>center</align>
 				<aligny>center</aligny>
 				<font>font24_title</font>
@@ -326,17 +235,17 @@
 			<control type="label">
 				<left>95</left>
 				<top>0</top>
-				<height>50</height>
+				<height>63</height>
 				<width>960</width>
 				<aligny>center</aligny>
+				<font>fontContextMenu</font>
 				<label>$VAR[SongTitleVar]</label>
-				<font>font12</font>
 				<shadowcolor>text_shadow</shadowcolor>
 			</control>
 			<control type="label">
 				<left>90</left>
 				<top>0</top>
-				<height>50</height>
+				<height>63</height>
 				<width>1090</width>
 				<align>right</align>
 				<aligny>center</aligny>
@@ -348,19 +257,19 @@
 		</itemlayout>
 	</include>
 	<include name="AddonsListLayout">
-		<focusedlayout height="70" condition="Container.Content(addons)">
+		<focusedlayout height="63" condition="Container.Content(addons)">
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1096</width>
-				<height>71</height>
+				<height>63</height>
 				<texture border="90,3,90,3">lists/separator.png</texture>
 			</control>
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1396</width>
-				<height>69</height>
+				<height>63</height>
 				<texture>lists/focus.png</texture>
 				<visible>Control.hasFocus(55)</visible>
 			</control>
@@ -374,16 +283,17 @@
 			<control type="label">
 				<left>75</left>
 				<top>0</top>
-				<height>70</height>
+				<height>63</height>
 				<width>820</width>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
+				<font>fontContextMenu</font>
 				<label>$INFO[ListItem.Label]</label>
 			</control>
 			<control type="label">
 				<left>590</left>
 				<top>0</top>
-				<height>70</height>
+				<height>63</height>
 				<width>590</width>
 				<align>right</align>
 				<aligny>center</aligny>
@@ -392,12 +302,12 @@
 				<label>$VAR[AddonsLabel2Var]</label>
 			</control>
 		</focusedlayout>
-		<itemlayout height="70" condition="Container.Content(addons)">
+		<itemlayout height="63" condition="Container.Content(addons)">
 			<control type="image">
 				<left>0</left>
 				<top>0</top>
 				<width>1396</width>
-				<height>71</height>
+				<height>63</height>
 				<texture border="90,3,90,3">lists/separator.png</texture>
 			</control>
 			<control type="image">
@@ -410,16 +320,17 @@
 			<control type="label">
 				<left>75</left>
 				<top>0</top>
-				<height>70</height>
+				<height>63</height>
 				<width>820</width>
 				<aligny>center</aligny>
 				<scroll>true</scroll>
+				<font>fontContextMenu</font>
 				<label>$INFO[ListItem.Label]</label>
 			</control>
 			<control type="label">
 				<left>590</left>
 				<top>0</top>
-				<height>70</height>
+				<height>63</height>
 				<width>590</width>
 				<align>right</align>
 				<aligny>center</aligny>

_service:download_url:master.tar.gz/addons/skin.estuary/addon.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.estuary" version="0.6.2" name="Estuary" provider-name="phil65, Piers">
+<addon id="skin.estuary" version="0.7.5" name="Estuary" provider-name="phil65, Piers">
 	<requires>
 		<import addon="xbmc.gui" version="5.11.0"/>
 	</requires>
@@ -7,23 +7,56 @@
 		<res width="1920" height="1080" aspect="16:9" default="true" folder="1080i" />
 	</extension>
 	<extension point="xbmc.addon.metadata">
+		<summary lang="bg_BG">Estuary облик от phil65 и Piers. (стандартния облик на Kodi)</summary>
 		<summary lang="cs_CZ">Estary skin od phil65 a Piers. (Výchozí skin Kodi)</summary>
 		<summary lang="de_DE">Estuary skin by phil65 and Piers. (Kodi Standardskin)</summary>
 		<summary lang="en_GB">Estuary skin by phil65 and Piers. (Kodi's default skin)</summary>
+		<summary lang="en_US">Estuary skin by phil65 and Piers. (Kodi's default skin)</summary>
 		<summary lang="fr_FR">Estuary, un habillage par phil65 et Piers (habillage d'origine de Kodi).</summary>
+		<summary lang="hr_HR">Estuary presvlaka autora phil65 i Piersa. (uobičajena Kodi presvlaka)</summary>
+		<summary lang="hu_HU">Estuary felszín. Készítette phil65 és Piers. (Kodi alapértelmezett felszín)</summary>
+		<summary lang="it_IT">Skin Estuary da phil65 e Piers. (Skin predefinita di Kodi)</summary>
 		<summary lang="lt_LT">Estuary teminė išvaizda, kurią sukūrė phil65 ir Piers. (Numatytoji Kodi teminė išvaizda)</summary>
+		<summary lang="ms_MY">Kulit Estuary oleh phil65 dan rakan-rakan. (Kulit lalai Kodi)</summary>
+		<summary lang="nl_NL">Estuary skin door phil65 en Piers. (Kodi's standaard skin)</summary>
 		<summary lang="pt_BR">Skin Esturay por phil65 e Piers. (Skin padrão do Kodi)</summary>
+		<summary lang="sk_SK">Vzhľad Estuary, vytvorili phil65 a Piers. (predvolený vzhľad pre Kodi)</summary>
+		<summary lang="sr_RS@latin">Maska Estuary autora phil65 i Piers. (Podrazumevana Kodi maska)</summary>
+		<summary lang="sv_SE">Estuary-skin av phil65 och Piers. (Kodi's standard-skin)</summary>
+		<summary lang="tr_TR">Estuary dış görünümü. phil65 ve Piers (Kodi'nin varsayılan dış görünümü)</summary>
+		<description lang="bg_BG">Estuary е стандартният облик на Kodi 17 и по-новите версии. Целта е да се улеснят хората които се сблъскват за първи път с Kodi.</description>
 		<description lang="cs_CZ">Estuary je výchozí skin pro Kodi 17.0 a výše. Jeho snahou je zjednodušit používání Kodi pro nové uživatele.</description>
+		<description lang="de_DE">Estuary ist der Standardskin für Kodi 17.0 und höher. Ziel war es, einen einfach zu bedienenden Skin für neue Kodi-User zu entwickeln.</description>
 		<description lang="en_GB">Estuary is the default skin for Kodi 17.0 and above. It attempts to be easy for first time Kodi users to understand and use.</description>
+		<description lang="en_US">Estuary is the default skin for Kodi 17.0 and above. It attempts to be easy for first time Kodi users to understand and use.</description>
 		<description lang="fr_FR">Estuary est l'habillage d'origine pour Kodi 17.0 et supérieur. Il est facile à comprendre et à utiliser pour les utilisateurs novices de Kodi..</description>
+		<description lang="hr_HR">Estuary je uobičajena presvlaka za Kodi 17.0 i novije inačice. To je pokušaj da se novim korisnicima olakša prvo korištenje i kasnija upotreba Kodija.</description>
+		<description lang="hu_HU">Estuary az alapértelmezett felszín a 17.0 és újabb Kodi kiadásokban.  Könnyen kezelhető újonc Kodi felhasználóknak is.</description>
+		<description lang="it_IT">Estuary è la skin predefinita di Kodi 17.0 e successivi. Cerca di essere facile da capire e usare per i nuovi utenti di Kodi.</description>
 		<description lang="lt_LT">Estuary yra numatytoji Kodi 17.0 ir aukštesnių versijų teminė išvaizda. Jos tikslas tapti lengvai suprantama ir naudojama naujiems Kodi vartotojams.</description>
+		<description lang="ms_MY">Estuary ialah kulit lalai untuk Kodi 17.0 dan ke atas. Kulit yang mudah digunakan buat pengguna Kodi kali pertama untuk memahami dan menggunakannya.</description>
+		<description lang="nl_NL">Estuary is de standaard skin voor Kodi 17.0 en hoger. Het tracht eenvoudig te begrijpen en te gebruiken te zijn voor beginnende Kodi gebruikers.</description>
 		<description lang="pt_BR">Estuary é a skin padrão para o Kodi 17.0 e acima. Objetiva ser fácil para usuários que iniciam no Kodi pela primeira vez, facilitando aprendizagem de uso do mesmo.</description>
+		<description lang="sk_SK">Estuary je predvolený vzhľad pre Kodi 17.0 a vyššie. Pokúša sa byť pre prvotných používateľov Kodi jednoduchým na pochopenie a používanie.</description>
+		<description lang="sv_SE">Estuary är standard-skin för Kodi 17.0 och uppåt. Det försöker att vara lättförståeligt för förstagångsanvändare av Kodi att förstå och använda.</description>
+		<description lang="tr_TR">Estuary Kodi 17.0 ve yukarısı için varsayılan dış görünümdür. İlk kez Kodi kullananlar için anlaşılması ve kullanımı kolaydır.</description>
+		<disclaimer lang="bg_BG">Estuary е стандартният облик на Kodi. Премахването му може да предизвика проблеми</disclaimer>
 		<disclaimer lang="cs_CZ">Estuary je výchozí skin pro Kodi, jeho odebráním může dojít k potížím.</disclaimer>
 		<disclaimer lang="de_DE">Estuary ist der Standardskin von Kodi. Ein Entfernen des Skins kann Probleme verursachen.</disclaimer>
 		<disclaimer lang="en_GB">Estuary is the default skin for Kodi, removing it may cause issues</disclaimer>
+		<disclaimer lang="en_US">Estuary is the default skin for Kodi, removing it may cause issues</disclaimer>
+		<disclaimer lang="fi_FI">Estuary on Kodin oletusteema, sen poisto voi aiheuttaa ongelmia</disclaimer>
 		<disclaimer lang="fr_FR">Estuary est l'habillage d'origine de Kodi, le retirer peut créer des problèmes</disclaimer>
+		<disclaimer lang="hr_HR">Estuary je uobičajena presvlaka za Kodi, njegovim uklanjanjem može uzrokovati poteškoće</disclaimer>
+		<disclaimer lang="hu_HU">Az Estuary az alapértelmezett Kodi felszín. Eltávolítása problémákat okozhat.</disclaimer>
+		<disclaimer lang="it_IT">Estuary è la skin predefinita di Kodi, rimuoverla potrebbe causare problemi</disclaimer>
 		<disclaimer lang="lt_LT">Estuary yra numatytoji Kodi teminė išvaizda, jos pašalinimas gali sukelti problemų</disclaimer>
+		<disclaimer lang="ms_MY">Estuary ialah kulit lalai Kodi, mengubahnya boleh menimbulkan isu.</disclaimer>
+		<disclaimer lang="nl_NL">Estuary is de standaard skin voor Kodi, het verwijderen van Estuary kan leiden tot problemen.</disclaimer>
 		<disclaimer lang="pt_BR">Estuary é a skin padrão para o Kodi, removendo-a pode causar problemas</disclaimer>
+		<disclaimer lang="sk_SK">Estuary je predvolený vzhľad pre Kodi, jeho odstránenie môže spôsobiť problémy</disclaimer>
+		<disclaimer lang="sr_RS@latin">Estuary je podrazumevana maska za Kodi, uklanjanje može izazvati probleme</disclaimer>
+		<disclaimer lang="tr_TR">Estuary Kodi için varsayılan dış görünümdür, kaldırmak sorunlara yol açabilir</disclaimer>
 		<platform>all</platform>
 		<license>CC BY-SA 4.0, GNU GENERAL PUBLIC LICENSE Version 2.0</license>
 		<forum>http://forum.kodi.tv/</forum>

_service:download_url:master.tar.gz/addons/skin.estuary/changelog.txt Changed

_service:download_url:master.tar.gz/addons/skin.estuary/fonts/AnonymousPro.ttf Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.af_za/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.am_et/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ar_sa/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.bg_bg/strings.po Changed

@@ -24,6 +24,54 @@
 msgid "Search"
 msgstr "Търсене"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Ползвай за фон фен-арт изображенията"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Режим \"Кино\""
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Промени режима"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Гледай в 2D режим"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Произволни филми"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Негледани филми"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Следени филми"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Най-слушани албуми"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Произволни албуми"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Произволни изпълнители"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Последни записи"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Най-гледани канали"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Прогноза"
@@ -36,10 +84,62 @@
 msgid "Misc options"
 msgstr "Разни настройки"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Подредба"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Изглед"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Списъкът е празен. Можете да добавите даден елемент посредством контекстното меню."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Към албумите"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Към песните"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Фен-арт"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Последно влизане"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Памет в употреба:"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Информация за версията"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Ред"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Моята оценка"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Разширена инф."
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Страници"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "елемента"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Превърти назад"
@@ -48,10 +148,22 @@
 msgid "Fast forward"
 msgstr "Превърти напред"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Отказ"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Производител на камерата"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Настройки на елементите в плейлиста"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "За да създадете плейлист изберете тип и добавете правила. Плейлистите са динамични и съдържанието им се изменя спрямо съвпаденията със съдържащите се елементи в библиотеката."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Добави група"
@@ -64,18 +176,110 @@
 msgid "Delete group"
 msgstr "Изтрий групата"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Прочетете още..."
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Натиснете клавиша [B]Нагоре[/B] ако желаете да превъртите"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Натиснете клавиша [B]OK[/B] за спиране"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Основан на Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Натиснете [B]Наляво[/B] за превъртане назад или [B]Надясно[/B] за превъртане напред"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Сваляне на субтитри"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Към плейлиста"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Показвай екрана за влизане след стартиране"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Автоматично влизане след стартиране"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Налично е обновяване"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "минути"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Елементи в менюто"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Препратки към раздел \"Файлове\" на всеки тип медиа. От там можете да добавяте изтоници за попълване на библиотеката със съдържание."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Раздели"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Видео плейлист"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Музикален плейлист"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Журнал за събития"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Последно обновяване"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Добавяне на медиен източик"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Изключи..."
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Заглавия"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Към библиотеката"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Поредици"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Предишно място"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Следващо място"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Ще свърши в"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Инф. за албума"
@@ -84,10 +288,18 @@
 msgid "Lyrics add-on"
 msgstr "Добавка за лирики"
 
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Настройки на визуализацията"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Група канали"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Метаданни"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Настройки за сканиране на съдържанието"
@@ -96,10 +308,22 @@
 msgid "Available groups"
 msgstr "Налични групи"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Търси трейлър"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Сваляне на субтитри"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Видео меню"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Показвай метеорологични условия в горния колонтитул"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Локално са налични субтитри"
@@ -115,3 +339,87 @@
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Стена"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Въведете текст тук..."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Телетекст"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Широк списък"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Персонален общ фон"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Път до катината"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Секция Файлове"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Преглед на личните ви снимки, свалени такива или снимки предоставени посредством добавки. Добавки можете да намерите в официалното хранилище."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Превключи аудио потока"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Търси в библиотеката"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Търси в YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Търси в TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Премахни елемента от менюто"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Браузър за добавки"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Не сте инсталирали добавки. Можете да прегледате наличните, за инсталиране, добавки посредством браузъра за добавки."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Метеорологичната прогноза не е налично защото няма настроена метеорологична услуга. За целта е необходимо да изберете доставчик на данни и да въведете местоположението си."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Метеорологична услуга"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Негледани ТВ Сериали"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "От същия режисьор"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Натиснете [B]Нагоре[/B] за информация за актьора"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Натиснете [B]ОК[/B] за да прочетете сюжета"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ca_es/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.cs_cz/strings.po Changed

@@ -28,9 +28,17 @@
 msgid "Show media fanart as background"
 msgstr "Zobrazit fanart médií jako pozadí"
 
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Mód kino"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Změnit režim"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Rozkoukané filmy"
+msgid "Watch as 2D"
+msgstr "Sledovat jako 2D"
 
 msgctxt "#31006"
 msgid "Random movies"
@@ -40,10 +48,6 @@
 msgid "Unwatched movies"
 msgstr "Neshlédnuté filmy"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Rozkoukané TV seriály"
-
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Stáhnout ikony"
@@ -72,14 +76,6 @@
 msgid "Recent recordings"
 msgstr "Nedávné nahrávky"
 
-msgctxt "#31016"
-msgid "Favourite channels"
-msgstr "Oblíbené kanály"
-
-msgctxt "#31017"
-msgid "Recent channels"
-msgstr "Nedávné kanály"
-
 msgctxt "#31018"
 msgid "Most played channels"
 msgstr "Nejsledovanější kanály"
@@ -100,6 +96,10 @@
 msgid "Sort by"
 msgstr "Řadit podle"
 
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "TypZobrazení"
+
 msgctxt "#31024"
 msgid "Next tracks"
 msgstr "Následující skladby"
@@ -200,10 +200,30 @@
 msgid "Available"
 msgstr "Dostupné"
 
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Stiskněte  [B]nahoru[/B] pro přetáčení vpřed"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Stiskněte [OK] pro zastavení"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Přepnout jazyk"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtrováno"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Písmo založené na Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Stiskněte  [B]vlevo[/B] pro přetočení zpět, nebo  [B]vpravo[/B] pro přetáčení vpřed"
+
 msgctxt "#31055"
 msgid "Subtitle download"
 msgstr "Stažení titulků"
@@ -232,6 +252,10 @@
 msgid "Main menu items"
 msgstr "Položky hlavního menu"
 
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Zkratky pro každý typ média v sekci \"Soubory\". Přejděte tam aby jste mohli přidat další zdroje do vašich databází."
+
 msgctxt "#31063"
 msgid "Sections"
 msgstr "Sekce"
@@ -240,6 +264,18 @@
 msgid "unwatched"
 msgstr "neshlédnuté"
 
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Video seznamy stop"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Hudební seznam stop"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Log událostí"
+
 msgctxt "#31068"
 msgid "Choose presets"
 msgstr "Vyberte předvolby"
@@ -264,6 +300,14 @@
 msgid "Titles"
 msgstr "Názvy"
 
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Hlavní adresář knihovny"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Filmové sady"
+
 msgctxt "#31076"
 msgid "Play optical disc"
 msgstr "Přehrát optický disk"
@@ -304,6 +348,10 @@
 msgid "Channel Group"
 msgstr "Skupina programů"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadata"
+
 msgctxt "#31087"
 msgid "Provider settings"
 msgstr "Nastavení poskytovatele"
@@ -332,6 +380,14 @@
 msgid "Show weather info in top bar"
 msgstr "Zobrazit počasí v horní liště"
 
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Ukazovat vlastnosti médií pro filmy / epizody / hudební videa"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Aktivovat snímkovou animaci"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Místní titulky k dispozici"
@@ -344,18 +400,26 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Vyberte Váš Kodi uživatelský profil[CR]pro přihlášení a pokračování"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Ikony"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
 
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Info zeď"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Zeď"
+
 msgctxt "#31103"
 msgid "Enter text here..."
 msgstr "Zde vložte text..."
 
-msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
-msgstr "Vaše knihovna je zatím prázdná. Pro přidání Vašich médií, přejděte do sekce \"Soubory\" a přidejte a nastavte zdroj médií. Jakmile dojde načtení a indexování zdroje, budete schopni procházet své položky v knihovně."
-
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
 msgstr "Přidejte zdroje videí a nastavte správný typ obsahu pro naplnění vašich video knihoven."
@@ -364,6 +428,10 @@
 msgid "Teletext"
 msgstr "Teletext"
 
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Široký seznam"
+
 msgctxt "#31108"
 msgid "Use custom global background"
 msgstr "Použít vlastní globální pozadí"
@@ -372,6 +440,18 @@
 msgid "Choose image path"
 msgstr "Vyberte cestu k obrázku"
 
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Vstoupit do sekce souborů"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Zobrazte vlastní obrázky, nebo si stáhněte jeden z mnoha obrázkových doplňků z oficiálního repozitáře."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Přepnout zvukový proud"
+
 msgctxt "#31113"
 msgid "Search local library"
 msgstr "Vyhledat v místní knihovně"
@@ -388,6 +468,22 @@
 msgid "Remove this main menu item"
 msgstr "Odebrat tuto položku hlavního menu"
 
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Upravit vlastnosti (nody)"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Vstoupit do prohlížeče doplňků"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Zatím nemáte instalovány žádné doplňky. Použijte náš prohlížeč doplňků pro prozkoumání naší kolekce a vylepšení vašeho Kodi."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Zatím jste nenastavili poskytovatele dat o počasí. Aby bylo možné zobrazit informace o počasí, nastavte si poskytovatele a svou polohu."
+
 msgctxt "#31121"
 msgid "Set weather provider"
 msgstr "Nastavte poskytovatele počasí"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.cy_gb/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.da_dk/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.de_de/strings.po Changed

@@ -24,9 +24,17 @@
 msgid "Search"
 msgstr "Suchen"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Medien-Fanart als Hintergrund nutzen (wenn verfügbar)"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Modus ändern"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Laufende Filme"
+msgid "Watch as 2D"
+msgstr "In 2D ansehen"
 
 msgctxt "#31006"
 msgid "Random movies"
@@ -36,10 +44,6 @@
 msgid "Unwatched movies"
 msgstr "Ungesehene Filme"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Laufende TV Serien"
-
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Icons herunterladen"
@@ -68,14 +72,6 @@
 msgid "Recent recordings"
 msgstr "Neue Aufnahmen"
 
-msgctxt "#31016"
-msgid "Favourite channels"
-msgstr "Beliebteste Kanäle"
-
-msgctxt "#31017"
-msgid "Recent channels"
-msgstr "Zuletzt gesehene Kanäle"
-
 msgctxt "#31018"
 msgid "Most played channels"
 msgstr "Meistgespielte Kanäle"
@@ -176,6 +172,10 @@
 msgid "Playlist options"
 msgstr "Wiedergabelisten-Einstellungen"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Stelle den Typ ein und füge Regeln für die Smart Playlist hinzu. Diese Art von Playlisten sind dynamisch und beinhalten alle Medien aus deiner Datenbank, die die gesetzten Regeln erfüllen."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Gruppe hinzufügen"
@@ -196,6 +196,10 @@
 msgid "Available"
 msgstr "Verfügbar"
 
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Drücke [B]Hoch[/B] zum Zurück- oder Vorspulen."
+
 msgctxt "#31052"
 msgid "filtered"
 msgstr "gefiltert"
@@ -204,6 +208,10 @@
 msgid "Arial based"
 msgstr "Arial-basiert"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Drücke[B]Links[/B] zum Zurückspulen, oder [B]Rechts[/B] zum Vorspulen"
+
 msgctxt "#31055"
 msgid "Subtitle download"
 msgstr "Untertitel-Download"
@@ -400,10 +408,6 @@
 msgid "Enter text here..."
 msgstr "Text hier eingeben..."
 
-msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
-msgstr "Deine Datenbank ist noch leer. Um sie mit deinen persönlichen Medien zu befüllen, betrete die \"Dateien\"-Sektion. Füge Medienquellen hinzu and konfiguriere sie. Nachdem die Quelle hinzugefügt und gescannt worden ist, können sie die Datenbankfunktionen nutzen."
-
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
 msgstr "Füge Videoquellen hinzu und stellen den korrekten Inhaltstyp ein, um die Datenbank zu befüllen."
@@ -432,10 +436,6 @@
 msgid "View your personal pictures or download one of the many image add-ons from the official repository."
 msgstr "Schaue dir deine persönlichen Fotos an oder probiere eines der vielen Bilder-Addons aus dem offiziellen Repository."
 
-msgctxt "#31112"
-msgid "Small list"
-msgstr "Kleine Liste"
-
 msgctxt "#31113"
 msgid "Search local library"
 msgstr "Lokale Datenbank durchsuchen"
@@ -460,6 +460,10 @@
 msgid "Enter add-on browser"
 msgstr "Add-on Browser betreten"
 
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Du hast noch keine Add-ons installiert. Besuche den Add-on Browser, um unsere Add-on-Sammlung zu durchforsten und mit ihnen deine Kodi-Erfahrung zu verbessern."
+
 msgctxt "#31120"
 msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
 msgstr "Du hast noch keinen Wetterprovider eingerichtet. Um Wetterinformationen zu erhalten, wähle einen Wetterprovider und stelle deinen Ort in den Einstellungen ein."
@@ -487,3 +491,11 @@
 msgctxt "#31126"
 msgid "Press OK to read plot"
 msgstr "Drücke \"OK\" zum Lesen der Handlung"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Icons zeigen"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Mitwirkende"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.el_gr/strings.po Changed

@@ -24,21 +24,29 @@
 msgid "Search"
 msgstr "Αναζήτηση"
 
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Αλλαγή λειτουργίας"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Ταινίες σε εξέλιξη"
+msgid "Watch as 2D"
+msgstr "Προβολή ως 2D"
 
 msgctxt "#31006"
 msgid "Random movies"
 msgstr "τυχαίες ταινείες"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Τηλεοπτικές σειρές σε εξέλιξη"
-
 msgctxt "#31010"
 msgid "In progress movies"
-msgstr "Ταινείες σε εξέλιξη"
+msgstr "Ταινίες σε εξέλιξη"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Τυχαία σειρά καλλιτεχνών"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Πρόσφατες εγγραφές"
 
 msgctxt "#31019"
 msgid "Forecast"
@@ -52,10 +60,42 @@
 msgid "Misc options"
 msgstr "Διάφορες επιλογές"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Ταξινόμηση κατά"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Επόμενα κομμάτια"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Τελευταία σύνδεση"
 
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Πληροφορίες εκδοσης"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Παραγγελία"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Η αξιολόγηση σας"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Εκτεταμένες πληροφορίες"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Σελίδες"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "Αντικείμενα"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Πίσω"
@@ -64,6 +104,14 @@
 msgid "Fast forward"
 msgstr "Μπροστά"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Ακύρωση της ενημέρωσης"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Κατασκευαστής της φωτογραφικής μηχανής "
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Επιλογές λίστας αναπ/γής"
@@ -80,18 +128,62 @@
 msgid "Delete group"
 msgstr "Διαγραφή Γκρουπ"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Διαβάστε περισσότερα"
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Διαθέσιμος"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Βασισμένη σε Arial"
 
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Κατέβασμα υποτίτλων"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Πήγαινε στην λίστα αναπαραγωγής"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Ενημερώσεις διαθέσιμες"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "Λεπτά"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Τμήματα"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Τελευταία Ενημέρωση"
 
+msgctxt "#31071"
+msgid "by"
+msgstr "υπο"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Επιλογές Ενέργειας"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Τίτλοι"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Επόμενη τοποθεσία"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Τελειώνει στο"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Πληροφορίες άλμπουμ"
@@ -104,6 +196,10 @@
 msgid "Channel Group"
 msgstr "Γκρουπ Καναλιών"
 
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Ρυθμίσεις παρόχου"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Επιλογές Σάρωσης Περιεχομένου"
@@ -131,3 +227,11 @@
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Αναζήτηση στην τοπική βιβλιοθήκη"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Αναζήτηση στο  Youtube"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.en_au/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.en_gb/strings.po Changed

@@ -23,7 +23,7 @@
 
 #: /1080i/Home.xml:775
 msgctxt "#31001"
-msgid "Search"
+msgid "Search..."
 msgstr ""
 
 #: /1080i/SkinSettings.xml:125
@@ -31,11 +31,19 @@
 msgid "Show media fanart as background"
 msgstr ""
 
-#empty strings from id 31003 to 31004
+#: /1080i/DialogVideoInfo.xml:431
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr ""
 
-#: /1080i/Home.xml:75
+#: /1080i/VideoOSD.xml:409
+msgctxt "#31004"
+msgid "Change mode"
+msgstr ""
+
+#: /1080i/VideoOSD.xml:416
 msgctxt "#31005"
-msgid "In-progress movies"
+msgid "Watch as 2D"
 msgstr ""
 
 #: /1080i/Home.xml:93
@@ -48,9 +56,9 @@
 msgid "Unwatched movies"
 msgstr ""
 
-#: /1080i/Home.xml:138
+#: /1080i/DialogAddonInfo.xml:32
 msgctxt "#31008"
-msgid "In-progress TV Shows"
+msgid "No disclaimer"
 msgstr ""
 
 #: /1080i/MyVideoNav.xml:278
@@ -90,12 +98,12 @@
 
 #: /1080i/Home.xml:374
 msgctxt "#31016"
-msgid "Favourite channels"
+msgid "Recently played channels"
 msgstr ""
 
-#: /1080i/Home.xml:435
+#: /1080i/DialogVideoInfo.xml:265
 msgctxt "#31017"
-msgid "Recent channels"
+msgid "Rated"
 msgstr ""
 
 #: /1080i/Home.xml:443
@@ -113,8 +121,7 @@
 msgid "Actions"
 msgstr ""
 
-#: /1080i/AddonBrowser.xml:35 /1080i/DialogPVRChannelManager.xml:203 /1080i/Includes_MediaMenu.xml:116
-#: /1080i/EventLog.xml:228
+#: /1080i/AddonBrowser.xml:35 /1080i/DialogPVRChannelManager.xml:203 /1080i/Includes_MediaMenu.xml:116 /1080i/EventLog.xml:228
 msgctxt "#31021"
 msgid "Misc options"
 msgstr ""
@@ -169,8 +176,7 @@
 msgid "Version info"
 msgstr ""
 
-#: /1080i/EventLog.xml:25 /1080i/Includes_MediaMenu.xml:216 /1080i/SmartPlaylistEditor.xml:67 /1080i/EventLog.xml:220
-#: /1080i/Includes_MediaMenu.xml:139
+#: /1080i/EventLog.xml:25 /1080i/Includes_MediaMenu.xml:216 /1080i/SmartPlaylistEditor.xml:67 /1080i/EventLog.xml:220 /1080i/Includes_MediaMenu.xml:139
 msgctxt "#31032"
 msgid "Order"
 msgstr ""
@@ -185,13 +191,12 @@
 msgid "Extended info"
 msgstr ""
 
-#: /1080i/DialogPVRChannelManager.xml:279 /1080i/DialogPVRChannelsOSD.xml:291 /1080i/DialogPVRGuideOSD.xml:171
-#: /1080i/Variables.xml:41 /1080i/FileBrowser.xml:238
+#: /1080i/DialogPVRChannelManager.xml:279 /1080i/DialogPVRChannelsOSD.xml:291 /1080i/DialogPVRGuideOSD.xml:171 /1080i/Variables.xml:41 /1080i/FileBrowser.xml:238
 msgctxt "#31035"
 msgid "Pages"
 msgstr ""
 
-#: /1080i/FileBrowser.xml:238 /1080i/Variables.xml:41
+#: /1080i/FileBrowser.xml:238 /1080i/Variables.xml:41 /1080i/MyPVRRecordings.xml:242
 msgctxt "#31036"
 msgid "items"
 msgstr ""
@@ -263,12 +268,12 @@
 
 #: /1080i/Variables.xml:120
 msgctxt "#31050"
-msgid "Press [B]Down[/B] to stop, or [B]Right[/B] to fast-forward"
+msgid "Press [B]OK[/B] to stop"
 msgstr ""
 
-#: /1080i/Variables.xml:121
+#: /1080i/VideoOSD.xml:361
 msgctxt "#31051"
-msgid "Press [B]Down[/B] to stop, or [B]Left[/B] to rewind"
+msgid "Toggle language"
 msgstr ""
 
 #: /1080i/Includes.xml:1102
@@ -533,7 +538,7 @@
 
 #: /1080i/Home.xml:134 /1080i/Home.xml:228
 msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
 msgstr ""
 
 #: /1080i/Home.xml:468
@@ -571,9 +576,9 @@
 msgid "View your personal pictures or download one of the many image add-ons from the official repository."
 msgstr ""
 
-#: /1080i/MyMusicNav.xml:78
+#: /1080i/VideoOSD.xml:322
 msgctxt "#31112"
-msgid "Small list"
+msgid "Toggle audio stream"
 msgstr ""
 
 #: /1080i/Custom_1107_SearchDialog.xml:32
@@ -655,3 +660,23 @@
 msgctxt "#31128"
 msgid "Contributors"
 msgstr ""
+
+#: /1080i/Variables.xml:229
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr ""
+
+#: /1080i/Variables.xml:230
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr ""
+
+#: /1080i/SkinSettings.xml:117
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr ""
+
+#: /1080i/MyVideoNav.xml:121 /1080i/View_502_FanArt.xml:213
+msgctxt "#31132"
+msgid "min"
+msgstr ""

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.en_nz/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.en_us/strings.po Changed

@@ -24,6 +24,62 @@
 msgid "Search"
 msgstr "Search"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Show media fanart as background"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Theater mode"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Change mode"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Watch as 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Random movies"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Unwatched movies"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Download icons"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "In progress movies"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Most played albums"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Random albums"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Random artists"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Unplayed albums"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Recent recordings"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Most played channels"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Forecast"
@@ -36,10 +92,70 @@
 msgid "Misc options"
 msgstr "Misc options"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Sort by"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Viewtype"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Next tracks"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "No favorites found. You can add any item from media views to this list by using the context menu."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Go to albums"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Go to songs"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Show fanart"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Last logged in"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Memory used"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Version info"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Order"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Your rating"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Extended info"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Pages"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "items"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Tracklist"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Rewind"
@@ -48,10 +164,22 @@
 msgid "Fast forward"
 msgstr "Fast forward"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Cancel update"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Camera manufacturer"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Playlist options"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Add group"
@@ -64,18 +192,142 @@
 msgid "Delete group"
 msgstr "Delete group"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Read more..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Available"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Press [B]Up[/B] to rewind or fast-forward"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Press [B]OK[/B] to stop"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Toggle language"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtered"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Arial based"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Subtitle download"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Go to playlist"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Show login screen on startup"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatic Login on startup"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Updates available"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minutes"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Main menu items"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sections"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "unwatched"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Video playlist"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Music playlist"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Event log"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Choose presets"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Last Updated"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Add media sources"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "by"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Power Options"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Titles"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Library root"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Movie sets"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Play optical disc"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Previous location"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Next location"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Cast not available"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Ends at"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Album info"
@@ -84,10 +336,26 @@
 msgid "Lyrics add-on"
 msgstr "Lyrics add-on"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Lyrics add-on settings"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Visualization settings"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Channel Group"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadata"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Provider settings"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Content scanning options"
@@ -96,10 +364,30 @@
 msgid "Available groups"
 msgstr "Available groups"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Search trailer"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Download subtitles"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Video menu"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Show weather info in top bar"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Show media flags for movies / episodes / music videos"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Use slide animations"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Local subtitle available"
@@ -112,6 +400,118 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Select your Kodi user profile[CR]to login and continue"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Icon Wall"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "InfoWall"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Wall"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Enter text here..."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Add video sources and set the appropriate content type in order to populate your video libraries."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletext"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "WideList"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Use custom global background"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Choose image path"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Enter files section"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "View your personal pictures or download one of the many image add-ons from the official repository."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Toggle audio stream"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Search local library"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Search YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Search TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Remove this main menu item"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Edit nodes"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Enter add-on browser"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Set weather provider"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Unwatched TV Shows"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Same director"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Show images on map"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Press up for actor info"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Press OK to read plot"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Show icons"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Contributors"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.es_ar/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.es_es/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.es_mx/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.et_ee/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.eu_es/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.fa_ir/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.fi_fi/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.fr_ca/strings.po Changed

@@ -24,6 +24,50 @@
 msgid "Search"
 msgstr "Rechercher"
 
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Mode cinéma"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Changer de mode"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Regarder en 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Films aléatoires"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Films non visionés"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Télécharger des icônes"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Films en cours"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Albums les plus joués"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Albums aléatoires"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Artistes aléatoires"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Enregistrements récents"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Prévisions"
@@ -36,10 +80,54 @@
 msgid "Misc options"
 msgstr "Options diverses"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Trier par"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Prochaines pistes"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Aller aux albums"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Aller aux chansons"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Dernière connexion"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Mémoire utilisée"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Information de version"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Trier"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Votre évaluation"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Information supplémentaire"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Pages"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "éléments"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Retour rapide"
@@ -48,6 +136,10 @@
 msgid "Fast forward"
 msgstr "Avance rapide"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Annuler la mise à jour"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Options de liste de lecture"
@@ -64,10 +156,50 @@
 msgid "Delete group"
 msgstr "Supprimer le groupe"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Lire plus..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Disponible"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Basé sur Arial"
 
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Aller à la liste de lecture"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Mises à jour disponibles"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minutes"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sections"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "non vues"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Liste de lecture vidéo"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Liste de lecture musicale"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Journal des événements"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
@@ -76,6 +208,22 @@
 msgid "Power Options"
 msgstr "Options d'alimentation"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Titres"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Racine de la médiathèque"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Sagas"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Termine à "
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Informations de l'album"
@@ -88,6 +236,10 @@
 msgid "Channel Group"
 msgstr "Groupe de chaînes"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Métadata"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Options de balayage du contenu"
@@ -96,10 +248,18 @@
 msgid "Available groups"
 msgstr "Groupes proposés"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Chercher la bande-annonce"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Télécharger les sous-titres"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Menu vidéo"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Sous-titres locaux disponibles"
@@ -115,3 +275,11 @@
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Maj."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "télétexte"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Afficher les icônes"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.fr_fr/strings.po Changed

@@ -28,9 +28,17 @@
 msgid "Show media fanart as background"
 msgstr "Afficher les FanArts des médias en arrière-plan"
 
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Mode cinéma"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Changer de mode"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Films en cours"
+msgid "Watch as 2D"
+msgstr "Voir en 2D"
 
 msgctxt "#31006"
 msgid "Random movies"
@@ -40,10 +48,6 @@
 msgid "Unwatched movies"
 msgstr "Films non vus"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Séries TV en cours"
-
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Télécharger les icônes"
@@ -73,12 +77,8 @@
 msgstr "Enregistrements récents"
 
 msgctxt "#31016"
-msgid "Favourite channels"
-msgstr "Chaînes favorites"
-
-msgctxt "#31017"
-msgid "Recent channels"
-msgstr "Chaînes récentes"
+msgid "Recently played channels"
+msgstr "Chaînes vues récemment"
 
 msgctxt "#31018"
 msgid "Most played channels"
@@ -110,7 +110,7 @@
 
 msgctxt "#31025"
 msgid "No favourites found. You can add any item from media views to this list by using the context menu."
-msgstr "Aucun favori trouvé. Il est possible d'en ajouter à cette liste à partir des vues média avec le menu contextuel."
+msgstr "Aucun favori trouvé. Il est possible d'ajouter n'importe quel élément à cette liste à partir des vues média à l'aide du menu contextuel."
 
 msgctxt "#31026"
 msgid "Go to albums"
@@ -174,7 +174,7 @@
 
 msgctxt "#31041"
 msgid "Camera manufacturer"
-msgstr "Fabricant"
+msgstr "Fabricant caméra"
 
 msgctxt "#31042"
 msgid "Playlist options"
@@ -209,12 +209,12 @@
 msgstr "Appuyer sur [B]Haut[/B] pour le retour ou l'avance rapide"
 
 msgctxt "#31050"
-msgid "Press [B]Down[/B] to stop, or [B]Right[/B] to fast-forward"
-msgstr "Appuyer sur [B]Bas[/B] pour l'arrêt, ou [B]Droite[/B] pour l'avance rapide"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Appuyer sur [B]OK[/B] pour stopper"
 
 msgctxt "#31051"
-msgid "Press [B]Down[/B] to stop, or [B]Left[/B] to rewind"
-msgstr "Appuyer sur [B]Bas[/B] pour l'arrêt, ou [B]Gauche[/B] pour le retour rapide"
+msgid "Toggle language"
+msgstr "Changer de langue"
 
 msgctxt "#31052"
 msgid "filtered"
@@ -238,11 +238,11 @@
 
 msgctxt "#31057"
 msgid "Show login screen on startup"
-msgstr "Afficher l'écran de connexion au démarrage"
+msgstr "Afficher l'écran d'identification au démarrage"
 
 msgctxt "#31058"
 msgid "Automatic Login on startup"
-msgstr "Connexion auto. au démarrage"
+msgstr "Identification auto. au démarrage"
 
 msgctxt "#31059"
 msgid "Updates available"
@@ -282,7 +282,7 @@
 
 msgctxt "#31068"
 msgid "Choose presets"
-msgstr "Choisir les présélections"
+msgstr "Choisir les préréglages"
 
 msgctxt "#31069"
 msgid "Last Updated"
@@ -314,7 +314,7 @@
 
 msgctxt "#31076"
 msgid "Play optical disc"
-msgstr "Lire le disque"
+msgstr "Lire disque optique"
 
 msgctxt "#31077"
 msgid "Previous location"
@@ -326,7 +326,7 @@
 
 msgctxt "#31079"
 msgid "Cast not available"
-msgstr "Distribution non disponible"
+msgstr "Casting non disponible"
 
 msgctxt "#31080"
 msgid "Ends at"
@@ -386,7 +386,7 @@
 
 msgctxt "#31094"
 msgid "Show media flags for movies / episodes / music videos"
-msgstr "Afficher les drapeaux médias pour films/épisodes/vidéos musicales"
+msgstr "Afficher les indicateurs média de films/épisodes/vidéos musicales"
 
 msgctxt "#31095"
 msgid "Use slide animations"
@@ -402,7 +402,7 @@
 
 msgctxt "#31098"
 msgid "Select your Kodi user profile[CR]to login and continue"
-msgstr "Choisir le profil de l'utilisateur Kodi[CR]pour s'identifier et poursuivre"
+msgstr "Sélectionner le profil utilisateur Kodi[CR]pour s'identifier et poursuivre"
 
 msgctxt "#31099"
 msgid "Icon Wall"
@@ -425,8 +425,8 @@
 msgstr "Saisir le texte ici…"
 
 msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
-msgstr "La bibliothèque est actuellement vide. Pour la peupler avec des médias, aller à la section « Fichiers », ajouter une source de média et la configurer. Après ajout et indexation, la bibliothèque pourra être parcourue."
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "La bibliothèque est actuellement vide. Pour la peupler avec des médias, aller à la section « Fichiers », ajouter une source de médias puis la configurer. Après ajout et indexation, la bibliothèque pourra être parcourue."
 
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
@@ -457,8 +457,8 @@
 msgstr "Permet de voir les images personnelles ou de télécharger une des nombreuses extension images du dépôt officiel."
 
 msgctxt "#31112"
-msgid "Small list"
-msgstr "Petite liste"
+msgid "Toggle audio stream"
+msgstr "Changer de flux audio"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -514,7 +514,7 @@
 
 msgctxt "#31126"
 msgid "Press OK to read plot"
-msgstr "Appuyer sur « OK  pour lire le résumé"
+msgstr "Appuyer sur « OK  pour lire l'intrigue"
 
 msgctxt "#31127"
 msgid "Show icons"
@@ -523,3 +523,15 @@
 msgctxt "#31128"
 msgid "Contributors"
 msgstr "Contributeurs"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Paramètres généraux s'appliquants à l'ensemble de l'habillage."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Paramètres relatifs au menu principal : configurer l'écran d'accueil comme désiré."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Choisir le paquet de FanArt pour l'accueil"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.gl_es/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.he_il/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "חיפוש"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "הראה מדיית פאנארט כרקע"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "מצב קולנוע"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "שינוי מצב"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "צפייה כ־2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "סרטים אקראיים"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "סרטים שלא נצפו"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "הורד אייקונים"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "בתהליך צפייה בסרטים"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "אלבומים שנוגנו לאחרונה"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "אלבומים אקראיים"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "אמנים אקראיים"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "אלבומים שלא הופעלו"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "הקלטות אחרונות"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "ערוצים שהופעלו לאחרונה"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "ערוצים שהפועלו הכי הרבה"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "תחזית"
@@ -36,10 +96,62 @@
 msgid "Misc options"
 msgstr "אפשרויות שונות"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "מיון לפי"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "השיר הבא"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "מעבר לאלבום"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "מעבר לשירים"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "הראה אומנות מעריצים"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "חובר לאחרונה"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "זיכרון בשימוש"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "מידע על הגרסה"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "הזמנה"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "הציון שלך"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "מידע מורחב"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "עמודים"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "פריטים"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "רשימת שירים"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "הרצה אחורה"
@@ -48,6 +160,14 @@
 msgid "Fast forward"
 msgstr "הרצה קדימה"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "ביטול עדכון"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "יצרן מצלמה"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "אפשרויות רשימת ניגון"
@@ -64,18 +184,130 @@
 msgid "Delete group"
 msgstr "מחיקת קבוצה"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "קרא עוד..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "זמין"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "לחץ על[B]אישור[B] כדי לעצור"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "הסתר שפה"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "סינון"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "מבוסס Arial"
 
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "הורדת כתובית"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "מעבר לרשימת השמעה"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "הצג מסך כניסה בעת ההפעלה."
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "התחברות אוטומטית בהפעלה"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "קיימים עדכונים"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "דקות"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "פריטי תפריט"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "סעיפים"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "לא נצפה"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "רשימות ניגון וידאו"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "רשימות ניגון מוזיקה"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "יומן אירועים"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "בחר הגדרות קבועות מראש"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "עודכן לאחרונה"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "הוסף מקורות מדיה"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "על ידי"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "אפשרויות חשמל"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "כותרות"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "ספריה"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "מארז סרטים"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "נגן מדיה מדיסק"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "מיקום קודם"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "המיקום הבא"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "עופרת אינו זמין"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "מסתיים ב"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "פרטי אלבום"
@@ -84,10 +316,26 @@
 msgid "Lyrics add-on"
 msgstr "הרחבת מילות שירים"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "הגדרות הרחבת מילים"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "הגדרות חיזוי"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "קבוצת ערוצים"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "נתוני מטה"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "הגדרות ספק"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "הגדרות סריקת תוכן"
@@ -96,10 +344,30 @@
 msgid "Available groups"
 msgstr "קבוצות זמינות"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "חפש קדימון"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "הורדת כתוביות"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "תפריט וידאו"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "הצג פרטי מזג אוויר בסרגל העליון"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "הצג דגלי מדיה עבור סרטים / פרקים / קליפים"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "אפשר הנפשות"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "כתובית מקומית זמינה"
@@ -112,6 +380,106 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "יש לבחור חשבון משתמש Kodi[CR]להתחברות והמשך"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "קיר אייקון"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "קיר מידע"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "קיר"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "...הכנס פה טקסט"
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "טלטקסט"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "רשימה רחבה"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "השתמש בהגדרות רקע גלובליות"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "בחירת נתיב תמונה"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "הזנת שמות הקבצים"
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "הסתר זרימת שמע"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "חפש ספרייה מקומית"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "חפש ביוטיוב"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "TheMovieDB-חיפוש ב"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "מחק את פריט התפריט הזה"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "עריכת בלוטות"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "הפעל הרחבות דפדפן"
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "הגדר ספק מזג האוויר"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "סדרות טלוויזיה שלא נצפו"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "אותו במאי"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "הראה תמונות במפה"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "בשביל מידע על השחקן up  לחץ על"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "על מנת לקרוא עלילה OK לחץ על "
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "הראה סמלים"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "תורמים"
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "בחירת חבילת אומנות אוהדים כבית"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.hr_hr/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.hu_hu/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Keresés"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Médiaillusztrációk megjelenítése a háttérben"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Mozi mód"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Mód változtatása"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Megnézés 2D-ként"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Véletlenszerű filmek"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Nem látott filmek"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Ikonok letöltése"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Folyamatban lévő filmek"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Legtöbbet játszott albumok"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Véletlenszerű albumok"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Véletlenszerű előadók"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Nem játszott albumok"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Friss felvételek"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Mostanában játszott csatornák"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Legtöbbet játszott csatornák"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Előrejelzés"
@@ -36,10 +96,70 @@
 msgid "Misc options"
 msgstr "Egyéb beállítások"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Rendezés"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Nézettípus"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Következő számok"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Nem találhatóak kedvencek. Bármely elemet hozzáadhat ehhez a listához a média nézetekből, a környezeti menü használatával."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Albumokhoz"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Számokhoz"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Illusztráció megjelenítése"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Utoljára bejelentkezve"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Memóriahasználat"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Verzióinformáció"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Rendezés"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Értékelés"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Bővített információ"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Oldalak"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "elem"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Számlista"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Visszatekerés"
@@ -48,10 +168,22 @@
 msgid "Fast forward"
 msgstr "Előretekerés"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Frissítés megszakítása"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Fényképezőkép gyártó"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Lejátszáslista lehetőségek"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Adja meg a típust és a szabályokat az intelligens lejátszólista létrehozásához. Ezek a lejátszólisták dinamikusak, és minden médiaelemet figyelembe vesznek az adatbázisban, amelyekre alkalmazhatóak a választott szabályok."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Csoport hozzáadása"
@@ -64,18 +196,138 @@
 msgid "Delete group"
 msgstr "Csoport törlése"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Olvasson tovább…"
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Elérhető"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Nyomja meg a [B]Fel[/B] gombot a tekeréshez"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Nyomjon [B]OK[/B]-ot a leállításhoz"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Nyelv váltása"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "szűrt"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Arial betűkészlet"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Nyomja meg a [B]Bal[/B] gombot a vissza-, vagy a [B]Jobb[/B] gombot az előretekeréshez"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Felirat letöltése"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Lejátszólistához"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Bejelentkezési képernyő megjelenítése indításkor"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatikus bejelentkezés indításkor"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Frissítések elérhetők"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "perc"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Főmenü elemek"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Szakaszok"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "nem látott"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Videó lejátszólista"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Zenei lejátszólista"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Eseménynapló"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Válassz előbeállítást"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Utoljára frissítve"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Médiaforrások hozzáadása"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "készítette"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Kikapcsolási lehetőségek"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Címek"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Médiatár gyökere"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Film gyűjtemények"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Optikai lemez lejátszása"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Előző hely"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Következő hely"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Szereposztás nem elérhető"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Befejezési időpont"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Albuminfó"
@@ -84,10 +336,26 @@
 msgid "Lyrics add-on"
 msgstr "Dalszöveg kiegészítő"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Dalszöveg kiegészítő beállítások"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Vizualizáció beállítások"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Csatorna csoportok"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metaadatok"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Szolgáltató beállítások"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Tartalomkeresési lehetőségek"
@@ -96,10 +364,30 @@
 msgid "Available groups"
 msgstr "Elérhető csoportok"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Filmajánló keresése"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Felirat letöltése"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Videó menü"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Időjárás információ megjelenítése a felső sávban"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Médiajelzők megjelenítése a filmekhez / epizódokhoz / zenei videókhoz"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Dia animációk használata"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Helyi felirat elérhető"
@@ -112,6 +400,98 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Válaszd ki a Kodi felhasználói profilod[CR]a belépéshez"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Ikonfal"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "InfóFal"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Fal"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Ide írja a szöveget…"
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletext"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "SzélesLista"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Egyéni globális háttér használata"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Válassz kép útvonalat"
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Hangfolyam ki- és bekapcsolása"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Helyi könyvtár keresése"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "YouTube keresés"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr " TheMovieDB keresés"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Főmenü elem eltávolítása"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Csomópontok szerkesztése"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Belépés a kiegészítő böngészőbe"
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Időjárás-szolgáltató beállítása"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Nem látott TV sorozatok"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Egyazon rendező"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Képek megjelenítése a térképen"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Nyomja meg a fel gombot a színész információkhoz"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Nyomjon OK-t a tartalom elolvasához"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Ikonok megjelenítése"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Közreműködők"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.hy_am/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.id_id/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.is_is/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.it_it/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Cerca"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Mostra fanart elementi come sfondo"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Modalità cinema"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Cambia modalità"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Guarda come 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Film casuali"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Film non visti"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Scarica icone"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Film in corso"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Album più riprodotti"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Album casuali"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Artisti casuali"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Album non riprodotti"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Registrazioni recenti"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Canali riprodotti di recente"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Canali più riprodotti"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Previsioni"
@@ -36,10 +96,70 @@
 msgid "Misc options"
 msgstr "Opzioni varie"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Ordina per"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Tipo di vista"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Prossime tracce"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Nessun preferito trovato. Puoi aggiungere qualunque elemento dalle viste multimediali a questa lista usando il menù contestuale."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Vai agli Album"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Vai ai Brani"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Mostra fanart"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Ultimo login"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Memoria usata"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Info versione"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Ordina"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Tuo voto"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Info Estese"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Pagine"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "elementi"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Lista tracce"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Indietro"
@@ -48,10 +168,22 @@
 msgid "Fast forward"
 msgstr "Avanti veloce"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Annulla aggiornamento"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Produttore fotocamera"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Opzioni Playlist"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Imposta il tipo e aggiungi regole per creare una playlist intelligente. Queste playlist sono dinamiche e includono tutti gli elementi multimediali dal tuo database che rispettano le regole scelte."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Aggiungi gruppo"
@@ -64,18 +196,142 @@
 msgid "Delete group"
 msgstr "Cancella gruppo"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Leggi altro..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Disponibile"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Premi [B]Su[/B] per riavvolgere o avanzare velocemente"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Premi [B]OK[/B] per fermare"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Scorri lingua"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtrati"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Basato su Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Premi [B]Sinistra[/B] per riavvolgere, o [B]Destra[/B] per avanzare velocemente"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Scarica Sottotitolo"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Vai a Playlist"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Mostra schermata login all'avvio"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Login automatico all'avvio"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Aggiornamenti disponibili"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minuti"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Elementi menù principale"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Collegamenti alle sezioni \"File\" di ogni tipo di contenuto. Vai li per aggiungere sorgenti aggiuntive per i tuoi database."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sezioni"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "non visti"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Playlist Video"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Playlist Musicale"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Log eventi"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Scegli predefiniti"
+
 msgctxt "#31069"
 msgid "Last Updated"
-msgstr "Ultimo aggiornamento"
+msgstr "Ultimo agg."
+
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Aggiungi sorgenti"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "da"
 
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Opzioni Alimentazione"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Titoli"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Root Libreria"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Raccolte di Film"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Riproduci disco ottico"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Località precedente"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Prossima località"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Cast non disponibile"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Termina alle"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Info Album"
@@ -84,22 +340,58 @@
 msgid "Lyrics add-on"
 msgstr "Add-on Testi"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Impostazioni Add-On Testi"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Impostazioni visualizzazione"
+
 msgctxt "#31085"
 msgid "Channel Group"
-msgstr "Gruppo canali"
+msgstr "Gruppo Canali"
+
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadati"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Impostazioni Provider"
 
 msgctxt "#31088"
 msgid "Content scanning options"
-msgstr "Opzioni Scansione Contenuto"
+msgstr "Opzioni scansione contenuto"
 
 msgctxt "#31089"
 msgid "Available groups"
 msgstr "Gruppi disponibili"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Cerca trailer"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Scarica Sottotitoli"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Menù Video"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Mostra info Meteo nella barra superiore"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Mostra etichette media per film / episodi / video musicali"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Usa animazioni scorrimento"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Sottotitolo locale disponibile"
@@ -112,6 +404,134 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Scegli il tuo profilo utente Kodi[CR]per fare login e continuare"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Muro di Icone"
+
 msgctxt "#31100"
 msgid "Shift"
-msgstr "Maiusc."
+msgstr "Sposta"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Muro Info"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Muro"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Inserisci testo..."
+
+msgctxt "#31104"
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "La tua Libreria è attualmente vuota. Per riempirla con i tuoi file multimediali personali, entra nella sezione \"File\", aggiungi una sorgente multimediale e configurala. Dopo che la sorgente sarà stata aggiunta e indicizzata potrai sfogliare la tua Libreria."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Aggiungi sorgenti video e imposta il contenuto appropriato per poter riempire le tue librerie video."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletext"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Lista Larga"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Usa sfondo globale personalizzato"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Scegli percorso immagine"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Inserisci sezione file"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Vedi le tue immagini personali o scarica uno dei tanti Add-On immagini dalla repository ufficiale."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Scorri traccia audio"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Cerca nella libreria locale"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Cerca su Youtube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Cerca su TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Rimuovi questo elemento menù principale"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Modifica nodi"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Inserisci browser Add-On"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Non hai ancora alcun Add-On installato. Visita il nostro browser Add-On per sfogliare la nostra collezione e migliorare la tua esperienza Kodi."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Non hai ancora impostato un provider meteo. Per poter vedere le informazioni meteo, scegli un provider meteo e imposta la tua località."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Imposta provider meteo"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Serie TV non viste"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Stesso regista"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Mostra immagini sulla mappa"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Premi Su per info attore"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Premi OK per leggere la trama"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Mostra icone"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Collaboratori"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Impostazioni generali che si applicano a tutte le aree della skin."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Impostazioni relative al menù principale: Configura la schermata home come ti piace."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Scegli pacchetto fanart home"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ja_jp/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ko_kr/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.lt_lt/strings.po Changed

@@ -28,9 +28,17 @@
 msgid "Show media fanart as background"
 msgstr "Rodyti media įrašo Fanart fone"
 
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Kino teatro režimas"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Pakeisti režimą"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Nebaigti žiūrėti filmai"
+msgid "Watch as 2D"
+msgstr "Žiūrėti 2D režimu"
 
 msgctxt "#31006"
 msgid "Random movies"
@@ -40,10 +48,6 @@
 msgid "Unwatched movies"
 msgstr "Neperžiūrėti filmai"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Nebaigtos žiūrėti TV laidos"
-
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Atsisiųsti piktogramas"
@@ -73,12 +77,8 @@
 msgstr "Naujausi įrašai"
 
 msgctxt "#31016"
-msgid "Favourite channels"
-msgstr "Mėgstamiausieji kanalai"
-
-msgctxt "#31017"
-msgid "Recent channels"
-msgstr "Naujausi kanalai"
+msgid "Recently played channels"
+msgstr "Neseniai žiūrėti kanalai"
 
 msgctxt "#31018"
 msgid "Most played channels"
@@ -150,11 +150,11 @@
 
 msgctxt "#31035"
 msgid "Pages"
-msgstr "Puslapiai"
+msgstr "Pusl."
 
 msgctxt "#31036"
 msgid "items"
-msgstr "elementai"
+msgstr "elem."
 
 msgctxt "#31037"
 msgid "Tracklist"
@@ -209,12 +209,12 @@
 msgstr "Paspauskite [B]aukštyn[/B] norėdami prasukti atgal ar į priekį"
 
 msgctxt "#31050"
-msgid "Press [B]Down[/B] to stop, or [B]Right[/B] to fast-forward"
-msgstr "Paspauskite [B]žemyn[/B] norėdami sustabdyti ar [B]dešinėn[/B], jei norite prasukti į priekį"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Paspauskite [B]OK[/B] norėdami sustabdyti"
 
 msgctxt "#31051"
-msgid "Press [B]Down[/B] to stop, or [B]Left[/B] to rewind"
-msgstr "Paspauskite [B]žemyn[/B] norėdami sustabdyti ar [B]kairėn[/B], jei norite prasukti atgal"
+msgid "Toggle language"
+msgstr "Perjungti kalbą"
 
 msgctxt "#31052"
 msgid "filtered"
@@ -254,7 +254,7 @@
 
 msgctxt "#31061"
 msgid "Main menu items"
-msgstr "Pagrindinio meniu elementai"
+msgstr "Meniu elementai"
 
 msgctxt "#31062"
 msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
@@ -304,6 +304,10 @@
 msgid "Titles"
 msgstr "Pavadinimai"
 
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Pradinis bibliotekos katalogas"
+
 msgctxt "#31075"
 msgid "Movie sets"
 msgstr "Filmų rinkiniai"
@@ -421,7 +425,7 @@
 msgstr "Įveskite tekstą čia..."
 
 msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
 msgstr "Jūsų biblioteka šiuo metu tuščia. Norėdami užpildyti ją asmeniniais media įrašais, eikite į \"Failų\" skyrių, pridėkite media šaltinį ir sukonfigūruokite jį. Kai šaltinis bus pridėtas ir suindeksuotas, galėsite naršyti po savo biblioteką."
 
 msgctxt "#31105"
@@ -453,8 +457,8 @@
 msgstr "Peržiūrėti asmeninius paveikslėlius ar atsisiųsti vieną iš daugelio atvaizdų priedų iš oficialios saugyklos."
 
 msgctxt "#31112"
-msgid "Small list"
-msgstr "Mažas sąrašas"
+msgid "Toggle audio stream"
+msgstr "Perjungti garso srautą"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -519,3 +523,15 @@
 msgctxt "#31128"
 msgid "Contributors"
 msgstr "Bendraautoriai"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Pagrindiniai nustatymai pritaikomi visoms teminės išvaizdoms sritims"
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Su pagrindiniu meniu susiję nustatymai: susikonfigūruokite pradinį ekraną taip kaip patinka"
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Pasirinkti pradinio ekrano Fanart paketą"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.lv_lv/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.mk_mk/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ms_my/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Gelintar"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Tunjuk seni peminat media sebagai latar belakang"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Mod wayang"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Ubah mod"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Tonton sebagai 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Cereka rawak"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Cereka belum ditonton"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Muat turun ikon"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Cereka masih bersiaran"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Album paling banyak dimainkan"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Album rawak"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Artis rawak"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Album belum dimainkan"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Rakaman baru-baru ini"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Saluran dimainkan baru-baru ini"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Saluran paling banyak dimainkan"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Ramalan"
@@ -36,10 +96,70 @@
 msgid "Misc options"
 msgstr "Pilihan lain"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Isih mengikut"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Jenis paparan"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Trek baharu"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Tiada kegemaran ditemui. Anda boleh tambah apa-apa item dari paparan media ke senarai ini menggunakan menu konteks."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Pergi ke album"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Pergi ke lagu"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Tunjuk seni peminat"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Daftar masuk terakhir"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Ingatan digunakan"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Maklumat versi"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Tertib"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Penarafan anda"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Maklumat lanjut"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Halaman"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "item"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Senarai trek"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Undur"
@@ -48,10 +168,22 @@
 msgid "Fast forward"
 msgstr "Maju pantas"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Batal kemaskini"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Pengilang kamera"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Pilihan senarai main"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Tetapkan jenis dan tambah peraturan untuk cipta senarai main pintar. Senarai main ini adalah dinamik dan sertakan semua item media dari pangkalan data anda yang laksanakan mengikut peraturan yang anda tetapkan."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Tambah kumpulan"
@@ -64,18 +196,142 @@
 msgid "Delete group"
 msgstr "Padam kumpulan"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Baca lagi..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Tersedia"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Tekan [B]Ke Atas[/B] untuk mandir atau maju-pantas"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Teka [B]OK[/B] untuk henti"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Togol bahasa"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "ditapis"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Berasaskan Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Tekan [B]Kiri[/B] untuk mandir, atau [B]Kanan[/B] untuk maju-pantas"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Muat turun sarikata"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Pergi ke senarai main"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Tunjuk skrin daftar masuk ketika permulaan"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Daftar masuk automatik ketika permulaan"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Kemaskini tersedia"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minit"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Item menu utama"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Pintasan pada seksyen \"Fail\" bagi setiap jenis media. Pergi di sana untuk tambah sumber tamabahan untuk pangkalan data anda."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Seksyen"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "belum ditonton"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Senarai main video"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Senarai main muzik"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Log peristiwa"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Pilih praset"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Kemaskini Terakhir"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Tambah sumber media"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "oleh"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Opsyen Kuasa"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Tajuk"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Root pustaka"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Set cereka"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Main cakera optik"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Lokasi terdahulu"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Lokasi berikutnya"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Barisan pelakon tidak tersedia"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Tamat pada"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Maklumat album"
@@ -84,10 +340,26 @@
 msgid "Lyrics add-on"
 msgstr "Tambahan lirik"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Tetapan tambahan lirik"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Tetapan pengvisualan"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Kumpulan Saluran"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Data meta"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Tetapan penyedia"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Pilihan pengimbasan kandungan"
@@ -96,10 +368,30 @@
 msgid "Available groups"
 msgstr "Kumpulan tersedia"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Gelintar treler"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Muat turun sari kata"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Menu video"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Tunjuk maklumat cuaca pada palang atas"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Tunjuk bendera media untuk cereka / episod / video muzik"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Guna animasi leret"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Sarikata setempat tersedia"
@@ -112,6 +404,134 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Pilih Profil pengguna Kodi anda[CR]untuk daftar masuk dan teruskan"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Dinding Ikon"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "DindingInfo"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Dinding"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Masukkan teks di sini..."
+
+msgctxt "#31104"
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "Pustaka anda buat masa ini masih kosong. Untuk mengisinya dengan media persendirian anda, masuk ke seksyen \"Fail\", tambah sumber media dan konfigurkannya. Selepas sumber telah ditambah dan diindekskan anda dapat melayari pustaka anda."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Tambah sumber video dan tetapkan jenis kandungan yang sesuai untuk mengisi pustaka video anda."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teleteks"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "SenaraiLebar"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Guna latar belakang sejagat suai"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Pilih laluan imej"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Masukkan seksyen fail"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Lihat gambar peribadi anda atau muat turun salah satu tambahan imej dari repositori rasmi."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Togol strim audio"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Gelintar pustaka setempat"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Gelintar YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Gelintar TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Buang item menu utama ini"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Sunting nod"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Masukkan pelayar tambahan"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Anda belum lagi mempunyai tambahan yang terpasang. Lawati pelayar tambahan untuk melayari koleksi kami dan tambah baik Kodi anda."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Anda belum lagi menetapkan penyedia cuaca. Untuk dapat melihat maklumat cuaca, pilih satu penyedia cuaca dan tetapkan lokasi anda."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Tetapkan penyedia cuaca"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Rancangan TV Belum Ditonton"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Pengarah yang sama"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Tunjuk imej pada peta"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Tekan ke atas untuk maklumat pelakon"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Tekan OK untuk baca plot"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Tunjuk ikon"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Penyumbang"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Tetapan am dilaksanakan ke semua kawasan kulit."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Tetapan berkaitan-menu utama: Konfigur skrin rumah mengikut citarasa anda."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Pilih pek seni peminat rumah"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.mt_mt/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.nb_no/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.nl_nl/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Zoeken"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Toon media fanart als achtergrond"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Bioscoopmodus"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Verander modus"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Bekijk als 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Willekeurige films"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Niet bekeken films"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Download pictogrammen"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Lopende films"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Meest afgespeelde albums"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Willekeurige albums"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Willekeurige artiesten"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Niet afgespeelde albums"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Recente opnames"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Onlangs afgespeelde kanalen"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Meest gespeelde kanalen"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Voorspelling"
@@ -36,10 +96,70 @@
 msgid "Misc options"
 msgstr "Overige opties"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Sorteer op"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Viewtype"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Volgende nummers"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Geen favorieten gevonden. U kunt ieder item uit media weergaven toevoegen aan deze lijst middels het context menu."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Ga naar albums"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Ga naar liedjes"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Toon fanart"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Laatst ingelogd op"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Geheugen gebruikt"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Versie info"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Volgorde"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Uw waardering"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Uitgebreide info"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Pagina's"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "items"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Nummerlijst"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Terugspoelen"
@@ -48,10 +168,22 @@
 msgid "Fast forward"
 msgstr "Vooruitspoelen"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Annuleer update"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Camera fabrikant"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Afspeellijst opties"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Stel het type in en voeg regels toe om een slimme afspeellijst te maken. Deze afspeellijst zijn dynamisch en bevatten alle media items vanuit uw database die voldoen aan uw gekozen regels."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Voeg groep toe"
@@ -64,18 +196,142 @@
 msgid "Delete group"
 msgstr "Verwijder Groep"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Lees meer..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Beschikbaar"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Kies [B]Up[/B] voor terugspoelen of snel vooruit"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Druk [B]Ok[/B] om te stoppen"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Scroll taal"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "gefilterd"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Gebaseerd op Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Druk [B]Links[/B] om terug te spoelen of [B]Rechts[/B] voor snel vooruit"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Ondertitel download"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Ga naar afspeellijst"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Toon inlogscherm bij opstarten"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatisch inloggen tijens opstarten"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Updates beschikbaar"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minuten"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Hoofdmenu items"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Snelkoppeling naar de \"bestanden\" sectie van elk mediatype. Ga daarheen om extra bronnen toe te voegen aan uw databases."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Secties"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "niet bekeken"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Video playlist"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Music playlist"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Gebeurtenis registratie"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Kies voorinstellingen"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Laatst bijgewerkt"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Voeg media bronnen toe"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "door"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Energiebeheer"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Titels"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Library root"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Filmsets"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Speel optische schijf af"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Vorige locatie"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Volgende locatie"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Uitzending niet beschikbaar"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Eindigt om"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Albuminformatie"
@@ -84,10 +340,26 @@
 msgid "Lyrics add-on"
 msgstr "Songtekst add-on"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Songtekst add-on instellingen"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Visualisatie instellingen"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Kanaal groep"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadata"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Provider instellingen"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Opties inhoudsscanner"
@@ -96,10 +368,30 @@
 msgid "Available groups"
 msgstr "Beschikbare groepen"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Zoek trailer"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Download ondertitels"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Video menu"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Toon weerbericht in bovenbalk"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Toon media markering voor films / afleveringen / muziek video's"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Gebruik schuif animaties"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Lokale ondertitel beschikbaar"
@@ -112,6 +404,122 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Selecteer jouw Kodi Gebruikersprofiel[CR]om in te loggen en door te gaan"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Icoon Muur"
+
 msgctxt "#31100"
 msgid "Shift"
-msgstr "Shift"
+msgstr "Scheiden"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Infomuur"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Muur"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Voor hier tekst in..."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Voeg video bronnen toe en stel het juiste content type in om uw video bibliotheken te vullen."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletekst"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Breedelijst"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Gebruik aangepaste globale achtergrond"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Kies afbeelding locatie"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Geef bestandensectie"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Toon uw persoonlijke afbeeldingen of download één van de vele afbeeldingsadd-ons uit de officiële repository."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Toggle audio stream"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Zoek lokale bibliotheek"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Zoek YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Zoek TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Verwijder dit hoofdmenu item"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Wijzig nodes"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Invoeren add-on verkenner"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "U heeft nog geen add-ons geïnstalleerd. Bezoek onze add-on verkenner om door onze collectie te browsen en uw Kodi beleving te verbeteren."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "U heeft nog geen weerbericht provider ingesteld. Om weerberichten te zien, kies een weerprovider en stel uw locatie in."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Stel weerprovider in"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Niet bekeken TV series"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Zelfde regisseur"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Toon afbeeldingen op kaart"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Kies 'Omhoog' voor acteursinformatie"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Kies 'OK' om het plot te lezen"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Toon pictogrammen"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Bijdragers"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Algemene instellingen die van toepassing zijn op alle onderdelen van de skin."

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.pl_pl/strings.po Changed

@@ -24,6 +24,46 @@
 msgid "Search"
 msgstr "Szukaj"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Pokazuj fototapety mediów w tle interfejsu"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Tryb kinowy"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Zmień tryb "
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Odtwarzaj w trybie 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Filmy losowe"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Film nieobejrzane"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Pobierz ikony"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Filmy w trakcie oglądania"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Albumy najczęściej odtwarzane"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Albumy losowe"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Prognoza"
@@ -36,10 +76,66 @@
 msgid "Misc options"
 msgstr "Opcje dodatkowe"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Sortuj"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Widok"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Kolejne utwory"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Przejdź do albumów"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Przejdź do utworów"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Pokazuj fototapetę"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Ostatnio zalogowany"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Użycie pamięci"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Informacje o wersji"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Kolejność"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Twoja ocena"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Rozszerzone"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Strony"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "pozycji"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Lista utworów"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Cofnij"
@@ -48,6 +144,10 @@
 msgid "Fast forward"
 msgstr "Przewiń"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Anuluj aktualizację"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Opcje listy odtwarzania"
@@ -64,18 +164,118 @@
 msgid "Delete group"
 msgstr "Usuń grupę"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Więcej informacji..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Dostępne"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Przełącz język"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Bazujące na Arialu"
 
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Pobierz napisy"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Przejdź do listy odtwarzania"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Pokazuj ekran logowania po uruchomieniu"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Loguj automatycznie po uruchomieniu"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Dostępne aktualizacje"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minut"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Pozycje menu startowego"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sekcje"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "nieobejrzane"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Lista wideo"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Lista utworów"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Dziennik zdarzeń"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Wybierz szablon"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Ostatnia aktualizacja"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Dodaj źródła mediów"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "po"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Opcje zasilania"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Tytuły"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Serie filmowe"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Odtwarzaj dysk"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Poprzednia lokalizacja"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Następna lokalizacja"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Brak obsady"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Koniec o"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Informacje o albumie"
@@ -84,10 +284,26 @@
 msgid "Lyrics add-on"
 msgstr "Dodatek Tekst utworu"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Ustawienia dodatku tekstu utworu"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Ustawienia wizializacji"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Grupa kanałów"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadane"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Ustawienia dostawcy"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Opcje skanowania zawartości"
@@ -96,10 +312,30 @@
 msgid "Available groups"
 msgstr "Dostępne grupy"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Szukaj zwiastunu"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Pobierz napisy"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Menu wideo"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Pokazuj informacje o pogodzie w górnym pasku"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Pokazuj etykiety mediów dla filmów /odcinków / teledysków"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Używaj animacji przesuwania"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Dostępne lokalne napisy"
@@ -115,3 +351,39 @@
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Wprowadź tekst..."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletekst"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Używaj niestandardowego globalnego tła"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Wybierz ścieżkę do folderu z obrazem"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Seriale nieobejrzane"
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Ustaw dostawcę pogody"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Seriale nieobejrzane"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Pokazuj obrazy na mapie"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Pokazuj ikony"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.pt_br/strings.po Changed

@@ -24,9 +24,21 @@
 msgid "Search"
 msgstr "Buscar"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Mostrar fanart de mídia como imagem de fundo."
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Modo cinema"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Alterar modo"
+
 msgctxt "#31005"
-msgid "In-progress movies"
-msgstr "Filmes em progresso"
+msgid "Watch as 2D"
+msgstr "Assistir como 2D"
 
 msgctxt "#31006"
 msgid "Random movies"
@@ -36,10 +48,6 @@
 msgid "Unwatched movies"
 msgstr "Filmes por assistir"
 
-msgctxt "#31008"
-msgid "In-progress TV Shows"
-msgstr "Seriados em progresso"
-
 msgctxt "#31009"
 msgid "Download icons"
 msgstr "Donwload ícones"
@@ -69,12 +77,8 @@
 msgstr "Gravações recentes"
 
 msgctxt "#31016"
-msgid "Favourite channels"
-msgstr "Canais favoritos"
-
-msgctxt "#31017"
-msgid "Recent channels"
-msgstr "Canais recentes"
+msgid "Recently played channels"
+msgstr "Canais assistidos recentemente"
 
 msgctxt "#31018"
 msgid "Most played channels"
@@ -205,12 +209,12 @@
 msgstr "Pressione [B]Acima[/B] para retroceder ou retroceder rapidamente"
 
 msgctxt "#31050"
-msgid "Press [B]Down[/B] to stop, or [B]Right[/B] to fast-forward"
-msgstr "Pressione [B]Baixo[/B] para parar, ou [B]Direita[/B] para avançar rapidamente"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Aperte [B]OK[/B] para parar"
 
 msgctxt "#31051"
-msgid "Press [B]Down[/B] to stop, or [B]Left[/B] to rewind"
-msgstr "Pressione [B]Baixo[/B] para parar, ou [B]Esquerda[/B] para retroceder"
+msgid "Toggle language"
+msgstr "Alterar língua"
 
 msgctxt "#31052"
 msgid "filtered"
@@ -421,8 +425,8 @@
 msgstr "Entre com o texto aqui..."
 
 msgctxt "#31104"
-msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library. "
-msgstr "Sua coleção atualmente está vazia. Para ter seus itens pessoais em modo coleção, entre na seção \"Arquivos\", adicione uma fonte de vídeo e configure-o. Após a fonte ser adicionada e tiver sido indexada, você sera capaz de navegar em sua coleção."
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "Sua coleção atualmente está vazia. Para ter seus itens pessoais em modo coleção, entre na seção \"Arquivos\", adicione uma fonte de vídeo e configure. Após a fonte ser adicionada e tiver sido indexada, você será capaz de navegar em sua coleção."
 
 msgctxt "#31105"
 msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
@@ -453,8 +457,8 @@
 msgstr "Visualizar suas imagens pessoais ou transferir um dos muitos addons de imagens disponíveis no repositório oficial."
 
 msgctxt "#31112"
-msgid "Small list"
-msgstr "Lista pequena"
+msgid "Toggle audio stream"
+msgstr "Alterar canal de áudio"
 
 msgctxt "#31113"
 msgid "Search local library"
@@ -511,3 +515,23 @@
 msgctxt "#31126"
 msgid "Press OK to read plot"
 msgstr "Pressione OK para ler sinopse"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Mostrar ícones"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Contribuidores"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Ajustes gerais aplicam-se a todas as área da skin."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Ajustes relacionados ao menu principal: Configure a tela da home de acordo com seu gosto pessoal."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Escolha pacote fanarts para home"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.pt_pt/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ro_ro/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.ru_ru/strings.po Changed

@@ -24,6 +24,38 @@
 msgid "Search"
 msgstr "Поиск"
 
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Изменить режим"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Смотреть в 2D"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Случайные альбомы"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Случайные исполнители"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Непрослушанные альбомы"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Недавние записи"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Недавно проигранные каналы"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Самые проигрываемые каналы"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Прогноз"
@@ -36,10 +68,34 @@
 msgid "Misc options"
 msgstr "Другие параметры"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Сорт. по"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Перейти к альбомам"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Перейти к композициям"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Последний вход"
 
+msgctxt "#31032"
+msgid "Order"
+msgstr "Порядок"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Страницы"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "Объекты"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Перемотка назад"
@@ -48,6 +104,14 @@
 msgid "Fast forward"
 msgstr "Перемотка вперед"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Отменить обновление"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Производитель камеры"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Параметры плейлиста"
@@ -64,14 +128,50 @@
 msgid "Delete group"
 msgstr "Удалить группу"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Читать далее..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Доступно"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Нажмите [B]OK[/B] для остановки"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Переключить язык"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "На основе Arial"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Нажмите [B]Влево[/B] для перемотки назад или [B]Вправо[/B] для перемотки вперед"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Доступны обновления"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "мин."
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Журнал событий"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Последнее обновление"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Добавить источники медиаданных"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Настройки питания"
@@ -84,6 +184,10 @@
 msgid "Lyrics add-on"
 msgstr "Дополнение текстов песен"
 
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Настройки визуализации"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Группа каналов"
@@ -100,6 +204,14 @@
 msgid "Download subtitles"
 msgstr "Загрузить субтитры"
 
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Показывать сведения о погоде на верхней панели"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Использовать скользящую анимацию"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Доступны локальные субтитры"
@@ -112,6 +224,38 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Выберите профиль пользователя Kodi,[CR]чтобы войти и продолжить"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Стена иконок"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Стена информации"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Стена"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Введите текст здесь..."
+
+msgctxt "#31104"
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "Ваша библиотека сейчас пуста. Чтобы заполнить её данными войдите в раздел \"Файлы\", добавьте медиаисточник и настройте его. После того как источник будет добавлен и проиндексирован вы сможете просматривать библиотеку."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Добавьте медиаисточник и установите правильный тип его содержимого для заполнения видеобиблиотеки."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Телетекст"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Широкий список"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.sk_sk/strings.po Changed

@@ -18,12 +18,72 @@
 
 msgctxt "#31000"
 msgid "Now playing"
-msgstr "Práve hrá"
+msgstr "Prehráva sa"
 
 msgctxt "#31001"
 msgid "Search"
 msgstr "Hľadať"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Zobraziť fanart médií ako pozadie"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Režim kina"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Zmeniť režim"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Pozerať ako 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Náhodné filmy"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Nepozreté filmy"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Prevziať ikony"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Rozpozerané filmy"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Najprehrávanejšie albumy"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Náhodné albumy"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Náhodní interpreti"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Neprehraté albumy"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Nedávne nahrávky"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Nedávno prehrávané kanály"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Najsledovanejšie kanály"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Predpoveď"
@@ -34,23 +94,95 @@
 
 msgctxt "#31021"
 msgid "Misc options"
-msgstr "Ďalšie nastavenia"
+msgstr "Ďalšie možnosti"
+
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Usporiadať podľa"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "TypZobrazenia"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Nasledujúce skladby"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Nenašli sa žiadne obľúbené položky. Akúkoľvek položku z prehľadov médií môžete pridať do tohto zoznamu použitím kontextovej ponuky."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Prejsť na albumy"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Prejsť na skladby"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Zobraziť fanart"
 
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Posledné prihlásenie"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Použitá pamäť"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Informácie o verzii"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Poradie"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Vaše hodnotenie"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Rozšírené informácie"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Stránky"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "položky"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Zoznam skladieb"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Pretočiť dozadu"
 
 msgctxt "#31039"
 msgid "Fast forward"
-msgstr "Posunúť dopredu"
+msgstr "Pretočiť dopredu"
+
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Zrušiť aktualizáciu"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Výrobca fotoaparátu"
 
 msgctxt "#31042"
 msgid "Playlist options"
-msgstr "Nastavenia Playlistu"
+msgstr "Možnosti zoznamu skladieb"
+
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Nastavte typ a pridajte pravidlá pre vytvorenie inteligentného zoznamu skladieb. Tieto zoznamy skladieb sú dynamické a zahŕňajú všetky položky médií z vašej databázy, ktoré zodpovedajú zvoleným pravidlám."
 
 msgctxt "#31044"
 msgid "Add group"
@@ -62,19 +194,143 @@
 
 msgctxt "#31046"
 msgid "Delete group"
-msgstr "Vymazať skupinu"
+msgstr "Odstrániť skupinu"
+
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Čítať viac..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "K dispozícii"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Stlačte [B]nahor[/B] pre rýchle pretáčanie dozadu alebo dopredu"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Stlačte [B]OK[/B] pre zastavenie"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Prepnúť jazyk"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtrované"
 
 msgctxt "#31053"
 msgid "Arial based"
-msgstr "Arial"
+msgstr "Písmo založené na Arial"
+
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Stlačte [B]doľava[/B] pre rýchle pretáčanie dozadu alebo [B]doprava[/B] pre rýchle pretáčanie dopredu"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Prevzatie titulkov"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Prejsť na zoznam skladieb"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Zobraziť prihlasovaciu obrazovku pri spustení"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatické prihlásenie pri spustení"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "K dispozícii sú aktualizácie"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minúty"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Položky hlavnej ponuky"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Odkazy k sekcii \"Súbory\" pre každý typ média. Prejdite tam, pokiaľ chcete pridať ďalšie zdroje pre vaše databázy."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sekcie"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "nepozreté"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Zoznam videí"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Hudobný zoznam skladieb"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Denník udalostí"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Vybrať predvoľby"
 
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Naposledy aktualizované"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Pridať zdroje médií"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "od"
+
 msgctxt "#31072"
 msgid "Power Options"
-msgstr "Napájanie"
+msgstr "Možnosti napájania"
+
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Názvy"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Hlavný adresár knižnice"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Filmové kolekcie"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Prehrať optický disk"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Predchádzajúce umiestnenie"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Nasledujúce umiestnenie"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Obsadenie nie je k dispozícii"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Končí v"
 
 msgctxt "#31081"
 msgid "Album info"
@@ -82,23 +338,63 @@
 
 msgctxt "#31082"
 msgid "Lyrics add-on"
-msgstr "Doplnok Texty skladieb"
+msgstr "Doplnok textov skladieb"
+
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Nastavenia doplnku textov skladieb"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Nastavenia vizualizácií"
 
 msgctxt "#31085"
 msgid "Channel Group"
-msgstr "Skupina kanálu"
+msgstr "Skupina kanálov"
+
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadáta"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Nastavenia poskytovateľa"
 
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Možnosti vyhľadávania obsahu"
 
+msgctxt "#31089"
+msgid "Available groups"
+msgstr "Dostupné skupiny"
+
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Hľadať upútavku"
+
 msgctxt "#31091"
 msgid "Download subtitles"
-msgstr "Stiahnuť titulky"
+msgstr "Prevziať titulky"
+
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Ponuka videa"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Zobraziť počasie v hornej lište"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Zobrazovať vlastnosti médií pre filmy / epizódy / hudobné videá"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Použiť animácie kĺzania"
 
 msgctxt "#31096"
 msgid "Local subtitle available"
-msgstr "Dostupné lokálne titulky"
+msgstr "Miestne titulky sú k dispozícii"
 
 msgctxt "#31097"
 msgid "Channel options"
@@ -106,8 +402,136 @@
 
 msgctxt "#31098"
 msgid "Select your Kodi user profile[CR]to login and continue"
-msgstr "Vyberte váš používateľský profil Kodi[CR]pre prihlásenie a pokračovanie"
+msgstr "Zvoľte si profil používateľa Kodi[CR]pre prihlásenie a pokračovanie"
+
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Ikony"
 
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Info nástenka"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Nástenka"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Sem zadajte text..."
+
+msgctxt "#31104"
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "Vaša knižnica je v tejto chvíli prázdna. Aby ste ju zaplnili vašimi osobnými médiami, vstúpte to sekcie \"Súbory\", pridajte zdroj médií a nakonfigurujte ho. Po pridaní zdroja a jeho zindexovaní budete môcť prehľadávať vašu knižnicu."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Pridajte zdroje videí a nastavte správny typ obsahu pre naplnenie vašich knižníc videí."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletext"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Široký zoznam"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Použiť vlastné globálne pozadie"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Vybrať cestu k obrázku"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Vstúpiť do sekcie súborov"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Zobrazte vaše osobné obrázky alebo si prevezmite jeden z mnohých obrázkových doplnkov z oficiálneho repozitára."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Prepnúť zvukovú stopu"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Hľadať v miestnej knižnici"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Hľadať na YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Hľadať na TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Odobrať túto položku hlavnej ponuky"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Upraviť uzly"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Vstúpiť do prehliadača doplnkov"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Zatiaľ nemáte nainštalované žiadne doplnky. Navštívte náš prehliadač doplnkov, preskúmajte našu kolekciu a vylepšite si váš zážitok s Kodi."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Zatiaľ ste nenastavili poskytovateľa dát o počasí. Aby bolo možné zobraziť informácie o počasí, zvoľte si poskytovateľa a vašu polohu."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Nastaviť poskytovateľa počasia"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Nepozreté TV seriály"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Rovnaký režisér"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Zobraziť obrázky na mape"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Stlačte nahor pre zobrazenie informácií o hercovi"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Stlačte OK pre zobrazenie deja"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Zobraziť ikony"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Prispievatelia"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Všeobecné nastavenia týkajúce sa všetkých oblastí vzhľadu."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Nastavenia týkajúce sa hlavnej ponuky: Nastavte si domovskú obrazovku podľa vašich predstáv."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Vybrať domovský fanart balík"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.sl_si/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.sr_rs/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.sr_rs@latin/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Pretraga"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Prikaži slike ljubitelja kao pozadinu"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Bioskopski režim"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Promeni režim"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Gledaj kao 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Nasumični filmovi"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Neodgledani filmovi"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Preuzmi ikonice"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Filmovi u toku"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Najslušaniji albumi"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Nasumični albumi"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Nasumični izvođači"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Nepreslušani albumi"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Skorašnji snimci"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Skorašnji kanali"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Najslušaniji kanali"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Prognoza"
@@ -36,10 +96,66 @@
 msgid "Misc options"
 msgstr "Ostale opcije"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Poređaj po"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Prikaz"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Sledeće pesme"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Idi u albume"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Idi u pesme"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Prikaži slike ljubitelja"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Poslednja prijava"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Iskorišćena memorija"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Informacije o verziji"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Redosled"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Vaša ocena"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Dodatne informacije"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Stranice"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "stavke"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Lista pesama"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Premotaj unazad"
@@ -48,6 +164,14 @@
 msgid "Fast forward"
 msgstr "Premotaj unapred"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Otkaži nadogradnju"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Proizvođač kamere"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Opcije liste za reprodukciju"
@@ -64,18 +188,138 @@
 msgid "Delete group"
 msgstr "Izbriši grupu"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Pročitaj više..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Dostupno"
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Pritisni [B]Gore[/B] za premotavanje unapred"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Pritisni [B]U Redu[/B] za zaustavljanje"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Promeni jezik"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filterisano"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Zasnovano na Arial-u"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Pritisni [B]Levo[/B] za premotavanje, ili [B]Desno[/B] za motanje unapred"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Preuzimanje prevoda"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Idi na listu za reprodukciju"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Prikaži ekran za prijavu pri uključivanju"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatska Prijava pri uključivanu"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Dostupne nadogradnje"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minuti"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Stavke glavnog izbornika"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sekcije"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "neodgledano"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Video lista"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Muzička lista"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Izveštaj događaja"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Izaberi podešavanja"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Poslednje ažuriranje"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Dodaj izvore medija"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "od strane"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Opcije napajanja"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Naslovi"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Koren biblioteke"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Filmski kompleti"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Pusti optički disk"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Prethodna lokacija"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Sledeća lokacija"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Uloge nisu dostupne"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Završava se u"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Podaci o albumu"
@@ -84,18 +328,58 @@
 msgid "Lyrics add-on"
 msgstr "Dodatni program za tekstove pesama"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Dodatak za tekstove pesama"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Podešavanja vizuelizacije"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Grupa programa"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Meta podaci"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Podešavanja provajdera"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Opcije analiziranja sadržaja"
 
+msgctxt "#31089"
+msgid "Available groups"
+msgstr "Dostupne grupe"
+
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Traži najavu"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Preuzmi titlove"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Video izbornik"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Prikaži informacije o prognozi pri vrhu"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Prikaži medijske zastavice za filmove / epizode / muzičke spotove"
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Koristi klizeće animacije"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Lokalni prevod dostupan"
@@ -108,6 +392,106 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Izaberite vaš Kodi korisnički profil[CR]za prijavu, a potom nastavite dalje"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Zid Ikonica"
+
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "InfoZid"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Zid"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Unesi tekst ovde..."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teletekst"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "ŠirokaLista"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Koristi prilagoćenu globalnu pozadinu"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Izaberi putanju slike"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Uđi u sekciju datoteka"
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Menjaj audio zapis"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Pretraži lokalnu biblioteku"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Pretraži YouTube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Pretraži TheMovieDB"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Ukloni ovu stavku iz glavnog izbornika"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Izmeni grane"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Otvori pregledač dodataka"
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Izaberi dostavljača prognoze"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "Neodgledane TV Serije"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Isti režiser"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Prikaži slike na mapi"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Pritisni na gore za informacije o glumcu"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Pritisni U Redu da pročitaš opis"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Prikaži ikonice"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Autori"
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Izaberi paket slika ljubitelja za glavnu stranu"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.sv_se/strings.po Changed

@@ -24,6 +24,58 @@
 msgid "Search"
 msgstr "Sök"
 
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Bio-läge"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Ändra läge"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "Se i 2D"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Slumpmässiga filmer"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "Osedda filmer"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Ladda ner ikoner"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Pågående filmer"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "Mest spelade album"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Slumpmässiga album"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Slumpmässiga artister"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Ospelade album"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "Nya inspelningar"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "Mest spelade kanaler"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Prognos"
@@ -36,10 +88,66 @@
 msgid "Misc options"
 msgstr "Övriga val"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Sortera efter"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Vytyp"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Nästa spår"
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Gå till album"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Go till låtar"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Visa fanart"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Senast inloggad"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Använd minne"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Versionsinfo"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Ordning"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Ditt betyg"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Utökad info"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Sidor"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "objekt"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Spellista"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Spola bakåt"
@@ -48,6 +156,14 @@
 msgid "Fast forward"
 msgstr "Spola fram"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Avbryt uppdatering"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Kameratillverkare"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Alternativ för spellista"
@@ -64,18 +180,106 @@
 msgid "Delete group"
 msgstr "Ta bort grupp"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Läs mer..."
+
+msgctxt "#31048"
+msgid "Available"
+msgstr "Tillgänglig"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Tryck på [B]OK[/B] för att stoppa"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Välj språk"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtrerad"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Arialbaserad"
 
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Ladda ner undertext"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Gå till spellista"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Visa loginskärm vid uppstart"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Automatisk inloggning vid uppstart"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Uppdateringar tillgängliga"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "minuter"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Huvudmeny objekt"
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Sektioner"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "osedda"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Spellista för video"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Händelselogg"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
+msgctxt "#31071"
+msgid "by"
+msgstr "av"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Energialternativ"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Titlar"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Spela optisk skiva"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Föregående plats"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Nästa plats"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Slutar vid"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Albuminfo"
@@ -84,10 +288,22 @@
 msgid "Lyrics add-on"
 msgstr "Sångtextstillägg"
 
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Visualiseringsinställningar"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Kanalgrupp"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Metadata"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Inställningar för leverantör"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "Alternativ för innehållsskanning"
@@ -96,10 +312,22 @@
 msgid "Available groups"
 msgstr "Tillgängliga grupper"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Sök efter trailer"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Ladda hem undertexter"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Video-meny"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Visa media-flaggor för filmer / avsnitt / musikvideor"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Lokal undertext tillgänglig"
@@ -115,3 +343,59 @@
 msgctxt "#31100"
 msgid "Shift"
 msgstr "Shift"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Vägg"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Fyll i text här..."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Texttv"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Använd en anpassad global bakgrund"
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Välj ljudström"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Sök i det lokala biblioteket"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "Sök på Youtube"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "Sök i TheMovieDB"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Redigera noder"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "O-sedda TV-program"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Samma direktör"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Visa bilder på kartan"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Visa ikoner"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Medarbetare"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.szl/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.tg_tj/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.th_th/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.tr_tr/strings.po Changed

@@ -24,6 +24,66 @@
 msgid "Search"
 msgstr "Ara"
 
+msgctxt "#31002"
+msgid "Show media fanart as background"
+msgstr "Ortam fanartını arka plan olarak göster"
+
+msgctxt "#31003"
+msgid "Cinema mode"
+msgstr "Sinema modu"
+
+msgctxt "#31004"
+msgid "Change mode"
+msgstr "Modu değiştir"
+
+msgctxt "#31005"
+msgid "Watch as 2D"
+msgstr "2 boyutlu olarak izle"
+
+msgctxt "#31006"
+msgid "Random movies"
+msgstr "Rastgele filmler"
+
+msgctxt "#31007"
+msgid "Unwatched movies"
+msgstr "İzlenmemiş filmler"
+
+msgctxt "#31009"
+msgid "Download icons"
+msgstr "Simgeleri indir"
+
+msgctxt "#31010"
+msgid "In progress movies"
+msgstr "Devam eden filmler"
+
+msgctxt "#31011"
+msgid "Most played albums"
+msgstr "En sık çalınan albümler"
+
+msgctxt "#31012"
+msgid "Random albums"
+msgstr "Rastgele albümler"
+
+msgctxt "#31013"
+msgid "Random artists"
+msgstr "Rastgele sanatçılar"
+
+msgctxt "#31014"
+msgid "Unplayed albums"
+msgstr "Çalınmamış albümler"
+
+msgctxt "#31015"
+msgid "Recent recordings"
+msgstr "En son kayıtlar"
+
+msgctxt "#31016"
+msgid "Recently played channels"
+msgstr "Son oynatılan kanallar"
+
+msgctxt "#31018"
+msgid "Most played channels"
+msgstr "En sık oynatılan kanallar"
+
 msgctxt "#31019"
 msgid "Forecast"
 msgstr "Hava Tahmini"
@@ -36,10 +96,70 @@
 msgid "Misc options"
 msgstr "Çeşitli seçenekler"
 
+msgctxt "#31022"
+msgid "Sort by"
+msgstr "Sırala"
+
+msgctxt "#31023"
+msgid "Viewtype"
+msgstr "Görünüm türü"
+
+msgctxt "#31024"
+msgid "Next tracks"
+msgstr "Sonraki parçalar"
+
+msgctxt "#31025"
+msgid "No favourites found. You can add any item from media views to this list by using the context menu."
+msgstr "Hiçbir sık kullanılan bulunamadı. İçerik menüsünü kullanarak ortam görünümlerindeki herhangi bir öğeyi bu listeye ekleyebilirsiniz."
+
+msgctxt "#31026"
+msgid "Go to albums"
+msgstr "Albümlere git"
+
+msgctxt "#31027"
+msgid "Go to songs"
+msgstr "Şarkılara git"
+
+msgctxt "#31028"
+msgid "Show fanart"
+msgstr "Fanartı göster"
+
 msgctxt "#31029"
 msgid "Last logged in"
 msgstr "Son giriş yapan"
 
+msgctxt "#31030"
+msgid "Memory used"
+msgstr "Kullanılan bellek"
+
+msgctxt "#31031"
+msgid "Version info"
+msgstr "Sürüm bilgisi"
+
+msgctxt "#31032"
+msgid "Order"
+msgstr "Düzen"
+
+msgctxt "#31033"
+msgid "Your rating"
+msgstr "Derecelendirmeniz"
+
+msgctxt "#31034"
+msgid "Extended info"
+msgstr "Genişletilmiş bilgi"
+
+msgctxt "#31035"
+msgid "Pages"
+msgstr "Sayfa"
+
+msgctxt "#31036"
+msgid "items"
+msgstr "Öğe"
+
+msgctxt "#31037"
+msgid "Tracklist"
+msgstr "Parça listesi"
+
 msgctxt "#31038"
 msgid "Rewind"
 msgstr "Geri sar"
@@ -48,10 +168,22 @@
 msgid "Fast forward"
 msgstr "İleri sar"
 
+msgctxt "#31040"
+msgid "Cancel update"
+msgstr "Güncellemeyi iptal et"
+
+msgctxt "#31041"
+msgid "Camera manufacturer"
+msgstr "Kamera üreticisi"
+
 msgctxt "#31042"
 msgid "Playlist options"
 msgstr "Çalma listesi seçenekleri"
 
+msgctxt "#31043"
+msgid "Set the type and add rules to create a smart playlist. These playlists are dynamic and include all media items from your database which apply to your chosen rules."
+msgstr "Akıllı çalma listesi oluşturmak için türünü seçin ve kurallar ekleyin. Bu çalma listeleri dinamiktir ve seçtiğiniz kuralları veritabanınızdaki tüm ortam öğelerine uygular."
+
 msgctxt "#31044"
 msgid "Add group"
 msgstr "Grup ekle"
@@ -64,18 +196,138 @@
 msgid "Delete group"
 msgstr "Grubu sil"
 
+msgctxt "#31047"
+msgid "Read more..."
+msgstr "Devamını oku..."
+
+msgctxt "#31049"
+msgid "Press [B]Up[/B] to rewind or fast-forward"
+msgstr "Geri veya ileri sarmak için [B]Yukarı[/B] tuşuna basın"
+
+msgctxt "#31050"
+msgid "Press [B]OK[/B] to stop"
+msgstr "Durdurmak için [B]OK[/B] tuşuna basın"
+
+msgctxt "#31051"
+msgid "Toggle language"
+msgstr "Dili değiştir"
+
+msgctxt "#31052"
+msgid "filtered"
+msgstr "filtre uygulanmış"
+
 msgctxt "#31053"
 msgid "Arial based"
 msgstr "Arial tabanlı"
 
+msgctxt "#31054"
+msgid "Press [B]Left[/B] to rewind, or [B]Right[/B] to fast-forward"
+msgstr "Geri sarmak için [B]Sol[/B] tuşuna, ileri sarmak için [B]Sağ[/B] tuşana basın"
+
+msgctxt "#31055"
+msgid "Subtitle download"
+msgstr "Altyazı indir"
+
+msgctxt "#31056"
+msgid "Go to playlist"
+msgstr "Çalma listesine git"
+
+msgctxt "#31057"
+msgid "Show login screen on startup"
+msgstr "Başlangıçta oturum açma ekranını göster"
+
+msgctxt "#31058"
+msgid "Automatic Login on startup"
+msgstr "Başlangıçta otomatik olarak oturum aç"
+
+msgctxt "#31059"
+msgid "Updates available"
+msgstr "Güncellemeler var"
+
+msgctxt "#31060"
+msgid "minutes"
+msgstr "dakika"
+
+msgctxt "#31061"
+msgid "Main menu items"
+msgstr "Ana menü öğeleri"
+
+msgctxt "#31062"
+msgid "Shortcuts to the \"Files\" sections of each media type. Go there to add additional sources for your databases."
+msgstr "Her bir ortam türünün \"Dosyalar\" bölümüne kısayolları. Veritabanınıza ek kaynaklar eklemek için oraya gidin."
+
+msgctxt "#31063"
+msgid "Sections"
+msgstr "Bölümler"
+
+msgctxt "#31064"
+msgid "unwatched"
+msgstr "izlenmemiş"
+
+msgctxt "#31065"
+msgid "Video playlist"
+msgstr "Video oynatma listesi"
+
+msgctxt "#31066"
+msgid "Music playlist"
+msgstr "Müzik çalma listesi"
+
+msgctxt "#31067"
+msgid "Event log"
+msgstr "Olay günlüğü"
+
+msgctxt "#31068"
+msgid "Choose presets"
+msgstr "Önayarları seç"
+
 msgctxt "#31069"
 msgid "Last Updated"
 msgstr "Son Güncelleme"
 
+msgctxt "#31070"
+msgid "Add media sources"
+msgstr "Ortam kaynağı ekle"
+
+msgctxt "#31071"
+msgid "by"
+msgstr "yazan"
+
 msgctxt "#31072"
 msgid "Power Options"
 msgstr "Güç Seçenekleri"
 
+msgctxt "#31073"
+msgid "Titles"
+msgstr "Başlıklar"
+
+msgctxt "#31074"
+msgid "Library root"
+msgstr "Kitaplık kökü"
+
+msgctxt "#31075"
+msgid "Movie sets"
+msgstr "Film kümeleri"
+
+msgctxt "#31076"
+msgid "Play optical disc"
+msgstr "Optik diski oynat"
+
+msgctxt "#31077"
+msgid "Previous location"
+msgstr "Önceki konum"
+
+msgctxt "#31078"
+msgid "Next location"
+msgstr "Sonraki konum"
+
+msgctxt "#31079"
+msgid "Cast not available"
+msgstr "Oyuncu bilgileri mevcut değil"
+
+msgctxt "#31080"
+msgid "Ends at"
+msgstr "Bitiş zamanı"
+
 msgctxt "#31081"
 msgid "Album info"
 msgstr "Albüm bilgisi"
@@ -84,10 +336,26 @@
 msgid "Lyrics add-on"
 msgstr "Şarkı sözleri eklentisi"
 
+msgctxt "#31083"
+msgid "Lyrics add-on settings"
+msgstr "Şarkı sözleri eklentisi ayarları"
+
+msgctxt "#31084"
+msgid "Visualisation settings"
+msgstr "Görsel öğe ayarları"
+
 msgctxt "#31085"
 msgid "Channel Group"
 msgstr "Kanal Grubu"
 
+msgctxt "#31086"
+msgid "Metadata"
+msgstr "Meta veriler"
+
+msgctxt "#31087"
+msgid "Provider settings"
+msgstr "Sağlayıcı ayarları"
+
 msgctxt "#31088"
 msgid "Content scanning options"
 msgstr "İçerik tarama seçenekleri"
@@ -96,10 +364,30 @@
 msgid "Available groups"
 msgstr "Kullanılabilir gruplar"
 
+msgctxt "#31090"
+msgid "Search trailer"
+msgstr "Fragman ara"
+
 msgctxt "#31091"
 msgid "Download subtitles"
 msgstr "Altyazıları indir"
 
+msgctxt "#31092"
+msgid "Video menu"
+msgstr "Video menüsü"
+
+msgctxt "#31093"
+msgid "Show weather info in top bar"
+msgstr "Hava durumu bilgisini üst çubukta göster"
+
+msgctxt "#31094"
+msgid "Show media flags for movies / episodes / music videos"
+msgstr "Filmler / bölümler / müzik videoları için ortam etiketlerini göster "
+
+msgctxt "#31095"
+msgid "Use slide animations"
+msgstr "Kayma animasyonlarını kullan"
+
 msgctxt "#31096"
 msgid "Local subtitle available"
 msgstr "Yerel altyazı mevcut"
@@ -112,6 +400,134 @@
 msgid "Select your Kodi user profile[CR]to login and continue"
 msgstr "Oturum açıp devam etmek için[CR]Kodi kullanıcı profilinizi seçin"
 
+msgctxt "#31099"
+msgid "Icon Wall"
+msgstr "Simge Duvarı"
+
 msgctxt "#31100"
 msgid "Shift"
-msgstr "Üst Karakter"
+msgstr "Kaydır"
+
+msgctxt "#31101"
+msgid "InfoWall"
+msgstr "Bilgi Duvarı"
+
+msgctxt "#31102"
+msgid "Wall"
+msgstr "Duvar"
+
+msgctxt "#31103"
+msgid "Enter text here..."
+msgstr "Metni buraya girin..."
+
+msgctxt "#31104"
+msgid "Your library is currently empty. In order to populate it with your personal media, enter \"Files\" section, add a media source and configure it. After the source has been added and indexed you will be able to browse your library."
+msgstr "Kitaplığınız şu anda boş. Kitaplığınızı kişisel medyalarınız ile doldurmak için \"Dosyalar\" bölümüne girdikten sonra bir ortam kaynağını ekleyin ve yapılandırın."
+
+msgctxt "#31105"
+msgid "Add video sources and set the appropriate content type in order to populate your video libraries."
+msgstr "Video kitaplığınızı doldurmak için video kaynakları ekleyin ve  uygun içerik türünü ayarlayın."
+
+msgctxt "#31106"
+msgid "Teletext"
+msgstr "Teleteks"
+
+msgctxt "#31107"
+msgid "WideList"
+msgstr "Geniş Liste"
+
+msgctxt "#31108"
+msgid "Use custom global background"
+msgstr "Özel genel arka plan kullan"
+
+msgctxt "#31109"
+msgid "Choose image path"
+msgstr "Resim yolu seç"
+
+msgctxt "#31110"
+msgid "Enter files section"
+msgstr "Dosyalar bölümüne gir"
+
+msgctxt "#31111"
+msgid "View your personal pictures or download one of the many image add-ons from the official repository."
+msgstr "Kişisel resimlerinizi görüntüleyin veya resmi depodaki birçok resim eklentisinden birini indirin."
+
+msgctxt "#31112"
+msgid "Toggle audio stream"
+msgstr "Ses akışını değiştir"
+
+msgctxt "#31113"
+msgid "Search local library"
+msgstr "Yerel kitaplıkta ara"
+
+msgctxt "#31114"
+msgid "Search YouTube"
+msgstr "YouTube'da ara"
+
+msgctxt "#31115"
+msgid "Search TheMovieDB"
+msgstr "TheMovieDB'de ara"
+
+msgctxt "#31116"
+msgid "Remove this main menu item"
+msgstr "Bu ana menü öğesini kaldır"
+
+msgctxt "#31117"
+msgid "Edit nodes"
+msgstr "Düğümleri düzenle"
+
+msgctxt "#31118"
+msgid "Enter add-on browser"
+msgstr "Eklenti tarayıcısına gir"
+
+msgctxt "#31119"
+msgid "You do not have any add-ons installed yet. Visit our add-on browser to browse through our collection and improve your Kodi experience."
+msgstr "Henüz yüklü herhangi bir eklenti yok. Kodi deneyiminizi geliştirmek için eklenti tarayıcımızı ziyaret edip koleksiyonumuza gözatın."
+
+msgctxt "#31120"
+msgid "You did not set up a weather provider yet. In order to view weather information, choose a weather provider and set up your location."
+msgstr "Henüz bir hava durumu bilgisi sağlayıcı ayarlamamışsınız. Hava durumu bilgilerini görüntülemek için, bir hava durumu bilgisi sağlayıcı seçin ve konumunuzu ayarlayın."
+
+msgctxt "#31121"
+msgid "Set weather provider"
+msgstr "Hava durumu sağlayıcısını ayarla"
+
+msgctxt "#31122"
+msgid "Unwatched TV Shows"
+msgstr "İzlenmemiş TV Programları"
+
+msgctxt "#31123"
+msgid "Same director"
+msgstr "Aynı yönetmen"
+
+msgctxt "#31124"
+msgid "Show images on map"
+msgstr "Haritada resimleri göster"
+
+msgctxt "#31125"
+msgid "Press up for actor info"
+msgstr "Aktör bilgisi için yukarı tuşuna basın"
+
+msgctxt "#31126"
+msgid "Press OK to read plot"
+msgstr "Özeti okumak için OK tuşuna basın"
+
+msgctxt "#31127"
+msgid "Show icons"
+msgstr "Simgeleri göster"
+
+msgctxt "#31128"
+msgid "Contributors"
+msgstr "Katkıda bulunanlar"
+
+msgctxt "#31129"
+msgid "General settings applying to all areas of the skin."
+msgstr "Genel ayarlar dış görünümün tüm alanlarına uygulanır."
+
+msgctxt "#31130"
+msgid "Main menu-related settings: Configure the home screen to your likings."
+msgstr "Ana menü ile ilgili ayarlar: Ana ekranı kendi zevkinize göre yapılandırın."
+
+msgctxt "#31131"
+msgid "Choose home fanart pack"
+msgstr "Giriş fanart paketi seçin"

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.uk_ua/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.vi_vn/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.zh_cn/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/language/resource.language.zh_tw/strings.po Changed

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/addonstatus Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/addonstatus/disable.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/addonstatus/install.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/addonstatus/update.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/defaulticons/DefaultAddonGame.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/defaulticons/DefaultAddonPeripheral.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/defaulticons/DefaultGameAddons.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/infodialogs/cinema.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/infodialogs/enabled.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/infodialogs/play.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/1080.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/3D.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/480.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/4K.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/540.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/576.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/720.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/lists/Set.png Deleted

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/playlist Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/icons/playlist/save.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/osd/fullscreen/buttons/record-white.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/osd/progress/nub_leftright.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/media/overlays/watched/resume.png Added

_service:download_url:master.tar.gz/addons/skin.estuary/playlists/mostplayed_albums.xsp Changed

_service:download_url:master.tar.gz/addons/skin.estuary/playlists/unwatched_tvshows.xsp Changed

_service:download_url:master.tar.gz/addons/xbmc.pvr/addon.xml Changed

_service:download_url:master.tar.gz/configure.ac Changed

@@ -296,12 +296,6 @@
   [use_profiling=$enableval],
   [use_profiling=no])
 
-AC_ARG_ENABLE([joystick],
-  [AS_HELP_STRING([--enable-joystick],
-  [enable SDL joystick support (default is auto)])],
-  [use_joystick=$enableval],
-  [use_joystick=auto])
-
 AC_ARG_ENABLE([x11],
   [AS_HELP_STRING([--enable-x11],
   [enable x11 (default is yes) 'Linux Only'])],
@@ -537,7 +531,6 @@
      ARCH="i486-linux"
      use_arch="x86"
      use_cpu="i686"
-     use_joystick=no
      use_gles=yes
      use_optical_drive=no
      use_x11=no
@@ -590,7 +583,6 @@
      ;;
   arm-apple-darwin*)
      CORE_SYSTEM_NAME=ios
-     use_joystick=no
      use_neon=yes
      use_libcec=no
      use_vtbdecoder=yes
@@ -610,7 +602,6 @@
      ;;
   *86*-apple-darwin*)
      CORE_SYSTEM_NAME=osx
-     use_joystick=no
      use_vtbdecoder=no
      ARCH="x86-osx"
      DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*})
@@ -618,7 +609,6 @@
      ;;
   powerpc-apple-darwin*)
      CORE_SYSTEM_NAME=osx
-     use_joystick=no
      use_vtbdecoder=no
      ARCH="powerpc-osx"
      use_arch="ppc"
@@ -638,7 +628,6 @@
      CORE_SYSTEM_NAME=linux
      ARCH="arm"
      use_arch="arm"
-     use_joystick=no
      use_neon=yes
      use_gles=yes
      use_gl=no
@@ -650,7 +639,6 @@
      use_arch="arm"
      use_cpu=cortex-a9
      ARCH="arm"
-     use_joystick=no
      use_neon=yes
      use_gles=yes
      use_optical_drive=no
@@ -936,7 +924,7 @@
       AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."])
       AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."])
       AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.)
-      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util"
+      LIBS="$LIBS -lEGL -lGLESv2 -lbcm_host -lvcos -lvchiq_arm -lmmal -lmmal_core -lmmal_util -lvcsm"
     else
       AC_CHECK_LIB([EGL],   [main],, AC_MSG_ERROR($missing_library))
       AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library))
@@ -977,7 +965,6 @@
 AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([ogg/ogg.h],,        AC_MSG_ERROR($missing_library))
 AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([LIBDCADEC], [dcadec],, AC_MSG_ERROR([libdcadec not found]))
 
 PKG_CHECK_MODULES([LIBCURL], [libcurl],, AC_MSG_ERROR([libcurl not found]))
 XB_FIND_SONAME([CURL], [curl])
@@ -1180,23 +1167,6 @@
 else
   AC_MSG_NOTICE($dbus_disabled)
 fi
-  #case "$host_vendor" != "apple"; determine availability of SDL or SDL2
-  # joystick
-  if test "$use_joystick" != "no"; then
-    PKG_CHECK_MODULES([SDL2], [sdl2],
-      [AC_DEFINE([HAVE_SDL_VERSION],[2],["SDL major version"])
-       AC_DEFINE([HAVE_SDL],[1],["Define to 1 if using sdl"])
-       INCLUDES="$INCLUDES $SDL2_CFLAGS"; LIBS="$LIBS $SDL2_LIBS"; use_joystick="yes"],
-      [if test "$use_joystick" = "yes"; then
-        AC_MSG_ERROR($sdl_joystick_not_found)
-      elif test "$use_joystick" != "no"; then
-        AC_MSG_NOTICE($sdl_joystick_not_found)
-        use_joystick="no"
-      fi
-     ])
-  else
-    AC_MSG_RESULT($sdl_joystick_not_found)
-  fi
 fi
 
 XB_FIND_SONAME([ASS],         [ass])
@@ -1620,7 +1590,6 @@
   FFMPEG_LIBDIR=${pkg_cfg_prefix}$(PKG_CONFIG_SYSROOT_DIR="" ${PKG_CONFIG} --static --variable=libdir libavcodec)
   GNUTLS_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls)
   VORBISENC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc)
-  DCADEC_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors dcadec)
 
   # check if static libs are available
   for ff_lib in ${ff_libs}; do
@@ -1796,11 +1765,9 @@
   fi
 fi
 
-if test "$use_arch" != "arm" ; then
-  AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
-  if test "$HAVE_CMAKE" = "no" ; then
-    AC_MSG_ERROR($missing_program)
-  fi
+AC_CHECK_PROG(HAVE_CMAKE,cmake,"yes","no",)
+if test "$HAVE_CMAKE" = "no" ; then
+  AC_MSG_ERROR("cmake not found")
 fi
 
 AC_CHECK_PROG(HAVE_GPERF,gperf,"yes","no",)
@@ -1934,13 +1901,6 @@
   final_message="$final_message\n  OpenMax:\tNo"
 fi
 
-if test "$use_joystick" = "yes"; then
-  final_message="$final_message\n  Joystick:\tYes"
-  AC_DEFINE([HAS_SDL_JOYSTICK],[1],["Define to 1 if using SDL joystick"])
-else
-  final_message="$final_message\n  Joystick:\tNo"
-fi
-
 if test "$use_x11" = "yes"; then
   USE_X11=1
   final_message="$final_message\n  X11:\t\tYes"
@@ -2241,6 +2201,7 @@
     lib/addons/library.kodi.audioengine/Makefile \
     lib/addons/library.xbmc.codec/Makefile \
     lib/addons/library.kodi.guilib/Makefile \
+    lib/addons/library.kodi.peripheral/Makefile \
     lib/addons/library.xbmc.pvr/Makefile \
     lib/addons/library.kodi.inputstream/Makefile \
     tools/Linux/kodi.sh \
@@ -2248,6 +2209,7 @@
     tools/Linux/kodi-xsession.desktop \
     tools/EventClients/Makefile \
     tools/EventClients/Clients/OSXRemote/Makefile \
+    xbmc/peripherals/addons/Makefile \
     xbmc/peripherals/bus/Makefile \
     xbmc/peripherals/devices/Makefile \
     xbmc/platform/posix/Makefile \
@@ -2271,6 +2233,7 @@
     tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCBroadcastReceiver.java \
+    tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCInputDeviceListener.java \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnFrameAvailableListener.java \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCSettingsContentObserver.java \
     tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCOnAudioFocusChangeListener.java \

_service:download_url:master.tar.gz/docs/README.linux Changed

_service:download_url:master.tar.gz/docs/README.ubuntu Changed

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral Added

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/CMakeLists.txt Added

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/Makefile.in Added

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/libKODI_peripheral.cpp Added

@@ -0,0 +1,74 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "addons/binary/interfaces/AddonInterfaces.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h"
+
+#include <stdio.h>
+
+#ifdef _WIN32
+  #include <windows.h>
+  #define DLLEXPORT __declspec(dllexport)
+#else
+  #define DLLEXPORT
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+DLLEXPORT CB_PeripheralLib* PERIPHERAL_register_me(AddonCB* frontend)
+{
+  CB_PeripheralLib* cb = NULL;
+  if (!frontend)
+    fprintf(stderr, "ERROR: PERIPHERAL_register_frontend is called with NULL handle!!!\n");
+  else
+  {
+    cb = frontend->PeripheralLib_RegisterMe(frontend->addonData);
+    if (!cb)
+      fprintf(stderr, "ERROR: PERIPHERAL_register_frontend can't get callback table from frontend!!!\n");
+  }
+  return cb;
+}
+
+DLLEXPORT void PERIPHERAL_unregister_me(AddonCB* frontend, CB_PeripheralLib* cb)
+{
+  if (frontend == NULL || cb == NULL)
+    return;
+  return frontend->PeripheralLib_UnRegisterMe(frontend->addonData, cb);
+}
+
+DLLEXPORT void PERIPHERAL_trigger_scan(AddonCB* frontend, CB_PeripheralLib* cb)
+{
+  if (frontend == NULL || cb == NULL)
+    return;
+  return cb->TriggerScan(frontend->addonData);
+}
+
+DLLEXPORT void PERIPHERAL_refresh_button_maps(AddonCB* frontend, CB_PeripheralLib* cb, const char* deviceName, const char* controllerId)
+{
+  if (frontend == NULL || cb == NULL)
+    return;
+  return cb->RefreshButtonMaps(frontend->addonData, deviceName ? deviceName : "", controllerId ? controllerId : "");
+}
+
+#ifdef __cplusplus
+}
+#endif

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/project Added

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/project/VS2010Express Added

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/project/VS2010Express/libKODI_peripheral.vcxproj Added

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FEA71D39-CB68-486B-A978-246E661A3F89}</ProjectGuid>
+    <RootNamespace>XBMC_VDR</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\XBMC.core-defaults.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(SolutionDir)\XBMC.defaults.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.kodi.peripheral\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.kodi.peripheral\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\..\addons\library.xbmc.addon\;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\..\addons\library.xbmc.addon\;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\..\..\..\addons\library.kodi.peripheral\$(ProjectName).dll</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\..\..\xbmc;..\..\..\..\..\xbmc\addons\include;..\..\..\..\..\xbmc\cores\dvdplayer\DVDDemuxers;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>HAS_SDL_OPENGL;HAS_SDL;_USRDLL;XBMC_VDR_EXPORTS;_WIN32PC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+    </ClCompile>
+    <Link>
+      <OutputFile>..\..\..\..\..\addons\library.kodi.peripheral\$(ProjectName).dll</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\libKODI_peripheral.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

_service:download_url:master.tar.gz/lib/addons/library.kodi.peripheral/project/VS2010Express/libKODI_peripheral.vcxproj.filters Added

_service:download_url:master.tar.gz/project/BuildDependencies/DownloadMingwBuildEnv.bat Changed

_service:download_url:master.tar.gz/project/VS2010Express/XBMC for Windows.sln Changed

@@ -41,6 +41,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_inputstream", "..\..\lib\addons\library.kodi.inputstream\project\VS2010Express\libKODI_inputstream.vcxproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_peripheral", "..\..\lib\addons\library.kodi.peripheral\project\VS2010Express\libKODI_peripheral.vcxproj", "{FEA71D39-CB68-486B-A978-246E661A3F89}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug Testsuite|Win32 = Debug Testsuite|Win32
@@ -66,60 +68,6 @@
 		{FE0A91C0-E30A-47CD-8A92-A508C9292452}.Debug|Win32.Build.0 = Debug|Win32
 		{FE0A91C0-E30A-47CD-8A92-A508C9292452}.Release|Win32.ActiveCfg = Release|Win32
 		{FE0A91C0-E30A-47CD-8A92-A508C9292452}.Release|Win32.Build.0 = Release|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug|Win32.Build.0 = Debug|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Release|Win32.ActiveCfg = Release|Win32
-		{3B424C94-2005-44CC-BFB1-4B6C89090732}.Release|Win32.Build.0 = Release|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug|Win32.Build.0 = Debug|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Release|Win32.ActiveCfg = Release|Win32
-		{3843C3D4-E5A6-4030-87EC-E7EE57242106}.Release|Win32.Build.0 = Release|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug|Win32.ActiveCfg = Debug|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug|Win32.Build.0 = Debug|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Release|Win32.ActiveCfg = Release|Win32
-		{88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Release|Win32.Build.0 = Release|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug|Win32.Build.0 = Debug|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Release|Win32.ActiveCfg = Release|Win32
-		{145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Release|Win32.Build.0 = Release|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug|Win32.Build.0 = Debug|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Release|Win32.ActiveCfg = Release|Win32
-		{8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Release|Win32.Build.0 = Release|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Debug|Win32.Build.0 = Debug|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Release|Win32.ActiveCfg = Release|Win32
-		{783701E9-4A65-4505-97B0-39E580AA680D}.Release|Win32.Build.0 = Release|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug|Win32.Build.0 = Debug|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Release|Win32.ActiveCfg = Release|Win32
-		{44BF83C4-F73A-4093-A29A-11B9016318C4}.Release|Win32.Build.0 = Release|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug|Win32.Build.0 = Debug|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Release|Win32.ActiveCfg = Release|Win32
-		{8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Release|Win32.Build.0 = Release|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Debug Testsuite|Win32.Build.0 = Debug|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Debug|Win32.Build.0 = Debug|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Release|Win32.ActiveCfg = Release|Win32
-		{96798038-06CE-4382-BD5B-F9C366724DEB}.Release|Win32.Build.0 = Release|Win32
 		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug Testsuite|Win32.ActiveCfg = Release (DLL)|Win32
 		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug Testsuite|Win32.Build.0 = Release (DLL)|Win32
 		{AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug|Win32.ActiveCfg = Debug (DLL)|Win32
@@ -198,6 +146,13 @@
 		{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Debug|Win32.Build.0 = Debug|Win32
 		{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Release|Win32.ActiveCfg = Release|Win32
+		{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Release|Win32.Build.0 = Release|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Debug Testsuite|Win32.Build.0 = Debug|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Debug|Win32.Build.0 = Debug|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Release|Win32.ActiveCfg = Release|Win32
+		{FEA71D39-CB68-486B-A978-246E661A3F89}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

_service:download_url:master.tar.gz/project/VS2010Express/XBMC.vcxproj Changed

@@ -91,7 +91,7 @@
       <IgnoreSpecificDefaultLibraries>libcpmt;libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-57.dll;avfilter-6.dll;avformat-57.dll;avutil-55.dll;postproc-54.dll;swresample-2.dll;swscale-4.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <EntryPointSymbol>
       </EntryPointSymbol>
@@ -129,7 +129,7 @@
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libcmt;msvcrtd;msvcprtd;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <ModuleDefinitionFile>
       </ModuleDefinitionFile>
-      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-57.dll;avfilter-6.dll;avformat-57.dll;avutil-55.dll;postproc-54.dll;swresample-2.dll;swscale-4.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
       <EntryPointSymbol>
@@ -163,7 +163,7 @@
       <AdditionalDependencies>d3d11.lib;DInput8.lib;DSound.lib;winmm.lib;CrossGuid.lib;Mpr.lib;Iphlpapi.lib;PowrProf.lib;setupapi.lib;dwmapi.lib;yajl.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
       <IgnoreSpecificDefaultLibraries>libc;msvcrt;libci;msvcprt;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-56.dll;avfilter-5.dll;avformat-56.dll;avutil-54.dll;postproc-53.dll;swresample-1.dll;swscale-3.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>libxslt.dll;dnssd.dll;dwmapi.dll;ssh.dll;sqlite3.dll;avcodec-57.dll;avfilter-6.dll;avformat-57.dll;avutil-55.dll;postproc-54.dll;swresample-2.dll;swscale-4.dll;d3dcompiler_47.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <RandomizedBaseAddress>true</RandomizedBaseAddress>
@@ -186,6 +186,7 @@
     <ClCompile Include="..\..\xbmc\addons\AddonInstaller.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonSystemSettings.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AddonVersion.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\BinaryAddonCache.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.cpp" />
@@ -195,8 +196,10 @@
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIRenderingControl.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIWindow.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\InputStream\AddonCallbacksInputStream.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Peripheral\AddonCallbacksPeripheral.cpp" />
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.cpp" />
     <ClCompile Include="..\..\xbmc\addons\ContextMenuAddon.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\ContextMenus.cpp" />
     <ClCompile Include="..\..\xbmc\addons\AudioDecoder.cpp" />
     <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonInfo.cpp" />
     <ClCompile Include="..\..\xbmc\addons\GUIDialogAddonSettings.cpp" />
@@ -206,6 +209,7 @@
     <ClCompile Include="..\..\xbmc\addons\InputStream.cpp" />
     <ClCompile Include="..\..\xbmc\addons\LanguageResource.cpp" />
     <ClCompile Include="..\..\xbmc\addons\PluginSource.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\PVRClient.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Repository.cpp" />
     <ClCompile Include="..\..\xbmc\addons\RepositoryUpdater.cpp" />
     <ClCompile Include="..\..\xbmc\addons\Service.cpp" />
@@ -282,7 +286,9 @@
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCC.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxClient.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DemuxMultiSource.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamBluray.cpp" />
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiSource.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\DVDInputStreamPVRManager.cpp" />
     <ClCompile Include="..\..\xbmc\cores\FFmpeg.cpp" />
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\Process\ProcessInfo.cpp" />
@@ -392,6 +398,10 @@
     <ClCompile Include="..\..\xbmc\filesystem\MultiPathFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\DefaultJoystick.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\ButtonMapping.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\FeatureHandling.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\InputHandling.cpp" />
     <ClCompile Include="..\..\xbmc\music\windows\MusicFileItemListModifier.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\MusicDatabaseFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\MusicFileDirectory.cpp" />
@@ -403,7 +413,6 @@
     <ClCompile Include="..\..\xbmc\filesystem\OverrideFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\PipeFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\PVRDirectory.cpp" />
-    <ClCompile Include="..\..\xbmc\filesystem\PVRFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\PipesManager.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\PlaylistDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\PlaylistFileDirectory.cpp" />
@@ -471,6 +480,19 @@
     <ClCompile Include="..\..\xbmc\filesystem\ZipDirectory.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\ZipFile.cpp" />
     <ClCompile Include="..\..\xbmc\filesystem\ZipManager.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\Controller.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerFeature.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerLayout.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerTranslator.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIAnalogStickButton.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIControllerButton.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIFeatureButton.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIGameController.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIScalarFeatureButton.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIConfigurationWizard.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIControllerList.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIControllerWindow.cpp" />
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIFeatureList.cpp" />
     <ClCompile Include="..\..\xbmc\GUIInfoManager.cpp" />
     <ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
     <ClCompile Include="..\..\xbmc\guilib\D3DResource.cpp" />
@@ -561,6 +583,10 @@
     <ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
     <ClCompile Include="..\..\xbmc\input\InputCodingTableKorean.cpp" />
     <ClCompile Include="..\..\xbmc\input\InputManager.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\DriverPrimitive.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\JoystickMonitor.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\JoystickTranslator.cpp" />
+    <ClCompile Include="..\..\xbmc\input\joysticks\KeymapHandler.cpp" />
     <ClCompile Include="..\..\xbmc\input\Key.cpp" />
     <ClCompile Include="..\..\xbmc\input\InputCodingTableBaiduPY.cpp" />
     <ClCompile Include="..\..\xbmc\input\InputCodingTableBasePY.cpp" />
@@ -574,7 +600,6 @@
     <ClCompile Include="..\..\xbmc\input\touch\ITouchInputHandling.cpp" />
     <ClCompile Include="..\..\xbmc\input\windows\IRServerSuite.cpp" />
     <ClCompile Include="..\..\xbmc\input\windows\IrssMessage.cpp" />
-    <ClCompile Include="..\..\xbmc\input\windows\WINJoystick.cpp" />
     <ClCompile Include="..\..\xbmc\input\XBMC_keytable.cpp" />
     <ClCompile Include="..\..\xbmc\interfaces\AnnouncementManager.cpp" />
     <ClCompile Include="..\..\xbmc\interfaces\builtins\AddonBuiltins.cpp" />
@@ -672,6 +697,15 @@
     <ClCompile Include="..\..\xbmc\listproviders\IListProvider.cpp" />
     <ClCompile Include="..\..\xbmc\listproviders\DirectoryProvider.cpp" />
     <ClCompile Include="..\..\xbmc\listproviders\StaticProvider.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonButtonMap.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonButtonMapping.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonInputHandling.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\addons\PeripheralAddon.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\addons\PeripheralAddonTranslator.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusAddon.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralJoystick.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\EventScanner.cpp" />
+    <ClCompile Include="..\..\xbmc\peripherals\EventScanRate.cpp" />
     <ClCompile Include="..\..\xbmc\platform\posix\main.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">true</ExcludedFromBuild>
     </ClCompile>
@@ -685,6 +719,7 @@
     <ClCompile Include="..\..\xbmc\messaging\helpers\DialogHelper.cpp" />
     <ClCompile Include="..\..\xbmc\music\Album.cpp" />
     <ClCompile Include="..\..\xbmc\music\Artist.cpp" />
+    <ClCompile Include="..\..\xbmc\music\ContextMenus.cpp" />
     <ClCompile Include="..\..\xbmc\music\CueInfoLoader.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp" />
     <ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp" />
@@ -809,7 +844,6 @@
     <ClCompile Include="..\..\xbmc\profiles\windows\GUIWindowSettingsProfile.cpp" />
     <ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp" />
     <ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp" />
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClient.cpp" />
     <ClCompile Include="..\..\xbmc\pvr\addons\PVRClients.cpp" />
     <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannel.cpp" />
     <ClCompile Include="..\..\xbmc\pvr\channels\PVRChannelGroup.cpp" />
@@ -850,6 +884,8 @@
     <ClCompile Include="..\..\xbmc\rendering\dx\RenderSystemDX.cpp" />
     <ClCompile Include="..\..\xbmc\rendering\RenderSystem.cpp" />
     <ClCompile Include="..\..\xbmc\SectionLoader.cpp" />
+    <ClCompile Include="..\..\xbmc\ServiceBroker.cpp" />
+    <ClCompile Include="..\..\xbmc\ServiceManager.cpp" />
     <ClCompile Include="..\..\xbmc\settings\AdvancedSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\AudioDSPSettings.cpp" />
     <ClCompile Include="..\..\xbmc\settings\dialogs\GUIDialogAudioDSPManager.cpp" />
@@ -925,6 +961,7 @@
     <ClCompile Include="..\..\xbmc\DatabaseManager.cpp" />
     <ClInclude Include="..\..\xbmc\addons\AddonBuilder.h" />
     <ClInclude Include="..\..\xbmc\addons\AudioDecoder.h" />
+    <ClInclude Include="..\..\xbmc\addons\BinaryAddonCache.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.h" />
@@ -934,9 +971,12 @@
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIRenderingControl.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIWindow.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\InputStream\AddonCallbacksInputStream.h" />
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Peripheral\AddonCallbacksPeripheral.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.h" />
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\IAddonInterface.h" />
     <ClInclude Include="..\..\xbmc\addons\ContextMenuAddon.h" />
+    <ClInclude Include="..\..\xbmc\addons\ContextMenus.h" />
+    <ClInclude Include="..\..\xbmc\addons\DllPeripheral.h" />
     <ClInclude Include="..\..\xbmc\addons\ImageResource.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_adsp_dll.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_adsp_types.h" />
@@ -945,6 +985,10 @@
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_audioengine_types.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_inputstream_dll.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_inputstream_types.h" />
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_callbacks.h" />
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_dll.h" />
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_types.h" />
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_utils.hpp" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_vfs_types.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_addon_cpp_dll.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_addon_dll.h" />
@@ -957,10 +1001,10 @@
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_pvr_types.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_scr_dll.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_scr_types.h" />
-    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_stream_utils.hpp" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_vis_dll.h" />
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_vis_types.h" />
     <ClInclude Include="..\..\xbmc\addons\InputStream.h" />
+    <ClInclude Include="..\..\xbmc\addons\PVRClient.h" />
     <ClInclude Include="..\..\xbmc\addons\Webinterface.h" />
     <ClInclude Include="..\..\xbmc\addons\UISoundsResource.h" />
     <ClInclude Include="..\..\xbmc\addons\LanguageResource.h" />
@@ -1015,6 +1059,10 @@
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxCDDA.h" />
     <ClInclude Include="..\..\xbmc\cores\FFmpeg.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxClient.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiSource.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiStreams.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DemuxMultiSource.h" />
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPacket.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\Process\ProcessInfo.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoRenderers\BaseRenderer.h" />
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\VideoRenderers\DebugRenderer.h" />
@@ -1054,6 +1102,15 @@
     <ClInclude Include="..\..\xbmc\filesystem\DAVFile.h" />
     <ClInclude Include="..\..\xbmc\filesystem\ImageFile.h" />
     <ClInclude Include="..\..\xbmc\filesystem\MusicDatabaseDirectory\DirectoryNodeGrouped.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\DefaultJoystick.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\ButtonMapping.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\FeatureHandling.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\InputHandling.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\IButtonMap.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\IButtonMapper.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\IDriverHandler.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\IInputHandler.h" />
+    <ClInclude Include="..\..\xbmc\music\ContextMenus.h" />
     <ClInclude Include="..\..\xbmc\music\windows\MusicFileItemListModifier.h" />
     <ClInclude Include="..\..\xbmc\filesystem\OverrideDirectory.h" />
     <ClInclude Include="..\..\xbmc\filesystem\OverrideFile.h" />
@@ -1068,6 +1125,23 @@
     <ClInclude Include="..\..\xbmc\filesystem\XbtDirectory.h" />
     <ClInclude Include="..\..\xbmc\filesystem\XbtFile.h" />
     <ClInclude Include="..\..\xbmc\filesystem\XbtManager.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\Controller.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerDefinitions.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerFeature.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerLayout.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerTranslator.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerTypes.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIAnalogStickButton.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIControllerButton.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIFeatureButton.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIGameController.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIScalarFeatureButton.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIConfigurationWizard.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerDefines.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerList.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerWindow.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIFeatureList.h" />
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\IConfigurationWindow.h" />
     <ClInclude Include="..\..\xbmc\guiinfo\GUIInfoLabels.h" />
     <ClInclude Include="..\..\xbmc\guilib\DispResource.h" />
     <ClInclude Include="..\..\xbmc\guilib\FFmpegImage.h" />
@@ -1081,6 +1155,13 @@
     <ClInclude Include="..\..\xbmc\input\InputCodingTableKorean.h" />
     <ClInclude Include="..\..\xbmc\InfoScanner.h" />
     <ClInclude Include="..\..\xbmc\input\InputManager.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\DriverPrimitive.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\IKeymapHandler.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickMonitor.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickTranslator.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickTypes.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickUtils.h" />
+    <ClInclude Include="..\..\xbmc\input\joysticks\KeymapHandler.h" />
     <ClInclude Include="..\..\xbmc\input\Key.h" />
     <ClInclude Include="..\..\xbmc\input\KeyboardLayoutManager.h" />
     <ClInclude Include="..\..\xbmc\input\InputCodingTable.h" />
@@ -1094,7 +1175,6 @@
     <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandler.h" />
     <ClInclude Include="..\..\xbmc\input\touch\ITouchInputHandling.h" />
     <ClInclude Include="..\..\xbmc\input\touch\TouchTypes.h" />
-    <ClInclude Include="..\..\xbmc\input\windows\WINJoystick.h" />
     <ClInclude Include="..\..\xbmc\interfaces\builtins\AddonBuiltins.h" />
     <ClInclude Include="..\..\xbmc\interfaces\builtins\AndroidBuiltins.h" />
     <ClInclude Include="..\..\xbmc\interfaces\builtins\ApplicationBuiltins.h" />
@@ -1169,6 +1249,15 @@
     <ClInclude Include="..\..\xbmc\interfaces\python\PyContext.h" />
     <ClInclude Include="..\..\xbmc\interfaces\python\PythonInvoker.h" />
     <ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonButtonMap.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonButtonMapping.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonInputHandling.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\addons\PeripheralAddon.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\addons\PeripheralAddonTranslator.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusAddon.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralJoystick.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\EventScanner.h" />
+    <ClInclude Include="..\..\xbmc\peripherals\EventScanRate.h" />
     <ClInclude Include="..\..\xbmc\platform\MessagePrinter.h" />
     <ClInclude Include="..\..\xbmc\media\MediaType.h" />
     <ClInclude Include="..\..\xbmc\messaging\ApplicationMessenger.h" />
@@ -1201,6 +1290,8 @@
     <ClInclude Include="..\..\xbmc\pvr\timers\PVRTimerType.h" />
     <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimerRules.h" />
     <ClInclude Include="..\..\xbmc\pvr\windows\GUIWindowPVRTimersBase.h" />
+    <ClInclude Include="..\..\xbmc\ServiceBroker.h" />
+    <ClInclude Include="..\..\xbmc\ServiceManager.h" />
     <ClInclude Include="..\..\xbmc\settings\AudioDSPSettings.h" />
     <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogAudioDSPManager.h" />
     <ClInclude Include="..\..\xbmc\settings\dialogs\GUIDialogAudioDSPSettings.h" />
@@ -1268,7 +1359,6 @@
     <ClInclude Include="..\..\xbmc\utils\win32\Win32InterfaceForCLog.h" />
     <ClInclude Include="..\..\xbmc\utils\win32\Win32Log.h" />
     <ClInclude Include="..\..\xbmc\utils\XSLTUtils.h" />
-    <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h" />
     <ClInclude Include="..\..\xbmc\interfaces\python\swig.h" />
     <ClInclude Include="..\..\xbmc\interfaces\python\XBPython.h" />
     <ClInclude Include="..\..\xbmc\music\MusicDbUrl.h" />
@@ -1322,7 +1412,6 @@
     <ClInclude Include="..\..\xbmc\filesystem\IDirectory.h" />
     <ClInclude Include="..\..\xbmc\filesystem\IFile.h" />
     <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h" />
     <ClInclude Include="..\..\xbmc\filesystem\iso9660.h" />
     <ClInclude Include="..\..\xbmc\filesystem\ISO9660Directory.h" />
     <ClInclude Include="..\..\xbmc\filesystem\ISOFile.h" />
@@ -1674,6 +1763,7 @@
     <ClCompile Include="..\..\xbmc\utils\XBMCTinyXML.cpp" />
     <ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp" />
     <ClCompile Include="..\..\xbmc\video\Bookmark.cpp" />
+    <ClCompile Include="..\..\xbmc\video\ContextMenus.cpp" />
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" />
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp" />
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.cpp" />
@@ -1682,7 +1772,6 @@
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.cpp" />
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp" />
     <ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp" />
-    <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp" />
     <ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp" />
     <ClCompile Include="..\..\xbmc\video\Teletext.cpp" />
     <ClCompile Include="..\..\xbmc\video\VideoDatabase.cpp" />
@@ -1935,7 +2024,6 @@
     <ClInclude Include="..\..\xbmc\epg\GUIEPGGridContainer.h" />
     <ClInclude Include="..\..\xbmc\FileItem.h" />
     <ClInclude Include="..\..\xbmc\filesystem\PVRDirectory.h" />
-    <ClInclude Include="..\..\xbmc\filesystem\PVRFile.h" />
     <ClInclude Include="..\..\xbmc\GUIInfoManager.h" />
     <ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
     <ClInclude Include="..\..\xbmc\guilib\D3DResource.h" />
@@ -2153,7 +2241,6 @@
     <ClInclude Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.h" />
     <ClInclude Include="..\..\xbmc\programs\GUIViewStatePrograms.h" />
     <ClInclude Include="..\..\xbmc\programs\GUIWindowPrograms.h" />
-    <ClInclude Include="..\..\xbmc\pvr\addons\PVRClient.h" />
     <ClInclude Include="..\..\xbmc\pvr\addons\PVRClients.h" />
     <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannel.h" />
     <ClInclude Include="..\..\xbmc\pvr\channels\PVRChannelGroup.h" />
@@ -2297,6 +2384,7 @@
     <ClInclude Include="..\..\xbmc\utils\XBMCTinyXML.h" />
     <ClInclude Include="..\..\xbmc\utils\XMLUtils.h" />
     <ClInclude Include="..\..\xbmc\video\Bookmark.h" />
+    <ClInclude Include="..\..\xbmc\video\ContextMenus.h" />
     <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h" />
     <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h" />
     <ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.h" />

_service:download_url:master.tar.gz/project/VS2010Express/XBMC.vcxproj.filters Changed

@@ -388,32 +388,65 @@
     <Filter Include="cores\Process">
       <UniqueIdentifier>{45ab3e06-b8d3-44f5-994e-d6130258c99c}</UniqueIdentifier>
     </Filter>
+    <Filter Include="addons\include">
+      <UniqueIdentifier>{353ba04b-a59a-4fb3-90d0-630277d5305b}</UniqueIdentifier>
+    </Filter>
     <Filter Include="addons\binary">
-      <UniqueIdentifier>{0840727e-72bd-4092-a230-5a1b0a582346}</UniqueIdentifier>
+      <UniqueIdentifier>{7e9ec20b-4be7-4724-84d1-4db46fd59066}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces">
-      <UniqueIdentifier>{c3d7bd79-2535-4e6e-a518-04fe52d63af7}</UniqueIdentifier>
+      <UniqueIdentifier>{a697a64f-fd0e-47b8-b5cd-b97c3682aafd}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1">
-      <UniqueIdentifier>{e8906622-ec29-4c0a-9c78-3707434c249f}</UniqueIdentifier>
+      <UniqueIdentifier>{766a713d-c6fe-4200-a040-749023a13831}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1\Addon">
-      <UniqueIdentifier>{713565a3-6312-41cc-b933-8bb825e7b92b}</UniqueIdentifier>
+      <UniqueIdentifier>{58b266a7-3b69-420e-a453-096606ba7025}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1\AudioDSP">
-      <UniqueIdentifier>{9d29c165-ad4c-4aa5-8b5a-cea7bd1a4518}</UniqueIdentifier>
+      <UniqueIdentifier>{5e8ea5bd-7ae5-4c79-8799-6b0b2e467641}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1\AudioEngine">
-      <UniqueIdentifier>{0427f795-7a94-42cc-a428-24f793ec1e9e}</UniqueIdentifier>
+      <UniqueIdentifier>{46f9b975-d582-439f-9f92-0ec9cccdaafd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\binary\interfaces\api1\Codec">
+      <UniqueIdentifier>{abafaa85-cfd4-477a-9b99-4b2d4f91ed35}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1\GUI">
-      <UniqueIdentifier>{81553ed3-d668-4b18-b634-1b0d5895eaff}</UniqueIdentifier>
+      <UniqueIdentifier>{300ee331-e0b8-4028-a2d3-7ddffdefa1d0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\binary\interfaces\api1\InputStream">
+      <UniqueIdentifier>{b13a0591-86af-4316-9f4e-d41efcf87de5}</UniqueIdentifier>
     </Filter>
     <Filter Include="addons\binary\interfaces\api1\PVR">
-      <UniqueIdentifier>{86920521-ee04-41f2-b7fc-4b00051c1357}</UniqueIdentifier>
+      <UniqueIdentifier>{c3708f40-3139-4ee9-b8f6-c6bcc22bb1c3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="addons\binary\interfaces\api1\Codec">
-      <UniqueIdentifier>{c9f0b2a1-0169-4c0f-9f9f-15e08a659a5d}</UniqueIdentifier>
+    <Filter Include="input\joysticks">
+      <UniqueIdentifier>{5d8049b8-4689-4ff0-bf4f-1f0a308e5b44}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="input\joysticks\generic">
+      <UniqueIdentifier>{80a8356f-f3be-46b5-be2e-714a42764ee1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="peripherals\addons">
+      <UniqueIdentifier>{15c34cc2-9101-4038-9df4-4357d83a9d0b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="peripherals\bus\virtual">
+      <UniqueIdentifier>{6b33e5ae-5edf-4c33-b87f-3ee9115eb01d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\binary\interfaces\api1\Peripheral">
+      <UniqueIdentifier>{bc7eb8ab-3f2e-4346-8546-7243b658fa30}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="games">
+      <UniqueIdentifier>{336d29fc-9a49-40a8-9295-a8d1062c540c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="games\controllers">
+      <UniqueIdentifier>{d0ae0c22-0869-416b-92c7-aa1dc14a58be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="games\controllers\guicontrols">
+      <UniqueIdentifier>{891f4e3d-e135-4ea9-8571-2b6ad3b1622d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="games\controllers\windows">
+      <UniqueIdentifier>{9e3dd585-08e1-4dae-bc21-05e49697ef94}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -762,6 +795,9 @@
     <ClCompile Include="..\..\xbmc\addons\ContextMenuAddon.cpp">
       <Filter>addons</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\ContextMenus.cpp">
+      <Filter>addons</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\xbmc\addons\Scraper.cpp">
       <Filter>addons</Filter>
     </ClCompile>
@@ -807,6 +843,9 @@
     <ClCompile Include="..\..\xbmc\music\Artist.cpp">
       <Filter>music</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\music\ContextMenus.cpp">
+      <Filter>music</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\xbmc\music\GUIViewStateMusic.cpp">
       <Filter>music</Filter>
     </ClCompile>
@@ -1461,6 +1500,9 @@
     <ClCompile Include="..\..\xbmc\video\Bookmark.cpp">
       <Filter>video</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\video\ContextMenus.cpp">
+      <Filter>video</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp">
       <Filter>video</Filter>
     </ClCompile>
@@ -1605,9 +1647,6 @@
     <ClCompile Include="..\..\xbmc\filesystem\PVRDirectory.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\filesystem\PVRFile.cpp">
-      <Filter>filesystem</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\utils\Observer.cpp">
       <Filter>utils</Filter>
     </ClCompile>
@@ -1683,9 +1722,6 @@
     <ClCompile Include="..\..\xbmc\pvr\channels\PVRRadioRDSInfoTag.cpp">
       <Filter>pvr\channels</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\pvr\addons\PVRClient.cpp">
-      <Filter>pvr\addons</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.cpp">
       <Filter>dialogs</Filter>
     </ClCompile>
@@ -2217,9 +2253,6 @@
     <ClCompile Include="..\..\xbmc\utils\RecentlyAddedJob.cpp">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\input\windows\WINJoystick.cpp">
-      <Filter>input\windows</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\filesystem\ImageFile.cpp">
       <Filter>filesystem</Filter>
     </ClCompile>
@@ -2584,9 +2617,6 @@
     <ClCompile Include="..\..\xbmc\interfaces\python\PyContext.cpp">
       <Filter>interfaces\python</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp">
-      <Filter>video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp">
       <Filter>view</Filter>
     </ClCompile>
@@ -3289,36 +3319,35 @@
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\Process\ProcessInfo.cpp">
       <Filter>cores\Process</Filter>
     </ClCompile>
-<<<<<<< c6b201a8ade5ab0e3eea677cae5b6ea55139839f
     <ClCompile Include="..\..\xbmc\addons\InputStream.cpp">
       <Filter>addons</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\AddonCallbacksInputStream.cpp">
-      <Filter>addons</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamAddon.cpp">
       <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.cpp">
-      <Filter>addons\binary\interfaces\api1\PVR</Filter>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.cpp">
+      <Filter>addons\binary\interfaces\api1\Addon</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonCallbacksGUI.cpp">
-      <Filter>addons\binary\interfaces\api1\GUI</Filter>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiSource.cpp">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Codec\AddonCallbacksCodec.cpp">
-      <Filter>addons\binary\interfaces\api1\Codec</Filter>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.cpp">
+      <Filter>addons\binary\interfaces\api1\AudioDSP</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DemuxMultiSource.cpp">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\AudioEngine\AddonCallbacksAudioEngine.cpp">
       <Filter>addons\binary\interfaces\api1\AudioEngine</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.cpp">
-      <Filter>addons\binary\interfaces\api1\AudioDSP</Filter>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Codec\AddonCallbacksCodec.cpp">
+      <Filter>addons\binary\interfaces\api1\Codec</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.cpp">
-      <Filter>addons\binary\interfaces\api1\Addon</Filter>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\InputStream\AddonCallbacksInputStream.cpp">
+      <Filter>addons\binary\interfaces\api1\InputStream</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.cpp">
-      <Filter>addons\binary\interfaces</Filter>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonCallbacksGUI.cpp">
+      <Filter>addons\binary\interfaces\api1\GUI</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIRenderingControl.cpp">
       <Filter>addons\binary\interfaces\api1\GUI</Filter>
@@ -3326,6 +3355,113 @@
     <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIWindow.cpp">
       <Filter>addons\binary\interfaces\api1\GUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.cpp">
+      <Filter>addons\binary\interfaces\api1\PVR</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.cpp">
+      <Filter>addons\binary\interfaces</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\DriverPrimitive.cpp">
+      <Filter>input\joysticks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\JoystickMonitor.cpp">
+      <Filter>input\joysticks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\JoystickTranslator.cpp">
+      <Filter>input\joysticks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\KeymapHandler.cpp">
+      <Filter>input\joysticks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\addons\PeripheralAddonTranslator.cpp">
+      <Filter>peripherals\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\addons\PeripheralAddon.cpp">
+      <Filter>peripherals\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusAddon.cpp">
+      <Filter>peripherals\bus\virtual</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\devices\PeripheralJoystick.cpp">
+      <Filter>peripherals\devices</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\EventScanner.cpp">
+      <Filter>peripherals</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\EventScanRate.cpp">
+      <Filter>peripherals</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\binary\interfaces\api1\Peripheral\AddonCallbacksPeripheral.cpp">
+      <Filter>addons\binary\interfaces\api1\Peripheral</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\Controller.cpp">
+      <Filter>games\controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerFeature.cpp">
+      <Filter>games\controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerLayout.cpp">
+      <Filter>games\controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\ControllerTranslator.cpp">
+      <Filter>games\controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\DefaultJoystick.cpp">
+      <Filter>input\joysticks</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIGameController.cpp">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIConfigurationWizard.cpp">
+      <Filter>games\controllers\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIControllerList.cpp">
+      <Filter>games\controllers\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIControllerWindow.cpp">
+      <Filter>games\controllers\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\windows\GUIFeatureList.cpp">
+      <Filter>games\controllers\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIAnalogStickButton.cpp">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIControllerButton.cpp">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIFeatureButton.cpp">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\games\controllers\guicontrols\GUIScalarFeatureButton.cpp">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\FeatureHandling.cpp">
+      <Filter>input\joysticks\generic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\InputHandling.cpp">
+      <Filter>input\joysticks\generic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\input\joysticks\generic\ButtonMapping.cpp">
+      <Filter>input\joysticks\generic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonButtonMapping.cpp">
+      <Filter>peripherals\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonInputHandling.cpp">
+      <Filter>peripherals\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\peripherals\addons\AddonButtonMap.cpp">
+      <Filter>peripherals\addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\addons\BinaryAddonCache.cpp">
+      <Filter>addons</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\xbmc\ServiceBroker.cpp" />
+    <ClCompile Include="..\..\xbmc\ServiceManager.cpp" />
+    <ClCompile Include="..\..\xbmc\addons\PVRClient.cpp">
+      <Filter>addons</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -3760,6 +3896,9 @@
     <ClInclude Include="..\..\xbmc\addons\ContextMenuAddon.h">
       <Filter>addons</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\ContextMenus.h">
+      <Filter>addons</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\DllAddon.h">
       <Filter>addons</Filter>
     </ClInclude>
@@ -4533,6 +4672,9 @@
     <ClInclude Include="..\..\xbmc\video\Bookmark.h">
       <Filter>video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\video\ContextMenus.h">
+      <Filter>video</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\xbmc\video\GUIViewStateVideo.h">
       <Filter>video</Filter>
     </ClInclude>
@@ -4689,9 +4831,6 @@
     <ClInclude Include="..\..\xbmc\epg\EpgInfoTag.h">
       <Filter>epg</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\PVRFile.h">
-      <Filter>filesystem</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\filesystem\PVRDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
@@ -4773,9 +4912,6 @@
     <ClInclude Include="..\..\xbmc\pvr\channels\PVRRadioRDSInfoTag.h">
       <Filter>pvr\channels</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\pvr\addons\PVRClient.h">
-      <Filter>pvr\addons</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\dialogs\GUIDialogExtendedProgressBar.h">
       <Filter>dialogs</Filter>
     </ClInclude>
@@ -4986,9 +5122,6 @@
     <ClInclude Include="..\..\xbmc\filesystem\IFileDirectory.h">
       <Filter>filesystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\filesystem\ILiveTV.h">
-      <Filter>filesystem</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\filesystem\iso9660.h">
       <Filter>filesystem</Filter>
     </ClInclude>
@@ -5347,9 +5480,6 @@
     <ClInclude Include="..\..\xbmc\utils\RecentlyAddedJob.h">
       <Filter>utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\input\windows\WINJoystick.h">
-      <Filter>input\windows</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\filesystem\ImageFile.h">
       <Filter>filesystem</Filter>
     </ClInclude>
@@ -5585,9 +5715,6 @@
     <ClInclude Include="..\..\xbmc\guilib\imagefactory.h">
       <Filter>guilib</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
-      <Filter>video</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
       <Filter>view</Filter>
     </ClInclude>
@@ -6336,6 +6463,12 @@
     <ClInclude Include="..\..\xbmc\cores\VideoPlayer\Process\ProcessInfo.h">
       <Filter>cores\Process</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiSource.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DemuxMultiSource.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_adsp_dll.h">
       <Filter>addons\include</Filter>
     </ClInclude>
@@ -6393,9 +6526,6 @@
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_scr_types.h">
       <Filter>addons\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_stream_utils.hpp">
-      <Filter>addons\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\xbmc_vis_dll.h">
       <Filter>addons\include</Filter>
     </ClInclude>
@@ -6405,32 +6535,29 @@
     <ClInclude Include="..\..\xbmc\addons\InputStream.h">
       <Filter>addons</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\AddonCallbacksInputStream.h">
-      <Filter>addons</Filter>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.h">
+      <Filter>addons\binary\interfaces\api1\Addon</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.h">
-      <Filter>addons\binary\interfaces</Filter>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.h">
+      <Filter>addons\binary\interfaces\api1\AudioDSP</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\IAddonInterface.h">
-      <Filter>addons\binary\interfaces</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDInputStreams\InputStreamMultiStreams.h">
+      <Filter>cores\VideoPlayer\DVDInputStreams</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.h">
-      <Filter>addons\binary\interfaces\api1\PVR</Filter>
+    <ClInclude Include="..\..\xbmc\cores\VideoPlayer\DVDDemuxers\DVDDemuxPacket.h">
+      <Filter>cores\VideoPlayer\DVDDemuxers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonCallbacksGUI.h">
-      <Filter>addons\binary\interfaces\api1\GUI</Filter>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\AudioEngine\AddonCallbacksAudioEngine.h">
+      <Filter>addons\binary\interfaces\api1\AudioEngine</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Codec\AddonCallbacksCodec.h">
       <Filter>addons\binary\interfaces\api1\Codec</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\AudioEngine\AddonCallbacksAudioEngine.h">
-      <Filter>addons\binary\interfaces\api1\AudioEngine</Filter>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\InputStream\AddonCallbacksInputStream.h">
+      <Filter>addons\binary\interfaces\api1\InputStream</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\AudioDSP\AddonCallbacksAudioDSP.h">
-      <Filter>addons\binary\interfaces\api1\AudioDSP</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Addon\AddonCallbacksAddon.h">
-      <Filter>addons\binary\interfaces\api1\Addon</Filter>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonCallbacksGUI.h">
+      <Filter>addons\binary\interfaces\api1\GUI</Filter>
     </ClInclude>
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIRenderingControl.h">
       <Filter>addons\binary\interfaces\api1\GUI</Filter>
@@ -6438,6 +6565,167 @@
     <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\GUI\AddonGUIWindow.h">
       <Filter>addons\binary\interfaces\api1\GUI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\PVR\AddonCallbacksPVR.h">
+      <Filter>addons\binary\interfaces\api1\PVR</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\AddonInterfaces.h">
+      <Filter>addons\binary\interfaces</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\IAddonInterface.h">
+      <Filter>addons\binary\interfaces</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\DriverPrimitive.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\IKeymapHandler.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickMonitor.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickTranslator.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickTypes.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\JoystickUtils.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\KeymapHandler.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\DllPeripheral.h">
+      <Filter>addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\addons\PeripheralAddonTranslator.h">
+      <Filter>peripherals\addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\addons\PeripheralAddon.h">
+      <Filter>peripherals\addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\bus\virtual\PeripheralBusAddon.h">
+      <Filter>peripherals\bus\virtual</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\devices\PeripheralJoystick.h">
+      <Filter>peripherals\devices</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\EventScanner.h">
+      <Filter>peripherals</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\EventScanRate.h">
+      <Filter>peripherals</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\binary\interfaces\api1\Peripheral\AddonCallbacksPeripheral.h">
+      <Filter>addons\binary\interfaces\api1\Peripheral</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_callbacks.h">
+      <Filter>addons\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_dll.h">
+      <Filter>addons\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_types.h">
+      <Filter>addons\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\kodi-addon-dev-kit\include\kodi\kodi_peripheral_utils.hpp">
+      <Filter>addons\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerTranslator.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerTypes.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\Controller.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerDefinitions.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerFeature.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\ControllerLayout.h">
+      <Filter>games\controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\DefaultJoystick.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIGameController.h">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIFeatureList.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\IConfigurationWindow.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIConfigurationWizard.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerDefines.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerList.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\windows\GUIControllerWindow.h">
+      <Filter>games\controllers\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIAnalogStickButton.h">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIControllerButton.h">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIFeatureButton.h">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\games\controllers\guicontrols\GUIScalarFeatureButton.h">
+      <Filter>games\controllers\guicontrols</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\ButtonMapping.h">
+      <Filter>input\joysticks\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\FeatureHandling.h">
+      <Filter>input\joysticks\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\generic\InputHandling.h">
+      <Filter>input\joysticks\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\IButtonMapper.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\IDriverHandler.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\IInputHandler.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\input\joysticks\IButtonMap.h">
+      <Filter>input\joysticks</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonButtonMapping.h">
+      <Filter>peripherals\addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonInputHandling.h">
+      <Filter>peripherals\addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\peripherals\addons\AddonButtonMap.h">
+      <Filter>peripherals\addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\addons\BinaryAddonCache.h">
+      <Filter>addons</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\music\ContextMenus.h">
+      <Filter>music</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\xbmc\ServiceBroker.h" />
+    <ClInclude Include="..\..\xbmc\ServiceManager.h" />
+    <ClInclude Include="..\..\xbmc\addons\PVRClient.h">
+      <Filter>addons</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">

_service:download_url:master.tar.gz/project/Win32BuildSetup/genNsisIncludes.bat Changed

@@ -79,30 +79,30 @@
 IF EXIST BUILD_WIN32\addons\screensaver.* (
   ECHO SectionGroup "Screensaver Add-ons" SecScreensaverAddons >> screensaver-addons.nsi
   FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\screensaver.*') DO (
-    SET "output=%%P"
-    SET output=!output:screensaver.=!
-    ECHO Section "!output!" SecScreensaverAddons!Counter! >> screensaver-addons.nsi
-    ECHO SectionIn 1 2 3 #section is in installtype Full >> screensaver-addons.nsi
-    ECHO SetOutPath "$INSTDIR\addons\%%P" >> screensaver-addons.nsi
-    ECHO File /r "${app_root}\addons\%%P\*.*" >> screensaver-addons.nsi
-    ECHO SectionEnd >> screensaver-addons.nsi
-    SET /A Counter = !Counter! + 1
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecScreensaverAddons!Counter! >> screensaver-addons.nsi
+      ECHO SectionIn 1 2 3 >> screensaver-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> screensaver-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> screensaver-addons.nsi
+      ECHO SectionEnd >> screensaver-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
     )
   ECHO SectionGroupEnd >> screensaver-addons.nsi
 )
 
 SET Counter=1
 IF EXIST BUILD_WIN32\addons\visualization.* (
-  ECHO SectionGroup "Music Visualization Add-ons" SecVisualizationAddons >> visualization-addons.nsi
+  ECHO SectionGroup "Visualization Add-ons" SecVisualizationAddons >> visualization-addons.nsi
   FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\visualization.*') DO (
-    SET "output=%%P"
-    SET output=!output:visualization.=!
-    ECHO Section "!output!" SecVisualizationAddons!Counter! >> visualization-addons.nsi
-    ECHO SectionIn 1 2 3 #section is in installtype Full >> visualization-addons.nsi
-    ECHO SetOutPath "$INSTDIR\addons\%%P" >> visualization-addons.nsi
-    ECHO File /r "${app_root}\addons\%%P\*.*" >> visualization-addons.nsi
-    ECHO SectionEnd >> visualization-addons.nsi
-    SET /A Counter = !Counter! + 1
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecVisualizationAddons!Counter! >> visualization-addons.nsi
+      ECHO SectionIn 1 2 3 >> visualization-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> visualization-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> visualization-addons.nsi
+      ECHO SectionEnd >> visualization-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
     )
   ECHO SectionGroupEnd >> visualization-addons.nsi
 )
@@ -123,4 +123,20 @@
   ECHO SectionGroupEnd >> skin-addons.nsi
 )
 
+SET Counter=1
+IF EXIST BUILD_WIN32\addons\inputstream.* (
+  ECHO SectionGroup "Inputstream Add-ons" SecInputstreamAddons >> inputstream-addons.nsi
+  FOR /F "tokens=*" %%P IN ('dir /B /AD BUILD_WIN32\addons\inputstream.*') DO (
+    FOR /f "delims=<" %%N in ('powershell.exe -ExecutionPolicy Unrestricted -command "& {[xml]$a = get-content BUILD_WIN32\addons\%%P\addon.xml;$a.addon.name}"') do (
+      ECHO Section "%%N" SecInputstreamAddons!Counter! >> inputstream-addons.nsi
+      ECHO SectionIn 1 2 >> inputstream-addons.nsi
+      ECHO SetOutPath "$INSTDIR\addons\%%P" >> inputstream-addons.nsi
+      ECHO File /r "${app_root}\addons\%%P\*.*" >> inputstream-addons.nsi
+      ECHO SectionEnd >> inputstream-addons.nsi
+      SET /A Counter = !Counter! + 1
+      )
+    )
+  ECHO SectionGroupEnd >> inputstream-addons.nsi
+)
+
 ENDLOCAL
\ No newline at end of file

_service:download_url:master.tar.gz/project/Win32BuildSetup/genNsisInstaller.nsi Changed

@@ -223,6 +223,8 @@
   File "${app_root}\application\*.*"
   SetOutPath "$INSTDIR\addons"
   File /r "${app_root}\application\addons\*.*"
+  File /nonfatal /r "${app_root}\addons\peripheral.*"
+  File /r "${app_root}\addons\skin.*"
   SetOutPath "$INSTDIR\media"
   File /r "${app_root}\application\media\*.*"
   SetOutPath "$INSTDIR\system"
@@ -281,8 +283,9 @@
 !include /nonfatal "audiodecoder-addons.nsi"
 !include /nonfatal "audioencoder-addons.nsi"
 !include /nonfatal "audiodsp-addons.nsi"
+!include /nonfatal "inputstream-addons.nsi"
 !include /nonfatal "pvr-addons.nsi"
-!include /nonfatal "skin-addons.nsi"
+;!include /nonfatal "skin-addons.nsi"
 !include /nonfatal "screensaver-addons.nsi"
 !include /nonfatal "visualization-addons.nsi"
 
@@ -382,7 +385,7 @@
   SectionIn 1 2 #section is in install type Full 
   SetOutPath "$TEMP\vc2010"
   File "${app_root}\..\dependencies\vcredist\2010\vcredist_x86.exe"
-  ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q' $VSRedistSetupError
+  ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q /norestart' $VSRedistSetupError
   RMDir /r "$TEMP\vc2010"
   DetailPrint "Finished VS2010 re-distributable setup"
 SectionEnd
@@ -392,7 +395,7 @@
   SectionIn 1 2 #section is in install type Full
   SetOutPath "$TEMP\vc2013"
   File "${app_root}\..\dependencies\vcredist\2013\vcredist_x86.exe"
-  ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /q' $VSRedistSetupError
+  ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /install /quiet /norestart' $VSRedistSetupError
   RMDir /r "$TEMP\vc2013"
   DetailPrint "Finished VS2013 re-distributable setup"
   SetOutPath "$INSTDIR"
@@ -403,7 +406,7 @@
   SectionIn 1 2 #section is in install type Full
   SetOutPath "$TEMP\vc2015"
   File "${app_root}\..\dependencies\vcredist\2015\vcredist_x86.exe"
-  ExecWait '"$TEMP\vc2015\vcredist_x86.exe" /q' $VSRedistSetupError
+  ExecWait '"$TEMP\vc2015\vcredist_x86.exe" /install /quiet /norestart' $VSRedistSetupError
   RMDir /r "$TEMP\vc2015"
   DetailPrint "Finished VS2015 re-distributable setup"
   SetOutPath "$INSTDIR"

_service:download_url:master.tar.gz/project/cmake/CMakeLists.txt Changed

@@ -205,6 +205,8 @@
 
 # Compile Info
 add_custom_command(OUTPUT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp
+                          ${CMAKE_BINARY_DIR}/addons/xbmc.addon/addon.xml
+                          ${CMAKE_BINARY_DIR}/addons/kodi.guilib/addon.xml
                    COMMAND ${CMAKE_COMMAND} -DCORE_SOURCE_DIR=${CORE_SOURCE_DIR}
                                             -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME}
                                             -DCORE_BUILD_DIR=${CORE_BUILD_DIR}
@@ -218,6 +220,8 @@
                           ${CORE_SOURCE_DIR}/addons/kodi.guilib/addon.xml.in
                           ${CORE_SOURCE_DIR}/xbmc/CompileInfo.cpp.in)
 list(APPEND install_data addons/xbmc.addon/addon.xml)
+list(APPEND install_data addons/xbmc.json/addon.xml)
+list(APPEND install_data addons/kodi.guilib/addon.xml)
 add_library(compileinfo OBJECT ${CORE_BUILD_DIR}/xbmc/CompileInfo.cpp)
 target_compile_options(compileinfo PRIVATE "${SYSTEM_DEFINES}")
 
@@ -277,9 +281,12 @@
 
 core_link_library(XBMC_addon addons/library.xbmc.addon/libXBMC_addon)
 core_link_library(XBMC_codec addons/library.xbmc.codec/libXBMC_codec)
-core_link_library(KODI_guilib addons/library.kodi.guilib/libKODI_guilib)
+core_link_library(XBMC_pvr addons/library.xbmc.pvr/libXBMC_pvr)
 core_link_library(KODI_adsp addons/library.kodi.adsp/libKODI_adsp)
-core_link_library(XBMC_pvr   addons/library.xbmc.pvr/libXBMC_pvr)
+core_link_library(KODI_audioengine addons/library.kodi.audioengine/libKODI_audioengine)
+core_link_library(KODI_guilib addons/library.kodi.guilib/libKODI_guilib)
+core_link_library(KODI_inputstream addons/library.kodi.inputstream/libKODI_inputstream)
+core_link_library(KODI_peripheral addons/library.kodi.peripheral/libKODI_peripheral)
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer)
 add_custom_target(wrap-libraries ALL DEPENDS ${WRAP_FILES})

_service:download_url:master.tar.gz/project/cmake/addons/CMakeLists.txt Changed

_service:download_url:master.tar.gz/project/cmake/installdata/addon-bindings.txt Changed

@@ -13,6 +13,11 @@
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
@@ -24,6 +29,7 @@
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
+xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
 xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
 xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h

_service:download_url:master.tar.gz/project/cmake/installdata/common/addons.txt Changed

@@ -1,7 +1,12 @@
+addons/audioencoder.xbmc.builtin.aac/*
+addons/audioencoder.xbmc.builtin.wma/*
+addons/game.controller.default/*
 addons/kodi.adsp/*
 addons/kodi.audiodecoder/*
+addons/kodi.game/*
+addons/kodi.inputstream/*
+addons/kodi.peripheral/*
 addons/kodi.resource/*
-addons/kodi.vfs/*
 addons/xbmc.audioencoder/*
 addons/xbmc.codec/*
 addons/xbmc.core/*
@@ -10,9 +15,13 @@
 addons/xbmc.pvr/*
 addons/xbmc.python/*
 addons/xbmc.webinterface/*
+addons/library.kodi.adsp/*
+addons/library.kodi.audioengine/*
+addons/library.kodi.guilib/*
+addons/library.kodi.inputstream/*
+addons/library.kodi.peripheral/*
 addons/library.xbmc.addon/*
 addons/library.xbmc.codec/*
-addons/library.xbmc.gui/*
 addons/library.xbmc.pvr/*
 addons/repository.xbmc.org/*
 addons/webinterface.default/*
@@ -26,6 +35,9 @@
 addons/resource.language.en_gb/*
 addons/resource.uisounds.confluence/*
 addons/resource.images.weathericons.default/*
+addons/service.xbmc.versioncheck/*
+addons/skin.estuary/*
+addons/skin.estouchy/*
 addons/metadata.local/*
 addons/metadata.album.universal/*
 addons/metadata.artists.universal/*

_service:download_url:master.tar.gz/project/cmake/modules/FindCpluff.cmake Changed

_service:download_url:master.tar.gz/project/cmake/modules/FindD3DX11Effects.cmake Changed

_service:download_url:master.tar.gz/project/cmake/modules/FindFFMPEG.cmake Changed

_service:download_url:master.tar.gz/project/cmake/scripts/common/macros.cmake Changed

@@ -53,12 +53,15 @@
 # Arguments:
 #   file     full path to file to mirror
 #   relative the relative base of file path in the build/install tree
-#   give another parameter to exclude from install target
+# Optional Arguments:
+#   NO_INSTALL: exclude file from installation target
 # Implicit arguments:
 #   CORE_SOURCE_DIR - root of source tree
 # On return:
-#   file is added to ${install_data} and mirrored in build tree
+#   Files is mirrored to the build tree and added to ${install_data}
+#   (if NO_INSTALL is not given).
 function(copy_file_to_buildtree file relative)
+  cmake_parse_arguments(arg "NO_INSTALL" "" "" ${ARGN})
   if(NOT WIN32)
     string(REPLACE "$" "\\(" file ${file})
     string(REPLACE "$" "\\)" file ${file})
@@ -74,27 +77,28 @@
     endif()
     add_custom_command(TARGET export-files COMMAND ${CMAKE_COMMAND} -E copy_if_different "${file}" "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
   endif()
-  if(NOT ARGN)
+  if(NOT arg_NO_INSTALL)
     list(APPEND install_data ${outfile})
     set(install_data ${install_data} PARENT_SCOPE)
   endif()
 endfunction()
 
-# add data files to installation list with a mirror in build tree.
+# Add data files to installation list with a mirror in build tree.
 # reads list of files to install from a given list of text files.
 # Arguments:
 #   pattern globbing pattern for text files to read
-#   give another parameter to exclude from installation target
+# Optional Arguments:
+#   NO_INSTALL: exclude files from installation target
 # Implicit arguments:
 #   CORE_SOURCE_DIR - root of source tree
 # On return:
-#   files are added to ${install_data} and mirrored in build tree
+#   Files are mirrored to the build tree and added to ${install_data}
+#   (if NO_INSTALL is not given).
 function(copy_files_from_filelist_to_buildtree pattern)
-  foreach(arg ${ARGN})
-    list(APPEND pattern ${arg})
-  endforeach()
   # copies files listed in text files to the buildtree
   # Input: [glob pattern: filepattern]
+  cmake_parse_arguments(arg "NO_INSTALL" "" "" ${ARGN})
+  list(APPEND pattern ${ARGN})
   list(SORT pattern)
   if(VERBOSE)
     message(STATUS "copy_files_from_filelist_to_buildtree - got pattern: ${pattern}")
@@ -107,8 +111,8 @@
       foreach(dir ${fstrings})
         file(GLOB_RECURSE files RELATIVE ${CORE_SOURCE_DIR} ${CORE_SOURCE_DIR}/${dir})
         foreach(file ${files})
-          if(ARGN)
-            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} ${CORE_SOURCE_DIR} 1)
+          if(arg_NO_INSTALL)
+            copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} ${CORE_SOURCE_DIR} NO_INSTALL)
           else()
             copy_file_to_buildtree(${CORE_SOURCE_DIR}/${file} ${CORE_SOURCE_DIR})
           endif()

_service:download_url:master.tar.gz/project/cmake/scripts/common/prepare-env.cmake Changed

_service:download_url:master.tar.gz/project/cmake/scripts/windows/archsetup.cmake Changed

_service:download_url:master.tar.gz/project/cmake/treedata/android/subdirs.txt Changed

_service:download_url:master.tar.gz/project/cmake/treedata/common/addons.txt Changed

_service:download_url:master.tar.gz/project/cmake/treedata/common/games.txt Added

_service:download_url:master.tar.gz/project/cmake/treedata/common/peripherals.txt Changed

_service:download_url:master.tar.gz/project/cmake/treedata/common/subdirs.txt Changed

@@ -7,6 +7,7 @@
 xbmc/addons/binary/interfaces/api1/Codec        api1AddonCallbacks_Codec
 xbmc/addons/binary/interfaces/api1/GUI          api1AddonCallbacks_GUI
 xbmc/addons/binary/interfaces/api1/InputStream  api1AddonCallbacks_InputStream
+xbmc/addons/binary/interfaces/api1/Peripheral   api1AddonCallbacks_Peripheral
 xbmc/addons/binary/interfaces/api1/PVR          api1AddonCallbacks_PVR
 xbmc/commons                                    commons
 xbmc/cdrip                                      cdrip
@@ -15,6 +16,8 @@
 xbmc/epg                                        epg
 xbmc/guilib                                     guilib
 xbmc/input                                      input
+xbmc/input/joysticks                            input/joysticks
+xbmc/input/joysticks/generic                    input/joysticks/generic
 xbmc/listproviders                              listproviders
 xbmc/media                                      media
 xbmc/messaging                                  messaging

_service:download_url:master.tar.gz/project/cmake/treedata/optional/common/cec.txt Deleted

_service:download_url:master.tar.gz/system/addon-manifest.xml Changed

_service:download_url:master.tar.gz/system/keymaps/joystick.Alienware.Dual.Compatible.Controller.xml Deleted

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    
-    
-     
-    <joystick name="Alienware Alienware Dual Compatible Game Pad">
-      <button id="1">FullScreen</button> 
-      <button id="2">Select</button>   
-      <button id="3">Back</button>    
-      <button id="4">Queue</button> 
-      <button id="6">PreviousMenu</button> 
-      <button id="7"></button>        
-      <button id="11">Screenshot</button> 
-      <button id="5"></button>          
-      <button id="8"></button>  
-      <button id="12">ActivateWindow(ShutdownMenu)</button>       
-      <button id="9"></button>        
-      <button id="10">ActivateWindow(PlayerControls)</button>   
-      
-      <axis limit="-1" id="0">AnalogSeekBack</axis>        
-      <axis limit="+1" id="0">AnalogSeekForward</axis>
-      
-      <axis limit="+1" id="1">ScrollDown</axis>      
-      <axis limit="-1" id="1">ScrollUp</axis>z`
-        
-      <axis limit="-1" id="2">VolumeUp</axis>        
-      <axis limit="+1" id="2">VolumeDown</axis>
-            
-      <axis limit="-1" id="3"></axis>      
-      <axis limit="+1" id="3"></axis>
-      
-      <axis limit="+1" id="4">Right</axis>
-      <axis limit="-1" id="4">Left</axis>            
-      <axis limit="-1" id="5">Up</axis>
-      <axis limit="+1" id="5">Down</axis>
-            
-      <hat id="1" position="left">Left</hat>
-      <hat id="1" position="right">Right</hat>
-      <hat id="1" position="up">Up</hat>
-      <hat id="1" position="down">Down</hat>
-    </joystick>
-  </global>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.AppleRemote.xml Deleted

@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="AppleRemote">
-            <button id="1">Up</button>
-            <button id="2">Down</button>
-            <button id="3">Left</button>
-            <button id="4">Right</button>
-            <button id="5">Select</button>
-            <button id="6">Back</button>
-            <button id="7">Fullscreen</button>
-            <button id="8">ContextMenu</button>
-
-      
-            <button id="9">Left</button>
-            <button id="10">Right</button>
-
-      
-            <button id="12">PlayPause</button>
-
-      
-            <button id="13">PageUp</button>
-            <button id="14">PageDown</button>
-            <button id="15">Pause</button>
-            <button id="16">Play</button>
-            <button id="17">Stop</button>
-            <button id="18">FastForward</button>
-            <button id="19">Rewind</button>
-            <button id="20">SkipNext</button>
-            <button id="21">SkipPrevious</button>
-
-      
-            <button id="70">Play</button>
-            <button id="71">Pause</button>
-            <button id="72">Stop</button>
-            <button id="73">SkipPrevious</button>
-            <button id="74">SkipNext</button>
-            <button id="75">Rewind</button>
-            <button id="76">FastForward</button>
-            <button id="77">OSD</button>
-            <button id="78">ShowVideoMenu</button>
-
-      
-            <button id="80">Left</button>
-            <button id="81">Right</button>
-            <button id="82">Up</button>
-            <button id="83">Down</button>
-
-            <button id="85">Left</button>
-            <button id="86">Right</button>
-            <button id="87">Up</button>
-            <button id="88">Down</button>
-
-    </joystick>
-  </global>
-  <Home>
-    <joystick name="AppleRemote">
-      <button id="6">ActivateWindow(Favourites)</button>
-      <button id="8">ActivateWindow(shutdownmenu)</button>
-    </joystick>
-  </Home>
-  <FullscreenVideo>
-    <joystick name="AppleRemote">
-      <button id="1">VolumeUp</button>
-      <button id="2">VolumeDown</button>
-      <button id="3">StepBack</button>
-      <button id="4">StepForward</button>
-      <button id="5">Pause</button>
-      <button id="6">Stop</button>
-      <button id="7">OSD</button>
-      <button id="8">Fullscreen</button>
-      <button id="9">Rewind</button>
-      <button id="10">FastForward</button>
-            <button id="13">ChapterOrBigStepForward</button>
-            <button id="14">ChapterOrBigStepBack</button>
-            <button id="80">StepBack</button>
-            <button id="81">StepForward</button>
-            <button id="82">BigStepForward</button>
-            <button id="83">BigStepBack</button>
-            <button id="85">Rewind</button>
-            <button id="86">FastForward</button>
-            <button id="87">BigStepForward</button>
-            <button id="88">BigStepBack</button>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick name="AppleRemote">
-      <button id="3">ChannelDown</button>
-      <button id="4">ChannelUp</button>
-            <button id="13">ChannelUp</button>
-            <button id="14">ChannelDown</button>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick name="AppleRemote">
-      <button id="3">ChannelDown</button>
-      <button id="4">ChannelUp</button>
-            <button id="13">ChannelUp</button>
-            <button id="14">ChannelDown</button>
-    </joystick>
-  </FullscreenRadio>
-  <Visualisation>
-    <joystick name="AppleRemote">
-      <button id="1">VolumeUp</button>
-      <button id="2">VolumeDown</button>
-      <button id="3">SkipPrevious</button>
-      <button id="4">SkipNext</button>
-      <button id="5">Pause</button>
-      <button id="6">Fullscreen</button>
-      <button id="7">OSD</button>
-      <button id="8">Stop</button>
-            <button id="80">SkipPrevious</button>
-            <button id="81">SkipNext</button>
-            <button id="85">SkipPrevious</button>
-            <button id="86">SkipNext</button>
-    </joystick>
-  </Visualisation>
-  <SlideShow>
-    <joystick name="AppleRemote">
-      <button id="1">ZoomIn</button>
-      <button id="2">ZoomOut</button>
-      <button id="3">PreviousPicture</button>
-      <button id="4">NextPicture</button>
-      <button id="6">Stop</button>
-      <button id="7">Info</button>
-      <button id="8">Rotate</button>
-            <button id="80">PreviousPicture</button>
-            <button id="81">NextPicture</button>
-            <button id="85">PreviousPicture</button>
-            <button id="86">NextPicture</button>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick name="AppleRemote">
-      <button id="5">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-  <VideoOSD>
-    <joystick name="AppleRemote">
-      <button id="7">Back</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick name="AppleRemote">
-      <button id="5">Select</button>
-      <button id="6">Stop</button>
-      <button id="7">OSD</button>
-      <button id="8"/>
-    </joystick>
-  </VideoMenu>
-  <MyVideoLibrary>
-    <joystick name="AppleRemote">
-      <button id="7">Info</button>
-    </joystick>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-    <joystick name="AppleRemote">
-      <button id="7">Info</button>
-    </joystick>
-  </MyVideoFiles>
-  <PictureInfo>
-    <joystick name="AppleRemote">
-      <button id="3">Left</button>
-      <button id="4">Right</button>
-            <button id="80">Left</button>
-            <button id="81">Right</button>
-            <button id="85">Left</button>
-            <button id="86">Right</button>
-    </joystick>
-  </PictureInfo>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Harmony.xml Deleted

@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="Harmony">
-            <button id="1">Up</button>
-            <button id="2">Down</button>
-            <button id="3">Left</button>
-            <button id="4">Right</button>
-            <button id="5">Select</button>
-            <button id="6">ContextMenu</button>
-            <button id="7">Fullscreen</button>
-            <button id="8">ContextMenu</button>
-            <button id="9">Right</button>
-            <button id="10">Left</button>
-            <button id="15">Stop</button>
-            <button id="17"/>
-            <button id="16">Play</button>
-            <button id="18"/>
-            <button id="91">SkipPrevious</button>
-            <button id="92">SkipNext</button>
-            <button id="52">Screenshot</button>
-            <button id="41">Rewind</button>
-            <button id="42">FastForward</button>
-            <button id="26">Pause</button>
-            <button id="32">Back</button>
-            <button id="65">FullScreen</button>
-            <button id="31">Info</button>
-            <button id="51">PreviousMenu</button>
-            <button id="71">PageUp</button>
-            <button id="72">PageDown</button>
-      
-        <button id="21">VolumeUp</button>
-        <button id="22">VolumeDown</button>
-            <button id="11">Number1</button>
-            <button id="12">Number2</button>
-            <button id="13">Number3</button>
-            <button id="14">Number4</button>
-            <button id="23">Number5</button>
-            <button id="24">Number6</button>
-            <button id="33">Number7</button>
-            <button id="34">Number8</button>
-            <button id="43">Number9</button>
-            <button id="44">Number0</button>
-            <button id="45">Back</button>
-            <button id="36">Select</button>
-            <button id="25">Mute</button>
-            <button id="61">AspectRatio</button>
-            <button id="53">ActivateWindow(Music)</button>
-            <button id="55">ActivateWindow(videolibrary,tvshowtitles,return)</button>
-            <button id="54">ActivateWindow(videolibrary,movietitles,return)</button>
-            <button id="56">ActivateWindow(Weather)</button>
-        <button id="93">OSD</button>
-        <button id="95">ActivateWindow(Home)</button>
-        <button id="94">ActivateWindow(Scripts)</button>
-        <button id="96">ActivateWindow(favourites)</button>
-        <button id="73">ShowVideoMenu</button>
-        <button id="74">ShowSubtitles</button>
-        <button id="75">NextSubtitle</button>
-        <button id="76">ActivateWindow(VideoFiles)</button>
-        <button id="63">Playlist</button>
-        <button id="64">AudioNextLanguage</button>
-        <button id="82">PageDown</button>
-            <button id="81">PageUp</button>
-         <button id="66">ShutDown()</button>
-            <button id="62">Queue</button>
-            <button id="46">Suspend()</button>
-            <button id="83">CodecInfo</button>
-            <button id="84">ActivateWindow(Settings)</button>
-            <button id="85">xbmc.ActivateWindow(SystemSettings)</button>
-            <button id="86">ActivateWindow(SystemInfo)</button>
-    </joystick>
-  </global>
-  <Home>
-    <joystick name="Harmony">
-            <button id="6">ActivateWindow(PlayerControls)</button>
-            <button id="31">ActivateWindow(Settings)</button>
-            <button id="51">ActivateWindow(ShutdownMenu)</button>
-            <button id="36">ActivateWindow(SystemInfo)</button>
-            <button id="11">ToggleFullScreen</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick name="Harmony">
-            <button id="11">Highlight</button>
-            <button id="14">Copy</button>
-            <button id="33">Move</button>
-            <button id="45">Delete</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick name="Harmony">
-            <button id="45">Delete</button>
-            <button id="71">MoveItemUp</button>
-            <button id="72">MoveItemDown</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicFiles>
-    <joystick name="Harmony">
-            <button id="45">Delete</button>
-            <button id="11">JumpSMS1</button>
-            <button id="12">JumpSMS2</button>
-            <button id="13">JumpSMS3</button>
-            <button id="14">JumpSMS4</button>
-            <button id="23">JumpSMS5</button>
-            <button id="24">JumpSMS6</button>
-            <button id="33">JumpSMS7</button>
-            <button id="34">JumpSMS8</button>
-            <button id="43">JumpSMS9</button>
-    </joystick>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-    <joystick name="Harmony">
-            <button id="11">JumpSMS1</button>
-            <button id="12">JumpSMS2</button>
-            <button id="13">JumpSMS3</button>
-            <button id="14">JumpSMS4</button>
-            <button id="23">JumpSMS5</button>
-            <button id="24">JumpSMS6</button>
-            <button id="33">JumpSMS7</button>
-            <button id="34">JumpSMS8</button>
-            <button id="43">JumpSMS9</button>
-    </joystick>
-  </MyMusicLibrary>
-  <FullscreenVideo>
-    <joystick name="Harmony">
-            <button id="1">ChapterOrBigStepForward</button>
-            <button id="2">ChapterOrBigStepBack</button>
-            <button id="3">StepBack</button>
-            <button id="4">StepForward</button>
-            <button id="6">OSD</button>
-            <button id="32">Seek(-7)</button>
-            <button id="31">Info</button>
-            <button id="95">NextSubtitle</button>
-            <button id="94">ShowSubtitles</button>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick name="Harmony">
-            <button id="1">ChannelUp</button>
-            <button id="2">ChannelDown</button>
-            <button id="3">StepBack</button>
-            <button id="4">StepForward</button>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick name="Harmony">
-            <button id="1">ChannelUp</button>
-            <button id="2">ChannelDown</button>
-            <button id="3">StepBack</button>
-            <button id="4">StepForward</button>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick name="Harmony">
-            <button id="31">Back</button>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </PlayerControls>
-  <Visualisation>
-    <joystick name="Harmony">
-            <button id="1">IncreaseRating</button>
-            <button id="2">DecreaseRating</button>
-            <button id="3">StepBack</button>
-            <button id="4">StepForward</button>
-            <button id="6">OSD</button>
-            <button id="32">LockPreset</button>
-            <button id="31">Info</button>
-            <button id="96">ActivateWindow(VisualisationPresetList)</button>
-            <button id="73">Addon.Default.OpenSettings(xbmc.player.musicviz)</button>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-            <button id="31">CodecInfo</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </VisualisationPresetList>
-  <SlideShow>
-    <joystick name="Harmony">
-            <button id="11">ZoomLevel1</button>
-            <button id="12">ZoomLevel2</button>
-            <button id="13">ZoomLevel3</button>
-            <button id="14">ZoomLevel4</button>
-            <button id="23">ZoomLevel5</button>
-            <button id="24">ZoomLevel6</button>
-            <button id="33">ZoomLevel7</button>
-            <button id="34">ZoomLevel8</button>
-            <button id="43">ZoomLevel9</button>
-            <button id="44">ZoomNormal</button>
-            <button id="92">NextPicture</button>
-            <button id="91">PreviousPicture</button>
-            <button id="31">Info</button>
-            <button id="5">Rotate</button>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick name="Harmony">
-            <button id="5">NextCalibration</button>
-            <button id="44">ResetCalibration</button>
-            <button id="36">NextCalibration</button>
-            <button id="65">NextResolution</button>
-    </joystick>
-  </ScreenCalibration>
-  <GUICalibration>
-    <joystick name="Harmony">
-            <button id="5">NextCalibration</button>
-            <button id="44">ResetCalibration</button>
-            <button id="36">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-  <VideoOSD>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick name="Harmony">
-            <button id="6">OSD</button>
-            <button id="31">Info</button>
-    </joystick>
-  </VideoMenu>
-  <OSDVideoSettings>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-            <button id="45">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoLibrary>
-    <joystick name="Harmony">
-            <button id="45">Delete</button>
-            <button id="36">ToggleWatched</button>
-            <button id="11">JumpSMS1</button>
-            <button id="12">JumpSMS2</button>
-            <button id="13">JumpSMS3</button>
-            <button id="14">JumpSMS4</button>
-            <button id="23">JumpSMS5</button>
-            <button id="24">JumpSMS6</button>
-            <button id="33">JumpSMS7</button>
-            <button id="34">JumpSMS8</button>
-            <button id="43">JumpSMS9</button>
-    </joystick>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-    <joystick name="Harmony">
-            <button id="45">Delete</button>
-            <button id="11">JumpSMS1</button>
-            <button id="12">JumpSMS2</button>
-            <button id="13">JumpSMS3</button>
-            <button id="14">JumpSMS4</button>
-            <button id="23">JumpSMS5</button>
-            <button id="24">JumpSMS6</button>
-            <button id="33">JumpSMS7</button>
-            <button id="34">JumpSMS8</button>
-            <button id="43">JumpSMS9</button>
-    </joystick>
-  </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick name="Harmony">
-            <button id="45">Delete</button>
-            <button id="71">MoveItemUp</button>
-            <button id="72">MoveItemDown</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick name="Harmony">
-            <button id="32">BackSpace</button>
-            <button id="45">Shift</button>
-            <button id="36">Symbols</button>
-            <button id="11">Number1</button>
-            <button id="12">Number2</button>
-            <button id="13">Number3</button>
-            <button id="14">Number4</button>
-            <button id="23">Number5</button>
-            <button id="24">Number6</button>
-            <button id="33">Number7</button>
-            <button id="34">Number8</button>
-            <button id="43">Number9</button>
-            <button id="44">Number0</button>
-            <button id="41">CursorLeft</button>
-            <button id="42">CursorRight</button>
-    </joystick>
-  </VirtualKeyboard>
-  <Scripts>
-    <joystick name="Harmony">
-            <button id="31">info</button>
-    </joystick>
-  </Scripts>
-  <NumericInput>
-    <joystick name="Harmony">
-            <button id="11">Number1</button>
-            <button id="12">Number2</button>
-            <button id="13">Number3</button>
-            <button id="14">Number4</button>
-            <button id="23">Number5</button>
-            <button id="24">Number6</button>
-            <button id="33">Number7</button>
-            <button id="34">Number8</button>
-            <button id="43">Number9</button>
-            <button id="44">Number0</button>
-            <button id="32">BackSpace</button>
-    </joystick>
-  </NumericInput>
-  <MusicInformation>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </MovieInformation>
-  <LockSettings>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </LockSettings>
-  <ProfileSettings>
-    <joystick name="Harmony">
-            <button id="6">Back</button>
-    </joystick>
-  </ProfileSettings>
-  <PictureInfo>
-    <joystick name="Harmony">
-            <button id="91">PreviousPicture</button>
-            <button id="92">NextPicture</button>
-            <button id="31">Back</button>
-    </joystick>
-  </PictureInfo>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Interact.AxisPad.xml Deleted

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="STD AxisPad">
-      <altname>Interact AxisPad</altname>
-      <button id="1">FullScreen</button> 
-      <button id="3">Select</button>   
-      <button id="4">Back</button>    
-      <button id="2">Queue</button> 
-      <button id="5">PreviousMenu</button> 
-      <button id="7"></button>        
-      <button id="9">Screenshot</button> 
-      <button id="6"></button>          
-      <button id="8"></button>  
-      <button id="10">PreviousMenu</button>       
-      <button id="11"></button>        
-      <button id="12">ActivateWindow(PlayerControls)</button>   
-      <button id="20"></button> 
-      
-      <axis limit="-1" id="0">AnalogSeekBack</axis>        
-      <axis limit="+1" id="0">AnalogSeekForward</axis>
-      
-      <axis limit="-1" id="1">ScrollUp</axis>
-      <axis limit="+1" id="1">ScrollDown</axis> 
-        
-      <axis limit="-1" id="2">VolumeUp</axis>        
-      <axis limit="+1" id="2">VolumeDown</axis>
-            
-      <axis limit="-1" id="3"></axis>      
-      <axis limit="+1" id="3"></axis>
-      
-      <axis limit="+1" id="4">Right</axis>
-      <axis limit="-1" id="4">Left</axis>            
-      <axis limit="-1" id="5">Up</axis>
-      <axis limit="+1" id="5">Down</axis>
-            
-      <hat id="1" position="left">Left</hat>
-      <hat id="1" position="right">Right</hat>
-      <hat id="1" position="up">Up</hat>
-      <hat id="1" position="down">Down</hat>
-    </joystick>
-  </global>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Logitech.RumblePad.2.xml Deleted

@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<keymap>
-  <global>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="1">FullScreen</button>
-      <button id="2">Select</button>
-      <button id="3">Back</button>
-      <button id="7">FullScreen</button>
-      <button id="8">ContextMenu</button>
-      <button id="10">ActivateWindow(Home)</button>
-      <button id="11">ActivateWindow(shutdownmenu)</button>
-      <button id="12">Screenshot</button>
-
-      <hat    id="1" position="left">Left</hat>
-      <hat    id="1" position="right">Right</hat>
-      <hat    id="1" position="up">Up</hat>
-      <hat    id="1" position="down">Down</hat>
-
-      <axis limit="+1" id="4">VolumeDown</axis>
-      <axis limit="-1" id="4">VolumeUp</axis>
-      <axis limit="+1" id="3">AnalogSeekForward</axis>
-      <axis limit="-1" id="3">AnalogSeekBack</axis>
-      <axis limit="-1" id="2">ScrollUp</axis>
-      <axis limit="+1" id="2">ScrollDown</axis>
-    </joystick>
-  </global>
-
-  <Home>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="3">ActivateWindow(Favourites)</button>
-    </joystick>
-  </Home>
-
-  <MyMusicFiles>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="4">Queue</button>
-    </joystick>
-  </MyMusicFiles>
-
-  <MyMusicLibrary>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="4">Queue</button>
-    </joystick>
-  </MyMusicLibrary>
-
-  <FullscreenVideo>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="4">AspectRatio</button>
-      <button id="5">Rewind</button>
-      <button id="6">FastForward</button>
-      <button id="10">OSD</button>
-
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChapterOrBigStepForward</hat>
-      <hat    id="1" position="down">ChapterOrBigStepBack</hat>
-    </joystick>
-  </FullscreenVideo>
-
-  <FullscreenLiveTV>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChannelUp</hat>
-      <hat    id="1" position="down">ChannelDown</hat>
-    </joystick>
-  </FullscreenLiveTV>
-
-  <FullscreenRadio>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChannelUp</hat>
-      <hat    id="1" position="down">ChannelDown</hat>
-    </joystick>
-  </FullscreenRadio>
-
-  <Visualisation>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="4">ActivateWindow(VisualisationPresetList)</button>
-      <button id="5">Rewind</button>
-      <button id="6">FastForward</button>
-      <button id="10">OSD</button>
-
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">SkipNext</hat>
-      <hat    id="1" position="down">SkipPrevious</hat>
-    </joystick>
-  </Visualisation>
-
-  <SlideShow>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="1">ZoomNormal</button>
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="4">Rotate</button>
-
-      <hat    id="1" position="left">PreviousPicture</hat>
-      <hat    id="1" position="right">NextPicture</hat>
-      <hat    id="1" position="up">ZoomIn</hat>
-      <hat    id="1" position="down">ZoomOut</hat>
-    </joystick>
-  </SlideShow>
-
-  <ScreenCalibration>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="2">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-
-  <MyVideoLibrary>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="4">Queue</button>
-      <button id="5">Info</button>
-    </joystick>
-  </MyVideoLibrary>
-
-  <MyVideoFiles>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="4">Queue</button>
-      <button id="5">Info</button>
-    </joystick>
-  </MyVideoFiles>
-
-  <VirtualKeyboard>
-    <joystick name="Logitech Logitech Cordless RumblePad 2">
-      <altname>Logitech Cordless RumblePad 2</altname>
-      <altname>Logitech RumblePad 2 USB</altname>
-      <button id="1">Symbols</button>
-      <button id="3">BackSpace</button>
-      <button id="4">Shift</button>
-      <button id="5">CursorLeft</button>
-      <button id="6">CursorRight</button>
-      <button id="9">Back</button>
-      <button id="10">Enter</button>
-    </joystick>
-  </VirtualKeyboard>
-
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml Deleted

@@ -1,713 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <joystickFamily name="Xbox 360 Controller (xpad)">
-     <name>Microsoft X-Box 360 pad</name>
-     <name>Xbox 360 Wireless Receiver (XBOX)</name>
-     <name>Xbox 360 Wireless Receiver</name>
-     <name>Thrustmaster Gamepad GP XID</name>
-     <name>Logitech Gamepad F310</name>
-     <name>Logitech Gamepad F510</name>
-     <name>Logitech Gamepad F710</name>
-     <name>Generic X-Box pad</name>
-     <name>Logitech Chillstream Controller</name>
-     <name>Mad Catz Wired Xbox 360 Controller</name>
-     <name>Mad Catz Street Fighter IV FightStick SE</name>
-     <name>Mad Catz Xbox 360 Controller</name>
-     <name>Mad Catz Street Fighter IV FightPad</name>
-     <name>Mad Catz Wired Xbox 360 Controller (SFIV)</name>
-     <name>Mad Catz Beat Pad</name>
-     <name>Mad Catz Xbox controller - MW2</name>
-     <name>Mad Catz JOYTECH NEO SE Advanced GamePad</name>
-     <name>Saitek Cyborg Rumble Pad - PC/Xbox 360</name>
-     <name>Saitek P3200 Rumble Pad - PC/Xbox 360</name>
-     <name>Super SFIV FightStick TE S</name>
-     <name>HSM3 Xbox360 dancepad</name>
-     <name>Afterglow AX.1 Gamepad for Xbox 360</name>
-     <name>Pelican PL-3601 'TSZ' Wired Xbox 360 Controller</name>
-     <name>Afterglow Gamepad for Xbox 360</name>
-     <name>Rock Candy Gamepad for Xbox 360</name>
-     <name>Logic3 Controller</name>
-     <name>Logic3 Controller</name>
-     <name>Hori Fighting Stick EX2</name>
-     <name>Hori Real Arcade Pro.EX</name>
-     <name>Honey Bee Xbox360 dancepad</name>
-     <name>PDP AFTERGLOW AX.1</name>
-     <name>RedOctane Guitar Hero X-plorer</name>
-     <name>BigBen Interactive XBOX 360 Controller</name>
-     <name>Razer Sabertooth</name>
-     <name>Power A Mini Pro Elite</name>
-     <name>Xbox Airflo wired controller</name>
-     <name>Batarang Xbox 360 controller</name>
-     <name>Joytech Neo-Se Take2</name>
-     <name>Razer Onza Tournament Edition</name>
-     <name>Razer Onza Classic Edition</name>
-     <name>Razer Sabertooth</name>
-     <name>Harmonix Rock Band Guitar</name>
-     <name>Harmonix Rock Band Drumkit</name>
-     <name>Mad Catz Xbox 360 Controller</name>
-     <name>MLG Pro Circuit Controller (Xbox)</name>
-     <name>Street Fighter IV FightPad</name>
-     <name>Street Fighter IV FightStick TE</name>
-     <name>Harmonix Xbox 360 Controller</name>
-     <name>Gamestop Xbox 360 Controller</name>
-     <name>Tron Xbox 360 controller</name>
-     <name>Razer Atrox Arcade Stick</name>
-     <name>PowerA MINI PROEX Controller</name>
-     <name>Xbox Airflo wired controller</name>
-     <name>Hori XBOX 360 EX 2 with Turbo</name>
-     <name>Hori Real Arcade Pro VX-SA</name>
-     <name>Hori SOULCALIBUR V Stick</name>
-     <name>Thrustmaster, Inc. GPX Controller</name>
-     <name>Thrustmaster Ferrari 458 Racing Wheel</name>
-     <name>Microsoft X-Box One pad</name>  
-  </joystickFamily>
-  <joystickFamily name="Xbox 360 Controller (Windows)">
-     <name>Afterglow Gamepad for Xbox 360 (Controller)</name>
-     <name>Controller (Gamepad F310)</name>
-     <name>Controller (Gamepad for Xbox 360)</name>
-     <name>Controller (Rumble Gamepad F510)</name>
-     <name>Controller (Wireless Gamepad F710)</name>
-     <name>Controller (Xbox 360 Wireless Receiver for Windows)</name>
-     <name>Controller (Xbox wireless receiver for windows)</name>
-     <name>Controller (XBOX360 GAMEPAD)</name>
-     <name>Controller (Batarang wired controller (XBOX))</name>
-     <name>Wireless Gamepad F710 (Controller)</name>
-     <name>XBOX 360 For Windows</name>
-     <name>XBOX 360 For Windows (Controller)</name>
-     <name>Xbox 360 Wireless Controller</name>
-     <name>Xbox Receiver for Windows (Wireless Controller)</name>
-     <name>Xbox wireless receiver for windows (Controller)</name>
-     <name>Gamepad F310 (Controller)</name>
-     <name>Razer Sabertooth Elite (Controller)</name>
-     <name>Controller (Razer Sabertooth Elite)</name>
-     <name>Controller (XBOX One For Windows)</name>
-  </joystickFamily>  
-  <global>
-    <joystick family="Xbox 360 Controller (Windows)">
-      
-      <button id="1">Select</button>
-      <button id="2">Back</button>
-      <button id="3">ContextMenu</button>
-      <button id="4">FullScreen</button>
-      
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-      <button id="7">PreviousMenu</button>
-      <button id="8">ActivateWindow(Home)</button>
-      
-      <button id="9">ActivateWindow(ShutdownMenu)</button>
-      <button id="10">ActivateWindow(PlayerControls)</button>
-      <button id="11">Up</button>
-      <button id="12">Down</button>
-      <button id="13">Left</button>
-      <button id="14">Right</button>
-      <button id="15">PreviousMenu</button>
-      <axis id="1" limit="-1">AnalogSeekBack</axis>
-      <axis id="1" limit="+1">AnalogSeekForward</axis>
-      <axis id="2" limit="-1">AnalogSeekForward</axis>
-      <axis id="2" limit="+1">AnalogSeekBack</axis>
-      <axis id="3" trigger="true" limit="+1">ScrollUp</axis>
-      <axis id="3" trigger="true" limit="-1">ScrollDown</axis>
-      
-      <axis id="5" limit="-1">VolumeUp</axis>
-      <axis id="5" limit="+1">VolumeDown</axis>
-      <axis id="4" limit="-1">VolumeDown</axis>
-      <axis id="4" limit="+1">VolumeUp</axis>
-      <hat id="1" position="up">Up</hat>
-      <hat id="1" position="down">Down</hat>
-      <hat id="1" position="left">Left</hat>
-      <hat id="1" position="right">Right</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="1">Select</button>
-      <button id="2">Back</button>
-      <button id="3">ContextMenu</button>
-      <button id="4">FullScreen</button>
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-      <button id="7">PreviousMenu</button>
-      <button id="8">ActivateWindow(Home)</button>
-      <button id="9">ActivateWindow(Home)</button>
-      <button id="10">ActivateWindow(ShutdownMenu)</button>
-      <button id="11">ActivateWindow(PlayerControls)</button>
-      <button id="12">Left</button>
-      <button id="13">Right</button>
-      <button id="14">Up</button>
-      <button id="15">Down</button>
-      <axis id="1" limit="-1">AnalogSeekBack</axis>
-      <axis id="1" limit="+1">AnalogSeekForward</axis>
-      <axis id="2" limit="-1">AnalogSeekForward</axis>
-      <axis id="2" limit="+1">AnalogSeekBack</axis>
-      <axis id="3" trigger="true" rest="-32768">ScrollUp</axis>
-      <axis id="4" limit="-1">VolumeDown</axis>
-      <axis id="4" limit="+1">VolumeUp</axis>
-      <axis id="5" limit="-1">VolumeUp</axis>
-      <axis id="5" limit="+1">VolumeDown</axis>
-      <axis id="6" trigger="true" rest="-32768">ScrollDown</axis>
-      <hat id="1" position="up">Up</hat>
-      <hat id="1" position="down">Down</hat>
-      <hat id="1" position="left">Left</hat>
-      <hat id="1" position="right">Right</hat>
-    </joystick>
-  </global>
-  <Home>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="8">Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="8">Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="6">Highlight</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="6">Highlight</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="5">Delete</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicFiles>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-  </MyMusicLibrary>
-  <FullscreenVideo>
-    <joystick family="Xbox 360 Controller (Windows)">
-      
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      
-      <button id="5">AspectRatio</button>
-      <button id="6">ShowSubtitles</button>
-      <button id="7">Seek(-7)</button>
-      <button id="8">Info</button>
-      <button id="10">AudioNextLanguage</button>
-      <button id="11">ChapterOrBigStepForward</button>
-      <button id="12">ChapterOrBigStepBack</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-      <hat id="1" position="up">ChapterOrBigStepForward</hat>
-      <hat id="1" position="down">ChapterOrBigStepBack</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="6">ShowSubtitles</button>
-      <button id="7">Seek(-7)</button>
-      <button id="8">Info</button>
-      <button id="9">ActivateWindow(Home)</button>  
-      <button id="10">ActivateWindow(ShutdownMenu)</button>  
-      <button id="11">AudioNextLanguage</button>  
-      <button id="12">StepBack</button>
-      <button id="13">StepForward</button>
-      <button id="14">ChapterOrBigStepForward</button>
-      <button id="15">ChapterOrBigStepBack</button>
-      <axis id="3">AnalogRewind</axis>
-      <axis id="6">AnalogFastForward</axis>
-      <hat id="1" position="up">ChapterOrBigStepForward</hat>
-      <hat id="1" position="down">ChapterOrBigStepBack</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="11">ChannelUp</button>
-      <button id="12">ChannelDown</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="12">StepBack</button>
-      <button id="13">StepForward</button>
-      <button id="14">ChannelUp</button>
-      <button id="15">ChannelDown</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="11">ChannelUp</button>
-      <button id="12">ChannelDown</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="12">StepBack</button>
-      <button id="13">StepForward</button>
-      <button id="14">ChannelUp</button>
-      <button id="15">ChannelDown</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-      <button id="3">OSD</button>
-      <button id="8">Close</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-      <button id="3">OSD</button>
-      <button id="8">Close</button>
-      <axis id="3">AnalogRewind</axis>
-      <axis id="6">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="3">Close</button>
-      <button id="9">Close</button>
-      <button id="10">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">Close</button>
-      <button id="10">Close</button>
-      <button id="11">Close</button>
-    </joystick>
-  </PlayerControls>
-  <Visualisation>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">ActivateWindow(MusicOSD)</button>
-      <button id="5">ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="10">ActivateWindow(MusicOSD)</button>
-      <button id="11">SkipNext</button>
-      <button id="12">SkipPrevious</button>
-      <button id="13">PreviousPreset</button>
-      <button id="14">NextPreset</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-      <hat id="1" position="up">SkipNext</hat>
-      <hat id="1" position="down">SkipPrevious</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">ActivateWindow(MusicOSD)</button>
-      <button id="5">ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="11">ActivateWindow(MusicOSD)</button>
-      <button id="12">PreviousPreset</button>
-      <button id="13">NextPreset</button>
-      <button id="14">SkipPrevious</button>
-      <button id="15">SkipNext</button>
-      <axis id="3">AnalogRewind</axis>
-      <axis id="6">AnalogFastForward</axis>
-      <hat id="1" position="up">SkipNext</hat>
-      <hat id="1" position="down">SkipPrevious</hat>
-      <hat id="1" position="left">PreviousPreset</hat>
-      <hat id="1" position="right">NextPreset</hat>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick family="Xbox 360 Controller (Windows)">
-
-      <button id="3">Close</button>
-      <button id="6">Info</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">Close</button>
-      <button id="6">Info</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-  <SlideShow>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">CodecInfo</button>
-      <button id="11">ZoomIn</button>
-      <button id="12">ZoomOut</button>
-      <button id="13">PreviousPicture</button>
-      <button id="14">NextPicture</button>
-      <axis id="1">AnalogMoveX</axis>
-      <axis id="2">AnalogMoveY</axis>
-      <axis id="3" limit="+1">ZoomOut</axis>
-      <axis id="3" limit="-1">ZoomIn</axis>
-      <hat id="1" position="up">ZoomIn</hat>
-      <hat id="1" position="down">ZoomOut</hat>
-      <hat id="1" position="left">PreviousPicture</hat>
-      <hat id="1" position="right">NextPicture</hat>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">CodecInfo</button>
-      <button id="12">PreviousPicture</button>
-      <button id="13">NextPicture</button>
-      <button id="14">ZoomIn</button>
-      <button id="15">ZoomOut</button>
-      <axis id="1">AnalogMoveX</axis>
-      <axis id="2">AnalogMoveY</axis>
-      <axis id="3">ZoomOut</axis>
-      <axis id="6">ZoomIn</axis>
-      <hat id="1" position="up">ZoomIn</hat>
-      <hat id="1" position="down">ZoomOut</hat>
-      <hat id="1" position="left">PreviousPicture</hat>
-      <hat id="1" position="right">NextPicture</hat>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-  <GUICalibration>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-  <VideoOSD>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="3">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">Close</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="8">Info</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="8">Info</button>
-    </joystick>
-  </VideoMenu>
-  <OSDVideoSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="5">Delete</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="5">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoLibrary>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-  </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="5">Delete</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">BackSpace</button>
-      <button id="4">Symbols</button>
-      <button id="5">Shift</button>
-      <button id="9">Enter</button>
-      <axis id="3" limit="+1">CursorLeft</axis>
-      <axis id="3" limit="-1">CursorRight</axis>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">BackSpace</button>
-      <button id="4">Symbols</button>
-      <button id="5">Shift</button>
-      <button id="10">Enter</button>
-      <axis id="3">CursorLeft</axis>
-      <axis id="6">CursorRight</axis>
-    </joystick>
-  </VirtualKeyboard>
-  <ContextMenu>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-    </joystick>
-  </ContextMenu>
-  <Scripts>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="3">ContextMenu</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="3">ContextMenu</button>
-    </joystick>
-  </Scripts>
-  <Settings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <AddonInformation>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </TextViewer>
-  <shutdownmenu>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">PreviousMenu</button>
-      <button id="9">PreviousMenu</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">PreviousMenu</button>
-      <button id="10">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </submenu>
-  <MusicInformation>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">Close</button>
-    </joystick>
-  </MovieInformation>
-  <NumericInput>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">BackSpace</button>
-      <button id="9">Enter</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">BackSpace</button>
-      <button id="10">Enter</button>
-    </joystick>
-  </NumericInput>
-  <GamepadInput>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="9">Stop</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="11">Stop</button>
-    </joystick>
-  </GamepadInput>
-  <LockSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">PreviousMenu</button>
-      <button id="9">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">PreviousMenu</button>
-      <button id="11">Close</button>
-    </joystick>
-  </LockSettings>
-  <ProfileSettings>
-    <joystick family="Xbox 360 Controller (Windows)">
-      <button id="2">PreviousMenu</button>
-      <button id="9">Close</button>
-    </joystick>
-    <joystick family="Xbox 360 Controller (xpad)">
-      <button id="2">PreviousMenu</button>
-      <button id="11">Close</button>
-    </joystick>
-  </ProfileSettings>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml Deleted

@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">Select</button>
-      <button id="2">Back</button>
-      <button id="3"/>
-      <button id="4">FullScreen</button>
-      <button id="5">Queue</button>
-      <button id="6">ContextMenu</button>
-      <button id="7"/>
-      <button id="8"/>
-      <button id="9">ActivateWindow(PlayerControls)</button>
-      <button id="10"/>
-      <button id="11">Screenshot</button>
-      <button id="12">ActivateWindow(ShutdownMenu)</button>
-      <button id="13">Up</button>
-      <button id="14">Right</button>
-      <button id="15">Down</button>
-      <button id="16">Left</button>
-      <button id="17">PreviousMenu</button>
-      <axis limit="-1" id="5">VolumeDown</axis>
-      <axis limit="+1" id="5">VolumeUp</axis>
-      <axis limit="-1" id="4">AnalogSeekBack</axis>
-      <axis limit="+1" id="4">AnalogSeekForward</axis>
-      <axis limit="0" id="3">ScrollUp</axis>
-      <axis limit="0" id="6">ScrollDown</axis>
-    </joystick>
-  </global>
-  <Home>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="5">Highlight</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Back</button>
-      <button id="5">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicFiles>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Playlist</button>
-      <button id="5">Queue</button>
-    </joystick>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Playlist</button>
-      <button id="5">Queue</button>
-    </joystick>
-  </MyMusicLibrary>
-  <FullscreenVideo>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="5">AspectRatio</button>
-      <button id="6">Info</button>
-      <button id="9">OSD</button>
-      <button id="13">ChapterOrBigStepForward</button>
-      <button id="14">ChapterOrStepForward</button>
-      <button id="15">BigStepBack</button>
-      <button id="16">StepBack</button>
-      <button id="17">Seek(-7)</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="13">ChannelUp</button>
-      <button id="14">StepForward</button>
-      <button id="15">ChannelDown</button>
-      <button id="16">StepBack</button>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="13">ChannelUp</button>
-      <button id="14">StepForward</button>
-      <button id="15">ChannelDown</button>
-      <button id="16">StepBack</button>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">CodecInfo</button>
-      <button id="6">Back</button>
-      <button id="9">OSD</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Back</button>
-    </joystick>
-  </PlayerControls>
-  <Visualisation>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="5">ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="9">OSD</button>
-      <button id="13">NextPreset</button>
-      <button id="14">SkipNext</button>
-      <button id="15">PreviousPreset</button>
-      <button id="16">SkipPrevious</button>
-      <axis limit="0" id="3">AnalogRewind</axis>
-      <axis limit="0" id="6">AnalogFastForward</axis>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="19">Back</button>
-      <button id="3">CodecInfo</button>
-      <button id="6">Info</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Back</button>
-      <button id="9">Back</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Back</button>
-      <button id="5">Back</button>
-      <button id="9">Back</button>
-    </joystick>
-  </VisualisationPresetList>
-  <SlideShow>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">CodecInfo</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">Info</button>
-      <button id="13">ZoomIn</button>
-      <button id="14">NextPicture</button>
-      <button id="15">ZoomOut</button>
-      <button id="16">PreviousPicture</button>
-      <button id="17">Stop</button>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">NextCalibration</button>
-      <button id="3">ResetCalibration</button>
-      <button id="6">NextResolution</button>
-    </joystick>
-  </ScreenCalibration>
-  <GUICalibration>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="1">NextCalibration</button>
-      <button id="3">ResetCalibration</button>
-      <button id="6">NextResolution</button>
-    </joystick>
-  </GUICalibration>
-  <VideoOSD>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Back</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="5">AspectRatio</button>
-      <button id="2">Stop</button>
-      <button id="9">OSD</button>
-      <button id="6">Info</button>
-      <button id="3">CodecInfo</button>
-    </joystick>
-  </VideoMenu>
-  <OSDVideoSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="4"/>
-      <button id="5">AspectRatio</button>
-      <button id="19">Back</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="4"/>
-      <button id="5">AspectRatio</button>
-      <button id="19">Back</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="4"/>
-      <button id="5">Delete</button>
-      <button id="19">Back</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoLibrary>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">Delete</button>
-    </joystick>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="5">Queue</button>
-      <button id="3">Playlist</button>
-    </joystick>
-  </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="5">Delete</button>
-      <button id="3">Back</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Enter</button>
-      <button id="2">BackSpace</button>
-      <button id="5">Shift</button>
-      <button id="4">Symbols</button>
-    </joystick>
-  </VirtualKeyboard>
-  <ContextMenu>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="6">Back</button>
-    </joystick>
-  </ContextMenu>
-  <Scripts>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="3">info</button>
-    </joystick>
-  </Scripts>
-  <NumericInput>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="2">BackSpace</button>
-      <button id="9">Enter</button>
-    </joystick>
-  </NumericInput>
-  <GamepadInput>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Stop</button>      
-    </joystick>
-  </GamepadInput>
-  <LockSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Back</button>
-    </joystick>
-  </LockSettings>
-  <ProfileSettings>
-    <joystick name="Microsoft Xbox Controller S">
-      <altname>Mad Catz MicroCON</altname>
-      <altname>Logitech Xbox Cordless Controller</altname>
-      <altname>Microsoft X-Box pad (Japan)</altname> 
-      <button id="9">Back</button>
-    </joystick>
-  </ProfileSettings>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Nintendo.Wii.U.Pro.Controller.xml Deleted

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<keymap>
-  <global>
-    <joystick name="Nintendo Wii Remote Pro Controller">
-      
-      <button id="1">Back</button>
-      <button id="2">Select</button>
-      <button id="3">FullScreen</button>
-      <button id="4">ContextMenu</button>
-
-      
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-
-      
-      <button id="7">ScrollUp</button>
-      <button id="8">ScrollDown</button>
-
-      
-      <button id="11">ActivateWindow(Home)</button>
-
-      
-      <button id="12">ActivateWindow(ShutdownMenu)</button>
-      <button id="13">ActivateWindow(PlayerControls)</button>
-
-      
-      <button id="14">Up</button>
-      <button id="15">Down</button>
-      <button id="16">Left</button>
-      <button id="17">Right</button>
-
-      
-      <axis id="1" limit="-1">Left</axis>
-      <axis id="1" limit="+1">Right</axis>
-      <axis id="2" limit="-1">Up</axis>
-      <axis id="2" limit="+1">Down</axis>
-
-      
-      <axis id="4" limit="-1">VolumeUp</axis>
-      <axis id="4" limit="+1">VolumeDown</axis>
-    </joystick>
-  </global>
-
-  <FullscreenVideo>
-    <joystick name="Nintendo Wii Remote Pro Controller">
-      
-      <button id="1">Stop</button>
-      <button id="2">Pause</button>
-      <button id="4">OSD</button>
-
-      
-      <button id="5">AudioNextLanguage</button>
-      <button id="6">NextSubtitle</button>
-
-      
-      <button id="7">Rewind</button>
-      <button id="8">FastForward</button>
-
-      
-      <button id="10">Info</button>
-
-      
-      <button id="13">AspectRatio</button>
-
-      
-      <button id="14">BigStepForward</button>
-      <button id="15">BigStepBack</button>
-      <button id="16">StepBack</button>
-      <button id="17">StepForward</button>
-
-      
-      <axis id="1" limit="-1">AnalogRewind</axis>
-      <axis id="1" limit="+1">AnalogFastForward</axis>
-
-    </joystick>
-  </FullscreenVideo>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Ouya.Controller.xml Deleted

@@ -1,334 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  
-  <global>
-    <joystick name="OUYA Game Controller">
-      <button id="1">Select</button>
-      <button id="2">ContextMenu</button>
-      <button id="3">FullScreen</button>
-      <button id="4">Back</button>
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-      <button id="7">PreviousMenu</button>
-      <button id="8">XBMC.ActivateWindow(Home)</button>
-      <button id="9">Up</button>
-      <button id="10">Down</button>
-      <button id="11">Left</button>
-      <button id="12">Right</button>
-      <axis id="4" limit="-1">AnalogSeekBack</axis>
-      <axis id="4" limit="+1">AnalogSeekForward</axis>
-      <axis id="2" limit="-1">ScrollUp</axis>
-      <axis id="2" limit="+1">ScrollDown</axis>
-    </joystick>
-  </global>
-
-  <Home>
-  </Home>
-
-  <MyFiles>
-  </MyFiles>
-
-  <MyMusicPlaylist>
-    <joystick name="OUYA Game Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-
-  <MyMusicFiles>
-  </MyMusicFiles>
-
-  <MyMusicLibrary>
-  </MyMusicLibrary>
-
-  <FullscreenVideo>
-    <joystick name="OUYA Game Controller">
-      <button id="1">Pause</button>
-      <button id="2">OSD</button>
-      <button id="4">Stop</button>
-      <button id="5">AspectRatio</button>
-      <button id="6">ShowSubtitles</button>
-      <button id="7">Seek(-7)</button>
-      <button id="8">Info</button>
-      <button id="9">BigStepForward</button>
-      <button id="10">BigStepBack</button>
-      <button id="11">StepBack</button>
-      <button id="12">StepForward</button>
-    </joystick>
-  </FullscreenVideo>
-
-  <FullscreenLiveTV>
-    <joystick name="OUYA Game Controller">
-      <button id="9">ChannelUp</button>
-      <button id="10">ChannelDown</button>
-      <button id="11">PreviousChannelGroup</button>
-      <button id="12">NextChannelGroup</button>
-    </joystick>
-  </FullscreenLiveTV>
-
-  <FullscreenInfo>
-    <joystick name="OUYA Game Controller">
-      <button id="2">OSD</button>
-      <button id="4">Close</button>
-      <button id="8">Close</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenInfo>
-
-  <PlayerControls>
-    <joystick name="OUYA Game Controller">
-      <button id="2">Close</button>
-      <button id="7">Close</button>
-      <button id="8">Close</button>
-    </joystick>
-  </PlayerControls>
-
-  <Visualisation>
-    <joystick name="OUYA Game Controller">
-      <button id="1">Pause</button>
-      <button id="4">Stop</button>
-      <button id="2">XBMC.ActivateWindow(MusicOSD)</button>
-      <button id="5">XBMC.ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="8">XBMC.ActivateWindow(MusicOSD)</button>
-      <button id="9">SkipNext</button>
-      <button id="10">SkipPrevious</button>
-      <button id="11">PreviousPreset</button>
-      <button id="12">NextPreset</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="6" limit="+1">AnalogFastForward</axis>
-    </joystick>
-  </Visualisation>
-
-  <MusicOSD>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-      <button id="6">Info</button>
-    </joystick>
-  </MusicOSD>
-
-  <VisualisationSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </VisualisationSettings>
-
-  <VisualisationPresetList>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-
-  <SlideShow>
-    <joystick name="OUYA Game Controller">
-      <button id="1">Pause</button>
-      <button id="4">Stop</button>
-      <button id="3">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">CodecInfo</button>
-      <button id="11">PreviousPicture</button>
-      <button id="12">NextPicture</button>
-      <axis id="1">AnalogMove</axis>
-      <axis id="2">AnalogMove</axis>
-      <axis id="3" limit="+1">ZoomOut</axis>
-      <axis id="6" limit="+1">ZoomIn</axis>
-    </joystick>
-  </SlideShow>
-
-  <ScreenCalibration>
-    <joystick name="OUYA Game Controller">
-      <button id="2">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-
-  <GUICalibration>
-    <joystick name="OUYA Game Controller">
-      <button id="2">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-
-  <VideoOSD>
-    <joystick name="OUYA Game Controller">
-      <button id="2">Close</button>
-    </joystick>
-  </VideoOSD>
-
-  <VideoMenu>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Stop</button>
-      <button id="2">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="8">Info</button>
-    </joystick>
-  </VideoMenu>
-
-  <OSDVideoSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-
-  <OSDAudioSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-
-  <VideoBookmarks>
-    <joystick name="OUYA Game Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-
-  <MyVideoLibrary>
-  </MyVideoLibrary>
-
-  <MyVideoFiles>
-  </MyVideoFiles>
-
-  <MyVideoPlaylist>
-    <joystick name="OUYA Game Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-
-  <VirtualKeyboard>
-    <joystick name="OUYA Game Controller">
-      <button id="4">BackSpace</button>
-      <button id="3">Symbols</button>
-      <button id="5">Shift</button>
-      <button id="7">Enter</button>
-      <axis id="3" limit="+1">CursorLeft</axis>
-      <axis id="6" limit="+1">CursorRight</axis>
-    </joystick>
-  </VirtualKeyboard>
-
-  <ContextMenu>
-    <joystick name="OUYA Game Controller">
-      <button id="2">Close</button>
-      <button id="4">Close</button>
-    </joystick>
-  </ContextMenu>
-
-  <Scripts>
-    <joystick name="OUYA Game Controller">
-      <button id="2">Info</button>
-    </joystick>
-  </Scripts>
-
-  <Settings>
-    <joystick name="OUYA Game Controller">
-      <button id="4">PreviousMenu</button>
-    </joystick>
-  </Settings>
-
-  <AddonInformation>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </AddonInformation>
-
-  <AddonSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </AddonSettings>
-
-  <TextViewer>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </TextViewer>
-
-  <shutdownmenu>
-    <joystick name="OUYA Game Controller">
-      <button id="4">PreviousMenu</button>
-      <button id="7">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-
-  <submenu>
-    <joystick name="OUYA Game Controller">
-      <button id="4">PreviousMenu</button>
-    </joystick>
-  </submenu>
-
-  <MusicInformation>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </MusicInformation>
-
-  <MovieInformation>
-    <joystick name="OUYA Game Controller">
-      <button id="4">Close</button>
-    </joystick>
-  </MovieInformation>
-
-  <NumericInput>
-    <joystick name="OUYA Game Controller">
-      <button id="4">BackSpace</button>
-      <button id="7">Enter</button>
-    </joystick>
-  </NumericInput>
-
-  <GamepadInput>
-    <joystick name="OUYA Game Controller">
-      <button id="7">Stop</button>
-    </joystick>
-  </GamepadInput>
-
-  <LockSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="4">PreviousMenu</button>
-      <button id="7">Close</button>
-    </joystick>
-  </LockSettings>
-
-  <ProfileSettings>
-    <joystick name="OUYA Game Controller">
-      <button id="4">PreviousMenu</button>
-      <button id="7">Close</button>
-    </joystick>
-  </ProfileSettings>
-
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.PS3.Remote.Keyboard.xml Deleted

@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="1">Info</button>
-      <button id="2">Select</button>
-      <button id="3">Back</button>
-      <button id="4">ContextMenu</button>
-      <button id="5">SkipPrevious</button>
-      <button id="6">SkipNext</button>
-      <button id="9">Select</button>
-      <button id="10">FullScreen</button>
-      <button id="12">VolumeUp</button>
-      <button id="11">VolumeDown</button>
-      <button id="13">ActivateWindow(Home)</button>
-      <hat    id="1" position="left">Left</hat>
-      <hat    id="1" position="right">Right</hat>
-      <hat    id="1" position="up">Up</hat>
-      <hat    id="1" position="down">Down</hat>
-      <axis limit="+1" id="4">VolumeDown</axis>
-      <axis limit="-1" id="4">VolumeUp</axis>
-      <axis limit="+1" id="1">AnalogSeekForward</axis>
-      <axis limit="-1" id="1">AnalogSeekBack</axis>
-      <axis limit="+1" id="13">ScrollUp</axis>
-      <axis limit="+1" id="14">ScrollDown</axis>
-    </joystick>
-  </global>
-  
-  <Visualisation>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="4">OSD</button>
-      <button id="1">Info</button>
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">IncreaseRating</hat>
-      <hat    id="1" position="down">DecreaseRating</hat>
-    </joystick>
-  </Visualisation>
-  
-  <MusicOSD>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="4">Back</button>
-    </joystick>
-  </MusicOSD>
-
-  <FullscreenVideo>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="4">OSD</button>
-      <button id="7">Rewind</button>
-      <button id="8">FastForward</button>
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChapterOrBigStepForward</hat>
-      <hat    id="1" position="down">ChapterOrBigStepBack</hat>
-    </joystick>
-  </FullscreenVideo>
-
-  <FullscreenLiveTV>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChannelUp</hat>
-      <hat    id="1" position="down">ChannelDown</hat>
-    </joystick>
-  </FullscreenLiveTV>
-
-  <FullscreenRadio>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">ChannelUp</hat>
-      <hat    id="1" position="down">ChannelDown</hat>
-    </joystick>
-  </FullscreenRadio>
-
-  <VideoOSD>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="1">Info</button>
-      <button id="4">OSD</button>
-    </joystick>
-  </VideoOSD>
-  
-  <PictureInfo>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <hat    id="1" position="left">PreviousPicture</hat>
-      <hat    id="1" position="right">NextPicture</hat>
-    </joystick>
-  </PictureInfo>
- 
-  <FullscreenInfo>
-    <joystick name="PLAYSTATION(R)3 Remote Keyboard">
-      <altname>PS3 Remote Keyboard</altname>
-      <altname>MoSart PS3 Remote Keyboard</altname>
-      <button id="1">Back</button>
-      <button id="4">OSD</button>
-    </joystick>
-  </FullscreenInfo>
-
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.PS4.Controller.xml Deleted

@@ -1,324 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  
-  <global>
-    <joystick name="Wireless Controller">
-      <button id="2">Select</button>
-      <button id="1">ContextMenu</button>
-      <button id="4">FullScreen</button>
-      <button id="3">Back</button>
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-      <button id="11">PreviousMenu</button>
-      <button id="12">XBMC.ActivateWindow(Home)</button>
-      <hat    id="1" position="left">Left</hat>
-      <hat    id="1" position="right">Right</hat>
-      <hat    id="1" position="up">Up</hat>
-      <hat    id="1" position="down">Down</hat>
-      <axis limit="+1" id="3">AnalogSeekForward</axis>
-      <axis limit="-1" id="3">AnalogSeekBack</axis>
-      <axis limit="-1" id="2">ScrollUp</axis>
-      <axis limit="+1" id="2">ScrollDown</axis>
-    </joystick>
-  </global>
-
-  <Home>
-  </Home>
-
-  <MyFiles>
-  </MyFiles>
-
-  <MyMusicPlaylist>
-    <joystick name="Wireless Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-
-  <MyMusicFiles>
-  </MyMusicFiles>
-
-  <MyMusicLibrary>
-  </MyMusicLibrary>
-
-  <FullscreenVideo>
-    <joystick name="Wireless Controller">
-      <button id="2">Pause</button>
-      <button id="1">OSD</button>
-      <button id="3">Stop</button>
-      <button id="5">AspectRatio</button>
-      <button id="6">ShowSubtitles</button>
-      <button id="11">Seek(-7)</button>
-      <button id="12">Info</button>
-      <hat    id="1" position="left">StepBack</hat>
-      <hat    id="1" position="right">StepForward</hat>
-      <hat    id="1" position="up">BigStepForward</hat>
-      <hat    id="1" position="down">BigStepBack</hat>
-    </joystick>
-  </FullscreenVideo>
-
-  <FullscreenLiveTV>
-    <joystick name="Wireless Controller">
-      <hat    id="1" position="up">ChannelUp</hat>
-      <hat    id="1" position="down">ChannelDown</hat>
-      <hat    id="1" position="left">PreviousChannelGroup</hat>
-      <hat    id="1" position="right">NextChannelGroup</hat>
-    </joystick>
-  </FullscreenLiveTV>
-
-  <FullscreenInfo>
-    <joystick name="Wireless Controller">
-      <button id="1">OSD</button>
-      <button id="3">Close</button>
-    </joystick>
-  </FullscreenInfo>
-
-  <PlayerControls>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </PlayerControls>
-
-  <Visualisation>
-    <joystick name="Wireless Controller">
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="1">XBMC.ActivateWindow(MusicOSD)</button>
-      <button id="12">Info</button>
-      <button id="6">SkipNext</button>
-      <button id="5">SkipPrevious</button>
-      <button id="7">PreviousPreset</button>
-      <button id="8">NextPreset</button>
-    </joystick>
-  </Visualisation>
-
-  <MusicOSD>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-      <button id="12">Info</button>
-    </joystick>
-  </MusicOSD>
-
-  <VisualisationSettings>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </VisualisationSettings>
-
-  <VisualisationPresetList>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-
-  <SlideShow>
-    <joystick name="Wireless Controller">
-      <button id="2">Pause</button>
-      <button id="3">Stop</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">CodecInfo</button>
-      <hat    id="1" position="left">PreviousPicture</hat>
-      <hat    id="1" position="right">NextPicture</hat>
-      <axis id="1">AnalogMove</axis>
-      <axis id="2">AnalogMove</axis>
-      <button id="7">ZoomOut</button>
-      <button id="8">ZoomIn</button>
-    </joystick>
-  </SlideShow>
-
-  <ScreenCalibration>
-    <joystick name="Wireless Controller">
-      <button id="2">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-
-  <GUICalibration>
-    <joystick name="Wireless Controller">
-      <button id="2">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-
-  <VideoOSD>
-    <joystick name="Wireless Controller">
-      <button id="2">Close</button>
-    </joystick>
-  </VideoOSD>
-
-  <VideoMenu>
-    <joystick name="Wireless Controller">
-      <button id="3">Stop</button>
-      <button id="2">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="12">Info</button>
-    </joystick>
-  </VideoMenu>
-
-  <OSDVideoSettings>
-    <joystick name="Wireless Controller">
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-
-  <OSDAudioSettings>
-    <joystick name="Wireless Controller">
-      <button id="5">AspectRatio</button>
-      <button id="2">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-
-  <VideoBookmarks>
-    <joystick name="Wireless Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-
-  <MyVideoLibrary>
-  </MyVideoLibrary>
-
-  <MyVideoFiles>
-  </MyVideoFiles>
-
-  <MyVideoPlaylist>
-    <joystick name="Wireless Controller">
-      <button id="5">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-
-  <VirtualKeyboard>
-    <joystick name="Wireless Controller">
-      <button id="3">BackSpace</button>
-      <button id="4">Symbols</button>
-      <button id="5">Shift</button>
-      <button id="11">Enter</button>
-      <button id="7">CursorLeft</button>
-      <button id="8">CursorRight</button>
-    </joystick>
-  </VirtualKeyboard>
-
-  <ContextMenu>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </ContextMenu>
-
-  <Scripts>
-  </Scripts>
-
-  <Settings>
-    <joystick name="Wireless Controller">
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </Settings>
-
-  <AddonInformation>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </AddonInformation>
-
-  <AddonSettings>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </AddonSettings>
-
-  <TextViewer>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </TextViewer>
-
-  <shutdownmenu>
-    <joystick name="Wireless Controller">
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-
-  <submenu>
-    <joystick name="Wireless Controller">
-      <button id="3">PreviousMenu</button>
-    </joystick>
-  </submenu>
-
-  <MusicInformation>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </MusicInformation>
-
-  <MovieInformation>
-    <joystick name="Wireless Controller">
-      <button id="3">Close</button>
-    </joystick>
-  </MovieInformation>
-
-  <NumericInput>
-    <joystick name="Wireless Controller">
-      <button id="3">BackSpace</button>
-      <button id="11">Enter</button>
-    </joystick>
-  </NumericInput>
-
-  <GamepadInput>
-    <joystick name="Wireless Controller">
-      <button id="11">Stop</button>
-    </joystick>
-  </GamepadInput>
-
-  <LockSettings>
-    <joystick name="Wireless Controller">
-      <button id="3">PreviousMenu</button>
-      <button id="11">Close</button>
-    </joystick>
-  </LockSettings>
-
-  <ProfileSettings>
-    <joystick name="Wireless Controller">
-      <button id="3">PreviousMenu</button>
-      <button id="11">Close</button>
-    </joystick>
-  </ProfileSettings>
-
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.Sony.PLAYSTATION(R)3.Controller.xml Deleted

@@ -1,485 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <button id="15">Select</button>
-      <button id="14">Back</button>
-      <button id="16">ContextMenu</button>
-      <button id="13">FullScreen</button>
-      <button id="11">Queue</button>
-      <button id="12">Playlist</button>
-      <button id="1">PreviousMenu</button>
-      <button id="4">ActivateWindow(Home)</button>
-      <button id="17">ActivateWindow(Home)</button>
-      <button id="2">ActivateWindow(ShutdownMenu)</button>
-      <button id="3">ActivateWindow(PlayerControls)</button>
-      <axis id="1">AnalogSeekForward</axis>
-      <axis id="2">AnalogSeekBack</axis>
-      <axis id="3" limit="+1">VolumeUp</axis>
-      <axis id="3" limit="-1">VolumeDown</axis>
-      <axis id="4" limit="+1">VolumeDown</axis>
-      <axis id="4" limit="-1">VolumeUp</axis>
-      <axis trigger="true" rest="-32768" id="13">ScrollUp</axis>
-      <axis trigger="true" rest="-32768" id="14">ScrollDown</axis>
-      <button id="5">Up</button>
-      <button id="7">Down</button>
-      <button id="8">Left</button>
-      <button id="6">Right</button>
-	  
-      
-      <axis id="5" rest="-32768">noop</axis>
-      <axis id="6" rest="-32768">noop</axis>
-      <axis id="7" rest="-32768">noop</axis>
-      <axis id="8" rest="-32768">noop</axis>
-      <axis id="9" rest="-32768">noop</axis>
-      <axis id="10" rest="-32768">noop</axis>
-      <axis id="11" rest="-32768">noop</axis>
-      <axis id="12" rest="-32768">noop</axis>
-      <axis id="15" rest="-32768">noop</axis>
-      <axis id="16" rest="-32768">noop</axis>
-      <axis id="17" rest="-32768">noop</axis>
-      <axis id="18" rest="-32768">noop</axis>
-      <axis id="19" rest="-32768">noop</axis>
-      <axis id="20" rest="-32768">noop</axis>
-      <axis id="21" rest="-32768">noop</axis>
-      <axis id="22" rest="-32768">noop</axis>
-      <axis id="23" rest="-32768">noop</axis>
-    </joystick>
-  </global>
-  <Home>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="4">Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="12">Highlight</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="11">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <FullscreenVideo>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="15">Pause</button>
-      <button id="14">Stop</button>
-      <button id="16">OSD</button>
-      <button id="11">AspectRatio</button>
-      <button id="12">ShowSubtitles</button>
-      <button id="1">Seek(-7)</button>
-      <button id="4">Info</button>
-      <button id="17">ActivateWindow(Home)</button>
-      <button id="2">ActivateWindow(ShutdownMenu)</button>
-      <button id="3">AudioNextLanguage</button>
-      <axis id="13">AnalogRewind</axis>
-      <axis id="14">AnalogFastForward</axis>
-      <button id="5">ChapterOrBigStepForward</button>
-      <button id="7">ChapterOrBigStepBack</button>
-      <button id="8">StepBack</button>
-      <button id="6">StepForward</button>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="5">ChannelUp</button>
-      <button id="7">ChannelDown</button>
-      <button id="8">StepBack</button>
-      <button id="6">StepForward</button>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="5">ChannelUp</button>
-      <button id="7">ChannelDown</button>
-      <button id="8">StepBack</button>
-      <button id="6">StepForward</button>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-      <button id="16">OSD</button>
-      <button id="4">Close</button>
-      <axis id="13">AnalogRewind</axis>
-      <axis id="14">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">Close</button>
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-    </joystick>
-  </PlayerControls>
-  <Visualisation>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="15">Pause</button>
-      <button id="14">Stop</button>
-      <button id="16">ActivateWindow(MusicOSD)</button>
-      <button id="11">ActivateWindow(VisualisationPresetList)</button>
-      <button id="12">Info</button>
-      <button id="3">ActivateWindow(MusicOSD)</button>
-      <axis id="13">AnalogRewind</axis>
-      <axis id="14">AnalogFastForward</axis>
-      <button id="5">SkipNext</button>
-      <button id="7">SkipPrevious</button>
-      <button id="8">PreviousPreset</button>
-      <button id="6">NextPreset</button>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">Close</button>
-      <button id="12">Info</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-  <SlideShow>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="15">Pause</button>
-      <button id="14">Stop</button>
-      <button id="13">ZoomNormal</button>
-      <button id="11">Rotate</button>
-      <button id="12">CodecInfo</button>
-      <axis id="1">AnalogMoveX</axis>
-      <axis id="2">AnalogMoveY</axis>
-      <axis id="13">ZoomOut</axis>
-      <axis id="14">ZoomIn</axis>
-      <button id="5">ZoomIn</button>
-      <button id="7">ZoomOut</button>
-      <button id="8">PreviousPicture</button>
-      <button id="6">NextPicture</button>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">ResetCalibration</button>
-      <button id="11">NextResolution</button>
-      <button id="12">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-  <GUICalibration>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">ResetCalibration</button>
-      <button id="11">NextResolution</button>
-      <button id="12">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-  <VideoOSD>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">Close</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Stop</button>
-      <button id="16">OSD</button>
-      <button id="11">AspectRatio</button>
-      <button id="4">Info</button>
-    </joystick>
-  </VideoMenu>
-  <OSDVideoSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="11">AspectRatio</button>
-      <button id="16">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="11">AspectRatio</button>
-      <button id="16">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="11">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoPlaylist>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="11">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">BackSpace</button>
-      <button id="13">Symbols</button>
-      <button id="11">Shift</button>
-      <button id="2">Enter</button>
-      <axis id="13">CursorLeft</axis>
-      <axis id="14">CursorRight</axis>
-    </joystick>
-  </VirtualKeyboard>
-  <ContextMenu>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-      <button id="16">Close</button>
-    </joystick>
-  </ContextMenu>
-  <Scripts>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="16">Info</button>
-    </joystick>
-  </Scripts>
-  <Settings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <AddonInformation>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </TextViewer>
-  <shutdownmenu>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">PreviousMenu</button>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">PreviousMenu</button>
-    </joystick>
-  </submenu>
-  <MusicInformation>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">Close</button>
-    </joystick>
-  </MovieInformation>
-  <NumericInput>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">BackSpace</button>
-      <button id="2">Enter</button>
-    </joystick>
-  </NumericInput>
-  <GamepadInput>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="3">Stop</button>
-    </joystick>
-  </GamepadInput>
-  <LockSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">PreviousMenu</button>
-      <button id="3">Close</button>
-    </joystick>
-  </LockSettings>
-  <ProfileSettings>
-    <joystick name="/Sony PLAYSTATION$R$3 Controller.*">
-      <altname>PLAYSTATION(R)3 Controller</altname>
-      <altname>PS3 Controller</altname>
-      <altname>Sony Computer Entertainment Wireless Controller</altname>      
-      <button id="14">PreviousMenu</button>
-      <button id="3">Close</button>
-    </joystick>
-  </ProfileSettings>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.WiiRemote.xml Deleted

@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick name="WiiRemote">
-      <button id="1">Up</button>
-      <button id="2">Down</button>
-      <button id="3">Left</button>
-      <button id="4">Right</button>
-      <button id="5">Select</button>
-      <button id="6">Back</button>
-      <button id="7">VolumeDown</button>
-      <button id="8">ActivateWindow(Home)</button>
-      <button id="9">VolumeUp</button>
-      <button id="10">ContextMenu</button>
-      <button id="11">ActivateWindow(PlayerControls)</button>
-    </joystick>
-  </global>
-  <Home>
-    <joystick name="WiiRemote">
-      <button id="8">Fullscreen</button>
-      <button id="10">ActivateWindow(Favourites)</button>
-      <button id="11">ActivateWindow(ShutdownMenu)</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick name="WiiRemote">
-      <button id="7">Move</button>
-      <button id="9">Copy</button>
-      <button id="11">Highlight</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick name="WiiRemote">
-      <button id="7">MoveItemUp</button>
-      <button id="9">MoveItemDown</button>
-      <button id="11">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicPlaylistEditor>
-    <joystick name="WiiRemote">
-      <button id="7">MoveItemUp</button>
-      <button id="9">MoveItemDown</button>
-      <button id="11">Delete</button>
-    </joystick>
-  </MyMusicPlaylistEditor>
-  <MyMusicFiles>
-    <joystick name="WiiRemote">
-      <button id="11">Playlist</button>
-    </joystick>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-    <joystick name="WiiRemote">
-      <button id="11">Playlist</button>
-    </joystick>
-  </MyMusicLibrary>
-  <FullscreenVideo>
-    <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">StepBack</button>
-      <button id="4">StepForward</button>
-      <button id="5">OSD</button>
-      <button id="6">Info</button>
-      <button id="10">CodecInfo</button>
-      <button id="11">AspectRatio</button>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick name="WiiRemote">
-      <button id="3">ChannelDown</button>
-      <button id="4">ChannelUp</button>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick name="WiiRemote">
-      <button id="3">ChannelDown</button>
-      <button id="4">ChannelUp</button>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick name="WiiRemote">
-      <button id="5">CodecInfo</button>
-    </joystick>
-  </FullscreenInfo>
-  <Visualisation>
-    <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">StepForward</button>
-      <button id="4">StepBack</button>
-      <button id="5">OSD</button>
-      <button id="6">Info</button>
-      <button id="8">ActivateWindow(music)</button>
-      <button id="10">SkipNext</button>
-      <button id="11">SkipPrevious</button>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick name="WiiRemote">
-      <button id="10">CodecInfo</button>
-      <button id="11">Info</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick name="WiiRemote">
-      <button id="10">ActivateWindow(VisualisationPresetList)</button>
-      <button id="11">ActivateWindow(MusicPlaylist)</button>
-    </joystick>
-  </VisualisationSettings>
-  <SlideShow>
-    <joystick name="WiiRemote">
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">PreviousPicture</button>
-      <button id="4">NextPicture</button>
-      <button id="5">CodecInfo</button>
-      <button id="6">Info</button>
-      <button id="10">ZoomIn</button>
-      <button id="11">ZoomOut</button>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick name="WiiRemote">
-      <button id="5">NextCalibration</button>
-      <button id="10">NextResolution</button>
-      <button id="11">ResetResolution</button>
-    </joystick>
-  </ScreenCalibration>
-  <VideoMenu>
-    <joystick name="WiiRemote">
-      <button id="5">Select</button>
-      <button id="10">Info</button>
-      <button id="11">AspectRatio</button>
-    </joystick>
-  </VideoMenu>
-  <VideoBookmarks>
-    <joystick name="WiiRemote">
-      <button id="11">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoLibrary>
-    <joystick name="WiiRemote">
-      <button id="11">Playlist</button>
-    </joystick>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-    <joystick name="WiiRemote">
-      <button id="11">Playlist</button>
-    </joystick>
-  </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick name="WiiRemote">
-      <button id="7">MoveItemDown</button>
-      <button id="9">MoveItemUp</button>
-      <button id="11">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick name="WiiRemote">
-      <button id="6">Shift</button>
-      <button id="7">CursorLeft</button>
-      <button id="9">CursorRight</button>
-      <button id="10">Symbols</button>
-      <button id="11">BackSpace</button>
-    </joystick>
-  </VirtualKeyboard>
-  <Scripts>
-    <joystick name="WiiRemote">
-      <button id="11">info</button>
-    </joystick>
-  </Scripts>
-  <NumericInput>
-    <joystick name="WiiRemote">
-      <button id="7">SkipPrevious</button>
-      <button id="9">SkipNext</button>
-      <button id="10">Enter</button>
-      <button id="11">BackSpace</button>
-    </joystick>
-  </NumericInput>
-  <PictureInfo>
-    <joystick name="WiiRemote">
-      <button id="3">PreviousPicture</button>
-      <button id="4">NextPicture</button>
-    </joystick>
-  </PictureInfo>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.xml Added

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keymap>
+  <global>
+    <joystick>
+      <a>Select</a>
+      <b>Back</b>
+      <x>ContextMenu</x>
+      <y>FullScreen</y>
+      <start>ActivateWindow(PlayerControls)</start>
+      <back>Back</back>
+      <guide>ActivateWindow(Home)</guide>
+      <up>Up</up>
+      <down>Down</down>
+      <right>Right</right>
+      <left>Left</left>
+      <leftthumb>Screenshot</leftthumb>
+      <rightthumb>ActivateWindow(ShutdownMenu)</rightthumb>
+      <lefttrigger>ScrollUp</lefttrigger>
+      <righttrigger>ScrollDown</righttrigger>
+      <leftbumper>ScrollUp</leftbumper>
+      <rightbumper>ScrollDown</rightbumper>
+      <leftstickleft>Left</leftstickleft>
+      <leftstickright>Right</leftstickright>
+      <leftstickup>Up</leftstickup>
+      <leftstickdown>Down</leftstickdown>
+      <rightstickleft>VolumeDown</rightstickleft>
+      <rightstickright>VolumeUp</rightstickright>
+      <rightstickup>VolumeUp</rightstickup>
+      <rightstickdown>VolumeDown</rightstickdown>
+    </joystick>
+  </global>
+  <Home>
+    <joystick>
+      <start>Skin.ToggleSetting(HomeViewToggle)</start>
+    </joystick>
+  </Home>
+  <MyFiles>
+    <joystick>
+      <rightbumper>Highlight</rightbumper>
+    </joystick>
+  </MyFiles>
+  <MyMusicPlaylist>
+    <joystick>
+      <leftbumper>Delete</leftbumper>
+    </joystick>
+  </MyMusicPlaylist>
+  <MyMusicFiles>
+  </MyMusicFiles>
+  <MyMusicLibrary>
+  </MyMusicLibrary>
+  <FullscreenVideo>
+    <joystick>
+      <a>Pause</a>
+      <b>Stop</b>
+      <x>OSD</x>
+      <y>FullScreen</y>
+      <start>Info</start>
+      <back>Seek(-7)</back>
+      <guide>ActivateWindow(Home)</guide>
+      <up>ChapterOrBigStepForward</up>
+      <down>ChapterOrBigStepBack</down>
+      <right>StepForward</right>
+      <left>StepBack</left>
+      <leftthumb>ShowSubtitles</leftthumb>
+      <rightthumb>AspectRatio</rightthumb>
+      <lefttrigger>AnalogRewind</lefttrigger>
+      <righttrigger>AnalogFastForward</righttrigger>
+      <leftbumper>AnalogRewind</leftbumper>
+      <rightbumper>AnalogFastForward</rightbumper>
+      <leftstickleft>AnalogSeekBack</leftstickleft>
+      <leftstickright>AnalogSeekForward</leftstickright>
+      <leftstickup>AnalogSeekForward</leftstickup>
+      <leftstickdown>AnalogSeekBack</leftstickdown>
+      <rightstickleft>VolumeDown</rightstickleft>
+      <rightstickright>VolumeUp</rightstickright>
+      <rightstickup>VolumeUp</rightstickup>
+      <rightstickdown>VolumeDown</rightstickdown>
+    </joystick>
+  </FullscreenVideo>
+  <FullscreenLiveTV>
+    <joystick>
+      <up>ChannelUp</up>
+      <down>ChannelDown</down>
+      <left>StepBack</left>
+      <right>StepForward</right>
+    </joystick>
+  </FullscreenLiveTV>
+  <FullscreenRadio>
+    <joystick>
+      <up>ChannelUp</up>
+      <down>ChannelDown</down>
+      <left>StepBack</left>
+      <right>StepForward</right>
+    </joystick>
+  </FullscreenRadio>
+  <FullscreenInfo>
+    <joystick>
+      <b>Close</b>
+      <x>OSD</x>
+      <start>Close</start>
+      <lefttrigger>AnalogRewind</lefttrigger>
+      <righttrigger>AnalogFastForward</righttrigger>
+      <leftbumper>AnalogRewind</leftbumper>
+      <rightbumper>AnalogFastForward</rightbumper>
+    </joystick>
+  </FullscreenInfo>
+  <PlayerControls>
+    <joystick>
+      <x>Close</x>
+      <leftthumb>Close</leftthumb>
+      <rightthumb>Close</rightthumb>
+    </joystick>
+  </PlayerControls>
+  <Visualisation>
+    <joystick>
+      <a>Pause</a>
+      <b>Stop</b>
+      <x>ActivateWindow(VisualisationSettings)</x>
+      <y>ActivateWindow(VisualisationPresetList)</y>
+      <start>Info</start>
+      <rightthumb>ActivateWindow(MusicOSD)</rightthumb>
+      <up>SkipNext</up>
+      <down>SkipPrevious</down>
+      <left>StepBack</left>
+      <right>StepForward</right>
+      <lefttrigger>AnalogRewind</lefttrigger>
+      <righttrigger>AnalogFastForward</righttrigger>
+      <leftbumper>AnalogRewind</leftbumper>
+      <rightbumper>AnalogFastForward</rightbumper>
+      <leftstickleft>PreviousPreset</leftstickleft>
+      <leftstickright>NextPreset</leftstickright>
+    </joystick>
+  </Visualisation>
+  <MusicOSD>
+    <joystick>
+      <b>Close</b>
+      <start>Info</start>
+    </joystick>
+  </MusicOSD>
+  <VisualisationSettings>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </VisualisationSettings>
+  <VisualisationPresetList>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </VisualisationPresetList>
+  <SlideShow>
+    <joystick>
+      <a>Pause</a>
+      <b>Stop</b>
+      <y>ZoomNormal</y>
+      <leftbumper>Rotate</leftbumper>
+      <rightbumper>CodecInfo</rightbumper>
+      <up>ZoomIn</up>
+      <down>ZoomOut</down>
+      <left>PreviousPicture</left>
+      <right>NextPicture</right>
+      <leftstickleft>AnalogMoveX</leftstickleft>
+      <leftstickright>AnalogMoveX</leftstickright>
+      <leftstickup>AnalogMoveY</leftstickup>
+      <leftstickdown>AnalogMoveY</leftstickdown>
+      <lefttrigger>ZoomOut</lefttrigger>
+      <righttrigger>ZoomIn</righttrigger>
+    </joystick>
+  </SlideShow>
+  <ScreenCalibration>
+    <joystick>
+      <x>ResetCalibration</x>
+      <leftbumper>NextResolution</leftbumper>
+      <rightbumper>NextCalibration</rightbumper>
+    </joystick>
+  </ScreenCalibration>
+  <GUICalibration>
+    <joystick>
+      <x>ResetCalibration</x>
+      <leftbumper>NextResolution</leftbumper>
+      <rightbumper>NextCalibration</rightbumper>
+    </joystick>
+  </GUICalibration>
+  <VideoOSD>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </VideoOSD>
+  <VideoMenu>
+    <joystick>
+      <b>Stop</b>
+      <x>OSD</x>
+      <leftbumper>AspectRatio</leftbumper>
+      <start>Info</start>
+    </joystick>
+  </VideoMenu>
+  <OSDVideoSettings>
+    <joystick>
+      <leftbumper>AspectRatio</leftbumper>
+      <x>Close</x>
+    </joystick>
+  </OSDVideoSettings>
+  <OSDAudioSettings>
+    <joystick>
+      <leftbumper>AspectRatio</leftbumper>
+      <x>Close</x>
+    </joystick>
+  </OSDAudioSettings>
+  <VideoBookmarks>
+    <joystick>
+      <leftbumper>Delete</leftbumper>
+    </joystick>
+  </VideoBookmarks>
+  <MyVideoLibrary>
+  </MyVideoLibrary>
+  <MyVideoFiles>
+  </MyVideoFiles>
+  <MyVideoPlaylist>
+    <joystick>
+      <leftbumper>Delete</leftbumper>
+    </joystick>
+  </MyVideoPlaylist>
+  <VirtualKeyboard>
+    <joystick>
+      <b>BackSpace</b>
+      <y>Symbols</y>
+      <leftbumper>Shift</leftbumper>
+      <leftthumb>Enter</leftthumb>
+      <lefttrigger>CursorLeft</lefttrigger>
+      <righttrigger>CursorRight</righttrigger>
+    </joystick>
+  </VirtualKeyboard>
+  <ContextMenu>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </ContextMenu>
+  <Scripts>
+    <joystick>
+      <x>ContextMenu</x>
+    </joystick>
+  </Scripts>
+  <Settings>
+    <joystick>
+      <b>PreviousMenu</b>
+    </joystick>
+  </Settings>
+  <AddonInformation>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </AddonInformation>
+  <AddonSettings>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </AddonSettings>
+  <TextViewer>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </TextViewer>
+  <shutdownmenu>
+    <joystick>
+      <b>PreviousMenu</b>
+      <leftthumb>PreviousMenu</leftthumb>
+    </joystick>
+  </shutdownmenu>
+  <submenu>
+    <joystick>
+      <b>PreviousMenu</b>
+    </joystick>
+  </submenu>
+  <MusicInformation>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </MusicInformation>
+  <MovieInformation>
+    <joystick>
+      <b>Close</b>
+    </joystick>
+  </MovieInformation>
+  <NumericInput>
+    <joystick>
+      <b>BackSpace</b>
+      <leftthumb>Enter</leftthumb>
+    </joystick>
+  </NumericInput>
+  <GamepadInput>
+    <joystick>
+      <leftthumb>Stop</leftthumb>
+    </joystick>
+  </GamepadInput>
+  <LockSettings>
+    <joystick>
+      <b>PreviousMenu</b>
+      <leftthumb>Close</leftthumb>
+    </joystick>
+  </LockSettings>
+  <ProfileSettings>
+    <joystick>
+      <b>PreviousMenu</b>
+      <leftthumb>Close</leftthumb>
+    </joystick>
+  </ProfileSettings>
+</keymap>

_service:download_url:master.tar.gz/system/keymaps/joystick.xml.sample Deleted

@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<keymap>
-  <global>
-    <joystick>
-      
-      <button id="1">Select</button>
-      <button id="2">Back</button>
-      <button id="3">ContextMenu</button>
-      <button id="4">FullScreen</button>
-      
-      <button id="5">Queue</button>
-      <button id="6">Playlist</button>
-      <button id="7">PreviousMenu</button>
-      <button id="8">ActivateWindow(Home)</button>
-      
-      <button id="9">ActivateWindow(ShutdownMenu)</button>
-      <button id="10">ActivateWindow(PlayerControls)</button>
-      <button id="11">Up</button>
-      <button id="12">Down</button>
-      <button id="13">Left</button>
-      <button id="14">Right</button>
-      <button id="15">PreviousMenu</button>
-      <axis id="1" limit="-1">Up</axis>
-      <axis id="1" limit="+1">Down</axis>
-      <axis id="2" limit="-1">Left</axis>
-      <axis id="2" limit="+1">Right</axis>
-      <axis id="3" limit="+1">ScrollUp</axis>
-      <axis id="3" limit="-1">ScrollDown</axis>
-      
-      <axis id="5" limit="-1">VolumeUp</axis>
-      <axis id="5" limit="+1">VolumeDown</axis>
-      <axis id="4" limit="-1">VolumeDown</axis>
-      <axis id="4" limit="+1">VolumeUp</axis>
-      <hat id="1" position="up">Up</hat>
-      <hat id="1" position="down">Down</hat>
-      <hat id="1" position="left">Left</hat>
-      <hat id="1" position="right">Right</hat>
-    </joystick>
-  </global>
-  <Home>
-    <joystick>
-      <button id="8">Skin.ToggleSetting(HomeViewToggle)</button>
-    </joystick>
-  </Home>
-  <MyFiles>
-    <joystick>
-      <button id="6">Highlight</button>
-    </joystick>
-  </MyFiles>
-  <MyMusicPlaylist>
-    <joystick>
-      <button id="5">Delete</button>
-    </joystick>
-  </MyMusicPlaylist>
-  <MyMusicFiles>
-  </MyMusicFiles>
-  <MyMusicLibrary>
-  </MyMusicLibrary>
-  <FullscreenVideo>
-    <joystick>
-      
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      
-      <button id="5">AspectRatio</button>
-      <button id="6">ShowSubtitles</button>
-      <button id="7">Seek(-7)</button>
-      <button id="8">Info</button>
-      <button id="10">AudioNextLanguage</button>
-      <button id="11">BigStepForward</button>
-      <button id="12">BigStepBack</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-      <hat id="1" position="up">BigStepForward</hat>
-      <hat id="1" position="down">BigStepBack</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenVideo>
-  <FullscreenLiveTV>
-    <joystick>
-      <button id="11">ChannelUp</button>
-      <button id="12">ChannelDown</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenLiveTV>
-  <FullscreenRadio>
-    <joystick>
-      <button id="11">ChannelUp</button>
-      <button id="12">ChannelDown</button>
-      <button id="13">StepBack</button>
-      <button id="14">StepForward</button>
-      <hat id="1" position="up">ChannelUp</hat>
-      <hat id="1" position="down">ChannelDown</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </FullscreenRadio>
-  <FullscreenInfo>
-    <joystick>
-      <button id="2">Close</button>
-      <button id="3">OSD</button>
-      <button id="8">Close</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-    </joystick>
-  </FullscreenInfo>
-  <PlayerControls>
-    <joystick>
-      <button id="3">Close</button>
-      <button id="9">Close</button>
-      <button id="10">Close</button>
-    </joystick>
-  </PlayerControls>
-  <Visualisation>
-    <joystick>
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="3">ActivateWindow(MusicOSD)</button>
-      <button id="5">ActivateWindow(VisualisationPresetList)</button>
-      <button id="6">Info</button>
-      <button id="10">ActivateWindow(MusicOSD)</button>
-      <button id="11">SkipNext</button>
-      <button id="12">SkipPrevious</button>
-      <button id="13">PreviousPreset</button>
-      <button id="14">NextPreset</button>
-      <axis id="3" limit="+1">AnalogRewind</axis>
-      <axis id="3" limit="-1">AnalogFastForward</axis>
-      <hat id="1" position="up">SkipNext</hat>
-      <hat id="1" position="down">SkipPrevious</hat>
-      <hat id="1" position="left">StepBack</hat>
-      <hat id="1" position="right">StepForward</hat>
-    </joystick>
-  </Visualisation>
-  <MusicOSD>
-    <joystick>
-      <button id="3">Close</button>
-      <button id="6">Info</button>
-    </joystick>
-  </MusicOSD>
-  <VisualisationSettings>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </VisualisationSettings>
-  <VisualisationPresetList>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </VisualisationPresetList>
-  <SlideShow>
-    <joystick>
-      <button id="1">Pause</button>
-      <button id="2">Stop</button>
-      <button id="4">ZoomNormal</button>
-      <button id="5">Rotate</button>
-      <button id="6">CodecInfo</button>
-      <button id="11">ZoomIn</button>
-      <button id="12">ZoomOut</button>
-      <button id="13">PreviousPicture</button>
-      <button id="14">NextPicture</button>
-      <axis id="1">AnalogMove</axis>
-      <axis id="2">AnalogMove</axis>
-      <axis id="3" limit="+1">ZoomOut</axis>
-      <axis id="3" limit="-1">ZoomIn</axis>
-      <hat id="1" position="up">ZoomIn</hat>
-      <hat id="1" position="down">ZoomOut</hat>
-      <hat id="1" position="left">PreviousPicture</hat>
-      <hat id="1" position="right">NextPicture</hat>
-    </joystick>
-  </SlideShow>
-  <ScreenCalibration>
-    <joystick>
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </ScreenCalibration>
-  <GUICalibration>
-    <joystick>
-      <button id="3">ResetCalibration</button>
-      <button id="5">NextResolution</button>
-      <button id="6">NextCalibration</button>
-    </joystick>
-  </GUICalibration>
-  <VideoOSD>
-    <joystick>
-      <button id="3">Close</button>
-    </joystick>
-  </VideoOSD>
-  <VideoMenu>
-    <joystick>
-      <button id="2">Stop</button>
-      <button id="3">OSD</button>
-      <button id="5">AspectRatio</button>
-      <button id="8">Info</button>
-    </joystick>
-  </VideoMenu>
-  <OSDVideoSettings>
-    <joystick>
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDVideoSettings>
-  <OSDAudioSettings>
-    <joystick>
-      <button id="5">AspectRatio</button>
-      <button id="3">Close</button>
-    </joystick>
-  </OSDAudioSettings>
-  <VideoBookmarks>
-    <joystick>
-      <button id="5">Delete</button>
-    </joystick>
-  </VideoBookmarks>
-  <MyVideoLibrary>
-  </MyVideoLibrary>
-  <MyVideoFiles>
-  </MyVideoFiles>
-  <MyVideoPlaylist>
-    <joystick>
-      <button id="5">Delete</button>
-    </joystick>
-  </MyVideoPlaylist>
-  <VirtualKeyboard>
-    <joystick>
-      <button id="2">BackSpace</button>
-      <button id="4">Symbols</button>
-      <button id="5">Shift</button>
-      <button id="9">Enter</button>
-      <axis id="3" limit="+1">CursorLeft</axis>
-      <axis id="3" limit="-1">CursorRight</axis>
-    </joystick>
-  </VirtualKeyboard>
-  <ContextMenu>
-    <joystick>
-      <button id="2">Close</button>
-      <button id="3">Close</button>
-    </joystick>
-  </ContextMenu>
-  <Scripts>
-    <joystick>
-      <button id="3">Info</button>
-    </joystick>
-  </Scripts>
-  <Settings>
-    <joystick>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </Settings>
-  <AddonInformation>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </AddonInformation>
-  <AddonSettings>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </AddonSettings>
-  <TextViewer>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </TextViewer>
-  <shutdownmenu>
-    <joystick>
-      <button id="2">PreviousMenu</button>
-      <button id="9">PreviousMenu</button>
-    </joystick>
-  </shutdownmenu>
-  <submenu>
-    <joystick>
-      <button id="2">PreviousMenu</button>
-    </joystick>
-  </submenu>
-  <MusicInformation>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </MusicInformation>
-  <MovieInformation>
-    <joystick>
-      <button id="2">Close</button>
-    </joystick>
-  </MovieInformation>
-  <NumericInput>
-    <joystick>
-      <button id="2">BackSpace</button>
-      <button id="9">Enter</button>
-    </joystick>
-  </NumericInput>
-  <GamepadInput>
-    <joystick>
-      <button id="9">Stop</button>
-    </joystick>
-  </GamepadInput>
-  <LockSettings>
-    <joystick>
-      <button id="2">PreviousMenu</button>
-      <button id="9">Close</button>
-    </joystick>
-  </LockSettings>
-  <ProfileSettings>
-    <joystick>
-      <button id="2">PreviousMenu</button>
-      <button id="9">Close</button>
-    </joystick>
-  </ProfileSettings>
-</keymap>

_service:download_url:master.tar.gz/system/keymaps/keyboard.xml Changed

_service:download_url:master.tar.gz/system/keymaps/remote.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/Arrangers.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/Composers.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/Conductors.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/DJMixers.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/Lyricists.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/Orchestras.xml Changed

_service:download_url:master.tar.gz/system/library/music/musicroles/index.xml Changed

_service:download_url:master.tar.gz/system/library/video/movies/recentlyaddedmovies.xml Changed

_service:download_url:master.tar.gz/system/library/video/musicvideos/recentlyaddedmusicvideos.xml Changed

_service:download_url:master.tar.gz/system/library/video/tvshows/inprogressshows.xml Changed

_service:download_url:master.tar.gz/system/library/video/tvshows/recentlyaddedepisodes.xml Changed

_service:download_url:master.tar.gz/system/settings/settings.xml Changed

@@ -1162,11 +1162,6 @@
   <section id="pvr" label="19180" help="36201">
     <category id="pvrmanager" label="128" help="36202">
       <group id="1">
-        <setting id="pvrmanager.enabled" type="boolean" label="449" help="36203">
-          <level>0</level>
-          <default>false</default>
-          <control type="toggle" />
-        </setting>
         <setting id="pvrmanager.hideconnectionlostwarning" type="boolean" label="19269" help="36210">
           <level>2</level>
           <default>false</default>
@@ -1193,23 +1188,14 @@
       <group id="3">
         <setting id="pvrmanager.channelmanager" type="action" label="19199" help="36207">
           <level>1</level>
-          <dependencies>
-            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-          </dependencies>
           <control type="button" format="action" />
         </setting>
         <setting id="pvrmanager.groupmanager" type="action" label="19048" help="36213">
           <level>1</level>
-          <dependencies>
-            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-          </dependencies>
           <control type="button" format="action" />
         </setting>
         <setting id="pvrmanager.channelscan" type="action" label="19117" help="36208">
           <level>1</level>
-          <dependencies>
-            <dependency type="enable" setting="pvrmanager.enabled">true</dependency>
-          </dependencies>
           <control type="button" format="action" />
         </setting>
       </group>
@@ -1257,7 +1243,6 @@
           <dependencies>
             <dependency type="enable">
               <and>
-                <condition setting="pvrmanager.enabled" operator="is">true</condition>
                 <condition setting="pvrmenu.iconpath" operator="!is"></condition>
               </and>
             </dependency>
@@ -2754,11 +2739,12 @@
           <control type="toggle" />
           <default>true</default>
         </setting>
-        <setting id="input.enablejoystick" type="boolean" label="35100" help="36378">
-          <requirement>HAS_SDL_JOYSTICK</requirement>
+        <setting id="input.controllerconfig" type="action" label="35063" help="35064">
           <level>0</level>
-          <default>true</default>
-          <control type="toggle" />
+          <dependencies>
+            <dependency type="enable" on="property" name="SupportsPeripheralControllers" />
+          </dependencies>
+          <control type="button" format="action" />
         </setting>
       </group>
     </category>
@@ -2909,7 +2895,7 @@
         </setting>
         <setting id="general.addonnotifications" type="boolean" label="36609" help="36612">
           <level>0</level>
-          <default>true</default>
+          <default>false</default>
           <control type="toggle" />
           <dependencies>
             <dependency type="enable" setting="general.addonupdates">0</dependency>

_service:download_url:master.tar.gz/system/shaders/testshader.fx Deleted

_service:download_url:master.tar.gz/system/shaders/yuv2rgb_d3d.fx Changed

@@ -18,9 +18,7 @@
  *
  */
 
-texture2D  g_YTexture;
-texture2D  g_UTexture;
-texture2D  g_VTexture;
+texture2D  g_Texture[3];
 float4x4   g_ColorMatrix;
 float2     g_StepXY;
 float2     g_viewPort;
@@ -45,15 +43,13 @@
 {
   float4 Position   : POSITION;
   float2 TextureY   : TEXCOORD0;
-  float2 TextureU   : TEXCOORD1;
-  float2 TextureV   : TEXCOORD2;
+  float2 TextureUV  : TEXCOORD1;
 };
 
 struct VS_OUTPUT
 {
   float2 TextureY   : TEXCOORD0;
-  float2 TextureU   : TEXCOORD1;
-  float2 TextureV   : TEXCOORD2;
+  float2 TextureUV  : TEXCOORD1;
   float4 Position   : SV_POSITION;
 };
 
@@ -65,8 +61,7 @@
   output.Position.z = output.Position.z;
   output.Position.w = 1.0;
   output.TextureY   = In.TextureY;
-  output.TextureU   = In.TextureU;
-  output.TextureV   = In.TextureV;
+  output.TextureUV  = In.TextureUV;
 
   return output;
 }
@@ -87,16 +82,16 @@
 float4 YUV2RGB(VS_OUTPUT In) : SV_TARGET
 {
 #if defined(XBMC_YV12) //|| defined(XBMC_NV12)
-  float4 YUV = float4(g_YTexture.Sample(YUVSampler, In.TextureY).r
-                    , g_UTexture.Sample(YUVSampler, In.TextureU).r
-                    , g_VTexture.Sample(YUVSampler, In.TextureV).r
+  float4 YUV = float4(g_Texture[0].Sample(YUVSampler, In.TextureY ).r
+                    , g_Texture[1].Sample(YUVSampler, In.TextureUV).r
+                    , g_Texture[2].Sample(YUVSampler, In.TextureUV).r
                     , 1.0);
 #elif defined(XBMC_NV12)
-  float4 YUV = float4(g_YTexture.Sample(YUVSampler, In.TextureY).r
+  float4 YUV = float4(g_Texture[0].Sample(YUVSampler, In.TextureY).r
   #if defined(NV12_SNORM_UV)
-                    , unormUV(g_UTexture.Sample(UVSamplerSNORM, In.TextureU).rg)
+                    , unormUV(g_Texture[1].Sample(UVSamplerSNORM, In.TextureUV).rg)
   #else
-                    , g_UTexture.Sample(YUVSampler, In.TextureU).rg
+                    , g_Texture[1].Sample(YUVSampler, In.TextureUV).rg
   #endif
                     , 1.0);
 #elif defined(XBMC_YUY2) || defined(XBMC_UYVY)
@@ -109,8 +104,8 @@
 
   //y axis will be correctly interpolated by opengl
   //x axis will not, so we grab two pixels at the center of two columns and interpolate ourselves
-  float4 c1 = g_YTexture.Sample(YUVSampler, float2(pos.x + ((0.5 - f.x) * stepxy.x), pos.y));
-  float4 c2 = g_YTexture.Sample(YUVSampler, float2(pos.x + ((1.5 - f.x) * stepxy.x), pos.y));
+  float4 c1 = g_Texture[0].Sample(YUVSampler, float2(pos.x + ((0.5 - f.x) * stepxy.x), pos.y));
+  float4 c2 = g_Texture[0].Sample(YUVSampler, float2(pos.x + ((1.5 - f.x) * stepxy.x), pos.y));
 
   /* each pixel has two Y subpixels and one UV subpixel
       YUV  Y  YUV
@@ -128,7 +123,7 @@
     float4 YUV    = float4(outY, outUV, 1.0);
 #endif
 
-  return float4(mul(YUV, g_ColorMatrix).rgb, 1.0);
+  return mul(YUV, g_ColorMatrix);
 }
 
 technique11 YUV2RGB_T

_service:download_url:master.tar.gz/tools/android/packaging/Makefile.in Changed

_service:download_url:master.tar.gz/tools/android/packaging/xbmc/src/org/xbmc/kodi/Main.java.in Changed

@@ -3,6 +3,7 @@
 import android.app.NativeActivity;
 import android.content.ComponentName;
 import android.content.Intent;
+import android.hardware.input.InputManager;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.util.Log;
@@ -19,6 +20,7 @@
   private static final String TAG = "@APP_NAME_LC@";
 
   private XBMCSettingsContentObserver mSettingsContentObserver;
+  private XBMCInputDeviceListener mInputDeviceListener;
   private XBMCVideoView mVideoView = null;
   private RelativeLayout mVideoLayout = null;
   private View thisView = null;
@@ -101,6 +103,11 @@
     mSettingsContentObserver = new XBMCSettingsContentObserver(this, new Handler());
     getApplicationContext().getContentResolver().registerContentObserver(android.provider.Settings.System.CONTENT_URI, true, mSettingsContentObserver );
 
+    // register the InputDeviceListener implementation
+    mInputDeviceListener = new XBMCInputDeviceListener();
+    InputManager manager = (InputManager) getSystemService(INPUT_SERVICE);
+    manager.registerInputDeviceListener(mInputDeviceListener, new Handler());
+
     thisView = getWindow().getDecorView();
     thisView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener()
           {
@@ -176,6 +183,10 @@
   @Override
   public void onDestroy()
   {
+    // unregister the InputDeviceListener implementation
+    InputManager manager = (InputManager) getSystemService(INPUT_SERVICE);
+    manager.unregisterInputDeviceListener(mInputDeviceListener);
+
     getApplicationContext().getContentResolver().unregisterContentObserver(mSettingsContentObserver);
     super.onDestroy();
   }

_service:download_url:master.tar.gz/tools/android/packaging/xbmc/src/org/xbmc/kodi/XBMCInputDeviceListener.java.in Added

_service:download_url:master.tar.gz/tools/buildsteps/win32/buildffmpeg.sh Changed

_service:download_url:master.tar.gz/tools/buildsteps/win32/fmpeg_options.txt Changed

_service:download_url:master.tar.gz/tools/buildsteps/win32/make-mingwlibs.sh Changed

_service:download_url:master.tar.gz/tools/darwin/Configurations/App.xcconfig.in Changed

@@ -25,7 +25,7 @@
 LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/"
 
-XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.7 -lyajl -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -ldcadec -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt -lnettle -lgmp -lhogweed -lgnutls -lcrossguid -lz -lm -liconv
+XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.7 -lyajl -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt -lnettle -lgmp -lhogweed -lgnutls -lcrossguid -lz -lm -liconv
 
 CLANG_CXX_LANGUAGE_STANDARD = c++0x
 CLANG_CXX_LIBRARY = libc++

_service:download_url:master.tar.gz/tools/depends/native/libtool-native/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/native/libtool-native/fix-libcrystax.patch Deleted

_service:download_url:master.tar.gz/tools/depends/target/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/ffmpeg/CMakeLists.txt Changed

_service:download_url:master.tar.gz/tools/depends/target/ffmpeg/FFMPEG-VERSION Changed

_service:download_url:master.tar.gz/tools/depends/target/ffmpeg/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/ffmpeg/autobuild.sh Changed

_service:download_url:master.tar.gz/tools/depends/target/libbluray/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/libdcadec Deleted

_service:download_url:master.tar.gz/tools/depends/target/libdcadec/Makefile Deleted

@@ -1,62 +0,0 @@
--include ../../Makefile.include
-DEPS= Makefile
-
-# lib name, version
-LIBNAME=libdcadec
-VERSION=git-2a9186e3
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-ifeq ($(CROSS_COMPILING), yes)
-  DEPS += ../../Makefile.include libdcadec_android.patch
-  EXTRA_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" AR="$(AR)"
-else
-  ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-
-  ifeq ($(PLATFORM),)
-    PLATFORM = native
-    TARBALLS_LOCATION = $(ROOT_DIR)
-    BASE_URL := http://mirrors.kodi.tv/build-deps/sources
-    RETRIEVE_TOOL := curl -Ls --create-dirs -f -O
-    ARCHIVE_TOOL := tar --strip-components=1 -xf
-  endif
-endif
-
-
-# configuration settings
-
-LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
-
-CFLAGS += -std=gnu99
-
-all: $(LIBDYLIB) .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-ifeq ($(PREFIX),)
-	@echo
-	@echo "ERROR: please set PREFIX to the kodi install path e.g. make PREFIX=/usr/local"
-	@exit 1
-endif
-
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-ifeq ($(OS),android)
-	cd $(PLATFORM); patch -p1 < ../libdcadec_android.patch
-endif
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM) PREFIX=$(PREFIX) $(EXTRA_FLAGS)
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) PREFIX=$(PREFIX) $(EXTRA_FLAGS) install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM) libdcadec-*.tar.gz

_service:download_url:master.tar.gz/tools/depends/target/libdcadec/libdcadec_android.patch Deleted

_service:download_url:master.tar.gz/tools/depends/target/libmodplug/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/libnfs/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/libshairplay/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/mysql/Makefile Changed

_service:download_url:master.tar.gz/tools/depends/target/pythonmodule-pil/Makefile Changed

@@ -15,18 +15,14 @@
 PILPATH=$(PREFIX)/share/$(APP_NAME)/addons/script.module.pil
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" LDSHARED="$(CC) -shared" LDFLAGS="$(LDFLAGS) -L$(PREFIX)/lib/dummy-lib$(APP_NAME)/ -l$(APP_NAME) -lm" PYTHONPATH="$(PILPATH):$(PREFIX)/lib/python2.7/site-packages/"
 endif
-ifeq ($(OS),osx)
-CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/"
-endif
+
+ifeq (darwin, $(findstring darwin, $(HOST)))
 ifeq ($(OS),ios)
 PYTHON_O=$(abs_top_srcdir)/target/python27/$(PLATFORM)/Modules/python.o
-ifeq ($(CPU), arm64)
-#ensure that there is no -fembed-bitcode in the linkerflags - its not compatible with -bundle
+endif
+#ensure that only our target ldflags are passed to the python build
 LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
 CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/" LDSHARED="$(LDSHARED)"
-else
-CROSSFLAGS=PYTHONXCPREFIX="$(PREFIX)" CC="$(CC) $(CFLAGS)" CCSHARED="$(CC) $(CFLAGS) $(PYTHON_O)" LDFLAGS="$(LDFLAGS)" PYTHONPATH="$(PREFIX)/lib/python2.7/site-packages/"
-endif
 endif
 
 LIBDYLIB=$(PLATFORM)/dist/PIL-$(VERSION)-py2.7-$(OS)-$(CPU).egg

_service:download_url:master.tar.gz/tools/depends/target/xbmc/Makefile Changed

_service:download_url:master.tar.gz/xbmc/Application.cpp Changed

@@ -429,6 +429,12 @@
 
 bool CApplication::Create()
 {
+  m_ServiceManager.reset(new CServiceManager());
+  if (!m_ServiceManager->Init1())
+  {
+    return false;
+  }
+
   SetupNetwork();
   Preflight();
 
@@ -653,15 +659,8 @@
   // initialize the addon database (must be before the addon manager is init'd)
   CDatabaseManager::GetInstance().Initialize(true);
 
-#ifdef HAS_PYTHON
-  CScriptInvocationManager::GetInstance().RegisterLanguageInvocationHandler(&g_pythonParser, ".py");
-#endif // HAS_PYTHON
-
-  // start-up Addons Framework
-  // currently bails out if either cpluff Dll is unavailable or system dir can not be scanned
-  if (!CAddonMgr::GetInstance().Init())
+  if (!m_ServiceManager->Init2())
   {
-    CLog::Log(LOGFATAL, "CApplication::Create: Unable to start CAddonMgr");
     return false;
   }
 
@@ -705,10 +704,6 @@
   sdlFlags |= SDL_INIT_VIDEO;
 #endif
 
-#if defined(HAS_SDL_JOYSTICK) && !defined(TARGET_WINDOWS)
-  sdlFlags |= SDL_INIT_JOYSTICK;
-#endif
-
   //depending on how it's compiled, SDL periodically calls XResetScreenSaver when it's fullscreen
   //this might bring the monitor out of standby, so we have to disable it explicitly
   //by passing 0 for overwrite to setsenv, the user can still override this by setting the environment variable
@@ -1159,9 +1154,6 @@
 #endif
       ADDON::CAddonMgr::GetInstance().StartServices(false);
 
-      // start the PVR manager
-      StartPVRManager();
-
       // activate the configured start window
       int firstWindow = g_SkinInfo->GetFirstWindow();
       g_windowManager.ActivateWindow(firstWindow);
@@ -1171,6 +1163,11 @@
 
       CStereoscopicsManager::GetInstance().Initialize();
       CApplicationMessenger::GetInstance().SendMsg(TMSG_SETAUDIODSPSTATE, ACTIVE_AE_DSP_STATE_ON, ACTIVE_AE_DSP_SYNC_ACTIVATE); // send a blocking message to active AudioDSP engine
+
+      if (!m_ServiceManager->Init3())
+      {
+        CLog::Log(LOGERROR, "Application - Init3 failed");
+      }
     }
 
   }
@@ -1213,11 +1210,6 @@
   // reset our screensaver (starts timers etc.)
   ResetScreenSaver();
 
-#ifdef HAS_SDL_JOYSTICK
-  CInputManager::GetInstance().SetEnabledJoystick(CSettings::GetInstance().GetBool(CSettings::SETTING_INPUT_ENABLEJOYSTICK) &&
-                    CPeripheralImon::GetCountOfImonsConflictWithDInput() == 0 );
-#endif
-
   // if the user interfaces has been fully initialized let everyone know
   if (uiInitializationFinished)
   {
@@ -1277,14 +1269,6 @@
   return ret;
 }
 
-void CApplication::StartPVRManager()
-{
-  if (!CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED))
-    return;
-
-  g_PVRManager.Start(true);
-}
-
 void CApplication::StopPVRManager()
 {
   CLog::Log(LOGINFO, "stopping PVRManager");
@@ -1860,7 +1844,6 @@
   bool hasRendered = false;
   bool limitFrames = false;
   unsigned int singleFrameTime = 40; // default limit 25 fps
-  bool vsync = true;
 
   // Whether externalplayer is playing and we're unfocused
   bool extPlayerActive = m_pPlayer->IsExternalPlaying() && !m_AppFocused;
@@ -1912,7 +1895,6 @@
   else if (vsync_mode != VSYNC_DRIVER)
   {
     g_Windowing.SetVSync(false);
-    vsync = false;
   }
 
   if (m_bPresentFrame && m_pPlayer->IsPlaying() && !m_pPlayer->IsPaused())
@@ -2348,7 +2330,7 @@
       if (!player.empty())
       {
         item.m_lStartOffset = (int)(GetTime() * 75);
-        PlayFile(item, player, true);
+        PlayFile(std::move(item), player, true);
       }
     }
     else
@@ -2358,8 +2340,7 @@
       std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
       if (!player.empty())
       {
-        CFileItem item;
-        PlayFile(item, player, false);
+        PlayFile(CFileItem(), player, false);
       }
     }
   }
@@ -2509,13 +2490,6 @@
     break;
 #endif
 
-  case TMSG_SETPVRMANAGERSTATE:
-    if (pMsg->param1 != 0)
-      StartPVRManager();
-    else
-      StopPVRManager();
-    break;
-
   case TMSG_SETAUDIODSPSTATE:
     if(pMsg->param1 == ACTIVE_AE_DSP_STATE_ON)
       ActiveAE::CActiveAEDSP::GetInstance().Activate(pMsg->param2 == ACTIVE_AE_DSP_ASYNC_ACTIVATE);
@@ -2802,12 +2776,18 @@
 {
   try
   {
-    g_windowManager.DestroyWindows();
+    CLog::Log(LOGNOTICE, "unload skin");
+    UnloadSkin();
 
-    CAddonMgr::GetInstance().DeInit();
+    // stop all remaining scripts; must be done after skin has been unloaded,
+    // not before some windows still need it when deinitializing during skin
+    // unloading
+    CScriptInvocationManager::GetInstance().Uninitialize();
 
-    CLog::Log(LOGNOTICE, "closing down remote control service");
-    CInputManager::GetInstance().DisableRemoteControl();
+    g_Windowing.DestroyRenderSystem();
+    g_Windowing.DestroyWindow();
+    g_Windowing.DestroyWindowSystem();
+    g_windowManager.DestroyWindows();
 
     CLog::Log(LOGNOTICE, "unload sections");
 
@@ -2855,6 +2835,13 @@
     delete m_network;
     m_network = NULL;
 
+    // Cleanup was called more than once on exit during my tests
+    if (m_ServiceManager)
+    {
+      m_ServiceManager->Deinit();
+      m_ServiceManager.reset();
+    }
+
     return true;
   }
   catch (...)
@@ -2915,11 +2902,8 @@
     CLog::Log(LOGNOTICE, "stop player");
     m_pPlayer->ClosePlayer();
 
-    CAnnouncementManager::GetInstance().Deinitialize();
-
     StopPVRManager();
     StopServices();
-    //Sleep(5000);
 
 #ifdef HAS_ZEROCONF
     if(CZeroconfBrowser::IsInstantiated())
@@ -2943,9 +2927,6 @@
     smb.Deinit();
 #endif
 
-    CLog::Log(LOGNOTICE, "unload skin");
-    UnloadSkin();
-
 #if defined(TARGET_DARWIN_OSX)
     if (XBMCHelper::GetInstance().IsAlwaysOn() == false)
       XBMCHelper::GetInstance().Stop();
@@ -2960,20 +2941,14 @@
     UnregisterActionListener(&CSeekHandler::GetInstance());
     UnregisterActionListener(&CPlayerController::GetInstance());
 
-    // stop all remaining scripts; must be done after skin has been unloaded,
-    // not before some windows still need it when deinitializing during skin
-    // unloading
-    CScriptInvocationManager::GetInstance().Uninitialize();
-
-    g_Windowing.DestroyRenderSystem();
-    g_Windowing.DestroyWindow();
-    g_Windowing.DestroyWindowSystem();
-
     g_audioManager.DeInitialize();
     // shutdown the AudioEngine
     CAEFactory::Shutdown();
     CAEFactory::UnLoadEngine();
 
+    CLog::Log(LOGNOTICE, "closing down remote control service");
+    CInputManager::GetInstance().DisableRemoteControl();
+
     // unregister ffmpeg lock manager call back
     av_lockmgr_register(NULL);
 
@@ -2984,9 +2959,6 @@
     CLog::Log(LOGERROR, "Exception in CApplication::Stop()");
   }
 
-  // we may not get to finish the run cycle but exit immediately after a call to g_application.Stop()
-  // so we may never get to Destroy() in CXBApplicationEx::Run(), we call it here.
-  Destroy();
   cleanup_emu_environ();
 
   Sleep(200);
@@ -3215,11 +3187,11 @@
   return PLAYBACK_FAIL;
 }
 
-PlayBackRet CApplication::PlayFile(const CFileItem& item, const std::string& player, bool bRestart)
+PlayBackRet CApplication::PlayFile(CFileItem item, const std::string& player, bool bRestart)
 {
   // Ensure the MIME type has been retrieved for http:// and shout:// streams
   if (item.GetMimeType().empty())
-    const_cast<CFileItem&>(item).FillInMimeType();
+    item.FillInMimeType();
 
   if (!bRestart)
   {
@@ -3268,7 +3240,7 @@
   { // we modify the item so that it becomes a real URL
     CFileItem item_new(item);
     if (XFILE::CPluginDirectory::GetPluginResult(item.GetPath(), item_new))
-      return PlayFile(item_new, player, false);
+      return PlayFile(std::move(item_new), player, false);
     return PLAYBACK_FAIL;
   }
 
@@ -3285,7 +3257,7 @@
   {
     CFileItem item_new(item);
     if (XFILE::CUPnPDirectory::GetResource(item.GetURL(), item_new))
-      return PlayFile(item_new, player, false);
+      return PlayFile(std::move(item_new), player, false);
     return PLAYBACK_FAIL;
   }
 #endif

_service:download_url:master.tar.gz/xbmc/Application.h Changed

@@ -27,6 +27,7 @@
 #include "guilib/Resolution.h"
 #include "utils/GlobalsHandling.h"
 #include "messaging/IMessageTarget.h"
+#include "ServiceManager.h"
 
 #include <map>
 #include <memory>
@@ -150,7 +151,6 @@
 
   bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false);
 
-  void StartPVRManager();
   void StopPVRManager();
   bool IsCurrentThread() const;
   void Stop(int exitCode);
@@ -180,7 +180,7 @@
   bool PlayMedia(const CFileItem& item, const std::string &player, int iPlaylist = PLAYLIST_MUSIC);
   bool PlayMediaSync(const CFileItem& item, int iPlaylist = PLAYLIST_MUSIC);
   bool ProcessAndStartPlaylist(const std::string& strPlayList, PLAYLIST::CPlayList& playlist, int iPlaylist, int track=0);
-  PlayBackRet PlayFile(const CFileItem& item, const std::string& player, bool bRestart = false);
+  PlayBackRet PlayFile(CFileItem item, const std::string& player, bool bRestart = false);
   void SaveFileState(bool bForeground = false);
   void UpdateFileState();
   void LoadVideoSettings(const CFileItem& item);
@@ -389,6 +389,8 @@
    */
   void UnregisterActionListener(IActionListener *listener);
 
+  std::unique_ptr<CServiceManager> m_ServiceManager;
+
 protected:
   virtual bool OnSettingsSaving() const override;

_service:download_url:master.tar.gz/xbmc/ApplicationPlayer.cpp Changed

_service:download_url:master.tar.gz/xbmc/ApplicationPlayer.h Changed

_service:download_url:master.tar.gz/xbmc/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/ContextMenuItem.cpp Changed

@@ -29,9 +29,9 @@
 #include "utils/StringUtils.h"
 
 
-bool CContextMenuItem::IsVisible(const CFileItemPtr& item) const
+bool CContextMenuItem::IsVisible(const CFileItem& item) const
 {
-  return IsGroup() || (item && m_condition && m_condition->Get(item.get()));
+  return IsGroup() || (m_condition && m_condition->Get(&item));
 }
 
 bool CContextMenuItem::IsParentOf(const CContextMenuItem& other) const
@@ -46,11 +46,15 @@
 
 bool CContextMenuItem::Execute(const CFileItemPtr& item) const
 {
-  if (!item || !m_addon || m_library.empty() || IsGroup())
+  if (!item || m_library.empty() || IsGroup())
+    return false;
+
+  ADDON::AddonPtr addon;
+  if (!ADDON::CAddonMgr::GetInstance().GetAddon(m_addonId, addon))
     return false;
 
   LanguageInvokerPtr invoker(new CContextItemAddonInvoker(&g_pythonParser, item));
-  return (CScriptInvocationManager::GetInstance().ExecuteAsync(m_library, invoker, m_addon) != -1);
+  return (CScriptInvocationManager::GetInstance().ExecuteAsync(m_library, invoker, addon) != -1);
 }
 
 bool CContextMenuItem::operator==(const CContextMenuItem& other) const
@@ -61,34 +65,38 @@
   return (IsGroup() == other.IsGroup())
       && (m_parent == other.m_parent)
       && (m_library == other.m_library)
-      && ((!m_addon && !other.m_addon) || (m_addon && other.m_addon && m_addon->ID() == other.m_addon->ID()));
+      && (m_addonId == other.m_addonId);
 }
 
 std::string CContextMenuItem::ToString() const
 {
   if (IsGroup())
     return StringUtils::Format("CContextMenuItem[group, id=%s, parent=%s, addon=%s]",
-        m_groupId.c_str(), m_parent.c_str(), m_addon ? m_addon->ID().c_str() : "null");
+        m_groupId.c_str(), m_parent.c_str(), m_addonId.c_str());
   else
     return StringUtils::Format("CContextMenuItem[item, parent=%s, library=%s, addon=%s]",
-        m_parent.c_str(), m_library.c_str(), m_addon ? m_addon->ID().c_str() : "null");
+        m_parent.c_str(), m_library.c_str(), m_addonId.c_str());
 }
 
-CContextMenuItem CContextMenuItem::CreateGroup(const std::string& label, const std::string& parent, const std::string& groupId)
+CContextMenuItem CContextMenuItem::CreateGroup(const std::string& label, const std::string& parent,
+    const std::string& groupId, const std::string& addonId)
 {
   CContextMenuItem menuItem;
   menuItem.m_label = label;
   menuItem.m_parent = parent;
   menuItem.m_groupId = groupId;
+  menuItem.m_addonId = addonId;
   return menuItem;
 }
 
-CContextMenuItem CContextMenuItem::CreateItem(const std::string& label, const std::string& parent, const std::string& library, const INFO::InfoPtr& condition)
+CContextMenuItem CContextMenuItem::CreateItem(const std::string& label, const std::string& parent,
+    const std::string& library, const INFO::InfoPtr& condition, const std::string& addonId)
 {
   CContextMenuItem menuItem;
   menuItem.m_label = label;
   menuItem.m_parent = parent;
   menuItem.m_library = library;
   menuItem.m_condition = condition;
+  menuItem.m_addonId = addonId;
   return menuItem;
 }

_service:download_url:master.tar.gz/xbmc/ContextMenuItem.h Changed

@@ -20,35 +20,67 @@
  */
 
 #include <map>
+
 #include "addons/IAddon.h"
-#include "dialogs/GUIDialogContextMenu.h"
+#include "addons/AddonManager.h"
+#include "addons/Repository.h"
+#include "addons/RepositoryUpdater.h"
+#include "addons/GUIDialogAddonInfo.h"
+#include "addons/GUIDialogAddonSettings.h"
+
 
 namespace ADDON
 {
   class CContextMenuAddon;
 }
 
-class CContextMenuItem
+class IContextMenuItem
+{
+public:
+  virtual bool IsVisible(const CFileItem& item) const = 0;
+  virtual bool Execute(const CFileItemPtr& item) const = 0;
+  virtual std::string GetLabel(const CFileItem& item) const = 0;
+  virtual bool IsGroup() const { return false; }
+};
+
+
+class CStaticContextMenuAction : public IContextMenuItem
+{
+public:
+  explicit CStaticContextMenuAction(uint32_t label) : m_label(label) {}
+  std::string GetLabel(const CFileItem& item) const override final
+  {
+    return g_localizeStrings.Get(m_label);
+  }
+  bool IsGroup() const override final { return false; }
+private:
+  const uint32_t m_label;
+};
+
+
+class CContextMenuItem : public IContextMenuItem
 {
 public:
-  const std::string& GetLabel() const { return m_label; }
-  bool IsVisible(const CFileItemPtr& item) const;
+  std::string GetLabel(const CFileItem& item) const { return m_label; }
+  bool IsVisible(const CFileItem& item) const override ;
   bool IsParentOf(const CContextMenuItem& menuItem) const;
-  bool IsGroup() const;
-  bool Execute(const CFileItemPtr& item) const;
+  bool IsGroup() const override ;
+  bool Execute(const CFileItemPtr& item) const override;
   bool operator==(const CContextMenuItem& other) const;
   std::string ToString() const;
 
   static CContextMenuItem CreateGroup(
     const std::string& label,
     const std::string& parent,
-    const std::string& groupId);
+    const std::string& groupId,
+    const std::string& addonId);
 
   static CContextMenuItem CreateItem(
     const std::string& label,
     const std::string& parent,
     const std::string& library,
-    const INFO::InfoPtr& condition);
+    const INFO::InfoPtr& condition,
+    const std::string& addonId);
 
   friend class ADDON::CContextMenuAddon;
 
@@ -58,5 +90,5 @@
   std::string m_groupId;
   std::string m_library;
   INFO::InfoPtr m_condition;
-  ADDON::AddonPtr m_addon;
+  std::string m_addonId; // The owner of this menu item
 };

_service:download_url:master.tar.gz/xbmc/ContextMenuManager.cpp Changed

@@ -23,22 +23,20 @@
 #include "addons/Addon.h"
 #include "addons/AddonManager.h"
 #include "addons/ContextMenuAddon.h"
+#include "addons/ContextMenus.h"
 #include "addons/IAddon.h"
-#include "interfaces/generic/ScriptInvocationManager.h"
-#include "interfaces/python/ContextItemAddonInvoker.h"
-#include "interfaces/python/XBPython.h"
+#include "music/ContextMenus.h"
+#include "video/ContextMenus.h"
 #include "utils/log.h"
 
 using namespace ADDON;
 
-typedef std::pair<unsigned int, CContextMenuItem> Item;
 
-const CContextMenuItem CContextMenuManager::MAIN = CContextMenuItem::CreateGroup("", "", "kodi.core.main");
-const CContextMenuItem CContextMenuManager::MANAGE = CContextMenuItem::CreateGroup("", "", "kodi.core.manage");
+const CContextMenuItem CContextMenuManager::MAIN = CContextMenuItem::CreateGroup("", "", "kodi.core.main", "");
+const CContextMenuItem CContextMenuManager::MANAGE = CContextMenuItem::CreateGroup("", "", "kodi.core.manage", "");
 
 
 CContextMenuManager::CContextMenuManager()
-  : m_nextButtonId(CONTEXT_BUTTON_FIRST_ADDON)
 {
   Init();
 }
@@ -55,6 +53,23 @@
   if (CAddonMgr::GetInstance().GetAddons(addons, ADDON_CONTEXT_ITEM))
     for (const auto& addon : addons)
       Register(std::static_pointer_cast<CContextMenuAddon>(addon));
+
+  m_items = {
+      std::make_shared<CONTEXTMENU::CResume>(),
+      std::make_shared<CONTEXTMENU::CPlay>(),
+      std::make_shared<CONTEXTMENU::CAddonInfo>(),
+      std::make_shared<CONTEXTMENU::CAddonSettings>(),
+      std::make_shared<CONTEXTMENU::CCheckForUpdates>(),
+      std::make_shared<CONTEXTMENU::CEpisodeInfo>(),
+      std::make_shared<CONTEXTMENU::CMovieInfo>(),
+      std::make_shared<CONTEXTMENU::CMusicVideoInfo>(),
+      std::make_shared<CONTEXTMENU::CTVShowInfo>(),
+      std::make_shared<CONTEXTMENU::CAlbumInfo>(),
+      std::make_shared<CONTEXTMENU::CArtistInfo>(),
+      std::make_shared<CONTEXTMENU::CSongInfo>(),
+      std::make_shared<CONTEXTMENU::CMarkWatched>(),
+      std::make_shared<CONTEXTMENU::CMarkUnWatched>(),
+  };
 }
 
 void CContextMenuManager::Register(const ContextItemAddonPtr& cm)
@@ -62,20 +77,12 @@
   if (!cm)
     return;
 
+  CSingleLock lock(m_criticalSection);
   for (const auto& menuItem : cm->GetItems())
   {
-    auto existing = std::find_if(m_items.begin(), m_items.end(),
-        [&](const Item& kv){ return kv.second == menuItem; });
-    if (existing != m_items.end())
-    {
-      if (!menuItem.GetLabel().empty())
-        existing->second = menuItem;
-    }
-    else
-    {
-      m_items.push_back(std::make_pair(m_nextButtonId, menuItem));
-      ++m_nextButtonId;
-    }
+    auto it = std::find(m_addonItems.begin(), m_addonItems.end(), menuItem);
+    if (it == m_addonItems.end())
+      m_addonItems.push_back(menuItem);
   }
 }
 
@@ -86,86 +93,102 @@
 
   const auto menuItems = cm->GetItems();
 
-  auto it = std::remove_if(m_items.begin(), m_items.end(),
-    [&](const Item& kv)
+  CSingleLock lock(m_criticalSection);
+
+  auto it = std::remove_if(m_addonItems.begin(), m_addonItems.end(),
+    [&](const CContextMenuItem& item)
     {
-      if (kv.second.IsGroup())
+      if (item.IsGroup())
         return false; //keep in case other items use them
-      return std::find(menuItems.begin(), menuItems.end(), kv.second) != menuItems.end();
+      return std::find(menuItems.begin(), menuItems.end(), item) != menuItems.end();
     }
   );
-  m_items.erase(it, m_items.end());
+  m_addonItems.erase(it, m_addonItems.end());
   return true;
 }
 
 bool CContextMenuManager::IsVisible(
-  const CContextMenuItem& menuItem, const CContextMenuItem& root, const CFileItemPtr& fileItem)
+  const CContextMenuItem& menuItem, const CContextMenuItem& root, const CFileItem& fileItem) const
 {
-  if (menuItem.GetLabel().empty() || !root.IsParentOf(menuItem))
+  if (menuItem.GetLabel(fileItem).empty() || !root.IsParentOf(menuItem))
     return false;
 
   if (menuItem.IsGroup())
-    return std::any_of(m_items.begin(), m_items.end(),
-        [&](const Item& kv){ return menuItem.IsParentOf(kv.second) && kv.second.IsVisible(fileItem); });
+  {
+    CSingleLock lock(m_criticalSection);
+    return std::any_of(m_addonItems.begin(), m_addonItems.end(),
+        [&](const CContextMenuItem& other){ return menuItem.IsParentOf(other) && other.IsVisible(fileItem); });
+  }
 
   return menuItem.IsVisible(fileItem);
 }
 
-void CContextMenuManager::AddVisibleItems(
-  const CFileItemPtr& item, CContextButtons& list, const CContextMenuItem& root /* = CContextMenuItem::MAIN */)
+ContextMenuView CContextMenuManager::GetItems(const CFileItem& fileItem, const CContextMenuItem& root /*= MAIN*/) const
 {
-  if (!item)
-    return;
-
-  const int initialSize = list.size();
+  ContextMenuView result;
+  //TODO: implement group support
+  if (&root == &MAIN)
+  {
+    CSingleLock lock(m_criticalSection);
+    std::copy_if(m_items.begin(), m_items.end(), std::back_inserter(result),
+        [&](const std::shared_ptr<IContextMenuItem>& menu){ return menu->IsVisible(fileItem); });
+  }
+  return result;
+}
 
-  for (const auto& kv : m_items)
-    if (IsVisible(kv.second, root, item))
-      list.push_back(std::make_pair(kv.first, kv.second.GetLabel()));
+ContextMenuView CContextMenuManager::GetAddonItems(const CFileItem& fileItem, const CContextMenuItem& root /*= MAIN*/) const
+{
+  ContextMenuView result;
+  {
+    CSingleLock lock(m_criticalSection);
+    for (const auto& menu : m_addonItems)
+      if (IsVisible(menu, root, fileItem))
+        result.emplace_back(new CContextMenuItem(menu));
+  }
 
-  if (root == MAIN || root == MANAGE)
+  if (&root == &MAIN || &root == &MANAGE)
   {
-    std::stable_sort(list.begin() + initialSize, list.end(),
-      [](const std::pair<int, std::string>& lhs, const std::pair<int, std::string>& rhs)
-      {
-        return lhs.second < rhs.second;
-      }
+    std::sort(result.begin(), result.end(),
+        [&](const ContextMenuView::value_type& lhs, const ContextMenuView::value_type& rhs)
+        {
+          return lhs->GetLabel(fileItem) < rhs->GetLabel(fileItem);
+        }
     );
   }
+  return result;
 }
 
 
-bool CContextMenuManager::OnClick(unsigned int id, const CFileItemPtr& item)
+bool CONTEXTMENU::ShowFor(const CFileItemPtr& fileItem, const CContextMenuItem& root)
 {
-  if (!item)
+  if (!fileItem)
     return false;
 
-  auto it = std::find_if(m_items.begin(), m_items.end(),
-      [id](const Item& kv){ return kv.first == id; });
-  if (it == m_items.end())
-  {
-    CLog::Log(LOGERROR, "CContextMenuManager: unknown button id '%u'", id);
-    return false;
-  }
+  auto menuItems = CContextMenuManager::GetInstance().GetItems(*fileItem, root);
+  for (auto&& item : CContextMenuManager::GetInstance().GetAddonItems(*fileItem, root))
+    menuItems.emplace_back(std::move(item));
 
-  CContextMenuItem menuItem = it->second;
-  if (menuItem.IsGroup())
-  {
-    CLog::Log(LOGDEBUG, "CContextMenuManager: showing group '%s'", menuItem.ToString().c_str());
-    CContextButtons choices;
-    AddVisibleItems(item, choices, menuItem);
-    if (choices.empty())
-    {
-      CLog::Log(LOGERROR, "CContextMenuManager: no items in group '%s'", menuItem.ToString().c_str());
-      return false;
-    }
-    int choice = CGUIDialogContextMenu::ShowAndGetChoice(choices);
-    if (choice == -1)
-      return false;
+  if (menuItems.empty())
+    return true;
 
-    return OnClick(choice, item);
-  }
+  CContextButtons buttons;
+  for (int i = 0; i < menuItems.size(); ++i)
+    buttons.Add(i, menuItems[i]->GetLabel(*fileItem));
+
+  int selected = CGUIDialogContextMenu::Show(buttons);
+  if (selected < 0 || selected >= menuItems.size())
+    return false;
 
-  return menuItem.Execute(item);
+  return menuItems[selected]->IsGroup() ?
+         ShowFor(fileItem, static_cast<const CContextMenuItem&>(*menuItems[selected])) :
+         menuItems[selected]->Execute(fileItem);
 }
 
+bool CONTEXTMENU::LoopFrom(const IContextMenuItem& menu, const CFileItemPtr& fileItem)
+{
+  if (!fileItem)
+    return false;
+  if (menu.IsGroup())
+    return ShowFor(fileItem, static_cast<const CContextMenuItem&>(menu));
+  return menu.Execute(fileItem);
+}

_service:download_url:master.tar.gz/xbmc/ContextMenuManager.h Changed

@@ -27,6 +27,8 @@
 #include "dialogs/GUIDialogContextMenu.h"
 
 
+using ContextMenuView = std::vector<std::shared_ptr<const IContextMenuItem>>;
+
 class CContextMenuManager
 {
 public:
@@ -35,23 +37,9 @@
 
   static CContextMenuManager& GetInstance();
 
-  /*!
-   * \param id - id of the context button clicked on.
-   * \param item - the selected file item.
-   * \return true on success, otherwise false.
-   */
-  bool OnClick(unsigned int id, const CFileItemPtr& item);
+  ContextMenuView GetItems(const CFileItem& item, const CContextMenuItem& root = MAIN) const;
 
-  /*!
-   * \brief Adds all registered context item to the list.
-   * \param item - the currently selected item.
-   * \param list - the context menu.
-   * \param root - the context menu responsible for this call.
-   */
-  void AddVisibleItems(
-    const CFileItemPtr& item,
-    CContextButtons& list,
-    const CContextMenuItem& root = MAIN);
+  ContextMenuView GetAddonItems(const CFileItem& item, const CContextMenuItem& root = MAIN) const;
 
   /*!
    * \brief Adds a context item to this manager.
@@ -74,8 +62,22 @@
   bool IsVisible(
     const CContextMenuItem& menuItem,
     const CContextMenuItem& root,
-    const CFileItemPtr& fileItem);
+    const CFileItem& fileItem) const;
 
-  std::vector<std::pair<unsigned int, CContextMenuItem>> m_items;
-  unsigned int m_nextButtonId;
+  CCriticalSection m_criticalSection;
+  std::vector<CContextMenuItem> m_addonItems;
+  std::vector<std::shared_ptr<IContextMenuItem>> m_items;
 };
+
+namespace CONTEXTMENU
+{
+  /*!
+   * Starts the context menu loop for a file item.
+   * */
+  bool ShowFor(const CFileItemPtr& fileItem, const CContextMenuItem& root=CContextMenuManager::MAIN);
+
+  /*!
+   * Shortcut for continuing the context menu loop from an exisiting menu item.
+   */
+  bool LoopFrom(const IContextMenuItem& menu, const CFileItemPtr& fileItem);
+}
\ No newline at end of file

_service:download_url:master.tar.gz/xbmc/FileItem.cpp Changed

_service:download_url:master.tar.gz/xbmc/GUIInfoManager.cpp Changed

@@ -85,7 +85,6 @@
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/channels/PVRRadioRDSInfoTag.h"
 #include "epg/EpgContainer.h"
-#include "pvr/timers/PVRTimers.h"
 #include "pvr/recordings/PVRRecording.h"
 
 #include "addons/AddonManager.h"
@@ -188,6 +187,274 @@
   int  val;
 } infomap;
 
+/// \page modules__General__List_of_gui_access List of GUI access messages
+/// \tableofcontents
+///
+/// \section modules__General__List_of_gui_access_Description Description
+/// Skins can use boolean conditions with the <b><visible></b> tag or with condition
+/// attributes. Scripts can read boolean conditions with
+/// <b>xbmc.getCondVisibility(condition)</b>.
+///
+/// Skins can use infolabels with <b>$INFO[infolabel]</b> or the <b><info></b> tag. Scripts
+/// can read infolabels with <b>xbmc.getInfoLabel('infolabel')</b>.
+
+
+const infomap string_bools[] =   {{ "isempty",          STRING_IS_EMPTY },
+                                  { "isequal",          STRING_IS_EQUAL },
+                                  { "startswith",       STRING_STARTS_WITH },
+                                  { "endswith",         STRING_ENDS_WITH },
+                                  { "contains",         STRING_CONTAINS }};
+
+const infomap integer_bools[] =  {{ "isequal",          INTEGER_IS_EQUAL },
+                                  { "isgreater",        INTEGER_GREATER_THAN },
+                                  { "isgreaterorequal", INTEGER_GREATER_OR_EQUAL },
+                                  { "isless",           INTEGER_LESS_THAN },
+                                  { "islessorequal",    INTEGER_LESS_OR_EQUAL }};
+
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Player Player
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Player.HasAudio`</b>,
+///                  \anchor Player_HasAudio
+///                  _boolean_,
+///     Returns true if the player has an audio file.
+///   }
+///   \table_row3{   <b>`Player.HasMedia`</b>,
+///                  \anchor Player_HasMedia
+///                  _boolean_,
+///     Returns true if the player has an audio or video file.
+///   }
+///   \table_row3{   <b>`Player.HasVideo`</b>,
+///                  \anchor Player_HasVideo
+///                  _boolean_,
+///     Returns true if the player has a video file.
+///   }
+///   \table_row3{   <b>`Player.Paused`</b>,
+///                  \anchor Player_Paused
+///                  _boolean_,
+///     Returns true if the player is paused.
+///   }
+///   \table_row3{   <b>`Player.Playing`</b>,
+///                  \anchor Player_Playing
+///                  _boolean_,
+///     Returns true if the player is currently playing (ie not ffwding\,
+///     rewinding or paused.)
+///   }
+///   \table_row3{   <b>`Player.Rewinding`</b>,
+///                  \anchor Player_Rewinding
+///                  _boolean_,
+///     Returns true if the player is rewinding.
+///   }
+///   \table_row3{   <b>`Player.Rewinding2x`</b>,
+///                  \anchor Player_Rewinding2x
+///                  _boolean_,
+///     Returns true if the player is rewinding at 2x.
+///   }
+///   \table_row3{   <b>`Player.Rewinding4x`</b>,
+///                  \anchor Player_Rewinding4x
+///                  _boolean_,
+///     Returns true if the player is rewinding at 4x.
+///   }
+///   \table_row3{   <b>`Player.Rewinding8x`</b>,
+///                  \anchor Player_Rewinding8x
+///                  _boolean_,
+///     Returns true if the player is rewinding at 8x.
+///   }
+///   \table_row3{   <b>`Player.Rewinding16x`</b>,
+///                  \anchor Player_Rewinding16x
+///                  _boolean_,
+///     Returns true if the player is rewinding at 16x.
+///   }
+///   \table_row3{   <b>`Player.Rewinding32x`</b>,
+///                  \anchor Player_Rewinding32x
+///                  _boolean_,
+///     Returns true if the player is rewinding at 32x.
+///   }
+///   \table_row3{   <b>`Player.Forwarding`</b>,
+///                  \anchor Player_Forwarding
+///                  _boolean_,
+///     Returns true if the player is fast forwarding.
+///   }
+///   \table_row3{   <b>`Player.Forwarding2x`</b>,
+///                  \anchor Player_Forwarding2x
+///                  _boolean_,
+///     Returns true if the player is fast forwarding at 2x.
+///   }
+///   \table_row3{   <b>`Player.Forwarding4x`</b>,
+///                  \anchor Player_Forwarding4x
+///                  _boolean_,
+///     Returns true if the player is fast forwarding at 4x.
+///   }
+///   \table_row3{   <b>`Player.Forwarding8x`</b>,
+///                  \anchor Player_Forwarding8x
+///                  _boolean_,
+///     Returns true if the player is fast forwarding at 8x.
+///   }
+///   \table_row3{   <b>`Player.Forwarding16x`</b>,
+///                  \anchor Player_Forwarding16x
+///                  _boolean_,
+///     Returns true if the player is fast forwarding at 16x.
+///   }
+///   \table_row3{   <b>`Player.Forwarding32x`</b>,
+///                  \anchor Player_Forwarding32x
+///                  _boolean_,
+///     Returns true if the player is fast forwarding at 32x.
+///   }
+///   \table_row3{   <b>`Player.CanRecord`</b>,
+///                  \anchor Player_CanRecord
+///                  _boolean_,
+///     Returns true if the player can record the current internet stream.
+///   }
+///   \table_row3{   <b>`Player.Recording`</b>,
+///                  \anchor Player_Recording
+///                  _boolean_,
+///     Returns true if the player is recording the current internet stream.
+///   }
+///   \table_row3{   <b>`Player.Caching`</b>,
+///                  \anchor Player_Caching
+///                  _boolean_,
+///     Returns true if the player is current re-caching data (internet based
+///     video playback).
+///   }
+///   \table_row3{   <b>`Player.DisplayAfterSeek`</b>,
+///                  \anchor Player_DisplayAfterSeek
+///                  _boolean_,
+///     Returns true for the first 2.5 seconds after a seek.
+///   }
+///   \table_row3{   <b>`Player.Seekbar`</b>,
+///                  \anchor Player_Seekbar
+///                  _integer_,
+///     Returns amount of percent of one seek to other position
+///   }
+///   \table_row3{   <b>`Player.Seeking`</b>,
+///                  \anchor Player_Seeking
+///                  _boolean_,
+///     Returns true if a seek is in progress
+///   }
+///   \table_row3{   <b>`Player.ShowTime`</b>,
+///                  \anchor Player_ShowTime
+///                  _boolean_,
+///     Returns true if the user has requested the time to show (occurs in video
+///     fullscreen)
+///   }
+///   \table_row3{   <b>`Player.ShowInfo`</b>,
+///                  \anchor Player_ShowInfo
+///                  _boolean_,
+///     Returns true if the user has requested the song info to show (occurs in
+///     visualisation fullscreen and slideshow)
+///   }
+///   \table_row3{   <b>`Player.ShowCodec`</b>,
+///                  \anchor Player_ShowCodec
+///                  _boolean_,
+///     Returns true if the user has requested the codec to show (occurs in
+///     visualisation and video fullscreen)
+///   }
+///   \table_row3{   <b>`Player.Title`</b>,
+///                  \anchor Player_Title
+///                  _boolean_,
+///     Returns the musicplayer title for audio and the videoplayer title for
+///     videos.
+///   }
+///   \table_row3{   <b>`Player.Muted`</b>,
+///                  \anchor Player_Muted
+///                  _boolean_,
+///     Returns true if the volume is muted.
+///   }
+///   \table_row3{   <b>`Player.HasDuration`</b>,
+///                  \anchor Player_HasDuration
+///                  _boolean_,
+///     Returns true if Media isn't a true stream
+///   }
+///   \table_row3{   <b>`Player.Passthrough`</b>,
+///                  \anchor Player_Passthrough
+///                  _boolean_,
+///     Returns true if the player is using audio passthrough.
+///   }
+///   \table_row3{   <b>`Player.CacheLevel`</b>,
+///                  \anchor Player_CacheLevel
+///                  _string_,
+///     Get the used cache level as string with an integer number
+///   }
+///   \table_row3{   <b>`Player.Progress`</b>,
+///                  \anchor Player_Progress
+///                  _integer_,
+///     Returns the progress position as percent
+///   }
+///   \table_row3{   <b>`Player.ProgressCache`</b>,
+///                  \anchor Player_ProgressCache
+///                  _boolean_,
+///     Shows how much of the file is cached above current play percentage
+///   }
+///   \table_row3{   <b>`Player.Volume`</b>,
+///                  \anchor Player_Volume
+///                  _string_,
+///     Returns the current player volume with the format `%2.1f dB`
+///   }
+///   \table_row3{   <b>`Player.SubtitleDelay`</b>,
+///                  \anchor Player_SubtitleDelay
+///                  _string_,
+///     Return the used subtitle delay with the format `%2.3f s`
+///   }
+///   \table_row3{   <b>`Player.AudioDelay`</b>,
+///                  \anchor Player_AudioDelay
+///                  _string_,
+///     Return the used audio delay with the format `%2.3f s`
+///   }
+///   \table_row3{   <b>`Player.Chapter`</b>,
+///                  \anchor Player_Chapter
+///                  _integer_,
+///     Current chapter of current playing media
+///   }
+///   \table_row3{   <b>`Player.ChapterCount`</b>,
+///                  \anchor Player_ChapterCount
+///                  _integer_,
+///     Total number of chapters of current playing media
+///   }
+///   \table_row3{   <b>`Player.ChapterName`</b>,
+///                  \anchor Player_ChapterName
+///                  _string_,
+///     Return the name of currently used chapter if available
+///   }
+///   \table_row3{   <b>`Player.Folderpath`</b>,
+///                  \anchor Player_Folderpath
+///                  _path_,
+///     Shows the full path of the currently playing song or movie
+///   }
+///   \table_row3{   <b>`Player.FilenameAndPath`</b>,
+///                  \anchor FilenameAndPath
+///                  _boolean_,
+///     Shows the full path with filename of the currently playing song or movie
+///   }
+///   \table_row3{   <b>`Player.Filename`</b>,
+///                  \anchor Player_Filename
+///                  _path_,
+///     Returns the filename of the currently playing media.
+///   }
+///   \table_row3{   <b>`Player.IsInternetStream`</b>,
+///                  \anchor Player_IsInternetStream
+///                  _boolean_,
+///     Returns true if the player is playing an internet stream.
+///   }
+///   \table_row3{   <b>`Player.PauseEnabled`</b>,
+///                  \anchor Player_PauseEnabled
+///                  _boolean_,
+///     Returns true if played stream is paused
+///   }
+///   \table_row3{   <b>`Player.SeekEnabled`</b>,
+///                  \anchor Player_SeekEnabled
+///                  _boolean_,
+///     Returns true if seek on playing is enabled
+///   }
+///   \table_row3{   <b>`Player.ChannelPreviewActive`</b>,
+///                  \anchor Player_ChannelPreviewActive
+///                  _boolean_,
+///     Returns true if pvr channel preview is active (used channel tag different
+///     from played tag)
+///   }
+/// \table_end
+/// @}
 const infomap player_labels[] =  {{ "hasmedia",         PLAYER_HAS_MEDIA },           // bools from here
                                   { "hasaudio",         PLAYER_HAS_AUDIO },
                                   { "hasvideo",         PLAYER_HAS_VIDEO },
@@ -235,8 +502,120 @@
                                   { "seekenabled",      PLAYER_CAN_SEEK },
                                   { "channelpreviewactive", PLAYER_IS_CHANNEL_PREVIEW_ACTIVE}};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Player.Art(fanart)`</b>,
+///                  \anchor Player_Art_fanart
+///                  _string_,
+///     Fanart Image of the currently playing episode's parent TV show
+///   }
+///   \table_row3{   <b>`Player.Art(thumb)`</b>,
+///                  \anchor Player_Art_thumb
+///                  _string_,
+///     Returns the thumbnail image of the currently playing item.
+///   }
+///   \table_row3{   <b>`Player.Art(poster)`</b>,
+///                  \anchor Player_Art_poster
+///                  _string_,
+///     Returns the poster of the currently playing movie.
+///   }
+///   \table_row3{   <b>`Player.Art(tvshow.poster)`</b>,
+///                  \anchor Player_Art_tvshowposter
+///                  _string_,
+///     Returns the tv show poster of the currently playing episode's parent TV show.
+///   }
+///   \table_row3{   <b>`Player.Art(tvshow.banner)`</b>,
+///                  \anchor Player_Art_tvshowbanner
+///                  _string_,
+///     Returns the tv show banner of the currently playing episode's parent TV show.
+///   }
+/// \table_end
+/// @}
 const infomap player_param[] =   {{ "art",              PLAYER_ITEM_ART }};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Player.SeekTime`</b>,
+///                  \anchor Player_SeekTime
+///                  _string_,
+///     Time to which the user is seeking
+///   }
+///   \table_row3{   <b>`Player.SeekOffset`</b>,
+///                  \anchor Player_SeekOffset
+///                  _string_,
+///     Indicates the seek offset after a seek press (eg user presses
+///     BigStepForward\, player.seekoffset returns +10:00)
+///   }
+///   \table_row3{   <b>`Player.SeekOffset(format)`</b>,
+///                  \anchor Player_SeekOffset_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). Also supported: (hh:mm)\,
+///     (mm:ss)\, (hh:mm:ss)\, (hh:mm:ss).
+///   }
+///   \table_row3{   <b>`Player.SeekStepSize`</b>,
+///                  \anchor Player_SeekStepSize
+///                  _string_,
+///     Displays the seek step size. (v15 addition)
+///   }
+///   \table_row3{   <b>`Player.TimeRemaining`</b>,
+///                  \anchor Player_TimeRemaining
+///                  _string_,
+///     Remaining time of current playing media
+///   }
+///   \table_row3{   <b>`Player.TimeRemaining(format)`</b>,
+///                  \anchor Player_TimeRemaining_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+///     used (xx) will return AM/PM. Also supported: (hh:mm)\, (mm:ss)\,
+///     (hh:mm:ss)\, (hh:mm:ss).
+///   }
+///   \table_row3{   <b>`Player.TimeSpeed`</b>,
+///                  \anchor Player_TimeSpeed
+///                  _string_,
+///     Both the time and the playspeed formatted up. eg 1:23 (2x)
+///   }
+///   \table_row3{   <b>`Player.Time`</b>,
+///                  \anchor Player_Time
+///                  _string_,
+///     Elapsed time of current playing media
+///   }
+///   \table_row3{   <b>`Player.Time(format)`</b>,
+///                  \anchor Player_Time_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+///     used (xx) will return AM/PM. Also supported: (hh:mm)\, (mm:ss)\,
+///     (hh:mm:ss)\, (hh:mm:ss).
+///   }
+///   \table_row3{   <b>`Player.Duration`</b>,
+///                  \anchor Player_Duration
+///                  _string_,
+///     Total duration of the current playing media
+///   }
+///   \table_row3{   <b>`Player.Duration(format)`</b>,
+///                  \anchor Player_Duration_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is used
+///     (xx) will return AM/PM. Also supported: (hh:mm)\, (mm:ss)\, (hh:mm:ss)\,
+///     (hh:mm:ss).
+///   }
+///   \table_row3{   <b>`Player.FinishTime`</b>,
+///                  \anchor Player_FinishTime
+///                  _string_,
+///     Time playing media will end
+///   }
+///   \table_row3{   <b>`Player.FinishTime(format)`</b>,
+///                  \anchor Player_FinishTime_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+///     used (xx) will return AM/PM. Also supported: (hh:mm)\, (mm:ss)\,
+///     (hh:mm:ss)\, (hh:mm:ss).
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap player_times[] =   {{ "seektime",         PLAYER_SEEKTIME },
                                   { "seekoffset",       PLAYER_SEEKOFFSET },
                                   { "seekstepsize",     PLAYER_SEEKSTEPSIZE },
@@ -247,6 +626,45 @@
                                   { "finishtime",       PLAYER_FINISH_TIME },
                                   { "starttime",        PLAYER_START_TIME}};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Weather Weather
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Weather.IsFetched`</b>,
+///                  \anchor Weather_IsFetched
+///                  _boolean_,
+///     Returns true if the weather data has been downloaded.
+///   }
+///   \table_row3{   <b>`Weather.Conditions`</b>,
+///                  \anchor Weather_Conditions
+///                  _string_,
+///     Current weather conditions – this is looked up in a background process.
+///   }
+///   \table_row3{   <b>`Weather.Temperature`</b>,
+///                  \anchor Weather_Temperature
+///                  _string_,
+///     Current weather temperature
+///   }
+///   \table_row3{   <b>`Weather.Location`</b>,
+///                  \anchor Weather_Location
+///                  _string_,
+///     City/town which the above two items are for
+///   }
+///   \table_row3{   <b>`Weather.fanartcode`</b>,
+///                  \anchor Weather_fanartcode
+///                  _string_,
+///     Current weather fanartcode.
+///   }
+///   \table_row3{   <b>`Weather.plugin`</b>,
+///                  \anchor Weather_plugin
+///                  _string_,
+///     Current weather plugin.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap weather[] =        {{ "isfetched",        WEATHER_IS_FETCHED },
                                   { "conditions",       WEATHER_CONDITIONS },         // labels from here
                                   { "temperature",      WEATHER_TEMPERATURE },
@@ -254,6 +672,447 @@
                                   { "fanartcode",       WEATHER_FANART_CODE },
                                   { "plugin",           WEATHER_PLUGIN }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_System System
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`System.AlarmLessOrEqual(alarmname\,seconds)`</b>,
+///                  \anchor System_AlarmLessOrEqual
+///                  _boolean_,
+///     Returns true if the alarm with `alarmname` has less or equal to `seconds`
+///     left. Standard use would be system.alarmlessorequal(shutdowntimer\,119)\,
+///     which would return true when the shutdowntimer has less then 2 minutes
+///     left.
+///   }
+///   \table_row3{   <b>`System.HasNetwork`</b>,
+///                  \anchor System_HasNetwork
+///                  _boolean_,
+///     Returns true if the ethernet cable is plugged in.
+///   }
+///   \table_row3{   <b>`System.HasMediadvd`</b>,
+///                  \anchor System_HasMediadvd
+///                  _boolean_,
+///     Returns true if there is a CD or DVD in the DVD-ROM drive.
+///   }
+///   \table_row3{   <b>`System.DVDReady`</b>,
+///                  \anchor System_DVDReady
+///                  _boolean_,
+///     Returns true if disc is ready to use.
+///   }
+///   \table_row3{   <b>`System.TrayOpen`</b>,
+///                  \anchor System_TrayOpen
+///                  _boolean_,
+///     Returns true if discs tray is open
+///   }
+///   \table_row3{   <b>`System.HasLocks`</b>,
+///                  \anchor System_HasLocks
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.IsMaster`</b>,
+///                  \anchor System_IsMaster
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.ShowExitButton`</b>,
+///                  \anchor System_ShowExitButton
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.DPMSActive`</b>,
+///                  \anchor System_DPMSActive
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.IdleTime(time)`</b>,
+///                  \anchor System_IdleTime
+///                  _boolean_,
+///     Returns true if Kodi has had no input for ?time? amount of seconds.
+///   }
+///   \table_row3{   <b>`System.IsStandalone`</b>,
+///                  \anchor System_IsStandalone
+///                  _boolean_,
+///     Returns true if Kodi is running in standalone mode.
+///   }
+///   \table_row3{   <b>`System.IsFullscreen`</b>,
+///                  \anchor System_IsFullscreen
+///                  _boolean_,
+///     Returns true if Kodi is running fullscreen.
+///   }
+///   \table_row3{   <b>`System.LoggedOn`</b>,
+///                  \anchor System_LoggedOn
+///                  _boolean_,
+///     Returns true if a user is currently logged on under a profile
+///   }
+///   \table_row3{   <b>`System.HasLoginScreen`</b>,
+///                  \anchor System_HasLoginScreen
+///                  _boolean_,
+///     Returns true if the profile login screen is enabled
+///   }
+///   \table_row3{   <b>`System.HasPVR`</b>,
+///                  \anchor System_HasPVR
+///                  _boolean_,
+///     Returns true if PVR is supported from Kodi
+///     \note normally always true
+///   }
+///   \table_row3{   <b>`System.HasADSP`</b>,
+///                  \anchor System_HasADSP
+///                  _boolean_,
+///     Returns true if ADSP is supported from Kodi
+///     \note normally always true
+///   }
+///   \table_row3{   <b>`System.HasModalDialog`</b>,
+///                  \anchor System_HasModalDialog
+///                  _boolean_,
+///     Returns true true if a modal dialog is visible
+///   }
+///   \table_row3{   <b>`System.Time(startTime\,endTime)`</b>,
+///                  \anchor System_Time
+///                  _boolean_,
+///     Returns true if the current system time is >= startTime and < endTime.
+///     endTime is optional. Time must be specified in the format HH:mm\, using
+///     a 24 hour clock.
+///   }
+///   \table_row3{   <b>`System.Date(startDate\,endDate)`</b>,
+///                  \anchor System_Date
+///                  _boolean_,
+///     Returns true if the current system date is >= startDate and < endDate.
+///     endDate is optional. Date must be specified in the format MM-DD.
+///   }
+///   \table_row3{   <b>`System.Platform.Linux`</b>,
+///                  \anchor System_PlatformLinux
+///                  _boolean_,
+///     Returns true if Kodi is running on a linux/unix based computer.
+///   }
+///   \table_row3{   <b>`System.Platform.Linux.RaspberryPi`</b>,
+///                  \anchor System_PlatformLinuxRaspberryPi
+///                  _boolean_,
+///     Returns true if Kodi is running on a Raspberry Pi.
+///   }
+///   \table_row3{   <b>`System.Platform.Windows`</b>,
+///                  \anchor System_PlatformWindows
+///                  _boolean_,
+///     Returns true if Kodi is running on a windows based computer.
+///   }
+///   \table_row3{   <b>`System.Platform.OSX`</b>,
+///                  \anchor System_PlatformOSX
+///                  _boolean_,
+///     Returns true if Kodi is running on an OSX based computer.
+///   }
+///   \table_row3{   <b>`System.Platform.IOS`</b>,
+///                  \anchor System_PlatformIOS
+///                  _boolean_,
+///     Returns true if Kodi is running on an IOS device.
+///   }
+///   \table_row3{   <b>`System.Platform.Darwin`</b>,
+///                  \anchor System_PlatformDarwin
+///                  _boolean_,
+///     Returns true if Kodi is running on an OSX or IOS system.
+///   }
+///   \table_row3{   <b>`System.Platform.ATV2`</b>,
+///                  \anchor System_PlatformATV2
+///                  _boolean_,
+///     Returns true if Kodi is running on an atv2.
+///   }
+///   \table_row3{   <b>`System.Platform.Android`</b>,
+///                  \anchor System_PlatformAndroid
+///                  _boolean_,
+///     Returns true if Kodi is running on an android device.
+///   }
+///   \table_row3{   <b>`System.CanPowerDown`</b>,
+///                  \anchor System_CanPowerDown
+///                  _boolean_,
+///     Returns true if Kodi can powerdown the system.
+///   }
+///   \table_row3{   <b>`System.CanSuspend`</b>,
+///                  \anchor System_CanSuspend
+///                  _boolean_,
+///     Returns true if Kodi can suspend the system.
+///   }
+///   \table_row3{   <b>`System.CanHibernate`</b>,
+///                  \anchor System_CanHibernate
+///                  _boolean_,
+///     Returns true if Kodi can hibernate the system.
+///   }
+///   \table_row3{   <b>`System.HasHiddenInput`</b>,
+///                  \anchor System_HasHiddenInput
+///                  _boolean_,
+///     Return true when to osd keyboard/numeric dialog requests a
+///     password/pincode.
+///   }
+///   \table_row3{   <b>`System.CanReboot`</b>,
+///                  \anchor System_CanReboot
+///                  _boolean_,
+///     Returns true if Kodi can reboot the system.
+///   }
+///   \table_row3{   <b>`System.ScreenSaverActive`</b>,
+///                  \anchor System_ScreenSaverActive
+///                  _boolean_,
+///     Returns true if ScreenSaver is active.
+///   }
+///   \table_row3{   <b>`System.IsInhibit`</b>,
+///                  \anchor System_IsInhibit
+///                  _boolean_,
+///     Returns true when shutdown on idle is disabled.
+///   }
+///   \table_row3{   <b>`System.HasShutdown`</b>,
+///                  \anchor System_HasShutdown
+///                  _boolean_,
+///     Returns true when shutdown on idle is enabled.
+///   }
+///   \table_row3{   <b>`System.Time`</b>,
+///                  \anchor System_Time
+///                  _string_,
+///     Current time
+///   }
+///   \table_row3{   <b>`System.Time(format)`</b>,
+///                  \anchor System_Time_format
+///                  _string_,
+///     Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+///     used (xx) will return AM/PM. Also supported: (hh:mm)\, (mm:ss)\,
+///     (hh:mm:ss)\, (hh:mm:ss). (xx) option added after dharma
+///   }
+///   \table_row3{   <b>`System.Date`</b>,
+///                  \anchor System_Date
+///                  _string_,
+///     Current date
+///   }
+///   \table_row3{   <b>`System.Date(format)`</b>,
+///                  \anchor System_Date_format
+///                  _string_,
+///     Show current date using format\, available markings: d (day of month
+///     1-31)\, dd (day of month 01-31)\, ddd (short day of the week Mon-Sun)\,
+///     DDD (long day of the week Monday-Sunday)\, m (month 1-12)\, mm (month
+///     01-12)\, mmm (short month name Jan-Dec)\, MMM (long month name January -
+///     December)\, yy (2-digit year)\, yyyy (4-digit year). Added after dharma.
+///   }
+///   \table_row3{   <b>`System.AlarmPos`</b>,
+///                  \anchor System_AlarmPos
+///                  _string_,
+///     Shutdown Timer position
+///   }
+///   \table_row3{   <b>`System.BatteryLevel`</b>,
+///                  \anchor System_BatteryLevel
+///                  _string_,
+///     Returns the remaining battery level in range 0-100
+///   }
+///   \table_row3{   <b>`System.FreeSpace`</b>,
+///                  \anchor System_FreeSpace
+///                  _string_,
+///     Total Freespace on the drive
+///   }
+///   \table_row3{   <b>`System.UsedSpace`</b>,
+///                  \anchor System_UsedSpace
+///                  _string_,
+///     Total Usedspace on the drive
+///   }
+///   \table_row3{   <b>`System.TotalSpace`</b>,
+///                  \anchor System_TotalSpace
+///                  _string_,
+///     Totalspace on the drive
+///   }
+///   \table_row3{   <b>`System.UsedSpacePercent`</b>,
+///                  \anchor System_UsedSpacePercent
+///                  _string_,
+///     Total Usedspace Percent on the drive
+///   }
+///   \table_row3{   <b>`System.FreeSpacePercent`</b>,
+///                  \anchor System_FreeSpacePercent
+///                  _string_,
+///     Total Freespace Percent on the drive
+///   }
+///   \table_row3{   <b>`System.CPUTemperature`</b>,
+///                  \anchor System_CPUTemperature
+///                  _string_,
+///     Current CPU temperature
+///   }
+///   \table_row3{   <b>`System.CpuUsage`</b>,
+///                  \anchor System_CpuUsage
+///                  _string_,
+///     Displays the cpu usage for each individual cpu core.
+///   }
+///   \table_row3{   <b>`System.GPUTemperature`</b>,
+///                  \anchor System_GPUTemperature
+///                  _string_,
+///     Current GPU temperature
+///   }
+///   \table_row3{   <b>`System.FanSpeed`</b>,
+///                  \anchor System_FanSpeed
+///                  _string_,
+///     Current fan speed
+///   }
+///   \table_row3{   <b>`System.BuildVersion`</b>,
+///                  \anchor System_BuildVersion
+///                  _string_,
+///     Version of build
+///   }
+///   \table_row3{   <b>`System.BuildVersionShort`</b>,
+///                  \anchor System_BuildVersionShort
+///                  _string_,
+///     Shorter string with version of build
+///   }
+///   \table_row3{   <b>`System.BuildDate`</b>,
+///                  \anchor System_BuildDate
+///                  _string_,
+///     Date of build
+///   }
+///   \table_row3{   <b>`System.FriendlyName`</b>,
+///                  \anchor System_FriendlyName
+///                  _string_,
+///     Returns the Kodi instance name. It will auto append (%hostname%) in case
+///     the device name was not changed. eg. "Kodi (htpc)"
+///   }
+///   \table_row3{   <b>`System.FPS`</b>,
+///                  \anchor System_FPS
+///                  _string_,
+///     Current rendering speed (frames per second)
+///   }
+///   \table_row3{   <b>`System.FreeMemory`</b>,
+///                  \anchor System_FreeMemory
+///                  _string_,
+///     Amount of free memory in Mb
+///   }
+///   \table_row3{   <b>`System.ScreenMode`</b>,
+///                  \anchor System_ScreenMode
+///                  _string_,
+///     Screenmode (eg windowed / fullscreen)
+///   }
+///   \table_row3{   <b>`System.ScreenWidth`</b>,
+///                  \anchor System_ScreenWidth
+///                  _string_,
+///     Width of screen in pixels
+///   }
+///   \table_row3{   <b>`System.ScreenHeight`</b>,
+///                  \anchor System_ScreenHeight
+///                  _string_,
+///     Height of screen in pixels
+///   }
+///   \table_row3{   <b>`System.StartupWindow`</b>,
+///                  \anchor System_StartupWindow
+///                  _string_,
+///     The Window Kodi will load on startup
+///   }
+///   \table_row3{   <b>`System.CurrentWindow`</b>,
+///                  \anchor System_CurrentWindow
+///                  _string_,
+///     Current Window we are in
+///   }
+///   \table_row3{   <b>`System.CurrentControl`</b>,
+///                  \anchor System_CurrentControl
+///                  _string_,
+///     Current focused control
+///   }
+///   \table_row3{   <b>`System.CurrentControlId`</b>,
+///                  \anchor System_CurrentControlId
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.DVDLabel`</b>,
+///                  \anchor System_DVDLabel
+///                  _string_,
+///     Label of the disk in the DVD-ROM drive
+///   }
+///   \table_row3{   <b>`System.KernelVersion`</b>,
+///                  \anchor System_KernelVersion
+///                  _string_,
+///     System kernel version
+///   }
+///   \table_row3{   <b>`System.OSVersionInfo`</b>,
+///                  \anchor System_OSVersionInfo
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.Uptime`</b>,
+///                  \anchor System_Uptime
+///                  _string_,
+///     System current uptime
+///   }
+///   \table_row3{   <b>`System.TotalUptime`</b>,
+///                  \anchor System_TotalUptime
+///                  _string_,
+///     System total uptime
+///   }
+///   \table_row3{   <b>`System.CpuFrequency`</b>,
+///                  \anchor System_CpuFrequency
+///                  _string_,
+///     System cpu frequency
+///   }
+///   \table_row3{   <b>`System.ScreenResolution`</b>,
+///                  \anchor System_ScreenResolution
+///                  _string_,
+///     Screen resolution
+///   }
+///   \table_row3{   <b>`System.VideoEncoderInfo`</b>,
+///                  \anchor System_VideoEncoderInfo
+///                  _string_,
+///     Video encoder info
+///   }
+///   \table_row3{   <b>`System.InternetState`</b>,
+///                  \anchor System_InternetState
+///                  _string_,
+///     Will return the internet state\, connected or not connected and for
+///     Conditional use: Connected->TRUE\, not Connected->FALSE\, do not use
+///     to check status in a pythonscript since it is threaded.
+///   }
+///   \table_row3{   <b>`System.Language`</b>,
+///                  \anchor System_Language
+///                  _string_,
+///     Shows the current language
+///   }
+///   \table_row3{   <b>`System.ProfileName`</b>,
+///                  \anchor System_ProfileName
+///                  _string_,
+///     Shows the User name of the currently logged in Kodi user
+///   }
+///   \table_row3{   <b>`System.ProfileThumb`</b>,
+///                  \anchor System_ProfileThumb
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.ProfileCount`</b>,
+///                  \anchor System_ProfileCount
+///                  _string_,
+///     Shows the number of defined profiles
+///   }
+///   \table_row3{   <b>`System.ProfileAutoLogin`</b>,
+///                  \anchor System_ProfileAutoLogin
+///                  _string_,
+///     The profile Kodi will auto login to
+///   }
+///   \table_row3{   <b>`System.StereoscopicMode`</b>,
+///                  \anchor System_StereoscopicMode
+///                  _string_,
+///     The prefered stereoscopic mode (settings > video > playback)
+///   }
+///   \table_row3{   <b>`System.TemperatureUnits`</b>,
+///                  \anchor System_TemperatureUnits
+///                  _string_,
+///     Shows Celsius or Fahrenheit symbol
+///   }
+///   \table_row3{   <b>`System.Progressbar`</b>,
+///                  \anchor System_Progressbar
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.GetBool(boolean)`</b>,
+///                  \anchor System_GetBool
+///                  _string_,
+///     Returns the value of any standard system boolean setting. Will not work
+///     with settings in advancedsettings.xml
+///   }
+///   \table_row3{   <b>`System.AddonTitle(id)`</b>,
+///                  \anchor System_AddonTitle
+///                  _string_,
+///     Returns the title of the addon with the given id
+///   }
+///   \table_row3{   <b>`System.AddonVersion(id)`</b>,
+///                  \anchor System_AddonVersion
+///                  _string_,
+///     Returns the version of the addon with the given id
+///   }
+/// \table_end
+/// @}
 const infomap system_labels[] =  {{ "hasnetwork",       SYSTEM_ETHERNET_LINK_ACTIVE },
                                   { "hasmediadvd",      SYSTEM_MEDIA_DVD },
                                   { "dvdready",         SYSTEM_DVDREADY },
@@ -286,7 +1145,6 @@
                                   { "buildversionshort",SYSTEM_BUILD_VERSION_SHORT },
                                   { "builddate",        SYSTEM_BUILD_DATE },
                                   { "fps",              SYSTEM_FPS },
-                                  { "dvdtraystate",     SYSTEM_DVD_TRAY_STATE },
                                   { "freememory",       SYSTEM_FREE_MEMORY },
                                   { "language",         SYSTEM_LANGUAGE },
                                   { "temperatureunits", SYSTEM_TEMPERATURE_UNITS },
@@ -320,12 +1178,98 @@
                                   { "stereoscopicmode", SYSTEM_STEREOSCOPIC_MODE },
                                   { "hasadsp",          SYSTEM_HAS_ADSP }};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`System.HasAddon(id)`</b>,
+///                  \anchor System_HasAddon
+///                  _boolean_,
+///     Returns true if the specified addon is installed on the system.
+///   }
+///   \table_row3{   <b>`System.HasCoreId(id)`</b>,
+///                  \anchor System_HasCoreId
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`System.HasAlarm(alarm)`</b>,
+///                  \anchor System_HasAlarm
+///                  _boolean_,
+///     Returns true if the system has the ?alarm? alarm set.
+///   }
+///   \table_row3{   <b>`System.CoreUsage(id)`</b>,
+///                  \anchor System_CoreUsage
+///                  _string_,
+///     Displays the usage of the cpu core with the given 'id'
+///   }
+///   \table_row3{   <b>`System.Setting(hidewatched)`</b>,
+///                  \anchor System_Setting
+///                  _boolean_,
+///     Returns true if 'hide watched items' is selected.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap system_param[] =   {{ "hasalarm",         SYSTEM_HAS_ALARM },
                                   { "hascoreid",        SYSTEM_HAS_CORE_ID },
                                   { "setting",          SYSTEM_SETTING },
                                   { "hasaddon",         SYSTEM_HAS_ADDON },
                                   { "coreusage",        SYSTEM_GET_CORE_USAGE }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Network Network
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Network.IsDHCP`</b>,
+///                  \anchor Network_IsDHCP
+///                  _boolean_,
+///     Network type is DHCP or FIXED
+///   }
+///   \table_row3{   <b>`Network.IPAddress`</b>,
+///                  \anchor Network_IPAddress
+///                  _string_,
+///     The system's IP Address (formatted as IP: <ipaddress>)
+///   }
+///   \table_row3{   <b>`Network.LinkState`</b>,
+///                  \anchor Network_LinkState
+///                  _string_,
+///     Network linkstate e.g. 10mbit/100mbit etc.
+///   }
+///   \table_row3{   <b>`Network.MacAddress`</b>,
+///                  \anchor Network_MacAddress
+///                  _string_,
+///     The system's mac address
+///   }
+///   \table_row3{   <b>`Network.SubnetMask`</b>,
+///                  \anchor Network_SubnetMask
+///                  _string_,
+///     Network subnet mask
+///   }
+///   \table_row3{   <b>`Network.GatewayAddress`</b>,
+///                  \anchor Network_GatewayAddress
+///                  _string_,
+///     Network gateway address
+///   }
+///   \table_row3{   <b>`Network.DNS1Address`</b>,
+///                  \anchor Network_DNS1Address
+///                  _string_,
+///     Network dns 1 address
+///   }
+///   \table_row3{   <b>`Network.DNS2Address`</b>,
+///                  \anchor Network_DNS2Address
+///                  _string_,
+///     Network dns 2 address
+///   }
+///   \table_row3{   <b>`Network.DHCPAddress`</b>,
+///                  \anchor Network_DHCPAddress
+///                  _string_,
+///     DHCP ip address
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap network_labels[] = {{ "isdhcp",            NETWORK_IS_DHCP },
                                   { "ipaddress",         NETWORK_IP_ADDRESS }, //labels from here
                                   { "linkstate",         NETWORK_LINK_STATE },
@@ -336,6 +1280,50 @@
                                   { "dns2address",       NETWORK_DNS2_ADDRESS },
                                   { "dhcpaddress",       NETWORK_DHCP_ADDRESS }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_musicpartymode Music party mode
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`MusicPartyMode.Enabled`</b>,
+///                  \anchor MusicPartyMode_Enabled
+///                  _boolean_,
+///     Returns true if Party Mode is enabled
+///   }
+///   \table_row3{   <b>`MusicPartyMode.SongsPlayed`</b>,
+///                  \anchor MusicPartyMode_SongsPlayed
+///                  _string_,
+///     Number of songs played during Party Mode
+///   }
+///   \table_row3{   <b>`MusicPartyMode.MatchingSongs`</b>,
+///                  \anchor MusicPartyMode_MatchingSongs
+///                  _string_,
+///     Number of songs available to Party Mode
+///   }
+///   \table_row3{   <b>`MusicPartyMode.MatchingSongsPicked`</b>,
+///                  \anchor MusicPartyMode_MatchingSongsPicked
+///                  _string_,
+///     Number of songs picked already for Party Mode
+///   }
+///   \table_row3{   <b>`MusicPartyMode.MatchingSongsLeft`</b>,
+///                  \anchor MusicPartyMode_MatchingSongsLeft
+///                  _string_,
+///     Number of songs left to be picked from for Party Mode
+///   }
+///   \table_row3{   <b>`MusicPartyMode.RelaxedSongsPicked`</b>,
+///                  \anchor MusicPartyMode_RelaxedSongsPicked
+///                  _string_,
+///     Not currently used
+///   }
+///   \table_row3{   <b>`MusicPartyMode.RandomSongsPicked`</b>,
+///                  \anchor MusicPartyMode_RandomSongsPicked
+///                  _string_,
+///     Number of unique random songs picked during Party Mode
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap musicpartymode[] = {{ "enabled",           MUSICPM_ENABLED },
                                   { "songsplayed",       MUSICPM_SONGSPLAYED },
                                   { "matchingsongs",     MUSICPM_MATCHINGSONGS },
@@ -344,6 +1332,308 @@
                                   { "relaxedsongspicked",MUSICPM_RELAXEDSONGSPICKED },
                                   { "randomsongspicked", MUSICPM_RANDOMSONGSPICKED }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_MusicPlayer Music player
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`MusicPlayer.Offset(number).Exists`</b>,
+///                  \anchor MusicPlayer_Offset
+///                  _boolean_,
+///     Returns true if the music players playlist has a song queued in
+///     position (number).
+///   }
+///   \table_row3{   <b>`MusicPlayer.Title`</b>,
+///                  \anchor MusicPlayer_Title
+///                  _string_,
+///     Title of the currently playing song\, also available are
+///     "MusicPlayer.offset(number).Title" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Title" position is relative
+///     to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Album`</b>,
+///                  \anchor MusicPlayer_Album
+///                  _string_,
+///     Album from which the current song is from\, also available are
+///     "MusicPlayer.offset(number).Album" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Album" position is relative
+///     to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Mood)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Mood
+///                  _string_,
+///     Shows the moods of the currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Style)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Style
+///                  _string_,
+///     Shows the styles of the currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Theme)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Theme
+///                  _string_,
+///     Shows the themes of the currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Type)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Type
+///                  _string_,
+///     Shows the Album Type (e.g. compilation\, enhanced\, explicit lyrics) of the
+///     currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Label)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Label
+///                  _string_,
+///     Shows the record label of the currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Album_Description)`</b>,
+///                  \anchor MusicPlayer_Property_Album_Description
+///                  _string_,
+///     Shows a review of the currently playing Album
+///   }
+///   \table_row3{   <b>`MusicPlayer.Artist`</b>,
+///                  \anchor MusicPlayer_Artist
+///                  _string_,
+///     Artist(s) of current song\, also available are
+///     "MusicPlayer.offset(number).Artist" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Artist" position is
+///     relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.AlbumArtist`</b>,
+///                  \anchor MusicPlayer_AlbumArtist
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.Cover`</b>,
+///                  \anchor MusicPlayer_Cover
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Born)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Born
+///                  _string_,
+///     Date of Birth of the currently playing Artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Died)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Died
+///                  _string_,
+///     Date of Death of the currently playing Artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Formed)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Formed
+///                  _string_,
+///     Formation date of the currently playing Artist/Band
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Disbanded)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Disbanded
+///                  _string_,
+///     Disbanding date of the currently playing Artist/Band
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_YearsActive)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_YearsActive
+///                  _string_,
+///     Years the currently Playing artist has been active
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Instrument)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Instrument
+///                  _string_,
+///     Instruments played by the currently playing artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Description)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Description
+///                  _string_,
+///     Shows a biography of the currently playing artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Mood)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Mood
+///                  _string_,
+///     Shows the moods of the currently playing artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Style)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Style
+///                  _string_,
+///     Shows the styles of the currently playing artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Property(Artist_Genre)`</b>,
+///                  \anchor MusicPlayer_Property_Artist_Genre
+///                  _string_,
+///     Shows the genre of the currently playing artist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Genre`</b>,
+///                  \anchor MusicPlayer_Genre
+///                  _string_,
+///     Genre(s) of current song\, also available are
+///     "MusicPlayer.offset(number).Genre" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Genre" position is
+///     relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Lyrics`</b>,
+///                  \anchor MusicPlayer_Lyrics
+///                  _string_,
+///     Lyrics of current song stored in ID tag info
+///   }
+///   \table_row3{   <b>`MusicPlayer.Year`</b>,
+///                  \anchor MusicPlayer_Year
+///                  _string_,
+///     Year of release of current song\, also available are
+///     "MusicPlayer.offset(number).Year" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Year" position is
+///     relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Rating`</b>,
+///                  \anchor MusicPlayer_Rating
+///                  _string_,
+///     Numeric Rating of current song\, also available are
+///     "MusicPlayer.offset(number).Rating" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Rating" position is
+///     relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.RatingAndVotes`</b>,
+///                  \anchor MusicPlayer_RatingAndVotes
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.UserRating`</b>,
+///                  \anchor MusicPlayer_UserRating
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.Votes`</b>,
+///                  \anchor MusicPlayer_Votes
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.DiscNumber`</b>,
+///                  \anchor MusicPlayer_DiscNumber
+///                  _string_,
+///     Disc Number of current song stored in ID tag info\, also available are
+///     "MusicPlayer.offset(number).DiscNumber" offset is relative to the
+///     current playing item and "MusicPlayer.Position(number).DiscNumber"
+///     position is relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Comment`</b>,
+///                  \anchor MusicPlayer_Comment
+///                  _string_,
+///     Comment of current song stored in ID tag info\, also available are
+///     "MusicPlayer.offset(number).Comment" offset is relative to the current
+///     playing item and "MusicPlayer.Position(number).Comment" position is
+///     relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Mood`</b>,
+///                  \anchor MusicPlayer_Mood
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.PlaylistPlaying`</b>,
+///                  \anchor MusicPlayer_PlaylistPlaying
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.Exists`</b>,
+///                  \anchor MusicPlayer_Exists
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.HasPrevious`</b>,
+///                  \anchor MusicPlayer_HasPrevious
+///                  _boolean_,
+///     Returns true if the music player has a a Previous Song in the Playlist .
+///   }
+///   \table_row3{   <b>`MusicPlayer.HasNext`</b>,
+///                  \anchor MusicPlayer_HasNext
+///                  _boolean_,
+///     Returns true if the music player has a next song queued in the Playlist.
+///   }
+///   \table_row3{   <b>`MusicPlayer.PlayCount`</b>,
+///                  \anchor MusicPlayer_PlayCount
+///                  _integer_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.LastPlayed`</b>,
+///                  \anchor MusicPlayer_LastPlayed
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`MusicPlayer.TrackNumber`</b>,
+///                  \anchor MusicPlayer_TrackNumber
+///                  _string_,
+///     Track number of current song\, also available are
+///     "MusicPlayer.offset(number).TrackNumber" offset is relative to the
+///     current playing item and "MusicPlayer.Position(number).TrackNumber"
+///     position is relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.Duration`</b>,
+///                  \anchor MusicPlayer_Duration
+///                  _string_,
+///     Duration of current song\, also available are
+///     "MusicPlayer.offset(number).Duration" offset is relative to the
+///     current playing item and "MusicPlayer.Position(number).Duration"
+///     position is relative to the start of the playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.BitRate`</b>,
+///                  \anchor MusicPlayer_BitRate
+///                  _string_,
+///     Bitrate of current song
+///   }
+///   \table_row3{   <b>`MusicPlayer.Channels`</b>,
+///                  \anchor MusicPlayer_Channels
+///                  _string_,
+///     Number of channels of current song
+///   }
+///   \table_row3{   <b>`MusicPlayer.BitsPerSample`</b>,
+///                  \anchor MusicPlayer_BitsPerSample
+///                  _string_,
+///     Number of bits per sample of current song
+///   }
+///   \table_row3{   <b>`MusicPlayer.SampleRate`</b>,
+///                  \anchor MusicPlayer_SampleRate
+///                  _string_,
+///     Samplerate of current song
+///   }
+///   \table_row3{   <b>`MusicPlayer.Codec`</b>,
+///                  \anchor MusicPlayer_Codec
+///                  _string_,
+///     Codec of current song
+///   }
+///   \table_row3{   <b>`MusicPlayer.PlaylistPosition`</b>,
+///                  \anchor MusicPlayer_PlaylistPosition
+///                  _string_,
+///     Position of the current song in the current music playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.PlaylistLength`</b>,
+///                  \anchor MusicPlayer_PlaylistLength
+///                  _string_,
+///     Total size of the current music playlist
+///   }
+///   \table_row3{   <b>`MusicPlayer.ChannelName`</b>,g
+///                  \anchor MusicPlayer_ChannelName
+///                  _string_,
+///     Channel name of the radio programme that's currently playing (PVR).
+///   }
+///   \table_row3{   <b>`MusicPlayer.ChannelNumber`</b>,
+///                  \anchor MusicPlayer_ChannelNumber
+///                  _string_,
+///     Channel number of the radio programme that's currently playing (PVR).
+///   }
+///   \table_row3{   <b>`MusicPlayer.SubChannelNumber`</b>,
+///                  \anchor MusicPlayer_SubChannelNumber
+///                  _string_,
+///     Subchannel number of the radio channel that's currently playing (PVR).
+///   }
+///   \table_row3{   <b>`MusicPlayer.ChannelNumberLabel`</b>,
+///                  \anchor MusicPlayer_ChannelNumberLabel
+///                  _string_,
+///     Channel and subchannel number of the radio channel that's currently
+///     playing (PVR).
+///   }
+///   \table_row3{   <b>`MusicPlayer.ChannelGroup`</b>,
+///                  \anchor MusicPlayer_ChannelGroup
+///                  _string_,
+///     Channel group of of the radio programme that's currently playing (PVR).
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap musicplayer[] =    {{ "title",            MUSICPLAYER_TITLE },
                                   { "album",            MUSICPLAYER_ALBUM },
                                   { "artist",           MUSICPLAYER_ARTIST },
@@ -381,6 +1671,370 @@
                                   { "channelgroup",     MUSICPLAYER_CHANNEL_GROUP }
 };
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Videoplayer Video player
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`VideoPlayer.UsingOverlays`</b>,
+///                  \anchor VideoPlayer_UsingOverlays
+///                  _boolean_,
+///     Returns true if the video player is using the hardware overlays render
+///     method. Useful\, as with hardware overlays you have no alpha blending to
+///     the video image\, so shadows etc. need redoing\, or disabling.
+///   }
+///   \table_row3{   <b>`VideoPlayer.IsFullscreen`</b>,
+///                  \anchor VideoPlayer_IsFullscreen
+///                  _boolean_,
+///     Returns true if the video player is in fullscreen mode.
+///   }
+///   \table_row3{   <b>`VideoPlayer.HasMenu`</b>,
+///                  \anchor VideoPlayer_HasMenu
+///                  _boolean_,
+///     Returns true if the video player has a menu (ie is playing a DVD)
+///   }
+///   \table_row3{   <b>`VideoPlayer.HasInfo`</b>,
+///                  \anchor VideoPlayer_HasInfo
+///                  _boolean_,
+///     Returns true if the current playing video has information from the
+///     library or from a plugin (eg director/plot etc.)
+///   }
+///   \table_row3{   <b>`VideoPlayer.Content(parameter)`</b>,
+///                  \anchor VideoPlayer_Content
+///                  _boolean_,
+///     Returns true if the current Video you are playing is contained in
+///     corresponding Video Library sections.\n
+///     The following values are accepted :
+///     - files
+///     - movies
+///     - episodes
+///     - musicvideos
+///     - livetv
+///   }
+///   \table_row3{   <b>`VideoPlayer.HasSubtitles`</b>,
+///                  \anchor VideoPlayer_HasSubtitles
+///                  _boolean_,
+///     Returns true if there are subtitles available for video.
+///   }
+///   \table_row3{   <b>`VideoPlayer.HasTeletext`</b>,
+///                  \anchor VideoPlayer_HasTeletext
+///                  _boolean_,
+///     Returns true if teletext is usable on played TV channel
+///   }
+///   \table_row3{   <b>`VideoPlayer.IsStereoscopic`</b>,
+///                  \anchor VideoPlayer_IsStereoscopic
+///                  _boolean_,
+///     Returns true when the currently playing video is a 3D (stereoscopic)
+///     video
+///   }
+///   \table_row3{   <b>`VideoPlayer.SubtitlesEnabled`</b>,
+///                  \anchor VideoPlayer_SubtitlesEnabled
+///                  _boolean_,
+///     Returns true if subtitles are turned on for video.
+///   }
+///   \table_row3{   <b>`VideoPlayer.HasEpg`</b>,
+///                  \anchor VideoPlayer_HasEpg
+///                  _boolean_,
+///     Returns true when epg information is available for the currently playing
+///     programme (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.CanResumeLiveTV`</b>,
+///                  \anchor VideoPlayer_CanResumeLiveTV
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.Title`</b>,
+///                  \anchor VideoPlayer_Title
+///                  _string_,
+///     Title of currently playing video. If it's in the database it will return
+///     the database title\, else the filename
+///   }
+///   \table_row3{   <b>`VideoPlayer.OriginalTitle`</b>,
+///                  \anchor VideoPlayer_OriginalTitle
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.TVShowTitle`</b>,
+///                  \anchor VideoPlayer_TVShowTitle
+///                  _string_,
+///     Title of currently playing episode's tvshow name
+///   }
+///   \table_row3{   <b>`VideoPlayer.Season`</b>,
+///                  \anchor VideoPlayer_Season
+///                  _string_,
+///     Season number of the currently playing episode\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Episode`</b>,
+///                  \anchor VideoPlayer_Episode
+///                  _string_,
+///     Episode number of the currently playing episode
+///   }
+///   \table_row3{   <b>`VideoPlayer.Genre`</b>,
+///                  \anchor VideoPlayer_Genre
+///                  _string_,
+///     Genre(s) of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Director`</b>,
+///                  \anchor VideoPlayer_Director
+///                  _string_,
+///     Director of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Country`</b>,
+///                  \anchor VideoPlayer_Country
+///                  _string_,
+///     Production country of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Year`</b>,
+///                  \anchor VideoPlayer_Year
+///                  _string_,
+///     Year of release of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Cover`</b>,
+///                  \anchor VideoPlayer_Cover
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.Rating`</b>,
+///                  \anchor VideoPlayer_Rating
+///                  _string_,
+///     IMDb user rating of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.UserRating`</b>,
+///                  \anchor VideoPlayer_UserRating
+///                  _string_,
+///     Shows the user rating of the currently playing item
+///   }
+///   \table_row3{   <b>`VideoPlayer.Votes`</b>,
+///                  \anchor VideoPlayer_Votes
+///                  _string_,
+///     IMDb votes of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.RatingAndVotes`</b>,
+///                  \anchor VideoPlayer_RatingAndVotes
+///                  _string_,
+///     IMDb user rating and votes of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.mpaa`</b>,
+///                  \anchor VideoPlayer_mpaa
+///                  _string_,
+///     MPAA rating of current movie\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.IMDBNumber`</b>,
+///                  \anchor VideoPlayer_IMDBNumber
+///                  _string_,
+///     The IMDB iD of the current video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Top250`</b>,
+///                  \anchor VideoPlayer_Top250
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.EpisodeName`</b>,
+///                  \anchor VideoPlayer_EpisodeName
+///                  _string_,
+///     (PVR only) The name of the episode if the playing video is a TV Show\,
+///     if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.PlaylistPosition`</b>,
+///                  \anchor VideoPlayer_PlaylistPosition
+///                  _string_,
+///     Position of the current song in the current video playlist
+///   }
+///   \table_row3{   <b>`VideoPlayer.PlaylistLength`</b>,
+///                  \anchor VideoPlayer_PlaylistLength
+///                  _string_,
+///     Total size of the current video playlist
+///   }
+///   \table_row3{   <b>`VideoPlayer.Cast`</b>,
+///                  \anchor VideoPlayer_Cast
+///                  _string_,
+///     A concatenated string of cast members of the current movie\, if it's in
+///     the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.CastAndRole`</b>,
+///                  \anchor VideoPlayer_CastAndRole
+///                  _string_,
+///     A concatenated string of cast members and roles of the current movie\,
+///     if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Album`</b>,
+///                  \anchor VideoPlayer_Album
+///                  _string_,
+///     Album from which the current Music Video is from\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Artist`</b>,
+///                  \anchor VideoPlayer_Artist
+///                  _string_,
+///     Artist(s) of current Music Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Studio`</b>,
+///                  \anchor VideoPlayer_Studio
+///                  _string_,
+///     Studio of current Music Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Writer`</b>,
+///                  \anchor VideoPlayer_Writer
+///                  _string_,
+///     Name of Writer of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Tagline`</b>,
+///                  \anchor VideoPlayer_Tagline
+///                  _string_,
+///     Small Summary of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.PlotOutline`</b>,
+///                  \anchor VideoPlayer_PlotOutline
+///                  _string_,
+///     Small Summary of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Plot`</b>,
+///                  \anchor VideoPlayer_Plot
+///                  _string_,
+///     Complete Text Summary of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.Premiered`</b>,
+///                  \anchor VideoPlayer_Premiered
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.Trailer`</b>,
+///                  \anchor VideoPlayer_Trailer
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`VideoPlayer.LastPlayed`</b>,
+///                  \anchor VideoPlayer_LastPlayed
+///                  _string_,
+///     Last play date of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.PlayCount`</b>,
+///                  \anchor VideoPlayer_PlayCount
+///                  _string_,
+///     Playcount of current playing Video\, if it's in the database
+///   }
+///   \table_row3{   <b>`VideoPlayer.VideoCodec`</b>,
+///                  \anchor VideoPlayer_VideoCodec
+///                  _string_,
+///     Shows the video codec of the currently playing video (common values: see
+///     \ref ListItem_VideoCodec "ListItem.VideoCodec")
+///   }
+///   \table_row3{   <b>`VideoPlayer.VideoResolution`</b>,
+///                  \anchor VideoPlayer_VideoResolution
+///                  _string_,
+///     Shows the video resolution of the currently playing video (possible
+///     values: see \ref ListItem_VideoResolution "ListItem.VideoResolution")
+///   }
+///   \table_row3{   <b>`VideoPlayer.VideoAspect`</b>,
+///                  \anchor VideoPlayer_VideoAspect
+///                  _string_,
+///     Shows the aspect ratio of the currently playing video (possible values:
+///     see \ref ListItem_VideoAspect "ListItem.VideoAspect")
+///   }
+///   \table_row3{   <b>`VideoPlayer.AudioCodec`</b>,
+///                  \anchor VideoPlayer_AudioCodec
+///                  _string_,
+///     Shows the audio codec of the currently playing video\, optionally 'n'
+///     defines the number of the audiostream (common values: see
+///     \ref ListItem_AudioCodec "ListItem.AudioCodec")
+///   }
+///   \table_row3{   <b>`VideoPlayer.AudioChannels`</b>,
+///                  \anchor VideoPlayer_AudioChannels
+///                  _string_,
+///     Shows the number of audio channels of the currently playing video
+///     (possible values: see \ref ListItem_AudioChannels "ListItem.AudioChannels")
+///   }
+///   \table_row3{   <b>`VideoPlayer.AudioLanguage`</b>,
+///                  \anchor VideoPlayer_AudioLanguage
+///                  _string_,
+///     Shows the language of the audio of the currently playing video(possible
+///     values: see \ref ListItem_AudioLanguage "ListItem.AudioLanguage")
+///   }
+///   \table_row3{   <b>`VideoPlayer.SubtitlesLanguage`</b>,
+///                  \anchor VideoPlayer_SubtitlesLanguage
+///                  _string_,
+///     Shows the language of the subtitle of the currently playing video
+///     (possible values: see \ref ListItem_SubtitleLanguage "ListItem.SubtitleLanguage")
+///   }
+///   \table_row3{   <b>`VideoPlayer.StereoscopicMode`</b>,
+///                  \anchor VideoPlayer_StereoscopicMode
+///                  _string_,
+///     Shows the stereoscopic mode of the currently playing video (possible
+///     values: see \ref ListItem_StereoscopicMode "ListItem.StereoscopicMode")
+///   }
+///   \table_row3{   <b>`VideoPlayer.EndTime`</b>,
+///                  \anchor VideoPlayer_EndTime
+///                  _string_,
+///     End date of the currently playing programme (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextTitle`</b>,
+///                  \anchor VideoPlayer_NextTitle
+///                  _string_,
+///     Title of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextGenre`</b>,
+///                  \anchor VideoPlayer_NextGenre
+///                  _string_,
+///     Genre of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextPlot`</b>,
+///                  \anchor VideoPlayer_NextPlot
+///                  _string_,
+///     Plot of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextPlotOutline`</b>,
+///                  \anchor VideoPlayer_NextPlotOutline
+///                  _string_,
+///     Plot outline of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextStartTime`</b>,
+///                  \anchor VideoPlayer_NextStartTime
+///                  _string_,
+///     Start time of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextEndTime`</b>,
+///                  \anchor VideoPlayer_NextEndTime
+///                  _string_,
+///     End time of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.NextDuration`</b>,
+///                  \anchor VideoPlayer_NextDuration
+///                  _string_,
+///     Duration of the programme that will be played next (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.ChannelName`</b>,
+///                  \anchor VideoPlayer_ChannelName
+///                  _string_,
+///     Name of the curently tuned channel (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.ChannelNumber`</b>,
+///                  \anchor VideoPlayer_ChannelNumber
+///                  _string_,
+///     Number of the curently tuned channel (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.SubChannelNumber`</b>,
+///                  \anchor VideoPlayer_SubChannelNumber
+///                  _string_,
+///     Subchannel number of the tv channel that's currently playing (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.ChannelNumberLabel`</b>,
+///                  \anchor VideoPlayer_ChannelNumberLabel
+///                  _string_,
+///     Channel and subchannel number of the tv channel that's currently playing (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.ChannelGroup`</b>,
+///                  \anchor VideoPlayer_ChannelGroup
+///                  _string_,
+///     Group of the curently tuned channel (PVR).
+///   }
+///   \table_row3{   <b>`VideoPlayer.ParentalRating`</b>,
+///                  \anchor VideoPlayer_ParentalRating
+///                  _string_,
+///     Parental rating of the currently playing programme (PVR).
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap videoplayer[] =    {{ "title",            VIDEOPLAYER_TITLE },
                                   { "genre",            VIDEOPLAYER_GENRE },
                                   { "country",          VIDEOPLAYER_COUNTRY },
@@ -448,6 +2102,99 @@
                                   { "episodename",      VIDEOPLAYER_EPISODENAME }
 };
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Container Container
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Container(id).HasFiles`</b>,
+///                  \anchor Container_HasFiles
+///                  _boolean_,
+///     Returns true if the container contains files (or current container if
+///     id is omitted).
+///   }
+///   \table_row3{   <b>`Container(id).HasFolders`</b>,
+///                  \anchor Container_HasFolders
+///                  _boolean_,
+///     Returns true if the container contains folders (or current container if
+///     id is omitted).
+///   }
+///   \table_row3{   <b>`Container(id).IsStacked`</b>,
+///                  \anchor Container_IsStacked
+///                  _boolean_,
+///     Returns true if the container is currently in stacked mode (or current
+///     container if id is omitted).
+///   }
+///   \table_row3{   <b>`Container.FolderPath`</b>,
+///                  \anchor Container_FolderPath
+///                  _string_,
+///     Shows complete path of currently displayed folder
+///   }
+///   \table_row3{   <b>`Container.FolderName`</b>,
+///                  \anchor Container_FolderName
+///                  _string_,
+///     Shows top most folder in currently displayed folder
+///   }
+///   \table_row3{   <b>`Container.PluginName`</b>,
+///                  \anchor Container_PluginName
+///                  _string_,
+///     Returns the current plugins base folder name
+///   }
+///   \table_row3{   <b>`Container.Viewmode`</b>,
+///                  \anchor Container_Viewmode
+///                  _string_,
+///     Returns the current viewmode (list\, icons etc.)
+///   }
+///   \table_row3{   <b>`Container.ViewCount`</b>,
+///                  \anchor Container_ViewCount
+///                  _integer_,
+///     Todo
+///   }
+///   \table_row3{   <b>`Container(id).Totaltime`</b>,
+///                  \anchor Container_Totaltime
+///                  _string_,
+///     Returns the total time of all items in the current container
+///   }
+///   \table_row3{   <b>`Container(id).TotalWatched`</b>,
+///                  \anchor Container_TotalWatched
+///                  _string_,
+///     Returns the number of watched items in the current container
+///   }
+///   \table_row3{   <b>`Container(id).TotalUnWatched`</b>,
+///                  \anchor Container_TotalUnWatched
+///                  _string_,
+///     Returns the number of unwatched items in the current container
+///   }
+///   \table_row3{   <b>`Container.HasThumb`</b>,
+///                  \anchor Container_HasThumb
+///                  _string_,
+///     Returns true if the current container you are in has a thumb assigned
+///     to it
+///   }
+///   \table_row3{   <b>`Container.SortMethod`</b>,
+///                  \anchor Container_SortMethod
+///                  _string_,
+///     Returns the current sort method (name\, year\, rating\, etc.)
+///   }
+///   \table_row3{   <b>`Container.SortOrder`</b>,
+///                  \anchor Container_SortOrder
+///                  _string_,
+///     Returns the current sort order (Ascending/Descending)
+///   }
+///   \table_row3{   <b>`Container.ShowPlot`</b>,
+///                  \anchor Container_ShowPlot
+///                  _string_,
+///     Returns the TV Show plot of the current container and can be used at
+///     season and episode level
+///   }
+///   \table_row3{   <b>`Container.ShowTitle`</b>,
+///                  \anchor Container_ShowTitle
+///                  _string_,
+///     Returns the TV Show title of the current container and can be used at
+///     season and episode level
+///   }
+/// \table_end
+/// @}
 const infomap mediacontainer[] = {{ "hasfiles",         CONTAINER_HASFILES },
                                   { "hasfolders",       CONTAINER_HASFOLDERS },
                                   { "isstacked",        CONTAINER_STACKED },
@@ -455,14 +2202,111 @@
                                   { "foldername",       CONTAINER_FOLDERNAME },
                                   { "pluginname",       CONTAINER_PLUGINNAME },
                                   { "viewmode",         CONTAINER_VIEWMODE },
+                                  { "viewcount",        CONTAINER_VIEWCOUNT },
                                   { "totaltime",        CONTAINER_TOTALTIME },
                                   { "totalwatched",     CONTAINER_TOTALWATCHED },
                                   { "totalunwatched",   CONTAINER_TOTALUNWATCHED },
                                   { "hasthumb",         CONTAINER_HAS_THUMB },
                                   { "sortmethod",       CONTAINER_SORT_METHOD },
                                   { "sortorder",        CONTAINER_SORT_ORDER },
-                                  { "showplot",         CONTAINER_SHOWPLOT }};
+                                  { "showplot",         CONTAINER_SHOWPLOT },
+                                  { "showtitle",        CONTAINER_SHOWTITLE }};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Container(id).OnNext`</b>,
+///                  \anchor Container_OnNext
+///                  _boolean_,
+///     Returns true if the container with id (or current container if id is
+///     omitted) is moving to the next item. Allows views to be
+///     custom-designed (such as 3D coverviews etc.)
+///   }
+///   \table_row3{   <b>`Container(id).OnScrollNext`</b>,
+///                  \anchor Container_OnScrollNext
+///                  _boolean_,
+///     Returns true if the container with id (or current container if id is
+///     omitted) is scrolling to the next item. Differs from OnNext in that
+///     OnNext triggers on movement even if there is no scroll involved.
+///   }
+///   \table_row3{   <b>`Container(id).OnPrevious`</b>,
+///                  \anchor Container_OnPrevious
+///                  _boolean_,
+///     Returns true if the container with id (or current container if id is
+///     omitted) is moving to the previous item. Allows views to be
+///     custom-designed (such as 3D coverviews etc.)
+///   }
+///   \table_row3{   <b>`Container(id).OnScrollPrevious`</b>,
+///                  \anchor Container_OnScrollPrevious
+///                  _boolean_,
+///     Returns true if the container with id (or current container if id is
+///     omitted) is scrolling to the previous item. Differs from OnPrevious in
+///     that OnPrevious triggers on movement even if there is no scroll involved.
+///   }
+///   \table_row3{   <b>`Container(id).NumPages`</b>,
+///                  \anchor Container_NumPages
+///                  _boolean_,
+///     Number of pages in the container with given id. If no id is specified it
+///     grabs the current container.
+///   }
+///   \table_row3{   <b>`Container(id).NumItems`</b>,
+///                  \anchor Container_NumItems
+///                  _boolean_,
+///     Number of items in the container or grouplist with given id. If no id is
+///     specified it grabs the current container.
+///   }
+///   \table_row3{   <b>`Container(id).CurrentPage`</b>,
+///                  \anchor Container_CurrentPage
+///                  _boolean_,
+///     Current page in the container with given id. If no id is specified it
+///     grabs the current container.
+///   }
+///   \table_row3{   <b>`Container(id).Scrolling`</b>,
+///                  \anchor Container_Scrolling
+///                  _boolean_,
+///     Returns true if the user is currently scrolling through the container
+///     with id (or current container if id is omitted). Note that this is
+///     slightly delayed from the actual scroll start. Use
+///     Container(id).OnScrollNext/OnScrollPrevious to trigger animations
+///     immediately on scroll.
+///   }
+///   \table_row3{   <b>`Container(id).HasNext`</b>,
+///                  \anchor Container_HasNext
+///                  _boolean_,
+///     Returns true if the container or textbox with id (id) has a next page.
+///   }
+///   \table_row3{   <b>`Container.HasParent`</b>,
+///                  \anchor Container_HasParent
+///                  _boolean_,
+///     Return true when the container contains a parent ('..') item.
+///   }
+///   \table_row3{   <b>`Container(id).HasPrevious`</b>,
+///                  \anchor Container_HasPrevious
+///                  _boolean_,
+///     Returns true if the container or textbox with id (id) has a previous page.
+///   }
+///   \table_row3{   <b>`Container.CanFilter`</b>,
+///                  \anchor Container_CanFilter
+///                  _boolean_,
+///     Returns true when the current container can be filtered.
+///   }
+///   \table_row3{   <b>`Container.CanFilterAdvanced`</b>,
+///                  \anchor Container_CanFilterAdvanced
+///                  _boolean_,
+///     Returns true when advanced filtering can be applied to the current container.
+///   }
+///   \table_row3{   <b>`Container.Filtered`</b>,
+///                  \anchor Container_Filtered
+///                  _boolean_,
+///     Returns true when a mediafilter is applied to the current container.
+///   }
+///   \table_row3{   <b>`Container(id).IsUpdating`</b>,
+///                  \anchor Container_IsUpdating
+///                  _boolean_,
+///     Returns true if the container with dynamic list content is currently updating.
+///   }
+/// \table_end
+/// @}
 const infomap container_bools[] ={{ "onnext",           CONTAINER_MOVE_NEXT },
                                   { "onprevious",       CONTAINER_MOVE_PREVIOUS },
                                   { "onscrollnext",     CONTAINER_SCROLL_NEXT },
@@ -479,6 +2323,45 @@
                                   { "filtered",         CONTAINER_FILTERED },
                                   { "isupdating",       CONTAINER_ISUPDATING }};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Container(id).Row`</b>,
+///                  \anchor Container_Row
+///                  _integer_,
+///     Returns the row number of the focused position in a panel container.
+///   }
+///   \table_row3{   <b>`Container(id).Column`</b>,
+///                  \anchor Container_Column
+///                  _integer_,
+///     Returns the column number of the focused position in a panel container.
+///   }
+///   \table_row3{   <b>`Container(id).Position`</b>,
+///                  \anchor Container_Position
+///                  _integer_,
+///     Returns the current focused position of container / grouplist (id) as a
+///     numeric label.
+///   }
+///   \table_row3{   <b>`Container(id).CurrentItem`</b>,
+///                  \anchor Container_CurrentItem
+///                  _integer_,
+///     Current item in the container or grouplist with given id. If no id is
+///     specified it grabs the current container.
+///   }
+///   \table_row3{   <b>`Container(id).SubItem`</b>,
+///                  \anchor Container_SubItem
+///                  _integer_,
+///     Todo
+///   }
+///   \table_row3{   <b>`Container(id).HasFocus(item_number)`</b>,
+///                  \anchor Container_HasFocus
+///                  _boolean_,
+///     Returns true if the container with id (or current container if id is
+///     omitted) has static content and is focused on the item with id
+///     item_number.
+///   }
+/// \table_end
+/// @}
 const infomap container_ints[] = {{ "row",              CONTAINER_ROW },
                                   { "column",           CONTAINER_COLUMN },
                                   { "position",         CONTAINER_POSITION },
@@ -486,10 +2369,1266 @@
                                   { "subitem",          CONTAINER_SUBITEM },
                                   { "hasfocus",         CONTAINER_HAS_FOCUS }};
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Container.Property(addoncategory)`</b>,
+///                  \anchor Container_Property_addoncategory
+///                  _string_,
+///     Returns the current add-on category
+///   }
+///   \table_row3{   <b>`Container.Property(reponame)`</b>,
+///                  \anchor Container_Property_reponame
+///                  _string_,
+///     Returns the current add-on repository name
+///   }
+///   \table_row3{   <b>`Container.Content(parameter)`</b>,
+///                  \anchor Container_Content
+///                  _string_,
+///     Returns true if the current container you are in contains the following:
+///     files\, songs\, artists\, albums\, movies\, tvshows\,
+///     seasons\, episodes\, musicvideos\, genres\, years\,
+///     actors\, playlists\, plugins\, studios\, directors\,
+///     sets\, tags (Note: these currently only work in the Video and Music
+///     Library or unless a Plugin has set the value) also available are
+///     Addons true when a list of add-ons is shown LiveTV true when a
+///     htsp (tvheadend) directory is shown
+///   }
+///   \table_row3{   <b>`Container.Art`</b>,
+///                  \anchor Container_Art
+///                  _string_,
+///     Todo
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap container_str[]  = {{ "property",         CONTAINER_PROPERTY },
                                   { "content",          CONTAINER_CONTENT },
                                   { "art",              CONTAINER_ART }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_ListItem ListItem
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`ListItem.Thumb`</b>,
+///                  \anchor ListItem_Thumb
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.Icon`</b>,
+///                  \anchor ListItem_Icon
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.ActualIcon`</b>,
+///                  \anchor ListItem_ActualIcon
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.Overlay`</b>,
+///                  \anchor ListItem_Overlay
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.IsFolder`</b>,
+///                  \anchor ListItem_IsFolder
+///                  _boolean_,
+///     Returns whether the current ListItem is a folder
+///   }
+///   \table_row3{   <b>`ListItem.IsPlaying`</b>,
+///                  \anchor ListItem_IsPlaying
+///                  _boolean_,
+///     Returns whether the current ListItem.* info labels and images are
+///     currently Playing media
+///   }
+///   \table_row3{   <b>`ListItem.IsResumable`</b>,
+///                  \anchor ListItem_IsResumable
+///                  _boolean_,
+///     Returns true when the current ListItem has been partially played
+///   }
+///   \table_row3{   <b>`ListItem.IsCollection`</b>,
+///                  \anchor ListItem_IsCollection
+///                  _boolean_,
+///     Returns true when the current ListItem is a movie set
+///   }
+///   \table_row3{   <b>`ListItem.IsSelected`</b>,
+///                  \anchor ListItem_IsSelected
+///                  _boolean_,
+///     Returns whether the current ListItem is selected (f.e. currently playing
+///     in playlist window)
+///   }
+///   \table_row3{   <b>`ListItem.HasEpg`</b>,
+///                  \anchor ListItem_HasEpg
+///                  _boolean_,
+///     Returns true when the selected programme has epg info (PVR)
+///   }
+///   \table_row3{   <b>`ListItem.HasTimer`</b>,
+///                  \anchor ListItem_HasTimer
+///                  _boolean_,
+///     Returns true when a recording timer has been set for the selected
+///     programme (PVR)
+///   }
+///   \table_row3{   <b>`ListItem.IsRecording`</b>,
+///                  \anchor ListItem_IsRecording
+///                  _boolean_,
+///     Returns true when the selected programme is being recorded (PVR)
+///   }
+///   \table_row3{   <b>`ListItem.IsEncrypted`</b>,
+///                  \anchor ListItem_IsEncrypted
+///                  _boolean_,
+///     Returns true when the selected programme is encrypted (PVR)
+///   }
+///   \table_row3{   <b>`ListItem.IsStereoscopic`</b>,
+///                  \anchor ListItem_IsStereoscopic
+///                  _boolean_,
+///     Returns true when the selected video is a 3D (stereoscopic) video
+///   }
+///   \table_row3{   <b>`ListItem.Property(IsSpecial)`</b>,
+///                  \anchor ListItem_Property_IsSpecial
+///                  _boolean_,
+///     Returns whether the current Season/Episode is a Special
+///   }
+///   \table_row3{   <b>`ListItem.Property(DateLabel)`</b>,
+///                  \anchor ListItem_Property_DateLabel
+///                  _string_,
+///     Can be used in the rulerlayout of the epggrid control. Will return true
+///     if the item is a date label\, returns false if the item is a time label.
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Enabled)`</b>,
+///                  \anchor ListItem_Property_AddonEnabled
+///                  _boolean_,
+///     Returns true when the selected addon is enabled (for use in the addon
+///     info dialog only).
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Installed)`</b>,
+///                  \anchor ListItem_Property_AddonInstalled
+///                  _boolean_,
+///     Returns true when the selected addon is installed (for use in the addon
+///     info dialog only).
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.UpdateAvail)`</b>,
+///                  \anchor ListItem_Property_AddonUpdateAvail
+///                  _boolean_,
+///     Returns true when there's an update available for the selected addon.
+///   }
+///   \table_row3{   <b>`ListItem.Label`</b>,
+///                  \anchor ListItem_Label
+///                  _string_,
+///     Shows the left label of the currently selected item in a container
+///   }
+///   \table_row3{   <b>`ListItem.Label2`</b>,
+///                  \anchor ListItem_Label2
+///                  _string_,
+///     Shows the right label of the currently selected item in a container
+///   }
+///   \table_row3{   <b>`ListItem.Title`</b>,
+///                  \anchor ListItem_Title
+///                  _string_,
+///     Shows the title of the currently selected song or movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.OriginalTitle`</b>,
+///                  \anchor ListItem_OriginalTitle
+///                  _string_,
+///     Shows the original title of the currently selected movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.SortLetter`</b>,
+///                  \anchor ListItem_SortLetter
+///                  _string_,
+///     Shows the first letter of the current file in a container
+///   }
+///   \table_row3{   <b>`ListItem.TrackNumber`</b>,
+///                  \anchor ListItem_TrackNumber
+///                  _string_,
+///     Shows the track number of the currently selected song in a container
+///   }
+///   \table_row3{   <b>`ListItem.Artist`</b>,
+///                  \anchor ListItem_Artist
+///                  _string_,
+///     Shows the artist of the currently selected song in a container
+///   }
+///   \table_row3{   <b>`ListItem.AlbumArtist`</b>,
+///                  \anchor ListItem_AlbumArtist
+///                  _string_,
+///     Shows the artist of the currently selected album in a list
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Born)`</b>,
+///                  \anchor ListItem_Property_Artist_Born
+///                  _string_,
+///     Date of Birth of the currently selected Artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Died)`</b>,
+///                  \anchor ListItem_Property_Artist_Died
+///                  _string_,
+///     Date of Death of the currently selected Artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Formed)`</b>,
+///                  \anchor ListItem_Property_Artist_Formed
+///                  _string_,
+///     Formation date of the currently selected Band
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Disbanded)`</b>,
+///                  \anchor ListItem_Property_Artist_Disbanded
+///                  _string_,
+///     Disbanding date of the currently selected Band
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_YearsActive)`</b>,
+///                  \anchor ListItem_Property_Artist_YearsActive
+///                  _string_,
+///     Years the currently selected artist has been active
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Instrument)`</b>,
+///                  \anchor ListItem_Property_Artist_Instrument
+///                  _string_,
+///     Instruments played by the currently selected artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Description)`</b>,
+///                  \anchor ListItem_Property_Artist_Description
+///                  _string_,
+///     Shows a biography of the currently selected artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Mood)`</b>,
+///                  \anchor ListItem_Property_Artist_Mood
+///                  _string_,
+///     Shows the moods of the currently selected artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Style)`</b>,
+///                  \anchor ListItem_Property_Artist_Style
+///                  _string_,
+///     Shows the styles of the currently selected artist
+///   }
+///   \table_row3{   <b>`ListItem.Property(Artist_Genre)`</b>,
+///                  \anchor ListItem_Property_Artist_Genre
+///                  _string_,
+///     Shows the genre of the currently selected artist
+///   }
+///   \table_row3{   <b>`ListItem.Album`</b>,
+///                  \anchor ListItem_Album
+///                  _string_,
+///     Shows the album of the currently selected song in a container
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Mood)`</b>,
+///                  \anchor ListItem_Property_Album_Mood
+///                  _string_,
+///     Shows the moods of the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Style)`</b>,
+///                  \anchor ListItem_Property_Album_Style
+///                  _string_,
+///     Shows the styles of the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Theme)`</b>,
+///                  \anchor ListItem_Property_Album_Theme
+///                  _string_,
+///     Shows the themes of the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Type)`</b>,
+///                  \anchor ListItem_Property_Album_Type
+///                  _string_,
+///     Shows the Album Type (e.g. compilation\, enhanced\, explicit lyrics) of
+///     the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Label)`</b>,
+///                  \anchor ListItem_Property_Album_Label
+///                  _string_,
+///     Shows the record label of the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.Property(Album_Description)`</b>,
+///                  \anchor ListItem_Property_Album_Description
+///                  _string_,
+///     Shows a review of the currently selected Album
+///   }
+///   \table_row3{   <b>`ListItem.DiscNumber`</b>,
+///                  \anchor ListItem_DiscNumber
+///                  _string_,
+///     Shows the disc number of the currently selected song in a container
+///   }
+///   \table_row3{   <b>`ListItem.Year`</b>,
+///                  \anchor ListItem_Year
+///                  _string_,
+///     Shows the year of the currently selected song\, album or movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.Premiered`</b>,
+///                  \anchor ListItem_Premiered
+///                  _string_,
+///     Shows the release/aired date of the currently selected episode\, show\,
+///     movie or EPG item in a container
+///   }
+///   \table_row3{   <b>`ListItem.Genre`</b>,
+///                  \anchor ListItem_Genre
+///                  _string_,
+///     Shows the genre of the currently selected song\, album or movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.Contributor`</b>,
+///                  \anchor ListItem_Contributor
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.ContributorAndRole`</b>,
+///                  \anchor ListItem_ContributorAndRole
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.Director`</b>,
+///                  \anchor ListItem_Director
+///                  _string_,
+///     Shows the director of the currently selected movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.Country`</b>,
+///                  \anchor ListItem_Country
+///                  _string_,
+///     Shows the production country of the currently selected movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.Episode`</b>,
+///                  \anchor ListItem_Episode
+///                  _string_,
+///     Shows the episode number value for the currently selected episode. It
+///     also shows the number of total\, watched or unwatched episodes for the
+///     currently selected tvshow or season\, based on the the current watched
+///     filter.
+///   }
+///   \table_row3{   <b>`ListItem.Season`</b>,
+///                  \anchor ListItem_Season
+///                  _string_,
+///     Shows the season value for the currently selected tvshow
+///   }
+///   \table_row3{   <b>`ListItem.TVShowTitle`</b>,
+///                  \anchor ListItem_TVShowTitle
+///                  _string_,
+///     Shows the name value for the currently selected tvshow in the season and
+///     episode depth of the video library
+///   }
+///   \table_row3{   <b>`ListItem.Property(TotalSeasons)`</b>,
+///                  \anchor ListItem_Property_TotalSeasons
+///                  _string_,
+///     Shows the total number of seasons for the currently selected tvshow
+///   }
+///   \table_row3{   <b>`ListItem.Property(TotalEpisodes)`</b>,
+///                  \anchor ListItem_Property_TotalEpisodes
+///                  _string_,
+///     Shows the total number of episodes for the currently selected tvshow or
+///     season
+///   }
+///   \table_row3{   <b>`ListItem.Property(WatchedEpisodes)`</b>,
+///                  \anchor ListItem_Property_WatchedEpisodes
+///                  _string_,
+///     Shows the number of watched episodes for the currently selected tvshow
+///     or season
+///   }
+///   \table_row3{   <b>`ListItem.Property(UnWatchedEpisodes)`</b>,
+///                  \anchor ListItem_Property_UnWatchedEpisodes
+///                  _string_,
+///     Shows the number of unwatched episodes for the currently selected tvshow
+///     or season
+///   }
+///   \table_row3{   <b>`ListItem.Property(NumEpisodes)`</b>,
+///                  \anchor ListItem_Property_NumEpisodes
+///                  _string_,
+///     Shows the number of total\, watched or unwatched episodes for the
+///     currently selected tvshow or season\, based on the the current watched filter.
+///   }
+///   \table_row3{   <b>`ListItem.PictureAperture`</b>,
+///                  \anchor ListItem_PictureAperture
+///                  _string_,
+///     Shows the F-stop used to take the selected picture. This is the value of the
+///     EXIF FNumber tag (hex code 0x829D).
+///   }
+///   \table_row3{   <b>`ListItem.PictureAuthor`</b>,
+///                  \anchor ListItem_PictureAuthor
+///                  _string_,
+///     Shows the name of the person involved in writing about the selected picture.
+///     This is the value of the IPTC Writer tag (hex code 0x7A).
+///   }
+///   \table_row3{   <b>`ListItem.PictureByline`</b>,
+///                  \anchor ListItem_PictureByline
+///                  _string_,
+///     Shows the name of the person who created the selected picture. This is
+///     the value of the IPTC Byline tag (hex code 0x50).
+///   }
+///   \table_row3{   <b>`ListItem.PictureBylineTitle`</b>,
+///                  \anchor ListItem_PictureBylineTitle
+///                  _string_,
+///     Shows the title of the person who created the selected picture. This is
+///     the value of the IPTC BylineTitle tag (hex code 0x55).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCamMake`</b>,
+///                  \anchor ListItem_PictureCamMake
+///                  _string_,
+///     Shows the manufacturer of the camera used to take the selected picture.
+///     This is the value of the EXIF Make tag (hex code 0x010F).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCamModel`</b>,
+///                  \anchor ListItem_PictureCamModel
+///                  _string_,
+///     Shows the manufacturer's model name or number of the camera used to take
+///     the selected picture. This is the value of the EXIF Model tag (hex code
+///     0x0110).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCaption`</b>,
+///                  \anchor ListItem_PictureCaption
+///                  _string_,
+///     Shows a description of the selected picture. This is the value of the IPTC
+///     Caption tag (hex code 0x78).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCategory`</b>,
+///                  \anchor ListItem_PictureCategory
+///                  _string_,
+///     Shows the subject of the selected picture as a category code. This is the
+///     value of the IPTC Category tag (hex code 0x0F).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCCDWidth`</b>,
+///                  \anchor ListItem_PictureCCDWidth
+///                  _string_,
+///     Shows the width of the CCD in the camera used to take the selected
+///     picture. This is calculated from three EXIF tags (0xA002 * 0xA210
+///     / 0xA20e).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCity`</b>,
+///                  \anchor ListItem_PictureCity
+///                  _string_,
+///     Shows the city where the selected picture was taken. This is the value of
+///     the IPTC City tag (hex code 0x5A).
+///   }
+///   \table_row3{   <b>`ListItem.PictureColour`</b>,
+///                  \anchor ListItem_PictureColour
+///                  _string_,
+///     Shows whether the selected picture is "Colour" or "Black and White".
+///   }
+///   \table_row3{   <b>`ListItem.PictureComment`</b>,
+///                  \anchor ListItem_PictureComment
+///                  _string_,
+///     Shows a description of the selected picture. This is the value of the
+///     EXIF User Comment tag (hex code 0x9286). This is the same value as
+///     \ref Slideshow_SlideComment "Slideshow.SlideComment".
+///   }
+///   \table_row3{   <b>`ListItem.PictureCopyrightNotice`</b>,
+///                  \anchor ListItem_PictureCopyrightNotice
+///                  _string_,
+///     Shows the copyright notice of the selected picture. This is the value of
+///     the IPTC Copyright tag (hex code 0x74).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCountry`</b>,
+///                  \anchor ListItem_PictureCountry
+///                  _string_,
+///     Shows the full name of the country where the selected picture was taken.
+///     This is the value of the IPTC CountryName tag (hex code 0x65).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCountryCode`</b>,
+///                  \anchor ListItem_PictureCountryCode
+///                  _string_,
+///     Shows the country code of the country where the selected picture was
+///     taken. This is the value of the IPTC CountryCode tag (hex code 0x64).
+///   }
+///   \table_row3{   <b>`ListItem.PictureCredit`</b>,
+///                  \anchor ListItem_PictureCredit
+///                  _string_,
+///     Shows who provided the selected picture. This is the value of the IPTC
+///     Credit tag (hex code 0x6E).
+///   }
+///   \table_row3{   <b>`ListItem.PictureDate`</b>,
+///                  \anchor ListItem_PictureDate
+///                  _string_,
+///     Shows the localized date of the selected picture. The short form of the
+///     date is used. The value of the EXIF DateTimeOriginal tag (hex code 0x9003)
+///     is preferred. If the DateTimeOriginal tag is not found\, the value of
+///     DateTimeDigitized (hex code 0x9004) or of DateTime (hex code 0x0132) might
+///     be used.
+///   }
+///   \table_row3{   <b>`ListItem.PictureDatetime`</b>,
+///                  \anchor ListItem_PictureDatetime
+///                  _string_,
+///     Shows the date/timestamp of the selected picture. The localized short form
+///     of the date and time is used. The value of the EXIF DateTimeOriginal tag
+///     (hex code 0x9003) is preferred. If the DateTimeOriginal tag is not found\,
+///     the value of DateTimeDigitized (hex code 0x9004) or of DateTime (hex code
+///     0x0132) might be used.
+///   }
+///   \table_row3{   <b>`ListItem.PictureDesc`</b>,
+///                  \anchor ListItem_PictureDesc
+///                  _string_,
+///     Shows a short description of the selected picture. The SlideComment\,
+///     EXIFComment\, or Caption values might contain a longer description. This
+///     is the value of the EXIF ImageDescription tag (hex code 0x010E).
+///   }
+///   \table_row3{   <b>`ListItem.PictureDigitalZoom`</b>,
+///                  \anchor ListItem_PictureDigitalZoom
+///                  _string_,
+///     Shows the digital zoom ratio when the selected picture was taken. This
+///     is the value of the EXIF DigitalZoomRatio tag (hex code 0xA404).
+///   }
+///   \table_row3{   <b>`ListItem.PictureExpMode`</b>,
+///                  \anchor ListItem_PictureExpMode
+///                  _string_,
+///     Shows the exposure mode of the selected picture. The possible values are
+///     "Automatic"\, "Manual"\, and "Auto bracketing". This is the value of the
+///     EXIF ExposureMode tag (hex code 0xA402).
+///   }
+///   \table_row3{   <b>`ListItem.PictureExposure`</b>,
+///                  \anchor ListItem_PictureExposure
+///                  _string_,
+///     Shows the class of the program used by the camera to set exposure when
+///     the selected picture was taken. Values include "Manual"\, "Program
+///     (Auto)"\, "Aperture priority (Semi-Auto)"\, "Shutter priority (semi-auto)"\,
+///     etc. This is the value of the EXIF ExposureProgram tag (hex code 0x8822).
+///   }
+///   \table_row3{   <b>`ListItem.PictureExposureBias`</b>,
+///                  \anchor ListItem_PictureExposureBias
+///                  _string_,
+///     Shows the exposure bias of the selected picture. Typically this is a
+///     number between -99.99 and 99.99. This is the value of the EXIF
+///     ExposureBiasValue tag (hex code 0x9204).
+///   }
+///   \table_row3{   <b>`ListItem.PictureExpTime`</b>,
+///                  \anchor ListItem_PictureExpTime
+///                  _string_,
+///     Shows the exposure time of the selected picture\, in seconds. This is the
+///     value of the EXIF ExposureTime tag (hex code 0x829A). If the ExposureTime
+///     tag is not found\, the ShutterSpeedValue tag (hex code 0x9201) might be
+///     used.
+///   }
+///   \table_row3{   <b>`ListItem.PictureFlashUsed`</b>,
+///                  \anchor ListItem_PictureFlashUsed
+///                  _string_,
+///     Shows the status of flash when the selected picture was taken. The value
+///     will be either "Yes" or "No"\, and might include additional information.
+///     This is the value of the EXIF Flash tag (hex code 0x9209).
+///   }
+///   \table_row3{   <b>`ListItem.PictureFocalLen`</b>,
+///                  \anchor ListItem_PictureFocalLen
+///                  _string_,
+///     Shows the lens focal length of the selected picture
+///   }
+///   \table_row3{   <b>`ListItem.PictureFocusDist`</b>,
+///                  \anchor ListItem_PictureFocusDist
+///                  _string_,
+///     Shows the focal length of the lens\, in mm. This is the value of the EXIF
+///     FocalLength tag (hex code 0x920A).
+///   }
+///   \table_row3{   <b>`ListItem.PictureGPSLat`</b>,
+///                  \anchor ListItem_PictureGPSLat
+///                  _string_,
+///     Shows the latitude where the selected picture was taken (degrees\,
+///     minutes\, seconds North or South). This is the value of the EXIF
+///     GPSInfo.GPSLatitude and GPSInfo.GPSLatitudeRef tags.
+///   }
+///   \table_row3{   <b>`ListItem.PictureGPSLon`</b>,
+///                  \anchor ListItem_PictureGPSLon
+///                  _string_,
+///     Shows the longitude where the selected picture was taken (degrees\,
+///     minutes\, seconds East or West). This is the value of the EXIF
+///     GPSInfo.GPSLongitude and GPSInfo.GPSLongitudeRef tags.
+///   }
+///   \table_row3{   <b>`ListItem.PictureGPSAlt`</b>,
+///                  \anchor ListItem_PictureGPSAlt
+///                  _string_,
+///     Shows the altitude in meters where the selected picture was taken. This
+///     is the value of the EXIF GPSInfo.GPSAltitude tag.
+///   }
+///   \table_row3{   <b>`ListItem.PictureHeadline`</b>,
+///                  \anchor ListItem_PictureHeadline
+///                  _string_,
+///     Shows a synopsis of the contents of the selected picture. This is the
+///     value of the IPTC Headline tag (hex code 0x69).
+///   }
+///   \table_row3{   <b>`ListItem.PictureImageType`</b>,
+///                  \anchor ListItem_PictureImageType
+///                  _string_,
+///     Shows the color components of the selected picture. This is the value of
+///     the IPTC ImageType tag (hex code 0x82).
+///   }
+///   \table_row3{   <b>`ListItem.PictureIPTCDate`</b>,
+///                  \anchor ListItem_PictureIPTCDate
+///                  _string_,
+///     Shows the date when the intellectual content of the selected picture was
+///     created\, rather than when the picture was created. This is the value of
+///     the IPTC DateCreated tag (hex code 0x37).
+///   }
+///   \table_row3{   <b>`ListItem.PictureIPTCTime`</b>,
+///                  \anchor ListItem_PictureIPTCTime
+///                  _string_,
+///     Shows the time when the intellectual content of the selected picture was
+///     created\, rather than when the picture was created. This is the value of
+///     the IPTC TimeCreated tag (hex code 0x3C).
+///   }
+///   \table_row3{   <b>`ListItem.PictureISO`</b>,
+///                  \anchor ListItem_PictureISO
+///                  _string_,
+///     Shows the ISO speed of the camera when the selected picture was taken.
+///     This is the value of the EXIF ISOSpeedRatings tag (hex code 0x8827).
+///   }
+///   \table_row3{   <b>`ListItem.PictureKeywords`</b>,
+///                  \anchor ListItem_PictureKeywords
+///                  _string_,
+///     Shows keywords assigned to the selected picture. This is the value of
+///     the IPTC Keywords tag (hex code 0x19).
+///   }
+///   \table_row3{   <b>`ListItem.PictureLightSource`</b>,
+///                  \anchor ListItem_PictureLightSource
+///                  _string_,
+///     Shows the kind of light source when the picture was taken. Possible
+///     values include "Daylight"\, "Fluorescent"\, "Incandescent"\, etc. This is
+///     the value of the EXIF LightSource tag (hex code 0x9208).
+///   }
+///   \table_row3{   <b>`ListItem.PictureLongDate`</b>,
+///                  \anchor ListItem_PictureLongDate
+///                  _string_,
+///     Shows only the localized date of the selected picture. The long form of
+///     the date is used. The value of the EXIF DateTimeOriginal tag (hex code
+///     0x9003) is preferred. If the DateTimeOriginal tag is not found\, the
+///     value of DateTimeDigitized (hex code 0x9004) or of DateTime (hex code
+///     0x0132) might be used.
+///   }
+///   \table_row3{   <b>`ListItem.PictureLongDatetime`</b>,
+///                  \anchor ListItem_PictureLongDatetime
+///                  _string_,
+///     Shows the date/timestamp of the selected picture. The localized long
+///     form of the date and time is used. The value of the EXIF DateTimeOriginal
+///     tag (hex code 0x9003) is preferred. if the DateTimeOriginal tag is not
+///     found\, the value of DateTimeDigitized (hex code 0x9004) or of DateTime
+///     (hex code 0x0132) might be used.
+///   }
+///   \table_row3{   <b>`ListItem.PictureMeteringMode`</b>,
+///                  \anchor ListItem_PictureMeteringMode
+///                  _string_,
+///     Shows the metering mode used when the selected picture was taken. The
+///     possible values are "Center weight"\, "Spot"\, or "Matrix". This is the
+///     value of the EXIF MeteringMode tag (hex code 0x9207).
+///   }
+///   \table_row3{   <b>`ListItem.PictureObjectName`</b>,
+///                  \anchor ListItem_PictureObjectName
+///                  _string_,
+///     Shows a shorthand reference for the selected picture. This is the value
+///     of the IPTC ObjectName tag (hex code 0x05).
+///   }
+///   \table_row3{   <b>`ListItem.PictureOrientation`</b>,
+///                  \anchor ListItem_PictureOrientation
+///                  _string_,
+///     Shows the orientation of the selected picture. Possible values are "Top
+///     Left"\, "Top Right"\, "Left Top"\, "Right Bottom"\, etc. This is the value
+///     of the EXIF Orientation tag (hex code 0x0112).
+///   }
+///   \table_row3{   <b>`ListItem.PicturePath`</b>,
+///                  \anchor ListItem_PicturePath
+///                  _string_,
+///     Shows the filename and path of the selected picture
+///   }
+///   \table_row3{   <b>`ListItem.PictureProcess`</b>,
+///                  \anchor ListItem_PictureProcess
+///                  _string_,
+///     Shows the process used to compress the selected picture
+///   }
+///   \table_row3{   <b>`ListItem.PictureReferenceService`</b>,
+///                  \anchor ListItem_PictureReferenceService
+///                  _string_,
+///     Shows the Service Identifier of a prior envelope to which the selected
+///     picture refers. This is the value of the IPTC ReferenceService tag
+///     (hex code 0x2D).
+///   }
+///   \table_row3{   <b>`ListItem.PictureResolution`</b>,
+///                  \anchor ListItem_PictureResolution
+///                  _string_,
+///     Shows the dimensions of the selected picture
+///   }
+///   \table_row3{   <b>`ListItem.PictureSource`</b>,
+///                  \anchor ListItem_PictureSource
+///                  _string_,
+///     Shows the original owner of the selected picture. This is the value of
+///     the IPTC Source tag (hex code 0x73).
+///   }
+///   \table_row3{   <b>`ListItem.PictureSpecialInstructions`</b>,
+///                  \anchor ListItem_PictureSpecialInstructions
+///                  _string_,
+///     Shows other editorial instructions concerning the use of the selected
+///     picture. This is the value of the IPTC SpecialInstructions tag (hex
+///     code 0x28).
+///   }
+///   \table_row3{   <b>`ListItem.PictureState`</b>,
+///                  \anchor ListItem_PictureState
+///                  _string_,
+///     Shows the State/Province where the selected picture was taken. This is
+///     the value of the IPTC ProvinceState tag (hex code 0x5F).
+///   }
+///   \table_row3{   <b>`ListItem.PictureSublocation`</b>,
+///                  \anchor ListItem_PictureSublocation
+///                  _string_,
+///     Shows the location within a city where the selected picture was taken -
+///     might indicate the nearest landmark. This is the value of the IPTC
+///     SubLocation tag (hex code 0x5C).
+///   }
+///   \table_row3{   <b>`ListItem.PictureSupplementalCategories`</b>,
+///                  \anchor ListItem_PictureSupplementalCategories
+///                  _string_,
+///     Shows supplemental category codes to further refine the subject of the
+///     selected picture. This is the value of the IPTC SuppCategory tag (hex
+///     code 0x14).
+///   }
+///   \table_row3{   <b>`ListItem.PictureTransmissionReference`</b>,
+///                  \anchor ListItem_PictureTransmissionReference
+///                  _string_,
+///     Shows a code representing the location of original transmission of the
+///     selected picture. This is the value of the IPTC TransmissionReference
+///     tag (hex code 0x67).
+///   }
+///   \table_row3{   <b>`ListItem.PictureUrgency`</b>,
+///                  \anchor ListItem_PictureUrgency
+///                  _string_,
+///     Shows the urgency of the selected picture. Values are 1-9. The "1" is
+///     most urgent. Some image management programs use urgency to indicate
+///     picture rating\, where urgency "1" is 5 stars and urgency "5" is 1 star.
+///     Urgencies 6-9 are not used for rating. This is the value of the IPTC
+///     Urgency tag (hex code 0x0A).
+///   }
+///   \table_row3{   <b>`ListItem.PictureWhiteBalance`</b>,
+///                  \anchor ListItem_PictureWhiteBalance
+///                  _string_,
+///     Shows the white balance mode set when the selected picture was taken.
+///     The possible values are "Manual" and "Auto". This is the value of the
+///     EXIF WhiteBalance tag (hex code 0xA403).
+///   }
+///   \table_row3{   <b>`ListItem.FileName`</b>,
+///                  \anchor ListItem_FileName
+///                  _string_,
+///     Shows the filename of the currently selected song or movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.Path`</b>,
+///                  \anchor ListItem_Path
+///                  _string_,
+///     Shows the complete path of the currently selected song or movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.FolderName`</b>,
+///                  \anchor ListItem_FolderName
+///                  _string_,
+///     Shows top most folder of the path of the currently selected song or
+///     movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.FolderPath`</b>,
+///                  \anchor ListItem_FolderPath
+///                  _string_,
+///     Shows the complete path of the currently selected song or movie in a
+///     container (without user details).
+///   }
+///   \table_row3{   <b>`ListItem.FileNameAndPath`</b>,
+///                  \anchor ListItem_FileNameAndPath
+///                  _string_,
+///     Shows the full path with filename of the currently selected song or
+///     movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.FileExtension`</b>,
+///                  \anchor ListItem_FileExtension
+///                  _string_,
+///     Shows the file extension (without leading dot) of the currently selected
+///     item in a container
+///   }
+///   \table_row3{   <b>`ListItem.Date`</b>,
+///                  \anchor ListItem_Date
+///                  _string_,
+///     Shows the file date of the currently selected song or movie in a
+///     container / Aired date of an episode / Day\, start time and end time of
+///     current selected TV programme (PVR)
+///   }
+///   \table_row3{   <b>`ListItem.DateAdded`</b>,
+///                  \anchor ListItem_DateAdded
+///                  _string_,
+///     Shows the date the currently selected item was added to the
+///     library / Date and time of an event in the EventLog window.
+///   }
+///   \table_row3{   <b>`ListItem.Size`</b>,
+///                  \anchor ListItem_Size
+///                  _string_,
+///     Shows the file size of the currently selected song or movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.Rating`</b>,
+///                  \anchor ListItem_Rating
+///                  _string_,
+///     Shows the IMDB rating of the currently selected movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.Set`</b>,
+///                  \anchor ListItem_Set
+///                  _string_,
+///     Shows the name of the set the movie is part of
+///   }
+///   \table_row3{   <b>`ListItem.SetId`</b>,
+///                  \anchor ListItem_SetId
+///                  _string_,
+///     Shows the id of the set the movie is part of
+///   }
+///   \table_row3{   <b>`ListItem.UserRating`</b>,
+///                  \anchor ListItem_UserRating
+///                  _string_,
+///     Shows the user rating of the currently selected item in a container
+///   }
+///   \table_row3{   <b>`ListItem.Votes`</b>,
+///                  \anchor ListItem_Votes
+///                  _string_,
+///     Shows the IMDB votes of the currently selected movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.RatingAndVotes`</b>,
+///                  \anchor ListItem_RatingAndVotes
+///                  _string_,
+///     Shows the IMDB rating and votes of the currently selected movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.Mood`</b>,
+///                  \anchor ListItem_Mood
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.Mpaa`</b>,
+///                  \anchor ListItem_Mpaa
+///                  _string_,
+///     Show the MPAA rating of the currently selected movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.ProgramCount`</b>,
+///                  \anchor ListItem_ProgramCount
+///                  _string_,
+///     Shows the number of times an xbe has been run from "my programs"
+///   }
+///   \table_row3{   <b>`ListItem.Duration`</b>,
+///                  \anchor ListItem_Duration
+///                  _string_,
+///     Shows the song or movie duration of the currently selected movie in a
+///     container
+///   }
+///   \table_row3{   <b>`ListItem.DBTYPE`</b>,
+///                  \anchor ListItem_DBTYPE
+///                  _string_,
+///     Shows the database type of the ListItem.DBID for videos (movie\, set\,
+///     genre\, actor\, tvshow\, season\, episode). It does not return any value
+///     for the music library. Beware with season\, the "*all seasons" entry does
+///     give a DBTYPE "season" and a DBID\, but you can't get the details of that
+///     entry since it's a virtual entry in the Video Library.
+///   }
+///   \table_row3{   <b>`ListItem.DBID`</b>,
+///                  \anchor ListItem_DBID
+///                  _string_,
+///     Shows the database id of the currently selected listitem in a container
+///   }
+///   \table_row3{   <b>`ListItem.Cast`</b>,
+///                  \anchor ListItem_Cast
+///                  _string_,
+///     Shows a concatenated string of cast members of the currently selected
+///     movie\, for use in dialogvideoinfo.xml
+///   }
+///   \table_row3{   <b>`ListItem.CastAndRole`</b>,
+///                  \anchor ListItem_CastAndRole
+///                  _string_,
+///     Shows a concatenated string of cast members and roles of the currently
+///     selected movie\, for use in dialogvideoinfo.xml
+///   }
+///   \table_row3{   <b>`ListItem.Studio`</b>,
+///                  \anchor ListItem_Studio
+///                  _string_,
+///     Studio of current selected Music Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.Top250`</b>,
+///                  \anchor ListItem_Top250
+///                  _string_,
+///     Shows the IMDb top250 position of the currently selected listitem in a
+///     container.
+///   }
+///   \table_row3{   <b>`ListItem.Trailer`</b>,
+///                  \anchor ListItem_Trailer
+///                  _string_,
+///     Shows the full trailer path with filename of the currently selected
+///     movie in a container
+///   }
+///   \table_row3{   <b>`ListItem.Writer`</b>,
+///                  \anchor ListItem_Writer
+///                  _string_,
+///     Name of Writer of current Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.Tag`</b>,
+///                  \anchor ListItem_Tag
+///                  _string_,
+///     Summary of current Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.Tagline`</b>,
+///                  \anchor ListItem_Tagline
+///                  _string_,
+///     Small Summary of current Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.PlotOutline`</b>,
+///                  \anchor ListItem_PlotOutline
+///                  _string_,
+///     Small Summary of current Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.Plot`</b>,
+///                  \anchor ListItem_Plot
+///                  _string_,
+///     Complete Text Summary of Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.IMDBNumber`</b>,
+///                  \anchor ListItem_IMDBNumber
+///                  _string_,
+///     The IMDB iD of the selected Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.EpisodeName`</b>,
+///                  \anchor ListItem_EpisodeName
+///                  _string_,
+///     (PVR only) The name of the episode if the selected EPG item is a TV Show
+///   }
+///   \table_row3{   <b>`ListItem.PercentPlayed`</b>,
+///                  \anchor ListItem_PercentPlayed
+///                  _string_,
+///     Returns percentage value [0-100] of how far the selected video has been
+///     played
+///   }
+///   \table_row3{   <b>`ListItem.LastPlayed`</b>,
+///                  \anchor ListItem_LastPlayed
+///                  _string_,
+///     Last play date of Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.PlayCount`</b>,
+///                  \anchor ListItem_PlayCount
+///                  _string_,
+///     Playcount of Video in a container
+///   }
+///   \table_row3{   <b>`ListItem.ChannelNumber`</b>,
+///                  \anchor ListItem_ChannelNumber
+///                  _string_,
+///     Number of current selected TV channel in a container
+///   }
+///   \table_row3{   <b>`ListItem.ChannelName`</b>,
+///                  \anchor ListItem_ChannelName
+///                  _string_,
+///     Name of current selected TV channel in a container
+///   }
+///   \table_row3{   <b>`ListItem.VideoCodec`</b>,
+///                  \anchor ListItem_VideoCodec
+///                  _string_,
+///     Shows the video codec of the currently selected video (common values:
+///     3iv2\, avc1\, div2\, div3\, divx\, divx 4\, dx50\, flv\, h264\, microsoft\, mp42\,
+///     mp43\, mp4v\, mpeg1video\, mpeg2video\, mpg4\, rv40\, svq1\, svq3\,
+///     theora\, vp6f\, wmv2\, wmv3\, wvc1\, xvid)
+///   }
+///   \table_row3{   <b>`ListItem.VideoResolution`</b>,
+///                  \anchor ListItem_VideoResolution
+///                  _string_,
+///     Shows the resolution of the currently selected video (possible values:
+///     480\, 576\, 540\, 720\, 1080\, 4K). Note that 540 usually means a widescreen
+///     format (around 960x540) while 576 means PAL resolutions (normally
+///     720x576)\, therefore 540 is actually better resolution than 576.
+///   }
+///   \table_row3{   <b>`ListItem.VideoAspect`</b>,
+///                  \anchor ListItem_VideoAspect
+///                  _string_,
+///     Shows the aspect ratio of the currently selected video (possible values:
+///     1.33\, 1.37\, 1.66\, 1.78\, 1.85\, 2.20\, 2.35\, 2.40\, 2.55\, 2.76)
+///   }
+///   \table_row3{   <b>`ListItem.AudioCodec`</b>,
+///                  \anchor ListItem_AudioCodec
+///                  _string_,
+///     Shows the audio codec of the currently selected video (common values:
+///     aac\, ac3\, cook\, dca\, dtshd_hra\, dtshd_ma\, eac3\, mp1\, mp2\, mp3\, pcm_s16be\, pcm_s16le\, pcm_u8\, truehd\, vorbis\, wmapro\, wmav2)
+///   }
+///   \table_row3{   <b>`ListItem.AudioChannels`</b>,
+///                  \anchor ListItem_AudioChannels
+///                  _string_,
+///     Shows the number of audio channels of the currently selected video
+///     (possible values: 1\, 2\, 4\, 5\, 6\, 8\, 10)
+///   }
+///   \table_row3{   <b>`ListItem.AudioLanguage`</b>,
+///                  \anchor ListItem_AudioLanguage
+///                  _string_,
+///     Shows the audio language of the currently selected video (returns an
+///     ISO 639-2 three character code\, e.g. eng\, epo\, deu)
+///   }
+///   \table_row3{   <b>`ListItem.SubtitleLanguage`</b>,
+///                  \anchor ListItem_SubtitleLanguage
+///                  _string_,
+///     Shows the subtitle language of the currently selected video (returns an
+///     ISO 639-2 three character code\, e.g. eng\, epo\, deu)
+///   }
+///   \table_row3{   <b>`ListItem.Property(AudioCodec.[n])`</b>,
+///                  \anchor ListItem_Property_AudioCodec
+///                  _string_,
+///     Shows the audio codec of the currently selected video\, 'n' defines the
+///     number of the audiostream (values: see \ref ListItem_AudioCodec "ListItem.AudioCodec")
+///   }
+///   \table_row3{   <b>`ListItem.Property(AudioChannels.[n])`</b>,
+///                  \anchor ListItem_Property_AudioChannels
+///                  _string_,
+///     Shows the number of audio channels of the currently selected video\, 'n'
+///     defines the number of the audiostream (values: see
+///     \ref ListItem_AudioChannels "ListItem.AudioChannels")
+///   }
+///   \table_row3{   <b>`ListItem.Property(AudioLanguage.[n])`</b>,
+///                  \anchor ListItem_Property_AudioLanguage
+///                  _string_,
+///     Shows the audio language of the currently selected video\, 'n' defines
+///     the number of the audiostream (values: see \ref ListItem_AudioLanguage "ListItem.AudioLanguage")
+///   }
+///   \table_row3{   <b>`ListItem.Property(SubtitleLanguage.[n])`</b>,
+///                  \anchor ListItem_Property_SubtitleLanguage
+///                  _string_,
+///     Shows the subtitle language of the currently selected video\, 'n' defines
+///     the number of the subtitle (values: see \ref ListItem_SubtitleLanguage "ListItem.SubtitleLanguage")
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Name)`</b>,
+///                  \anchor ListItem_Property_AddonName
+///                  _string_,
+///     Shows the name of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Version)`</b>,
+///                  \anchor ListItem_Property_AddonVersion
+///                  _string_,
+///     Shows the version of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Summary)`</b>,
+///                  \anchor ListItem_Property_AddonSummary
+///                  _string_,
+///     Shows a short description of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Description)`</b>,
+///                  \anchor ListItem_Property_AddonDescription
+///                  _string_,
+///     Shows the full description of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Type)`</b>,
+///                  \anchor ListItem_Property_AddonType
+///                  _string_,
+///     Shows the type (screensaver\, script\, skin\, etc...) of the currently
+///     selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Creator)`</b>,
+///                  \anchor ListItem_Property_AddonCreator
+///                  _string_,
+///     Shows the name of the author the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Disclaimer)`</b>,
+///                  \anchor ListItem_Property_AddonDisclaimer
+///                  _string_,
+///     Shows the disclaimer of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Changelog)`</b>,
+///                  \anchor ListItem_Property_AddonChangelog
+///                  _string_,
+///     Shows the changelog of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.ID)`</b>,
+///                  \anchor ListItem_Property_AddonID
+///                  _string_,
+///     Shows the identifier of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Status)`</b>,
+///                  \anchor ListItem_Property_AddonStatus
+///                  _string_,
+///     Shows the status of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Broken)`</b>,
+///                  \anchor ListItem_Property_AddonBroken
+///                  _string_,
+///     Shows a message when the addon is marked as broken in the repo
+///   }
+///   \table_row3{   <b>`ListItem.Property(Addon.Path)`</b>,
+///                  \anchor ListItem_Property_AddonPath
+///                  _string_,
+///     Shows the path of the currently selected addon
+///   }
+///   \table_row3{   <b>`ListItem.StartTime`</b>,
+///                  \anchor ListItem_StartTime
+///                  _string_,
+///     Start time of current selected TV programme in a container
+///   }
+///   \table_row3{   <b>`ListItem.EndTime`</b>,
+///                  \anchor ListItem_EndTime
+///                  _string_,
+///     End time of current selected TV programme in a container
+///   }
+///   \table_row3{   <b>`ListItem.StartDate`</b>,
+///                  \anchor ListItem_StartDate
+///                  _string_,
+///     Start date of current selected TV programme in a container
+///   }
+///   \table_row3{   <b>`ListItem.EndDate`</b>,
+///                  \anchor ListItem_EndDate
+///                  _string_,
+///     End date of current selected TV programme in a container
+///   }
+///   \table_row3{   <b>`ListItem.NextTitle`</b>,
+///                  \anchor ListItem_NextTitle
+///                  _string_,
+///     Title of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextGenre`</b>,
+///                  \anchor ListItem_NextGenre
+///                  _string_,
+///     Genre of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextPlot`</b>,
+///                  \anchor ListItem_NextPlot
+///                  _string_,
+///     Plot of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextPlotOutline`</b>,
+///                  \anchor ListItem_NextPlotOutline
+///                  _string_,
+///     Plot outline of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextStartTime`</b>,
+///                  \anchor ListItem_NextStartTime
+///                  _string_,
+///     Start time of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextEndTime`</b>,
+///                  \anchor ListItem_NextEndTime
+///                  _string_,
+///     End of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextStartDate`</b>,
+///                  \anchor ListItem_NextStartDate
+///                  _string_,
+///     Start date of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.NextEndDate`</b>,
+///                  \anchor ListItem_NextEndDate
+///                  _string_,
+///     End date of the next item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.ChannelGroup`</b>,
+///                  \anchor ListItem_ChannelGroup
+///                  _string_,
+///     Channel group of the selected item (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.SubChannelNumber`</b>,
+///                  \anchor ListItem_SubChannelNumber
+///                  _string_,
+///     Subchannel number of the currently selected channel that's currently
+///     playing (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.ChannelNumberLabel`</b>,
+///                  \anchor ListItem_ChannelNumberLabel
+///                  _string_,
+///     Channel and subchannel number of the currently selected channel that's
+///     currently playing (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.Progress`</b>,
+///                  \anchor ListItem_Progress
+///                  _string_,
+///     Part of the programme that's been played (PVR).
+///   }
+///   \table_row3{   <b>`ListItem.StereoscopicMode`</b>,
+///                  \anchor ListItem_StereoscopicMode
+///                  _string_,
+///     Returns the stereomode of the selected video (i.e. mono\,
+///     split_vertical\, split_horizontal\, row_interleaved\,
+///     anaglyph_cyan_red\, anaglyph_green_magenta)
+///   }
+///   \table_row3{   <b>`ListItem.HasTimerSchedule`</b>,
+///                  \anchor ListItem_HasTimerSchedule
+///                  _boolean_,
+///     Whether the item is part of a repeating timer schedule (PVR). (v16 addition)
+///   }
+///   \table_row3{   <b>`ListItem.HasRecording`</b>,
+///                  \anchor ListItem_HasRecording
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.TimerHasError`</b>,
+///                  \anchor ListItem_TimerHasError
+///                  _boolean_,
+///     Whether the item has a timer and it won't be recorded because of an error (PVR). (v17 addition)
+///   }
+///   \table_row3{   <b>`ListItem.TimerHasConflict`</b>,
+///                  \anchor ListItem_TimerHasConflict
+///                  _boolean_,
+///     Whether the item has a timer and it won't be recorded because of a conflict (PVR). (v17 addition)
+///   }
+///   \table_row3{   <b>`ListItem.TimerIsActive`</b>,
+///                  \anchor ListItem_TimerIsActive
+///                  _boolean_,
+///     Whether the item has a timer that will be recorded\, i.e. the timer is enabled (PVR). (v17 addition)
+///   }
+///   \table_row3{   <b>`ListItem.Comment`</b>,
+///                  \anchor ListItem_Comment
+///                  _string_,
+///     Comment assigned to the item (PVR/MUSIC).
+///   }
+///   \table_row3{   <b>`ListItem.TimerType`</b>,
+///                  \anchor ListItem_TimerType
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.EpgEventTitle`</b>,
+///                  \anchor ListItem_EpgEventTitle
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.InProgress`</b>,
+///                  \anchor ListItem_InProgress
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.IsParentFolder`</b>,
+///                  \anchor ListItem_IsParentFolder
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonName`</b>,
+///                  \anchor ListItem_AddonName
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonVersion`</b>,
+///                  \anchor ListItem_AddonVersion
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonCreator`</b>,
+///                  \anchor ListItem_AddonCreator
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonSummary`</b>,
+///                  \anchor ListItem_AddonSummary
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonDescription`</b>,
+///                  \anchor ListItem_AddonDescription
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonDisclaimer`</b>,
+///                  \anchor ListItem_AddonDisclaimer
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonBroken`</b>,
+///                  \anchor ListItem_AddonBroken
+///                  _boolean_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonType`</b>,
+///                  \anchor ListItem_AddonType
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonInstallDate`</b>,
+///                  \anchor ListItem_AddonInstallDate
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonLastUpdated`</b>,
+///                  \anchor ListItem_AddonLastUpdated
+///                  _string_,
+///     Todo
+///   }
+///   \table_row3{   <b>`ListItem.AddonLastUsed`</b>,
+///                  \anchor ListItem_AddonLastUsed
+///                  _string_,
+///     Todo
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap listitem_labels[]= {{ "thumb",            LISTITEM_THUMB },
                                   { "icon",             LISTITEM_ICON },
                                   { "actualicon",       LISTITEM_ACTUAL_ICON },
@@ -662,23 +3801,169 @@
                                   { "addoninstalldate", LISTITEM_ADDON_INSTALL_DATE },
                                   { "addonlastupdated", LISTITEM_ADDON_LAST_UPDATED },
                                   { "addonlastused",    LISTITEM_ADDON_LAST_USED },
+
 };
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Visualisation Visualisation
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Visualisation.Enabled`</b>,
+///                  \anchor Visualisation_Enabled
+///                  _boolean_,
+///     Returns true if any visualisation has been set in settings (so not None).
+///   }
+///   \table_row3{   <b>`Visualisation.HasPresets`</b>,
+///                  \anchor Visualisation_HasPresets
+///                  _boolean_,
+///     Returns true if the visualisation has built in presets.
+///   }
+///   \table_row3{   <b>`Visualisation.Locked`</b>,
+///                  \anchor Visualisation_Locked
+///                  _boolean_,
+///     Returns true if the current visualisation preset is locked (eg in Milkdrop.)
+///   }
+///   \table_row3{   <b>`Visualisation.Preset`</b>,
+///                  \anchor Visualisation_Preset
+///                  _string_,
+///     Shows the current preset of the visualisation.
+///   }
+///   \table_row3{   <b>`Visualisation.Name`</b>,
+///                  \anchor Visualisation_Name
+///                  _string_,
+///     Shows the name of the visualisation.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap visualisation[] =  {{ "locked",           VISUALISATION_LOCKED },
                                   { "preset",           VISUALISATION_PRESET },
                                   { "haspresets",       VISUALISATION_HAS_PRESETS },
                                   { "name",             VISUALISATION_NAME },
                                   { "enabled",          VISUALISATION_ENABLED }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Fanart Fanart
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Fanart.Color1`</b>,
+///                  \anchor Fanart_Color1
+///                  _string_,
+///     Returns the first of three colors included in the currently selected
+///     Fanart theme for the parent TV Show. Colors are arranged Lightest to
+///     Darkest.
+///   }
+///   \table_row3{   <b>`Fanart.Color2`</b>,
+///                  \anchor Fanart_Color2
+///                  _string_,
+///     Returns the second of three colors included in the currently selected
+///     Fanart theme for the parent TV Show. Colors are arranged Lightest to
+///     Darkest.
+///   }
+///   \table_row3{   <b>`Fanart.Color3`</b>,
+///                  \anchor Fanart_Color3
+///                  _string_,
+///     Returns the third of three colors included in the currently selected
+///     Fanart theme for the parent TV Show. Colors are arranged Lightest to
+///     Darkest.
+///   }
+///   \table_row3{   <b>`Fanart.Image`</b>,
+///                  \anchor Fanart_Image
+///                  _string_,
+///     todo
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap fanart_labels[] =  {{ "color1",           FANART_COLOR1 },
                                   { "color2",           FANART_COLOR2 },
                                   { "color3",           FANART_COLOR3 },
                                   { "image",            FANART_IMAGE }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Skin Skin
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Skin.CurrentTheme`</b>,
+///                  \anchor Skin_CurrentTheme
+///                  _boolean_,
+///     todo
+///   }
+///   \table_row3{   <b>`Skin.CurrentColourTheme`</b>,
+///                  \anchor Skin_CurrentColourTheme
+///                  _boolean_,
+///     todo
+///   }
+///   \table_row3{   <b>`Skin.AspectRatio`</b>,
+///                  \anchor Skin_AspectRatio
+///                  _boolean_,
+///     todo
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap skin_labels[] =    {{ "currenttheme",     SKIN_THEME },
                                   { "currentcolourtheme",SKIN_COLOUR_THEME },
                                   {"aspectratio",       SKIN_ASPECT_RATIO}};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Window Window
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Window.IsMedia`</b>,
+///                  \anchor Window_IsMedia
+///                  _boolean_,
+///     Returns true if this window is a media window (programs\, music\, video\,
+///     scripts\, pictures)
+///   }
+///   \table_row3{   <b>`Window.Is(window)`</b>,
+///                  \anchor Window_Is
+///                  _boolean_,
+///     todo
+///   }
+///   \table_row3{   <b>`Window.IsActive(window)`</b>,
+///                  \anchor Window_IsActive
+///                  _boolean_,
+///     Returns true if the window with id or title _window_ is active (excludes
+///     fade out time on dialogs) \ref modules__General__Window_IDs "See here for a list of windows"
+///   }
+///   \table_row3{   <b>`Window.IsTopMost(window)`</b>,
+///                  \anchor Window_IsTopMost
+///                  _boolean_,
+///     Returns true if the window with id or title _window_ is on top of the
+///     window stack (excludes fade out time on dialogs)
+///     \ref modules__General__Window_IDs "See here for a list of windows"
+///   }
+///   \table_row3{   <b>`Window.IsVisible(window)`</b>,
+///                  \anchor Window_IsVisible
+///                  _boolean_,
+///     Returns true if the window is visible (includes fade out time on dialogs)
+///   }
+///   \table_row3{   <b>`Window.Previous(window)`</b>,
+///                  \anchor Window_Previous
+///                  _boolean_,
+///     Returns true if the window with id or title _window_ is being moved from.
+///     \ref modules__General__Window_IDs "See here for a list of windows". Only
+///     valid while windows are changing.
+///   }
+///   \table_row3{   <b>`Window.Next(window)`</b>,
+///                  \anchor Window_Next
+///                  _boolean_,
+///     Returns true if the window with id or title _window_ is being moved to.
+///     \ref modules__General__Window_IDs "See here for a list of windows". Only
+///     valid while windows are changing.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap window_bools[] =   {{ "ismedia",          WINDOW_IS_MEDIA },
                                   { "is",               WINDOW_IS },
                                   { "isactive",         WINDOW_IS_ACTIVE },
@@ -687,11 +3972,88 @@
                                   { "previous",         WINDOW_PREVIOUS },
                                   { "next",             WINDOW_NEXT }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Control Control
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Control.HasFocus(id)`</b>,
+///                  \anchor Control_HasFocus
+///                  _boolean_,
+///     Returns true if the currently focused control has id "id".
+///   }
+///   \table_row3{   <b>`Control.IsVisible(id)`</b>,
+///                  \anchor Control_IsVisible
+///                  _boolean_,
+///     Returns true if the control with id "id" is visible.
+///   }
+///   \table_row3{   <b>`Control.IsEnabled(id)`</b>,
+///                  \anchor Control_IsEnabled
+///                  _boolean_,
+///     Returns true if the control with id "id" is enabled.
+///   }
+///   \table_row3{   <b>`Control.GetLabel(id)[.index()]`</b>,
+///                  \anchor Control_GetLabel
+///                  _string_,
+///     Returns the label value or texture name of the control with the given id.
+///     Optionally you can specify index(1) to retrieve label2 from an Edit
+///     control.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap control_labels[] = {{ "hasfocus",         CONTROL_HAS_FOCUS },
                                   { "isvisible",        CONTROL_IS_VISIBLE },
                                   { "isenabled",        CONTROL_IS_ENABLED },
                                   { "getlabel",         CONTROL_GET_LABEL }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Playlist Playlist
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Playlist.Length(media)`</b>,
+///                  \anchor Playlist_Length
+///                  _integer_,
+///     Total size of the current playlist. optional parameter media is either
+///     video or music.
+///   }
+///   \table_row3{   <b>`Playlist.Position(media)`</b>,
+///                  \anchor Playlist_Position
+///                  _integer_,
+///     Position of the current item in the current playlist. optional parameter
+///     media is either video or music.
+///   }
+///   \table_row3{   <b>`Playlist.Random`</b>,
+///                  \anchor Playlist_Random
+///                  _integer_,
+///     Returns string ID's 590 (Randomize Play Enabled) or 591 (Disabled)
+///   }
+///   \table_row3{   <b>`Playlist.Repeat`</b>,
+///                  \anchor Playlist_Repeat
+///                  _integer_,
+///     Returns string ID's 592 (Repeat One)\, 593 (Repeat All)\, or 594 (Repeat Off)
+///   }
+///   \table_row3{   <b>`Playlist.IsRandom`</b>,
+///                  \anchor Playlist_IsRandom
+///                  _boolean_,
+///     Returns true if the player is in random mode.
+///   }
+///   \table_row3{   <b>`Playlist.IsRepeat`</b>,
+///                  \anchor Playlist_IsRepeat
+///                  _boolean_,
+///     Returns true if the player is in repeat all mode.
+///   }
+///   \table_row3{   <b>`Playlist.IsRepeatOne`</b>,
+///                  \anchor Playlist_IsRepeatOne
+///                  _boolean_,
+///     Returns true if the player is in repeat one mode.
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap playlist[] =       {{ "length",           PLAYLIST_LENGTH },
                                   { "position",         PLAYLIST_POSITION },
                                   { "random",           PLAYLIST_RANDOM },
@@ -700,6 +4062,275 @@
                                   { "isrepeat",         PLAYLIST_ISREPEAT },
                                   { "isrepeatone",      PLAYLIST_ISREPEATONE }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_Pvr Pvr
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Pvr.IsRecording`</b>,
+///                  \anchor Pvr_IsRecording
+///                  _boolean_,
+///     Returns true when the system is recording a tv programme.
+///   }
+///   \table_row3{   <b>`Pvr.HasTimer`</b>,
+///                  \anchor Pvr_HasTimer
+///                  _boolean_,
+///     Returns true when a recording timer is active.
+///   }
+///   \table_row3{   <b>`Pvr.HasTVChannels`</b>,
+///                  \anchor Pvr_HasTVChannels
+///                  _boolean_,
+///     Returns true if there are TV channels available
+///   }
+///   \table_row3{   <b>`Pvr.HasRadioChannels`</b>,
+///                  \anchor Pvr_HasRadioChannels
+///                  _boolean_,
+///     Returns true if there are radio channels available
+///   }
+///   \table_row3{   <b>`Pvr.HasNonRecordingTimer`</b>,
+///                  \anchor Pvr_HasNonRecordingTimer
+///                  _boolean_,
+///     Returns true if there are timers present who currently not do recording
+///   }
+///   \table_row3{   <b>`Pvr.NowRecordingTitle`</b>,
+///                  \anchor Pvr_NowRecordingTitle
+///                  _string_,
+///     Title of the programme being recorded
+///   }
+///   \table_row3{   <b>`Pvr.NowRecordingDateTime`</b>,
+///                  \anchor Pvr_NowRecordingDateTime
+///                  _Date/Time string_,
+///     Start date and time of the current recording
+///   }
+///   \table_row3{   <b>`Pvr.NowRecordingChannel`</b>,
+///                  \anchor Pvr_NowRecordingChannel
+///                  _string_,
+///     Channel number that's being recorded
+///   }
+///   \table_row3{   <b>`Pvr.NowRecordingChannelIcon`</b>,
+///                  \anchor Pvr_NowRecordingChannelIcon
+///                  _path_,
+///     Icon of the current recording channel
+///   }
+///   \table_row3{   <b>`Pvr.NextRecordingTitle`</b>,
+///                  \anchor Pvr_NextRecordingTitle
+///                  _string_,
+///     Title of the next programme that will be recorded
+///   }
+///   \table_row3{   <b>`Pvr.NextRecordingDateTime`</b>,
+///                  \anchor Pvr_NextRecordingDateTime
+///                  _Date/Time string_,
+///     Start date and time of the next recording
+///   }
+///   \table_row3{   <b>`Pvr.NextRecordingChannel`</b>,
+///                  \anchor Pvr_NextRecordingChannel
+///                  _string_,
+///     Channel name of the next recording
+///   }
+///   \table_row3{   <b>`Pvr.NextRecordingChannelIcon`</b>,
+///                  \anchor Pvr_NextRecordingChannelIcon
+///                  _path_,
+///     Icon of the next recording channel
+///   }
+///   \table_row3{   <b>`Pvr.BackendName`</b>,
+///                  \anchor Pvr_BackendName
+///                  _string_,
+///     Name of the backend being used
+///   }
+///   \table_row3{   <b>`Pvr.BackendVersion`</b>,
+///                  \anchor Pvr_BackendVersion
+///                  _string_,
+///     Version of the backend that's being used
+///   }
+///   \table_row3{   <b>`Pvr.BackendHost`</b>,
+///                  \anchor Pvr_BackendHost
+///                  _string_,
+///     Backend hostname
+///   }
+///   \table_row3{   <b>`Pvr.BackendDiskSpace`</b>,
+///                  \anchor Pvr_BackendDiskSpace
+///                  _string_,
+///     Available diskspace on the backend as string with size
+///   }
+///   \table_row3{   <b>`Pvr.BackendDiskSpaceProgr`</b>,
+///                  \anchor Pvr_BackendDiskSpaceProgr
+///                  _integer_,
+///     Available diskspace on the backend as percent value
+///   }
+///   \table_row3{   <b>`Pvr.BackendChannels`</b>,
+///                  \anchor Pvr_BackendChannels
+///                  _string (integer)_,
+///     Number of available channels the backend provides
+///   }
+///   \table_row3{   <b>`Pvr.BackendTimers`</b>,
+///                  \anchor Pvr_BackendTimers
+///                  _string (integer)_,
+///     Number of timers set for the backend
+///   }
+///   \table_row3{   <b>`Pvr.BackendRecordings`</b>,
+///                  \anchor Pvr_BackendRecordings
+///                  _string (integer)_,
+///     Number of recording available on the backend
+///   }
+///   \table_row3{   <b>`Pvr.BackendDeletedRecordings`</b>,
+///                  \anchor Pvr_BackendDeletedRecordings
+///                  _string (integer)_,
+///     Number of deleted recording present on the backend
+///   }
+///   \table_row3{   <b>`Pvr.BackendNumber`</b>,
+///                  \anchor Pvr_BackendNumber
+///                  _string_,
+///     Backend number
+///   }
+///   \table_row3{   <b>`Pvr.HasEpg`</b>,
+///                  \anchor Pvr_HasEpg
+///                  _boolean_,
+///     Returns true when an epg is available.
+///   }
+///   \table_row3{   <b>`Pvr.HasTxt`</b>,
+///                  \anchor Pvr_HasTxt
+///                  _boolean_,
+///     Returns true when teletext is available.
+///   }
+///   \table_row3{   <b>`Pvr.TotalDiscSpace`</b>,
+///                  \anchor Pvr_TotalDiscSpace
+///                  _string_,
+///     Total diskspace available for recordings
+///   }
+///   \table_row3{   <b>`Pvr.NextTimer`</b>,
+///                  \anchor Pvr_NextTimer
+///                  _boolean_,
+///     Next timer date
+///   }
+///   \table_row3{   <b>`Pvr.IsPlayingTv`</b>,
+///                  \anchor Pvr_IsPlayingTv
+///                  _boolean_,
+///     Returns true when live tv is being watched.
+///   }
+///   \table_row3{   <b>`Pvr.IsPlayingRadio`</b>,
+///                  \anchor Pvr_IsPlayingRadio
+///                  _boolean_,
+///     Returns true when live radio is being listened to.
+///   }
+///   \table_row3{   <b>`Pvr.IsPlayingRecording`</b>,
+///                  \anchor Pvr_IsPlayingRecording
+///                  _boolean_,
+///     Returns true when a recording is being watched.
+///   }
+///   \table_row3{   <b>`Pvr.Duration`</b>,
+///                  \anchor Pvr_Duration
+///                  _time string_,
+///     Returns the duration of the currently played title on TV
+///   }
+///   \table_row3{   <b>`Pvr.Time`</b>,
+///                  \anchor Pvr_Time
+///                  _time string_,
+///     Returns the time position of the currently played title on TV
+///   }
+///   \table_row3{   <b>`Pvr.Progress`</b>,
+///                  \anchor Pvr_Progress
+///                  _integer_,
+///     Returns the position of currently played title on TV as integer
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamClient`</b>,
+///                  \anchor Pvr_ActStreamClient
+///                  _string_,
+///     Stream client name
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamDevice`</b>,
+///                  \anchor Pvr_ActStreamDevice
+///                  _string_,
+///     Stream device name
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamStatus`</b>,
+///                  \anchor Pvr_ActStreamStatus
+///                  _string_,
+///     Status of the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamSignal`</b>,
+///                  \anchor Pvr_ActStreamSignal
+///                  _string_,
+///     Signal quality of the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamSnr`</b>,
+///                  \anchor Pvr_ActStreamSnr
+///                  _string_,
+///     Signal to noise ratio of the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamBer`</b>,
+///                  \anchor Pvr_ActStreamBer
+///                  _string_,
+///     Bit error rate of the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamUnc`</b>,
+///                  \anchor Pvr_ActStreamUnc
+///                  _string_,
+///     UNC value of the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamProgrSignal`</b>,
+///                  \anchor Pvr_ActStreamProgrSignal
+///                  _integer_,
+///     Signal quality of the programme
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamProgrSnr`</b>,
+///                  \anchor Pvr_ActStreamProgrSnr
+///                  _integer_,
+///     Signal to noise ratio of the programme
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamIsEncrypted`</b>,
+///                  \anchor Pvr_ActStreamIsEncrypted
+///                  _boolean_,
+///     Returns true when channel is encrypted on source
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamEncryptionName`</b>,
+///                  \anchor Pvr_ActStreamEncryptionName
+///                  _string_,
+///     Encryption used on the stream
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamServiceName`</b>,
+///                  \anchor Pvr_ActStreamServiceName
+///                  _string_,
+///     Returns the service name of played channel if available
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamMux`</b>,
+///                  \anchor Pvr_ActStreamMux
+///                  _string_,
+///     Returns the multiplex type of played channel if available
+///   }
+///   \table_row3{   <b>`Pvr.ActStreamProviderName`</b>,
+///                  \anchor Pvr_ActStreamProviderName
+///                  _string_,
+///     Returns the provider name of the played channel if available
+///   }
+///   \table_row3{   <b>`Pvr.IsTimeShift`</b>,
+///                  \anchor Pvr_IsTimeShift
+///                  _boolean_,
+///     Returns true when for channel is timeshift available
+///   }
+///   \table_row3{   <b>`Pvr.TimeShiftStart`</b>,
+///                  \anchor Pvr_TimeShiftStart
+///                  _time string_,
+///     Start position of the timeshift
+///   }
+///   \table_row3{   <b>`Pvr.TimeShiftEnd`</b>,
+///                  \anchor Pvr_TimeShiftEnd
+///                  _time string_,
+///     End position of the timeshift
+///   }
+///   \table_row3{   <b>`Pvr.TimeShiftCur`</b>,
+///                  \anchor Pvr_TimeShiftCur
+///                  _time string_,
+///     Current position of the timeshift
+///   }
+///   \table_row3{   <b>`Pvr.TimeShiftProgress`</b>,
+///                  \anchor Pvr_TimeShiftProgress
+///                  _integer_,
+///     Returns the position of currently timeshifted title on TV as interger
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap pvr[] =            {{ "isrecording",              PVR_IS_RECORDING },
                                   { "hastimer",                 PVR_HAS_TIMER },
                                   { "hastvchannels",            PVR_HAS_TV_CHANNELS },
@@ -725,7 +4356,6 @@
                                   { "backendnumber",            PVR_BACKEND_NUMBER },
                                   { "hasepg",                   PVR_HAS_EPG },
                                   { "hastxt",                   PVR_HAS_TXT },
-                                  { "hasdirector",              PVR_HAS_DIRECTOR },
                                   { "totaldiscspace",           PVR_TOTAL_DISKSPACE },
                                   { "nexttimer",                PVR_NEXT_TIMER },
                                   { "isplayingtv",              PVR_IS_PLAYING_TV },
@@ -754,6 +4384,81 @@
                                   { "timeshiftcur",             PVR_TIMESHIFT_PLAY_TIME },
                                   { "timeshiftprogress",        PVR_TIMESHIFT_PROGRESS }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_ADSP ADSP
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`ADSP.IsActive`</b>,
+///                  \anchor ADSP_IsActive
+///                  _boolean_,
+///     Returns true if dsp system is enabled
+///   }
+///   \table_row3{   <b>`ADSP.HasInputResample`</b>,
+///                  \anchor ADSP_HasInputResample
+///                  _boolean_,
+///     Returns true if on stream is a input resample is active
+///   }
+///   \table_row3{   <b>`ADSP.HasPreProcess`</b>,
+///                  \anchor ADSP_HasPreProcess
+///                  _boolean_,
+///     Returns true if on stream is a pre process mode active
+///   }
+///   \table_row3{   <b>`ADSP.HasMasterProcess`</b>,
+///                  \anchor ADSP_HasMasterProcess
+///                  _boolean_,
+///     Returns true if on stream is a master process mode available
+///   }
+///   \table_row3{   <b>`ADSP.HasPostProcess`</b>,
+///                  \anchor ADSP_HasPostProcess
+///                  _boolean_,
+///     Returns true if on stream is a post process
+///   }
+///   \table_row3{   <b>`ADSP.HasOutputResample`</b>,
+///                  \anchor ADSP_HasOutputResample
+///                  _boolean_,
+///     Returns true if on stream is a output resample
+///   }
+///   \table_row3{   <b>`ADSP.MasterActive`</b>,
+///                  \anchor ADSP_MasterActive
+///                  _boolean_,
+///     Returns true if on stream is a master mode selected and active
+///   }
+///   \table_row3{   <b>`ADSP.ActiveStreamType`</b>,
+///                  \anchor ADSP_ActiveStreamType
+///                  _string_,
+///     From user wanted and selected stream type\, e.g. music or video
+///   }
+///   \table_row3{   <b>`ADSP.DetectedStreamType`</b>,
+///                  \anchor ADSP_DetectedStreamType
+///                  _string_,
+///     From Kodi detected stream type
+///   }
+///   \table_row3{   <b>`ADSP.MasterName`</b>,
+///                  \anchor ADSP_MasterName
+///                  _string_,
+///     Name of the curently selected and used master dsp mode
+///   }
+///   \table_row3{   <b>`ADSP.MasterInfo`</b>,
+///                  \anchor ADSP_MasterInfo
+///                  _string_,
+///     Continues updated information label of master mode (if available)
+///   }
+///   \table_row3{   <b>`ADSP.MasterOwnIcon`</b>,
+///                  \anchor ADSP_MasterOwnIcon
+///                  _path_,
+///     Icon to use for selected master mode
+///   }
+///   \table_row3{   <b>`ADSP.MasterOverrideIcon`</b>,
+///                  \anchor ADSP_MasterOverrideIcon
+///                  _path_,
+///     Icon to overrite Kodi's codec icon with one of add-on\, e.g. Dolby
+///     Digital EX on Dolby Digital
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap adsp[] =           {{ "isactive",                 ADSP_IS_ACTIVE },
                                   { "hasinputresample",         ADSP_HAS_INPUT_RESAMPLE },
                                   { "haspreprocess",            ADSP_HAS_PRE_PROCESS },
@@ -768,6 +4473,322 @@
                                   { "masterownicon",            ADSP_MASTER_OWN_ICON },
                                   { "masteroverrideicon",       ADSP_MASTER_OVERRIDE_ICON }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_RDS Radio RDS
+/// \note Only be supported on PVR Radio where the related add-on client can
+/// bring it.
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`RDS.HasRds`</b>,
+///                  \anchor RDS_HasRds
+///                  _boolean_,
+///     Returns true if RDS is present
+///   }
+///   \table_row3{   <b>`RDS.HasRadioText`</b>,
+///                  \anchor RDS_HasRadioText
+///                  _boolean_,
+///     Returns true if RDS contains also Radiotext
+///   }
+///   \table_row3{   <b>`RDS.HasRadioTextPlus`</b>,
+///                  \anchor RDS_HasRadioTextPlus
+///                  _boolean_,
+///     Returns true if RDS with Radiotext contains also the plus information
+///   }
+///   \table_row3{   <b>`RDS.HasHotline`</b>,
+///                  \anchor RDS_HasHotline
+///                  _boolean_,
+///     Returns true if a hotline phone number is present\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.HasStudio`</b>,
+///                  \anchor RDS_HasStudio
+///                  _boolean_,
+///     Returns true if a studio name is present\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.AudioLanguage`</b>,
+///                  \anchor RDS_AudioLanguage
+///                  _string_,
+///     The from RDS reported audio language of channel
+///   }
+///   \table_row3{   <b>`RDS.ChannelCountry`</b>,
+///                  \anchor RDS_ChannelCountry
+///                  _string_,
+///     Country where the radio channel is sended
+///   }
+///   \table_row3{   <b>`RDS.GetLine(number)`</b>,
+///                  \anchor RDS_GetLine
+///                  _string_,
+///     Returns the last sended RDS text messages on givern number\, 0 is the
+///     last and 4 rows are supported (0-3)
+///   }
+///   \table_row3{   <b>`RDS.Title`</b>,
+///                  \anchor RDS_Title
+///                  _string_,
+///     Title of item; e.g. track title of an album\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.Artist`</b>,
+///                  \anchor RDS_Artist
+///                  _string_,
+///     A person or band/collective generally considered responsible for the work\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.Band`</b>,
+///                  \anchor RDS_Band
+///                  _string_,
+///     Band/orchestra/accompaniment/musician\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.Composer`</b>,
+///                  \anchor RDS_Composer
+///                  _string_,
+///     Name of the original composer/author\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.Conductor`</b>,
+///                  \anchor RDS_Conductor
+///                  _string_,
+///     The artist(s) who performed the work. In classical music this would be
+///     the conductor\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.Album`</b>,
+///                  \anchor RDS_Album
+///                  _string_,
+///     The collection name to which this track belongs\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.TrackNumber`</b>,
+///                  \anchor RDS_TrackNumber
+///                  _string_,
+///     The track number of the item on the album on which it was originally
+///     released.\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.RadioStyle`</b>,
+///                  \anchor RDS_RadioStyle
+///                  _string_,
+///     The from radio channel used style of currently played part\, is always
+///     updated on changed\, e.g "popmusic" to "news" or "weather"...
+///     | RDS                     | RBDS                    |
+///     |:------------------------|:------------------------|
+///     | none                    | none                    |
+///     | news                    | news                    |
+///     | currentaffairs          | information             |
+///     | information             | sport                   |
+///     | sport                   | talk                    |
+///     | education               | rockmusic               |
+///     | drama                   | classicrockmusic        |
+///     | cultures                | adulthits               |
+///     | science                 | softrock                |
+///     | variedspeech            | top40                   |
+///     | popmusic                | countrymusic            |
+///     | rockmusic               | oldiesmusic             |
+///     | easylistening           | softmusic               |
+///     | lightclassics           | nostalgia               |
+///     | seriousclassics         | jazzmusic               |
+///     | othermusic              | classical               |
+///     | weather                 | randb                   |
+///     | finance                 | softrandb               |
+///     | childrensprogs          | language                |
+///     | socialaffairs           | religiousmusic          |
+///     | religion                | religioustalk           |
+///     | phonein                 | personality             |
+///     | travelandtouring        | public                  |
+///     | leisureandhobby         | college                 |
+///     | jazzmusic               | spanishtalk             |
+///     | countrymusic            | spanishmusic            |
+///     | nationalmusic           | hiphop                  |
+///     | oldiesmusic             |                         |
+///     | folkmusic               |                         |
+///     | documentary             | weather                 |
+///     | alarmtest               | alarmtest               |
+///     | alarm-alarm             | alarm-alarm             |
+///     @note "alarm-alarm" is normally not used from radio stations\, is thought
+///     to inform about horrible messages who are needed asap to all people.
+///   }
+///   \table_row3{   <b>`RDS.Comment`</b>,
+///                  \anchor RDS_Comment
+///                  _string_,
+///     Radio station comment string if available\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoNews`</b>,
+///                  \anchor RDS_InfoNews
+///                  _string_,
+///     Message / headline (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoNewsLocal`</b>,
+///                  \anchor RDS_InfoNewsLocal
+///                  _string_,
+///     Local information news sended from radio channel (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoStock`</b>,
+///                  \anchor RDS_InfoStock
+///                  _string_,
+///     Quote information; either as one part or as several distinct parts:
+///     "name 99latest value 99change 99high 99low 99volume" (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoStockSize`</b>,
+///                  \anchor RDS_InfoStockSize
+///                  _string_,
+///     Number of rows present in stock information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoSport`</b>,
+///                  \anchor RDS_InfoSport
+///                  _string_,
+///     Result of a game; either as one part or as several distinct parts:
+///     "match 99result"\, e.g. "Bayern München : Borussia 995:5"  (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoSportSize`</b>,
+///                  \anchor RDS_InfoSportSize
+///                  _string_,
+///     Number of rows present in sport information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoLottery`</b>,
+///                  \anchor RDS_InfoLottery
+///                  _string_,
+///     Raffle / lottery: "key word 99values" (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoLotterySize`</b>,
+///                  \anchor RDS_InfoLotterySize
+///                  _string_,
+///     Number of rows present in lottery information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoWeather`</b>,
+///                  \anchor RDS_InfoWeather
+///                  _string_,
+///     Weather informations sended from radio channel (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoWeatherSize`</b>,
+///                  \anchor RDS_InfoWeatherSize
+///                  _string_,
+///     Number of rows present in weather information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoCinema`</b>,
+///                  \anchor RDS_InfoCinema
+///                  _string_,
+///     Information about movies in cinema (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoCinemaSize`</b>,
+///                  \anchor RDS_InfoCinemaSize
+///                  _string_,
+///     Number of rows present in cinema information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoHoroscope`</b>,
+///                  \anchor RDS_InfoHoroscope
+///                  _string_,
+///     Horoscope; either as one part or as two distinct parts:
+///     "key word 99text"\, e.g. "sign of the zodiac 99blablabla" (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoHoroscopeSize`</b>,
+///                  \anchor RDS_InfoHoroscopeSize
+///                  _string_,
+///     Number of rows present in horoscope information\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoOther`</b>,
+///                  \anchor RDS_InfoOther
+///                  _string_,
+///     Other information\, not especially specified: "key word 99info" (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.InfoOtherSize`</b>,
+///                  \anchor RDS_InfoOtherSize
+///                  _string_,
+///     Number of rows present with other informations\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.ProgStation`</b>,
+///                  \anchor RDS_ProgStation
+///                  _string_,
+///     Name of the radio channel
+///     @note becomes also be set from epg if from RDS not available
+///   }
+///   \table_row3{   <b>`RDS.ProgNow`</b>,
+///                  \anchor RDS_ProgNow
+///                  _string_,
+///     Now played program name
+///     @note becomes also be set from epg if from RDS not available
+///   }
+///   \table_row3{   <b>`RDS.ProgNext`</b>,
+///                  \anchor RDS_ProgNext
+///                  _string_,
+///     Next played program name (if available)
+///     @note becomes also be set from epg if from RDS not available
+///   }
+///   \table_row3{   <b>`RDS.ProgHost`</b>,
+///                  \anchor RDS_ProgHost
+///                  _string_,
+///     Name of the host of the radio show
+///   }
+///   \table_row3{   <b>`RDS.ProgEditStaff`</b>,
+///                  \anchor RDS_ProgEditStaff
+///                  _string_,
+///     Name of the editorial staff; e.g. name of editorial journalist\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.ProgHomepage`</b>,
+///                  \anchor RDS_ProgHomepage
+///                  _string_,
+///     Link to radio station homepage\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.ProgStyle`</b>,
+///                  \anchor RDS_ProgStyle
+///                  _string_,
+///     Human readable string about radiostyle defined from RDS or RBDS
+///   }
+///   \table_row3{   <b>`RDS.PhoneHotline`</b>,
+///                  \anchor RDS_PhoneHotline
+///                  _string_,
+///     The telephone number of the radio station's hotline\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.PhoneStudio`</b>,
+///                  \anchor RDS_PhoneStudio
+///                  _string_,
+///     The telephone number of the radio station's studio\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.SmsStudio`</b>,
+///                  \anchor RDS_SmsStudio
+///                  _string_,
+///     The sms number of the radio stations studio (to send directly a sms to
+///     the studio) (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.EmailHotline`</b>,
+///                  \anchor RDS_EmailHotline
+///                  _string_,
+///     The email adress of the radio stations hotline (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+///   \table_row3{   <b>`RDS.EmailStudio`</b>,
+///                  \anchor RDS_EmailStudio
+///                  _string_,
+///     The email adress of the radio stations studio (if available)\n
+///     (Only be available on RadiotextPlus)
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
 const infomap rds[] =            {{ "hasrds",                   RDS_HAS_RDS },
                                   { "hasradiotext",             RDS_HAS_RADIOTEXT },
                                   { "hasradiotextplus",         RDS_HAS_RADIOTEXT_PLUS },
@@ -814,11 +4835,42 @@
                                   { "hashotline",               RDS_HAS_HOTLINE_DATA },
                                   { "hasstudio",                RDS_HAS_STUDIO_DATA }};
 
+/// \page modules__General__List_of_gui_access
+/// \section modules__General__List_of_gui_access_slideshow Slideshow
+/// @{
+/// \table_start
+///   \table_h3{ Labels, Type, Description }
+///   \table_row3{   <b>`Slideshow.IsActive`</b>,
+///                  \anchor Slideshow_IsActive
+///                  _boolean_,
+///     Returns true if the picture slideshow is running
+///   }
+///   \table_row3{   <b>`Slideshow.IsPaused`</b>,
+///                  \anchor Slideshow_IsPaused
+///                  _boolean_,
+///     Returns true if the picture slideshow is paused
+///   }
+///   \table_row3{   <b>`Slideshow.IsRandom`</b>,
+///                  \anchor Slideshow_IsRandom
+///                  _boolean_,
+///     Returns true if the picture slideshow is in random mode
+///   }
+///   \table_row3{   <b>`Slideshow.IsVideo`</b>,
+///                  \anchor Slideshow_IsVideo
+///                  _boolean_,
+///     Returns true if the picture slideshow is playing a video
+///   }
+/// \table_end
+/// @}
 const infomap slideshow[] =      {{ "ispaused",         SLIDESHOW_ISPAUSED },
                                   { "isactive",         SLIDESHOW_ISACTIVE },
                                   { "isvideo",          SLIDESHOW_ISVIDEO },
                                   { "israndom",         SLIDESHOW_ISRANDOM }};
 
+// Crazy part, to use tableofcontents must it be on end
+/// \page modules__General__List_of_gui_access
+/// \tableofcontents
+
 const int picture_slide_map[]  = {/* LISTITEM_PICTURE_RESOLUTION => */ SLIDE_RESOLUTION,
                                   /* LISTITEM_PICTURE_LONGDATE   => */ SLIDE_EXIF_LONG_DATE,
                                   /* LISTITEM_PICTURE_LONGDATETIME => */ SLIDE_EXIF_LONG_DATE_TIME,
@@ -950,8 +5002,7 @@
 {
   /* We need to disable caching in INFO::InfoBool::Get if either of the following are true:
    *  1. if condition is between LISTITEM_START and LISTITEM_END
-   *  2. if condition is STRING_IS_EMPTY, STRING_COMPARE, STRING_STR, INTEGER_GREATER_THAN and the
-   *     corresponding label is between LISTITEM_START and LISTITEM_END
+   *  2. if condition is string or integer the corresponding label is between LISTITEM_START and LISTITEM_END
    *  This is achieved by setting the bool pointed at by listItemDependent, either here or in a recursive call
    */
   // trim whitespaces
@@ -971,6 +5022,9 @@
       return SYSTEM_ALWAYS_FALSE;
     else if (cat.name == "true" || cat.name == "yes")
       return SYSTEM_ALWAYS_TRUE;
+
+    // deprecated begin
+    // should be removed before L*** v18
     if (cat.name == "isempty" && cat.num_params() == 1)
       return AddMultiInfo(GUIInfo(STRING_IS_EMPTY, TranslateSingleString(cat.param(), listItemDependent)));
     else if (cat.name == "stringcompare" && cat.num_params() == 2)
@@ -1010,11 +5064,52 @@
       }
       return AddMultiInfo(GUIInfo(STRING_STR, info, compareString));
     }
+    // deprecated end
   }
   else if (info.size() == 2)
   {
     const Property &prop = info[1];
-    if (cat.name == "player")
+    if (cat.name == "string")
+    {
+      if (prop.name == "isempty")
+      {
+        return AddMultiInfo(GUIInfo(STRING_IS_EMPTY, TranslateSingleString(prop.param(), listItemDependent)));
+      }
+      else if (prop.num_params() == 2)
+      {
+        for (size_t i = 0; i < sizeof(string_bools) / sizeof(infomap); i++)
+        {
+          if (prop.name == string_bools[i].str)
+          {
+            int data1 = TranslateSingleString(prop.param(0), listItemDependent);
+            // pipe our original string through the localize parsing then make it lowercase (picks up $LBRACKET etc.)
+            std::string label = CGUIInfoLabel::GetLabel(prop.param(1));
+            StringUtils::ToLower(label);
+            // 'true', 'false', 'yes', 'no' are valid strings, do not resolve them to SYSTEM_ALWAYS_TRUE or SYSTEM_ALWAYS_FALSE
+            if (label != "true" && label != "false" && label != "yes" && label != "no")
+            {
+              int data2 = TranslateSingleString(prop.param(1), listItemDependent);
+              if (data2 > 0)
+                return AddMultiInfo(GUIInfo(string_bools[i].val, data1, -data2));
+            }
+            return AddMultiInfo(GUIInfo(string_bools[i].val, data1, ConditionalStringParameter(label)));
+          }
+        }
+      }
+    }
+    if (cat.name == "integer")
+    {
+      for (size_t i = 0; i < sizeof(integer_bools) / sizeof(infomap); i++)
+      {
+        if (prop.name == integer_bools[i].str)
+        {
+          int data1 = TranslateSingleString(prop.param(0), listItemDependent);
+          int data2 = atoi(prop.param(1).c_str());
+          return AddMultiInfo(GUIInfo(integer_bools[i].val, data1, data2));
+        }
+      }
+    }
+    else if (cat.name == "player")
     {
       for (size_t i = 0; i < sizeof(player_labels) / sizeof(infomap); i++)
       {
@@ -1997,6 +6092,7 @@
       }
       break;
     }
+  case CONTAINER_VIEWCOUNT:
   case CONTAINER_VIEWMODE:
     {
       CGUIWindow *window = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
@@ -2004,7 +6100,12 @@
       {
         const CGUIControl *control = window->GetControl(window->GetViewContainerID());
         if (control && control->IsContainer())
-          strLabel = ((IGUIContainer *)control)->GetLabel();
+        {
+          if (info == CONTAINER_VIEWMODE)
+            strLabel = ((IGUIContainer *)control)->GetLabel();
+          else if (info == CONTAINER_VIEWCOUNT)
+            strLabel = StringUtils::Format("%i", window->GetViewCount());
+        }
       }
       break;
     }
@@ -2032,10 +6133,16 @@
     return GetMultiInfoLabel(GUIInfo(info), contextWindow);
     break;
   case CONTAINER_SHOWPLOT:
+  case CONTAINER_SHOWTITLE:
     {
       CGUIWindow *window = GetWindowWithCondition(contextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
       if (window)
-        return ((CGUIMediaWindow *)window)->CurrentDirectory().GetProperty("showplot").asString();
+      {
+        if (info == CONTAINER_SHOWPLOT)
+          return ((CGUIMediaWindow *)window)->CurrentDirectory().GetProperty("showplot").asString();
+        else if (info == CONTAINER_SHOWTITLE)
+          return ((CGUIMediaWindow *)window)->CurrentDirectory().GetProperty("showtitle").asString();
+      }
     }
     break;
   case CONTAINER_TOTALTIME:
@@ -3033,7 +7140,8 @@
         else
           bReturn = GetImage(info.GetData1(), contextWindow).empty();
         break;
-      case STRING_COMPARE:
+      case STRING_COMPARE: // STRING_COMPARE is deprecated - should be removed before L*** v18
+      case STRING_IS_EQUAL:
         {
           std::string compare;
           if (info.GetData2() < 0) // info labels are stored with negative numbers
@@ -3054,15 +7162,16 @@
             bReturn = StringUtils::EqualsNoCase(GetImage(info.GetData1(), contextWindow), compare);
         }
         break;
+      case INTEGER_IS_EQUAL:
       case INTEGER_GREATER_THAN:
+      case INTEGER_GREATER_OR_EQUAL:
+      case INTEGER_LESS_THAN:
+      case INTEGER_LESS_OR_EQUAL:
         {
           int integer;
-          if (GetInt(integer, info.GetData1(), contextWindow, item))
-            bReturn = integer > info.GetData2();
-          else
+          if (!GetInt(integer, info.GetData1(), contextWindow, item))
           {
             std::string value;
-
             if (item && item->IsFileItem() && info.GetData1() >= LISTITEM_START && info.GetData1() < LISTITEM_END)
               value = GetItemImage((const CFileItem *)item, info.GetData1());
             else
@@ -3070,16 +7179,31 @@
 
             // Handle the case when a value contains time separator (:). This makes IntegerGreaterThan
             // useful for Player.Time* members without adding a separate set of members returning time in seconds
-            if ( value.find_first_of( ':' ) != value.npos )
-              bReturn = StringUtils::TimeStringToSeconds( value ) > info.GetData2();
+            if (value.find_first_of( ':' ) != value.npos)
+              integer = StringUtils::TimeStringToSeconds(value);
             else
-              bReturn = atoi( value.c_str() ) > info.GetData2();
+              integer = atoi(value.c_str());
           }
+
+          // compare
+          if (condition == INTEGER_IS_EQUAL)
+            bReturn = integer == info.GetData2();
+          else if (condition == INTEGER_GREATER_THAN)
+            bReturn = integer > info.GetData2();
+          else if (condition == INTEGER_GREATER_OR_EQUAL)
+            bReturn = integer >= info.GetData2();
+          else if (condition == INTEGER_LESS_THAN)
+            bReturn = integer < info.GetData2();
+          else if (condition == INTEGER_LESS_OR_EQUAL)
+            bReturn = integer <= info.GetData2();
         }
         break;
-      case STRING_STR:
-      case STRING_STR_LEFT:
-      case STRING_STR_RIGHT:
+      case STRING_STR:          // STRING_STR is deprecated - should be removed before L*** v18
+      case STRING_STR_LEFT:     // STRING_STR_LEFT is deprecated - should be removed before L*** v18
+      case STRING_STR_RIGHT:    // STRING_STR_RIGHT is deprecated - should be removed before L*** v18
+      case STRING_STARTS_WITH:
+      case STRING_ENDS_WITH:
+      case STRING_CONTAINS:
         {
           std::string compare = m_stringParameters[info.GetData2()];
           // our compare string is already in lowercase, so lower case our label as well
@@ -3095,9 +7219,9 @@
             label = GetImage(info.GetData1(), contextWindow);
             StringUtils::ToLower(label);
           }
-          if (condition == STRING_STR_LEFT)
+          if (condition == STRING_STR_LEFT || condition == STRING_STARTS_WITH)
             bReturn = StringUtils::StartsWith(label, compare);
-          else if (condition == STRING_STR_RIGHT)
+          else if (condition == STRING_STR_RIGHT || condition == STRING_ENDS_WITH)
             bReturn = StringUtils::EndsWith(label, compare);
           else
             bReturn = label.find(compare) != std::string::npos;
@@ -6121,16 +10245,9 @@
       }
       else if (pItem->HasEPGInfoTag())
       {
-        CEpgInfoTagPtr epgTag = pItem->GetEPGInfoTag();
-
-        // Check if the tag has a currently recording timer associated
-        if (epgTag->HasTimer())
-          return epgTag->Timer()->IsRecording();
-
-        // Search all timers for something that matches the tag
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        if (timer && timer->HasPVRTimerInfoTag())
-          return timer->GetPVRTimerInfoTag()->IsRecording();
+        const CPVRTimerInfoTagPtr timer = pItem->GetEPGInfoTag()->Timer();
+        if (timer)
+          return timer->IsRecording();
       }
     }
     else if (condition == LISTITEM_INPROGRESS)
@@ -6144,45 +10261,42 @@
     else if (condition == LISTITEM_HASTIMER)
     {
       if (pItem->HasEPGInfoTag())
-      {
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        return (timer && timer->HasPVRTimerInfoTag());
-      }
+        return pItem->GetEPGInfoTag()->HasTimer();
     }
     else if (condition == LISTITEM_HASTIMERSCHEDULE)
     {
       if (pItem->HasEPGInfoTag())
       {
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        if (timer && timer->HasPVRTimerInfoTag())
-          return timer->GetPVRTimerInfoTag()->GetTimerRuleId() != PVR_TIMER_NO_PARENT;
+        CPVRTimerInfoTagPtr timer = pItem->GetEPGInfoTag()->Timer();
+        if (timer)
+          return timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT;
       }
     }
     else if (condition == LISTITEM_TIMERISACTIVE)
     {
       if (pItem->HasEPGInfoTag())
       {
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        if (timer && timer->HasPVRTimerInfoTag())
-          return timer->GetPVRTimerInfoTag()->IsActive();
+        CPVRTimerInfoTagPtr timer = pItem->GetEPGInfoTag()->Timer();
+        if (timer)
+          return timer->IsActive();
       }
     }
     else if (condition == LISTITEM_TIMERHASCONFLICT)
     {
       if (pItem->HasEPGInfoTag())
       {
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        if (timer && timer->HasPVRTimerInfoTag())
-          return timer->GetPVRTimerInfoTag()->HasConflict();
+        CPVRTimerInfoTagPtr timer = pItem->GetEPGInfoTag()->Timer();
+        if (timer)
+          return timer->HasConflict();
       }
     }
     else if (condition == LISTITEM_TIMERHASERROR)
     {
       if (pItem->HasEPGInfoTag())
       {
-        CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(pItem);
-        if (timer && timer->HasPVRTimerInfoTag())
-          return (timer->GetPVRTimerInfoTag()->IsBroken() && !timer->GetPVRTimerInfoTag()->HasConflict());
+        CPVRTimerInfoTagPtr timer = pItem->GetEPGInfoTag()->Timer();
+        if (timer)
+          return (timer->IsBroken() && !timer->HasConflict());
       }
     }
     else if (condition == LISTITEM_HASRECORDING)

_service:download_url:master.tar.gz/xbmc/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/ServiceBroker.cpp Added

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (C) 2005-2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ServiceBroker.h"
+#include "Application.h"
+
+ADDON::CAddonMgr &CServiceBroker::GetAddonMgr()
+{
+  return g_application.m_ServiceManager->GetAddonMgr();
+}
+
+ADDON::CBinaryAddonCache &CServiceBroker::GetBinaryAddonCache()
+{
+  return g_application.m_ServiceManager->GetBinaryAddonCache();
+}
+
+ANNOUNCEMENT::CAnnouncementManager &CServiceBroker::GetAnnouncementManager()
+{
+  return g_application.m_ServiceManager->GetAnnouncementManager();
+}
+
+XBPython& CServiceBroker::GetXBPython()
+{
+  return g_application.m_ServiceManager->GetXBPython();
+}
+
+PVR::CPVRManager &CServiceBroker::GetPVRManager()
+{
+  return g_application.m_ServiceManager->GetPVRManager();
+}

_service:download_url:master.tar.gz/xbmc/ServiceBroker.h Added

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (C) 2005-2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+namespace ADDON {
+class CAddonMgr;
+class CBinaryAddonCache;
+}
+
+namespace ANNOUNCEMENT
+{
+  class CAnnouncementManager;
+}
+
+namespace PVR
+{
+  class CPVRManager;
+}
+
+class XBPython;
+
+class CServiceBroker
+{
+public:
+  static ADDON::CAddonMgr &GetAddonMgr();
+  static ADDON::CBinaryAddonCache &GetBinaryAddonCache();
+  static ANNOUNCEMENT::CAnnouncementManager &GetAnnouncementManager();
+  static XBPython &GetXBPython();
+  static PVR::CPVRManager &GetPVRManager();
+};

_service:download_url:master.tar.gz/xbmc/ServiceManager.cpp Added

@@ -0,0 +1,94 @@
+/*
+ *      Copyright (C) 2005-2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ServiceManager.h"
+#include "utils/log.h"
+#include "interfaces/AnnouncementManager.h"
+#include "interfaces/generic/ScriptInvocationManager.h"
+
+bool CServiceManager::Init1()
+{
+  m_announcementManager.reset(new ANNOUNCEMENT::CAnnouncementManager());
+  m_announcementManager->Start();
+
+  m_XBPython.reset(new XBPython());
+  CScriptInvocationManager::GetInstance().RegisterLanguageInvocationHandler(m_XBPython.get(), ".py");
+
+  return true;
+}
+
+bool CServiceManager::Init2()
+{
+  m_addonMgr.reset(new ADDON::CAddonMgr());
+  if (!m_addonMgr->Init())
+  {
+    CLog::Log(LOGFATAL, "CServiceManager::Init: Unable to start CAddonMgr");
+    return false;
+  }
+  
+  m_PVRManager.reset(new PVR::CPVRManager());
+
+  m_binaryAddonCache.reset( new ADDON::CBinaryAddonCache());
+  m_binaryAddonCache->Init();
+
+  return true;
+}
+
+bool CServiceManager::Init3()
+{
+  m_PVRManager->Init();
+
+  return true;
+}
+
+void CServiceManager::Deinit()
+{
+  m_binaryAddonCache.reset();
+  m_PVRManager.reset();
+  m_addonMgr.reset();
+  CScriptInvocationManager::GetInstance().UnregisterLanguageInvocationHandler(m_XBPython.get());
+  m_XBPython.reset();
+  m_announcementManager.reset();
+}
+
+ADDON::CAddonMgr &CServiceManager::GetAddonMgr()
+{
+  return *m_addonMgr.get();
+}
+
+ADDON::CBinaryAddonCache &CServiceManager::GetBinaryAddonCache()
+{
+  return *m_binaryAddonCache.get();
+}
+
+ANNOUNCEMENT::CAnnouncementManager& CServiceManager::GetAnnouncementManager()
+{
+  return *m_announcementManager;
+}
+
+XBPython& CServiceManager::GetXBPython()
+{
+  return *m_XBPython;
+}
+
+PVR::CPVRManager& CServiceManager::GetPVRManager()
+{
+  return *m_PVRManager;
+}

_service:download_url:master.tar.gz/xbmc/ServiceManager.h Added

@@ -0,0 +1,63 @@
+/*
+ *      Copyright (C) 2005-2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include "addons/AddonManager.h"
+#include "addons/BinaryAddonCache.h"
+#include "interfaces/python/XBPython.h"
+#include "pvr/PVRManager.h"
+#include <memory>
+
+namespace ADDON {
+class CAddonMgr;
+class CBinaryAddonCache;
+}
+
+namespace ANNOUNCEMENT
+{
+class CAnnouncementManager;
+}
+
+namespace PVR
+{
+class CPVRManager;
+}
+
+class CServiceManager
+{
+public:
+  bool Init1();
+  bool Init2();
+  bool Init3();
+  void Deinit();
+  ADDON::CAddonMgr& GetAddonMgr();
+  ADDON::CBinaryAddonCache& GetBinaryAddonCache();
+  ANNOUNCEMENT::CAnnouncementManager& GetAnnouncementManager();
+  XBPython& GetXBPython();
+  PVR::CPVRManager& GetPVRManager();
+
+protected:
+  std::unique_ptr<ADDON::CAddonMgr> m_addonMgr;
+  std::unique_ptr<ADDON::CBinaryAddonCache> m_binaryAddonCache;
+  std::unique_ptr<ANNOUNCEMENT::CAnnouncementManager> m_announcementManager;
+  std::unique_ptr<XBPython> m_XBPython;
+  std::unique_ptr<PVR::CPVRManager> m_PVRManager;
+};

_service:download_url:master.tar.gz/xbmc/SystemGlobals.cpp Changed

_service:download_url:master.tar.gz/xbmc/Util.cpp Changed

_service:download_url:master.tar.gz/xbmc/Util.h Changed

_service:download_url:master.tar.gz/xbmc/addons/Addon.cpp Changed

@@ -87,10 +87,12 @@
    {"xbmc.python.module",                ADDON_SCRIPT_MODULE,       24082, "DefaultAddonLibrary.png" },
    {"xbmc.subtitle.module",              ADDON_SUBTITLE_MODULE,     24012, "DefaultAddonSubtitles.png" },
    {"kodi.context.item",                 ADDON_CONTEXT_ITEM,        24025, "DefaultAddonContextItem.png" },
+   {"kodi.game.controller",              ADDON_GAME_CONTROLLER,     35050, "DefaultAddonGame.png" },
    {"xbmc.gui.skin",                     ADDON_SKIN,                  166, "DefaultAddonSkin.png" },
    {"xbmc.webinterface",                 ADDON_WEB_INTERFACE,         199, "DefaultAddonWebSkin.png" },
    {"xbmc.addon.repository",             ADDON_REPOSITORY,          24011, "DefaultAddonRepository.png" },
    {"xbmc.pvrclient",                    ADDON_PVRDLL,              24019, "DefaultAddonPVRClient.png" },
+   {"kodi.peripheral",                   ADDON_PERIPHERALDLL,       35010, "DefaultAddonPeripheral.png" },
    {"xbmc.addon.video",                  ADDON_VIDEO,                1037, "DefaultAddonVideo.png" },
    {"xbmc.addon.audio",                  ADDON_AUDIO,                1038, "DefaultAddonMusic.png" },
    {"xbmc.addon.image",                  ADDON_IMAGE,                1039, "DefaultAddonPicture.png" },

_service:download_url:master.tar.gz/xbmc/addons/AddonBuilder.cpp Changed

@@ -34,7 +34,9 @@
 #include "addons/Visualisation.h"
 #include "addons/Webinterface.h"
 #include "cores/AudioEngine/DSPAddons/ActiveAEDSPAddon.h"
-#include "pvr/addons/PVRClient.h"
+#include "games/controllers/Controller.h"
+#include "peripherals/addons/PeripheralAddon.h"
+#include "addons/PVRClient.h"
 
 
 namespace ADDON
@@ -86,6 +88,7 @@
     case ADDON_AUDIOENCODER:
     case ADDON_AUDIODECODER:
     case ADDON_INPUTSTREAM:
+    case ADDON_PERIPHERALDLL:
     { // begin temporary platform handling for Dlls
       // ideally platforms issues will be handled by C-Pluff
       // this is not an attempt at a solution
@@ -131,8 +134,11 @@
         return CAudioDecoder::FromExtension(std::move(m_props), m_extPoint);
       else if (type == ADDON_INPUTSTREAM)
         return CInputStream::FromExtension(std::move(m_props), m_extPoint);
-      else
-        return std::make_shared<CScreenSaver>(std::move(m_props));;
+      else if (type == ADDON_SCREENSAVER)
+        return std::make_shared<CScreenSaver>(std::move(m_props));
+      else if (type == ADDON_PERIPHERALDLL)
+        return PERIPHERALS::CPeripheralAddon::FromExtension(std::move(m_props), m_extPoint);
+      break;
     }
     case ADDON_SKIN:
       return CSkinInfo::FromExtension(std::move(m_props), m_extPoint);
@@ -146,6 +152,8 @@
       return CRepository::FromExtension(std::move(m_props), m_extPoint);
     case ADDON_CONTEXT_ITEM:
       return CContextMenuAddon::FromExtension(std::move(m_props), m_extPoint);
+    case ADDON_GAME_CONTROLLER:
+      return GAME::CController::FromExtension(std::move(m_props), m_extPoint);
     default:
       break;
   }
@@ -208,6 +216,10 @@
       return AddonPtr(new CContextMenuAddon(std::move(addonProps)));
     case ADDON_INPUTSTREAM:
       return AddonPtr(new CInputStream(std::move(addonProps)));
+    case ADDON_PERIPHERALDLL:
+      return AddonPtr(new PERIPHERALS::CPeripheralAddon(std::move(addonProps), false, false)); // TODO
+    case ADDON_GAME_CONTROLLER:
+      return AddonPtr(new GAME::CController(std::move(addonProps)));
     default:
       break;
   }

_service:download_url:master.tar.gz/xbmc/addons/AddonDatabase.cpp Changed

@@ -49,6 +49,16 @@
   return CDatabase::Open();
 }
 
+int CAddonDatabase::GetMinSchemaVersion() const
+{
+  return 15;
+}
+
+int CAddonDatabase::GetSchemaVersion() const
+{
+  return 23;
+}
+
 void CAddonDatabase::CreateTables()
 {
   CLog::Log(LOGINFO, "create addon table");
@@ -185,9 +195,17 @@
   {
     m_pDS->exec("DROP TABLE system");
   }
+  if (version < 23)
+  {
+    m_pDS->exec("DELETE FROM addon");
+    m_pDS->exec("DELETE FROM addonextra");
+    m_pDS->exec("DELETE FROM dependencies");
+    m_pDS->exec("DELETE FROM addonlinkrepo");
+    m_pDS->exec("DELETE FROM repo");
+  }
 }
 
-void CAddonDatabase::SyncInstalled(const std::set<std::string>& ids)
+void CAddonDatabase::SyncInstalled(const std::set<std::string>& ids, const std::set<std::string>& enabled)
 {
   try
   {
@@ -215,18 +233,23 @@
       CLog::Log(LOGDEBUG, "CAddonDatabase: %s has been uninstalled.", id.c_str());
 
     std::string now = CDateTime::GetCurrentDateTime().GetAsDBDateTime();
-    BeginMultipleExecute();
+    BeginTransaction();
     for (const auto& id : added)
       m_pDS->exec(PrepareSQL("INSERT INTO installed(addonID, enabled, installDate) "
           "VALUES('%s', 0, '%s')", id.c_str(), now.c_str()));
 
     for (const auto& id : removed)
       m_pDS->exec(PrepareSQL("DELETE FROM installed WHERE addonID='%s'", id.c_str()));
-    CommitMultipleExecute();
+
+    for (const auto& id : enabled)
+      m_pDS->exec(PrepareSQL("UPDATE installed SET enabled=1 WHERE addonID='%s'", id.c_str()));
+
+    CommitTransaction();
   }
   catch (...)
   {
     CLog::Log(LOGERROR, "%s failed", __FUNCTION__);
+    RollbackTransaction();
   }
 }
 
@@ -296,14 +319,7 @@
   return false;
 }
 
-int CAddonDatabase::GetAddonId(const ADDON::AddonPtr& item)
-{
-  std::string value = GetSingleValue("addon", "id", StringUtils::Format("name = '%s'", item->Name().c_str()), "id desc");
-  return value.empty() || !StringUtils::IsInteger(value) ? -1 : atoi(value.c_str());
-}
-
-int CAddonDatabase::AddAddon(const AddonPtr& addon,
-                             int idRepo)
+int CAddonDatabase::AddAddon(const AddonPtr& addon, int idRepo)
 {
   try
   {
@@ -902,26 +918,6 @@
                                    addonID.c_str(), reason.c_str()));
 }
 
-bool CAddonDatabase::IsAddonDisabled(const std::string &addonID)
-{
-  try
-  {
-    if (NULL == m_pDB.get()) return false;
-    if (NULL == m_pDS.get()) return false;
-
-    std::string sql = PrepareSQL("SELECT * FROM installed WHERE addonID='%s' AND enabled=0", addonID.c_str());
-    m_pDS->query(sql);
-    bool ret = !m_pDS->eof();
-    m_pDS->close();
-    return ret;
-  }
-  catch (...)
-  {
-    CLog::Log(LOGERROR, "%s failed on addon %s", __FUNCTION__, addonID.c_str());
-  }
-  return false;
-}
-
 bool CAddonDatabase::GetDisabled(std::set<std::string>& addons)
 {
   try

_service:download_url:master.tar.gz/xbmc/addons/AddonDatabase.h Changed

@@ -34,8 +34,6 @@
   virtual ~CAddonDatabase();
   virtual bool Open();
 
-  int GetAddonId(const ADDON::AddonPtr& item);
-  int AddAddon(const ADDON::AddonPtr& item, int idRepo);
   bool GetAddon(const std::string& addonID, ADDON::AddonPtr& addon);
 
   /*! \brief Get an addon with a specific version and repository. */
@@ -84,12 +82,6 @@
    \sa IsAddonDisabled, HasDisabledAddons */
   bool DisableAddon(const std::string &addonID, bool disable = true);
 
-  /*! \brief Check whether an addon has been disabled via DisableAddon.
-   \param addonID id of the addon to check
-   \return true if the addon is disabled, false otherwise
-   \sa DisableAddon, HasDisabledAddons */
-  bool IsAddonDisabled(const std::string &addonID);
-
   /*! \brief Mark an addon as broken
    Sets a flag that this addon has been marked as broken in the repository.
    \param addonID id of the addon to mark as broken
@@ -138,7 +130,7 @@
   /*! Clear internal fields that shouldn't be kept around indefinitely */
   void OnPostUnInstall(const std::string& addonId);
 
-  void SyncInstalled(const std::set<std::string>& ids);
+  void SyncInstalled(const std::set<std::string>& ids, const std::set<std::string>& enabled);
 
   void GetInstalled(std::vector<ADDON::CAddonBuilder>& addons);
 
@@ -150,11 +142,12 @@
   virtual void CreateTables();
   virtual void CreateAnalytics();
   virtual void UpdateTables(int version);
-  virtual int GetMinSchemaVersion() const { return 15; }
-  virtual int GetSchemaVersion() const { return 22; }
+  virtual int GetMinSchemaVersion() const;
+  virtual int GetSchemaVersion() const;
   const char *GetBaseDBName() const { return "Addons"; }
 
   bool GetAddon(int id, ADDON::AddonPtr& addon);
+  int AddAddon(const ADDON::AddonPtr& item, int idRepo);
 
   /* keep in sync with the addon table */
   enum AddonFields

_service:download_url:master.tar.gz/xbmc/addons/AddonDll.h Changed

@@ -67,10 +67,12 @@
     void HandleException(std::exception &e, const char* context);
     bool Initialized() { return m_initialized; }
     virtual bool LoadSettings();
+    static uint32_t GetChildCount() { static uint32_t childCounter = 0; return childCounter++; }
     TheStruct* m_pStruct;
     TheProps*     m_pInfo;
     CAddonInterfaces* m_pHelpers;
     bool m_bIsChild;
+    std::string m_parentLib;
 
   private:
     TheDll* m_pDll;
@@ -100,6 +102,7 @@
   m_pInfo       = NULL;
   m_pHelpers    = NULL;
   m_needsavedsettings = false;
+  m_parentLib.clear();
 }
 
 template<class TheDll, typename TheStruct, typename TheProps>
@@ -113,6 +116,7 @@
   m_pInfo             = rhs.m_pInfo;
   m_pHelpers          = rhs.m_pHelpers;
   m_needsavedsettings = rhs.m_needsavedsettings;
+  m_parentLib = rhs.m_parentLib;
 }
 
 template<class TheDll, typename TheStruct, typename TheProps>
@@ -135,13 +139,28 @@
   }
   else
   {
-    std::string extension = URIUtils::GetExtension(LibPath());
-    strFileName = "special://temp/" + ID() + "-%03d" + extension;
-    strFileName = CUtil::GetNextFilename(strFileName, 100);
+    std::string libPath = LibPath();
+    if (!XFILE::CFile::Exists(libPath))
+    {
+      std::string temp = CSpecialProtocol::TranslatePath("special://xbmc/");
+      std::string tempbin = CSpecialProtocol::TranslatePath("special://xbmcbin/");
+      libPath.erase(0, temp.size());
+      libPath = tempbin + libPath;
+      if (!XFILE::CFile::Exists(libPath))
+      {
+        CLog::Log(LOGERROR, "ADDON: Could not locate %s", m_props.libname.c_str());
+        return false;
+      }
+    }
 
-    if (!XFILE::CFile::Exists(strFileName))
-      XFILE::CFile::Copy(LibPath(), strFileName);
+    std::stringstream childcount;
+    childcount << GetChildCount();
+    std::string extension = URIUtils::GetExtension(libPath);
+    strFileName = "special://temp/" + ID() + "-" + childcount.str() + extension;
+
+    XFILE::CFile::Copy(libPath, strFileName);
 
+    m_parentLib = libPath;
     CLog::Log(LOGNOTICE, "ADDON: Loaded virtual child addon %s", strFileName.c_str());
   }

_service:download_url:master.tar.gz/xbmc/addons/AddonManager.cpp Changed

@@ -53,6 +53,7 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/XBMCTinyXML.h"
+#include "ServiceBroker.h"
 
 #ifdef HAS_VISUALISATION
 #include "Visualisation.h"
@@ -60,9 +61,10 @@
 #ifdef HAS_SCREENSAVER
 #include "ScreenSaver.h"
 #endif
-#ifdef HAS_PVRCLIENTS
-#include "pvr/addons/PVRClient.h"
-#endif
+
+#include "addons/PVRClient.h"
+#include "games/controllers/Controller.h"
+#include "peripherals/addons/PeripheralAddon.h"
 
 using namespace XFILE;
 
@@ -236,8 +238,7 @@
 
 CAddonMgr &CAddonMgr::GetInstance()
 {
-  static CAddonMgr sAddonMgr;
-  return sAddonMgr;
+  return CServiceBroker::GetAddonMgr();
 }
 
 IAddonMgrCallback* CAddonMgr::GetCallbackForType(TYPE type)
@@ -312,7 +313,7 @@
   }
 
   status = m_cpluff->register_logger(m_cp_context, cp_logger,
-      &CAddonMgr::GetInstance(), clog_to_cp(g_advancedSettings.m_logLevel));
+      this, clog_to_cp(g_advancedSettings.m_logLevel));
   if (status != CP_OK)
   {
     CLog::Log(LOGERROR, "ADDONS: Fatal Error, cp_register_logger() returned status: %i", status);
@@ -325,21 +326,18 @@
     return false;
   }
 
-  m_database.Open();
+ if (!m_database.Open())
+   CLog::Log(LOGFATAL, "ADDONS: Failed to open database");
+
   FindAddonsAndNotify();
 
-  //Ensure critical add-ons are installed and enabled
+  //Ensure required add-ons are installed and enabled
   for (const auto& id : m_systemAddons)
   {
     AddonPtr addon;
-    if (!GetAddon(id, addon, ADDON_UNKNOWN, false))
-    {
-      CLog::Log(LOGFATAL, "addon '%s' is missing.", id.c_str());
-      return false;
-    }
-    if (!EnableAddon(id))
+    if (!GetAddon(id, addon, ADDON_UNKNOWN))
     {
-      CLog::Log(LOGFATAL, "addon '%s' could not be enabled.", id.c_str());
+      CLog::Log(LOGFATAL, "addon '%s' not installed or not enabled.", id.c_str());
       return false;
     }
   }
@@ -357,9 +355,9 @@
 
 void CAddonMgr::DeInit()
 {
+  m_cpluff->destroy_context(m_cp_context);
   m_cpluff.reset();
   m_database.Close();
-  m_disabled.clear();
 }
 
 bool CAddonMgr::HasAddons(const TYPE &type)
@@ -468,7 +466,7 @@
 bool CAddonMgr::GetDisabledAddons(VECADDONS& addons, const TYPE& type)
 {
   VECADDONS all;
-  if (CAddonMgr::GetInstance().GetInstalledAddons(all, type))
+  if (GetInstalledAddons(all, type))
   {
     std::copy_if(all.begin(), all.end(), std::back_inserter(addons),
         [this](const AddonPtr& addon){ return IsAddonDisabled(addon->ID()); });
@@ -683,7 +681,7 @@
       for (int i = 0; i < n; ++i)
         installed.insert(cp_addons[i]->identifier);
       m_cpluff->release_info(m_cp_context, cp_addons);
-      m_database.SyncInstalled(installed);
+      m_database.SyncInstalled(installed, m_systemAddons);
     }
 
     // Reload caches
@@ -752,14 +750,30 @@
   return m_updateBlacklist.find(id) != m_updateBlacklist.end();
 }
 
+static void ResolveDependencies(const std::string& addonId, std::vector<std::string>& needed, std::vector<std::string>& missing)
+{
+  if (std::find(needed.begin(), needed.end(), addonId) != needed.end())
+    return;
+
+  AddonPtr addon;
+  if (!CAddonMgr::GetInstance().GetAddon(addonId, addon, ADDON_UNKNOWN, false))
+    missing.push_back(addonId);
+  else
+  {
+    needed.push_back(addonId);
+    for (const auto& dep : addon->GetDeps())
+      if (!dep.second.second) // ignore 'optional'
+        ResolveDependencies(dep.first, needed, missing);
+  }
+}
+
 bool CAddonMgr::DisableAddon(const std::string& id)
 {
   CSingleLock lock(m_critSection);
-  if (m_disabled.find(id) != m_disabled.end())
-    return true; //already disabled
-
   if (!CanAddonBeDisabled(id))
     return false;
+  if (m_disabled.find(id) != m_disabled.end())
+    return true; //already disabled
   if (!m_database.DisableAddon(id))
     return false;
   if (!m_disabled.insert(id).second)
@@ -774,23 +788,34 @@
   return true;
 }
 
-bool CAddonMgr::EnableAddon(const std::string& id)
+bool CAddonMgr::EnableSingle(const std::string& id)
 {
   CSingleLock lock(m_critSection);
   if (m_disabled.find(id) == m_disabled.end())
     return true; //already enabled
-
   if (!m_database.DisableAddon(id, false))
     return false;
-  if (m_disabled.erase(id) == 0)
-    return false;
+  m_disabled.erase(id);
+  ADDON::OnEnabled(id);
 
   AddonPtr addon;
   if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
     CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(addon, 24064)));
 
-  //success
-  ADDON::OnEnabled(id);
+  CLog::Log(LOGDEBUG, "CAddonMgr: enabled %s", addon->ID().c_str());
+  return true;
+}
+
+bool CAddonMgr::EnableAddon(const std::string& id)
+{
+  std::vector<std::string> needed;
+  std::vector<std::string> missing;
+  ResolveDependencies(id, needed, missing);
+  for (const auto& dep : missing)
+    CLog::Log(LOGWARNING, "CAddonMgr: '%s' required by '%s' is missing. Add-on may not function "
+        "correctly", dep.c_str(), id.c_str());
+  for (auto it = needed.rbegin(); it != needed.rend(); ++it)
+    EnableSingle(*it);
   return true;
 }
 
@@ -846,7 +871,7 @@
 
 bool CAddonMgr::CanUninstall(const AddonPtr& addon)
 {
-  return addon && !IsSystemAddon(addon->ID()) &&
+  return addon && CanAddonBeDisabled(addon->ID()) &&
       !StringUtils::StartsWith(addon->Path(), CSpecialProtocol::TranslatePath("special://xbmc/addons"));
 }

_service:download_url:master.tar.gz/xbmc/addons/AddonManager.h Changed

_service:download_url:master.tar.gz/xbmc/addons/BinaryAddonCache.cpp Added

@@ -0,0 +1,84 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "BinaryAddonCache.h"
+#include "AddonManager.h"
+#include "threads/SingleLock.h"
+
+namespace ADDON
+{
+
+CBinaryAddonCache::~CBinaryAddonCache()
+{
+  Deinit();
+}
+
+void CBinaryAddonCache::Init()
+{
+  m_addonsToCache = {ADDON_AUDIODECODER, ADDON_INPUTSTREAM};
+  CAddonMgr::GetInstance().RegisterObserver(this);
+  Update();
+}
+
+void CBinaryAddonCache::Deinit()
+{
+  CAddonMgr::GetInstance().UnregisterObserver(this);
+}
+
+void CBinaryAddonCache::GetAddons(VECADDONS& addons, const TYPE& type)
+{
+  CSingleLock lock(m_critSection);
+  auto it = m_addons.find(type);
+
+  if (it != m_addons.end())
+  {
+    for (auto &addon : it->second)
+    {
+      if (!CAddonMgr::GetInstance().IsAddonDisabled(addon->ID()))
+        addons.push_back(addon);
+    }
+  }
+}
+
+void CBinaryAddonCache::Notify(const Observable &obs, const ObservableMessage msg)
+{
+  Update();
+}
+
+void CBinaryAddonCache::Update()
+{
+  using AddonMap = std::multimap<TYPE, VECADDONS>;
+  AddonMap addonmap;
+  addonmap.clear();
+
+  for (auto &addonType : m_addonsToCache)
+  {
+    VECADDONS addons;
+    CAddonMgr::GetInstance().GetInstalledAddons(addons, addonType);
+    addonmap.insert(AddonMap::value_type(addonType, addons));
+  }
+
+  {
+    CSingleLock lock(m_critSection);
+    m_addons = addonmap;
+  }
+}
+
+}
\ No newline at end of file

_service:download_url:master.tar.gz/xbmc/addons/BinaryAddonCache.h Added

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include "utils/Observer.h"
+#include "Addon.h"
+#include "threads/CriticalSection.h"
+#include <map>
+#include <vector>
+
+namespace ADDON {
+
+class CBinaryAddonCache : public Observer
+{
+public:
+  virtual ~CBinaryAddonCache();
+  void Init();
+  void Deinit();
+  void GetAddons(VECADDONS& addons, const TYPE& type);
+  virtual void Notify(const Observable &obs, const ObservableMessage msg) override;
+
+protected:
+  void Update();
+  
+  CCriticalSection m_critSection;
+  std::multimap<TYPE, VECADDONS> m_addons;
+  std::vector<TYPE> m_addonsToCache;
+};
+
+}
\ No newline at end of file

_service:download_url:master.tar.gz/xbmc/addons/CMakeLists.txt Changed

@@ -1,5 +1,6 @@
 set(SOURCES Addon.cpp
             AddonBuilder.cpp
+            BinaryAddonCache.cpp
             AddonDatabase.cpp
             AddonInstaller.cpp
             AddonManager.cpp
@@ -9,6 +10,7 @@
             AudioDecoder.cpp
             AudioEncoder.cpp
             ContextMenuAddon.cpp
+            ContextMenus.cpp
             GUIDialogAddonInfo.cpp
             GUIDialogAddonSettings.cpp
             GUIViewStateAddonBrowser.cpp
@@ -17,6 +19,7 @@
             InputStream.cpp
             LanguageResource.cpp
             PluginSource.cpp
+            PVRClient.cpp
             Repository.cpp
             RepositoryUpdater.cpp
             Scraper.cpp
@@ -29,6 +32,7 @@
 
 set(HEADERS Addon.h
             AddonBuilder.h
+            BinaryAddonCache.h
             AddonDatabase.h
             AddonDll.h
             AddonInstaller.h
@@ -39,6 +43,7 @@
             AudioDecoder.h
             AudioEncoder.h
             ContextMenuAddon.h
+            ContextMenus.h
             DllAddon.h
             DllAudioDSP.h
             DllLibCPluff.h
@@ -52,6 +57,7 @@
             InputStream.h
             LanguageResource.h
             PluginSource.h
+            PVRClient.h
             Repository.h
             RepositoryUpdater.h
             Resource.h

_service:download_url:master.tar.gz/xbmc/addons/ContextMenuAddon.cpp Changed

@@ -52,7 +52,7 @@
     menuId = ss.str();
   }
 
-  items.push_back(CContextMenuItem::CreateGroup(menuLabel, parent, menuId));
+  items.push_back(CContextMenuItem::CreateGroup(menuLabel, parent, menuId, props.id));
 
   ELEMENTS subMenus;
   if (CAddonMgr::GetInstance().GetExtElements(elem, "menu", subMenus))
@@ -73,7 +73,7 @@
       if (!label.empty() && !library.empty() && !visCondition.empty())
       {
         auto menu = CContextMenuItem::CreateItem(label, menuId,
-            URIUtils::AddFileToFolder(props.path, library), g_infoManager.Register(visCondition, 0));
+            URIUtils::AddFileToFolder(props.path, library), g_infoManager.Register(visCondition, 0), props.id);
         items.push_back(menu);
       }
     }
@@ -111,7 +111,7 @@
 
       CContextMenuItem menuItem = CContextMenuItem::CreateItem(label, parent,
           URIUtils::AddFileToFolder(props.path, props.libname),
-          g_infoManager.Register(visCondition, 0));
+          g_infoManager.Register(visCondition, 0), props.id);
 
       items.push_back(menuItem);
     }
@@ -125,13 +125,9 @@
 {
 }
 
-std::vector<CContextMenuItem> CContextMenuAddon::GetItems()
+std::vector<CContextMenuItem> CContextMenuAddon::GetItems() const
 {
-  //Return a copy which owns `this`
-  std::vector<CContextMenuItem> ret = m_items;
-  for (CContextMenuItem& menuItem : ret)
-    menuItem.m_addon = this->shared_from_this();
-  return ret;
+  return m_items;
 }
 
 }

_service:download_url:master.tar.gz/xbmc/addons/ContextMenuAddon.h Changed

_service:download_url:master.tar.gz/xbmc/addons/ContextMenus.cpp Added

@@ -0,0 +1,64 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenus.h"
+#include "AddonManager.h"
+#include "Repository.h"
+#include "RepositoryUpdater.h"
+#include "GUIDialogAddonInfo.h"
+#include "GUIDialogAddonSettings.h"
+
+
+namespace CONTEXTMENU
+{
+
+using namespace ADDON;
+
+bool CAddonSettings::IsVisible(const CFileItem& item) const
+{
+  AddonPtr addon;
+  return item.HasAddonInfo()
+         && CAddonMgr::GetInstance().GetAddon(item.GetAddonInfo()->ID(), addon, ADDON_UNKNOWN, false)
+         && addon->HasSettings();
+}
+
+bool CAddonSettings::Execute(const CFileItemPtr& item) const
+{
+  AddonPtr addon;
+  return CAddonMgr::GetInstance().GetAddon(item->GetAddonInfo()->ID(), addon, ADDON_UNKNOWN, false)
+         && CGUIDialogAddonSettings::ShowAndGetInput(addon);
+}
+
+bool CCheckForUpdates::IsVisible(const CFileItem& item) const
+{
+  return item.HasAddonInfo() && item.GetAddonInfo()->Type() == ADDON::ADDON_REPOSITORY;
+}
+
+bool CCheckForUpdates::Execute(const CFileItemPtr& item) const
+{
+  AddonPtr addon;
+  if (item->HasAddonInfo() && CAddonMgr::GetInstance().GetAddon(item->GetAddonInfo()->ID(), addon, ADDON_REPOSITORY))
+  {
+    CRepositoryUpdater::GetInstance().CheckForUpdates(std::static_pointer_cast<CRepository>(addon), true);
+    return true;
+  }
+  return false;
+}
+}

_service:download_url:master.tar.gz/xbmc/addons/ContextMenus.h Added

@@ -0,0 +1,52 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenuItem.h"
+#include "FileItem.h"
+#include "GUIDialogAddonInfo.h"
+
+namespace CONTEXTMENU
+{
+
+struct CAddonInfo : CStaticContextMenuAction
+{
+  CAddonInfo() : CStaticContextMenuAction(19033) {}
+  bool IsVisible(const CFileItem& item) const override { return item.HasAddonInfo(); }
+  bool Execute(const CFileItemPtr& item) const override
+  {
+    return CGUIDialogAddonInfo::ShowForItem(item);
+  }
+};
+
+struct CAddonSettings : CStaticContextMenuAction
+{
+  CAddonSettings() : CStaticContextMenuAction(10004) {}
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+};
+
+struct CCheckForUpdates : CStaticContextMenuAction
+{
+  CCheckForUpdates() : CStaticContextMenuAction(24034) {}
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+};
+}

_service:download_url:master.tar.gz/xbmc/addons/DllPeripheral.h Added

@@ -0,0 +1,28 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "DllAddon.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"
+
+class DllPeripheral : public DllAddon<PeripheralAddon, PERIPHERAL_PROPERTIES>
+{
+  // this is populated via Macro calls in DllAddon.h
+};

_service:download_url:master.tar.gz/xbmc/addons/GUIDialogAddonInfo.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/GUIViewStateAddonBrowser.cpp Changed

@@ -33,11 +33,16 @@
 
 CGUIViewStateAddonBrowser::CGUIViewStateAddonBrowser(const CFileItemList& items) : CGUIViewState(items)
 {
-  if (items.IsVirtualDirectoryRoot())
+  if (URIUtils::PathEquals(items.GetPath(), "addons://"))
   {
     AddSortMethod(SortByNone, 551, LABEL_MASKS("%F", "", "%L", ""));
     SetSortMethod(SortByNone);
   }
+  else if (URIUtils::PathEquals(items.GetPath(), "addons://recently_updated/", true))
+  {
+    AddSortMethod(SortByLastUpdated, 12014, LABEL_MASKS("%L", "%v", "%L", "%v"),
+        SortAttributeIgnoreFolders, SortOrderDescending);
+  }
   else
   {
     AddSortMethod(SortByLabel, SortAttributeIgnoreFolders, 551, LABEL_MASKS("%L", "%s", "%L", "%s"));
@@ -67,53 +72,3 @@
 {
   return "";
 }
-
-VECSOURCES& CGUIViewStateAddonBrowser::GetSources()
-{
-  m_sources.clear();
-  {
-    CMediaSource share;
-    share.strPath = "addons://user/";
-    share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-    share.m_strThumbnailImage = "DefaultAddonsInstalled.png";
-    share.strName = g_localizeStrings.Get(24998);
-    m_sources.push_back(share);
-  }
-  if (CAddonMgr::GetInstance().HasAvailableUpdates())
-  {
-    CMediaSource share;
-    share.strPath = "addons://outdated/";
-    share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-    share.m_strThumbnailImage = "DefaultAddonsUpdates.png";
-    share.strName = g_localizeStrings.Get(24043); // "Available updates"
-    m_sources.push_back(share);
-  }
-  if (CAddonMgr::GetInstance().HasAddons(ADDON_REPOSITORY))
-  {
-    CMediaSource share;
-    share.strPath = "addons://repos/";
-    share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-    share.m_strThumbnailImage = "DefaultAddonsRepo.png";
-    share.strName = g_localizeStrings.Get(24033);
-    m_sources.push_back(share);
-  }
-  {
-    CMediaSource share;
-    share.strPath = "addons://install/";
-    share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-    share.m_strThumbnailImage = "DefaultAddonsZip.png";
-    share.strName = g_localizeStrings.Get(24041);
-    m_sources.push_back(share);
-  }
-  {
-    CMediaSource share;
-    share.strPath = "addons://search/";
-    share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-    share.m_strThumbnailImage = "DefaultAddonsSearch.png";
-    share.strName = g_localizeStrings.Get(137);
-    m_sources.push_back(share);
-  }
-
-  return CGUIViewState::GetSources();
-}
-

_service:download_url:master.tar.gz/xbmc/addons/GUIViewStateAddonBrowser.h Changed

_service:download_url:master.tar.gz/xbmc/addons/GUIWindowAddonBrowser.cpp Changed

@@ -77,12 +77,6 @@
     break;
   case GUI_MSG_WINDOW_INIT:
     {
-      m_rootDir.AllowNonLocalSources(false);
-
-      // is this the first time the window is opened?
-      if (m_vecItems->GetPath() == "?" && message.GetStringParam().empty())
-        m_vecItems->SetPath("");
-
       SetProperties();
     }
     break;
@@ -161,55 +155,6 @@
     lastUpdated.GetAsLocalizedDateTime() : g_localizeStrings.Get(21337));
 }
 
-void CGUIWindowAddonBrowser::GetContextButtons(int itemNumber, CContextButtons& buttons)
-{
-  if (itemNumber < 0 || itemNumber >= m_vecItems->Size())
-    return;
-
-  CFileItemPtr pItem = m_vecItems->Get(itemNumber);
-  std::string addonId = pItem->GetProperty("Addon.ID").asString();
-  if (!addonId.empty())
-  {
-    buttons.Add(CONTEXT_BUTTON_INFO, 24003);
-
-    AddonPtr addon;
-    if (CAddonMgr::GetInstance().GetAddon(addonId, addon, ADDON_UNKNOWN, false) && addon->HasSettings())
-      buttons.Add(CONTEXT_BUTTON_SETTINGS, 24020);
-    if (CAddonMgr::GetInstance().GetAddon(addonId, addon, ADDON_REPOSITORY))
-      buttons.Add(CONTEXT_BUTTON_CHECK_FOR_UPDATES, 24034);
-  }
-
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
-}
-
-bool CGUIWindowAddonBrowser::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
-{
-  CFileItemPtr pItem = m_vecItems->Get(itemNumber);
-
-  std::string addonId = pItem->GetProperty("Addon.ID").asString();
-  if (!addonId.empty())
-  {
-    if (button == CONTEXT_BUTTON_INFO)
-    {
-      return CGUIDialogAddonInfo::ShowForItem(pItem);
-    }
-    else if (button == CONTEXT_BUTTON_SETTINGS)
-    {
-      AddonPtr addon;
-      if (CAddonMgr::GetInstance().GetAddon(addonId, addon, ADDON_UNKNOWN, false))
-        return CGUIDialogAddonSettings::ShowAndGetInput(addon);
-    }
-    else if (button == CONTEXT_BUTTON_CHECK_FOR_UPDATES)
-    {
-      AddonPtr addon;
-      if (CAddonMgr::GetInstance().GetAddon(addonId, addon, ADDON_REPOSITORY))
-        CRepositoryUpdater::GetInstance().CheckForUpdates(std::static_pointer_cast<CRepository>(addon), true);
-    }
-  }
-
-  return CGUIMediaWindow::OnContextButton(itemNumber, button);
-}
-
 class UpdateAddons : public IRunnable
 {
   virtual void Run()
@@ -305,70 +250,37 @@
 
 bool CGUIWindowAddonBrowser::GetDirectory(const std::string& strDirectory, CFileItemList& items)
 {
-  bool result;
-  if (URIUtils::PathEquals(strDirectory, "addons://downloading/"))
-  {
-    VECADDONS addons;
-    CAddonInstaller::GetInstance().GetInstallList(addons);
+  bool result = CGUIMediaWindow::GetDirectory(strDirectory, items);
 
-    CURL url(strDirectory);
-    CAddonsDirectory::GenerateAddonListing(url, addons, items, g_localizeStrings.Get(24067));
-    result = true;
-    items.SetPath(strDirectory);
-
-    if (m_guiState.get() && !m_guiState->HideParentDirItems())
-    {
-      CFileItemPtr pItem(new CFileItem(".."));
-      pItem->SetPath(m_history.GetParentPath());
-      pItem->m_bIsFolder = true;
-      pItem->m_bIsShareOrDrive = false;
-      items.AddFront(pItem, 0);
-    }
-
-  }
-  else
+  if (result && CAddonsDirectory::IsRepoDirectory(CURL(strDirectory)))
   {
-    result = CGUIMediaWindow::GetDirectory(strDirectory, items);
-
-    if (result && CAddonsDirectory::IsRepoDirectory(CURL(strDirectory)))
+    if (CSettings::GetInstance().GetBool(CSettings::SETTING_GENERAL_ADDONFOREIGNFILTER))
     {
-      if (CSettings::GetInstance().GetBool(CSettings::SETTING_GENERAL_ADDONFOREIGNFILTER))
+      int i = 0;
+      while (i < items.Size())
       {
-        int i = 0;
-        while (i < items.Size())
-        {
-          auto prop = items[i]->GetProperty("Addon.Language");
-          if (!prop.isNull() && IsForeign(prop.asString()))
-            items.Remove(i);
-          else
-            ++i;
-        }
+        auto prop = items[i]->GetProperty("Addon.Language");
+        if (!prop.isNull() && IsForeign(prop.asString()))
+          items.Remove(i);
+        else
+          ++i;
       }
-      if (CSettings::GetInstance().GetBool(CSettings::SETTING_GENERAL_ADDONBROKENFILTER))
+    }
+    if (CSettings::GetInstance().GetBool(CSettings::SETTING_GENERAL_ADDONBROKENFILTER))
+    {
+      for (int i = items.Size() - 1; i >= 0; i--)
       {
-        for (int i = items.Size() - 1; i >= 0; i--)
+        if (items[i]->GetAddonInfo() && !items[i]->GetAddonInfo()->Broken().empty())
         {
-          if (items[i]->GetAddonInfo() && !items[i]->GetAddonInfo()->Broken().empty())
-          {
-            //check if it's installed
-            AddonPtr addon;
-            if (!CAddonMgr::GetInstance().GetAddon(items[i]->GetProperty("Addon.ID").asString(), addon))
-              items.Remove(i);
-          }
+          //check if it's installed
+          AddonPtr addon;
+          if (!CAddonMgr::GetInstance().GetAddon(items[i]->GetProperty("Addon.ID").asString(), addon))
+            items.Remove(i);
         }
       }
     }
   }
 
-  if (strDirectory.empty() && CAddonInstaller::GetInstance().IsDownloading())
-  {
-    CFileItemPtr item(new CFileItem("addons://downloading/", true));
-    item->SetLabel(g_localizeStrings.Get(24067));
-    item->SetLabelPreformated(true);
-    item->SetIconImage("DefaultNetwork.png");
-    items.Add(item);
-  }
-
   for (int i = 0; i < items.Size(); ++i)
     UpdateStatus(items[i]);

_service:download_url:master.tar.gz/xbmc/addons/GUIWindowAddonBrowser.h Changed

_service:download_url:master.tar.gz/xbmc/addons/IAddon.h Changed

_service:download_url:master.tar.gz/xbmc/addons/InputStream.cpp Changed

@@ -20,11 +20,17 @@
 #include "utils/StringUtils.h"
 #include "utils/log.h"
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
+#include "threads/SingleLock.h"
 #include "utils/RegExp.h"
+#include "utils/URIUtils.h"
 
 namespace ADDON
 {
 
+bool CInputStream::m_hasConfig = false;
+std::vector<std::string> CInputStream::m_pathList;
+CCriticalSection CInputStream::m_parentSection;
+
 std::unique_ptr<CInputStream> CInputStream::FromExtension(AddonProps props, const cp_extension_t* ext)
 {
   std::string listitemprops = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@listitemprops");
@@ -51,50 +57,64 @@
   {
     StringUtils::Trim(ext);
   }
+
+  if (!m_bIsChild && !m_hasConfig)
+    UpdateConfig();
 }
 
-bool CInputStream::Supports(CFileItem &fileitem)
+void CInputStream::SaveSettings()
 {
-  std::string extension = URIUtils::GetExtension(fileitem.GetPath());
-  bool match = false;
-  for (auto &ext : m_extensionsList)
-  {
-    if (ext == extension)
-    {
-      match = true;
-      break;
-    }
-  }
-  if (!match)
-    return false;
-
-  if (!m_pStruct)
-    return true;
+  CAddon::SaveSettings();
+  if (!m_bIsChild)
+    UpdateConfig();
+}
 
+void CInputStream::UpdateConfig()
+{
   std::string pathList;
+  Create();
   try
   {
     pathList = m_pStruct->GetPathList();
   }
   catch (std::exception &e)
   {
-    return false;
+    CLog::Log(LOGERROR, "CInputStream::Supports - could not get a list of paths. Reason: %s", e.what());
   }
+  Destroy();
 
+  CSingleLock lock(m_parentSection);
   m_pathList = StringUtils::Tokenize(pathList, "|");
   for (auto &path : m_pathList)
   {
     StringUtils::Trim(path);
   }
+  m_hasConfig = true;
+}
+
+bool CInputStream::Supports(CFileItem &fileitem)
+{
+  // check if a specific inputstream addon is requested
+  CVariant addon = fileitem.GetProperty("inputstreamaddon");
+  if (!addon.isNull())
+  {
+    if (addon.asString() != ID())
+      return false;
+    else
+      return true;
+  }
+
+  // check paths
+  CSingleLock lock(m_parentSection);
 
-  match = false;
+  bool match = false;
   for (auto &path : m_pathList)
   {
     if (path.empty())
       continue;
 
     CRegExp r(true, CRegExp::asciiOnly, path.c_str());
-    if (r.RegFind(path.c_str()) == 0 && r.GetFindLen() > 5)
+    if (r.RegFind(fileitem.GetPath().c_str()) == 0 && r.GetFindLen() > 5)
     {
       match = true;
       break;
@@ -106,18 +126,28 @@
 bool CInputStream::Open(CFileItem &fileitem)
 {
   INPUTSTREAM props;
-  props.m_nCountInfoValues = 0;
-  std::vector<std::string> values;
+  std::map<std::string, std::string> propsMap;
   for (auto &key : m_fileItemProps)
   {
     if (fileitem.GetProperty(key).isNull())
       continue;
-    props.m_ListItemProperties[props.m_nCountInfoValues].m_strKey = key.c_str();
-    values.push_back(fileitem.GetProperty(key).asString());
-    props.m_ListItemProperties[props.m_nCountInfoValues].m_strValue = values.back().c_str();
+    propsMap[key] = fileitem.GetProperty(key).asString();
+  }
+
+  props.m_nCountInfoValues = 0;
+  for (auto &pair : propsMap)
+  {
+    props.m_ListItemProperties[props.m_nCountInfoValues].m_strKey = pair.first.c_str();
+    props.m_ListItemProperties[props.m_nCountInfoValues].m_strValue = pair.second.c_str();
     props.m_nCountInfoValues++;
   }
+
   props.m_strURL = fileitem.GetPath().c_str();
+  
+  std::string libFolder = URIUtils::GetDirectory(m_parentLib);
+  std::string profileFolder = CSpecialProtocol::TranslatePath(Profile());
+  props.m_libFolder = libFolder.c_str();
+  props.m_profileFolder = profileFolder.c_str();
 
   bool ret = false;
   try
@@ -128,7 +158,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::Open - could not open stream");
+    CLog::Log(LOGERROR, "CInputStream::Open - could not open stream. Reason: %s", e.what());
     return false;
   }
 
@@ -144,7 +174,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::Close - could not close stream");
+    CLog::Log(LOGERROR, "CInputStream::Close - could not close stream. Reason: %s", e.what());
   }
 }
 
@@ -158,7 +188,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::GetTotalTime - error");
+    CLog::Log(LOGERROR, "CInputStream::GetTotalTime - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -172,7 +202,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::GetTime - error");;
+    CLog::Log(LOGERROR, "CInputStream::GetTime - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -187,7 +217,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::PosTime - error");;
+    CLog::Log(LOGERROR, "CInputStream::PosTime - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -205,7 +235,7 @@
   catch (std::exception &e)
   {
     DisposeStreams();
-    CLog::Log(LOGERROR, "CInputStream::UpdateStreams - error GetStreamIds");
+    CLog::Log(LOGERROR, "CInputStream::UpdateStreams - error GetStreamIds. Reason: %s", e.what());
     return;
   }
 
@@ -225,7 +255,7 @@
     catch (std::exception &e)
     {
       DisposeStreams();
-      CLog::Log(LOGERROR, "CInputStream::GetTotalTime - error GetStream");
+      CLog::Log(LOGERROR, "CInputStream::GetTotalTime - error GetStream. Reason: %s", e.what());
       return;
     }
 
@@ -337,7 +367,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::EnableStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::EnableStream - error. Reason: %s", e.what());
   }
 }
 
@@ -353,7 +383,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::EnableStreamAtPTS - error");;
+    CLog::Log(LOGERROR, "CInputStream::EnableStreamAtPTS - error. Reason: %s", e.what());
   }
 }
 
@@ -366,7 +396,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::ReadDemux - error");
+    CLog::Log(LOGERROR, "CInputStream::ReadDemux - error. Reason: %s", e.what());
     return nullptr;
   }
 
@@ -395,7 +425,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::SeekTime - error");;
+    CLog::Log(LOGERROR, "CInputStream::SeekTime - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -408,7 +438,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::AbortDemux - error");;
+    CLog::Log(LOGERROR, "CInputStream::AbortDemux - error. Reason: %s", e.what());
   }
 }
 
@@ -420,7 +450,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::FlushDemux - error");;
+    CLog::Log(LOGERROR, "CInputStream::FlushDemux - error. Reason: %s", e.what());
   }
 }
 
@@ -432,7 +462,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::SetSpeed - error");;
+    CLog::Log(LOGERROR, "CInputStream::SetSpeed - error. Reason: %s", e.what());
   }
 }
 
@@ -445,7 +475,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::ReadStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::ReadStream - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -459,7 +489,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::SeekStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::SeekStream - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -473,7 +503,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::PositionStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::PositionStream - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -487,7 +517,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::LengthStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::LengthStream - error. Reason: %s", e.what());
   }
   return ret;
 }
@@ -500,7 +530,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::PauseStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::PauseStream - error. Reason: %s", e.what());
   }
 }
 
@@ -513,7 +543,7 @@
   }
   catch (std::exception &e)
   {
-    CLog::Log(LOGERROR, "CInputStream::IsRealTimeStream - error");;
+    CLog::Log(LOGERROR, "CInputStream::IsRealTimeStream - error. Reason: %s", e.what());
   }
   return ret;
 }

_service:download_url:master.tar.gz/xbmc/addons/InputStream.h Changed

@@ -21,6 +21,7 @@
 #include "AddonDll.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h"
 #include "FileItem.h"
+#include "threads/CriticalSection.h"
 #include <vector>
 #include <map>
 
@@ -44,6 +45,8 @@
     CInputStream(AddonProps props, std::string name, std::string listitemprops, std::string extensions);
     virtual ~CInputStream() {}
 
+    virtual void SaveSettings() override;
+
     bool Supports(CFileItem &fileitem);
     bool Open(CFileItem &fileitem);
     void Close();
@@ -85,12 +88,16 @@
   protected:
     void UpdateStreams();
     void DisposeStreams();
+    void UpdateConfig();
 
     std::vector<std::string> m_fileItemProps;
-    std::vector<std::string> m_pathList;
     std::vector<std::string> m_extensionsList;
     INPUTSTREAM_CAPABILITIES m_caps;
     std::map<int, CDemuxStream*> m_streams;
+
+    static CCriticalSection m_parentSection;
+    static bool m_hasConfig;
+    static std::vector<std::string> m_pathList;
   };
 
 } /*namespace ADDON*/

_service:download_url:master.tar.gz/xbmc/addons/Makefile Changed

_service:download_url:master.tar.gz/xbmc/addons/PVRClient.cpp Added

@@ -0,0 +1,2028 @@
+/*
+ *      Copyright (C) 2012-2015 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Kodi; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "Application.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h"
+#include "epg/Epg.h"
+#include "messaging/ApplicationMessenger.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "settings/AdvancedSettings.h"
+#include "settings/Settings.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+#include "utils/Variant.h"
+
+#include "pvr/PVRManager.h"
+#include "pvr/addons/PVRClients.h"
+#include "pvr/channels/PVRChannelGroupsContainer.h"
+#include "pvr/recordings/PVRRecordings.h"
+#include "pvr/timers/PVRTimers.h"
+#include "pvr/timers/PVRTimerInfoTag.h"
+#include "pvr/timers/PVRTimerType.h"
+
+#include "PVRClient.h"
+
+#include <assert.h>
+#include <memory>
+#include <algorithm>
+
+using namespace ADDON;
+using namespace PVR;
+using namespace EPG;
+using namespace KODI::MESSAGING;
+
+using KODI::MESSAGING::HELPERS::DialogResponse;
+
+#define DEFAULT_INFO_STRING_VALUE "unknown"
+
+std::unique_ptr<CPVRClient> CPVRClient::FromExtension(AddonProps props, const cp_extension_t* ext)
+{
+  std::string strAvahiType = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_type");
+  std::string strAvahiIpSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_ip_setting");
+  std::string strAvahiPortSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_port_setting");
+  bool bNeedsConfiguration = !(CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@needs_configuration") == "false");
+  return std::unique_ptr<CPVRClient>(new CPVRClient(std::move(props), strAvahiType,
+      strAvahiIpSetting, strAvahiPortSetting, bNeedsConfiguration));
+}
+
+CPVRClient::CPVRClient(AddonProps props)
+  : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
+    m_bNeedsConfiguration(false),
+    m_apiVersion("0.0.0"),
+    m_bAvahiServiceAdded(false)
+{
+  ResetProperties();
+}
+
+CPVRClient::CPVRClient(AddonProps props, const std::string& strAvahiType, const std::string& strAvahiIpSetting,
+    const std::string& strAvahiPortSetting, bool bNeedsConfiguration)
+  : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
+    m_strAvahiType(strAvahiType),
+    m_strAvahiIpSetting(strAvahiIpSetting),
+    m_strAvahiPortSetting(strAvahiPortSetting),
+    m_bNeedsConfiguration(bNeedsConfiguration),
+    m_apiVersion("0.0.0"),
+    m_bAvahiServiceAdded(false)
+{
+  ResetProperties();
+}
+
+CPVRClient::~CPVRClient(void)
+{
+  if (m_bAvahiServiceAdded)
+    CZeroconfBrowser::GetInstance()->RemoveServiceType(m_strAvahiType);
+  Destroy();
+  SAFE_DELETE(m_pInfo);
+}
+
+void CPVRClient::OnDisabled()
+{
+  CAddon::OnDisabled();
+  CPVRManager::GetInstance().Clients()->UpdateAddons();
+}
+
+void CPVRClient::OnEnabled()
+{
+  CAddon::OnEnabled();
+  CPVRManager::GetInstance().Clients()->UpdateAddons();
+}
+
+void CPVRClient::SaveSettings()
+{
+  CAddon::SaveSettings();
+  ReCreate();
+  CPVRManager::GetInstance().Clients()->UpdateAddons();
+}
+
+void CPVRClient::OnPostInstall(bool update, bool modal)
+{
+  CAddon::OnPostInstall(update, modal);
+  CPVRManager::GetInstance().Clients()->UpdateAddons();
+}
+
+void CPVRClient::OnPreUnInstall()
+{
+  // stop the pvr manager, so running pvr add-ons are stopped and closed
+  PVR::CPVRManager::GetInstance().Stop();
+  CAddon::OnPreUnInstall();
+}
+
+void CPVRClient::OnPostUnInstall()
+{
+  CAddon::OnPostUnInstall();
+  CPVRManager::GetInstance().Clients()->UpdateAddons();
+}
+
+void CPVRClient::ResetProperties(int iClientId /* = PVR_INVALID_CLIENT_ID */)
+{
+  /* initialise members */
+  SAFE_DELETE(m_pInfo);
+  m_pInfo = new PVR_PROPERTIES;
+  m_strUserPath           = CSpecialProtocol::TranslatePath(Profile());
+  m_pInfo->strUserPath    = m_strUserPath.c_str();
+  m_strClientPath         = CSpecialProtocol::TranslatePath(Path());
+  m_pInfo->strClientPath  = m_strClientPath.c_str();
+  m_pInfo->iEpgMaxDays    = CSettings::GetInstance().GetInt(CSettings::SETTING_EPG_DAYSTODISPLAY);
+  m_menuhooks.clear();
+  m_timertypes.clear();
+  m_bReadyToUse           = false;
+  m_connectionState       = PVR_CONNECTION_STATE_UNKNOWN;
+  m_prevConnectionState   = PVR_CONNECTION_STATE_UNKNOWN;
+  m_ignoreClient          = false;
+  m_iClientId             = iClientId;
+  m_strBackendVersion     = DEFAULT_INFO_STRING_VALUE;
+  m_strConnectionString   = DEFAULT_INFO_STRING_VALUE;
+  m_strFriendlyName       = DEFAULT_INFO_STRING_VALUE;
+  m_strBackendName        = DEFAULT_INFO_STRING_VALUE;
+  m_strBackendHostname.clear();
+  m_bIsPlayingTV          = false;
+  m_bIsPlayingRecording   = false;
+  memset(&m_addonCapabilities, 0, sizeof(m_addonCapabilities));
+  m_apiVersion = AddonVersion("0.0.0");
+}
+
+ADDON_STATUS CPVRClient::Create(int iClientId)
+{
+  ADDON_STATUS status(ADDON_STATUS_UNKNOWN);
+  if (iClientId <= PVR_INVALID_CLIENT_ID)
+    return status;
+
+  /* reset all properties to defaults */
+  ResetProperties(iClientId);
+
+  /* initialise the add-on */
+  bool bReadyToUse(false);
+  CLog::Log(LOGDEBUG, "PVR - %s - creating PVR add-on instance '%s'", __FUNCTION__, Name().c_str());
+  try
+  {
+    if ((status = CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::Create()) == ADDON_STATUS_OK)
+      bReadyToUse = GetAddonProperties();
+  }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  m_bReadyToUse = bReadyToUse;
+  return status;
+}
+
+bool CPVRClient::DllLoaded(void) const
+{
+  try { return CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::DllLoaded(); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  return false;
+}
+
+void CPVRClient::Destroy(void)
+{
+  if (!m_bReadyToUse)
+    return;
+  m_bReadyToUse = false;
+
+  /* reset 'ready to use' to false */
+  CLog::Log(LOGDEBUG, "PVR - %s - destroying PVR add-on '%s'", __FUNCTION__, GetFriendlyName().c_str());
+
+  /* destroy the add-on */
+  try { CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::Destroy(); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  /* reset all properties to defaults */
+  ResetProperties();
+}
+
+void CPVRClient::ReCreate(void)
+{
+  int iClientID(m_iClientId);
+  Destroy();
+
+  /* recreate the instance */
+  Create(iClientID);
+}
+
+bool CPVRClient::ReadyToUse(void) const
+{
+  return m_bReadyToUse;
+}
+
+PVR_CONNECTION_STATE CPVRClient::GetConnectionState(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_connectionState;
+}
+
+void CPVRClient::SetConnectionState(PVR_CONNECTION_STATE state)
+{
+  CSingleLock lock(m_critSection);
+
+  m_prevConnectionState = m_connectionState;
+  m_connectionState = state;
+
+  if (m_connectionState == PVR_CONNECTION_STATE_CONNECTED)
+    m_ignoreClient = false;
+  else if (m_connectionState == PVR_CONNECTION_STATE_CONNECTING &&
+           m_prevConnectionState == PVR_CONNECTION_STATE_UNKNOWN)
+    m_ignoreClient = true;
+}
+
+PVR_CONNECTION_STATE CPVRClient::GetPreviousConnectionState(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_prevConnectionState;
+}
+
+bool CPVRClient::IgnoreClient(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_ignoreClient;
+}
+
+int CPVRClient::GetID(void) const
+{
+  return m_iClientId;
+}
+
+/*!
+ * @brief Copy over group info from xbmcGroup to addonGroup.
+ * @param xbmcGroup The group on XBMC's side.
+ * @param addonGroup The group on the addon's side.
+ */
+void CPVRClient::WriteClientGroupInfo(const CPVRChannelGroup &xbmcGroup, PVR_CHANNEL_GROUP &addonGroup)
+{
+  memset(&addonGroup, 0, sizeof(addonGroup));
+
+  addonGroup.bIsRadio     = xbmcGroup.IsRadio();
+  strncpy(addonGroup.strGroupName, xbmcGroup.GroupName().c_str(), sizeof(addonGroup.strGroupName) - 1);
+}
+
+/*!
+ * @brief Copy over recording info from xbmcRecording to addonRecording.
+ * @param xbmcRecording The recording on XBMC's side.
+ * @param addonRecording The recording on the addon's side.
+ */
+void CPVRClient::WriteClientRecordingInfo(const CPVRRecording &xbmcRecording, PVR_RECORDING &addonRecording)
+{
+  time_t recTime;
+  xbmcRecording.RecordingTimeAsUTC().GetAsTime(recTime);
+
+  memset(&addonRecording, 0, sizeof(addonRecording));
+
+  addonRecording.recordingTime       = recTime - g_advancedSettings.m_iPVRTimeCorrection;
+  strncpy(addonRecording.strRecordingId, xbmcRecording.m_strRecordingId.c_str(), sizeof(addonRecording.strRecordingId) - 1);
+  strncpy(addonRecording.strTitle, xbmcRecording.m_strTitle.c_str(), sizeof(addonRecording.strTitle) - 1);
+  strncpy(addonRecording.strPlotOutline, xbmcRecording.m_strPlotOutline.c_str(), sizeof(addonRecording.strPlotOutline) - 1);
+  strncpy(addonRecording.strPlot, xbmcRecording.m_strPlot.c_str(), sizeof(addonRecording.strPlot) - 1);
+  strncpy(addonRecording.strChannelName, xbmcRecording.m_strChannelName.c_str(), sizeof(addonRecording.strChannelName) - 1);
+  addonRecording.iDuration           = xbmcRecording.GetDuration();
+  addonRecording.iPriority           = xbmcRecording.m_iPriority;
+  addonRecording.iLifetime           = xbmcRecording.m_iLifetime;
+  addonRecording.iPlayCount          = xbmcRecording.m_playCount;
+  addonRecording.iLastPlayedPosition = (int)xbmcRecording.m_resumePoint.timeInSeconds;
+  addonRecording.bIsDeleted          = xbmcRecording.IsDeleted();
+  strncpy(addonRecording.strDirectory, xbmcRecording.m_strDirectory.c_str(), sizeof(addonRecording.strDirectory) - 1);
+  strncpy(addonRecording.strStreamURL, xbmcRecording.m_strStreamURL.c_str(), sizeof(addonRecording.strStreamURL) - 1);
+  strncpy(addonRecording.strIconPath, xbmcRecording.m_strIconPath.c_str(), sizeof(addonRecording.strIconPath) - 1);
+  strncpy(addonRecording.strThumbnailPath, xbmcRecording.m_strThumbnailPath.c_str(), sizeof(addonRecording.strThumbnailPath) - 1);
+  strncpy(addonRecording.strFanartPath, xbmcRecording.m_strFanartPath.c_str(), sizeof(addonRecording.strFanartPath) - 1);
+}
+
+/*!
+ * @brief Copy over timer info from xbmcTimer to addonTimer.
+ * @param xbmcTimer The timer on XBMC's side.
+ * @param addonTimer The timer on the addon's side.
+ */
+void CPVRClient::WriteClientTimerInfo(const CPVRTimerInfoTag &xbmcTimer, PVR_TIMER &addonTimer)
+{
+  time_t start, end, firstDay;
+  xbmcTimer.StartAsUTC().GetAsTime(start);
+  xbmcTimer.EndAsUTC().GetAsTime(end);
+  xbmcTimer.FirstDayAsUTC().GetAsTime(firstDay);
+  CEpgInfoTagPtr epgTag = xbmcTimer.GetEpgInfoTag();
+
+  memset(&addonTimer, 0, sizeof(addonTimer));
+
+  addonTimer.iClientIndex              = xbmcTimer.m_iClientIndex;
+  addonTimer.iParentClientIndex        = xbmcTimer.m_iParentClientIndex;
+  addonTimer.state                     = xbmcTimer.m_state;
+  addonTimer.iTimerType                = xbmcTimer.GetTimerType() ? xbmcTimer.GetTimerType()->GetTypeId() : PVR_TIMER_TYPE_NONE;
+  addonTimer.iClientChannelUid         = xbmcTimer.m_iClientChannelUid;
+  strncpy(addonTimer.strTitle, xbmcTimer.m_strTitle.c_str(), sizeof(addonTimer.strTitle) - 1);
+  strncpy(addonTimer.strEpgSearchString, xbmcTimer.m_strEpgSearchString.c_str(), sizeof(addonTimer.strEpgSearchString) - 1);
+  addonTimer.bFullTextEpgSearch        = xbmcTimer.m_bFullTextEpgSearch;
+  strncpy(addonTimer.strDirectory, xbmcTimer.m_strDirectory.c_str(), sizeof(addonTimer.strDirectory) - 1);
+  addonTimer.iPriority                 = xbmcTimer.m_iPriority;
+  addonTimer.iLifetime                 = xbmcTimer.m_iLifetime;
+  addonTimer.iMaxRecordings            = xbmcTimer.m_iMaxRecordings;
+  addonTimer.iPreventDuplicateEpisodes = xbmcTimer.m_iPreventDupEpisodes;
+  addonTimer.iRecordingGroup           = xbmcTimer.m_iRecordingGroup;
+  addonTimer.iWeekdays                 = xbmcTimer.m_iWeekdays;
+  addonTimer.startTime                 = start - g_advancedSettings.m_iPVRTimeCorrection;
+  addonTimer.endTime                   = end - g_advancedSettings.m_iPVRTimeCorrection;
+  addonTimer.bStartAnyTime             = xbmcTimer.m_bStartAnyTime;
+  addonTimer.bEndAnyTime               = xbmcTimer.m_bEndAnyTime;
+  addonTimer.firstDay                  = firstDay - g_advancedSettings.m_iPVRTimeCorrection;
+  addonTimer.iEpgUid                   = epgTag ? epgTag->UniqueBroadcastID() : PVR_TIMER_NO_EPG_UID;
+  strncpy(addonTimer.strSummary, xbmcTimer.m_strSummary.c_str(), sizeof(addonTimer.strSummary) - 1);
+  addonTimer.iMarginStart              = xbmcTimer.m_iMarginStart;
+  addonTimer.iMarginEnd                = xbmcTimer.m_iMarginEnd;
+  addonTimer.iGenreType                = epgTag ? epgTag->GenreType() : 0;
+  addonTimer.iGenreSubType             = epgTag ? epgTag->GenreSubType() : 0;
+}
+
+/*!
+ * @brief Copy over channel info from xbmcChannel to addonClient.
+ * @param xbmcChannel The channel on XBMC's side.
+ * @param addonChannel The channel on the addon's side.
+ */
+void CPVRClient::WriteClientChannelInfo(const CPVRChannelPtr &xbmcChannel, PVR_CHANNEL &addonChannel)
+{
+  assert(xbmcChannel.get());
+
+  memset(&addonChannel, 0, sizeof(addonChannel));
+
+  addonChannel.iUniqueId         = xbmcChannel->UniqueID();
+  addonChannel.iChannelNumber    = xbmcChannel->ClientChannelNumber();
+  addonChannel.iSubChannelNumber = xbmcChannel->ClientSubChannelNumber();
+  strncpy(addonChannel.strChannelName, xbmcChannel->ClientChannelName().c_str(), sizeof(addonChannel.strChannelName) - 1);
+  strncpy(addonChannel.strIconPath, xbmcChannel->IconPath().c_str(), sizeof(addonChannel.strIconPath) - 1);
+  addonChannel.iEncryptionSystem = xbmcChannel->EncryptionSystem();
+  addonChannel.bIsRadio          = xbmcChannel->IsRadio();
+  addonChannel.bIsHidden         = xbmcChannel->IsHidden();
+  strncpy(addonChannel.strInputFormat, xbmcChannel->InputFormat().c_str(), sizeof(addonChannel.strInputFormat) - 1);
+  strncpy(addonChannel.strStreamURL, xbmcChannel->StreamURL().c_str(), sizeof(addonChannel.strStreamURL) - 1);
+}
+
+bool CPVRClient::IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version)
+{
+  AddonVersion myMinVersion = AddonVersion(XBMC_PVR_MIN_API_VERSION);
+  AddonVersion myVersion = AddonVersion(XBMC_PVR_API_VERSION);
+  return (version >= myMinVersion && minVersion <= myVersion);
+}
+
+bool CPVRClient::IsCompatibleGUIAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version)
+{
+  AddonVersion myMinVersion = AddonVersion(KODI_GUILIB_MIN_API_VERSION);
+  AddonVersion myVersion = AddonVersion(KODI_GUILIB_API_VERSION);
+  return (version >= myMinVersion && minVersion <= myVersion);
+}
+
+bool CPVRClient::CheckAPIVersion(void)
+{
+  /* check the API version */
+  AddonVersion minVersion = AddonVersion(XBMC_PVR_MIN_API_VERSION);
+  try { m_apiVersion = AddonVersion(m_pStruct->GetPVRAPIVersion()); }
+  catch (std::exception &e) { LogException(e, "GetPVRAPIVersion()"); return false;  }
+
+  if (!IsCompatibleAPIVersion(minVersion, m_apiVersion))
+  {
+    CLog::Log(LOGERROR, "PVR - Add-on '%s' is using an incompatible API version. XBMC minimum API version = '%s', add-on API version '%s'", Name().c_str(), minVersion.asString().c_str(), m_apiVersion.asString().c_str());
+    return false;
+  }
+
+  /* check the GUI API version */
+  AddonVersion guiVersion = AddonVersion("0.0.0");
+  minVersion = AddonVersion(KODI_GUILIB_MIN_API_VERSION);
+  try { guiVersion = AddonVersion(m_pStruct->GetGUIAPIVersion()); }
+  catch (std::exception &e) { LogException(e, "GetGUIAPIVersion()"); return false;  }
+
+  /* Only do the check, if add-on depends on GUI API. */
+  if (!guiVersion.empty() && !IsCompatibleGUIAPIVersion(minVersion, guiVersion))
+  {
+    CLog::Log(LOGERROR, "PVR - Add-on '%s' is using an incompatible GUI API version. XBMC minimum GUI API version = '%s', add-on GUI API version '%s'", Name().c_str(), minVersion.asString().c_str(), guiVersion.asString().c_str());
+    return false;
+  }
+
+  return true;
+}
+
+bool CPVRClient::GetAddonProperties(void)
+{
+  std::string strBackendName, strConnectionString, strFriendlyName, strBackendVersion, strBackendHostname;
+  PVR_ADDON_CAPABILITIES addonCapabilities;
+  CPVRTimerTypes timerTypes;
+
+  /* get the capabilities */
+  try
+  {
+    memset(&addonCapabilities, 0, sizeof(addonCapabilities));
+    PVR_ERROR retVal = m_pStruct->GetAddonCapabilities(&addonCapabilities);
+    if (retVal != PVR_ERROR_NO_ERROR)
+    {
+      CLog::Log(LOGERROR, "PVR - couldn't get the capabilities for add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
+      return false;
+    }
+  }
+  catch (std::exception &e) { LogException(e, "GetAddonCapabilities()"); return false; }
+
+  /* get the name of the backend */
+  try { strBackendName = m_pStruct->GetBackendName(); }
+  catch (std::exception &e) { LogException(e, "GetBackendName()"); return false;  }
+
+  /* get the connection string */
+  try { strConnectionString = m_pStruct->GetConnectionString(); }
+  catch (std::exception &e) { LogException(e, "GetConnectionString()"); return false;  }
+
+  /* display name = backend name:connection string */
+  strFriendlyName = StringUtils::Format("%s:%s", strBackendName.c_str(), strConnectionString.c_str());
+
+  /* backend version number */
+  try { strBackendVersion = m_pStruct->GetBackendVersion(); }
+  catch (std::exception &e) { LogException(e, "GetBackendVersion()"); return false;  }
+
+  /* backend hostname */
+  try { strBackendHostname = m_pStruct->GetBackendHostname(); }
+  catch (std::exception &e) { LogException(e, "GetBackendHostname()"); return false; }
+
+  /* timer types */
+  if (addonCapabilities.bSupportsTimers)
+  {
+    try
+    {
+      std::unique_ptr<PVR_TIMER_TYPE[]> types_array(new PVR_TIMER_TYPE[PVR_ADDON_TIMERTYPE_ARRAY_SIZE]);
+      int size = PVR_ADDON_TIMERTYPE_ARRAY_SIZE;
+
+      PVR_ERROR retval = m_pStruct->GetTimerTypes(types_array.get(), &size);
+
+      if (retval == PVR_ERROR_NOT_IMPLEMENTED)
+      {
+        // begin compat section
+        CLog::Log(LOGWARNING, "%s - Addon %s does not support timer types. It will work, but not benefit from the timer features introduced with PVR Addon API 2.0.0", __FUNCTION__, strFriendlyName.c_str());
+
+        // Create standard timer types (mostly) matching the timer functionality available in Isengard.
+        // This is for migration only and does not make changes to the addons obsolete. Addons should
+        // work and benefit from some UI changes (e.g. some of the timer settings dialog enhancements),
+        // but all old problems/bugs due to static attributes and values will remain the same as in
+        // Isengard. Also, new features (like epg search) are not available to addons automatically.
+        // This code can be removed once all addons actually support the respective PVR Addon API version.
+
+        size = 0;
+        // One-shot manual
+        memset(&types_array[size], 0, sizeof(types_array[size]));
+        types_array[size].iId         = size + 1;
+        types_array[size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
+                                        PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
+                                        PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
+                                        PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
+                                        PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
+                                        PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
+                                        PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
+                                        PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+        size++;
+
+        // Repeating manual
+        memset(&types_array[size], 0, sizeof(types_array[size]));
+        types_array[size].iId         = size + 1;
+        types_array[size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
+                                        PVR_TIMER_TYPE_IS_REPEATING            |
+                                        PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
+                                        PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
+                                        PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
+                                        PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
+                                        PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
+                                        PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
+                                        PVR_TIMER_TYPE_SUPPORTS_FIRST_DAY      |
+                                        PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS       |
+                                        PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+        size++;
+
+        if (addonCapabilities.bSupportsEPG)
+        {
+          // One-shot epg-based
+          memset(&types_array[size], 0, sizeof(types_array[size]));
+          types_array[size].iId         = size + 1;
+          types_array[size].iAttributes = PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE    |
+                                          PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE |
+                                          PVR_TIMER_TYPE_SUPPORTS_CHANNELS          |
+                                          PVR_TIMER_TYPE_SUPPORTS_START_TIME        |
+                                          PVR_TIMER_TYPE_SUPPORTS_END_TIME          |
+                                          PVR_TIMER_TYPE_SUPPORTS_PRIORITY          |
+                                          PVR_TIMER_TYPE_SUPPORTS_LIFETIME          |
+                                          PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
+          size++;
+        }
+
+        retval = PVR_ERROR_NO_ERROR;
+        // end compat section
+      }
+
+      if (retval == PVR_ERROR_NO_ERROR)
+      {
+        timerTypes.reserve(size);
+        for (int i = 0; i < size; ++i)
+        {
+          if (types_array[i].iId == PVR_TIMER_TYPE_NONE)
+          {
+            CLog::Log(LOGERROR, "PVR - invalid timer type supplied by add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
+            continue;
+          }
+
+          if (strlen(types_array[i].strDescription) == 0)
+          {
+            int id;
+            if (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_REPEATING)
+            {
+              id = (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_MANUAL)
+                 ? 822  // "Repeating"
+                 : 823; // "Repeating (Guide-based)"
+            }
+            else
+            {
+              id = (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_MANUAL)
+                 ? 820  // "One Time"
+                 : 821; // "One Time (Guide-based)
+            }
+            std::string descr(g_localizeStrings.Get(id));
+            strncpy(types_array[i].strDescription, descr.c_str(), descr.size());
+          }
+          timerTypes.push_back(CPVRTimerTypePtr(new CPVRTimerType(types_array[i], m_iClientId)));
+        }
+      }
+      else
+      {
+        CLog::Log(LOGERROR, "PVR - couldn't get the timer types for add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
+        return false;
+      }
+    }
+    catch (std::exception &e) { LogException(e, "GetTimerTypes()"); return false; }
+  }
+
+  /* update the members */
+  m_strBackendName      = strBackendName;
+  m_strConnectionString = strConnectionString;
+  m_strFriendlyName     = strFriendlyName;
+  m_strBackendVersion   = strBackendVersion;
+  m_addonCapabilities   = addonCapabilities;
+  m_strBackendHostname  = strBackendHostname;
+  m_timertypes          = timerTypes;
+
+  return true;
+}
+
+PVR_ADDON_CAPABILITIES CPVRClient::GetAddonCapabilities(void) const
+{
+  PVR_ADDON_CAPABILITIES addonCapabilities(m_addonCapabilities);
+  return addonCapabilities;
+}
+
+const std::string& CPVRClient::GetBackendName(void) const
+{
+  return m_strBackendName;
+}
+
+const std::string& CPVRClient::GetBackendVersion(void) const
+{
+  return m_strBackendVersion;
+}
+
+const std::string& CPVRClient::GetBackendHostname(void) const
+{
+  return m_strBackendHostname;
+}
+
+const std::string& CPVRClient::GetConnectionString(void) const
+{
+  return m_strConnectionString;
+}
+
+const std::string& CPVRClient::GetFriendlyName(void) const
+{
+  return m_strFriendlyName;
+}
+
+PVR_ERROR CPVRClient::GetDriveSpace(long long *iTotal, long long *iUsed)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  try { return m_pStruct->GetDriveSpace(iTotal, iUsed); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  /* default to 0 on error */
+  *iTotal = 0;
+  *iUsed  = 0;
+
+  return PVR_ERROR_UNKNOWN;
+}
+
+PVR_ERROR CPVRClient::StartChannelScan(void)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelScan)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  try { return m_pStruct->OpenDialogChannelScan(); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  return PVR_ERROR_UNKNOWN;
+}
+
+PVR_ERROR CPVRClient::OpenDialogChannelAdd(const CPVRChannelPtr &channel)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelSettings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_CHANNEL addonChannel;
+    WriteClientChannelInfo(channel, addonChannel);
+
+    retVal = m_pStruct->OpenDialogChannelAdd(addonChannel);
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::OpenDialogChannelSettings(const CPVRChannelPtr &channel)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelSettings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_CHANNEL addonChannel;
+    WriteClientChannelInfo(channel, addonChannel);
+
+    retVal = m_pStruct->OpenDialogChannelSettings(addonChannel);
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::DeleteChannel(const CPVRChannelPtr &channel)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelSettings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_CHANNEL addonChannel;
+    WriteClientChannelInfo(channel, addonChannel);
+
+    retVal = m_pStruct->DeleteChannel(addonChannel);
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::RenameChannel(const CPVRChannelPtr &channel)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelSettings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_CHANNEL addonChannel;
+    WriteClientChannelInfo(channel, addonChannel);
+
+    retVal = m_pStruct->RenameChannel(addonChannel);
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+void CPVRClient::CallMenuHook(const PVR_MENUHOOK &hook, const CFileItem *item)
+{
+  if (!m_bReadyToUse)
+    return;
+
+  try {
+    PVR_MENUHOOK_DATA hookData;
+    hookData.cat = PVR_MENUHOOK_UNKNOWN;
+
+    if (item)
+    {
+      if (item->IsEPG())
+      {
+        hookData.cat = PVR_MENUHOOK_EPG;
+        hookData.data.iEpgUid = item->GetEPGInfoTag()->UniqueBroadcastID();
+      }
+      else if (item->IsPVRChannel())
+      {
+        hookData.cat = PVR_MENUHOOK_CHANNEL;
+        WriteClientChannelInfo(item->GetPVRChannelInfoTag(), hookData.data.channel);
+      }
+      else if (item->IsUsablePVRRecording())
+      {
+        hookData.cat = PVR_MENUHOOK_RECORDING;
+        WriteClientRecordingInfo(*item->GetPVRRecordingInfoTag(), hookData.data.recording);
+      }
+      else if (item->IsDeletedPVRRecording())
+      {
+        hookData.cat = PVR_MENUHOOK_DELETED_RECORDING;
+        WriteClientRecordingInfo(*item->GetPVRRecordingInfoTag(), hookData.data.recording);
+      }
+      else if (item->IsPVRTimer())
+      {
+        hookData.cat = PVR_MENUHOOK_TIMER;
+        WriteClientTimerInfo(*item->GetPVRTimerInfoTag(), hookData.data.timer);
+      }
+    }
+
+    m_pStruct->MenuHook(hook, hookData);
+  }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+}
+
+PVR_ERROR CPVRClient::GetEPGForChannel(const CPVRChannelPtr &channel, CEpg *epg, time_t start /* = 0 */, time_t end /* = 0 */, bool bSaveInDb /* = false*/)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsEPG)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_CHANNEL addonChannel;
+    WriteClientChannelInfo(channel, addonChannel);
+
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress  = this;
+    handle.dataAddress    = epg;
+    handle.dataIdentifier = bSaveInDb ? 1 : 0; // used by the callback method CAddonCallbacksPVR::PVRTransferEpgEntry()
+    retVal = m_pStruct->GetEpg(&handle,
+        addonChannel,
+        start ? start - g_advancedSettings.m_iPVRTimeCorrection : 0,
+        end ? end - g_advancedSettings.m_iPVRTimeCorrection : 0);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::SetEPGTimeFrame(int iDays)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsEPG)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    retVal = m_pStruct->SetEPGTimeFrame(iDays);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+int CPVRClient::GetChannelGroupsAmount(void)
+{
+  int iReturn(-EINVAL);
+
+  if (!m_bReadyToUse)
+    return iReturn;
+
+  if (!m_addonCapabilities.bSupportsChannelGroups)
+    return iReturn;
+
+  try { iReturn = m_pStruct->GetChannelGroupsAmount(); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  return iReturn;
+}
+
+PVR_ERROR CPVRClient::GetChannelGroups(CPVRChannelGroups *groups)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelGroups)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress = this;
+    handle.dataAddress = groups;
+    retVal = m_pStruct->GetChannelGroups(&handle, groups->IsRadio());
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::GetChannelGroupMembers(CPVRChannelGroup *group)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsChannelGroups)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress = this;
+    handle.dataAddress = group;
+
+    PVR_CHANNEL_GROUP tag;
+    WriteClientGroupInfo(*group, tag);
+
+    CLog::Log(LOGDEBUG, "PVR - %s - get group members for group '%s' from add-on '%s'",
+        __FUNCTION__, tag.strGroupName, GetFriendlyName().c_str());
+    retVal = m_pStruct->GetChannelGroupMembers(&handle, tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+int CPVRClient::GetChannelsAmount(void)
+{
+  int iReturn(-EINVAL);
+  if (m_bReadyToUse && (m_addonCapabilities.bSupportsTV || m_addonCapabilities.bSupportsRadio))
+  {
+    try { iReturn = m_pStruct->GetChannelsAmount(); }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+
+  return iReturn;
+}
+
+PVR_ERROR CPVRClient::GetChannels(CPVRChannelGroup &channels, bool radio)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if ((!m_addonCapabilities.bSupportsRadio && radio) ||
+      (!m_addonCapabilities.bSupportsTV && !radio))
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+
+  try
+  {
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress = this;
+    handle.dataAddress = (CPVRChannelGroup*) &channels;
+    retVal = m_pStruct->GetChannels(&handle, radio);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+int CPVRClient::GetRecordingsAmount(bool deleted)
+{
+  int iReturn(-EINVAL);
+
+  if (!m_addonCapabilities.bSupportsRecordings || (deleted && !m_addonCapabilities.bSupportsRecordingsUndelete))
+    return iReturn;
+
+  try
+  {
+    iReturn = m_pStruct->GetRecordingsAmount(deleted);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return iReturn;
+}
+
+PVR_ERROR CPVRClient::GetRecordings(CPVRRecordings *results, bool deleted)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordings || (deleted && !m_addonCapabilities.bSupportsRecordingsUndelete))
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress = this;
+    handle.dataAddress = (CPVRRecordings*) results;
+    retVal = m_pStruct->GetRecordings(&handle, deleted);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::DeleteRecording(const CPVRRecording &recording)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    retVal = m_pStruct->DeleteRecording(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::UndeleteRecording(const CPVRRecording &recording)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordingsUndelete)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    retVal = m_pStruct->UndeleteRecording(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::DeleteAllRecordingsFromTrash()
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordingsUndelete)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    retVal = m_pStruct->DeleteAllRecordingsFromTrash();
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::RenameRecording(const CPVRRecording &recording)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordings)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    retVal = m_pStruct->RenameRecording(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::SetRecordingPlayCount(const CPVRRecording &recording, int count)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsRecordingPlayCount)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    retVal = m_pStruct->SetRecordingPlayCount(tag, count);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::SetRecordingLastPlayedPosition(const CPVRRecording &recording, int lastplayedposition)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsLastPlayedPosition)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    retVal = m_pStruct->SetRecordingLastPlayedPosition(tag, lastplayedposition);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+int CPVRClient::GetRecordingLastPlayedPosition(const CPVRRecording &recording)
+{
+  int iReturn(-EINVAL);
+  if (!m_bReadyToUse)
+    return iReturn;
+
+  if (!m_addonCapabilities.bSupportsLastPlayedPosition)
+    return iReturn;
+
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    iReturn = m_pStruct->GetRecordingLastPlayedPosition(tag);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return iReturn;
+}
+
+std::vector<PVR_EDL_ENTRY> CPVRClient::GetRecordingEdl(const CPVRRecording &recording)
+{
+  std::vector<PVR_EDL_ENTRY> edl;
+  if (!m_bReadyToUse)
+    return edl;
+
+  if (!m_addonCapabilities.bSupportsRecordingEdl)
+    return edl;
+
+  try
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(recording, tag);
+
+    PVR_EDL_ENTRY edl_array[PVR_ADDON_EDL_LENGTH];
+    int size = PVR_ADDON_EDL_LENGTH;
+    PVR_ERROR retval = m_pStruct->GetRecordingEdl(tag, edl_array, &size);
+    if (retval == PVR_ERROR_NO_ERROR)
+    {
+      edl.reserve(size);
+      for (int i = 0; i < size; ++i)
+      {
+        edl.push_back(edl_array[i]);
+      }
+    }
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return edl;
+}
+
+int CPVRClient::GetTimersAmount(void)
+{
+  int iReturn(-EINVAL);
+  if (!m_bReadyToUse)
+    return iReturn;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return iReturn;
+
+  try { iReturn = m_pStruct->GetTimersAmount(); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  return iReturn;
+}
+
+PVR_ERROR CPVRClient::GetTimers(CPVRTimers *results)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    ADDON_HANDLE_STRUCT handle;
+    handle.callerAddress = this;
+    handle.dataAddress = (CPVRTimers*) results;
+    retVal = m_pStruct->GetTimers(&handle);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::AddTimer(const CPVRTimerInfoTag &timer)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_TIMER tag;
+    WriteClientTimerInfo(timer, tag);
+
+    retVal = m_pStruct->AddTimer(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::DeleteTimer(const CPVRTimerInfoTag &timer, bool bForce /* = false */)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_TIMER tag;
+    WriteClientTimerInfo(timer, tag);
+
+    retVal = m_pStruct->DeleteTimer(tag, bForce);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::RenameTimer(const CPVRTimerInfoTag &timer, const std::string &strNewName)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_TIMER tag;
+    WriteClientTimerInfo(timer, tag);
+
+    retVal = m_pStruct->UpdateTimer(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::UpdateTimer(const CPVRTimerInfoTag &timer)
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  if (!m_addonCapabilities.bSupportsTimers)
+    return PVR_ERROR_NOT_IMPLEMENTED;
+
+  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
+  try
+  {
+    PVR_TIMER tag;
+    WriteClientTimerInfo(timer, tag);
+
+    retVal = m_pStruct->UpdateTimer(tag);
+
+    LogError(retVal, __FUNCTION__);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return retVal;
+}
+
+PVR_ERROR CPVRClient::GetTimerTypes(CPVRTimerTypes& results) const
+{
+  if (!m_bReadyToUse)
+    return PVR_ERROR_SERVER_ERROR;
+
+  results = m_timertypes;
+  return PVR_ERROR_NO_ERROR;
+}
+
+int CPVRClient::ReadStream(void* lpBuf, int64_t uiBufSize)
+{
+  if (IsPlayingLiveStream())
+  {
+    try { return m_pStruct->ReadLiveStream((unsigned char *)lpBuf, (int)uiBufSize); }
+    catch (std::exception &e) { LogException(e, "ReadLiveStream()"); }
+  }
+  else if (IsPlayingRecording())
+  {
+    try { return m_pStruct->ReadRecordedStream((unsigned char *)lpBuf, (int)uiBufSize); }
+    catch (std::exception &e) { LogException(e, "ReadRecordedStream()"); }
+  }
+  return -EINVAL;
+}
+
+int64_t CPVRClient::SeekStream(int64_t iFilePosition, int iWhence/* = SEEK_SET*/)
+{
+  if (IsPlayingLiveStream())
+  {
+    try { return m_pStruct->SeekLiveStream(iFilePosition, iWhence); }
+    catch (std::exception &e) { LogException(e, "SeekLiveStream()"); }
+  }
+  else if (IsPlayingRecording())
+  {
+    try { return m_pStruct->SeekRecordedStream(iFilePosition, iWhence); }
+    catch (std::exception &e) { LogException(e, "SeekRecordedStream()"); }
+  }
+  return -EINVAL;
+}
+
+bool CPVRClient::SeekTime(int time, bool backwards, double *startpts)
+{
+  if (IsPlaying())
+  {
+    try { return m_pStruct->SeekTime(time, backwards, startpts); }
+    catch (std::exception &e) { LogException(e, "SeekTime()"); }
+  }
+  return false;
+}
+
+int64_t CPVRClient::GetStreamPosition(void)
+{
+  if (IsPlayingLiveStream())
+  {
+    try { return m_pStruct->PositionLiveStream(); }
+    catch (std::exception &e) { LogException(e, "PositionLiveStream()"); }
+  }
+  else if (IsPlayingRecording())
+  {
+    try { return m_pStruct->PositionRecordedStream(); }
+    catch (std::exception &e) { LogException(e, "PositionRecordedStream()"); }
+  }
+  return -EINVAL;
+}
+
+int64_t CPVRClient::GetStreamLength(void)
+{
+  if (IsPlayingLiveStream())
+  {
+    try { return m_pStruct->LengthLiveStream(); }
+    catch (std::exception &e) { LogException(e, "LengthLiveStream()"); }
+  }
+  else if (IsPlayingRecording())
+  {
+    try { return m_pStruct->LengthRecordedStream(); }
+    catch (std::exception &e) { LogException(e, "LengthRecordedStream()"); }
+  }
+  return -EINVAL;
+}
+
+bool CPVRClient::SwitchChannel(const CPVRChannelPtr &channel)
+{
+  bool bSwitched(false);
+
+  if (IsPlayingLiveStream() && CanPlayChannel(channel))
+  {
+    PVR_CHANNEL tag;
+    WriteClientChannelInfo(channel, tag);
+    try
+    {
+      bSwitched = m_pStruct->SwitchChannel(tag);
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+
+  if (bSwitched)
+  {
+    CPVRChannelPtr currentChannel(g_PVRChannelGroups->GetByUniqueID(channel->UniqueID(), channel->ClientID()));
+    CSingleLock lock(m_critSection);
+    m_playingChannel = currentChannel;
+  }
+
+  return bSwitched;
+}
+
+bool CPVRClient::SignalQuality(PVR_SIGNAL_STATUS &qualityinfo)
+{
+  if (IsPlayingLiveStream())
+  {
+    try
+    {
+      return m_pStruct->SignalStatus(qualityinfo) == PVR_ERROR_NO_ERROR;
+    }
+    catch (std::exception &e)
+    {
+      LogException(e, __FUNCTION__);
+    }
+  }
+  return false;
+}
+
+std::string CPVRClient::GetLiveStreamURL(const CPVRChannelPtr &channel)
+{
+  std::string strReturn;
+
+  if (!m_bReadyToUse || !CanPlayChannel(channel))
+    return strReturn;
+
+  try
+  {
+    PVR_CHANNEL tag;
+    WriteClientChannelInfo(channel, tag);
+    strReturn = m_pStruct->GetLiveStreamURL(tag);
+  }
+  catch (std::exception &e)
+  {
+    LogException(e, __FUNCTION__);
+  }
+
+  return strReturn;
+}
+
+PVR_ERROR CPVRClient::GetStreamProperties(PVR_STREAM_PROPERTIES *props)
+{
+  if (!IsPlaying())
+    return PVR_ERROR_REJECTED;
+
+  try { return m_pStruct->GetStreamProperties(props); }
+  catch (std::exception &e) { LogException(e, __FUNCTION__); }
+
+  return PVR_ERROR_UNKNOWN;
+}
+
+void CPVRClient::DemuxReset(void)
+{
+  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
+  {
+    try { m_pStruct->DemuxReset(); }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+}
+
+void CPVRClient::DemuxAbort(void)
+{
+  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
+  {
+    try { m_pStruct->DemuxAbort(); }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+}
+
+void CPVRClient::DemuxFlush(void)
+{
+  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
+  {
+    try { m_pStruct->DemuxFlush(); }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+}
+
+DemuxPacket* CPVRClient::DemuxRead(void)
+{
+  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
+  {
+    try { return m_pStruct->DemuxRead(); }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return NULL;
+}
+
+bool CPVRClient::HaveMenuHooks(PVR_MENUHOOK_CAT cat) const
+{
+  bool bReturn(false);
+  if (m_bReadyToUse && !m_menuhooks.empty())
+  {
+    for (unsigned int i = 0; i < m_menuhooks.size(); i++)
+    {
+      if (m_menuhooks[i].category == cat || m_menuhooks[i].category == PVR_MENUHOOK_ALL)
+      {
+        bReturn = true;
+        break;
+      }
+    }
+  }
+  return bReturn;
+}
+
+PVR_MENUHOOKS *CPVRClient::GetMenuHooks(void)
+{
+  return &m_menuhooks;
+}
+
+const char *CPVRClient::ToString(const PVR_ERROR error)
+{
+  switch (error)
+  {
+  case PVR_ERROR_NO_ERROR:
+    return "no error";
+  case PVR_ERROR_NOT_IMPLEMENTED:
+    return "not implemented";
+  case PVR_ERROR_SERVER_ERROR:
+    return "server error";
+  case PVR_ERROR_SERVER_TIMEOUT:
+    return "server timeout";
+  case PVR_ERROR_RECORDING_RUNNING:
+    return "recording already running";
+  case PVR_ERROR_ALREADY_PRESENT:
+    return "already present";
+  case PVR_ERROR_REJECTED:
+    return "rejected by the backend";
+  case PVR_ERROR_INVALID_PARAMETERS:
+    return "invalid parameters for this method";
+  case PVR_ERROR_FAILED:
+    return "the command failed";
+  case PVR_ERROR_UNKNOWN:
+  default:
+    return "unknown error";
+  }
+}
+
+bool CPVRClient::LogError(const PVR_ERROR error, const char *strMethod) const
+{
+  if (error != PVR_ERROR_NO_ERROR)
+  {
+    CLog::Log(LOGERROR, "PVR - %s - addon '%s' returned an error: %s",
+        strMethod, GetFriendlyName().c_str(), ToString(error));
+    return false;
+  }
+  return true;
+}
+
+void CPVRClient::LogException(const std::exception &e, const char *strFunctionName) const
+{
+  CLog::Log(LOGERROR, "PVR - exception '%s' caught while trying to call '%s' on add-on '%s'. Please contact the developer of this add-on: %s", e.what(), strFunctionName, GetFriendlyName().c_str(), Author().c_str());
+}
+
+bool CPVRClient::CanPlayChannel(const CPVRChannelPtr &channel) const
+{
+  assert(channel.get());
+
+  return (m_bReadyToUse &&
+           ((m_addonCapabilities.bSupportsTV && !channel->IsRadio()) ||
+            (m_addonCapabilities.bSupportsRadio && channel->IsRadio())));
+}
+
+bool CPVRClient::SupportsChannelGroups(void) const
+{
+  return m_addonCapabilities.bSupportsChannelGroups;
+}
+
+bool CPVRClient::SupportsChannelScan(void) const
+{
+  return m_addonCapabilities.bSupportsChannelScan;
+}
+
+bool CPVRClient::SupportsChannelSettings(void) const
+{
+  return m_addonCapabilities.bSupportsChannelSettings;
+}
+
+bool CPVRClient::SupportsEPG(void) const
+{
+  return m_addonCapabilities.bSupportsEPG;
+}
+
+bool CPVRClient::SupportsLastPlayedPosition(void) const
+{
+  return m_addonCapabilities.bSupportsLastPlayedPosition;
+}
+
+bool CPVRClient::SupportsRadio(void) const
+{
+  return m_addonCapabilities.bSupportsRadio;
+}
+
+bool CPVRClient::SupportsRecordings(void) const
+{
+  return m_addonCapabilities.bSupportsRecordings;
+}
+
+bool CPVRClient::SupportsRecordingsUndelete(void) const
+{
+  return m_addonCapabilities.bSupportsRecordingsUndelete;
+}
+
+bool CPVRClient::SupportsRecordingPlayCount(void) const
+{
+  return m_addonCapabilities.bSupportsRecordingPlayCount;
+}
+
+bool CPVRClient::SupportsRecordingEdl(void) const
+{
+  return m_addonCapabilities.bSupportsRecordingEdl;
+}
+
+bool CPVRClient::SupportsTimers(void) const
+{
+  return m_addonCapabilities.bSupportsTimers;
+}
+
+bool CPVRClient::SupportsTV(void) const
+{
+  return m_addonCapabilities.bSupportsTV;
+}
+
+bool CPVRClient::HandlesDemuxing(void) const
+{
+  return m_addonCapabilities.bHandlesDemuxing;
+}
+
+bool CPVRClient::HandlesInputStream(void) const
+{
+  return m_addonCapabilities.bHandlesInputStream;
+}
+
+bool CPVRClient::IsPlayingLiveStream(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_bReadyToUse && m_bIsPlayingTV;
+}
+
+bool CPVRClient::IsPlayingLiveTV(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_bReadyToUse && m_bIsPlayingTV && !m_playingChannel->IsRadio();
+}
+
+bool CPVRClient::IsPlayingLiveRadio(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_bReadyToUse && m_bIsPlayingTV && m_playingChannel->IsRadio();
+}
+
+bool CPVRClient::IsPlayingEncryptedChannel(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_bReadyToUse && m_bIsPlayingTV && m_playingChannel->IsEncrypted();
+}
+
+bool CPVRClient::IsPlayingRecording(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_bReadyToUse && m_bIsPlayingRecording;
+}
+
+bool CPVRClient::IsPlaying(void) const
+{
+  return IsPlayingLiveStream() ||
+         IsPlayingRecording();
+}
+
+CPVRChannelPtr CPVRClient::GetPlayingChannel() const
+{
+  CSingleLock lock(m_critSection);
+  if (m_bReadyToUse && m_bIsPlayingTV)
+    return m_playingChannel;
+
+  return CPVRChannelPtr();
+}
+
+CPVRRecordingPtr CPVRClient::GetPlayingRecording(void) const
+{
+  CSingleLock lock(m_critSection);
+  if (m_bReadyToUse && m_bIsPlayingRecording)
+    return m_playingRecording;
+
+  return CPVRRecordingPtr();
+}
+
+bool CPVRClient::OpenStream(const CPVRChannelPtr &channel, bool bIsSwitchingChannel)
+{
+  bool bReturn(false);
+  CloseStream();
+
+  if(!CanPlayChannel(channel))
+  {
+    CLog::Log(LOGDEBUG, "add-on '%s' can not play channel '%s'", GetFriendlyName().c_str(), channel->ChannelName().c_str());
+  }
+  else if (!channel->StreamURL().empty())
+  {
+    CLog::Log(LOGDEBUG, "opening live stream on url '%s'", channel->StreamURL().c_str());
+    bReturn = true;
+
+    // the Njoy N7 sometimes doesn't switch channels, but opens a stream to the previous channel
+    // when not waiting for a short period.
+    // added in 1.1.0
+    AddonVersion checkVersion("1.1.0");
+    if (m_apiVersion >= checkVersion)
+    {
+      unsigned int iWaitTimeMs = m_pStruct->GetChannelSwitchDelay();
+      if (iWaitTimeMs > 0)
+        XbmcThreads::ThreadSleep(iWaitTimeMs);
+    }
+  }
+  else
+  {
+    CLog::Log(LOGDEBUG, "opening live stream for channel '%s'", channel->ChannelName().c_str());
+    PVR_CHANNEL tag;
+    WriteClientChannelInfo(channel, tag);
+
+    try
+    {
+      bReturn = m_pStruct->OpenLiveStream(tag);
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+
+  if (bReturn)
+  {
+    CPVRChannelPtr currentChannel(g_PVRChannelGroups->GetByUniqueID(channel->UniqueID(), channel->ClientID()));
+    CSingleLock lock(m_critSection);
+    m_playingChannel      = currentChannel;
+    m_bIsPlayingTV        = true;
+    m_bIsPlayingRecording = false;
+  }
+
+  return bReturn;
+}
+
+bool CPVRClient::OpenStream(const CPVRRecordingPtr &recording)
+{
+  bool bReturn(false);
+  CloseStream();
+
+  if (m_bReadyToUse && m_addonCapabilities.bSupportsRecordings)
+  {
+    PVR_RECORDING tag;
+    WriteClientRecordingInfo(*recording, tag);
+
+    try
+    {
+      bReturn = m_pStruct->OpenRecordedStream(tag);
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+
+  if (bReturn)
+  {
+    CSingleLock lock(m_critSection);
+    m_playingRecording    = recording;
+    m_bIsPlayingTV        = false;
+    m_bIsPlayingRecording = true;
+  }
+
+  return bReturn;
+}
+
+void CPVRClient::CloseStream(void)
+{
+  if (IsPlayingLiveStream())
+  {
+    try { m_pStruct->CloseLiveStream(); }
+    catch (std::exception &e) { LogException(e, "CloseLiveStream()"); }
+
+    CSingleLock lock(m_critSection);
+    m_bIsPlayingTV = false;
+  }
+  else if (IsPlayingRecording())
+  {
+    try { m_pStruct->CloseRecordedStream(); }
+    catch (std::exception &e) { LogException(e, "CloseRecordedStream()"); }
+
+    CSingleLock lock(m_critSection);
+    m_bIsPlayingRecording = false;
+  }
+}
+
+void CPVRClient::PauseStream(bool bPaused)
+{
+  if (IsPlaying())
+  {
+    try { m_pStruct->PauseStream(bPaused); }
+    catch (std::exception &e) { LogException(e, "PauseStream()"); }
+  }
+}
+
+void CPVRClient::SetSpeed(int speed)
+{
+  if (IsPlaying())
+  {
+    try { m_pStruct->SetSpeed(speed); }
+    catch (std::exception &e) { LogException(e, "SetSpeed()"); }
+  }
+}
+
+bool CPVRClient::CanPauseStream(void) const
+{
+  bool bReturn(false);
+  if (IsPlaying())
+  {
+    try
+    {
+      bReturn = m_pStruct->CanPauseStream();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+
+  return bReturn;
+}
+
+bool CPVRClient::CanSeekStream(void) const
+{
+  bool bReturn(false);
+  if (IsPlaying())
+  {
+    try
+    {
+      bReturn = m_pStruct->CanSeekStream();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return bReturn;
+}
+
+bool CPVRClient::IsTimeshifting(void) const
+{
+  bool bReturn(false);
+  if (IsPlaying())
+  {
+    try
+    {
+      if (m_pStruct->IsTimeshifting)
+        bReturn = m_pStruct->IsTimeshifting();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return bReturn;
+}
+
+time_t CPVRClient::GetPlayingTime(void) const
+{
+  time_t time = 0;
+  if (IsPlaying())
+  {
+    try
+    {
+      time = m_pStruct->GetPlayingTime();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  // fallback if not implemented by addon
+  if (time == 0)
+  {
+    CDateTime::GetUTCDateTime().GetAsTime(time);
+  }
+  return time;
+}
+
+time_t CPVRClient::GetBufferTimeStart(void) const
+{
+  time_t time = 0;
+  if (IsPlaying())
+  {
+    try
+    {
+      time = m_pStruct->GetBufferTimeStart();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return time;
+}
+
+time_t CPVRClient::GetBufferTimeEnd(void) const
+{
+  time_t time = 0;
+  if (IsPlaying())
+  {
+    try
+    {
+      time = m_pStruct->GetBufferTimeEnd();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return time;
+}
+
+bool CPVRClient::CanAutoconfigure(void) const
+{
+  /** can only auto-configure when avahi details are provided in addon.xml */
+  return !m_strAvahiType.empty() &&
+      !m_strAvahiIpSetting.empty() &&
+      !m_strAvahiPortSetting.empty();
+}
+
+bool CPVRClient::AutoconfigureRegisterType(void)
+{
+  if (!m_strAvahiType.empty())
+  {
+    // AddServiceType() returns false when already registered
+    m_bAvahiServiceAdded |= CZeroconfBrowser::GetInstance()->AddServiceType(m_strAvahiType);
+    return true;
+  }
+
+  return false;
+}
+
+bool CPVRClient::Autoconfigure(void)
+{
+  bool bReturn(false);
+
+  if (!CanAutoconfigure())
+    return bReturn;
+
+  std::string strHostPort;
+  std::vector<CZeroconfBrowser::ZeroconfService> found_services = CZeroconfBrowser::GetInstance()->GetFoundServices();
+  for(std::vector<CZeroconfBrowser::ZeroconfService>::iterator it = found_services.begin(); !bReturn && it != found_services.end(); ++it)
+  {
+    /** found the type that we are looking for */
+    if ((*it).GetType() == m_strAvahiType && std::find(m_rejectedAvahiHosts.begin(), m_rejectedAvahiHosts.end(), *it) == m_rejectedAvahiHosts.end())
+    {
+      /** try to resolve */
+      if(!CZeroconfBrowser::GetInstance()->ResolveService((*it)))
+      {
+        CLog::Log(LOGWARNING, "%s - %s service found but the host name couldn't be resolved", __FUNCTION__, (*it).GetName().c_str());
+      }
+      else
+      {
+        // %s service found at %s
+        std::string strLogLine(StringUtils::Format(g_localizeStrings.Get(19689).c_str(), (*it).GetName().c_str(), (*it).GetIP().c_str()));
+        CLog::Log(LOGDEBUG, "%s - %s", __FUNCTION__, strLogLine.c_str());
+
+        if (DialogResponse::YES != 
+          HELPERS::ShowYesNoDialogLines(CVariant{19688}, // Scanning for PVR services
+                                        CVariant{strLogLine},
+                                        CVariant{19690})) // Do you want to use this service?
+        {
+          CLog::Log(LOGDEBUG, "%s - %s service found but not enabled by the user", __FUNCTION__, (*it).GetName().c_str());
+          m_rejectedAvahiHosts.push_back(*it);
+        }
+        else
+        {
+          /** update the settings and return */
+          std::string strPort(StringUtils::Format("%d", (*it).GetPort()));
+          UpdateSetting(m_strAvahiIpSetting, (*it).GetIP());
+          UpdateSetting(m_strAvahiPortSetting, strPort);
+          SaveSettings();
+          CLog::Log(LOGNOTICE, "%s - auto-configured %s using host '%s' and port '%d'", __FUNCTION__, (*it).GetName().c_str(), (*it).GetIP().c_str(), (*it).GetPort());
+
+          bReturn = true;
+        }
+      }
+    }
+  }
+
+  return bReturn;
+}
+
+bool CPVRClient::IsRealTimeStream(void) const
+{
+  bool bReturn(false);
+  if (IsPlaying())
+  {
+    try
+    {
+      bReturn = m_pStruct->IsRealTimeStream();
+    }
+    catch (std::exception &e) { LogException(e, __FUNCTION__); }
+  }
+  return bReturn;
+}

_service:download_url:master.tar.gz/xbmc/addons/PVRClient.h Added

@@ -0,0 +1,737 @@
+#pragma once
+/*
+ *      Copyright (C) 2012-2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "addons/Addon.h"
+#include "addons/AddonDll.h"
+#include "addons/DllPVRClient.h"
+#include "network/ZeroconfBrowser.h"
+
+#include "pvr/channels/PVRChannel.h"
+#include "pvr/recordings/PVRRecordings.h"
+
+namespace EPG
+{
+  class CEpg;
+}
+
+namespace PVR
+{
+  class CPVRChannelGroup;
+  class CPVRChannelGroupInternal;
+  class CPVRChannelGroups;
+  class CPVRTimers;
+  class CPVRTimerInfoTag;
+  class CPVRRecordings;
+  class CPVREpgContainer;
+  class CPVRClient;
+  class CPVRTimerType;
+
+  typedef std::vector<PVR_MENUHOOK> PVR_MENUHOOKS;
+  typedef std::shared_ptr<CPVRClient> PVR_CLIENT;
+  #define PVR_INVALID_CLIENT_ID (-2)
+
+  typedef std::shared_ptr<CPVRTimerType> CPVRTimerTypePtr;
+  typedef std::vector<CPVRTimerTypePtr>  CPVRTimerTypes;
+
+  /*!
+   * Interface from XBMC to a PVR add-on.
+   *
+   * Also translates XBMC's C++ structures to the addon's C structures.
+   */
+  class CPVRClient : public ADDON::CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>
+  {
+  public:
+    static std::unique_ptr<CPVRClient> FromExtension(ADDON::AddonProps props, const cp_extension_t* ext);
+
+    explicit CPVRClient(ADDON::AddonProps props);
+    CPVRClient(ADDON::AddonProps props, const std::string& strAvahiType,
+        const std::string& strAvahiIpSetting, const std::string& strAvahiPortSetting, bool bNeedsConfiguration);
+
+    ~CPVRClient(void);
+
+    virtual void OnDisabled() override;
+    virtual void OnEnabled() override;
+    virtual void SaveSettings() override;
+    virtual void OnPostInstall(bool update, bool modal) override;
+    virtual void OnPreUnInstall() override;
+    virtual void OnPostUnInstall() override;
+
+    bool NeedsConfiguration(void) const { return m_bNeedsConfiguration; }
+
+    /** @name PVR add-on methods */
+    //@{
+
+    /*!
+     * @brief Initialise the instance of this add-on.
+     * @param iClientId The ID of this add-on.
+     */
+    ADDON_STATUS Create(int iClientId);
+
+    /*!
+     * @return True when the dll for this add-on was loaded, false otherwise (e.g. unresolved symbols)
+     */
+    bool DllLoaded(void) const;
+
+    /*!
+     * @brief Destroy the instance of this add-on.
+     */
+    void Destroy(void);
+
+    /*!
+     * @brief Destroy and recreate this add-on.
+     */
+    void ReCreate(void);
+
+    /*!
+     * @return True if this instance is initialised (ADDON_Create returned true), false otherwise.
+     */
+    bool ReadyToUse(void) const;
+
+    /*!
+     * @brief Gets the backend connection state.
+     * @return the backend connection state.
+     */
+    PVR_CONNECTION_STATE GetConnectionState(void) const;
+
+    /*!
+     * @brief Sets the backend connection state.
+     * @param state the new backend connection state.
+     */
+    void SetConnectionState(PVR_CONNECTION_STATE state);
+
+    /*!
+     * @brief Gets the backend's previous connection state.
+     * @return the backend's previous  connection state.
+     */
+    PVR_CONNECTION_STATE GetPreviousConnectionState(void) const;
+
+    /*!
+     * @brief signal to PVRMananager this client should be ignored
+     * @return true if this client should be ignored
+     */
+    bool IgnoreClient(void) const;
+
+    /*!
+     * @return The ID of this instance.
+     */
+    int GetID(void) const;
+
+    //@}
+    /** @name PVR server methods */
+    //@{
+
+    /*!
+     * @brief Query this add-on's capabilities.
+     * @return pCapabilities The add-on's capabilities.
+     */
+    PVR_ADDON_CAPABILITIES GetAddonCapabilities(void) const;
+
+    /*!
+     * @brief Get the stream properties of the stream that's currently being read.
+     * @param pProperties The properties.
+     * @return PVR_ERROR_NO_ERROR if the properties have been fetched successfully.
+     */
+    PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES *pProperties);
+
+    /*!
+     * @return The name reported by the backend.
+     */
+    const std::string& GetBackendName(void) const;
+
+    /*!
+     * @return The version string reported by the backend.
+     */
+    const std::string& GetBackendVersion(void) const;
+
+    /*!
+     * @brief the ip address or alias of the pvr backend server
+     */
+    const std::string& GetBackendHostname(void) const;
+
+    /*!
+     * @return The connection string reported by the backend.
+     */
+    const std::string& GetConnectionString(void) const;
+
+    /*!
+     * @return A friendly name for this add-on that can be used in log messages.
+     */
+    const std::string& GetFriendlyName(void) const;
+
+    /*!
+     * @brief Get the disk space reported by the server.
+     * @param iTotal The total disk space.
+     * @param iUsed The used disk space.
+     * @return PVR_ERROR_NO_ERROR if the drive space has been fetched successfully.
+     */
+    PVR_ERROR GetDriveSpace(long long *iTotal, long long *iUsed);
+
+    /*!
+     * @brief Start a channel scan on the server.
+     * @return PVR_ERROR_NO_ERROR if the channel scan has been started successfully.
+     */
+    PVR_ERROR StartChannelScan(void);
+
+    /*!
+     * @brief Request the client to open dialog about given channel to add
+     * @param channel The channel to add
+     * @return PVR_ERROR_NO_ERROR if the add has been fetched successfully.
+     */
+    PVR_ERROR OpenDialogChannelAdd(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief Request the client to open dialog about given channel settings
+     * @param channel The channel to edit
+     * @return PVR_ERROR_NO_ERROR if the edit has been fetched successfully.
+     */
+    PVR_ERROR OpenDialogChannelSettings(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief Request the client to delete given channel
+     * @param channel The channel to delete
+     * @return PVR_ERROR_NO_ERROR if the delete has been fetched successfully.
+     */
+    PVR_ERROR DeleteChannel(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief Request the client to rename given channel
+     * @param channel The channel to rename
+     * @return PVR_ERROR_NO_ERROR if the rename has been fetched successfully.
+     */
+    PVR_ERROR RenameChannel(const CPVRChannelPtr &channel);
+
+    /*!
+     * @return True if this add-on has menu hooks, false otherwise.
+     */
+    bool HaveMenuHooks(PVR_MENUHOOK_CAT cat) const;
+
+    /*!
+     * @return The menu hooks for this add-on.
+     */
+    PVR_MENUHOOKS *GetMenuHooks(void);
+
+    /*!
+     * @brief Call one of the menu hooks of this client.
+     * @param hook The hook to call.
+     * @param item The selected file item for which the hook was called.
+     */
+    void CallMenuHook(const PVR_MENUHOOK &hook, const CFileItem *item);
+
+    //@}
+    /** @name PVR EPG methods */
+    //@{
+
+    /*!
+     * @brief Request an EPG table for a channel from the client.
+     * @param channel The channel to get the EPG table for.
+     * @param epg The table to write the data to.
+     * @param start The start time to use.
+     * @param end The end time to use.
+     * @param bSaveInDb If true, tell the callback method to save any new entry in the database or not. see CAddonCallbacksPVR::PVRTransferEpgEntry()
+     * @return PVR_ERROR_NO_ERROR if the table has been fetched successfully.
+     */
+    PVR_ERROR GetEPGForChannel(const CPVRChannelPtr &channel, EPG::CEpg *epg, time_t start = 0, time_t end = 0, bool bSaveInDb = false);
+
+    /*!
+     * Tell the client the time frame to use when notifying epg events back to Kodi. The client might push epg events asynchronously
+     * to Kodi using the callback function EpgEventStateChange. To be able to only push events that are actually of interest for Kodi,
+     * client needs to know about the epg time frame Kodi uses.
+     * @param iDays number of days from "now". EPG_TIMEFRAME_UNLIMITED means that Kodi is interested in all epg events, regardless of event times.
+     * @return PVR_ERROR_NO_ERROR if new value was successfully set.
+     */
+    PVR_ERROR SetEPGTimeFrame(int iDays);
+
+    //@}
+    /** @name PVR channel group methods */
+    //@{
+
+    /*!
+      * @return The total amount of channel groups on the server or -1 on error.
+      */
+    int GetChannelGroupsAmount(void);
+
+    /*!
+     * @brief Request the list of all channel groups from the backend.
+     * @param groups The groups container to get the groups for.
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetChannelGroups(CPVRChannelGroups *groups);
+
+    /*!
+     * @brief Request the list of all group members from the backend.
+     * @param groups The group to get the members for.
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetChannelGroupMembers(CPVRChannelGroup *group);
+
+    //@}
+    /** @name PVR channel methods */
+    //@{
+
+    /*!
+     * @return The total amount of channels on the server or -1 on error.
+     */
+    int GetChannelsAmount(void);
+
+    /*!
+     * @brief Request the list of all channels from the backend.
+     * @param channels The channel group to add the channels to.
+     * @param bRadio True to get the radio channels, false to get the TV channels.
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetChannels(CPVRChannelGroup &channels, bool bRadio);
+
+    //@}
+    /** @name PVR recording methods */
+    //@{
+
+    /*!
+     * @param deleted if set return deleted recording
+     * @return The total amount of recordingd on the server or -1 on error.
+     */
+    int GetRecordingsAmount(bool deleted);
+
+    /*!
+     * @brief Request the list of all recordings from the backend.
+     * @param results The container to add the recordings to.
+     * @param deleted if set return deleted recording
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetRecordings(CPVRRecordings *results, bool deleted);
+
+    /*!
+     * @brief Delete a recording on the backend.
+     * @param recording The recording to delete.
+     * @return PVR_ERROR_NO_ERROR if the recording has been deleted successfully.
+     */
+    PVR_ERROR DeleteRecording(const CPVRRecording &recording);
+
+    /*!
+     * @brief Undelete a recording on the backend.
+     * @param recording The recording to undelete.
+     * @return PVR_ERROR_NO_ERROR if the recording has been undeleted successfully.
+     */
+    PVR_ERROR UndeleteRecording(const CPVRRecording &recording);
+
+    /*!
+     * @brief Delete all recordings permanent which in the deleted folder on the backend.
+     * @return PVR_ERROR_NO_ERROR if the recordings has been deleted successfully.
+     */
+    PVR_ERROR DeleteAllRecordingsFromTrash();
+
+    /*!
+     * @brief Rename a recording on the backend.
+     * @param recording The recording to rename.
+     * @return PVR_ERROR_NO_ERROR if the recording has been renamed successfully.
+     */
+    PVR_ERROR RenameRecording(const CPVRRecording &recording);
+
+    /*!
+     * @brief Set the play count of a recording on the backend.
+     * @param recording The recording to set the play count.
+     * @param count Play count.
+     * @return PVR_ERROR_NO_ERROR if the recording's play count has been set successfully.
+     */
+    PVR_ERROR SetRecordingPlayCount(const CPVRRecording &recording, int count);
+
+    /*!
+    * @brief Set the last watched position of a recording on the backend.
+    * @param recording The recording.
+    * @param position The last watched position in seconds
+    * @return PVR_ERROR_NO_ERROR if the position has been stored successfully.
+    */
+    PVR_ERROR SetRecordingLastPlayedPosition(const CPVRRecording &recording, int lastplayedposition);
+
+    /*!
+    * @brief Retrieve the last watched position of a recording on the backend.
+    * @param recording The recording.
+    * @return The last watched position in seconds or -1 on error
+    */
+    int GetRecordingLastPlayedPosition(const CPVRRecording &recording);
+
+    /*!
+    * @brief Retrieve the edit decision list (EDL) from the backend.
+    * @param recording The recording.
+    * @return The edit decision list (empty on error).
+    */
+    std::vector<PVR_EDL_ENTRY> GetRecordingEdl(const CPVRRecording &recording);
+
+    //@}
+    /** @name PVR timer methods */
+    //@{
+
+    /*!
+     * @return The total amount of timers on the backend or -1 on error.
+     */
+    int GetTimersAmount(void);
+
+    /*!
+     * @brief Request the list of all timers from the backend.
+     * @param results The container to store the result in.
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetTimers(CPVRTimers *results);
+
+    /*!
+     * @brief Add a timer on the backend.
+     * @param timer The timer to add.
+     * @return PVR_ERROR_NO_ERROR if the timer has been added successfully.
+     */
+    PVR_ERROR AddTimer(const CPVRTimerInfoTag &timer);
+
+    /*!
+     * @brief Delete a timer on the backend.
+     * @param timer The timer to delete.
+     * @param bForce Set to true to delete a timer that is currently recording a program.
+     * @return PVR_ERROR_NO_ERROR if the timer has been deleted successfully.
+     */
+    PVR_ERROR DeleteTimer(const CPVRTimerInfoTag &timer, bool bForce = false);
+
+    /*!
+     * @brief Rename a timer on the server.
+     * @param timer The timer to rename.
+     * @param strNewName The new name of the timer.
+     * @return PVR_ERROR_NO_ERROR if the timer has been renamed successfully.
+     */
+    PVR_ERROR RenameTimer(const CPVRTimerInfoTag &timer, const std::string &strNewName);
+
+    /*!
+     * @brief Update the timer information on the server.
+     * @param timer The timer to update.
+     * @return PVR_ERROR_NO_ERROR if the timer has been updated successfully.
+     */
+    PVR_ERROR UpdateTimer(const CPVRTimerInfoTag &timer);
+
+    /*!
+     * @brief Get all timer types supported by the backend.
+     * @param results The container to store the result in.
+     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
+     */
+    PVR_ERROR GetTimerTypes(CPVRTimerTypes& results) const;
+
+    //@}
+    /** @name PVR live stream methods */
+    //@{
+
+    /*!
+     * @brief Open a live stream on the server.
+     * @param channel The channel to stream.
+     * @param bIsSwitchingChannel True when switching channels, false otherwise.
+     * @return True if the stream opened successfully, false otherwise.
+     */
+    bool OpenStream(const CPVRChannelPtr &channel, bool bIsSwitchingChannel);
+
+    /*!
+     * @brief Close an open live stream.
+     */
+    void CloseStream(void);
+
+    /*!
+     * @brief Read from an open live stream.
+     * @param lpBuf The buffer to store the data in.
+     * @param uiBufSize The amount of bytes to read.
+     * @return The amount of bytes that were actually read from the stream.
+     */
+    int ReadStream(void* lpBuf, int64_t uiBufSize);
+
+    /*!
+     * @brief Seek in a live stream on a backend that supports timeshifting.
+     * @param iFilePosition The position to seek to.
+     * @param iWhence ?
+     * @return The new position.
+     */
+    int64_t SeekStream(int64_t iFilePosition, int iWhence = SEEK_SET);
+
+    /*!
+     * @return The position in the stream that's currently being read.
+     */
+    int64_t GetStreamPosition(void);
+
+    /*!
+     * @return The total length of the stream that's currently being read.
+     */
+    int64_t GetStreamLength(void);
+
+    /*!
+     * @brief (Un)Pause a stream
+     */
+    void PauseStream(bool bPaused);
+
+    /*!
+     * @brief Switch to another channel. Only to be called when a live stream has already been opened.
+     * @param channel The channel to switch to.
+     * @return True if the switch was successful, false otherwise.
+     */
+    bool SwitchChannel(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief Get the signal quality of the stream that's currently open.
+     * @param qualityinfo The signal quality.
+     * @return True if the signal quality has been read successfully, false otherwise.
+     */
+    bool SignalQuality(PVR_SIGNAL_STATUS &qualityinfo);
+
+    /*!
+     * @brief Get the stream URL for a channel from the server. Used by the MediaPortal add-on.
+     * @param channel The channel to get the stream URL for.
+     * @return The requested URL.
+     */
+    std::string GetLiveStreamURL(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief Check whether PVR backend supports pausing the currently playing stream
+     */
+    bool CanPauseStream(void) const;
+
+    /*!
+     * @brief Check whether PVR backend supports seeking for the currently playing stream
+     */
+    bool CanSeekStream(void) const;
+
+    /*!
+     * Notify the pvr addon/demuxer that XBMC wishes to seek the stream by time
+     * @param time The absolute time since stream start
+     * @param backwards True to seek to keyframe BEFORE time, else AFTER
+     * @param startpts can be updated to point to where display should start
+     * @return True if the seek operation was possible
+     * @remarks Optional, and only used if addon has its own demuxer. Return False if this add-on won't provide this function.
+     */
+    bool SeekTime(int time, bool backwards, double *startpts);
+
+    /*!
+     * Notify the pvr addon/demuxer that XBMC wishes to change playback speed
+     * @param speed The requested playback speed
+     * @remarks Optional, and only used if addon has its own demuxer.
+     */
+    void SetSpeed(int speed);
+
+    //@}
+    /** @name PVR recording stream methods */
+    //@{
+
+    /*!
+     * @brief Open a recording on the server.
+     * @param recording The recording to open.
+     * @return True if the stream has been opened succesfully, false otherwise.
+     */
+    bool OpenStream(const CPVRRecordingPtr &recording);
+
+    //@}
+    /** @name PVR demultiplexer methods */
+    //@{
+
+    /*!
+     * @brief Reset the demultiplexer in the add-on.
+     */
+    void DemuxReset(void);
+
+    /*!
+     * @brief Abort the demultiplexer thread in the add-on.
+     */
+    void DemuxAbort(void);
+
+    /*!
+     * @brief Flush all data that's currently in the demultiplexer buffer in the add-on.
+     */
+    void DemuxFlush(void);
+
+    /*!
+     * @brief Read a packet from the demultiplexer.
+     * @return The packet.
+     */
+    DemuxPacket *DemuxRead(void);
+
+    //@}
+
+    bool SupportsChannelGroups(void) const;
+    bool SupportsChannelScan(void) const;
+    bool SupportsChannelSettings(void) const;
+    bool SupportsEPG(void) const;
+    bool SupportsLastPlayedPosition(void) const;
+    bool SupportsRadio(void) const;
+    bool SupportsRecordings(void) const;
+    bool SupportsRecordingsUndelete(void) const;
+    bool SupportsRecordingPlayCount(void) const;
+    bool SupportsRecordingEdl(void) const;
+    bool SupportsTimers(void) const;
+    bool SupportsTV(void) const;
+    bool HandlesDemuxing(void) const;
+    bool HandlesInputStream(void) const;
+
+    bool IsPlayingLiveStream(void) const;
+    bool IsPlayingLiveTV(void) const;
+    bool IsPlayingLiveRadio(void) const;
+    bool IsPlayingEncryptedChannel(void) const;
+    bool IsPlayingRecording(void) const;
+    bool IsPlaying(void) const;
+    CPVRRecordingPtr GetPlayingRecording(void) const;
+    CPVRChannelPtr GetPlayingChannel() const;
+
+    static const char *ToString(const PVR_ERROR error);
+
+    /*!
+     * @brief is timeshift active?
+     */
+    bool IsTimeshifting() const;
+
+    /*!
+     * @brief actual playing time
+     */
+    time_t GetPlayingTime() const;
+
+    /*!
+     * @brief time of oldest packet in timeshift buffer
+     */
+    time_t GetBufferTimeStart() const;
+
+    /*!
+     * @brief time of latest packet in timeshift buffer
+     */
+    time_t GetBufferTimeEnd() const;
+
+    /*!
+     * @return True if this add-on can be auto-configured via avahi, false otherwise
+     */
+    bool CanAutoconfigure(void) const;
+
+    /*!
+     * Registers the avahi type for this add-on
+     * @return True if registered, false if not.
+     */
+    bool AutoconfigureRegisterType(void);
+
+    /*!
+     * Try to auto-configure this add-on via avahi
+     * @return True if auto-configured and the configured was accepted by the user, false otherwise
+     */
+    bool Autoconfigure(void);
+
+    /*!
+     * @brief is real-time stream?
+     */
+    bool IsRealTimeStream() const;
+
+    /*!
+     * @brief reads the client's properties
+     */
+    bool GetAddonProperties(void);
+
+  private:
+    /*!
+     * @brief Checks whether the provided API version is compatible with XBMC
+     * @param minVersion The add-on's XBMC_PVR_MIN_API_VERSION version
+     * @param version The add-on's XBMC_PVR_API_VERSION version
+     * @return True when compatible, false otherwise
+     */
+    static bool IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version);
+
+    /*!
+     * @brief Checks whether the provided GUI API version is compatible with XBMC
+     * @param minVersion The add-on's XBMC_GUI_MIN_API_VERSION version
+     * @param version The add-on's XBMC_GUI_API_VERSION version
+     * @return True when compatible, false otherwise
+     */
+    static bool IsCompatibleGUIAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version);
+
+    /*!
+     * @brief Request the API version from the add-on, and check if it's compatible
+     * @return True when compatible, false otherwise.
+     */
+    bool CheckAPIVersion(void) override;
+
+    /*!
+     * @brief Resets all class members to their defaults. Called by the constructors.
+     */
+    void ResetProperties(int iClientId = PVR_INVALID_CLIENT_ID);
+
+    /*!
+     * @brief Copy over group info from xbmcGroup to addonGroup.
+     * @param xbmcGroup The group on XBMC's side.
+     * @param addonGroup The group on the addon's side.
+     */
+    static void WriteClientGroupInfo(const CPVRChannelGroup &xbmcGroup, PVR_CHANNEL_GROUP &addonGroup);
+
+    /*!
+     * @brief Copy over recording info from xbmcRecording to addonRecording.
+     * @param xbmcRecording The recording on XBMC's side.
+     * @param addonRecording The recording on the addon's side.
+     */
+    static void WriteClientRecordingInfo(const CPVRRecording &xbmcRecording, PVR_RECORDING &addonRecording);
+
+    /*!
+     * @brief Copy over timer info from xbmcTimer to addonTimer.
+     * @param xbmcTimer The timer on XBMC's side.
+     * @param addonTimer The timer on the addon's side.
+     */
+    static void WriteClientTimerInfo(const CPVRTimerInfoTag &xbmcTimer, PVR_TIMER &addonTimer);
+
+    /*!
+     * @brief Copy over channel info from xbmcChannel to addonClient.
+     * @param xbmcChannel The channel on XBMC's side.
+     * @param addonChannel The channel on the addon's side.
+     */
+    static void WriteClientChannelInfo(const CPVRChannelPtr &xbmcChannel, PVR_CHANNEL &addonChannel);
+
+    /*!
+     * @brief Whether a channel can be played by this add-on
+     * @param channel The channel to check.
+     * @return True when it can be played, false otherwise.
+     */
+    bool CanPlayChannel(const CPVRChannelPtr &channel) const;
+
+    bool LogError(const PVR_ERROR error, const char *strMethod) const;
+    void LogException(const std::exception &e, const char *strFunctionName) const;
+
+    bool                   m_bReadyToUse;          /*!< true if this add-on is initialised (ADDON_Create returned true), false otherwise */
+    PVR_CONNECTION_STATE   m_connectionState;      /*!< the backend connection state */
+    PVR_CONNECTION_STATE   m_prevConnectionState;  /*!< the previous backend connection state */
+    bool                   m_ignoreClient;         /*!< signals to PVRManager to ignore this client until it has been connected */
+    PVR_MENUHOOKS          m_menuhooks;            /*!< the menu hooks for this add-on */
+    CPVRTimerTypes         m_timertypes;           /*!< timer types supported by this backend */
+    int                    m_iClientId;            /*!< database ID of the client */
+
+    /* cached data */
+    std::string            m_strBackendName;       /*!< the cached backend version */
+    std::string            m_strBackendVersion;    /*!< the cached backend version */
+    std::string            m_strConnectionString;  /*!< the cached connection string */
+    std::string            m_strFriendlyName;      /*!< the cached friendly name */
+    PVR_ADDON_CAPABILITIES m_addonCapabilities;     /*!< the cached add-on capabilities */
+    std::string            m_strBackendHostname;    /*!< the cached backend hostname */
+
+    /* stored strings to make sure const char* members in PVR_PROPERTIES stay valid */
+    std::string                                    m_strUserPath;         /*!< @brief translated path to the user profile */
+    std::string                                    m_strClientPath;       /*!< @brief translated path to this add-on */
+    std::string                                    m_strAvahiType;        /*!< avahi service type */
+    std::string                                    m_strAvahiIpSetting;   /*!< add-on setting name to change to the found ip address */
+    std::string                                    m_strAvahiPortSetting; /*!< add-on setting name to change to the found port number */
+    bool                                           m_bNeedsConfiguration; /*!< add-on needs a user set configuration */
+    std::vector<CZeroconfBrowser::ZeroconfService> m_rejectedAvahiHosts;  /*!< hosts that were rejected by the user */
+
+    CCriticalSection m_critSection;
+
+    bool                m_bIsPlayingTV;
+    CPVRChannelPtr      m_playingChannel;
+    bool                m_bIsPlayingRecording;
+    CPVRRecordingPtr    m_playingRecording;
+    ADDON::AddonVersion m_apiVersion;
+    bool                m_bAvahiServiceAdded;
+  };
+}

_service:download_url:master.tar.gz/xbmc/addons/addon-bindings.mk Changed

@@ -12,7 +12,12 @@
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h
@@ -24,6 +29,7 @@
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h
+BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h
 BINDINGS+=xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h
 BINDINGS+=xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/AddonInterfaces.cpp Changed

@@ -30,6 +30,7 @@
 #include "addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h"
 #include "addons/binary/interfaces/api1/GUI/AddonGUIWindow.h"
 #include "addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h"
+#include "addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h"
 #include "addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h"
 #include "filesystem/SpecialProtocol.h"
 #include "messaging/ApplicationMessenger.h"
@@ -49,7 +50,8 @@
     m_helperPVR(nullptr),
     m_helperADSP(nullptr),
     m_helperCODEC(nullptr),
-    m_helperInputStream(nullptr)
+    m_helperInputStream(nullptr),
+    m_helperPeripheral(nullptr)
 {
   m_callbacks->libBasePath                  = strdup(CSpecialProtocol::TranslatePath("special://xbmcbin/addons").c_str());
   m_callbacks->addonData                    = this;
@@ -68,6 +70,8 @@
   m_callbacks->CodecLib_UnRegisterMe        = CAddonInterfaces::CodecLib_UnRegisterMe;
   m_callbacks->INPUTSTREAMLib_RegisterMe    = CAddonInterfaces::INPUTSTREAMLib_RegisterMe;
   m_callbacks->INPUTSTREAMLib_UnRegisterMe  = CAddonInterfaces::INPUTSTREAMLib_UnRegisterMe;
+  m_callbacks->PeripheralLib_RegisterMe     = CAddonInterfaces::PeripheralLib_RegisterMe;
+  m_callbacks->PeripheralLib_UnRegisterMe   = CAddonInterfaces::PeripheralLib_UnRegisterMe;
 }
 
 CAddonInterfaces::~CAddonInterfaces()
@@ -79,6 +83,7 @@
   delete static_cast<V1::KodiAPI::AudioDSP::CAddonCallbacksADSP*>(m_helperADSP);
   delete static_cast<V1::KodiAPI::Codec::CAddonCallbacksCodec*>(m_helperCODEC);
   delete static_cast<V1::KodiAPI::InputStream::CAddonCallbacksInputStream*>(m_helperInputStream);
+  delete static_cast<V1::KodiAPI::Peripheral::CAddonCallbacksPeripheral*>(m_helperPeripheral);
 
   free((char*)m_callbacks->libBasePath);
   delete m_callbacks;
@@ -277,6 +282,33 @@
 }
 /*\_____________________________________________________________________________
 \*/
+CB_PeripheralLib* CAddonInterfaces::PeripheralLib_RegisterMe(void *addonData)
+{
+  CAddonInterfaces* addon = static_cast<CAddonInterfaces*>(addonData);
+  if (addon == nullptr)
+  {
+    CLog::Log(LOGERROR, "CAddonInterfaces - %s - called with a null pointer", __FUNCTION__);
+    return nullptr;
+  }
+
+  addon->m_helperPeripheral = new V1::KodiAPI::Peripheral::CAddonCallbacksPeripheral(addon->m_addon);
+  return static_cast<V1::KodiAPI::Peripheral::CAddonCallbacksPeripheral*>(addon->m_helperPeripheral)->GetCallbacks();
+}
+
+void CAddonInterfaces::PeripheralLib_UnRegisterMe(void *addonData, CB_PeripheralLib* cbTable)
+{
+  CAddonInterfaces* addon = static_cast<CAddonInterfaces*>(addonData);
+  if (addon == nullptr)
+  {
+    CLog::Log(LOGERROR, "CAddonInterfaces - %s - called with a null pointer", __FUNCTION__);
+    return;
+  }
+
+  delete static_cast<V1::KodiAPI::Peripheral::CAddonCallbacksPeripheral*>(addon->m_helperPeripheral);
+  addon->m_helperPeripheral = nullptr;
+}
+/*\_____________________________________________________________________________
+\*/
 void CAddonInterfaces::OnApplicationMessage(ThreadMessage* pMsg)
 {
   switch (pMsg->dwMessage)
@@ -297,4 +329,4 @@
   }
 }
 
-}; /* namespace ADDON */
+} /* namespace ADDON */

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/AddonInterfaces.h Changed

@@ -21,6 +21,7 @@
  */
 
 #include "IAddonInterface.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h"
 
 #include <stdint.h>
 
@@ -46,6 +47,8 @@
 typedef void (*KODICodecLib_UnRegisterMe)(void *addonData, void *cbTable);
 typedef void* (*KODIINPUTSTREAMLib_RegisterMe)(void *addonData);
 typedef void (*KODIINPUTSTREAMLib_UnRegisterMe)(void *addonData, void *cbTable);
+typedef CB_PeripheralLib* (*KODIPeripheralLib_RegisterMe)(void *addonData);
+typedef void (*KODIPeripheralLib_UnRegisterMe)(void *addonData, CB_PeripheralLib *cbTable);
 
 typedef struct AddonCB
 {
@@ -65,6 +68,8 @@
   KODIADSPLib_UnRegisterMe          ADSPLib_UnRegisterMe;
   KODIINPUTSTREAMLib_RegisterMe     INPUTSTREAMLib_RegisterMe;
   KODIINPUTSTREAMLib_UnRegisterMe   INPUTSTREAMLib_UnRegisterMe;
+  KODIPeripheralLib_RegisterMe      PeripheralLib_RegisterMe;
+  KODIPeripheralLib_UnRegisterMe    PeripheralLib_UnRegisterMe;
 } AddonCB;
 
 
@@ -117,6 +122,11 @@
     static void*        INPUTSTREAMLib_RegisterMe      (void *addonData);
     static void         INPUTSTREAMLib_UnRegisterMe    (void *addonData, void* cbTable);
     void*               GetHelperInputStream()        { return m_helperInputStream; }
+    /*\_________________________________________________________________________
+    \*/
+    static CB_PeripheralLib* PeripheralLib_RegisterMe  (void *addonData);
+    static void         PeripheralLib_UnRegisterMe     (void *addonData, CB_PeripheralLib* cbTable);
+    void*               GetHelperPeripheral()         { return m_helperPeripheral; }
     /*
      * API level independent functions for Kodi
      */
@@ -133,6 +143,7 @@
     void*     m_helperADSP;
     void*     m_helperCODEC;
     void*     m_helperInputStream;
+    void*     m_helperPeripheral;
   };
 
-}; /* namespace ADDON */
+} /* namespace ADDON */

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/IAddonInterface.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.cpp Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/InputStream/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.cpp Changed

@@ -28,7 +28,7 @@
 #include "events/EventLog.h"
 #include "events/NotificationEvent.h"
 #include "pvr/PVRManager.h"
-#include "pvr/addons/PVRClient.h"
+#include "addons/PVRClient.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/channels/PVRChannelGroupInternal.h"
 #include "pvr/recordings/PVRRecordings.h"
@@ -51,7 +51,7 @@
 {
 
 CAddonCallbacksPVR::CAddonCallbacksPVR(CAddon* addon)
-  : ADDON::IAddonInterface(addon, APILevel(), Version()),
+  : ADDON::IAddonInterface(addon, 1, XBMC_PVR_API_VERSION),
     m_callbacks(new CB_PVRLib)
 {
   /* write XBMC PVR specific add-on function addresses to callback table */
@@ -341,53 +341,11 @@
 
   client->SetConnectionState(newState);
 
-  int iMsg(-1);
-  bool bError(true);
-  bool bNotify(true);
+  std::string msg;
+  if (strMessage != nullptr)
+    msg = strMessage;
 
-  switch (newState)
-  {
-    case PVR_CONNECTION_STATE_SERVER_UNREACHABLE:
-      iMsg = 35505; // Server is unreachable
-      break;
-    case PVR_CONNECTION_STATE_SERVER_MISMATCH:
-      iMsg = 35506; // Server does not respond properly
-      break;
-    case PVR_CONNECTION_STATE_VERSION_MISMATCH:
-      iMsg = 35507; // Server version is not compatible
-      break;
-    case PVR_CONNECTION_STATE_ACCESS_DENIED:
-      iMsg = 35508; // Access denied
-      break;
-    case PVR_CONNECTION_STATE_CONNECTED:
-      iMsg = 36034; // Connection established
-      bError = false;
-      // No notification for the first successful connect.
-      bNotify = (prevState != PVR_CONNECTION_STATE_UNKNOWN);
-      break;
-    case PVR_CONNECTION_STATE_DISCONNECTED:
-      iMsg = 36030; // Connection lost
-      break;
-    default:
-      CLog::Log(LOGERROR, "PVR - %s - unknown connection state", __FUNCTION__);
-      return;
-  }
-
-  // Use addon-supplied message, if present
-  std::string strMsg;
-  if (strMessage && strlen(strMessage) > 0)
-    strMsg = strMessage;
-  else
-    strMsg = g_localizeStrings.Get(iMsg);
-
-  // Notify user.
-  if (bNotify && !CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_HIDECONNECTIONLOSTWARNING))
-    CGUIDialogKaiToast::QueueNotification(
-      bError ? CGUIDialogKaiToast::Error : CGUIDialogKaiToast::Info, client->Name().c_str(), strMsg, 5000, true);
-
-  // Write event log entry.
-  CEventLog::GetInstance().Add(EventPtr(new CNotificationEvent(
-    client->Name(), strMsg, client->Icon(), bError ? EventLevel::Error : EventLevel::Information)));
+  g_PVRManager.ConnectionStateChange(client->GetID(), std::string(strConnectionString), newState, msg);
 }
 
 typedef struct EpgEventStateChange
@@ -437,9 +395,6 @@
     return;
   }
 
-  CLog::Log(LOGDEBUG, "PVR - %s - state for epg event '%d' on channel '%d' on client '%s' changed to '%d'.",
-            __FUNCTION__, tag->iUniqueBroadcastId, iUniqueChannelId, client->Name().c_str(), newState);
-
   static CCriticalSection queueMutex;
   static std::vector<EpgEventStateChange> queuedChanges;
 
@@ -471,7 +426,7 @@
   }
 }
 
-}; /* namespace PVR */
+} /* namespace PVR */
 
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h Changed

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Peripheral Added

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp Added

@@ -0,0 +1,81 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonCallbacksPeripheral.h"
+#include "peripherals/Peripherals.h"
+#include "peripherals/addons/PeripheralAddon.h"
+#include "utils/log.h"
+
+using namespace ADDON;
+using namespace PERIPHERALS;
+
+namespace V1
+{
+namespace KodiAPI
+{
+
+namespace Peripheral
+{
+
+CAddonCallbacksPeripheral::CAddonCallbacksPeripheral(ADDON::CAddon* addon)
+  : ADDON::IAddonInterface(addon, 1, PERIPHERAL_API_VERSION),
+    m_callbacks(new CB_PeripheralLib)
+{
+  /* write Kodi peripheral specific add-on function addresses to callback table */
+  m_callbacks->TriggerScan               = TriggerScan;
+  m_callbacks->RefreshButtonMaps         = RefreshButtonMaps;
+}
+
+CAddonCallbacksPeripheral::~CAddonCallbacksPeripheral()
+{
+  /* delete the callback table */
+  delete m_callbacks;
+}
+
+CPeripheralAddon* CAddonCallbacksPeripheral::GetPeripheralAddon(void* addonData, const char* strFunction)
+{
+  CAddonInterfaces* addon = static_cast<CAddonInterfaces*>(addonData);
+  if (!addon || !addon->GetHelperPeripheral())
+  {
+    CLog::Log(LOGERROR, "PERIPHERAL - %s - called with a null pointer", strFunction);
+    return NULL;
+  }
+
+  return dynamic_cast<CPeripheralAddon*>(static_cast<CAddonCallbacksPeripheral*>(addon->GetHelperPeripheral())->m_addon);
+}
+
+void CAddonCallbacksPeripheral::TriggerScan(void* addonData)
+{
+  g_peripherals.TriggerDeviceScan(PERIPHERAL_BUS_ADDON);
+}
+
+void CAddonCallbacksPeripheral::RefreshButtonMaps(void* addonData, const char* deviceName, const char* controllerId)
+{
+  CPeripheralAddon* peripheralAddon = GetPeripheralAddon(addonData, __FUNCTION__);
+  if (!peripheralAddon)
+    return;
+
+  peripheralAddon->RefreshButtonMaps(deviceName ? deviceName : "", controllerId ? controllerId : "");
+}
+
+} /* namespace Peripheral */
+
+} /* namespace KodiAPI */
+} /* namespace V1 */

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h Added

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "addons/binary/interfaces/AddonInterfaces.h"
+
+namespace PERIPHERALS { class CPeripheralAddon; }
+
+namespace V1
+{
+namespace KodiAPI
+{
+
+namespace Peripheral
+{
+
+/*!
+ * Callbacks for a peripheral add-on to Kodi
+ */
+class CAddonCallbacksPeripheral : public ADDON::IAddonInterface
+{
+public:
+  CAddonCallbacksPeripheral(ADDON::CAddon* addon);
+  ~CAddonCallbacksPeripheral(void);
+
+  /*!
+   * @return The callback table
+   */
+  CB_PeripheralLib* GetCallbacks() const { return m_callbacks; }
+
+  static void TriggerScan(void* addonData);
+  static void RefreshButtonMaps(void* addonData, const char* deviceName, const char* controllerId);
+
+private:
+  static PERIPHERALS::CPeripheralAddon* GetPeripheralAddon(void* addonData, const char* strFunction);
+
+  CB_PeripheralLib*  m_callbacks; /*!< callback addresses */
+};
+
+} /* namespace Peripheral */
+
+} /* namespace KoidAPI */
+} /* namespace V1 */

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Peripheral/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/addons/binary/interfaces/api1/Peripheral/Makefile Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/.gitignore Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile Added

@@ -0,0 +1,2460 @@
+# Doxyfile 1.8.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Kodi Development"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 17.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "for Binary (API Level 2) and Script based Add-Ons"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ./kodi-dev.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../doxygen-generated
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = .
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = YES
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = "table_start=<table width= 100% style= border bgcolor= 576f9f border= 0>" \
+                         "table_end=</table>" \
+                         "table_h2_l{2}=<tr bgcolor= 576f9f><th width= 40% align=left>\1</th><th width= 60% align=left>\2</th></tr>" \
+                         "table_row2_l{2}=<tr bgcolor=white><td width= 40% align=left>\1</td><td width= 60% align=left>\2</td></tr>" \
+                         "table_h3{3}=<tr bgcolor= 576f9f><th width= 30% align=left>\1</th><th width= 10% align=left>\2</th><th width= 60% align=left>\3</th></tr>" \
+                         "table_row3{3}=<tr bgcolor=white><td width= 30% align=left>\1</td><td width= 10% align=left>\2</td><td width= 60% align=left>\3</td></tr>"
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = NO
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = YES
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = YES
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = NO
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = DoxygenLayout.xml
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = main.txt \
+                         ../../../GUIInfoManager.cpp \
+                         Modules/modules_general.dox \
+                         ../../../interfaces/builtins/AddonBuiltins.cpp \
+                         ../../../interfaces/builtins/AndroidBuiltins.cpp \
+                         ../../../interfaces/builtins/ApplicationBuiltins.cpp \
+                         ../../../interfaces/builtins/CECBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIContainerBuiltins.cpp \
+                         ../../../interfaces/builtins/GUIControlBuiltins.cpp \
+                         ../../../interfaces/builtins/LibraryBuiltins.cpp \
+                         ../../../interfaces/builtins/OpticalBuiltins.cpp \
+                         ../../../interfaces/builtins/PictureBuiltins.cpp \
+                         ../../../interfaces/builtins/PlayerBuiltins.cpp \
+                         ../../../interfaces/builtins/ProfileBuiltins.cpp \
+                         ../../../interfaces/builtins/PVRBuiltins.cpp \
+                         ../../../interfaces/builtins/SkinBuiltins.cpp \
+                         ../../../interfaces/builtins/SystemBuiltins.cpp \
+                         ../../../interfaces/builtins/WeatherBuiltins.cpp \
+                         ../../../pictures/PictureInfoTag.cpp
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.as \
+                         *.js \
+                         *.GPL
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = .
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = .
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = LICENSE.GPL
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = YES
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             = 
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               = 
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           = 
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      = 
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen/Modules/modules_general.dox Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen/kodi-dev.png Added

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/doxygen/main.txt Added

@@ -0,0 +1,48 @@
+/*!
+
+@mainpage
+
+### Welcome to the Documentation of Kodi for Add-On Development.
+
+__Kodi®__ media center, formerly known as XBMC Media Center, is a free and
+open-source media player software developed by the XBMC Foundation, a non-profit
+technology consortium. Kodi is available for multiple operating systems and
+hardware platforms, with a software 10-foot user interface for use with
+televisions and remote controls. It allows users to play and view most videos,
+music, such as audio and video podcasts from the internet, and all common
+digital media files from local and network storage media.
+
+Add-ons are extensions that can be run from inside the Kodi GUI and in
+addition to binary add-ons for the use of different systems. They are usual
+written by third party developers and published to our official repository.
+Add-ons can also be published in other repositories or as stand alone zip
+files anywhere on the internet. Examples of Add-ons include video website
+streams, scrapers, skins and scripts.
+
+#### Supported systems
+
+Currently support Kodi Add-Ons based upon Python and C++.
+
+#### Tutorials and Examples
+
+In the distribution of the library  you find the two directories *tutorials*
+and *examples*. They contain subdirectories for the packages...
+The demos use third party libraries for the graphical user interface. The
+examples don't have this dependency and most examples are refered to in the
+user manual.
+
+#### License
+
+Kodi is distributed under a [GNU General Public License version 2](./LICENSE.GPL).
+
+\htmlonly
+<div style="display:none">
+\endhtmlonly
+
+\subpage general_parts
+
+\htmlonly
+</div>
+\endhtmlonly
+
+*/

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h Changed

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h Added

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#ifndef __PERIPHERAL_CALLBACKS_H__
+#define __PERIPHERAL_CALLBACKS_H__
+
+#include "kodi_peripheral_types.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+typedef struct CB_PeripheralLib
+{
+  /*!
+   * @brief Trigger a scan for peripherals
+   *
+   * The add-on calls this if a change in hardware is detected.
+   */
+  void (*TriggerScan)(void* addonData);
+
+  /*!
+   * @brief Notify the frontend that button maps have changed
+   *
+   * @param[optional] deviceName The name of the device to refresh, or empty/null for all devices
+   * @param[optional] controllerId The controller ID to refresh, or empty/null for all controllers
+   */
+  void (*RefreshButtonMaps)(void* addonData, const char* deviceName, const char* controllerId);
+
+} CB_PeripheralLib;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PERIPHERAL_CALLBACKS_H__

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h Added

@@ -0,0 +1,198 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#ifndef __PERIPHERAL_DLL_H__
+#define __PERIPHERAL_DLL_H__
+
+#include "kodi_peripheral_types.h"
+
+#define PERIPHERAL_ADDON_JOYSTICKS // TODO
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  /// @name Peripheral operations
+  ///{
+  /*!
+   * @brief  Get the PERIPHERAL_API_VERSION used to compile this peripheral add-on
+   * @return KODI_PERIPHERAL_API_VERSION from kodi_peripheral_types.h
+   * @remarks Valid implementation required
+   *
+   * Used to check if the implementation is compatible with the frontend.
+   */
+  const char* GetPeripheralAPIVersion(void);
+
+  /*!
+   * @brief Get the KODI_PERIPHERAL_MIN_API_VERSION used to compile this peripheral add-on
+   * @return KODI_PERIPHERAL_MIN_API_VERSION from kodi_peripheral_types.h
+   * @remarks Valid implementation required
+   *
+   * Used to check if the implementation is compatible with the frontend.
+   */
+  const char* GetMinimumPeripheralAPIVersion(void);
+
+  /*!
+   * @brief Get the list of features that this add-on provides
+   * @param pCapabilities The add-on's capabilities.
+   * @return PERIPHERAL_NO_ERROR if the properties were fetched successfully.
+   * @remarks Valid implementation required.
+   *
+   * Called by the frontend to query the add-on's capabilities and supported
+   * peripherals. All capabilities that the add-on supports should be set to true.
+   *
+   */
+  PERIPHERAL_ERROR GetAddonCapabilities(PERIPHERAL_CAPABILITIES *pCapabilities);
+
+  /*!
+   * @brief Perform a scan for joysticks
+   * @param peripheral_count  Assigned to the number of peripherals allocated
+   * @param scan_results      Assigned to allocated memory
+   * @return PERIPHERAL_NO_ERROR if successful; peripherals must be freed using
+   * FreeScanResults() in this case
+   *
+   * The frontend calls this when a hardware change is detected. If an add-on
+   * detects a hardware change, it can trigger this function using the
+   * TriggerScan() callback.
+   */
+  PERIPHERAL_ERROR PerformDeviceScan(unsigned int* peripheral_count, PERIPHERAL_INFO** scan_results);
+
+  /*!
+   * @brief Free the memory allocated in PerformDeviceScan()
+   *
+   * Must be called if PerformDeviceScan() returns PERIPHERAL_NO_ERROR.
+   *
+   * @param peripheral_count  The number of events allocated for the events array
+   * @param scan_results      The array of allocated peripherals
+   */
+  void FreeScanResults(unsigned int peripheral_count, PERIPHERAL_INFO* scan_results);
+
+  /*!
+   * @brief Get all events that have occurred since the last call to GetEvents()
+   * @return PERIPHERAL_NO_ERROR if successful; events must be freed using
+   * FreeEvents() in this case
+   */
+  PERIPHERAL_ERROR GetEvents(unsigned int* event_count, PERIPHERAL_EVENT** events);
+
+  /*!
+   * @brief Free the memory allocated in GetEvents()
+   *
+   * Must be called if GetEvents() returns PERIPHERAL_NO_ERROR.
+   *
+   * @param event_count  The number of events allocated for the events array
+   * @param events       The array of allocated events
+   */
+  void FreeEvents(unsigned int event_count, PERIPHERAL_EVENT* events);
+  ///}
+
+  /// @name Joystick operations
+  /*!
+   * @note #define PERIPHERAL_ADDON_JOYSTICKS before including kodi_peripheral_dll.h
+   * in the add-on if the add-on provides joysticks and add provides_joysticks="true"
+   * to the kodi.peripheral extension point node in addon.xml.
+   */
+  ///{
+#ifdef PERIPHERAL_ADDON_JOYSTICKS
+  /*!
+   * @brief Get extended info about an attached joystick
+   * @param index  The joystick's driver index
+   * @param info   The container for the allocated joystick info
+   * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
+   *         FreeJoystickInfo() in this case
+   */
+  PERIPHERAL_ERROR GetJoystickInfo(unsigned int index, JOYSTICK_INFO* info);
+
+  /*!
+   * @brief Free the memory allocated in GetJoystickInfo()
+   */
+  void FreeJoystickInfo(JOYSTICK_INFO* info);
+
+  /*!
+   * @brief Get the features that allow translating the joystick into the controller profile
+   * @param joystick      The device's joystick properties; unknown values may be left at their default
+   * @param controller_id The controller profile being requested, e.g. game.controller.default
+   * @param feature_count The number of features allocated for the features array
+   * @param features      The array of allocated features
+   * @return PERIPHERAL_NO_ERROR if successful; array must be freed using
+   *         FreeButtonMap() in this case
+   */
+  PERIPHERAL_ERROR GetFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
+                               unsigned int* feature_count, JOYSTICK_FEATURE** features);
+
+  /*!
+   * @brief Free the memory allocated in GetFeatures()
+   *
+   * Must be called if GetFeatures() returns PERIPHERAL_NO_ERROR.
+   *
+   * @param feature_count  The number of features allocated for the features array
+   * @param features       The array of allocated features
+   */
+  void FreeFeatures(unsigned int feature_count, JOYSTICK_FEATURE* features);
+
+  /*!
+   * @brief Add or update joystick features
+   * @param joystick      The device's joystick properties; unknown values may be left at their default
+   * @param controller_id The game controller profile being updated
+   * @param feature_count The number of features int the features array
+   * @param features      The array of features
+   * @return PERIPHERAL_NO_ERROR if successful
+   */
+  PERIPHERAL_ERROR MapFeatures(const JOYSTICK_INFO* joystick, const char* controller_id,
+                               unsigned int feature_count, JOYSTICK_FEATURE* features);
+
+  /*!
+   * @brief Reset the button map for the given joystick and controller profile ID
+   * @param joystick      The device's joystick properties
+   * @param controller_id The game controller profile being reset
+   */
+  void ResetButtonMap(const JOYSTICK_INFO* joystick, const char* controller_id);
+#endif
+  ///}
+
+  /*!
+   * Called by the frontend to assign the function pointers of this add-on to
+   * pClient. Note that get_addon() is defined here, so it will be available in
+   * all compiled peripheral add-ons.
+   */
+  void __declspec(dllexport) get_addon(struct PeripheralAddon* pClient)
+  {
+    pClient->GetPeripheralAPIVersion        = GetPeripheralAPIVersion;
+    pClient->GetMinimumPeripheralAPIVersion = GetMinimumPeripheralAPIVersion;
+    pClient->GetAddonCapabilities           = GetAddonCapabilities;
+    pClient->PerformDeviceScan              = PerformDeviceScan;
+    pClient->FreeScanResults                = FreeScanResults;
+    pClient->GetEvents                      = GetEvents;
+    pClient->FreeEvents                     = FreeEvents;
+
+#ifdef PERIPHERAL_ADDON_JOYSTICKS
+    pClient->GetJoystickInfo                = GetJoystickInfo;
+    pClient->FreeJoystickInfo               = FreeJoystickInfo;
+    pClient->GetFeatures                    = GetFeatures;
+    pClient->FreeFeatures                   = FreeFeatures;
+    pClient->MapFeatures                    = MapFeatures;
+    pClient->ResetButtonMap                 = ResetButtonMap;
+#endif
+  }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PERIPHERAL_DLL_H__

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h Added

@@ -0,0 +1,301 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#ifndef __PERIPHERAL_TYPES_H__
+#define __PERIPHERAL_TYPES_H__
+
+#ifdef TARGET_WINDOWS
+  #include <windows.h>
+#else
+  #ifndef __cdecl
+    #define __cdecl
+  #endif
+  #ifndef __declspec
+    #define __declspec(X)
+  #endif
+#endif
+
+#include <stdint.h>
+
+#undef ATTRIBUTE_PACKED
+#undef PRAGMA_PACK_BEGIN
+#undef PRAGMA_PACK_END
+
+#if defined(__GNUC__)
+  #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+    #define ATTRIBUTE_PACKED __attribute__ ((packed))
+    #define PRAGMA_PACK 0
+  #endif
+#endif
+
+#if !defined(ATTRIBUTE_PACKED)
+  #define ATTRIBUTE_PACKED
+  #define PRAGMA_PACK 1
+#endif
+
+/* current Peripheral API version */
+#define PERIPHERAL_API_VERSION "1.0.17"
+
+/* min. Peripheral API version */
+#define PERIPHERAL_MIN_API_VERSION "1.0.16"
+
+/* indicates a joystick has no preference for port number */
+#define NO_PORT_REQUESTED     (-1)
+
+/* joystick's driver button/hat/axis index is unknown */
+#define DRIVER_INDEX_UNKNOWN  (-1)
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+  /// @name Peripheral types
+  ///{
+  typedef enum PERIPHERAL_ERROR
+  {
+    PERIPHERAL_NO_ERROR                      =  0, // no error occurred
+    PERIPHERAL_ERROR_UNKNOWN                 = -1, // an unknown error occurred
+    PERIPHERAL_ERROR_FAILED                  = -2, // the command failed
+    PERIPHERAL_ERROR_INVALID_PARAMETERS      = -3, // the parameters of the method are invalid for this operation
+    PERIPHERAL_ERROR_NOT_IMPLEMENTED         = -4, // the method that the frontend called is not implemented
+    PERIPHERAL_ERROR_NOT_CONNECTED           = -5, // no peripherals are connected
+    PERIPHERAL_ERROR_CONNECTION_FAILED       = -6, // peripherals are connected, but command was interrupted
+  } PERIPHERAL_ERROR;
+
+  typedef enum PERIPHERAL_TYPE
+  {
+    PERIPHERAL_TYPE_UNKNOWN,
+    PERIPHERAL_TYPE_JOYSTICK,
+  } PERIPHERAL_TYPE;
+
+  typedef struct PERIPHERAL_INFO
+  {
+    PERIPHERAL_TYPE type;           /*!< @brief type of peripheral */
+    char*           name;           /*!< @brief name of peripheral */
+    uint16_t        vendor_id;      /*!< @brief vendor ID of peripheral, 0x0000 if unknown */
+    uint16_t        product_id;     /*!< @brief product ID of peripheral, 0x0000 if unknown */
+    unsigned int    index;          /*!< @brief the order in which the add-on identified this peripheral */
+  } ATTRIBUTE_PACKED PERIPHERAL_INFO;
+
+  /*!
+   * @brief Properties passed to the Create() method of an add-on.
+   */
+  typedef struct PERIPHERAL_PROPERTIES
+  {
+    const char* user_path;              /*!< @brief path to the user profile */
+    const char* addon_path;             /*!< @brief path to this add-on */
+  } ATTRIBUTE_PACKED PERIPHERAL_PROPERTIES;
+
+  /*!
+   * @brief Peripheral add-on capabilities.
+   * If a capability is set to true, then the corresponding methods from
+   * kodi_peripheral_dll.h need to be implemented.
+   */
+  typedef struct PERIPHERAL_CAPABILITIES
+  {
+    bool provides_joysticks;            /*!< @brief true if the add-on provides joysticks */
+  } ATTRIBUTE_PACKED PERIPHERAL_CAPABILITIES;
+  ///}
+
+  /// @name Event types
+  ///{
+  typedef enum PERIPHERAL_EVENT_TYPE
+  {
+    PERIPHERAL_EVENT_TYPE_NONE,           /*!< @brief unknown event */
+    PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON,  /*!< @brief state changed for joystick driver button */
+    PERIPHERAL_EVENT_TYPE_DRIVER_HAT,     /*!< @brief state changed for joystick driver hat */
+    PERIPHERAL_EVENT_TYPE_DRIVER_AXIS,    /*!< @brief state changed for joystick driver axis */
+  } PERIPHERAL_EVENT_TYPE;
+
+  typedef enum JOYSTICK_STATE_BUTTON
+  {
+    JOYSTICK_STATE_BUTTON_UNPRESSED = 0x0,    /*!< @brief button is released */
+    JOYSTICK_STATE_BUTTON_PRESSED   = 0x1,    /*!< @brief button is pressed */
+  } JOYSTICK_STATE_BUTTON;
+
+  typedef enum JOYSTICK_STATE_HAT
+  {
+    JOYSTICK_STATE_HAT_UNPRESSED  = 0x0,    /*!< @brief no directions are pressed */
+    JOYSTICK_STATE_HAT_LEFT       = 0x1,    /*!< @brief only left is pressed */
+    JOYSTICK_STATE_HAT_RIGHT      = 0x2,    /*!< @brief only right is pressed */
+    JOYSTICK_STATE_HAT_UP         = 0x4,    /*!< @brief only up is pressed */
+    JOYSTICK_STATE_HAT_DOWN       = 0x8,    /*!< @brief only down is pressed */
+    JOYSTICK_STATE_HAT_LEFT_UP    = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_UP,
+    JOYSTICK_STATE_HAT_LEFT_DOWN  = JOYSTICK_STATE_HAT_LEFT  | JOYSTICK_STATE_HAT_DOWN,
+    JOYSTICK_STATE_HAT_RIGHT_UP   = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_UP,
+    JOYSTICK_STATE_HAT_RIGHT_DOWN = JOYSTICK_STATE_HAT_RIGHT | JOYSTICK_STATE_HAT_DOWN,
+  } JOYSTICK_STATE_HAT;
+
+  /*!
+   * @brief value in the closed interval [-1.0, 1.0]
+   *
+   * The axis state uses the XInput coordinate system:
+   *   - Negative values signify down or to the left
+   *   - Positive values signify up or to the right
+   */
+  typedef float JOYSTICK_STATE_AXIS;
+
+  typedef struct PERIPHERAL_EVENT
+  {
+    unsigned int             peripheral_index;
+    PERIPHERAL_EVENT_TYPE    type;
+    unsigned int             driver_index;
+    JOYSTICK_STATE_BUTTON    driver_button_state;
+    JOYSTICK_STATE_HAT       driver_hat_state;
+    JOYSTICK_STATE_AXIS      driver_axis_state;
+  } ATTRIBUTE_PACKED PERIPHERAL_EVENT;
+  ///}
+
+  /// @name Joystick types
+  ///{
+  typedef struct JOYSTICK_INFO
+  {
+    PERIPHERAL_INFO peripheral;         /*!< @brief peripheral info for this joystick */
+    char*           provider;           /*!< @brief name of the driver or interface providing the joystick */
+    int             requested_port;     /*!< @brief requested port number (such as for 360 controllers), or NO_PORT_REQUESTED */
+    unsigned int    button_count;       /*!< @brief number of buttons reported by the driver */
+    unsigned int    hat_count;          /*!< @brief number of hats reported by the driver */
+    unsigned int    axis_count;         /*!< @brief number of axes reported by the driver */
+  } ATTRIBUTE_PACKED JOYSTICK_INFO;
+
+  typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
+  {
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
+  } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
+
+  typedef struct JOYSTICK_DRIVER_BUTTON
+  {
+    int              index;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
+
+  typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
+  {
+    JOYSTICK_DRIVER_HAT_UNKNOWN,
+    JOYSTICK_DRIVER_HAT_LEFT,
+    JOYSTICK_DRIVER_HAT_RIGHT,
+    JOYSTICK_DRIVER_HAT_UP,
+    JOYSTICK_DRIVER_HAT_DOWN,
+  } JOYSTICK_DRIVER_HAT_DIRECTION;
+
+  typedef struct JOYSTICK_DRIVER_HAT
+  {
+    int                           index;
+    JOYSTICK_DRIVER_HAT_DIRECTION direction;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
+
+  typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
+  {
+    JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1, /*!< @brief negative half of the axis */
+    JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN  =  0, /*!< @brief unknown direction */
+    JOYSTICK_DRIVER_SEMIAXIS_POSITIVE =  1, /*!< @brief positive half of the axis */
+  } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
+
+  typedef struct JOYSTICK_DRIVER_SEMIAXIS
+  {
+    int                                index;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction;
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
+
+  typedef struct JOYSTICK_DRIVER_PRIMITIVE
+  {
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE    type;
+    union
+    {
+      struct JOYSTICK_DRIVER_BUTTON   button;
+      struct JOYSTICK_DRIVER_HAT      hat;
+      struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
+    };
+  } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
+
+  typedef enum JOYSTICK_FEATURE_TYPE
+  {
+    JOYSTICK_FEATURE_TYPE_UNKNOWN,
+    JOYSTICK_FEATURE_TYPE_SCALAR,
+    JOYSTICK_FEATURE_TYPE_ANALOG_STICK,
+    JOYSTICK_FEATURE_TYPE_ACCELEROMETER,
+  } JOYSTICK_FEATURE_TYPE;
+
+  typedef struct JOYSTICK_FEATURE_SCALAR
+  {
+    struct JOYSTICK_DRIVER_PRIMITIVE primitive;
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE_SCALAR;
+
+  typedef struct JOYSTICK_FEATURE_ANALOG_STICK
+  {
+    struct JOYSTICK_DRIVER_PRIMITIVE up;
+    struct JOYSTICK_DRIVER_PRIMITIVE down;
+    struct JOYSTICK_DRIVER_PRIMITIVE right;
+    struct JOYSTICK_DRIVER_PRIMITIVE left;
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE_ANALOG_STICK;
+
+  typedef struct JOYSTICK_FEATURE_ACCELEROMETER
+  {
+    struct JOYSTICK_DRIVER_PRIMITIVE positive_x;
+    struct JOYSTICK_DRIVER_PRIMITIVE positive_y;
+    struct JOYSTICK_DRIVER_PRIMITIVE positive_z;
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE_ACCELEROMETER;
+
+  typedef struct JOYSTICK_FEATURE
+  {
+    char*                                   name;
+    JOYSTICK_FEATURE_TYPE                   type;
+    union
+    {
+      struct JOYSTICK_FEATURE_SCALAR        scalar;
+      struct JOYSTICK_FEATURE_ANALOG_STICK  analog_stick;
+      struct JOYSTICK_FEATURE_ACCELEROMETER accelerometer;
+    };
+  } ATTRIBUTE_PACKED JOYSTICK_FEATURE;
+  ///}
+
+  // TODO: Mouse, light gun, multitouch
+
+  /*!
+   * @brief Structure to transfer the methods from kodi_peripheral_dll.h to the frontend
+   */
+  typedef struct PeripheralAddon
+  {
+    const char*      (__cdecl* GetPeripheralAPIVersion)(void);
+    const char*      (__cdecl* GetMinimumPeripheralAPIVersion)(void);
+    PERIPHERAL_ERROR (__cdecl* GetAddonCapabilities)(PERIPHERAL_CAPABILITIES*);
+    PERIPHERAL_ERROR (__cdecl* PerformDeviceScan)(unsigned int*, PERIPHERAL_INFO**);
+    void             (__cdecl* FreeScanResults)(unsigned int, PERIPHERAL_INFO*);
+    PERIPHERAL_ERROR (__cdecl* GetEvents)(unsigned int*, PERIPHERAL_EVENT**);
+    void             (__cdecl* FreeEvents)(unsigned int, PERIPHERAL_EVENT*);
+
+    /// @name Joystick operations
+    ///{
+    PERIPHERAL_ERROR (__cdecl* GetJoystickInfo)(unsigned int, JOYSTICK_INFO*);
+    void             (__cdecl* FreeJoystickInfo)(JOYSTICK_INFO*);
+    PERIPHERAL_ERROR (__cdecl* GetFeatures)(const JOYSTICK_INFO*, const char*, unsigned int*, JOYSTICK_FEATURE**);
+    void             (__cdecl* FreeFeatures)(unsigned int, JOYSTICK_FEATURE*);
+    PERIPHERAL_ERROR (__cdecl* MapFeatures)(const JOYSTICK_INFO*, const char*, unsigned int, JOYSTICK_FEATURE*);
+    void             (__cdecl* ResetButtonMap)(const JOYSTICK_INFO*, const char*);
+    ///}
+  } PeripheralAddon;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __PERIPHERAL_TYPES_H__

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp Added

@@ -0,0 +1,657 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "kodi_peripheral_types.h"
+
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+
+#define PERIPHERAL_SAFE_DELETE(x)        do { delete   (x); (x) = NULL; } while (0)
+#define PERIPHERAL_SAFE_DELETE_ARRAY(x)  do { delete[] (x); (x) = NULL; } while (0)
+
+namespace ADDON
+{
+  /*!
+   * Utility class to manipulate arrays of peripheral types.
+   */
+  template <class THE_CLASS, typename THE_STRUCT>
+  class PeripheralVector
+  {
+  public:
+    static void ToStructs(const std::vector<THE_CLASS>& vecObjects, THE_STRUCT** pStructs)
+    {
+      if (!pStructs)
+        return;
+
+      if (vecObjects.empty())
+      {
+        *pStructs = NULL;
+      }
+      else
+      {
+        (*pStructs) = new THE_STRUCT[vecObjects.size()];
+        for (unsigned int i = 0; i < vecObjects.size(); i++)
+          vecObjects.at(i).ToStruct((*pStructs)[i]);
+      }
+    }
+
+    static void ToStructs(const std::vector<THE_CLASS*>& vecObjects, THE_STRUCT** pStructs)
+    {
+      if (!pStructs)
+        return;
+
+      if (vecObjects.empty())
+      {
+        *pStructs = NULL;
+      }
+      else
+      {
+        *pStructs = new THE_STRUCT[vecObjects.size()];
+        for (unsigned int i = 0; i < vecObjects.size(); i++)
+          vecObjects.at(i)->ToStruct((*pStructs)[i]);
+      }
+    }
+
+    static void FreeStructs(unsigned int structCount, THE_STRUCT* structs)
+    {
+      if (structs)
+      {
+        for (unsigned int i = 0; i < structCount; i++)
+          THE_CLASS::FreeStruct(structs[i]);
+      }
+      PERIPHERAL_SAFE_DELETE_ARRAY(structs);
+    }
+  };
+
+  /*!
+   * ADDON::Peripheral
+   *
+   * Wrapper class providing peripheral information. Classes can extend
+   * Peripheral to inherit peripheral properties.
+   */
+  class Peripheral
+  {
+  public:
+    Peripheral(PERIPHERAL_TYPE type = PERIPHERAL_TYPE_UNKNOWN, const std::string& strName = "") :
+      m_type(type),
+      m_strName(strName),
+      m_vendorId(0),
+      m_productId(0),
+      m_index(0)
+    {
+    }
+
+    Peripheral(const PERIPHERAL_INFO& info) :
+      m_type(info.type),
+      m_strName(info.name ? info.name : ""),
+      m_vendorId(info.vendor_id),
+      m_productId(info.product_id),
+      m_index(info.index)
+    {
+    }
+
+    virtual ~Peripheral(void) { }
+
+    PERIPHERAL_TYPE    Type(void) const      { return m_type; }
+    const std::string& Name(void) const      { return m_strName; }
+    uint16_t           VendorID(void) const  { return m_vendorId; }
+    uint16_t           ProductID(void) const { return m_productId; }
+    unsigned int       Index(void) const     { return m_index; }
+
+    // Derived property: VID and PID are 0x0000 if unknown
+    bool IsVidPidKnown(void) const { return m_vendorId != 0 || m_productId != 0; }
+
+    void SetType(PERIPHERAL_TYPE type)       { m_type      = type; }
+    void SetName(const std::string& strName) { m_strName   = strName; }
+    void SetVendorID(uint16_t vendorId)      { m_vendorId  = vendorId; }
+    void SetProductID(uint16_t productId)    { m_productId = productId; }
+    void SetIndex(unsigned int index)        { m_index     = index; }
+
+    void ToStruct(PERIPHERAL_INFO& info) const
+    {
+      info.type       = m_type;
+      info.name       = new char[m_strName.size() + 1];
+      info.vendor_id  = m_vendorId;
+      info.product_id = m_productId;
+      info.index      = m_index;
+
+      std::strcpy(info.name, m_strName.c_str());
+    }
+
+    static void FreeStruct(PERIPHERAL_INFO& info)
+    {
+      PERIPHERAL_SAFE_DELETE_ARRAY(info.name);
+    }
+
+  private:
+    PERIPHERAL_TYPE  m_type;
+    std::string      m_strName;
+    uint16_t         m_vendorId;
+    uint16_t         m_productId;
+    unsigned int     m_index;
+  };
+
+  typedef PeripheralVector<Peripheral, PERIPHERAL_INFO> Peripherals;
+
+  /*!
+   * ADDON::PeripheralEvent
+   *
+   * Wrapper class for peripheral events.
+   */
+  class PeripheralEvent
+  {
+  public:
+    PeripheralEvent(void) :
+      m_event()
+    {
+    }
+
+    PeripheralEvent(unsigned int peripheralIndex, unsigned int buttonIndex, JOYSTICK_STATE_BUTTON state) :
+      m_event()
+    {
+      SetType(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON);
+      SetPeripheralIndex(peripheralIndex);
+      SetDriverIndex(buttonIndex);
+      SetButtonState(state);
+    }
+
+    PeripheralEvent(unsigned int peripheralIndex, unsigned int hatIndex, JOYSTICK_STATE_HAT state) :
+      m_event()
+    {
+      SetType(PERIPHERAL_EVENT_TYPE_DRIVER_HAT);
+      SetPeripheralIndex(peripheralIndex);
+      SetDriverIndex(hatIndex);
+      SetHatState(state);
+    }
+
+    PeripheralEvent(unsigned int peripheralIndex, unsigned int axisIndex, JOYSTICK_STATE_AXIS state) :
+      m_event()
+    {
+      SetType(PERIPHERAL_EVENT_TYPE_DRIVER_AXIS);
+      SetPeripheralIndex(peripheralIndex);
+      SetDriverIndex(axisIndex);
+      SetAxisState(state);
+    }
+
+    PeripheralEvent(const PERIPHERAL_EVENT& event) :
+      m_event(event)
+    {
+    }
+
+    PERIPHERAL_EVENT_TYPE Type(void) const            { return m_event.type; }
+    unsigned int          PeripheralIndex(void) const { return m_event.peripheral_index; }
+    unsigned int          DriverIndex(void) const     { return m_event.driver_index; }
+    JOYSTICK_STATE_BUTTON ButtonState(void) const     { return m_event.driver_button_state; }
+    JOYSTICK_STATE_HAT    HatState(void) const        { return m_event.driver_hat_state; }
+    JOYSTICK_STATE_AXIS   AxisState(void) const       { return m_event.driver_axis_state; }
+
+    void SetType(PERIPHERAL_EVENT_TYPE type)         { m_event.type                = type; }
+    void SetPeripheralIndex(unsigned int index)      { m_event.peripheral_index    = index; }
+    void SetDriverIndex(unsigned int index)          { m_event.driver_index        = index; }
+    void SetButtonState(JOYSTICK_STATE_BUTTON state) { m_event.driver_button_state = state; }
+    void SetHatState(JOYSTICK_STATE_HAT state)       { m_event.driver_hat_state    = state; }
+    void SetAxisState(JOYSTICK_STATE_AXIS state)     { m_event.driver_axis_state   = state; }
+
+    void ToStruct(PERIPHERAL_EVENT& event) const
+    {
+      event = m_event;
+    }
+
+    static void FreeStruct(PERIPHERAL_EVENT& event)
+    {
+      (void)event;
+    }
+
+  private:
+    PERIPHERAL_EVENT m_event;
+  };
+
+  typedef PeripheralVector<PeripheralEvent, PERIPHERAL_EVENT> PeripheralEvents;
+
+  /*!
+   * ADDON::Joystick
+   *
+   * Wrapper class providing additional joystick information not provided by
+   * ADDON::Peripheral.
+   */
+  class Joystick : public Peripheral
+  {
+  public:
+    Joystick(const std::string& provider = "", const std::string& strName = "") :
+      Peripheral(PERIPHERAL_TYPE_JOYSTICK, strName),
+      m_provider(provider),
+      m_requestedPort(NO_PORT_REQUESTED),
+      m_buttonCount(0),
+      m_hatCount(0),
+      m_axisCount(0)
+    {
+    }
+
+    Joystick(const Joystick& other)
+    {
+      *this = other;
+    }
+
+    Joystick(const JOYSTICK_INFO& info) :
+      Peripheral(info.peripheral),
+      m_provider(info.provider ? info.provider : ""),
+      m_requestedPort(info.requested_port),
+      m_buttonCount(info.button_count),
+      m_hatCount(info.hat_count),
+      m_axisCount(info.axis_count)
+    {
+    }
+
+    virtual ~Joystick(void) { }
+
+    Joystick& operator=(const Joystick& rhs)
+    {
+      if (this != &rhs)
+      {
+        Peripheral::operator=(rhs);
+
+        m_provider      = rhs.m_provider;
+        m_requestedPort = rhs.m_requestedPort;
+        m_buttonCount   = rhs.m_buttonCount;
+        m_hatCount      = rhs.m_hatCount;
+        m_axisCount     = rhs.m_axisCount;
+      }
+      return *this;
+    }
+
+    const std::string& Provider(void) const      { return m_provider; }
+    int                RequestedPort(void) const { return m_requestedPort; }
+    unsigned int       ButtonCount(void) const   { return m_buttonCount; }
+    unsigned int       HatCount(void) const      { return m_hatCount; }
+    unsigned int       AxisCount(void) const     { return m_axisCount; }
+
+    // Derived property: Counts are unknown if all are zero
+    bool AreElementCountsKnown(void) const { return m_buttonCount != 0 || m_hatCount != 0 || m_axisCount != 0; }
+
+    void SetProvider(const std::string& provider)     { m_provider      = provider; }
+    void SetRequestedPort(int requestedPort)          { m_requestedPort = requestedPort; }
+    void SetButtonCount(unsigned int buttonCount)     { m_buttonCount   = buttonCount; }
+    void SetHatCount(unsigned int hatCount)           { m_hatCount      = hatCount; }
+    void SetAxisCount(unsigned int axisCount)         { m_axisCount     = axisCount; }
+
+    void ToStruct(JOYSTICK_INFO& info) const
+    {
+      Peripheral::ToStruct(info.peripheral);
+
+      info.provider       = new char[m_provider.size() + 1];
+      info.requested_port = m_requestedPort;
+      info.button_count   = m_buttonCount;
+      info.hat_count      = m_hatCount;
+      info.axis_count     = m_axisCount;
+
+      std::strcpy(info.provider, m_provider.c_str());
+    }
+
+    static void FreeStruct(JOYSTICK_INFO& info)
+    {
+      Peripheral::FreeStruct(info.peripheral);
+
+      PERIPHERAL_SAFE_DELETE_ARRAY(info.provider);
+    }
+
+  private:
+    std::string                   m_provider;
+    int                           m_requestedPort;
+    unsigned int                  m_buttonCount;
+    unsigned int                  m_hatCount;
+    unsigned int                  m_axisCount;
+  };
+
+  typedef PeripheralVector<Joystick, JOYSTICK_INFO> Joysticks;
+
+  /*!
+   * ADDON::DriverPrimitive
+   *
+   * Base class for joystick driver primitives. A driver primitive can be:
+   *
+   *   1) a button
+   *   2) a hat direction
+   *   3) a semiaxis (either the positive or negative half of an axis)
+   *
+   * The type determines the fields in use:
+   *
+   *    Button:
+   *       - driver index
+   *
+   *    Hat direction:
+   *       - driver index
+   *       - hat direction
+   *
+   *    Semiaxis:
+   *       - driver index
+   *       - semiaxis direction
+   */
+  class DriverPrimitive
+  {
+  public:
+    /*!
+     * \brief Construct an invalid driver primitive
+     */
+    DriverPrimitive(void) :
+      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN),
+      m_driverIndex(0),
+      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+    {
+    }
+
+    /*!
+     * \brief Construct a driver primitive representing a button
+     */
+    DriverPrimitive(unsigned int buttonIndex) :
+      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON),
+      m_driverIndex(buttonIndex),
+      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+    {
+    }
+
+    /*!
+     * \brief Construct a driver primitive representing one of the four direction
+     *        arrows on a dpad
+     */
+    DriverPrimitive(unsigned int hatIndex, JOYSTICK_DRIVER_HAT_DIRECTION direction) :
+      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION),
+      m_driverIndex(hatIndex),
+      m_hatDirection(direction),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+    {
+    }
+
+    /*!
+     * \brief Construct a driver primitive representing the positive or negative
+     *        half of an axis
+     */
+    DriverPrimitive(unsigned int axisIndex, JOYSTICK_DRIVER_SEMIAXIS_DIRECTION direction) :
+      m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS),
+      m_driverIndex(axisIndex),
+      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+      m_semiAxisDirection(direction)
+    {
+    }
+
+    DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) :
+      m_type(primitive.type),
+      m_driverIndex(0),
+      m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+      m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN)
+    {
+      switch (m_type)
+      {
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+        {
+          m_driverIndex = primitive.button.index;
+          break;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+        {
+          m_driverIndex  = primitive.hat.index;
+          m_hatDirection = primitive.hat.direction;
+          break;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+        {
+          m_driverIndex       = primitive.semiaxis.index;
+          m_semiAxisDirection = primitive.semiaxis.direction;
+          break;
+        }
+        default:
+          break;
+      }
+    }
+
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE     Type(void) const { return m_type; }
+    unsigned int                       DriverIndex(void) const { return m_driverIndex; }
+    JOYSTICK_DRIVER_HAT_DIRECTION      HatDirection(void) const { return m_hatDirection; }
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION SemiAxisDirection(void) const { return m_semiAxisDirection; }
+
+    bool operator==(const DriverPrimitive& other) const
+    {
+      if (m_type == other.m_type)
+      {
+        switch (m_type)
+        {
+          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+          {
+            return m_driverIndex == other.m_driverIndex;
+          }
+          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+          {
+            return m_driverIndex  == other.m_driverIndex &&
+                   m_hatDirection == other.m_hatDirection;
+          }
+          case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+          {
+            return m_driverIndex       == other.m_driverIndex &&
+                   m_semiAxisDirection == other.m_semiAxisDirection;
+          }
+          default:
+            break;
+        }
+      }
+      return false;
+    }
+
+    void ToStruct(JOYSTICK_DRIVER_PRIMITIVE& driver_primitive) const
+    {
+      driver_primitive.type = m_type;
+      switch (m_type)
+      {
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+        {
+          driver_primitive.button.index = m_driverIndex;
+          break;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+        {
+          driver_primitive.hat.index     = m_driverIndex;
+          driver_primitive.hat.direction = m_hatDirection;
+          break;
+        }
+        case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+        {
+          driver_primitive.semiaxis.index     = m_driverIndex;
+          driver_primitive.semiaxis.direction = m_semiAxisDirection;
+          break;
+        }
+        default:
+          break;
+      }
+    }
+
+  private:
+    JOYSTICK_DRIVER_PRIMITIVE_TYPE     m_type;
+    unsigned int                       m_driverIndex;
+    JOYSTICK_DRIVER_HAT_DIRECTION      m_hatDirection;
+    JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection;
+  };
+
+  /*!
+   * ADDON::JoystickFeature
+   *
+   * Class for joystick features. A feature can be:
+   *
+   *   1) scalar[1]
+   *   2) analog stick
+   *   3) accelerometer
+   *
+   * [1] All three driver primitives (buttons, hats and axes) have a state that
+   *     can be represented using a single scalar value. For this reason,
+   *     features that map to a single primitive are called "scalar features".
+   *
+   * Features can be mapped to a variable number of driver primitives. The names
+   * of the primitives for each feature are:
+   *
+   *    Scalar feature:
+   *       - primitive
+   *
+   *    Analog stick:
+   *       - up
+   *       - down
+   *       - right
+   *       - left
+   *
+   *    Accelerometer:
+   *       - positive X
+   *       - positive Y
+   *       - positive Z
+   */
+  class JoystickFeature
+  {
+  public:
+    const unsigned int MAX_PRIMITIVES = 4;
+
+    JoystickFeature(void) :
+      m_type(JOYSTICK_FEATURE_TYPE_UNKNOWN)
+    {
+      m_primitives.resize(MAX_PRIMITIVES);
+    }
+
+    JoystickFeature(const std::string& name, JOYSTICK_FEATURE_TYPE type) :
+      m_name(name),
+      m_type(type)
+    {
+      m_primitives.resize(MAX_PRIMITIVES);
+    }
+
+    JoystickFeature(const JoystickFeature& other)
+    {
+      *this = other;
+    }
+
+    JoystickFeature(const JOYSTICK_FEATURE& feature) :
+      m_name(feature.name ? feature.name : ""),
+      m_type(feature.type)
+    {
+      m_primitives.resize(MAX_PRIMITIVES);
+      switch (m_type)
+      {
+        case JOYSTICK_FEATURE_TYPE_SCALAR:
+          SetPrimitive(feature.scalar.primitive);
+          break;
+        case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:
+          SetUp(feature.analog_stick.up);
+          SetDown(feature.analog_stick.down);
+          SetRight(feature.analog_stick.right);
+          SetLeft(feature.analog_stick.left);
+          break;
+        case JOYSTICK_FEATURE_TYPE_ACCELEROMETER:
+          SetPositiveX(feature.accelerometer.positive_x);
+          SetPositiveY(feature.accelerometer.positive_y);
+          SetPositiveZ(feature.accelerometer.positive_z);
+          break;
+        default:
+          break;
+      }
+    }
+
+    JoystickFeature& operator=(const JoystickFeature& rhs)
+    {
+      if (this != &rhs)
+      {
+        m_name = rhs.m_name;
+        m_type = rhs.m_type;
+        m_primitives = rhs.m_primitives;
+      }
+      return *this;
+    }
+
+    bool operator==(const JoystickFeature& other) const
+    {
+      return m_name == other.m_name &&
+             m_type == other.m_type &&
+             m_primitives == other.m_primitives;
+    }
+
+    const std::string& Name(void) const { return m_name; }
+    JOYSTICK_FEATURE_TYPE Type(void) const { return m_type; }
+
+    void SetName(const std::string& name) { m_name = name; }
+    void SetType(JOYSTICK_FEATURE_TYPE type) { m_type = type; }
+
+    // Scalar methods
+    const DriverPrimitive& Primitive(void) const { return m_primitives[0]; }
+    void SetPrimitive(const DriverPrimitive& primitive) { m_primitives[0] = primitive; }
+
+    // Analog stick methods
+    const DriverPrimitive& Up(void) const { return m_primitives[0]; }
+    const DriverPrimitive& Down(void) const { return m_primitives[1]; }
+    const DriverPrimitive& Right(void) const { return m_primitives[2]; }
+    const DriverPrimitive& Left(void) const { return m_primitives[3]; }
+    void SetUp(const DriverPrimitive& primitive) { m_primitives[0] = primitive; }
+    void SetDown(const DriverPrimitive& primitive) { m_primitives[1] = primitive; }
+    void SetRight(const DriverPrimitive& primitive) { m_primitives[2] = primitive; }
+    void SetLeft(const DriverPrimitive& primitive) { m_primitives[3] = primitive; }
+
+    // Accelerometer methods
+    const DriverPrimitive& PositiveX(void) const { return m_primitives[0]; }
+    const DriverPrimitive& PositiveY(void) const { return m_primitives[1]; }
+    const DriverPrimitive& PositiveZ(void) const { return m_primitives[2]; }
+    void SetPositiveX(const DriverPrimitive& primitive) { m_primitives[0] = primitive; }
+    void SetPositiveY(const DriverPrimitive& primitive) { m_primitives[1] = primitive; }
+    void SetPositiveZ(const DriverPrimitive& primitive) { m_primitives[2] = primitive; }
+
+    void ToStruct(JOYSTICK_FEATURE& feature) const
+    {
+      feature.name = new char[m_name.length() + 1];
+      feature.type = m_type;
+      switch (m_type)
+      {
+        case JOYSTICK_FEATURE_TYPE_SCALAR:
+          Primitive().ToStruct(feature.scalar.primitive);
+          break;
+        case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:
+          Up().ToStruct(feature.analog_stick.up);
+          Down().ToStruct(feature.analog_stick.down);
+          Right().ToStruct(feature.analog_stick.right);
+          Left().ToStruct(feature.analog_stick.left);
+          break;
+        case JOYSTICK_FEATURE_TYPE_ACCELEROMETER:
+          PositiveX().ToStruct(feature.accelerometer.positive_x);
+          PositiveY().ToStruct(feature.accelerometer.positive_y);
+          PositiveZ().ToStruct(feature.accelerometer.positive_z);
+          break;
+        default:
+          break;
+      }
+      std::strcpy(feature.name, m_name.c_str());
+    }
+
+    static void FreeStruct(JOYSTICK_FEATURE& feature)
+    {
+      PERIPHERAL_SAFE_DELETE_ARRAY(feature.name);
+    }
+
+  private:
+    std::string                  m_name;
+    JOYSTICK_FEATURE_TYPE        m_type;
+    std::vector<DriverPrimitive> m_primitives;
+  };
+
+  typedef PeripheralVector<JoystickFeature, JOYSTICK_FEATURE> JoystickFeatures;
+}

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp Added

@@ -0,0 +1,96 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+/*!
+ * @file kodi_vfs_utils.hpp - C++ wrappers for Kodi's VFS operations
+ */
+
+#include "libXBMC_addon.h"
+#include "kodi_vfs_types.h"
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+namespace ADDON
+{
+  class CVFSDirEntry
+  {
+  public:
+    CVFSDirEntry(const std::string& label = "",
+                 const std::string& path = "",
+                 bool bFolder = false,
+                 int64_t size = -1) :
+      m_label(label),
+      m_path(path),
+      m_bFolder(bFolder),
+      m_size(size)
+    {
+    }
+
+    CVFSDirEntry(const VFSDirEntry& dirEntry) :
+      m_label(dirEntry.label ? dirEntry.label : ""),
+      m_path(dirEntry.path ? dirEntry.path : ""),
+      m_bFolder(dirEntry.folder),
+      m_size(dirEntry.size)
+    {
+    }
+
+    const std::string& Label(void) const { return m_label; }
+    const std::string& Path(void) const { return m_path; }
+    bool IsFolder(void) const { return m_bFolder; }
+    int64_t Size(void) const { return m_size; }
+
+    void SetLabel(const std::string& label) { m_label = label; }
+    void SetPath(const std::string& path) { m_path = path; }
+    void SetFolder(bool bFolder) { m_bFolder = bFolder; }
+    void SetSize(int64_t size) { m_size = size; }
+
+  private:
+    std::string m_label;
+    std::string m_path;
+    bool m_bFolder;
+    int64_t m_size;
+  };
+
+  class VFSUtils
+  {
+  public:
+    static bool GetDirectory(ADDON::CHelper_libXBMC_addon* frontend,
+                             const std::string& path,
+                             const std::string& mask,
+                             std::vector<CVFSDirEntry>& items)
+    {
+      VFSDirEntry* dir_list = nullptr;
+      unsigned int num_items = 0;
+      if (frontend->GetDirectory(path.c_str(), mask.c_str(), &dir_list, &num_items))
+      {
+        for (unsigned int i = 0; i < num_items; i++)
+          items.push_back(CVFSDirEntry(dir_list[i]));
+
+        frontend->FreeDirectory(dir_list, num_items);
+
+        return true;
+      }
+      return false;
+    }
+  };
+}

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h Changed

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h Added

@@ -0,0 +1,140 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "libXBMC_addon.h"
+#include "kodi_peripheral_callbacks.h"
+
+#include <string>
+#include <stdio.h>
+
+#if defined(ANDROID)
+  #include <sys/stat.h>
+#endif
+
+#ifdef _WIN32
+  #define PERIPHERAL_HELPER_DLL "\\library.kodi.peripheral\\libKODI_peripheral" ADDON_HELPER_EXT
+#else
+  #define PERIPHERAL_HELPER_DLL_NAME "libKODI_peripheral-" ADDON_HELPER_ARCH ADDON_HELPER_EXT
+  #define PERIPHERAL_HELPER_DLL "/library.kodi.peripheral/" PERIPHERAL_HELPER_DLL_NAME
+#endif
+
+#define PERIPHERAL_REGISTER_SYMBOL(dll, functionPtr) \
+  CHelper_libKODI_peripheral::RegisterSymbol(dll, functionPtr, #functionPtr)
+
+namespace ADDON
+{
+
+class CHelper_libKODI_peripheral
+{
+public:
+  CHelper_libKODI_peripheral(void)
+  {
+    m_handle       = NULL;
+    m_callbacks    = NULL;
+    m_libKODI_peripheral = NULL;
+  }
+
+  ~CHelper_libKODI_peripheral(void)
+  {
+    if (m_libKODI_peripheral)
+    {
+      PERIPHERAL_unregister_me(m_handle, m_callbacks);
+      dlclose(m_libKODI_peripheral);
+    }
+  }
+
+  template <typename T>
+  static bool RegisterSymbol(void* dll, T& functionPtr, const char* strFunctionPtr)
+  {
+    if ((functionPtr = (T)dlsym(dll, strFunctionPtr)) == NULL)
+    {
+      fprintf(stderr, "ERROR: Unable to assign function %s: %s\n", strFunctionPtr, dlerror());
+      return false;
+    }
+    return true;
+  }
+
+  /*!
+    * @brief Resolve all callback methods
+    * @param handle Pointer to the add-on
+    * @return True when all methods were resolved, false otherwise.
+    */
+  bool RegisterMe(void* handle)
+  {
+    m_handle = handle;
+
+    std::string libBasePath;
+    libBasePath  = ((cb_array*)m_handle)->libPath;
+    libBasePath += PERIPHERAL_HELPER_DLL;
+
+#if defined(ANDROID)
+      struct stat st;
+      if (stat(libBasePath.c_str(),&st) != 0)
+      {
+        std::string tempbin = getenv("XBMC_ANDROID_LIBS");
+        libBasePath = tempbin + "/" + PERIPHERAL_HELPER_DLL_NAME;
+      }
+#endif
+
+    m_libKODI_peripheral = dlopen(libBasePath.c_str(), RTLD_LAZY);
+    if (m_libKODI_peripheral == NULL)
+    {
+      fprintf(stderr, "Unable to load %s\n", dlerror());
+      return false;
+    }
+
+    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_register_me)) return false;
+    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_unregister_me)) return false;
+    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_trigger_scan)) return false;
+    if (!PERIPHERAL_REGISTER_SYMBOL(m_libKODI_peripheral, PERIPHERAL_refresh_button_maps)) return false;
+
+    m_callbacks = PERIPHERAL_register_me(m_handle);
+    return m_callbacks != NULL;
+  }
+
+  void TriggerScan(void)
+  {
+    return PERIPHERAL_trigger_scan(m_handle, m_callbacks);
+  }
+
+  void RefreshButtonMaps(const std::string& strDeviceName = "", const std::string& strControllerId = "")
+  {
+    return PERIPHERAL_refresh_button_maps(m_handle, m_callbacks, strDeviceName.c_str(), strControllerId.c_str());
+  }
+
+protected:
+    CB_PeripheralLib* (*PERIPHERAL_register_me)(void* handle);
+    void (*PERIPHERAL_unregister_me)(void* handle, CB_PeripheralLib* cb);
+    void (*PERIPHERAL_trigger_scan)(void* handle, CB_PeripheralLib* cb);
+    void (*PERIPHERAL_refresh_button_maps)(void* handle, CB_PeripheralLib* cb, const char* deviceName, const char* controllerId);
+
+private:
+  void*             m_handle;
+  CB_PeripheralLib* m_callbacks;
+  void*             m_libKODI_peripheral;
+
+  struct cb_array
+  {
+    const char* libPath;
+  };
+};
+
+}

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h Changed

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h Changed

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h Changed

_service:download_url:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h Changed

_service:download_url:master.tar.gz/xbmc/cdrip/EncoderFFmpeg.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEUtil.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEUtil.h Changed

_service:download_url:master.tar.gz/xbmc/cores/IPlayer.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDClock.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp Changed

@@ -131,8 +131,8 @@
   {
     if(sub.rects[i])
     {
-      av_free(sub.rects[i]->pict.data[0]);
-      av_free(sub.rects[i]->pict.data[1]);
+      av_free(sub.rects[i]->data[0]);
+      av_free(sub.rects[i]->data[1]);
       av_freep(&sub.rects[i]);
     }
   }
@@ -237,7 +237,7 @@
       return NULL;
 
     AVSubtitleRect rect = *m_Subtitle.rects[m_SubtitleIndex];
-    if (rect.pict.data[0] == NULL)
+    if (rect.data[0] == NULL)
       return NULL;
 
     m_height = m_pCodecContext->height;
@@ -289,20 +289,20 @@
     overlay->source_width  = m_width;
     overlay->source_height = m_height;
 
-    uint8_t* s = rect.pict.data[0];
+    uint8_t* s = rect.data[0];
     uint8_t* t = overlay->data;
     for(int i=0;i<rect.h;i++)
     {
       memcpy(t, s, rect.w);
-      s += rect.pict.linesize[0];
+      s += rect.linesize[0];
       t += overlay->linesize;
     }
 
     for(int i=0;i<rect.nb_colors;i++)
-      overlay->palette[i] = Endian_SwapLE32(((uint32_t *)rect.pict.data[1])[i]);
+      overlay->palette[i] = Endian_SwapLE32(((uint32_t *)rect.data[1])[i]);
 
-    av_free(rect.pict.data[0]);
-    av_free(rect.pict.data[1]);
+    av_free(rect.data[0]);
+    av_free(rect.data[1]);
     av_freep(&m_Subtitle.rects[m_SubtitleIndex]);
     m_SubtitleIndex++;

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp Changed

@@ -206,11 +206,11 @@
   m_videobuffer.iDisplayHeight = m_videobuffer.iHeight;
   if (m_hints.aspect > 0.0 && !m_hints.forced_aspect)
   {
-    m_videobuffer.iDisplayWidth  = ((int)lrint(m_videobuffer.iHeight * m_hints.aspect)) & -3;
+    m_videobuffer.iDisplayWidth  = ((int)lrint(m_videobuffer.iHeight * m_hints.aspect)) & ~3;
     if (m_videobuffer.iDisplayWidth > m_videobuffer.iWidth)
     {
       m_videobuffer.iDisplayWidth  = m_videobuffer.iWidth;
-      m_videobuffer.iDisplayHeight = ((int)lrint(m_videobuffer.iWidth / m_hints.aspect)) & -3;
+      m_videobuffer.iDisplayHeight = ((int)lrint(m_videobuffer.iWidth / m_hints.aspect)) & ~3;
     }
   }
 
@@ -309,11 +309,11 @@
   pDvdVideoPicture->iDisplayHeight = pDvdVideoPicture->iHeight;
   if (m_aspect_ratio > 1.0 && !m_hints.forced_aspect)
   {
-    pDvdVideoPicture->iDisplayWidth  = ((int)lrint(pDvdVideoPicture->iHeight * m_aspect_ratio)) & -3;
+    pDvdVideoPicture->iDisplayWidth  = ((int)lrint(pDvdVideoPicture->iHeight * m_aspect_ratio)) & ~3;
     if (pDvdVideoPicture->iDisplayWidth > pDvdVideoPicture->iWidth)
     {
       pDvdVideoPicture->iDisplayWidth  = pDvdVideoPicture->iWidth;
-      pDvdVideoPicture->iDisplayHeight = ((int)lrint(pDvdVideoPicture->iWidth / m_aspect_ratio)) & -3;
+      pDvdVideoPicture->iDisplayHeight = ((int)lrint(pDvdVideoPicture->iWidth / m_aspect_ratio)) & ~3;
     }
   }

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp Changed

@@ -60,6 +60,9 @@
 #ifdef TARGET_DARWIN_OSX
 #include "VDA.h"
 #endif
+#ifdef HAS_MMAL
+#include "MMALFFmpeg.h"
+#endif
 #include "utils/StringUtils.h"
 
 extern "C" {
@@ -174,6 +177,21 @@
         dec->Release();
     }
 #endif
+
+#ifdef HAS_MMAL
+    if (*cur == AV_PIX_FMT_YUV420P)
+    {
+      MMAL::CDecoder* dec = new MMAL::CDecoder();
+      ctx->m_pCodecContext->hwaccel_context = (void *)ctx->m_options.m_opaque_pointer;
+      if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount))
+      {
+        ctx->SetHardware(dec);
+        return *cur;
+      }
+      else
+        dec->Release();
+    }
+#endif
     cur++;
   }
 
@@ -272,6 +290,9 @@
     if(CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDA))
       tryhw = true;
 #endif
+#ifdef HAS_MMAL
+    tryhw = true;
+#endif
     if (tryhw && m_decoderState == STATE_NONE)
     {
       m_decoderState = STATE_HW_SINGLE;
@@ -561,9 +582,12 @@
 
   if (!iGotPicture)
   {
-    m_droppedFrames++;
-    if (m_interlaced)
+    if (pData)
+    {
       m_droppedFrames++;
+      if (m_interlaced)
+        m_droppedFrames++;
+    }
 
     if (m_pHardware && (m_codecControlFlags & DVD_CODEC_CTRL_DRAIN))
     {

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.cpp Changed

@@ -42,6 +42,7 @@
 #include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "settings/DisplaySettings.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h"
 #include "settings/AdvancedSettings.h"
 
 #include "linux/RBP.h"
@@ -51,46 +52,27 @@
 #define CLASSNAME "CMMALVideoBuffer"
 
 CMMALVideoBuffer::CMMALVideoBuffer(CMMALVideo *omv)
-    : m_omv(omv), m_refs(0)
+    : m_omv(omv)
 {
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
   mmal_buffer = NULL;
-  width = 0;
-  height = 0;
+  m_width = 0;
+  m_height = 0;
+  m_aligned_width = 0;
+  m_aligned_height = 0;
   m_aspect_ratio = 0.0f;
+  m_refs = 0;
 }
 
 CMMALVideoBuffer::~CMMALVideoBuffer()
 {
+  if (mmal_buffer)
+    mmal_buffer_header_release(mmal_buffer);
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
 }
 
-
-CMMALVideoBuffer* CMMALVideoBuffer::Acquire()
-{
-  long count = AtomicIncrement(&m_refs);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s %p (%p) ref:%ld", CLASSNAME, __func__, this, mmal_buffer, count);
-  (void)count;
-  return this;
-}
-
-long CMMALVideoBuffer::Release()
-{
-  long count = AtomicDecrement(&m_refs);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s %p (%p) ref:%ld", CLASSNAME, __func__, this, mmal_buffer, count);
-  if (count == 0)
-  {
-    mmal_buffer_header_release(mmal_buffer);
-    delete this;
-  }
-  else assert(count > 0);
-  return count;
-}
-
 #undef CLASSNAME
 #define CLASSNAME "CMMALVideo"
 
@@ -101,6 +83,8 @@
 
   m_decoded_width = 0;
   m_decoded_height = 0;
+  m_decoded_aligned_width = 0;
+  m_decoded_aligned_height = 0;
 
   m_finished = false;
   m_pFormatName = "mmal-xxxx";
@@ -114,7 +98,7 @@
   m_dec_input = NULL;
   m_dec_output = NULL;
   m_dec_input_pool = NULL;
-  m_vout_input_pool = NULL;
+  m_renderer = NULL;
 
   m_deint = NULL;
   m_deint_connection = NULL;
@@ -188,11 +172,13 @@
       m_aspect_ratio = (float)(m_es_format->es->video.par.num * m_es_format->es->video.crop.width) / (m_es_format->es->video.par.den * m_es_format->es->video.crop.height);
     m_decoded_width = m_es_format->es->video.crop.width;
     m_decoded_height = m_es_format->es->video.crop.height;
+    m_decoded_aligned_width = m_es_format->es->video.width;
+    m_decoded_aligned_height = m_es_format->es->video.height;
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s format changed: %dx%d %.2f", CLASSNAME, __func__, m_decoded_width, m_decoded_height, m_aspect_ratio);
+      CLog::Log(LOGDEBUG, "%s::%s format changed: %dx%d (%dx%d) %.2f", CLASSNAME, __func__, m_decoded_width, m_decoded_height, m_decoded_aligned_width, m_decoded_aligned_height, m_aspect_ratio);
   }
   else
-    CLog::Log(LOGERROR, "%s::%s format changed: Unexpected %dx%d", CLASSNAME, __func__, m_es_format->es->video.crop.width, m_es_format->es->video.crop.height);
+    CLog::Log(LOGERROR, "%s::%s format changed: Unexpected %dx%d (%dx%d)", CLASSNAME, __func__, m_es_format->es->video.crop.width, m_es_format->es->video.crop.height, m_decoded_aligned_width, m_decoded_aligned_height);
 
   if (!change_dec_output_format())
     CLog::Log(LOGERROR, "%s::%s - change_dec_output_format() failed", CLASSNAME, __func__);
@@ -276,8 +262,10 @@
       {
         omvb->mmal_buffer = buffer;
         buffer->user_data = (void *)omvb;
-        omvb->width = m_decoded_width;
-        omvb->height = m_decoded_height;
+        omvb->m_width = m_decoded_width;
+        omvb->m_height = m_decoded_height;
+        omvb->m_aligned_width = m_decoded_aligned_width;
+        omvb->m_aligned_height = m_decoded_aligned_height;
         omvb->m_aspect_ratio = m_aspect_ratio;
         {
           CSingleLock lock(m_output_mutex);
@@ -511,7 +499,7 @@
   buffer->cmd = 0;
   buffer->length = std::min(m_hints.extrasize, buffer->alloc_size);
   memcpy(buffer->data, m_hints.extradata, buffer->length);
-  buffer->flags |= MMAL_BUFFER_HEADER_FLAG_FRAME_END | MMAL_BUFFER_HEADER_FLAG_CONFIG;
+  buffer->flags = MMAL_BUFFER_HEADER_FLAG_FRAME_END | MMAL_BUFFER_HEADER_FLAG_CONFIG;
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s - %-8p %-6d flags:%x", CLASSNAME, __func__, buffer, buffer->length, buffer->flags);
   status = mmal_port_send_buffer(m_dec_input, buffer);
@@ -527,18 +515,18 @@
 {
   CSingleLock lock(m_sharedSection);
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s usemmal:%d software:%d %dx%d pool:%p", CLASSNAME, __func__, CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL), hints.software, hints.width, hints.height, options.m_opaque_pointer);
+    CLog::Log(LOGDEBUG, "%s::%s usemmal:%d software:%d %dx%d renderer:%p", CLASSNAME, __func__, CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL), hints.software, hints.width, hints.height, options.m_opaque_pointer);
 
   // we always qualify even if DVDFactoryCodec does this too.
   if (!CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEMMAL) || hints.software)
     return false;
 
   m_hints = hints;
-  m_vout_input_pool = (MMAL_POOL_T *)options.m_opaque_pointer;
+  m_renderer = (CMMALRenderer *)options.m_opaque_pointer;
   MMAL_STATUS_T status;
 
-  m_decoded_width  = hints.width;
-  m_decoded_height = hints.height;
+  m_decoded_width = m_decoded_aligned_width = hints.width;
+  m_decoded_height = m_decoded_aligned_height = hints.height;
 
   // use aspect in stream if available
   if (m_hints.forced_aspect)
@@ -882,10 +870,12 @@
 void CMMALVideo::Prime()
 {
   MMAL_BUFFER_HEADER_T *buffer;
+  assert(m_renderer);
+  MMAL_POOL_T *render_pool = m_renderer->GetPool(RENDER_FMT_MMAL, true);
+  assert(render_pool);
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s - queue(%p)", CLASSNAME, __func__, m_vout_input_pool);
-  assert(m_vout_input_pool);
-  while (buffer = mmal_queue_get(m_vout_input_pool->queue), buffer)
+    CLog::Log(LOGDEBUG, "%s::%s - queue(%p)", CLASSNAME, __func__, render_pool);
+  while (buffer = mmal_queue_get(render_pool->queue), buffer)
     Recycle(buffer);
 }
 
@@ -997,11 +987,11 @@
     pDvdVideoPicture->MMALBuffer = buffer;
     pDvdVideoPicture->color_range  = 0;
     pDvdVideoPicture->color_matrix = 4;
-    pDvdVideoPicture->iWidth  = buffer->width ? buffer->width : m_decoded_width;
-    pDvdVideoPicture->iHeight = buffer->height ? buffer->height : m_decoded_height;
+    pDvdVideoPicture->iWidth  = buffer->m_width ? buffer->m_width : m_decoded_width;
+    pDvdVideoPicture->iHeight = buffer->m_height ? buffer->m_height : m_decoded_height;
     pDvdVideoPicture->iDisplayWidth  = pDvdVideoPicture->iWidth;
     pDvdVideoPicture->iDisplayHeight = pDvdVideoPicture->iHeight;
-    //CLog::Log(LOGDEBUG, "%s::%s -  %dx%d %dx%d %dx%d %dx%d %f,%f", CLASSNAME, __func__, pDvdVideoPicture->iWidth, pDvdVideoPicture->iHeight, pDvdVideoPicture->iDisplayWidth, pDvdVideoPicture->iDisplayHeight, m_decoded_width, m_decoded_height, buffer->width, buffer->height, buffer->m_aspect_ratio, m_hints.aspect);
+    //CLog::Log(LOGDEBUG, "%s::%s -  %dx%d %dx%d %dx%d %dx%d %f,%f", CLASSNAME, __func__, pDvdVideoPicture->iWidth, pDvdVideoPicture->iHeight, pDvdVideoPicture->iDisplayWidth, pDvdVideoPicture->iDisplayHeight, m_decoded_width, m_decoded_height, buffer->m_width, buffer->m_height, buffer->m_aspect_ratio, m_hints.aspect);
 
     if (buffer->m_aspect_ratio > 0.0)
     {

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h Changed

@@ -40,26 +40,31 @@
 #include "guilib/Geometry.h"
 #include "rendering/RenderSystem.h"
 #include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
+#include "cores/VideoPlayer/DVDResource.h"
+
+// a mmal video frame
+class CMMALBuffer : public IDVDResourceCounted<CMMALBuffer>
+{
+public:
+  virtual ~CMMALBuffer() {}
+  MMAL_BUFFER_HEADER_T *mmal_buffer;
+  unsigned int m_width;
+  unsigned int m_height;
+  unsigned int m_aligned_width;
+  unsigned int m_aligned_height;
+  float m_aspect_ratio;
+};
 
 class CMMALVideo;
+class CMMALRenderer;
 
 // a mmal video frame
-class CMMALVideoBuffer
+class CMMALVideoBuffer : public CMMALBuffer
 {
 public:
   CMMALVideoBuffer(CMMALVideo *omv);
   virtual ~CMMALVideoBuffer();
-
-  MMAL_BUFFER_HEADER_T *mmal_buffer;
-  int width;
-  int height;
-  float m_aspect_ratio;
-  // reference counting
-  CMMALVideoBuffer* Acquire();
-  long              Release();
   CMMALVideo *m_omv;
-  long m_refs;
-private:
 };
 
 class CMMALVideo : public CDVDVideoCodec
@@ -97,8 +102,10 @@
   void Prime();
 
   // Video format
-  int               m_decoded_width;
-  int               m_decoded_height;
+  unsigned int      m_decoded_width;
+  unsigned int      m_decoded_height;
+  unsigned int      m_decoded_aligned_width;
+  unsigned int      m_decoded_aligned_height;
   unsigned int      m_egl_buffer_count;
   bool              m_finished;
   float             m_aspect_ratio;
@@ -131,7 +138,7 @@
   MMAL_PORT_T *m_dec_input;
   MMAL_PORT_T *m_dec_output;
   MMAL_POOL_T *m_dec_input_pool;
-  MMAL_POOL_T *m_vout_input_pool;
+  CMMALRenderer *m_renderer;
 
   MMAL_ES_FORMAT_T *m_es_format;
   MMAL_COMPONENT_T *m_deint;

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp Added

@@ -0,0 +1,345 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "system.h"
+#ifdef HAS_MMAL
+
+#include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
+#include "cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h"
+#include "../DVDCodecUtils.h"
+#include "MMALFFmpeg.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+#include "linux/RBP.h"
+#include "settings/AdvancedSettings.h"
+
+extern "C" {
+#include "libavutil/imgutils.h"
+}
+
+using namespace MMAL;
+
+//-----------------------------------------------------------------------------
+// MMAL Buffers
+//-----------------------------------------------------------------------------
+
+#define CLASSNAME "CMMALYUVBuffer"
+
+CMMALYUVBuffer::CMMALYUVBuffer(CDecoder *dec, unsigned int width, unsigned int height, unsigned int aligned_width, unsigned int aligned_height)
+  : m_dec(dec)
+{
+  dec->Acquire();
+  m_width = width;
+  m_height = height;
+  m_aligned_width = aligned_width;
+  m_aligned_height = aligned_height;
+  m_aspect_ratio = 0.0f;
+  mmal_buffer = nullptr;
+  unsigned int size_pic = (m_aligned_width * m_aligned_height * 3) >> 1;
+  gmem = m_dec->AllocateBuffer(size_pic);
+  if (gmem)
+    gmem->m_opaque = (void *)this;
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p mmal:%p", CLASSNAME, __FUNCTION__, this, gmem, mmal_buffer);
+}
+
+CMMALYUVBuffer::~CMMALYUVBuffer()
+{
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s buf:%p gmem:%p", CLASSNAME, __FUNCTION__, this, gmem);
+  if (gmem)
+    m_dec->ReleaseBuffer(gmem);
+  gmem = nullptr;
+  if (mmal_buffer)
+    mmal_buffer_header_release(mmal_buffer);
+  m_dec->Release();
+}
+
+CGPUMEM *CDecoder::AllocateBuffer(unsigned int size_pic)
+{
+  CSingleLock lock(m_section);
+  CGPUMEM *gmem = nullptr;
+  while (!m_freeBuffers.empty())
+  {
+    gmem = m_freeBuffers.front();
+    m_freeBuffers.pop_front();
+    if (gmem->m_numbytes == size_pic)
+      return gmem;
+    delete gmem;
+  }
+
+  gmem = new CGPUMEM(size_pic, true);
+  if (!gmem)
+    CLog::Log(LOGERROR, "%s::%s GCPUMEM(%d) failed", CLASSNAME, __FUNCTION__, size_pic);
+  return gmem;
+}
+
+void CDecoder::ReleaseBuffer(CGPUMEM *gmem)
+{
+  if (m_closing)
+    delete gmem;
+  else
+    m_freeBuffers.push_back(gmem);
+}
+
+void CDecoder::AlignedSize(AVCodecContext *avctx, int &w, int &h)
+{
+  AVFrame picture;
+  int unaligned;
+  int stride_align[AV_NUM_DATA_POINTERS];
+
+  avcodec_align_dimensions2(avctx, &w, &h, stride_align);
+  // gpu requirements
+  w = (w + 31) & ~31;
+  h = (h + 15) & ~15;
+
+  do {
+    // NOTE: do not align linesizes individually, this breaks e.g. assumptions
+    // that linesize[0] == 2*linesize[1] in the MPEG-encoder for 4:2:2
+    av_image_fill_linesizes(picture.linesize, avctx->pix_fmt, w);
+    // increase alignment of w for next try (rhs gives the lowest bit set in w)
+    w += w & ~(w - 1);
+
+    unaligned = 0;
+    for (int i = 0; i < 4; i++)
+      unaligned |= picture.linesize[i] % stride_align[i];
+  } while (unaligned);
+}
+
+CMMALYUVBuffer *CDecoder::GetBuffer(unsigned int width, unsigned int height, AVCodecContext *avctx)
+{
+  CSingleLock lock(m_section);
+  // ffmpeg requirements
+  int aligned_width = width;
+  int aligned_height = height;
+  AlignedSize(avctx, aligned_width, aligned_height);
+  return new CMMALYUVBuffer(this, width, height, aligned_width, aligned_height);
+}
+
+//-----------------------------------------------------------------------------
+// MMAL Decoder
+//-----------------------------------------------------------------------------
+
+#undef CLASSNAME
+#define CLASSNAME "CDecoder"
+
+CDecoder::CDecoder()
+{
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - create %p", CLASSNAME, __FUNCTION__, this);
+  m_shared = 0;
+  m_avctx = nullptr;
+  m_renderer = nullptr;
+  m_closing = false;
+}
+
+CDecoder::~CDecoder()
+{
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - destroy %p", CLASSNAME, __FUNCTION__, this);
+  Close();
+}
+
+long CDecoder::Release()
+{
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - m_refs:%ld", CLASSNAME, __FUNCTION__, m_refs);
+  return IHardwareDecoder::Release();
+}
+
+void CDecoder::Close()
+{
+  CSingleLock lock(m_section);
+
+  m_closing = true;
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - close %p", CLASSNAME, __FUNCTION__, this);
+
+  while (!m_freeBuffers.empty())
+  {
+    CGPUMEM *gmem = m_freeBuffers.front();
+    m_freeBuffers.pop_front();
+    delete gmem;
+  }
+  assert(m_freeBuffers.empty());
+
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG,"%s::%s", CLASSNAME, __FUNCTION__);
+}
+
+void CDecoder::FFReleaseBuffer(void *opaque, uint8_t *data)
+{
+  CGPUMEM *gmem = (CGPUMEM *)opaque;
+  CMMALYUVBuffer *YUVBuffer = (CMMALYUVBuffer *)gmem->m_opaque;
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG,"%s::%s buf:%p gmem:%p", CLASSNAME, __FUNCTION__, YUVBuffer, gmem);
+
+  YUVBuffer->Release();
+}
+
+int CDecoder::FFGetBuffer(AVCodecContext *avctx, AVFrame *frame, int flags)
+{
+  CDVDVideoCodecFFmpeg *ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque;
+  CDecoder *dec = (CDecoder*)ctx->GetHardware();
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG,"%s::%s %dx%d format:%x flags:%x", CLASSNAME, __FUNCTION__, frame->width, frame->height, frame->format, flags);
+
+  if ((avctx->codec->capabilities & AV_CODEC_CAP_DR1) == 0 || frame->format != AV_PIX_FMT_YUV420P)
+  {
+    assert(0);
+    return avcodec_default_get_buffer2(avctx, frame, flags);
+  }
+
+  CSingleLock lock(dec->m_section);
+
+  CMMALYUVBuffer *YUVBuffer = dec->GetBuffer(frame->width, frame->height, dec->m_avctx);
+
+  CGPUMEM *gmem = YUVBuffer->gmem;
+  AVBufferRef *buf = av_buffer_create((uint8_t *)gmem->m_arm, (YUVBuffer->m_aligned_width * YUVBuffer->m_aligned_height * 3)>>1, CDecoder::FFReleaseBuffer, gmem, AV_BUFFER_FLAG_READONLY);
+  if (!buf)
+  {
+    CLog::Log(LOGERROR, "%s::%s av_buffer_create() failed", CLASSNAME, __FUNCTION__);
+    YUVBuffer->Release();
+    return -1;
+  }
+
+  for (int i = 0; i < AV_NUM_DATA_POINTERS; i++)
+  {
+    frame->buf[i] = NULL;
+    frame->data[i] = NULL;
+    frame->linesize[i] = 0;
+  }
+
+  frame->buf[0] = buf;
+  frame->linesize[0] = YUVBuffer->m_aligned_width;
+  frame->linesize[1] = YUVBuffer->m_aligned_width>>1;
+  frame->linesize[2] = YUVBuffer->m_aligned_width>>1;
+  frame->data[0] = (uint8_t *)gmem->m_arm;
+  frame->data[1] = frame->data[0] + YUVBuffer->m_aligned_width * YUVBuffer->m_aligned_height;
+  frame->data[2] = frame->data[1] + (YUVBuffer->m_aligned_width>>1) * (YUVBuffer->m_aligned_height>>1);
+  frame->extended_data = frame->data;
+  // Leave extended buf alone
+
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG,"%s::%s buf:%p gmem:%p avbuf:%p:%p:%p", CLASSNAME, __FUNCTION__, YUVBuffer, gmem, frame->data[0], frame->data[1], frame->data[2]);
+
+  return 0;
+}
+
+
+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
+{
+  CSingleLock lock(m_section);
+
+  m_renderer = (CMMALRenderer *)mainctx->hwaccel_context;
+
+  CLog::Log(LOGNOTICE, "%s::%s - m_renderer:%p", CLASSNAME, __FUNCTION__, m_renderer);
+  assert(m_renderer);
+  mainctx->hwaccel_context = nullptr;
+
+  if (surfaces > m_shared)
+    m_shared = surfaces;
+
+  CLog::Log(LOGDEBUG, "%s::%s MMAL - source requires %d references", CLASSNAME, __FUNCTION__, avctx->refs);
+
+  avctx->get_buffer2 = CDecoder::FFGetBuffer;
+  mainctx->get_buffer2 = CDecoder::FFGetBuffer;
+
+  m_avctx = mainctx;
+  return true;
+}
+
+int CDecoder::Decode(AVCodecContext* avctx, AVFrame* frame)
+{
+  int status = Check(avctx);
+  if(status)
+    return status;
+
+  if(frame)
+    return VC_BUFFER | VC_PICTURE;
+  else
+    return VC_BUFFER;
+}
+
+MMAL_BUFFER_HEADER_T *CDecoder::GetMmal()
+{
+  MMAL_POOL_T *render_pool = m_renderer->GetPool(RENDER_FMT_MMAL, false);
+  assert(render_pool);
+  MMAL_BUFFER_HEADER_T *mmal_buffer = mmal_queue_timedwait(render_pool->queue, 500);
+  if (!mmal_buffer)
+  {
+    CLog::Log(LOGERROR, "%s::%s - mmal_queue_get failed", CLASSNAME, __FUNCTION__);
+    return nullptr;
+  }
+  mmal_buffer_header_reset(mmal_buffer);
+  mmal_buffer->cmd = 0;
+  mmal_buffer->offset = 0;
+  mmal_buffer->flags = 0;
+  mmal_buffer->user_data = NULL;
+  return mmal_buffer;
+}
+
+bool CDecoder::GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture)
+{
+  CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque;
+  bool ret = ctx->GetPictureCommon(picture);
+  if (!ret)
+    return false;
+
+  if (frame->format != AV_PIX_FMT_YUV420P || frame->buf[1] != nullptr || frame->buf[0] == nullptr)
+    return false;
+
+  MMAL_BUFFER_HEADER_T *mmal_buffer = GetMmal();
+  if (!mmal_buffer)
+    return false;
+
+  CSingleLock lock(m_section);
+
+  AVBufferRef *buf = frame->buf[0];
+  CGPUMEM *gmem = (CGPUMEM *)av_buffer_get_opaque(buf);
+  mmal_buffer->data = (uint8_t *)gmem->m_vc_handle;
+  mmal_buffer->alloc_size = mmal_buffer->length = gmem->m_numbytes;
+
+  picture->MMALBuffer = (CMMALYUVBuffer *)gmem->m_opaque;
+  assert(picture->MMALBuffer);
+  picture->format = RENDER_FMT_MMAL;
+  assert(!picture->MMALBuffer->mmal_buffer);
+  picture->MMALBuffer->mmal_buffer = mmal_buffer;
+
+  // need to flush ARM cache so GPU can see it
+  gmem->Flush();
+
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p gpu:%p", CLASSNAME, __FUNCTION__, picture->MMALBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, picture->MMALBuffer, gmem);
+  return true;
+}
+
+int CDecoder::Check(AVCodecContext* avctx)
+{
+  CSingleLock lock(m_section);
+  return 0;
+}
+
+unsigned CDecoder::GetAllowedReferences()
+{
+  return m_shared;
+}
+
+#endif

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h Added

@@ -0,0 +1,82 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+#include <memory>
+#include <queue>
+#include "DVDCodecs/Video/DVDVideoCodecFFmpeg.h"
+#include "libavcodec/avcodec.h"
+#include "MMALCodec.h"
+
+class CMMALRenderer;
+struct MMAL_BUFFER_HEADER_T;
+class CGPUMEM;
+
+namespace MMAL {
+
+class CDecoder;
+
+// a mmal video frame
+class CMMALYUVBuffer : public CMMALBuffer
+{
+public:
+  CMMALYUVBuffer(CDecoder *dec, unsigned int width, unsigned int height, unsigned int aligned_width, unsigned int aligned_height);
+  virtual ~CMMALYUVBuffer();
+
+  CGPUMEM *gmem;
+private:
+  CDecoder *m_dec;
+};
+
+class CDecoder
+  : public CDVDVideoCodecFFmpeg::IHardwareDecoder
+{
+public:
+  CDecoder();
+  virtual ~CDecoder();
+  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
+  virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
+  virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
+  virtual int Check(AVCodecContext* avctx);
+  virtual void Close();
+  virtual const std::string Name() { return "mmal"; }
+  virtual unsigned GetAllowedReferences();
+  virtual long Release();
+
+  static void FFReleaseBuffer(void *opaque, uint8_t *data);
+  static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
+
+  static void AlignedSize(AVCodecContext *avctx, int &w, int &h);
+  CMMALYUVBuffer *GetBuffer(unsigned int width, unsigned int height, AVCodecContext *avctx);
+  CGPUMEM *AllocateBuffer(unsigned int numbytes);
+  void ReleaseBuffer(CGPUMEM *gmem);
+  unsigned sizeFree() { return m_freeBuffers.size(); }
+protected:
+  MMAL_BUFFER_HEADER_T *GetMmal();
+  AVCodecContext *m_avctx;
+  unsigned int m_shared;
+  CCriticalSection m_section;
+  CMMALRenderer *m_renderer;
+  std::deque<CGPUMEM *> m_freeBuffers;
+  bool m_closing;
+};
+
+};

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp Changed

@@ -70,8 +70,7 @@
 {
   CSingleLock lock(m_section);
 
-  std::vector<CDecoder*>::iterator it;
-  it = find(m_decoders.begin(), m_decoders.end(), decoder);
+  auto it = find(m_decoders.begin(), m_decoders.end(), decoder);
   if (it != m_decoders.end())
     m_decoders.erase(it);
 
@@ -258,8 +257,7 @@
 
 bool CVAAPIContext::IsValidDecoder(CDecoder *decoder)
 {
-  std::vector<CDecoder*>::iterator it;
-  it = find(m_decoders.begin(), m_decoders.end(), decoder);
+  auto it = find(m_decoders.begin(), m_decoders.end(), decoder);
   if (it != m_decoders.end())
     return true;
 
@@ -312,8 +310,7 @@
     CLog::Log(LOGWARNING, "CVideoSurfaces::MarkRender - surface invalid");
     return false;
   }
-  std::list<VASurfaceID>::iterator it;
-  it = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
+  auto it = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
   if (it != m_freeSurfaces.end())
   {
     m_freeSurfaces.erase(it);
@@ -351,8 +348,7 @@
   CSingleLock lock(m_section);
   if (m_state.find(surf) != m_state.end())
   {
-    std::list<VASurfaceID>::iterator it;
-    it = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
+    auto it = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
     if (it == m_freeSurfaces.end())
     {
       CLog::Log(LOGWARNING, "CVideoSurfaces::GetFree - surface not free");
@@ -381,7 +377,7 @@
   if ((size_t) idx >= m_state.size())
     return VA_INVALID_SURFACE;
 
-  std::map<VASurfaceID, int>::iterator it = m_state.begin();
+  auto it = m_state.begin();
   for(int i = 0; i < idx; i++)
     ++it;
   return it->first;
@@ -391,16 +387,14 @@
 {
   CSingleLock lock(m_section);
   VASurfaceID surf;
-  std::map<VASurfaceID, int>::iterator it;
-  for(it = m_state.begin(); it != m_state.end(); ++it)
+  for(auto it = m_state.begin(); it != m_state.end(); ++it)
   {
     if (skiprender && it->second & SURFACE_USED_FOR_RENDER)
       continue;
     surf = it->first;
     m_state.erase(surf);
 
-    std::list<VASurfaceID>::iterator it2;
-    it2 = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
+    auto it2 = std::find(m_freeSurfaces.begin(), m_freeSurfaces.end(), surf);
     if (it2 != m_freeSurfaces.end())
       m_freeSurfaces.erase(it2);
     return surf;
@@ -436,9 +430,9 @@
 bool CVideoSurfaces::HasRefs()
 {
   CSingleLock lock(m_section);
-  for (std::map<VASurfaceID, int>::iterator it = m_state.begin(); it != m_state.end(); ++it)
+  for (const auto &i : m_state)
   {
-    if (it->second & SURFACE_USED_FOR_REFERENCE)
+    if (i.second & SURFACE_USED_FOR_REFERENCE)
     return true;
   }
   return false;
@@ -2150,8 +2144,7 @@
 
 void COutput::DropVppProcessedPictures()
 {
-  std::deque<CVaapiProcessedPicture>::iterator it;
-  it = m_bufferPool.processedPics.begin();
+  auto it = m_bufferPool.processedPics.begin();
   while (it != m_bufferPool.processedPics.end())
   {
     if (it->source == CVaapiProcessedPicture::VPP_SRC)
@@ -2195,9 +2188,9 @@
   }
 
   // check if already queued
-  std::deque<int>::iterator it2 = find(m_bufferPool.syncRenderPics.begin(),
-                                       m_bufferPool.syncRenderPics.end(),
-                                       *it);
+  auto it2 = find(m_bufferPool.syncRenderPics.begin(),
+                  m_bufferPool.syncRenderPics.end(),
+                  *it);
   if (it2 == m_bufferPool.syncRenderPics.end())
   {
     m_bufferPool.syncRenderPics.push_back(*it);
@@ -2211,8 +2204,7 @@
   CVaapiRenderPicture *pic;
   bool busy = false;
 
-  std::deque<int>::iterator it;
-  for (it = m_bufferPool.syncRenderPics.begin(); it != m_bufferPool.syncRenderPics.end(); )
+  for (auto it = m_bufferPool.syncRenderPics.begin(); it != m_bufferPool.syncRenderPics.end(); )
   {
     pic = m_bufferPool.allRenderPics[*it];
 
@@ -2241,9 +2233,9 @@
 
     m_bufferPool.freeRenderPics.push_back(*it);
 
-    std::deque<int>::iterator it2 = find(m_bufferPool.usedRenderPics.begin(),
-                                         m_bufferPool.usedRenderPics.end(),
-                                         *it);
+    auto it2 = find(m_bufferPool.usedRenderPics.begin(),
+                    m_bufferPool.usedRenderPics.end(),
+                    *it);
     if (it2 == m_bufferPool.usedRenderPics.end())
     {
       CLog::Log(LOGERROR, "COutput::ProcessSyncPicture - pic not found in queue");
@@ -2279,8 +2271,7 @@
 
 void COutput::ProcessReturnProcPicture(int id)
 {
-  std::deque<CVaapiProcessedPicture>::iterator it;
-  for (it=m_bufferPool.processedPicsAway.begin(); it!=m_bufferPool.processedPicsAway.end(); ++it)
+  for (auto it=m_bufferPool.processedPicsAway.begin(); it!=m_bufferPool.processedPicsAway.end(); ++it)
   {
     if (it->id == id)
     {
@@ -2808,12 +2799,11 @@
     return false;
   }
 
-  std::deque<CVaapiDecodedPicture>::iterator it;
-  for (it=m_decodedPics.begin(); it!=m_decodedPics.end(); ++it)
-  {
-    if (it->index == m_currentIdx)
-      break;
-  }
+  const auto currentIdx = m_currentIdx;
+  auto it = std::find_if(m_decodedPics.begin(), m_decodedPics.end(),
+                         [currentIdx](const CVaapiDecodedPicture &picture){
+                           return picture.index == currentIdx;
+                         });
   if (it==m_decodedPics.end())
   {
     return false;
@@ -2916,26 +2906,26 @@
   double pts = DVD_NOPTS_VALUE;
 
   pipelineParams->surface = VA_INVALID_SURFACE;
-  for (it=m_decodedPics.begin(); it!=m_decodedPics.end(); ++it)
+  for (const auto &picture : m_decodedPics)
   {
-    if (it->index >= minPic && it->index <= maxPic)
+    if (picture.index >= minPic && picture.index <= maxPic)
     {
-      if (it->index > curPic)
+      if (picture.index > curPic)
       {
-        backwardRefs[(it->index - curPic) - 1] = it->videoSurface;
+        backwardRefs[(picture.index - curPic) - 1] = picture.videoSurface;
         pipelineParams->num_backward_references++;
       }
-      else if (it->index == curPic)
+      else if (picture.index == curPic)
       {
-        pipelineParams->surface = it->videoSurface;
-        pts = it->DVDPic.pts;
+        pipelineParams->surface = picture.videoSurface;
+        pts = picture.DVDPic.pts;
       }
-      if (it->index < curPic)
+      if (picture.index < curPic)
       {
-        forwardRefs[(curPic - it->index) - 1] = it->videoSurface;
+        forwardRefs[(curPic - picture.index) - 1] = picture.videoSurface;
         pipelineParams->num_forward_references++;
-        if (it->index == curPic - 1)
-          ptsLast = it->DVDPic.pts;
+        if (picture.index == curPic - 1)
+          ptsLast = picture.DVDPic.pts;
       }
     }
   }
@@ -2984,8 +2974,7 @@
   m_currentIdx++;
 
   // release all unneeded refs
-  std::deque<CVaapiDecodedPicture>::iterator it;
-  it = m_decodedPics.begin();
+  auto it = m_decodedPics.begin();
   while (it != m_decodedPics.end())
   {
     if (it->index < m_currentIdx - m_forwardRefs)
@@ -3006,8 +2995,7 @@
 void CVppPostproc::Flush()
 {
   // release all decoded pictures
-  std::deque<CVaapiDecodedPicture>::iterator it;
-  it = m_decodedPics.begin();
+  auto it = m_decodedPics.begin();
   while (it != m_decodedPics.end())
   {
     m_config.videoSurfaces->ClearRender(it->videoSurface);

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxSPU.cpp Changed

@@ -92,7 +92,7 @@
     pSPUData->iSize = 0;
 
     // check spu data lenght, only needed / possible in the first spu pakcet
-    unsigned __int16 length = data[0] << 8 | data[1];
+    uint16_t length = data[0] << 8 | data[1];
     if (length == 0)
     {
       DebugLog("corrupt spu data: zero packet");
@@ -174,7 +174,7 @@
   uint8_t* p = pSPUData->data; // pointer to walk through all data
 
   // get data length
-  unsigned __int16 datalength = p[2] << 8 | p[3]; // datalength + 4 control bytes
+  uint16_t datalength = p[2] << 8 | p[3]; // datalength + 4 control bytes
 
   pUnparsedData = pSPUData->data + 4;
 
@@ -190,8 +190,8 @@
   {
     DebugLog("  starting new SP_DCSQT");
     // p is beginning of first SP_DCSQT now
-    unsigned __int16 delay = p[0] << 8 | p[1];
-    unsigned __int16 next_DCSQ = p[2] << 8 | p[3];
+    uint16_t delay = p[0] << 8 | p[1];
+    uint16_t next_DCSQ = p[2] << 8 | p[3];
 
     //offset within the Sub-Picture Unit to the next SP_DCSQ. If this is the last SP_DCSQ, it points to itself.
     bHasNewDCSQ = ((pSPUData->data + next_DCSQ) != p);
@@ -295,8 +295,8 @@
       case SET_DSPXA:
         {
           p++;
-          unsigned __int16 tfaddr = (p[0] << 8 | p[1]); // offset in packet
-          unsigned __int16 bfaddr = (p[2] << 8 | p[3]); // offset in packet
+          uint16_t tfaddr = (p[0] << 8 | p[1]); // offset in packet
+          uint16_t bfaddr = (p[2] << 8 | p[3]); // offset in packet
           pSPUInfo->pTFData = (tfaddr - 4); //pSPUInfo->pData + (tfaddr - 4); // pSPUData->data = packet startaddr - 4
           pSPUInfo->pBFData = (bfaddr - 4); //pSPUInfo->pData + (bfaddr - 4); // pSPUData->data = packet startaddr - 4
           p += 4;
@@ -306,7 +306,7 @@
       case CHG_COLCON:
         {
           p++;
-          unsigned __int16 paramlength = p[0] << 8 | p[1];
+          uint16_t paramlength = p[0] << 8 | p[1];
           DebugLog("GetPacket, CHG_COLCON, skippin %i bytes", paramlength);
           p += paramlength;
         }
@@ -365,7 +365,7 @@
   unsigned int i_x, i_y;
 
   // allocate a buffer for the result
-  unsigned __int16* p_dest = (unsigned __int16*)pSPU->result;
+  uint16_t* p_dest = (uint16_t*)pSPU->result;
 
   /* The subtitles are interlaced, we need two offsets */
   unsigned int i_id = 0;                   /* Start on the even SPU layer */

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxSPU.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.h Changed

@@ -77,6 +77,7 @@
   {
     uniqueId = 0;
     dvdNavId = 0;
+    demuxerId = -1;
     codec = (AVCodecID)0; // AV_CODEC_ID_NONE
     codec_fourcc = 0;
     profile = FF_PROFILE_UNKNOWN;
@@ -104,6 +105,7 @@
 
   int uniqueId;          // unique stream id
   int dvdNavId;
+  int64_t demuxerId; // id of the associated demuxer
   AVCodecID codec;
   unsigned int codec_fourcc; // if available
   int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders.
@@ -232,7 +234,7 @@
 {
 public:
 
-  CDVDDemux() {}
+  CDVDDemux() : m_demuxerId(NewGuid()) {}
   virtual ~CDVDDemux() {}
 
 
@@ -306,7 +308,7 @@
   /*
    * returns the stream or NULL on error
    */
-  virtual CDemuxStream* GetStream(int iStreamId) const = 0;
+  virtual CDemuxStream* GetStream(int64_t demuxerId, int iStreamId) const { return GetStream(iStreamId); };
 
   virtual std::vector<CDemuxStream*> GetStreams() const = 0;
 
@@ -328,23 +330,44 @@
   /*
    * return a user-presentable codec name of the given stream
    */
-  virtual std::string GetStreamCodecName(int iStreamId) { return ""; };
+  virtual std::string GetStreamCodecName(int64_t demuxerId, int iStreamId) { return GetStreamCodecName(iStreamId); };
 
   /*
   * return true if demuxer supports enabling at a specific PTS
   */
-  virtual bool SupportsEnableAtPTS() { return false; };
+  virtual bool SupportsEnableAtPTS(int64_t demuxerId) { return SupportsEnableAtPTS(); };
 
   /*
    * enable / disable demux stream
    */
-  virtual void EnableStream(int id, bool enable) {};
+  virtual void EnableStream(int64_t demuxerId, int id, bool enable) { EnableStream(id, enable); };
 
   /*
   * enable / disable demux stream at given PTS
   */
-  virtual void EnableStreamAtPTS(int id, uint64_t pts) {};
+  virtual void EnableStreamAtPTS(int64_t demuxerId, int id, uint64_t pts) { EnableStreamAtPTS(id, pts); };
+
+  /*
+  * return the id of the demuxer
+  */
+  int64_t GetDemuxerId() { return m_demuxerId; };
 
 protected:
+  virtual void EnableStream(int id, bool enable) {};
+  virtual void EnableStreamAtPTS(int id, uint64_t pts) {};
+  virtual bool SupportsEnableAtPTS() { return false; };
+  virtual CDemuxStream* GetStream(int iStreamId) const = 0;
+  virtual std::string GetStreamCodecName(int iStreamId) { return ""; };
+
   int GetNrOfStreams(StreamType streamType);
+
+  int64_t m_demuxerId;
+
+private:
+
+  int64_t NewGuid()
+  {
+    static int64_t guid = 0;
+    return guid++;
+  }
 };

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.cpp Changed

@@ -62,36 +62,16 @@
   bool m_parser_split;
 };
 
-class CDemuxStreamVideoClient
-: public CDemuxStreamVideo
-, public CDemuxStreamClientInternal
+template <class T>
+class CDemuxStreamClientInternalTpl : public CDemuxStreamClientInternal, public T
 {
-public:
-  CDemuxStreamVideoClient() {}
-};
-
-class CDemuxStreamAudioClient
-: public CDemuxStreamAudio
-, public CDemuxStreamClientInternal
-{
-public:
-  CDemuxStreamAudioClient() {}
-};
-
-class CDemuxStreamSubtitleClient
-: public CDemuxStreamSubtitle
-, public CDemuxStreamClientInternal
-{
-public:
-  CDemuxStreamSubtitleClient() {}
 };
 
 CDVDDemuxClient::CDVDDemuxClient() : CDVDDemux()
 {
   m_pInput = nullptr;
   m_IDemux = nullptr;
-  for (int i = 0; i < MAX_STREAMS; i++)
-    m_streams[i] = nullptr;
+  m_streams.clear();
 }
 
 CDVDDemuxClient::~CDVDDemuxClient()
@@ -112,6 +92,9 @@
     return false;
 
   RequestStreams();
+
+  m_displayTime = 0;
+  m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
   return true;
 }
 
@@ -123,18 +106,9 @@
   m_IDemux = nullptr;
 }
 
-void CDVDDemuxClient::DisposeStream(int iStreamId)
-{
-  if (iStreamId < 0 || iStreamId >= MAX_STREAMS)
-    return;
-  delete m_streams[iStreamId];
-  m_streams[iStreamId] = nullptr;
-}
-
 void CDVDDemuxClient::DisposeStreams()
 {
-  for (int i=0; i< MAX_STREAMS; i++)
-    DisposeStream(i);
+  m_streams.clear();
 }
 
 void CDVDDemuxClient::Reset()
@@ -154,11 +128,14 @@
 {
   if (m_IDemux)
     m_IDemux->FlushDemux();
+
+  m_displayTime = 0;
+  m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
 }
 
 void CDVDDemuxClient::ParsePacket(DemuxPacket* pkt)
 {
-  CDemuxStream* st = m_streams[pkt->iStreamId];
+  CDemuxStream* st = GetStream(pkt->iStreamId);
   if (st == nullptr)
     return;
 
@@ -243,7 +220,7 @@
     {
       case STREAM_AUDIO:
       {
-        CDemuxStreamAudioClient* sta = static_cast<CDemuxStreamAudioClient*>(st);
+        CDemuxStreamClientInternalTpl<CDemuxStreamAudio>* sta = static_cast<CDemuxStreamClientInternalTpl<CDemuxStreamAudio>*>(st);
         if (stream->m_context->channels != sta->iChannels &&
             stream->m_context->channels != 0)
         {
@@ -264,7 +241,7 @@
       }
       case STREAM_VIDEO:
       {
-        CDemuxStreamVideoClient* stv = static_cast<CDemuxStreamVideoClient*>(st);
+        CDemuxStreamClientInternalTpl<CDemuxStreamVideo>* stv = static_cast<CDemuxStreamClientInternalTpl<CDemuxStreamVideo>*>(st);
         if (stream->m_context->width != stv->iWidth &&
             stream->m_context->width != 0)
         {
@@ -316,35 +293,48 @@
     RequestStreams();
   }
   else if (pPacket->iStreamId >= 0 &&
-           pPacket->iStreamId < MAX_STREAMS &&
            m_streams[pPacket->iStreamId])
   {
     ParsePacket(pPacket);
   }
 
+  CDVDInputStream::IDisplayTime *inputStream = m_pInput->GetIDisplayTime();
+  if (inputStream)
+  {
+    int dispTime = inputStream->GetTime();
+    if (m_displayTime != dispTime)
+    {
+      m_displayTime = dispTime;
+      if (pPacket->dts != DVD_NOPTS_VALUE)
+      {
+        m_dtsAtDisplayTime = pPacket->dts;
+      }
+    }
+    if (m_dtsAtDisplayTime != DVD_NOPTS_VALUE && pPacket->dts != DVD_NOPTS_VALUE)
+    {
+      pPacket->dispTime = m_displayTime;
+      pPacket->dispTime += DVD_TIME_TO_MSEC(pPacket->dts - m_dtsAtDisplayTime);
+    }
+  }
   return pPacket;
 }
 
 CDemuxStream* CDVDDemuxClient::GetStream(int iStreamId) const
 {
-  for (int i=0; i<GetNrOfStreams(); i++)
-  {
-    if (m_streams[i]->uniqueId == iStreamId)
-      return m_streams[i];
-  }
-  return nullptr;
+  auto stream = m_streams.find(iStreamId);
+  if (stream == m_streams.end())
+    return nullptr;
+
+  return stream->second.get();
 }
 
 std::vector<CDemuxStream*> CDVDDemuxClient::GetStreams() const
 {
   std::vector<CDemuxStream*> streams;
 
-  for (auto iter : m_streams)
+  for (auto &iter : m_streams)
   {
-    if (iter != nullptr)
-    {
-      streams.push_back(iter);
-    }
+    streams.push_back(iter.second.get());
   }
 
   return streams;
@@ -352,187 +342,213 @@
 
 void CDVDDemuxClient::RequestStreams()
 {
-  int i = -1;
+  std::map<int, std::shared_ptr<CDemuxStream>> m_newStreamMap;
+
   for (auto stream : m_IDemux->GetStreams())
   {
-    ++i;
     if (!stream)
     {
-      CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid stream at pos %d", i);
+      CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid stream");
       DisposeStreams();
       return;
     }
 
+    std::shared_ptr<CDemuxStream> dStream = GetStreamInternal(stream->uniqueId);
+
     if (stream->type == STREAM_AUDIO)
     {
       CDemuxStreamAudio *source = dynamic_cast<CDemuxStreamAudio*>(stream);
       if (!source)
       {
-        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream at pos %d", i);
+        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream with id %d", stream->uniqueId);
         DisposeStreams();
         return;
       }
-      CDemuxStreamAudioClient* st = nullptr;
-      if (m_streams[i])
-      {
-        st = dynamic_cast<CDemuxStreamAudioClient*>(m_streams[i]);
-        if (!st || (st->codec != source->codec))
-          DisposeStream(i);
-      }
-      if (!m_streams[i])
+
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStreamAudio>> streamAudio;
+      if (dStream)
+        streamAudio = std::dynamic_pointer_cast<CDemuxStreamClientInternalTpl<CDemuxStreamAudio>>(dStream);
+      if (!streamAudio || streamAudio->codec != source->codec)
       {
-        st = new CDemuxStreamAudioClient();
-        st->m_parser = av_parser_init(source->codec);
-        if(st->m_parser)
-          st->m_parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
+        streamAudio.reset(new CDemuxStreamClientInternalTpl<CDemuxStreamAudio>());
+        streamAudio->m_parser = av_parser_init(source->codec);
+        if (streamAudio->m_parser)
+          streamAudio->m_parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
       }
-      st->iChannels       = source->iChannels;
-      st->iSampleRate     = source->iSampleRate;
-      st->iBlockAlign     = source->iBlockAlign;
-      st->iBitRate        = source->iBitRate;
-      st->iBitsPerSample  = source->iBitsPerSample;
+
+      streamAudio->iChannels       = source->iChannels;
+      streamAudio->iSampleRate     = source->iSampleRate;
+      streamAudio->iBlockAlign     = source->iBlockAlign;
+      streamAudio->iBitRate        = source->iBitRate;
+      streamAudio->iBitsPerSample  = source->iBitsPerSample;
       if (source->ExtraSize > 0 && source->ExtraData)
       {
-        st->ExtraData = new uint8_t[source->ExtraSize];
-        st->ExtraSize = source->ExtraSize;
+        streamAudio->ExtraData = new uint8_t[source->ExtraSize];
+        streamAudio->ExtraSize = source->ExtraSize;
         for (unsigned int j=0; j<source->ExtraSize; j++)
-          st->ExtraData[j] = source->ExtraData[j];
+          streamAudio->ExtraData[j] = source->ExtraData[j];
       }
-      m_streams[i] = st;
-      st->m_parser_split = true;
-      st->changes++;
+      streamAudio->m_parser_split = true;
+      streamAudio->changes++;
+      m_newStreamMap[stream->uniqueId] = streamAudio;
+      dStream = streamAudio;
     }
     else if (stream->type == STREAM_VIDEO)
     {
       CDemuxStreamVideo *source = dynamic_cast<CDemuxStreamVideo*>(stream);
+
       if (!source)
       {
-        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid video stream at pos %d", i);
+        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream with id %d", stream->uniqueId);
         DisposeStreams();
         return;
       }
-      CDemuxStreamVideoClient* st = nullptr;
-      if (m_streams[i])
-      {
-        st = dynamic_cast<CDemuxStreamVideoClient*>(m_streams[i]);
-        if (!st
-            || (st->codec != source->codec)
-            || (st->iWidth != source->iWidth)
-            || (st->iHeight != source->iHeight))
-          DisposeStream(i);
-      }
-      if (!m_streams[i])
+
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStreamVideo>> streamVideo;
+      if (dStream)
+        streamVideo = std::dynamic_pointer_cast<CDemuxStreamClientInternalTpl<CDemuxStreamVideo>>(dStream);
+      if (!streamVideo || streamVideo->codec != source->codec ||
+          streamVideo->iWidth != source->iWidth || streamVideo->iHeight != source->iHeight)
       {
-        st = new CDemuxStreamVideoClient();
-        st->m_parser = av_parser_init(source->codec);
-        if(st->m_parser)
-          st->m_parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
+        streamVideo.reset(new CDemuxStreamClientInternalTpl<CDemuxStreamVideo>());
+        streamVideo->m_parser = av_parser_init(source->codec);
+        if (streamVideo->m_parser)
+          streamVideo->m_parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
       }
-      st->iFpsScale       = source->irFpsScale;
-      st->iFpsRate        = source->irFpsRate;
-      st->iHeight         = source->iHeight;
-      st->iWidth          = source->iWidth;
-      st->fAspect         = source->fAspect;
-      st->stereo_mode     = "mono";
+
+      streamVideo->iFpsScale       = source->irFpsScale;
+      streamVideo->iFpsRate        = source->irFpsRate;
+      streamVideo->iHeight         = source->iHeight;
+      streamVideo->iWidth          = source->iWidth;
+      streamVideo->fAspect         = source->fAspect;
+      streamVideo->stereo_mode     = "mono";
       if (source->ExtraSize > 0 && source->ExtraData)
       {
-        st->ExtraData = new uint8_t[source->ExtraSize];
-        st->ExtraSize = source->ExtraSize;
+        streamVideo->ExtraData = new uint8_t[source->ExtraSize];
+        streamVideo->ExtraSize = source->ExtraSize;
         for (unsigned int j=0; j<source->ExtraSize; j++)
-          st->ExtraData[j] = source->ExtraData[j];
+          streamVideo->ExtraData[j] = source->ExtraData[j];
       }
-      m_streams[i] = st;
-      st->m_parser_split = true;
+      streamVideo->m_parser_split = true;
+      streamVideo->changes++;
+      m_newStreamMap[stream->uniqueId] = streamVideo;
+      dStream = streamVideo;
     }
     else if (stream->type == STREAM_SUBTITLE)
     {
       CDemuxStreamSubtitle *source = dynamic_cast<CDemuxStreamSubtitle*>(stream);
+
       if (!source)
       {
-        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid subtitle stream at pos %d", i);
+        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream with id %d", stream->uniqueId);
         DisposeStreams();
         return;
       }
-      CDemuxStreamSubtitleClient* st = nullptr;
-      if (m_streams[i])
-      {
-        st = dynamic_cast<CDemuxStreamSubtitleClient*>(m_streams[i]);
-        if (!st || (st->codec != source->codec))
-          DisposeStream(i);
-      }
-      if (!m_streams[i])
+
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStreamSubtitle>> streamSubtitle;
+      if (dStream)
+        streamSubtitle = std::dynamic_pointer_cast<CDemuxStreamClientInternalTpl<CDemuxStreamSubtitle>>(dStream);
+      if (!streamSubtitle || streamSubtitle->codec != source->codec)
       {
-        st = new CDemuxStreamSubtitleClient();
+        streamSubtitle.reset(new CDemuxStreamClientInternalTpl<CDemuxStreamSubtitle>());
+        streamSubtitle->m_parser = av_parser_init(source->codec);
+        if (streamSubtitle->m_parser)
+          streamSubtitle->m_parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
       }
+
       if (source->ExtraSize == 4)
       {
-        st->ExtraData = new uint8_t[4];
-        st->ExtraSize = 4;
+        streamSubtitle->ExtraData = new uint8_t[4];
+        streamSubtitle->ExtraSize = 4;
         for (int j=0; j<4; j++)
-          st->ExtraData[j] = source->ExtraData[j];
+          streamSubtitle->ExtraData[j] = source->ExtraData[j];
       }
-      m_streams[i] = st;
+      m_newStreamMap[stream->uniqueId] = streamSubtitle;
+      dStream = streamSubtitle;
     }
     else if (stream->type == STREAM_TELETEXT)
     {
-      if (m_streams[i])
+      CDemuxStreamTeletext *source = dynamic_cast<CDemuxStreamTeletext*>(stream);
+
+      if (!source)
+      {
+        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream with id %d", stream->uniqueId);
+        DisposeStreams();
+        return;
+      }
+
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStreamTeletext>> streamTeletext;
+      if (dStream)
+        streamTeletext = std::dynamic_pointer_cast<CDemuxStreamClientInternalTpl<CDemuxStreamTeletext>>(dStream);
+      if (!streamTeletext || streamTeletext->codec != source->codec)
       {
-        if (m_streams[i]->codec != stream->codec)
-          DisposeStream(i);
+        streamTeletext.reset(new CDemuxStreamClientInternalTpl<CDemuxStreamTeletext>());
       }
-      if (!m_streams[i])
-        m_streams[i] = new CDemuxStreamTeletext();
+
+      m_newStreamMap[stream->uniqueId] = streamTeletext;
+      dStream = streamTeletext;
     }
     else if (stream->type == STREAM_RADIO_RDS)
     {
-      if (m_streams[i])
+      CDemuxStreamRadioRDS *source = dynamic_cast<CDemuxStreamRadioRDS*>(stream);
+
+      if (!source)
+      {
+        CLog::Log(LOGERROR, "CDVDDemuxClient::RequestStreams - invalid audio stream with id %d", stream->uniqueId);
+        DisposeStreams();
+        return;
+      }
+
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStreamRadioRDS>> streamRDS;
+      if (dStream)
+        streamRDS = std::dynamic_pointer_cast<CDemuxStreamClientInternalTpl<CDemuxStreamRadioRDS>>(dStream);
+      if (!streamRDS || streamRDS->codec != source->codec)
       {
-        if (m_streams[i]->codec != stream->codec)
-          DisposeStream(i);
+        streamRDS.reset(new CDemuxStreamClientInternalTpl<CDemuxStreamRadioRDS>());
       }
-      if (!m_streams[i])
-        m_streams[i] = new CDemuxStreamRadioRDS();
+
+      m_newStreamMap[stream->uniqueId] = streamRDS;
+      dStream = streamRDS;
     }
     else
     {
-      if (m_streams[i])
-        DisposeStream(i);
-      m_streams[i] = new CDemuxStream();
+      std::shared_ptr<CDemuxStreamClientInternalTpl<CDemuxStream>> streamGen;
+      streamGen = std::make_shared<CDemuxStreamClientInternalTpl<CDemuxStream>>();
+      m_newStreamMap[stream->uniqueId] = streamGen;
+      dStream = streamGen;
     }
 
-    m_streams[i]->codec = stream->codec;
-    m_streams[i]->codecName = stream->codecName;
-    m_streams[i]->bandwidth = stream->bandwidth;
-    m_streams[i]->uniqueId = stream->uniqueId;
+    dStream->uniqueId = stream->uniqueId;
+    dStream->codec = stream->codec;
+    dStream->codecName = stream->codecName;
+    dStream->bandwidth = stream->bandwidth;
+    dStream->uniqueId = stream->uniqueId;
     for (int j=0; j<4; j++)
-      m_streams[i]->language[j] = stream->language[j];
+      dStream->language[j] = stream->language[j];
 
-    m_streams[i]->realtime = stream->realtime;
+    dStream->realtime = stream->realtime;
 
     CLog::Log(LOGDEBUG,"CDVDDemuxClient::RequestStreams(): added/updated stream %d with codec_id %d",
-        m_streams[i]->uniqueId,
-        m_streams[i]->codec);
+        dStream->uniqueId,
+        dStream->codec);
   }
-  ++i;
-  // check if we need to dispose any streams no longer in props
-  for (int j = i; j < MAX_STREAMS; j++)
+  m_streams = m_newStreamMap;
+}
+
+std::shared_ptr<CDemuxStream> CDVDDemuxClient::GetStreamInternal(int iStreamId)
+{
+  auto stream = m_streams.find(iStreamId);
+  if (stream != m_streams.end())
   {
-    if (m_streams[j])
-    {
-      CLog::Log(LOGDEBUG,"CDVDDemuxClient::RequestStreams(): disposed stream %d with codec_id %d",
-          m_streams[j]->uniqueId,
-          m_streams[j]->codec);
-      DisposeStream(j);
-    }
+    return stream->second;
   }
+  else
+    return nullptr;
 }
 
 int CDVDDemuxClient::GetNrOfStreams() const
 {
-  int i = 0;
-  while (i < MAX_STREAMS && m_streams[i])
-    i++;
-  return i;
+  return m_streams.size();
 }
 
 std::string CDVDDemuxClient::GetFileName()
@@ -571,6 +587,8 @@
 {
   if (m_IDemux)
   {
+    m_displayTime = 0;
+    m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
     return m_IDemux->SeekTime(timems, backwards, startpts);
   }
   return false;

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxClient.h Changed

@@ -20,7 +20,7 @@
  */
 
 #include "DVDDemux.h"
-#include <vector>
+#include <map>
 
 extern "C" {
 #include "libavcodec/avcodec.h"
@@ -48,7 +48,7 @@
   int GetNrOfStreams() const override;
   std::string GetFileName() override;
   virtual std::string GetStreamCodecName(int iStreamId) override;
-  virtual bool SupportsEnableAtPTS() { return m_IDemux ? m_IDemux->SupportsEnableAtPTS():false; };
+  virtual bool SupportsEnableAtPTS() override { return m_IDemux ? m_IDemux->SupportsEnableAtPTS():false; };
   virtual void EnableStream(int id, bool enable) override;
   virtual void EnableStreamAtPTS(int id, uint64_t pts) override;
 
@@ -57,12 +57,12 @@
   void ParsePacket(DemuxPacket* pPacket);
   void DisposeStream(int iStreamId);
   void DisposeStreams();
+  std::shared_ptr<CDemuxStream> GetStreamInternal(int iStreamId);
   
   CDVDInputStream* m_pInput;
   CDVDInputStream::IDemux *m_IDemux;
-#ifndef MAX_STREAMS
-  #define MAX_STREAMS 100
-#endif
-  CDemuxStream* m_streams[MAX_STREAMS]; // maximum number of streams that ffmpeg can handle
+  std::map<int, std::shared_ptr<CDemuxStream>> m_streams;
+  int m_displayTime;
+  double m_dtsAtDisplayTime;
 };

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.cpp Changed

@@ -20,6 +20,7 @@
 
 #include "DVDDemuxFFmpeg.h"
 
+#include <sstream>
 #include <utility>
 
 #include "commons/Exception.h"
@@ -230,9 +231,9 @@
   {
     // special stream type that makes avformat handle file opening
     // allows internal ffmpeg protocols to be used
-    CURL url = m_pInput->GetURL();
+    AVDictionary *options = GetFFMpegOptionsFromInput();
 
-    AVDictionary *options = GetFFMpegOptionsFromURL(url);
+    CURL url = m_pInput->GetURL();
 
     int result=-1;
     if (url.IsProtocol("mms"))
@@ -437,7 +438,7 @@
       AVStream *st = m_pFormatContext->streams[i];
       if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->codec_id == AV_CODEC_ID_DTS)
       {
-        AVCodec* pCodec = avcodec_find_decoder_by_name("libdcadec");
+        AVCodec* pCodec = avcodec_find_decoder_by_name("dcadec");
         if (pCodec)
           st->codec->codec = pCodec;
       }
@@ -498,13 +499,16 @@
   if (skipCreateStreams && GetNrOfStreams() == 0)
     m_program = 0;
 
+  m_displayTime = 0;
+  m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
+
   return true;
 }
 
 void CDVDDemuxFFmpeg::Dispose()
 {
   m_pkt.result = -1;
-  av_free_packet(&m_pkt.pkt);
+  av_packet_unref(&m_pkt.pkt);
 
   if (m_pFormatContext)
   {
@@ -552,7 +556,10 @@
   m_currentPts = DVD_NOPTS_VALUE;
 
   m_pkt.result = -1;
-  av_free_packet(&m_pkt.pkt);
+  av_packet_unref(&m_pkt.pkt);
+
+  m_displayTime = 0;
+  m_dtsAtDisplayTime = DVD_NOPTS_VALUE;
 }
 
 void CDVDDemuxFFmpeg::Abort()
@@ -599,9 +606,12 @@
   }
 }
 
-AVDictionary *CDVDDemuxFFmpeg::GetFFMpegOptionsFromURL(const CURL &url)
+AVDictionary *CDVDDemuxFFmpeg::GetFFMpegOptionsFromInput()
 {
+  const CDVDInputStreamFFmpeg *const input =
+    dynamic_cast<CDVDInputStreamFFmpeg*>(m_pInput);
 
+  const CURL url = m_pInput->GetURL();
   AVDictionary *options = NULL;
 
   if (url.IsProtocol("http") || url.IsProtocol("https"))
@@ -622,9 +632,9 @@
         av_dict_set(&options, "user-agent", value.c_str(), 0);
         hasUserAgent = true;
       }
-      else if (name != "auth" && name != "encoding")
-        // all other protocol options can be added as http header.
-        headers.append(it->first).append(": ").append(value).append("\r\n");
+      // we don't add blindly all options to headers anymore
+      // if anybody wants to pass options to ffmpeg, explicitly prefix those
+      // to be identified here
     }
     if (!hasUserAgent)
       // set default xbmc user-agent.
@@ -638,6 +648,33 @@
       av_dict_set(&options, "cookies", cookies.c_str(), 0);
 
   }
+
+  if (input)
+  {
+    const std::string host = input->GetProxyHost();
+    if (!host.empty() && input->GetProxyType() == "http")
+    {
+      std::ostringstream urlStream;
+
+      const uint16_t port = input->GetProxyPort();
+      const std::string user = input->GetProxyUser();
+      const std::string password = input->GetProxyPassword();
+
+      urlStream << "http://";
+
+      if (!user.empty()) {
+        urlStream << user;
+        if (!password.empty())
+          urlStream << ":" << password;
+        urlStream << "@";
+      }
+
+      urlStream << host << ':' << port;
+
+      av_dict_set(&options, "http_proxy", urlStream.str().c_str(), 0);
+    }
+  }
+
   return options;
 }
 
@@ -706,6 +743,7 @@
 
       pPacket = CDVDDemuxUtils::AllocateDemuxPacket(0);
       pPacket->iStreamId = DMX_SPECIALID_STREAMCHANGE;
+      pPacket->demuxerId = m_demuxerId;
 
       return pPacket;
     }
@@ -725,7 +763,7 @@
         CLog::Log(LOGERROR, "CDVDDemuxFFmpeg::Read() returned invalid packet and eof reached");
 
       m_pkt.result = -1;
-      av_free_packet(&m_pkt.pkt);
+      av_packet_unref(&m_pkt.pkt);
     }
     else
     {
@@ -779,10 +817,6 @@
             m_pkt.pkt.pts = AV_NOPTS_VALUE;
         }
 
-        // we need to get duration slightly different for matroska embedded text subtitels
-        if(m_bMatroska && stream->codec && stream->codec->codec_id == AV_CODEC_ID_TEXT && m_pkt.pkt.convergence_duration != 0)
-          m_pkt.pkt.duration = m_pkt.pkt.convergence_duration;
-
         if(m_bAVI && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_VIDEO)
         {
           // AVI's always have borked pts, specially if m_pFormatContext->flags includes
@@ -801,6 +835,25 @@
         pPacket->dts = ConvertTimestamp(m_pkt.pkt.dts, stream->time_base.den, stream->time_base.num);
         pPacket->duration =  DVD_SEC_TO_TIME((double)m_pkt.pkt.duration * stream->time_base.num / stream->time_base.den);
 
+        CDVDInputStream::IDisplayTime *inputStream = m_pInput->GetIDisplayTime();
+        if (inputStream)
+        {
+          int dispTime = inputStream->GetTime();
+          if (m_displayTime != dispTime)
+          {
+            m_displayTime = dispTime;
+            if (pPacket->dts != DVD_NOPTS_VALUE)
+            {
+              m_dtsAtDisplayTime = pPacket->dts;
+            }
+          }
+          if (m_dtsAtDisplayTime != DVD_NOPTS_VALUE && pPacket->dts != DVD_NOPTS_VALUE)
+          {
+            pPacket->dispTime = m_displayTime;
+            pPacket->dispTime += DVD_TIME_TO_MSEC(pPacket->dts - m_dtsAtDisplayTime);
+          }
+        }
+
         // used to guess streamlength
         if (pPacket->dts != DVD_NOPTS_VALUE && (pPacket->dts > m_currentPts || m_currentPts == DVD_NOPTS_VALUE))
           m_currentPts = pPacket->dts;
@@ -830,7 +883,7 @@
         pPacket->iStreamId = m_pkt.pkt.stream_index;
       }
       m_pkt.result = -1;
-      av_free_packet(&m_pkt.pkt);
+      av_packet_unref(&m_pkt.pkt);
     }
   }
   } // end of lock scope
@@ -878,6 +931,7 @@
     }
 
     pPacket->iStreamId = stream->uniqueId;
+    pPacket->demuxerId = m_demuxerId;
   }
   return pPacket;
 }
@@ -891,7 +945,7 @@
     time = 0;
 
   m_pkt.result = -1;
-  av_free_packet(&m_pkt.pkt);
+  av_packet_unref(&m_pkt.pkt);
 
   CDVDInputStream::IPosTime* ist = m_pInput->GetIPosTime();
   if (ist)
@@ -958,7 +1012,7 @@
     UpdateCurrentPTS();
 
   m_pkt.result = -1;
-  av_free_packet(&m_pkt.pkt);
+  av_packet_unref(&m_pkt.pkt);
 
   return (ret >= 0);
 }
@@ -1310,8 +1364,11 @@
     }
 
 #ifdef HAVE_LIBBLURAY
-    if( m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY) )
+    if (m_pInput->IsStreamType(DVDSTREAM_TYPE_BLURAY))
+    {
       static_cast<CDVDInputStreamBluray*>(m_pInput)->GetStreamInfo(pStream->id, stream->language);
+      stream->dvdNavId = pStream->id;
+    }
 #endif
     if( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) )
     {
@@ -1342,6 +1399,7 @@
     }
 
     stream->uniqueId = pStream->index;
+    stream->demuxerId = m_demuxerId;
 
     AddStream(stream->uniqueId, stream);
     return stream;
@@ -1598,7 +1656,7 @@
 void CDVDDemuxFFmpeg::ParsePacket(AVPacket *pkt)
 {
   AVStream *st = m_pFormatContext->streams[pkt->stream_index];
-  CDemuxStream *stream = GetStream(st->id);
+  CDemuxStream *stream = GetStream(pkt->stream_index);
 
   // if the stream is new, tell ffmpeg to parse the stream
   if (!stream && !st->parser)

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxFFmpeg.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp Added

@@ -0,0 +1,281 @@
+/*
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DVDClock.h"
+#include "DemuxMultiSource.h"
+#include "DVDDemuxUtils.h"
+#include "DVDFactoryDemuxer.h"
+#include "DVDInputStreams/DVDInputStream.h"
+#include "utils/log.h"
+#include "Util.h"
+
+
+CDemuxMultiSource::CDemuxMultiSource()
+{
+}
+
+CDemuxMultiSource::~CDemuxMultiSource()
+{
+  Dispose();
+}
+
+void CDemuxMultiSource::Abort()
+{
+  for (auto& iter : m_demuxerMap)
+    iter.second->Abort();
+}
+
+void CDemuxMultiSource::Dispose()
+{
+  while (!m_demuxerQueue.empty())
+  {
+    m_demuxerQueue.pop();
+  }
+
+  m_demuxerMap.clear();
+  m_DemuxerToInputStreamMap.clear();
+  m_pInput = NULL;
+
+}
+
+void CDemuxMultiSource::EnableStream(int64_t demuxerId, int id, bool enable)
+{
+  auto iter = m_demuxerMap.find(demuxerId);
+  if (iter != m_demuxerMap.end())
+  {
+    DemuxPtr demuxer = iter->second;
+    demuxer->EnableStream(demuxerId, id, enable);
+  }
+}
+
+void CDemuxMultiSource::EnableStreamAtPTS(int64_t demuxerId, int id, uint64_t pts)
+{
+  auto iter = m_demuxerMap.find(demuxerId);
+  if (iter != m_demuxerMap.end())
+  {
+    DemuxPtr demuxer = iter->second;
+    if (demuxer->SupportsEnableAtPTS(demuxerId))
+    {
+      demuxer->EnableStreamAtPTS(demuxerId, id, pts);
+    }
+    else
+    {
+      CLog::Log(LOGDEBUG, "%s called, but the demuxer for file %s does not support it",
+        __FUNCTION__, CURL::GetRedacted(demuxer->GetFileName()).c_str());
+    }
+  }
+}
+
+void CDemuxMultiSource::Flush()
+{
+  for (auto& iter : m_demuxerMap)
+    iter.second->Flush();
+}
+
+int CDemuxMultiSource::GetNrOfStreams() const
+{
+  int streamsCount = 0;
+  for (auto& iter : m_demuxerMap)
+    streamsCount += iter.second->GetNrOfStreams();
+
+  return streamsCount;
+}
+
+CDemuxStream* CDemuxMultiSource::GetStream(int64_t demuxerId, int iStreamId) const
+{
+  auto iter = m_demuxerMap.find(demuxerId);
+  if (iter != m_demuxerMap.end())
+  {
+    return iter->second->GetStream(demuxerId, iStreamId);
+  }
+  else
+    return NULL;
+}
+
+std::vector<CDemuxStream*> CDemuxMultiSource::GetStreams() const
+{
+  std::vector<CDemuxStream*> streams;
+
+  for (auto& iter : m_demuxerMap)
+  {
+    for (auto& stream : iter.second->GetStreams())
+    {
+      streams.push_back(stream);
+    }
+  }
+  return streams;
+}
+
+std::string CDemuxMultiSource::GetStreamCodecName(int64_t demuxerId, int iStreamId)
+{
+  auto iter = m_demuxerMap.find(demuxerId);
+  if (iter != m_demuxerMap.end())
+  {
+    return iter->second->GetStreamCodecName(demuxerId, iStreamId);
+  }
+  else
+    return "";
+};
+
+int CDemuxMultiSource::GetStreamLength()
+{
+  int length = 0;
+  for (auto& iter : m_demuxerMap)
+  {
+    length = std::max(length, iter.second->GetStreamLength());
+  }
+
+  return length;
+}
+
+bool CDemuxMultiSource::Open(CDVDInputStream* pInput)
+{
+  if (!pInput)
+    return false;
+
+  m_pInput = dynamic_cast<InputStreamMultiStreams*>(pInput);
+
+  if (!m_pInput)
+    return false;
+
+  auto iter = m_pInput->m_InputStreams.begin();
+  while (iter != m_pInput->m_InputStreams.end())
+  {
+    DemuxPtr demuxer = DemuxPtr(CDVDFactoryDemuxer::CreateDemuxer(iter->get()));
+    if (!demuxer)
+    {
+      iter = m_pInput->m_InputStreams.erase(iter);
+    }
+    else
+    {
+      SetMissingStreamDetails(demuxer);
+
+      m_demuxerMap[demuxer->GetDemuxerId()] = demuxer;
+      m_DemuxerToInputStreamMap[demuxer] = *iter;
+      m_demuxerQueue.push(std::make_pair((double)DVD_NOPTS_VALUE, demuxer));
+      ++iter;
+    }
+  }
+  return !m_demuxerMap.empty();
+}
+
+void CDemuxMultiSource::Reset()
+{
+  for (auto& iter : m_demuxerMap)
+    iter.second->Reset();
+}
+
+DemuxPacket* CDemuxMultiSource::Read()
+{
+  if (m_demuxerQueue.empty())
+    return NULL;
+
+  DemuxPtr currentDemuxer = m_demuxerQueue.top().second;
+  m_demuxerQueue.pop();
+
+  if (!currentDemuxer)
+    return NULL;
+
+  DemuxPacket* packet = currentDemuxer->Read();
+  if (packet)
+  {
+    double readTime = 0;
+    if (packet->dts != DVD_NOPTS_VALUE)
+      readTime = packet->dts;
+    else
+      readTime = packet->pts;
+    m_demuxerQueue.push(std::make_pair(readTime, currentDemuxer));
+  }
+  else
+  {
+    auto input = m_DemuxerToInputStreamMap.find(currentDemuxer);
+    if (input != m_DemuxerToInputStreamMap.end())
+    {
+      if (input->second->IsEOF())
+      {
+        CLog::Log(LOGDEBUG, "%s - Demuxer for file %s is at eof, removed it from the queue",
+          __FUNCTION__, CURL::GetRedacted(currentDemuxer->GetFileName()).c_str());
+      }
+      else    //maybe add an error counter?
+        m_demuxerQueue.push(std::make_pair((double)DVD_NOPTS_VALUE, currentDemuxer));
+    }
+  }
+
+  return packet;
+}
+
+bool CDemuxMultiSource::SeekTime(int time, bool backwords, double* startpts)
+{
+  DemuxQueue demuxerQueue = DemuxQueue();
+  bool ret = false;
+  for (auto& iter : m_demuxerMap)
+  {
+    if (iter.second->SeekTime(time, false, startpts))
+    {
+      demuxerQueue.push(std::make_pair(*startpts, iter.second));
+      CLog::Log(LOGDEBUG, "%s - starting demuxer from: %d", __FUNCTION__, time);
+      ret = true;
+    }
+    else
+    {
+      CLog::Log(LOGDEBUG, "%s - failed to start demuxing from: %d", __FUNCTION__, time);
+    }
+  }
+  m_demuxerQueue = demuxerQueue;
+  return ret;
+}
+
+void CDemuxMultiSource::SetMissingStreamDetails(DemuxPtr demuxer)
+{
+  std::string baseFileName = m_pInput->GetFileName();
+  std::string fileName = demuxer->GetFileName();
+  for (auto& stream : demuxer->GetStreams())
+  {
+    ExternalStreamInfo info;
+    CUtil::GetExternalStreamDetailsFromFilename(baseFileName, fileName, info);
+
+    if (stream->flags == CDemuxStream::FLAG_NONE)
+    {
+      stream->flags = static_cast<CDemuxStream::EFlags>(info.flag);
+    }
+    if (stream->language[0] == '\0')
+    {
+      size_t len = info.language.size();
+      for (size_t i = 0; i < 3; ++i)
+      {
+        if (i < len)
+        {
+          stream->language[i] = info.language.at(i);
+        }
+      }
+    }
+  }
+}
+
+bool CDemuxMultiSource::SupportsEnableAtPTS(int64_t demuxerId)
+{
+  auto iter = m_demuxerMap.find(demuxerId);
+  if (iter != m_demuxerMap.end())
+  {
+    return iter->second->SupportsEnableAtPTS(demuxerId);
+  }
+
+  return false;
+}

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h Added

@@ -0,0 +1,75 @@
+/*
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+#include "DVDDemux.h"
+#include "DVDInputStreams/InputStreamMultiSource.h"
+
+#include <map>
+#include <queue>
+#include <string>
+#include <utility>
+#include <vector>
+
+typedef std::shared_ptr<CDVDDemux> DemuxPtr;
+
+struct comparator{
+  bool operator() (std::pair<double, DemuxPtr> x, std::pair<double, DemuxPtr> y) const
+  {
+    return x.first > y.first;
+  }
+};
+
+typedef std::priority_queue<std::pair<double, DemuxPtr>, std::vector<std::pair<double, DemuxPtr>>, comparator> DemuxQueue;
+
+class CDemuxMultiSource : public CDVDDemux
+{
+
+public:
+  CDemuxMultiSource();
+  virtual ~CDemuxMultiSource();
+  
+  void Abort();
+  virtual void EnableStream(int64_t demuxerId, int id, bool enable) override;
+  virtual void EnableStreamAtPTS(int64_t demuxerId, int id, uint64_t pts) override;
+  void Flush();
+  virtual std::string GetFileName() { return ""; };
+  int GetNrOfStreams() const override;
+  virtual CDemuxStream* GetStream(int iStreamId)const override { return nullptr; } ;
+  virtual CDemuxStream* GetStream(int64_t demuxerId, int iStreamId) const override;
+  virtual std::vector<CDemuxStream*> GetStreams() const override;
+  std::string GetStreamCodecName(int64_t demuxerId, int iStreamId) override;
+  int GetStreamLength();
+  bool Open(CDVDInputStream* pInput);
+  DemuxPacket* Read();
+  void Reset();
+  bool SeekTime(int time, bool backwords = false, double* startpts = NULL);
+  virtual void SetSpeed(int iSpeed) {};
+  virtual bool SupportsEnableAtPTS(int64_t demuxerId) override;
+
+private:
+  void Dispose();
+  void SetMissingStreamDetails(DemuxPtr demuxer);
+
+  InputStreamMultiStreams* m_pInput = NULL;
+  std::map<DemuxPtr, InputStreamPtr> m_DemuxerToInputStreamMap;
+  DemuxQueue m_demuxerQueue;
+  std::map<int64_t, DemuxPtr> m_demuxerMap;
+};

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDFileInfo.cpp Changed

@@ -187,15 +187,19 @@
   }
 
   int nVideoStream = -1;
+  int64_t demuxerId = -1;
   for (CDemuxStream* pStream : pDemuxer->GetStreams())
   {
     if (pStream)
     {
       // ignore if it's a picture attachment (e.g. jpeg artwork)
-      if(pStream->type == STREAM_VIDEO && !(pStream->flags & AV_DISPOSITION_ATTACHED_PIC))
+      if (pStream->type == STREAM_VIDEO && !(pStream->flags & AV_DISPOSITION_ATTACHED_PIC))
+      {
         nVideoStream = pStream->uniqueId;
+        demuxerId = pStream->demuxerId;
+      }
       else
-        pDemuxer->EnableStream(pStream->uniqueId, false);
+        pDemuxer->EnableStream(pStream->demuxerId, pStream->uniqueId, false);
     }
   }
 
@@ -207,7 +211,7 @@
     CDVDVideoCodec *pVideoCodec;
     std::unique_ptr<CProcessInfo> pProcessInfo(CProcessInfo::CreateInstance());
 
-    CDVDStreamInfo hint(*pDemuxer->GetStream(nVideoStream), true);
+    CDVDStreamInfo hint(*pDemuxer->GetStream(demuxerId, nVideoStream), true);
     hint.software = true;
 
     if (hint.codec == AV_CODEC_ID_MPEG2VIDEO || hint.codec == AV_CODEC_ID_MPEG1VIDEO)
@@ -408,7 +412,7 @@
       p->m_fAspect = ((CDemuxStreamVideo *)stream)->fAspect;
       if (p->m_fAspect == 0.0f)
         p->m_fAspect = (float)p->m_iWidth / p->m_iHeight;
-      p->m_strCodec = pDemux->GetStreamCodecName(stream->uniqueId);
+      p->m_strCodec = pDemux->GetStreamCodecName(stream->demuxerId, stream->uniqueId);
       p->m_iDuration = pDemux->GetStreamLength();
       p->m_strStereoMode = ((CDemuxStreamVideo *)stream)->stereo_mode;
       p->m_strLanguage = ((CDemuxStreamVideo *)stream)->language;
@@ -442,7 +446,7 @@
       CStreamDetailAudio *p = new CStreamDetailAudio();
       p->m_iChannels = ((CDemuxStreamAudio *)stream)->iChannels;
       p->m_strLanguage = stream->language;
-      p->m_strCodec = pDemux->GetStreamCodecName(stream->uniqueId);
+      p->m_strCodec = pDemux->GetStreamCodecName(stream->demuxerId, stream->uniqueId);
       details.AddStream(p);
       retVal = true;
     }

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.cpp Changed

@@ -27,6 +27,7 @@
 #include "DVDInputStreamPVRManager.h"
 #include "DVDInputStreamRTMP.h"
 #include "InputStreamAddon.h"
+#include "InputStreamMultiSource.h"
 #ifdef HAVE_LIBBLURAY
 #include "DVDInputStreamBluray.h"
 #endif
@@ -38,16 +39,30 @@
 #include "URL.h"
 #include "filesystem/File.h"
 #include "utils/URIUtils.h"
-#include "addons/AddonManager.h"
+#include "ServiceBroker.h"
 #include "addons/InputStream.h"
+#include "addons/BinaryAddonCache.h"
+#include "Util.h"
 
 
-CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IVideoPlayer* pPlayer, CFileItem fileitem)
+CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IVideoPlayer* pPlayer, CFileItem fileitem, bool scanforextaudio)
 {
   std::string file = fileitem.GetPath();
+  if (scanforextaudio)
+  {
+    // find any available external audio tracks
+    std::vector<std::string> filenames;
+    filenames.push_back(file);
+    CUtil::ScanForExternalAudio(file, filenames);
+    if (filenames.size() >= 2)
+    {
+      return CreateInputStream(pPlayer, fileitem, filenames);
+    }
+  }
 
   ADDON::VECADDONS addons;
-  ADDON::CAddonMgr::GetInstance().GetAddons(addons, ADDON::ADDON_INPUTSTREAM);
+  ADDON::CBinaryAddonCache &addonCache = CServiceBroker::GetBinaryAddonCache();
+  addonCache.GetAddons(addons, ADDON::ADDON_INPUTSTREAM);
   for (size_t i=0; i<addons.size(); ++i)
   {
     std::shared_ptr<ADDON::CInputStream> input(std::static_pointer_cast<ADDON::CInputStream>(addons[i]));
@@ -136,3 +151,8 @@
   // our file interface handles all these types of streams
   return (new CDVDInputStreamFile(fileitem));
 }
+
+CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IVideoPlayer* pPlayer, CFileItem fileitem, const std::vector<std::string>& filenames)
+{
+  return (new CInputStreamMultiSource(pPlayer, fileitem, filenames));
+}

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDFactoryInputStream.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp Changed

@@ -19,12 +19,18 @@
  */
 
 #include "DVDInputStreamFFmpeg.h"
+
+#include "filesystem/CurlFile.h"
 #include "playlists/PlayListM3U.h"
 #include "settings/Settings.h"
 #include "utils/log.h"
+#include "utils/StringUtils.h"
+#include "utils/URIUtils.h"
+
 #include <limits.h>
 
 using namespace XFILE;
+using PLAYLIST::CPlayListM3U;
 
 CDVDInputStreamFFmpeg::CDVDInputStreamFFmpeg(CFileItem& fileitem)
   : CDVDInputStream(DVDSTREAM_TYPE_FFMPEG, fileitem)
@@ -50,18 +56,19 @@
 
 bool CDVDInputStreamFFmpeg::Open()
 {
-  std::string selected;
   if (m_item.IsInternetStream() && (m_item.IsType(".m3u8") || m_item.GetMimeType() == "application/vnd.apple.mpegurl"))
   {
     // get the available bandwidth and  determine the most appropriate stream
     int bandwidth = CSettings::GetInstance().GetInt(CSettings::SETTING_NETWORK_BANDWIDTH);
     if(bandwidth <= 0)
       bandwidth = INT_MAX;
-    selected = PLAYLIST::CPlayListM3U::GetBestBandwidthStream(m_item.GetPath(), bandwidth);
-    if (selected.compare(m_item.GetPath()) != 0)
+    const CURL playlist_url = m_item.GetURL();
+    const CURL selected = GetM3UBestBandwidthStream(playlist_url, bandwidth);
+    if (selected.Get() != playlist_url.Get())
     {
-      CLog::Log(LOGINFO, "CDVDInputStreamFFmpeg: Auto-selecting %s based on configured bandwidth.", selected.c_str());
-      m_item.SetPath(selected.c_str());
+      CLog::Log(LOGINFO, "CDVDInputStreamFFmpeg: Auto-selecting %s based on configured bandwidth.",
+                selected.Get().c_str());
+      m_item.SetURL(selected);
     }
   }
 
@@ -109,3 +116,129 @@
   return -1;
 }
 
+std::string CDVDInputStreamFFmpeg::GetProxyType() const
+{
+  return m_item.HasProperty("proxy.type") ?
+    m_item.GetProperty("proxy.type").asString() : std::string();
+}
+
+std::string CDVDInputStreamFFmpeg::GetProxyHost() const
+{
+  return m_item.HasProperty("proxy.host") ?
+    m_item.GetProperty("proxy.host").asString() : std::string();
+}
+
+uint16_t CDVDInputStreamFFmpeg::GetProxyPort() const
+{
+  if (m_item.HasProperty("proxy.port"))
+    return m_item.GetProperty("proxy.port").asInteger();
+
+  // Select the standard port
+  const std::string value = GetProxyType();
+  if (value == "socks4" || value == "socks4a" ||
+      value == "socks5" || value == "socks5-remote")
+    return 1080;
+  else
+    return 3128;
+}
+
+std::string CDVDInputStreamFFmpeg::GetProxyUser() const
+{
+  return m_item.HasProperty("proxy.user") ?
+    m_item.GetProperty("proxy.user").asString() : std::string();
+}
+
+std::string CDVDInputStreamFFmpeg::GetProxyPassword() const
+{
+  return m_item.HasProperty("proxy.password") ?
+    m_item.GetProperty("proxy.password").asString() : std::string();
+}
+
+CURL CDVDInputStreamFFmpeg::GetM3UBestBandwidthStream(const CURL &url, size_t bandwidth)
+{
+  typedef CPlayListM3U M3U;
+  using std::string;
+  using std::map;
+
+  // we may be passed a playlist that does not contain playlists of different
+  // bitrates (eg: this playlist is really the HLS video). So, default the
+  // return to the filename so it can be played
+  char szLine[4096];
+  string strLine;
+  size_t maxBandwidth = 0;
+
+  CCurlFile file;
+
+  // set the proxy configuration
+  const string host = GetProxyHost();
+  if (!host.empty())
+    file.SetProxy(GetProxyType(), host, GetProxyPort(),
+                  GetProxyUser(), GetProxyPassword());
+
+  // open the file, and if it fails, return
+  if (!file.Open(url))
+  {
+    file.Close();
+    return url;
+  }
+
+  // and set the fallback value
+  CURL subStreamUrl(url);
+
+  // determine the base
+  CURL basePlaylistUrl(URIUtils::GetParentPath(url.Get()));
+  basePlaylistUrl.SetOptions("");
+  basePlaylistUrl.SetProtocolOptions("");
+  const string basePart = basePlaylistUrl.Get();
+
+  // convert bandwidth specified in kbps to bps used by the m3u8
+  bandwidth *= 1000;
+
+  while (file.ReadString(szLine, 1024))
+  {
+    // read and trim a line
+    strLine = szLine;
+    StringUtils::Trim(strLine);
+
+    // skip the first line
+    if (strLine == M3U::StartMarker)
+        continue;
+    else if (StringUtils::StartsWith(strLine, M3U::StreamMarker))
+    {
+      // parse the line so we can pull out the bandwidth
+      const map< string, string > params = M3U::ParseStreamLine(strLine);
+      const map< string, string >::const_iterator it = params.find(M3U::BandwidthMarker);
+
+      if (it != params.end())
+      {
+        const size_t streamBandwidth = atoi(it->second.c_str());
+        if ((maxBandwidth < streamBandwidth) && (streamBandwidth <= bandwidth))
+        {
+          // read the next line
+          if (!file.ReadString(szLine, 1024))
+            continue;
+
+          strLine = szLine;
+          StringUtils::Trim(strLine);
+
+          // this line was empty
+          if (strLine.empty())
+            continue;
+
+          // store the max bandwidth
+          maxBandwidth = streamBandwidth;
+
+          // if the path is absolute just use it
+          if (CURL::IsFullPath(strLine))
+            subStreamUrl = CURL(strLine);
+          else
+            subStreamUrl = CURL(basePart + strLine);
+        }
+      }
+    }
+  }
+
+  // if any protocol options were set, restore them
+  subStreamUrl.SetProtocolOptions(url.GetProtocolOptions());
+  return subStreamUrl;
+}

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFFmpeg.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.cpp Changed

@@ -20,13 +20,14 @@
 
 #include "DVDFactoryInputStream.h"
 #include "DVDInputStreamPVRManager.h"
-#include "filesystem/PVRFile.h"
 #include "URL.h"
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannel.h"
 #include "utils/log.h"
+#include "utils/StringUtils.h"
 #include "pvr/addons/PVRClients.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
+#include "pvr/recordings/PVRRecordingsPath.h"
 #include "settings/Settings.h"
 #include "cores/VideoPlayer/DVDDemuxers/DVDDemux.h"
 
@@ -43,10 +44,7 @@
   : CDVDInputStream(DVDSTREAM_TYPE_PVRMANAGER, fileitem)
 {
   m_pPlayer = pPlayer;
-  m_pFile = NULL;
-  m_pRecordable = NULL;
-  m_pLiveTV = NULL;
-  m_pOtherStream = NULL;
+  m_pOtherStream = nullptr;
   m_eof = true;
   m_ScanTimeout.Set(0);
   m_isOtherStreamHack = false;
@@ -80,30 +78,64 @@
   if (m_pOtherStream)
     return m_pOtherStream->IsEOF();
   else
-    return !m_pFile || m_eof;
+    return m_eof;
 }
 
 bool CDVDInputStreamPVRManager::Open()
 {
-  /* Open PVR File for both cases, to have access to ILiveTVInterface and
-   * IRecordable
-   */
-  m_pFile       = new CPVRFile;
-  m_pLiveTV     = ((CPVRFile*)m_pFile)->GetLiveTV();
-  m_pRecordable = ((CPVRFile*)m_pFile)->GetRecordable();
-
   if (!CDVDInputStream::Open())
     return false;
 
   CURL url(m_item.GetPath());
-  if (!m_pFile->Open(url))
+
+  std::string strURL = url.Get();
+
+  if (StringUtils::StartsWith(strURL, "pvr://channels/tv/") ||
+      StringUtils::StartsWith(strURL, "pvr://channels/radio/"))
+  {
+    CFileItemPtr tag = g_PVRChannelGroups->GetByPath(strURL);
+    if (tag && tag->HasPVRChannelInfoTag())
+    {
+      if (!g_PVRManager.OpenLiveStream(*tag))
+        return false;
+
+      m_isRecording = false;
+      CLog::Log(LOGDEBUG, "CDVDInputStreamPVRManager - %s - playback has started on filename %s", __FUNCTION__, strURL.c_str());
+    }
+    else
+    {
+      CLog::Log(LOGERROR, "CDVDInputStreamPVRManager - %s - channel not found with filename %s", __FUNCTION__, strURL.c_str());
+      return false;
+    }
+  }
+  else if (CPVRRecordingsPath(strURL).IsActive())
+  {
+    CFileItemPtr tag = g_PVRRecordings->GetByPath(strURL);
+    if (tag && tag->HasPVRRecordingInfoTag())
+    {
+      if (!g_PVRManager.OpenRecordedStream(tag->GetPVRRecordingInfoTag()))
+        return false;
+
+      m_isRecording = true;
+      CLog::Log(LOGDEBUG, "%s - playback has started on recording %s (%s)", __FUNCTION__, strURL.c_str(), tag->GetPVRRecordingInfoTag()->m_strIconPath.c_str());
+    }
+    else
+    {
+      CLog::Log(LOGERROR, "CDVDInputStreamPVRManager - Recording not found with filename %s", strURL.c_str());
+      return false;
+    }
+  }
+  else if (CPVRRecordingsPath(strURL).IsDeleted())
+  {
+    CLog::Log(LOGNOTICE, "CDVDInputStreamPVRManager - Playback of deleted recordings is not possible (%s)", strURL.c_str());
+    return false;
+  }
+  else
   {
-    delete m_pFile;
-    m_pFile = NULL;
-    m_pLiveTV = NULL;
-    m_pRecordable = NULL;
+    CLog::Log(LOGERROR, "%s - invalid path specified %s", __FUNCTION__, strURL.c_str());
     return false;
   }
+
   m_eof = false;
 
   /*
@@ -117,7 +149,7 @@
    * handler.
    */
   m_isOtherStreamHack = false;
-  std::string transFile = XFILE::CPVRFile::TranslatePVRFilename(m_item.GetPath());
+  std::string transFile = ThisIsAHack(m_item.GetPath());
   if(transFile.substr(0, 6) != "pvr://")
   {
     m_isOtherStreamHack = true;
@@ -133,10 +165,6 @@
     if (!m_pOtherStream->Open())
     {
       CLog::Log(LOGERROR, "CDVDInputStreamPVRManager::Open - error opening [%s]", CURL::GetRedacted(transFile).c_str());
-      delete m_pFile;
-      m_pFile = NULL;
-      m_pLiveTV = NULL;
-      m_pRecordable = NULL;
       delete m_pOtherStream;
       m_pOtherStream = NULL;
       return false;
@@ -160,6 +188,35 @@
   return true;
 }
 
+std::string CDVDInputStreamPVRManager::ThisIsAHack(const std::string& pathFile)
+{
+  std::string FileName = pathFile;
+  if (FileName.substr(0, 14) == "pvr://channels")
+  {
+    CFileItemPtr channel = g_PVRChannelGroups->GetByPath(FileName);
+    if (channel && channel->HasPVRChannelInfoTag())
+    {
+      std::string stream = channel->GetPVRChannelInfoTag()->StreamURL();
+      if(!stream.empty())
+      {
+        if (stream.compare(6, 7, "stream/") == 0)
+        {
+          // pvr://stream
+          // This function was added to retrieve the stream URL for this item
+          // Is is used for the MediaPortal (ffmpeg) PVR addon
+          // see PVRManager.cpp
+          return g_PVRClients->GetStreamURL(channel->GetPVRChannelInfoTag());
+        }
+        else
+        {
+          return stream;
+        }
+      }
+    }
+  }
+  return FileName;
+}
+
 // close file and reset everything
 void CDVDInputStreamPVRManager::Close()
 {
@@ -169,18 +226,11 @@
     delete m_pOtherStream;
   }
 
-  if (m_pFile)
-  {
-    m_pFile->Close();
-    delete m_pFile;
-  }
+  g_PVRManager.CloseStream();
 
   CDVDInputStream::Close();
 
   m_pPlayer         = NULL;
-  m_pFile           = NULL;
-  m_pLiveTV         = NULL;
-  m_pRecordable     = NULL;
   m_pOtherStream    = NULL;
   m_eof             = true;
 
@@ -189,28 +239,26 @@
 
 int CDVDInputStreamPVRManager::Read(uint8_t* buf, int buf_size)
 {
-  if(!m_pFile) return -1;
-
   if (m_pOtherStream)
   {
     return m_pOtherStream->Read(buf, buf_size);
   }
   else
   {
-    unsigned int ret = m_pFile->Read(buf, buf_size);
+    int ret = g_PVRClients->ReadStream((BYTE*)buf, buf_size);
+    if (ret < 0)
+      ret = -1;
 
     /* we currently don't support non completing reads */
-    if( ret == 0 ) m_eof = true;
+    if( ret == 0 )
+      m_eof = true;
 
-    return (int)(ret & 0xFFFFFFFF);
+    return ret;
   }
 }
 
 int64_t CDVDInputStreamPVRManager::Seek(int64_t offset, int whence)
 {
-  if (!m_pFile)
-    return -1;
-
   if (m_pOtherStream)
   {
     return m_pOtherStream->Seek(offset, whence);
@@ -218,12 +266,18 @@
   else
   {
     if (whence == SEEK_POSSIBLE)
-      return m_pFile->IoControl(IOCTRL_SEEK_POSSIBLE, NULL);
+    {
+      if (g_PVRClients->CanSeekStream())
+        return 1;
+      else
+        return 0;
+    }
 
-    int64_t ret = m_pFile->Seek(offset, whence);
+    int64_t ret = g_PVRClients->SeekStream(offset, whence);
 
-    /* if we succeed, we are not eof anymore */
-    if( ret >= 0 ) m_eof = false;
+    // if we succeed, we are not eof anymore
+    if( ret >= 0 )
+      m_eof = false;
 
     return ret;
   }
@@ -231,31 +285,30 @@
 
 int64_t CDVDInputStreamPVRManager::GetLength()
 {
-  if(!m_pFile) return -1;
-
   if (m_pOtherStream)
     return m_pOtherStream->GetLength();
   else
-    return m_pFile->GetLength();
+    return g_PVRClients->GetStreamLength();
 }
 
 int CDVDInputStreamPVRManager::GetTotalTime()
 {
-  if (m_pLiveTV)
-    return m_pLiveTV->GetTotalTime();
+  if (!m_isRecording)
+    return g_PVRManager.GetTotalTime();
   return 0;
 }
 
 int CDVDInputStreamPVRManager::GetTime()
 {
-  if (m_pLiveTV)
-    return m_pLiveTV->GetStartTime();
+  if (!m_isRecording)
+    return g_PVRManager.GetStartTime();
   return 0;
 }
 
 bool CDVDInputStreamPVRManager::NextChannel(bool preview/* = false*/)
 {
   PVR_CLIENT client;
+  unsigned int newchannel;
   if (!preview && IsOtherStreamHack())
   {
     CPVRChannelPtr channel(g_PVRManager.GetCurrentChannel());
@@ -263,14 +316,15 @@
     if (item)
       return CloseAndOpen(item->GetPath().c_str());
   }
-  else if (m_pLiveTV)
-    return m_pLiveTV->NextChannel(preview);
+  else if (!m_isRecording)
+    return g_PVRManager.ChannelUp(&newchannel, preview);
   return false;
 }
 
 bool CDVDInputStreamPVRManager::PrevChannel(bool preview/* = false*/)
 {
   PVR_CLIENT client;
+  unsigned int newchannel;
   if (!preview && IsOtherStreamHack())
   {
     CPVRChannelPtr channel(g_PVRManager.GetCurrentChannel());
@@ -278,8 +332,8 @@
     if (item)
       return CloseAndOpen(item->GetPath().c_str());
   }
-  else if (m_pLiveTV)
-    return m_pLiveTV->PrevChannel(preview);
+  else if (!m_isRecording)
+    return g_PVRManager.ChannelDown(&newchannel, preview);
   return false;
 }
 
@@ -295,10 +349,10 @@
   {
     return CloseAndOpen(item->GetPath().c_str());
   }
-  else if (m_pLiveTV)
+  else if (!m_isRecording)
   {
     if (item->HasPVRChannelInfoTag())
-      return m_pLiveTV->SelectChannelById(item->GetPVRChannelInfoTag()->ChannelID());
+      return g_PVRManager.ChannelSwitchById(item->GetPVRChannelInfoTag()->ChannelID());
   }
 
   return false;
@@ -314,9 +368,9 @@
     CFileItem item(channel);
     return CloseAndOpen(item.GetPath().c_str());
   }
-  else if (m_pLiveTV)
+  else if (!m_isRecording)
   {
-    return m_pLiveTV->SelectChannelById(channel->ChannelID());
+    return g_PVRManager.ChannelSwitchById(channel->ChannelID());
   }
 
   return false;
@@ -329,22 +383,17 @@
 
 bool CDVDInputStreamPVRManager::UpdateItem(CFileItem& item)
 {
-  if (m_pLiveTV)
-    return m_pLiveTV->UpdateItem(item);
-  return false;
+  return g_PVRManager.UpdateItem(item);
 }
 
 CDVDInputStream::ENextStream CDVDInputStreamPVRManager::NextStream()
 {
-  if(!m_pFile)
-    return NEXTSTREAM_NONE;
-
   m_eof = IsEOF();
 
   CDVDInputStream::ENextStream next;
   if (m_pOtherStream && ((next = m_pOtherStream->NextStream()) != NEXTSTREAM_NONE))
     return next;
-  else if(m_pFile->SkipNext())
+  else if(!m_isRecording)
   {
     if (m_eof)
       return NEXTSTREAM_OPEN;
@@ -356,23 +405,19 @@
 
 bool CDVDInputStreamPVRManager::CanRecord()
 {
-  if (m_pRecordable)
-    return m_pRecordable->CanRecord();
+  if (!m_isRecording)
+    return g_PVRClients->CanRecordInstantly();
   return false;
 }
 
 bool CDVDInputStreamPVRManager::IsRecording()
 {
-  if (m_pRecordable)
-    return m_pRecordable->IsRecording();
-  return false;
+  return g_PVRClients->IsRecordingOnPlayingChannel();
 }
 
 bool CDVDInputStreamPVRManager::Record(bool bOnOff)
 {
-  if (m_pRecordable)
-    return m_pRecordable->Record(bOnOff);
-  return false;
+  return g_PVRManager.StartRecordingOnPlayingChannel(bOnOff);
 }
 
 bool CDVDInputStreamPVRManager::CanPause()
@@ -392,7 +437,7 @@
 
 std::string CDVDInputStreamPVRManager::GetInputFormat()
 {
-  if (!m_pOtherStream && g_PVRManager.IsStarted())
+  if (!m_pOtherStream)
     return g_PVRClients->GetCurrentInputFormat();
   return "";
 }

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamPVRManager.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.cpp Added

@@ -0,0 +1,152 @@
+/*
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "InputStreamMultiSource.h"
+#include "DVDFactoryInputStream.h"
+#include "filesystem/File.h"
+#include "filesystem/IFile.h"
+#include "settings/AdvancedSettings.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+#include<map>
+
+using namespace XFILE;
+
+CInputStreamMultiSource::CInputStreamMultiSource(IVideoPlayer* pPlayer, CFileItem& fileitem, const std::vector<std::string>& filenames) : InputStreamMultiStreams(DVDSTREAM_TYPE_MULTIFILES, fileitem),
+  m_pPlayer(pPlayer),
+  m_filenames(filenames)
+{
+}
+
+CInputStreamMultiSource::~CInputStreamMultiSource()
+{
+  Close();
+}
+
+void CInputStreamMultiSource::Abort()
+{
+  for (auto iter : m_InputStreams)
+    iter->Abort();
+}
+
+void CInputStreamMultiSource::Close()
+{
+  m_InputStreams.clear();
+  CDVDInputStream::Close();
+}
+
+BitstreamStats CInputStreamMultiSource::GetBitstreamStats() const
+{
+  return m_stats;
+}
+
+int CInputStreamMultiSource::GetBlockSize()
+{
+  return 0;
+}
+
+bool CInputStreamMultiSource::GetCacheStatus(XFILE::SCacheStatus *status)
+{
+  return false;
+}
+
+int64_t CInputStreamMultiSource::GetLength()
+{
+  int64_t length = 0;
+  for (auto iter : m_InputStreams)
+  {
+    length = std::max(length, iter->GetLength());
+  }
+
+  return length;
+}
+
+bool CInputStreamMultiSource::IsEOF()
+{
+  if (m_InputStreams.empty())
+    return true;
+
+  for (auto iter : m_InputStreams)
+  {
+    if (!(iter->IsEOF()))
+      return false;
+  }
+
+  return true;
+}
+
+CDVDInputStream::ENextStream CInputStreamMultiSource::NextStream()
+{
+  bool eOF = IsEOF();
+  if (m_InputStreams.empty() || eOF)
+    return NEXTSTREAM_NONE;
+
+
+  CDVDInputStream::ENextStream next;
+  for (auto iter : m_InputStreams)
+  {
+    next = iter->NextStream();
+    if (next != NEXTSTREAM_NONE)
+      return next;
+  }
+
+  return NEXTSTREAM_RETRY;
+}
+
+bool CInputStreamMultiSource::Open()
+{
+  if (!m_pPlayer || m_filenames.empty())
+    return false;
+
+  for (unsigned int i = 0; i < m_filenames.size(); i++)
+  {
+    CFileItem fileitem = CFileItem(m_filenames[i], false);
+    InputStreamPtr inputstream(CDVDFactoryInputStream::CreateInputStream(m_pPlayer, fileitem));
+    if (!inputstream)
+    {
+      CLog::Log(LOGERROR, "CDVDPlayer::OpenInputStream - unable to create input stream for file [%s]", m_filenames[i].c_str());
+      continue;
+    }
+
+    if (!inputstream->Open())
+    {
+      CLog::Log(LOGERROR, "CDVDPlayer::OpenInputStream - error opening file [%s]", m_filenames[i].c_str());
+      continue;
+    }
+    m_InputStreams.push_back(inputstream);
+  }
+  return !m_InputStreams.empty();
+}
+
+int CInputStreamMultiSource::Read(uint8_t* buf, int buf_size)
+{
+  return -1;
+}
+
+int64_t CInputStreamMultiSource::Seek(int64_t offset, int whence)
+{
+  return -1;
+}
+
+void CInputStreamMultiSource::SetReadRate(unsigned rate)
+{
+  for (auto iter : m_InputStreams)
+    iter->SetReadRate(rate);
+}

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.h Added

@@ -0,0 +1,55 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DVDInputStream.h"
+#include "InputStreamMultiStreams.h"
+
+#include <string>
+#include <vector>
+
+class IVideoPlayer;
+
+class CInputStreamMultiSource : public InputStreamMultiStreams
+{
+
+public:
+  CInputStreamMultiSource(IVideoPlayer* pPlayer, CFileItem& fileitem, const std::vector<std::string>& filenames);
+  virtual ~CInputStreamMultiSource();
+
+  virtual void Abort() override;
+  virtual void Close() override;
+  virtual BitstreamStats GetBitstreamStats() const ;
+  virtual int GetBlockSize();
+  virtual bool GetCacheStatus(XFILE::SCacheStatus *status);
+  int64_t GetLength() override;
+  virtual bool IsEOF() override;
+  virtual CDVDInputStream::ENextStream NextStream() override;
+  virtual bool Open() override;
+  virtual bool Pause(double dTime)override { return false; };
+  virtual int Read(uint8_t* buf, int buf_size) override;
+  virtual int64_t Seek(int64_t offset, int whence) override;
+  virtual void SetReadRate(unsigned rate) override;
+
+protected:
+  IVideoPlayer* m_pPlayer;
+  std::vector<std::string> m_filenames;
+};

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiStreams.h Added

@@ -0,0 +1,43 @@
+#pragma once
+
+/*
+ *      Copyright (C) 2005-2015 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DVDInputStream.h"
+
+#include <string>
+#include <vector>
+
+typedef std::shared_ptr<CDVDInputStream> InputStreamPtr;
+class IDVDPlayer;
+
+class InputStreamMultiStreams : public CDVDInputStream
+{
+  friend class CDemuxMultiSource;
+
+public:
+  InputStreamMultiStreams(DVDStreamType type, CFileItem& fileitem)
+    : CDVDInputStream(type, fileitem) {}
+
+  virtual ~InputStreamMultiStreams() {};
+
+protected:
+  std::vector<InputStreamPtr> m_InputStreams;    // input streams for current playing file
+};

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/Makefile Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.cpp Changed

@@ -19,6 +19,7 @@
  */
 
 #include <cstring>
+#include <memory>
 
 #include "DVDSubtitleStream.h"
 #include "DVDInputStreams/DVDFactoryInputStream.h"
@@ -41,22 +42,20 @@
 
 bool CDVDSubtitleStream::Open(const std::string& strFile)
 {
-  CDVDInputStream* pInputStream;
   CFileItem item(strFile, false);
   item.SetContentLookup(false);
-  pInputStream = CDVDFactoryInputStream::CreateInputStream(NULL, item);
+  std::unique_ptr<CDVDInputStream> pInputStream(CDVDFactoryInputStream::CreateInputStream(NULL, item));
   if (pInputStream && pInputStream->Open())
   {
     // prepare buffer
     size_t totalread = 0;
     XUTILS::auto_buffer buf(1024);
 
-    if (URIUtils::HasExtension(strFile, ".sub") && IsIncompatible(pInputStream, buf, &totalread))
+    if (URIUtils::HasExtension(strFile, ".sub") && IsIncompatible(pInputStream.get(), buf, &totalread))
     {
       CLog::Log(LOGDEBUG, "%s: file %s seems to be a vob sub"
         "file without an idx file, skipping it", __FUNCTION__, CURL::GetRedacted(pInputStream->GetFileName()).c_str());
       buf.clear();
-      delete pInputStream;
       return false;
     }
 
@@ -73,7 +72,6 @@
         totalread += read;
     } while (read > 0);
 
-    delete pInputStream;
     if (!totalread)
       return false;
 
@@ -105,7 +103,6 @@
     return true;
   }
 
-  delete pInputStream;
   return false;
 }

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/Process/ProcessInfo.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/Process/ProcessInfo.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/Process/overrides/rbpi/ProcessInfoPi.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayer.cpp Changed

@@ -345,7 +345,7 @@
   return false;
 }
 
-int CSelectionStreams::IndexOf(StreamType type, int source, int id) const
+int CSelectionStreams::IndexOf(StreamType type, int source, int64_t demuxerId, int id) const
 {
   CSingleLock lock(m_section);
   int count = -1;
@@ -358,7 +358,7 @@
       continue;
     if(id < 0)
       continue;
-    if(m_Streams[i].id == id)
+    if(m_Streams[i].id == id && m_Streams[i].demuxerId == demuxerId)
       return count;
   }
   if(id < 0)
@@ -379,19 +379,19 @@
     else if(type == STREAM_SUBTITLE)
       id = ((CDVDInputStreamNavigator*)p.m_pInputStream)->GetActiveSubtitleStream();
 
-    return IndexOf(type, STREAM_SOURCE_NAV, id);
+    return IndexOf(type, STREAM_SOURCE_NAV, -1, id);
   }
 
   if(type == STREAM_AUDIO)
-    return IndexOf(type, p.m_CurrentAudio.source, p.m_CurrentAudio.id);
+    return IndexOf(type, p.m_CurrentAudio.source, p.m_CurrentAudio.demuxerId, p.m_CurrentAudio.id);
   else if(type == STREAM_VIDEO)
-    return IndexOf(type, p.m_CurrentVideo.source, p.m_CurrentVideo.id);
+    return IndexOf(type, p.m_CurrentVideo.source, p.m_CurrentVideo.demuxerId, p.m_CurrentVideo.id);
   else if(type == STREAM_SUBTITLE)
-    return IndexOf(type, p.m_CurrentSubtitle.source, p.m_CurrentSubtitle.id);
+    return IndexOf(type, p.m_CurrentSubtitle.source, p.m_CurrentSubtitle.demuxerId, p.m_CurrentSubtitle.id);
   else if(type == STREAM_TELETEXT)
-    return IndexOf(type, p.m_CurrentTeletext.source, p.m_CurrentTeletext.id);
+    return IndexOf(type, p.m_CurrentTeletext.source, p.m_CurrentTeletext.demuxerId, p.m_CurrentTeletext.id);
   else if(type == STREAM_RADIO_RDS)
-    return IndexOf(type, p.m_CurrentRadioRDS.source, p.m_CurrentRadioRDS.id);
+    return IndexOf(type, p.m_CurrentRadioRDS.source, p.m_CurrentRadioRDS.demuxerId, p.m_CurrentRadioRDS.id);
 
   return -1;
 }
@@ -418,7 +418,7 @@
 void CSelectionStreams::Update(SelectionStream& s)
 {
   CSingleLock lock(m_section);
-  int index = IndexOf(s.type, s.source, s.id);
+  int index = IndexOf(s.type, s.source, s.demuxerId, s.id);
   if(index >= 0)
   {
     SelectionStream& o = Get(s.type, index);
@@ -516,17 +516,19 @@
       s.source   = source;
       s.type     = stream->type;
       s.id       = stream->uniqueId;
+      s.demuxerId = stream->demuxerId;
       s.language = g_LangCodeExpander.ConvertToISO6392T(stream->language);
       s.flags    = stream->flags;
       s.filename = demuxer->GetFileName();
       s.filename2 = filename2;
       s.name = stream->GetStreamName();
-      s.codec    = demuxer->GetStreamCodecName(stream->uniqueId);
+      s.codec    = demuxer->GetStreamCodecName(stream->demuxerId, stream->uniqueId);
       s.channels = 0; // Default to 0. Overwrite if STREAM_AUDIO below.
       if(stream->type == STREAM_VIDEO)
       {
         s.width = ((CDemuxStreamVideo*)stream)->iWidth;
         s.height = ((CDemuxStreamVideo*)stream)->iHeight;
+        s.stereo_mode = ((CDemuxStreamVideo*)stream)->stereo_mode;
       }
       if(stream->type == STREAM_AUDIO)
       {
@@ -558,7 +560,6 @@
     if (source && m_Streams[i].source != source)
       continue;
     count++;
-    continue;
   }
   return count;
 }
@@ -657,6 +658,8 @@
   m_omxplayer_mode                     = false;
 #endif
 
+  m_SkipCommercials = true;
+
   m_processInfo = CProcessInfo::CreateInstance();
   CreatePlayers();
 
@@ -778,7 +781,7 @@
     m_item.SetPath(g_mediaManager.TranslateDevicePath(""));
   }
 
-  m_pInputStream = CDVDFactoryInputStream::CreateInputStream(this, m_item);
+  m_pInputStream = CDVDFactoryInputStream::CreateInputStream(this, m_item, true);
   if(m_pInputStream == NULL)
   {
     CLog::Log(LOGERROR, "CVideoPlayer::OpenInputStream - unable to create input stream for [%s]", m_item.GetPath().c_str());
@@ -886,32 +889,36 @@
   || m_dvd.iSelectedSPUStream   >= 0)
     return;
 
-  SelectionStreams streams;
   bool valid;
 
   // open video stream
-  streams = m_SelectionStreams.Get(STREAM_VIDEO, PredicateVideoPriority);
   valid   = false;
-  for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+
+  for (const auto &stream : m_SelectionStreams.Get(STREAM_VIDEO, PredicateVideoPriority))
   {
-    if(OpenStream(m_CurrentVideo, it->id, it->source, reset))
+    if(OpenStream(m_CurrentVideo, stream.demuxerId, stream.id, stream.source, reset))
+    {
       valid = true;
+      break;
+    }
   }
   if(!valid)
     CloseStream(m_CurrentVideo, true);
 
   // open audio stream
-  if(m_PlayerOptions.video_only)
-    streams.clear();
-  else
-    streams = m_SelectionStreams.Get(STREAM_AUDIO, PredicateAudioPriority);
   valid   = false;
-
-  for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+  if(!m_PlayerOptions.video_only)
   {
-    if(OpenStream(m_CurrentAudio, it->id, it->source, reset))
-      valid = true;
+    for (const auto &stream : m_SelectionStreams.Get(STREAM_AUDIO, PredicateAudioPriority))
+    {
+      if(OpenStream(m_CurrentAudio, stream.demuxerId, stream.id, stream.source, reset))
+      {
+        valid = true;
+        break;
+      }
+    }
   }
+
   if(!valid)
     CloseStream(m_CurrentAudio, true);
 
@@ -921,18 +928,18 @@
   // open subtitle stream
   SelectionStream as = m_SelectionStreams.Get(STREAM_AUDIO, GetAudioStream());
   PredicateSubtitlePriority psp(as.language);
-  streams = m_SelectionStreams.Get(STREAM_SUBTITLE, psp);
   valid   = false;
   CloseStream(m_CurrentSubtitle, false);
-  for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+  for (const auto &stream : m_SelectionStreams.Get(STREAM_SUBTITLE, psp))
   {
-    if(OpenStream(m_CurrentSubtitle, it->id, it->source))
+    if(OpenStream(m_CurrentSubtitle, stream.demuxerId, stream.id, stream.source))
     {
       valid = true;
-      if(!psp.relevant(*it))
+      if(!psp.relevant(stream))
         visible = false;
-      else if(it->flags & CDemuxStream::FLAG_FORCED)
+      else if(stream.flags & CDemuxStream::FLAG_FORCED)
         visible = true;
+      break;
     }
   }
   if(!valid)
@@ -942,23 +949,27 @@
     SetSubtitleVisibleInternal(visible); // only set subtitle visibility if state not stored by dvd navigator, because navigator will restore it (if visible)
 
   // open teletext stream
-  streams = m_SelectionStreams.Get(STREAM_TELETEXT);
   valid   = false;
-  for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+  for (const auto &stream : m_SelectionStreams.Get(STREAM_TELETEXT))
   {
-    if(OpenStream(m_CurrentTeletext, it->id, it->source))
+    if(OpenStream(m_CurrentTeletext, stream.demuxerId, stream.id, stream.source))
+    {
       valid = true;
+      break;
+    }
   }
   if(!valid)
     CloseStream(m_CurrentTeletext, false);
 
   // open RDS stream
-  streams = m_SelectionStreams.Get(STREAM_RADIO_RDS);
   valid   = false;
-  for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+  for (const auto &stream : m_SelectionStreams.Get(STREAM_RADIO_RDS))
   {
-    if(OpenStream(m_CurrentRadioRDS, it->id, it->source))
+    if(OpenStream(m_CurrentRadioRDS, stream.demuxerId, stream.id, stream.source))
+    {
       valid = true;
+      break;
+    }
   }
   if(!valid)
     CloseStream(m_CurrentRadioRDS, false);
@@ -976,7 +987,7 @@
             stream.id != m_CurrentTeletext.id &&
             stream.id != m_CurrentRadioRDS.id)
         {
-          m_pDemuxer->EnableStream(stream.id, false);
+          m_pDemuxer->EnableStream(stream.demuxerId, stream.id, false);
         }
       }
     }
@@ -997,7 +1008,7 @@
       if(packet->iStreamId < 0)
         return true;
 
-      stream = m_pSubtitleDemuxer->GetStream(packet->iStreamId);
+      stream = m_pSubtitleDemuxer->GetStream(packet->demuxerId, packet->iStreamId);
       if (!stream)
       {
         CLog::Log(LOGERROR, "%s - Error demux packet doesn't belong to a valid stream", __FUNCTION__);
@@ -1051,7 +1062,7 @@
 
     if(m_pDemuxer)
     {
-      stream = m_pDemuxer->GetStream(packet->iStreamId);
+      stream = m_pDemuxer->GetStream(packet->demuxerId, packet->iStreamId);
       if (!stream)
       {
         CLog::Log(LOGERROR, "%s - Error demux packet doesn't belong to a valid stream", __FUNCTION__);
@@ -1078,7 +1089,7 @@
     return true;
   if(source == STREAM_SOURCE_DEMUX_SUB)
   {
-    CDemuxStream* st = m_pSubtitleDemuxer->GetStream(stream.id);
+    CDemuxStream* st = m_pSubtitleDemuxer->GetStream(stream.demuxerId, stream.id);
     if(st == NULL || st->disabled)
       return false;
     if(st->type != stream.type)
@@ -1087,7 +1098,7 @@
   }
   if(source == STREAM_SOURCE_DEMUX)
   {
-    CDemuxStream* st = m_pDemuxer->GetStream(stream.id);
+    CDemuxStream* st = m_pDemuxer->GetStream(stream.demuxerId, stream.id);
     if(st == NULL || st->disabled)
       return false;
     if(st->type != stream.type)
@@ -1145,13 +1156,14 @@
       return true;
     if(current.type == STREAM_SUBTITLE && stream->dvdNavId == m_dvd.iSelectedSPUStream)
       return true;
-    if(current.type == STREAM_VIDEO && current.id < 0)
+    if(current.type == STREAM_VIDEO    && current.id < 0)
       return true;
   }
   else
   {
     if(stream->source == current.source &&
-       stream->uniqueId == current.id)
+       stream->uniqueId == current.id &&
+       stream->demuxerId == current.demuxerId)
       return false;
 
     if(stream->type != current.type)
@@ -1173,7 +1185,7 @@
     CloseStream(current, true);
 
   if (IsBetterStream(current, stream))
-    OpenStream(current, stream->uniqueId, stream->source);
+    OpenStream(current, stream->demuxerId, stream->uniqueId, stream->source);
 }
 
 void CVideoPlayer::Process()
@@ -1252,13 +1264,24 @@
     }
     CLog::Log(LOGDEBUG, "%s - Start position set to last stopped position: %d", __FUNCTION__, starttime);
   }
-  else if(m_Edl.InCut(0, &cut)
-      && (cut.action == CEdl::CUT || cut.action == CEdl::COMM_BREAK))
+  else if(m_Edl.InCut(0, &cut))
   {
-    starttime = cut.end;
-    CLog::Log(LOGDEBUG, "%s - Start position set to end of first cut or commercial break: %d", __FUNCTION__, starttime);
-    if(cut.action == CEdl::COMM_BREAK)
+    if (cut.action == CEdl::CUT)
     {
+      starttime = cut.end;
+      CLog::Log(LOGDEBUG, "%s - Start position set to end of first cut: %d", __FUNCTION__, starttime);
+    }
+    else if (cut.action == CEdl::COMM_BREAK)
+    {
+      if (m_SkipCommercials)
+      {
+        starttime = cut.end;
+        CLog::Log(LOGDEBUG, "%s - Start position set to end of first commercial break: %d", __FUNCTION__, starttime);
+      }
+
+      std::string strTimeString = StringUtils::SecondsToTimeString(cut.end / 1000, TIME_FORMAT_MM_SS);
+      CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25011), strTimeString);
+
       /*
        * Setup auto skip markers as if the commercial break had been skipped using standard
        * detection.
@@ -1306,7 +1329,7 @@
     if (m_omxplayer_mode && OMXDoProcessing(m_OmxPlayerState, m_playSpeed, m_VideoPlayerVideo, m_VideoPlayerAudio, m_CurrentAudio, m_CurrentVideo, m_HasVideo, m_HasAudio, m_renderManager))
     {
       CloseStream(m_CurrentVideo, false);
-      OpenStream(m_CurrentVideo, m_CurrentVideo.id, m_CurrentVideo.source);
+      OpenStream(m_CurrentVideo, m_CurrentVideo.demuxerId, m_CurrentVideo.id, m_CurrentVideo.source);
       if (m_State.canseek)
         m_messenger.Put(new CDVDMsgPlayerSeek(GetTime(), true, true, true, true, true));
     }
@@ -1603,6 +1626,7 @@
 bool CVideoPlayer::CheckIsCurrent(CCurrentStream& current, CDemuxStream* stream, DemuxPacket* pkg)
 {
   if(current.id     == pkg->iStreamId
+  && current.demuxerId == stream->demuxerId
   && current.source == stream->source
   && current.type   == stream->type)
     return true;
@@ -1627,8 +1651,6 @@
     ProcessRadioRDSData(pStream, pPacket);
   else
   {
-    if (m_pDemuxer)
-      m_pDemuxer->EnableStream(pStream->uniqueId, false);
     CDVDDemuxUtils::FreeDemuxPacket(pPacket); // free it since we won't do anything with it
   }
 }
@@ -1642,7 +1664,7 @@
     /* if they have, reopen stream */
 
     if (current.hint != CDVDStreamInfo(*stream, true))
-      OpenStream(current, stream->uniqueId, stream->source );
+      OpenStream(current, stream->demuxerId, stream->uniqueId , stream->source );
 
     current.stream = (void*)stream;
     current.changes = stream->changes;
@@ -2142,6 +2164,8 @@
     current.dur = 0.1 * (current.dur * 9 + (dts - current.dts));
 
   current.dts = dts;
+
+  current.dispTime = pPacket->dispTime;
 }
 
 static void UpdateLimits(double& minimum, double& maximum, double dts)
@@ -2293,13 +2317,21 @@
   &&      GetPlaySpeed() >= 0
   &&      cut.start > m_EdlAutoSkipMarkers.commbreak_end)
   {
-    CLog::Log(LOGDEBUG, "%s - Clock in commercial break [%s - %s]: %s. Automatically skipping to end of commercial break (only done once per break)",
-              __FUNCTION__, CEdl::MillisecondsToTimeString(cut.start).c_str(), CEdl::MillisecondsToTimeString(cut.end).c_str(),
-              CEdl::MillisecondsToTimeString(clock).c_str());
-    /*
-     * Seeking is NOT flushed so any content up to the demux point is retained when playing forwards.
-     */
-    m_messenger.Put(new CDVDMsgPlayerSeek(cut.end + 1, true, false, m_omxplayer_mode, true, false, true));
+    std::string strTimeString = StringUtils::SecondsToTimeString((cut.end - cut.start) / 1000, TIME_FORMAT_MM_SS);
+    CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25011), strTimeString);
+
+    if (m_SkipCommercials)
+    {
+      CLog::Log(LOGDEBUG, "%s - Clock in commercial break [%s - %s]: %s. Automatically skipping to end of commercial break (only done once per break)",
+                __FUNCTION__, CEdl::MillisecondsToTimeString(cut.start).c_str(), CEdl::MillisecondsToTimeString(cut.end).c_str(),
+                CEdl::MillisecondsToTimeString(clock).c_str());
+
+      /*
+       * Seeking is NOT flushed so any content up to the demux point is retained when playing forwards.
+       */
+      m_messenger.Put(new CDVDMsgPlayerSeek(cut.end + 1, true, false, m_omxplayer_mode, true, false, true));
+    }
+
     /*
      * Each commercial break is only skipped once so poorly detected commercial breaks can be
      * manually re-entered. Start and end are recorded to prevent looping and to allow seeking back
@@ -2456,7 +2488,7 @@
         // of the desired segment. With the current approach calculated time may point
         // to nirvana
         if (m_pInputStream->GetIPosTime() == nullptr)
-          time += DVD_TIME_TO_MSEC(m_offset_pts - m_State.time_offset);
+          time -= DVD_TIME_TO_MSEC(m_State.time_offset);
 
         CLog::Log(LOGDEBUG, "demuxer seek to: %d", time);
         if (m_pDemuxer && m_pDemuxer->SeekTime(time, msg.GetBackward(), &start))
@@ -2472,7 +2504,6 @@
             m_State.dts = DVD_MSEC_TO_TIME(time) - m_State.time_offset;
           else
           {
-            start -= m_offset_pts;
             m_State.dts = start;
           }
 
@@ -2503,8 +2534,6 @@
         // This should always be the case.
         if(m_pDemuxer && m_pDemuxer->SeekChapter(msg.GetChapter(), &start))
         {
-          if (start != DVD_NOPTS_VALUE)
-            start -= m_offset_pts;
           FlushBuffers(false, start, true);
           offset = DVD_TIME_TO_MSEC(start) - beforeSeek;
           m_callback.OnPlayBackSeekChapter(msg.GetChapter());
@@ -2544,10 +2573,10 @@
           else
           {
             CloseStream(m_CurrentAudio, false);
-            OpenStream(m_CurrentAudio, st.id, st.source);
+            OpenStream(m_CurrentAudio, st.demuxerId, st.id, st.source);
             AdaptForcedSubtitles();
             
-            if (!m_pDemuxer || !m_pDemuxer->SupportsEnableAtPTS())
+            if (!m_pDemuxer || !m_pDemuxer->SupportsEnableAtPTS(st.demuxerId))
               m_messenger.Put(new CDVDMsgPlayerSeek((int) GetTime(), true, true, true, true, true));
             else
               m_CurrentAudio.avsync = CCurrentStream::AV_SYNC_CONT;
@@ -2573,7 +2602,7 @@
           else
           {
             CloseStream(m_CurrentVideo, false);
-            OpenStream(m_CurrentVideo, st.id, st.source);
+            OpenStream(m_CurrentVideo, st.demuxerId, st.id, st.source);
             m_messenger.Put(new CDVDMsgPlayerSeek((int)GetTime(), true, true, true, true, true));
           }
         }
@@ -2597,7 +2626,7 @@
           else
           {
             CloseStream(m_CurrentSubtitle, false);
-            OpenStream(m_CurrentSubtitle, st.id, st.source);
+            OpenStream(m_CurrentSubtitle, st.demuxerId, st.id, st.source);
           }
         }
       }
@@ -3244,15 +3273,27 @@
     s.aspect_ratio = m_renderManager.GetAspectRatio();
     CRect viewRect;
     m_renderManager.GetVideoRect(s.SrcRect, s.DestRect, viewRect);
-    s.stereo_mode = m_VideoPlayerVideo->GetStereoMode();
-    if (s.stereo_mode == "mono")
-      s.stereo_mode = "";
-
-    CDemuxStream* stream = m_pDemuxer->GetStream(m_CurrentVideo.id);
+    CDemuxStream* stream = m_pDemuxer->GetStream(m_CurrentVideo.demuxerId, m_CurrentVideo.id);
     if (stream && stream->type == STREAM_VIDEO)
     {
-      s.width = ((CDemuxStreamVideo*)stream)->iWidth;
-      s.height = ((CDemuxStreamVideo*)stream)->iHeight;
+      if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
+      {
+        int cout = m_SelectionStreams.Count(STREAM_VIDEO);
+        for (int i = 0; i < cout; ++i)
+        {
+          SelectionStream& select = m_SelectionStreams.Get(STREAM_VIDEO, i);
+          select.width = static_cast<CDemuxStreamVideo*>(stream)->iWidth;
+          select.height = static_cast<CDemuxStreamVideo*>(stream)->iHeight;
+        }
+      }
+      else
+      {
+        s.width = static_cast<CDemuxStreamVideo*>(stream)->iWidth;
+        s.height = static_cast<CDemuxStreamVideo*>(stream)->iHeight;
+      }
+      s.stereo_mode = m_VideoPlayerVideo->GetStereoMode();
+      if (s.stereo_mode == "mono")
+        s.stereo_mode = "";
     }
   }
 
@@ -3265,10 +3306,10 @@
     s.bitrate = m_VideoPlayerAudio->GetAudioBitrate();
     s.channels = m_VideoPlayerAudio->GetAudioChannels();
 
-    CDemuxStream* stream = m_pDemuxer->GetStream(m_CurrentAudio.id);
+    CDemuxStream* stream = m_pDemuxer->GetStream(m_CurrentAudio.demuxerId, m_CurrentAudio.id);
     if (stream && stream->type == STREAM_AUDIO)
     {
-      s.codec = m_pDemuxer->GetStreamCodecName(stream->uniqueId);
+      s.codec = m_pDemuxer->GetStreamCodecName(stream->demuxerId, stream->uniqueId);
     }
   }
 }
@@ -3430,7 +3471,7 @@
   SetPlaySpeed(iSpeed * DVD_PLAYSPEED_NORMAL);
 }
 
-bool CVideoPlayer::OpenStream(CCurrentStream& current, int iStream, int source, bool reset)
+bool CVideoPlayer::OpenStream(CCurrentStream& current, int64_t demuxerId, int iStream, int source, bool reset /*= true*/)
 {
   CDemuxStream* stream = NULL;
   CDVDStreamInfo hint;
@@ -3439,7 +3480,7 @@
 
   if(STREAM_SOURCE_MASK(source) == STREAM_SOURCE_DEMUX_SUB)
   {
-    int index = m_SelectionStreams.IndexOf(current.type, source, iStream);
+    int index = m_SelectionStreams.IndexOf(current.type, source, demuxerId, iStream);
     if(index < 0)
       return false;
     SelectionStream st = m_SelectionStreams.Get(current.type, index);
@@ -3461,20 +3502,20 @@
     pts += m_offset_pts;
     if (!m_pSubtitleDemuxer->SeekTime((int)(1000.0 * pts / (double)DVD_TIME_BASE)))
         CLog::Log(LOGDEBUG, "%s - failed to start subtitle demuxing from: %f", __FUNCTION__, pts);
-    stream = m_pSubtitleDemuxer->GetStream(iStream);
+    stream = m_pSubtitleDemuxer->GetStream(demuxerId, iStream);
     if(!stream || stream->disabled)
       return false;
     
-    if (!m_pSubtitleDemuxer->SupportsEnableAtPTS())
-      m_pSubtitleDemuxer->EnableStream(iStream, true);
+    if (!m_pSubtitleDemuxer->SupportsEnableAtPTS(demuxerId))
+      m_pSubtitleDemuxer->EnableStream(demuxerId, iStream, true);
     else
-      m_pSubtitleDemuxer->EnableStreamAtPTS(iStream, DVD_MSEC_TO_TIME(GetTime()));
+      m_pSubtitleDemuxer->EnableStreamAtPTS(demuxerId, iStream, DVD_MSEC_TO_TIME(GetTime()));
 
     hint.Assign(*stream, true);
   }
   else if(STREAM_SOURCE_MASK(source) == STREAM_SOURCE_TEXT)
   {
-    int index = m_SelectionStreams.IndexOf(current.type, source, iStream);
+    int index = m_SelectionStreams.IndexOf(current.type, source, demuxerId, iStream);
     if(index < 0)
       return false;
 
@@ -3488,14 +3529,14 @@
     if(!m_pDemuxer)
       return false;
 
-    stream = m_pDemuxer->GetStream(iStream);
+    stream = m_pDemuxer->GetStream(demuxerId, iStream);
     if(!stream || stream->disabled)
       return false;
 
-    if (!m_pDemuxer->SupportsEnableAtPTS())
-      m_pDemuxer->EnableStream(iStream, true);
+    if (!m_pDemuxer->SupportsEnableAtPTS(demuxerId))
+      m_pDemuxer->EnableStream(demuxerId, iStream, true);
     else
-      m_pDemuxer->EnableStreamAtPTS(iStream, DVD_MSEC_TO_TIME(GetTime()));
+      m_pDemuxer->EnableStreamAtPTS(demuxerId, iStream, DVD_MSEC_TO_TIME(GetTime()));
 
     hint.Assign(*stream, true);
 
@@ -3540,6 +3581,7 @@
   if (res)
   {
     current.id      = iStream;
+    current.demuxerId = demuxerId;
     current.source  = source;
     current.hint    = hint;
     current.stream  = (void*)stream;
@@ -3704,16 +3746,16 @@
   if (ss.flags & CDemuxStream::FLAG_FORCED || !GetSubtitleVisible())
   {
     SelectionStream as = m_SelectionStreams.Get(STREAM_AUDIO, GetAudioStream());
-    SelectionStreams streams = m_SelectionStreams.Get(STREAM_SUBTITLE);
 
-    for(SelectionStreams::iterator it = streams.begin(); it != streams.end() && !valid; ++it)
+    for (const auto &stream : m_SelectionStreams.Get(STREAM_SUBTITLE))
     {
-      if (it->flags & CDemuxStream::FLAG_FORCED && g_LangCodeExpander.CompareISO639Codes(it->language, as.language))
+      if (stream.flags & CDemuxStream::FLAG_FORCED && g_LangCodeExpander.CompareISO639Codes(stream.language, as.language))
       {
-        if(OpenStream(m_CurrentSubtitle, it->id, it->source))
+        if(OpenStream(m_CurrentSubtitle, stream.demuxerId, stream.id, stream.source))
         {
           valid = true;
           SetSubtitleVisibleInternal(true);
+          break;
         }
       }
     }
@@ -3775,7 +3817,7 @@
     SetCaching(CACHESTATE_DONE);
 
   if (m_pDemuxer && STREAM_SOURCE_MASK(current.source) == STREAM_SOURCE_DEMUX)
-    m_pDemuxer->EnableStream(current.id, false);
+    m_pDemuxer->EnableStream(current.demuxerId, current.id, false);
 
   IDVDStreamPlayer* player = GetStreamPlayer(current.player);
   if(player)
@@ -4388,6 +4430,11 @@
       }
       else
         break;
+    case ACTION_TOGGLE_COMMSKIP:
+      m_SkipCommercials = !m_SkipCommercials;
+      CGUIDialogKaiToast::QueueNotification(g_localizeStrings.Get(25011),
+                                            g_localizeStrings.Get(m_SkipCommercials ? 25013 : 25012));
+      break;
     case ACTION_SHOW_CODEC:
       m_renderManager.ToggleDebug();
       break;
@@ -4584,7 +4631,9 @@
       if (sub->type != STREAM_SUBTITLE)
         continue;
 
-      int index = m_SelectionStreams.IndexOf(STREAM_SUBTITLE, m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename), sub->uniqueId);
+      int index = m_SelectionStreams.IndexOf(STREAM_SUBTITLE,
+        m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename),
+        sub->demuxerId, sub->uniqueId);
       SelectionStream& stream = m_SelectionStreams.Get(STREAM_SUBTITLE, index);
 
       if (stream.name.empty())
@@ -4597,7 +4646,8 @@
         stream.flags = static_cast<CDemuxStream::EFlags>(info.flag);
     }
 
-    return m_SelectionStreams.IndexOf(STREAM_SUBTITLE, m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename), 0);
+    return m_SelectionStreams.IndexOf(STREAM_SUBTITLE,
+      m_SelectionStreams.Source(STREAM_SOURCE_DEMUX_SUB, filename), -1, 0);
   }
   if(ext == ".sub")
   {
@@ -4619,17 +4669,18 @@
     s.flags = static_cast<CDemuxStream::EFlags>(info.flag);
 
   m_SelectionStreams.Update(s);
-  return m_SelectionStreams.IndexOf(STREAM_SUBTITLE, s.source, s.id);
+  return m_SelectionStreams.IndexOf(STREAM_SUBTITLE, s.source, s.demuxerId, s.id);
 }
 
 void CVideoPlayer::UpdatePlayState(double timeout)
 {
-  if(m_State.timestamp != 0
-  && m_State.timestamp + DVD_MSEC_TO_TIME(timeout) > CDVDClock::GetAbsoluteClock())
+  if(m_State.timestamp != 0 &&
+     m_State.timestamp + DVD_MSEC_TO_TIME(timeout) > CDVDClock::GetAbsoluteClock())
     return;
 
   SPlayerState state(m_State);
 
+  state.dts = DVD_NOPTS_VALUE;
   if (m_CurrentVideo.dts != DVD_NOPTS_VALUE)
     state.dts = m_CurrentVideo.dts;
   else if (m_CurrentAudio.dts != DVD_NOPTS_VALUE)
@@ -4657,9 +4708,7 @@
       }
     }
 
-    // time = dts - m_offset_pts
     state.time = DVD_TIME_TO_MSEC(m_clock.GetClock(false));
-    state.time_offset = 0;
     state.time_total = m_pDemuxer->GetStreamLength();
   }
 
@@ -4683,13 +4732,21 @@
     {
       if (state.dts != DVD_NOPTS_VALUE)
       {
-        // dts is correct by offset_pts, so we need to revert this correction here
-        // the results is: time = pDisplayTime->GetTime()
-        state.time_offset += DVD_MSEC_TO_TIME(pDisplayTime->GetTime()) - state.dts + m_offset_pts;
-        state.time += DVD_TIME_TO_MSEC(state.time_offset);
+        int dispTime = 0;
+        if (m_CurrentVideo.dispTime)
+          dispTime = m_CurrentVideo.dispTime;
+        else if (m_CurrentAudio.dispTime)
+          dispTime = m_CurrentAudio.dispTime;
+
+        state.time_offset = DVD_MSEC_TO_TIME(dispTime) - state.dts;
       }
+      state.time += DVD_TIME_TO_MSEC(state.time_offset);
       state.time_total = pDisplayTime->GetTotalTime();
     }
+    else
+    {
+      state.time_offset = 0;
+    }
 
     if (CDVDInputStream::IMenus* ptr = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream))
     {
@@ -4905,11 +4962,6 @@
   return m_renderManager.GetAspectRatio();
 }
 
-RESOLUTION CVideoPlayer::GetRenderResolution()
-{
-  return g_graphicsContext.GetVideoResolution();
-}
-
 void CVideoPlayer::TriggerUpdateResolution()
 {
   m_renderManager.TriggerUpdateResolution(0, 0, 0);

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayer.h Changed

@@ -106,10 +106,12 @@
 class CCurrentStream
 {
 public:
-  int id;     // demuxerid of current playing stream
+  int64_t demuxerId; // demuxer's id of current playing stream
+  int id;     // id of current playing stream
   int source;
   double dts;    // last dts from demuxer, used to find disncontinuities
   double dur;    // last frame expected duration
+  int dispTime; // display time from input stream
   CDVDStreamInfo hint;   // stream hints, used to notice stream changes
   void* stream; // pointer or integer, identifying stream playing. if it changes stream changed
   int changes; // remembered counter from stream to track codec changes
@@ -143,6 +145,7 @@
   void Clear()
   {
     id = -1;
+    demuxerId = -1;
     source = STREAM_SOURCE_NONE;
     dts = DVD_NOPTS_VALUE;
     dur = DVD_NOPTS_VALUE;
@@ -179,6 +182,7 @@
   CDemuxStream::EFlags flags = CDemuxStream::FLAG_NONE;
   int          source = 0;
   int          id = 0;
+  int64_t      demuxerId = -1;
   std::string  codec;
   int          channels = 0;
   int          bitrate = 0;
@@ -205,9 +209,9 @@
   std::vector<SelectionStream> m_Streams;
   CCriticalSection m_section;
 
-  int              IndexOf (StreamType type, int source, int id) const;
+  int              IndexOf (StreamType type, int source, int64_t demuxerId, int id) const;
   int              IndexOf (StreamType type, const CVideoPlayer& p) const;
-  int              Count   (StreamType type) const { return IndexOf(type, STREAM_SOURCE_NONE, -1) + 1; }
+  int              Count   (StreamType type) const { return IndexOf(type, STREAM_SOURCE_NONE, -1, -1) + 1; }
   int              CountSource(StreamType type, StreamSource source) const;
   SelectionStream& Get     (StreamType type, int index);
   bool             Get     (StreamType type, CDemuxStream::EFlags flag, SelectionStream& out);
@@ -318,7 +322,6 @@
   virtual void FlushRenderer();
   virtual void SetRenderViewMode(int mode);
   float GetRenderAspectRatio();
-  virtual RESOLUTION GetRenderResolution();
   virtual void TriggerUpdateResolution();
   virtual bool IsRenderingVideo();
   virtual bool IsRenderingGuiLayer();
@@ -364,7 +367,7 @@
   void CreatePlayers();
   void DestroyPlayers();
 
-  bool OpenStream(CCurrentStream& current, int iStream, int source, bool reset = true);
+  bool OpenStream(CCurrentStream& current, int64_t demuxerId, int iStream, int source, bool reset = true);
   bool OpenAudioStream(CDVDStreamInfo& hint, bool reset = true);
   bool OpenVideoStream(CDVDStreamInfo& hint, bool reset = true);
   bool OpenSubtitleStream(CDVDStreamInfo& hint);
@@ -523,6 +526,7 @@
   CEvent m_ready;
 
   CEdl m_Edl;
+  bool m_SkipCommercials;
 
   struct SEdlAutoSkipMarkers {

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp Changed

@@ -87,22 +87,13 @@
   // CloseStream(true);
 }
 
-bool CVideoPlayerAudio::AllowDTSHDDecode()
-{
-#ifdef TARGET_RASPBERRY_PI
-  if (g_RBP.RasberryPiVersion() == 1)
-    return false;
-#endif
-  return true;
-}
-
 bool CVideoPlayerAudio::OpenStream(CDVDStreamInfo &hints)
 {
   CLog::Log(LOGNOTICE, "Finding audio codec for: %i", hints.codec);
   bool allowpassthrough = !CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK);
   if (hints.realtime)
     allowpassthrough = false;
-  CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints, allowpassthrough, AllowDTSHDDecode());
+  CDVDAudioCodec* codec = CDVDFactoryCodec::CreateAudioCodec(hints, allowpassthrough, m_processInfo.AllowDTSHDDecode());
   if(!codec)
   {
     CLog::Log(LOGERROR, "Unsupported audio codec");
@@ -603,7 +594,7 @@
   bool allowpassthrough = !CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK);
   if (m_streaminfo.realtime)
     allowpassthrough = false;
-  CDVDAudioCodec *codec = CDVDFactoryCodec::CreateAudioCodec(m_streaminfo, allowpassthrough, AllowDTSHDDecode());
+  CDVDAudioCodec *codec = CDVDFactoryCodec::CreateAudioCodec(m_streaminfo, allowpassthrough, m_processInfo.AllowDTSHDDecode());
   if (!codec || codec->NeedPassthrough() == m_pAudioCodec->NeedPassthrough()) {
     // passthrough state has not changed
     delete codec;

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerAudio.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.cpp Changed

@@ -210,10 +210,11 @@
     m_rotatedDestCoords[i] = m_savedRotatedDestCoords[i];
 }
 
-void CBaseRenderer::CalcNormalDisplayRect(float offsetX, float offsetY, float screenWidth, float screenHeight, float inputFrameRatio, float zoomAmount, float verticalShift)
+void CBaseRenderer::CalcNormalRenderRect(float offsetX, float offsetY, float width, float height,
+                                         float inputFrameRatio, float zoomAmount, float verticalShift)
 {
   // if view window is empty, set empty destination
-  if(screenHeight == 0 || screenWidth == 0)
+  if(height == 0 || width == 0)
   {
     m_destRect.SetRect(0.0f, 0.0f, 0.0f, 0.0f);
     return;
@@ -226,8 +227,8 @@
 
   float outputFrameRatio = inputFrameRatio / g_graphicsContext.GetResInfo().fPixelRatio;
 
-  // allow a certain error to maximize screen size
-  float fCorrection = screenWidth / screenHeight / outputFrameRatio - 1.0f;
+  // allow a certain error to maximize size of render area
+  float fCorrection = width / height / outputFrameRatio - 1.0f;
   float fAllowed    = CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_ERRORINASPECT) * 0.01f;
   if(fCorrection >   fAllowed) fCorrection =   fAllowed;
   if(fCorrection < - fAllowed) fCorrection = - fAllowed;
@@ -235,12 +236,12 @@
   outputFrameRatio *= 1.0f + fCorrection;
 
   // maximize the movie width
-  float newWidth = screenWidth;
+  float newWidth = width;
   float newHeight = newWidth / outputFrameRatio;
 
-  if (newHeight > screenHeight)
+  if (newHeight > height)
   {
-    newHeight = screenHeight;
+    newHeight = height;
     newWidth = newHeight * outputFrameRatio;
   }
 
@@ -249,24 +250,24 @@
   newHeight *= zoomAmount;
 
   // if we are less than one pixel off use the complete screen instead
-  if (std::abs(newWidth - screenWidth) < 1.0f)
-    newWidth = screenWidth;
-  if (std::abs(newHeight - screenHeight) < 1.0f)
-    newHeight = screenHeight;
+  if (std::abs(newWidth - width) < 1.0f)
+    newWidth = width;
+  if (std::abs(newHeight - height) < 1.0f)
+    newHeight = height;
 
   // Centre the movie
-  float posY = (screenHeight - newHeight) / 2;
-  float posX = (screenWidth - newWidth) / 2;
+  float posY = (height - newHeight) / 2;
+  float posX = (width - newWidth) / 2;
 
   // vertical shift range -1 to 1 shifts within the top and bottom black bars
   // if there are no top and bottom black bars, this range does nothing
-  float blackBarSize = std::max((screenHeight - newHeight) / 2.0f, 0.0f);
+  float blackBarSize = std::max((height - newHeight) / 2.0f, 0.0f);
   posY += blackBarSize * std::max(std::min(verticalShift, 1.0f), -1.0f);
 
   // vertical shift ranges -2 to -1 and 1 to 2 will shift the image out of the screen
   // if vertical shift is -2 it will be completely shifted out the top,
   // if it's 2 it will be completely shifted out the bottom
-  float shiftRange = std::min(newHeight, newHeight - (newHeight - screenHeight) / 2.0f);
+  float shiftRange = std::min(newHeight, newHeight - (newHeight - height) / 2.0f);
   if (verticalShift > 1.0f)
     posY += shiftRange * (verticalShift - 1.0f);
   else if (verticalShift < -1.0f)
@@ -281,7 +282,7 @@
   if (!(g_graphicsContext.IsFullScreenVideo() || g_graphicsContext.IsCalibrating()))
   {
     CRect original(m_destRect);
-    m_destRect.Intersect(CRect(offsetX, offsetY, offsetX + screenWidth, offsetY + screenHeight));
+    m_destRect.Intersect(CRect(offsetX, offsetY, offsetX + width, offsetY + height));
     if (m_destRect != original)
     {
       float scaleX = m_sourceRect.Width() / original.Width();
@@ -370,7 +371,7 @@
   }
 }
 
-void CBaseRenderer::ManageDisplay()
+void CBaseRenderer::ManageRenderArea()
 {
   m_viewRect = g_graphicsContext.GetViewWindow();
 
@@ -422,7 +423,7 @@
     }
   }
 
-  CalcNormalDisplayRect(m_viewRect.x1, m_viewRect.y1, m_viewRect.Width(), m_viewRect.Height(), GetAspectRatio() * CDisplaySettings::GetInstance().GetPixelRatio(), CDisplaySettings::GetInstance().GetZoomAmount(), CDisplaySettings::GetInstance().GetVerticalShift());
+  CalcNormalRenderRect(m_viewRect.x1, m_viewRect.y1, m_viewRect.Width(), m_viewRect.Height(), GetAspectRatio() * CDisplaySettings::GetInstance().GetPixelRatio(), CDisplaySettings::GetInstance().GetZoomAmount(), CDisplaySettings::GetInstance().GetVerticalShift());
 }
 
 void CBaseRenderer::SetViewMode(int viewMode)

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/BaseRenderer.h Changed

@@ -81,8 +81,8 @@
   virtual bool IsConfigured() = 0;
   virtual int GetImage(YV12Image *image, int source = -1, bool readonly = false) = 0;
   virtual void ReleaseImage(int source, bool preserve = false) = 0;
-  virtual bool AddVideoPicture(DVDVideoPicture* picture, int index) { return false; }
   virtual void AddVideoPictureHW(DVDVideoPicture &picture, int index) {};
+  virtual bool IsPictureHW(DVDVideoPicture &picture) { return false; };
   virtual void FlipPage(int source) = 0;
   virtual void PreInit() = 0;
   virtual void UnInit() = 0;
@@ -98,6 +98,7 @@
   virtual void RenderUpdate(bool clear, unsigned int flags = 0, unsigned int alpha = 255) = 0;
   virtual bool RenderCapture(CRenderCapture* capture) = 0;
   virtual EINTERLACEMETHOD AutoInterlaceMethod() = 0;
+  virtual bool HandlesRenderFormat(ERenderFormat format) { return format == m_format; };
 
   // Feature support
   virtual bool SupportsMultiPassRendering() = 0;
@@ -106,24 +107,23 @@
   virtual bool Supports(EINTERLACEMETHOD method) = 0;
   virtual bool Supports(ESCALINGMETHOD method) = 0;
 
-  ERenderFormat GetRenderFormat() { return m_format; }
-
   void SetViewMode(int viewMode);
-
-  /*! \brief Get video rectangle and view window
-  \param source is original size of the video
-  \param dest is the target rendering area honoring aspect ratio of source
-  \param view is the entire target rendering area for the video (including black bars)
-  */
+
+  /*! \brief Get video rectangle and view window
+  \param source is original size of the video
+  \param dest is the target rendering area honoring aspect ratio of source
+  \param view is the entire target rendering area for the video (including black bars)
+  */
   void GetVideoRect(CRect &source, CRect &dest, CRect &view);
   float GetAspectRatio() const;
 
   static void SettingOptionsRenderMethodsFiller(const CSetting *setting, std::vector< std::pair<std::string, int> > &list, int &current, void *data);
 
 protected:
-  void CalcNormalDisplayRect(float offsetX, float offsetY, float screenWidth, float screenHeight, float inputFrameRatio, float zoomAmount, float verticalShift);
+  void CalcNormalRenderRect(float offsetX, float offsetY, float width, float height,
+                            float inputFrameRatio, float zoomAmount, float verticalShift);
   void CalculateFrameAspectRatio(unsigned int desired_width, unsigned int desired_height);
-  void ManageDisplay();
+  void ManageRenderArea();
   virtual void ReorderDrawPoints();//might be overwritten (by egl e.x.)
   void saveRotatedCoords();//saves the current state of m_rotatedDestCoords
   void syncDestRectToRotatedPoints();//sync any changes of m_destRect to m_rotatedDestCoords

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.cpp Changed

@@ -436,20 +436,21 @@
   return true;
 }
 
-CRenderPicture *CProcessorHD::Convert(DVDVideoPicture* picture)
+CRenderPicture *CProcessorHD::Convert(DVDVideoPicture &picture)
 {
-  // RENDER_FMT_YUV420P -> DXGI_FORMAT_NV12
-  // RENDER_FMT_YUV420P10 -> DXGI_FORMAT_P010
-  // RENDER_FMT_YUV420P16 -> DXGI_FORMAT_P016
-  if ( picture->format != RENDER_FMT_YUV420P
-    && picture->format != RENDER_FMT_YUV420P10
-    && picture->format != RENDER_FMT_YUV420P16)
+  if ( picture.format != RENDER_FMT_YUV420P
+    && picture.format != RENDER_FMT_YUV420P10
+    && picture.format != RENDER_FMT_YUV420P16
+    && picture.format != RENDER_FMT_DXVA)
   {
     CLog::Log(LOGERROR, "%s - colorspace not supported by processor, skipping frame.", __FUNCTION__);
     return nullptr;
   }
 
-  ID3D11View* pView = m_context->GetFree(nullptr);
+  if (picture.format == RENDER_FMT_DXVA)
+    return picture.dxva->Acquire();
+
+  ID3D11View *pView = m_context->GetFree(nullptr);
   if (!pView)
   {
     CLog::Log(LOGERROR, "%s - no free video surface", __FUNCTION__);
@@ -478,14 +479,15 @@
   uint8_t*  dst[] = { pData, pData + m_texDesc.Height * rectangle.RowPitch };
   int dstStride[] = { rectangle.RowPitch, rectangle.RowPitch };
 
-  if (picture->format == RENDER_FMT_YUV420P)
+  if (picture.format == RENDER_FMT_YUV420P)
   {
-    convert_yuv420_nv12(picture->data, picture->iLineSize, picture->iHeight, picture->iWidth, dst, dstStride);
+    convert_yuv420_nv12(picture.data, picture.iLineSize, picture.iHeight, picture.iWidth, dst, dstStride);
   }
-  else
+  else if(picture.format == RENDER_FMT_YUV420P10
+       || picture.format == RENDER_FMT_YUV420P16)
   {
-    convert_yuv420_p01x(picture->data, picture->iLineSize, picture->iHeight, picture->iWidth, dst, dstStride
-                      , picture->format == RENDER_FMT_YUV420P10 ? 10 : 16);
+    convert_yuv420_p01x(picture.data, picture.iLineSize, picture.iHeight, picture.iWidth, dst, dstStride
+                      , picture.format == RENDER_FMT_YUV420P10 ? 10 : 16);
   }
   pContext->Unmap(pResource, subresource);
   SAFE_RELEASE(pResource);

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/DXVAHD.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.cpp Changed

@@ -33,43 +33,18 @@
 #include "windowing/WindowingFactory.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h"
 #include "xbmc/Application.h"
+#include "linux/RBP.h"
 
 #define CLASSNAME "CMMALRenderer"
 
 
-CYUVVideoBuffer::CYUVVideoBuffer()
+MMAL_POOL_T *CMMALRenderer::GetPool(ERenderFormat format, bool opaque)
 {
-  m_refs = 0;
-  mmal_buffer = 0;
-}
-
-CYUVVideoBuffer::~CYUVVideoBuffer()
-{
-  m_refs = 0;
-  mmal_buffer = 0;
-}
-
-CYUVVideoBuffer *CYUVVideoBuffer::Acquire()
-{
-  long count = AtomicIncrement(&m_refs);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p ref:%ld", CLASSNAME, __func__, this, mmal_buffer, count);
-  (void)count;
-  return this;
-}
+  CSingleLock lock(m_sharedSection);
+  if (!m_bMMALConfigured)
+    m_bMMALConfigured = init_vout(format, opaque);
 
-long CYUVVideoBuffer::Release()
-{
-  long count = AtomicDecrement(&m_refs);
-  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p ref:%ld", CLASSNAME, __func__, this, mmal_buffer, count);
-  if (count == 0)
-  {
-    mmal_buffer_header_release(mmal_buffer);
-    delete this;
-  }
-  else assert(count > 0);
-  return count;
+  return m_vout_input_pool;
 }
 
 CRenderInfo CMMALRenderer::GetRenderInfo()
@@ -77,48 +52,26 @@
   CSingleLock lock(m_sharedSection);
   CRenderInfo info;
 
-  // we'll assume that video is accelerated (RENDER_FMT_MMAL) for now
-  // we will reconfigure renderer later if necessary
-  if (!m_bMMALConfigured)
-    m_bMMALConfigured = init_vout(RENDER_FMT_MMAL);
-
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s cookie:%p", CLASSNAME, __func__, (void *)m_vout_input_pool);
 
   info.max_buffer_size = NUM_BUFFERS;
   info.optimal_buffer_size = NUM_BUFFERS;
-  info.opaque_pointer = (void *)m_vout_input_pool;
+  info.opaque_pointer = (void *)this;
   info.formats = m_formats;
   return info;
 }
 
-static void vout_control_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
-{
-  mmal_buffer_header_release(buffer);
-}
-
 void CMMALRenderer::vout_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
   assert(!(buffer->flags & MMAL_BUFFER_HEADER_FLAG_TRANSMISSION_FAILED));
   buffer->flags &= ~MMAL_BUFFER_HEADER_FLAG_USER2;
-  if (m_format == RENDER_FMT_MMAL)
-  {
-    CMMALVideoBuffer *omvb = (CMMALVideoBuffer *)buffer->user_data;
-    assert(buffer == omvb->mmal_buffer);
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s port:%p omvb:%p mmal:%p len:%d cmd:%x flags:%x flight:%d", CLASSNAME, __func__, port, omvb, omvb->mmal_buffer, buffer->length, buffer->cmd, buffer->flags, m_inflight);
-    omvb->Release();
-  }
-  else if (m_format == RENDER_FMT_YUV420P)
-  {
-    CYUVVideoBuffer *omvb = (CYUVVideoBuffer *)buffer->user_data;
-    assert(buffer == omvb->mmal_buffer);
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s port:%p omvb:%p mmal:%p len:%d cmd:%x flags:%x flight:%d", CLASSNAME, __func__, port, omvb, omvb->mmal_buffer, buffer->length, buffer->cmd, buffer->flags, m_inflight);
-    m_inflight--;
-    omvb->Release();
-  }
-  else assert(0);
+  CMMALBuffer *omvb = (CMMALBuffer *)buffer->user_data;
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s YUV port:%p omvb:%p mmal:%p:%p len:%d cmd:%x flags:%x flight:%d", CLASSNAME, __func__, port, omvb, buffer, omvb->mmal_buffer, buffer->length, buffer->cmd, buffer->flags, m_inflight);
+  assert(buffer == omvb->mmal_buffer);
+  m_inflight--;
+  omvb->Release();
 }
 
 static void vout_input_port_cb_static(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
@@ -127,13 +80,13 @@
   mmal->vout_input_port_cb(port, buffer);
 }
 
-bool CMMALRenderer::init_vout(ERenderFormat format)
+bool CMMALRenderer::init_vout(ERenderFormat format, bool opaque)
 {
   CSingleLock lock(m_sharedSection);
-  bool formatChanged = m_format != format;
+  bool formatChanged = m_format != format || m_opaque != opaque;
   MMAL_STATUS_T status;
 
-  CLog::Log(LOGDEBUG, "%s::%s configured:%d format:%d->%d", CLASSNAME, __func__, m_bConfigured, m_format, format);
+  CLog::Log(LOGDEBUG, "%s::%s configured:%d format %d->%d opaque %d->%d", CLASSNAME, __func__, m_bConfigured, m_format, format, m_opaque, opaque);
 
   if (m_bMMALConfigured && formatChanged)
     UnInitMMAL();
@@ -142,8 +95,7 @@
     return true;
 
   m_format = format;
-  if (m_format != RENDER_FMT_MMAL && m_format != RENDER_FMT_YUV420P)
-    return true;
+  m_opaque = opaque;
 
   /* Create video renderer */
   status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, &m_vout);
@@ -153,50 +105,29 @@
     return false;
   }
 
-  m_vout->control->userdata = (struct MMAL_PORT_USERDATA_T *)this;
-  status = mmal_port_enable(m_vout->control, vout_control_port_cb);
-  if(status != MMAL_SUCCESS)
-  {
-    CLog::Log(LOGERROR, "%s::%s Failed to enable vout control port (status=%x %s)", CLASSNAME, __func__, status, mmal_status_to_string(status));
-    return false;
-  }
   m_vout_input = m_vout->input[0];
   m_vout_input->userdata = (struct MMAL_PORT_USERDATA_T *)this;
   MMAL_ES_FORMAT_T *es_format = m_vout_input->format;
 
   es_format->type = MMAL_ES_TYPE_VIDEO;
+  if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_BT709)
+    es_format->es->video.color_space = MMAL_COLOR_SPACE_ITUR_BT709;
+  else if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_BT601)
+    es_format->es->video.color_space = MMAL_COLOR_SPACE_ITUR_BT601;
+  else if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_240M)
+    es_format->es->video.color_space = MMAL_COLOR_SPACE_SMPTE240M;
+
   es_format->es->video.crop.width = m_sourceWidth;
   es_format->es->video.crop.height = m_sourceHeight;
+  es_format->es->video.width = m_sourceWidth;
+  es_format->es->video.height = m_sourceHeight;
 
-  if (m_format == RENDER_FMT_MMAL)
-  {
-    es_format->encoding = MMAL_ENCODING_OPAQUE;
-    es_format->es->video.width = m_sourceWidth;
-    es_format->es->video.height = m_sourceHeight;
-  }
-  else if (m_format == RENDER_FMT_YUV420P)
-  {
-    const int pitch = ALIGN_UP(m_sourceWidth, 32);
-    const int aligned_height = ALIGN_UP(m_sourceHeight, 16);
-
-    es_format->encoding = MMAL_ENCODING_I420;
-    es_format->es->video.width = pitch;
-    es_format->es->video.height = aligned_height;
-
-    if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_BT709)
-      es_format->es->video.color_space = MMAL_COLOR_SPACE_ITUR_BT709;
-    else if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_BT601)
-      es_format->es->video.color_space = MMAL_COLOR_SPACE_ITUR_BT601;
-    else if (CONF_FLAGS_YUVCOEF_MASK(m_iFlags) == CONF_FLAGS_YUVCOEF_240M)
-      es_format->es->video.color_space = MMAL_COLOR_SPACE_SMPTE240M;
-  }
+  es_format->encoding = m_opaque ? MMAL_ENCODING_OPAQUE : MMAL_ENCODING_I420;
+
+  status = mmal_port_parameter_set_boolean(m_vout_input, MMAL_PARAMETER_ZERO_COPY,  MMAL_TRUE);
+  if (status != MMAL_SUCCESS)
+     CLog::Log(LOGERROR, "%s::%s Failed to enable zero copy mode on %s (status=%x %s)", CLASSNAME, __func__, m_vout_input->name, status, mmal_status_to_string(status));
 
-  if (m_format == RENDER_FMT_MMAL)
-  {
-    status = mmal_port_parameter_set_boolean(m_vout_input, MMAL_PARAMETER_ZERO_COPY,  MMAL_TRUE);
-    if (status != MMAL_SUCCESS)
-       CLog::Log(LOGERROR, "%s::%s Failed to enable zero copy mode on %s (status=%x %s)", CLASSNAME, __func__, m_vout_input->name, status, mmal_status_to_string(status));
-  }
   status = mmal_port_format_commit(m_vout_input);
   if (status != MMAL_SUCCESS)
   {
@@ -204,7 +135,7 @@
     return false;
   }
 
-  m_vout_input->buffer_num = std::max(m_vout_input->buffer_num_recommended, (uint32_t)m_NumYV12Buffers);
+  m_vout_input->buffer_num = std::max(m_vout_input->buffer_num_recommended, (uint32_t)m_NumYV12Buffers+(m_opaque?0:32));
   m_vout_input->buffer_size = m_vout_input->buffer_size_recommended;
 
   status = mmal_port_enable(m_vout_input, vout_input_port_cb_static);
@@ -221,7 +152,8 @@
     return false;
   }
 
-  m_vout_input_pool = mmal_port_pool_create(m_vout_input , m_vout_input->buffer_num, m_vout_input->buffer_size);
+  CLog::Log(LOGDEBUG, "%s::%s Created pool of size %d x %d", CLASSNAME, __func__, m_vout_input->buffer_num, m_vout_input->buffer_size);
+  m_vout_input_pool = mmal_port_pool_create(m_vout_input , m_vout_input->buffer_num, m_opaque ? m_vout_input->buffer_size:0);
   if (!m_vout_input_pool)
   {
     CLog::Log(LOGERROR, "%s::%s Failed to create pool for decoder input port (status=%x %s)", CLASSNAME, __func__, status, mmal_status_to_string(status));
@@ -239,6 +171,7 @@
   memset(m_buffers, 0, sizeof m_buffers);
   m_iFlags = 0;
   m_format = RENDER_FMT_NONE;
+  m_opaque = true;
   m_bConfigured = false;
   m_bMMALConfigured = false;
   m_iYV12RenderBuffer = 0;
@@ -254,14 +187,18 @@
 
 void CMMALRenderer::AddVideoPictureHW(DVDVideoPicture& pic, int index)
 {
-  CMMALVideoBuffer *buffer = pic.MMALBuffer;
+  if (m_format != RENDER_FMT_MMAL)
+  {
+    assert(0);
+    return;
+  }
+
+  CMMALBuffer *buffer = pic.MMALBuffer;
+  assert(buffer);
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-    CLog::Log(LOGDEBUG, "%s::%s - %p (%p) %i", CLASSNAME, __func__, buffer, buffer->mmal_buffer, index);
+    CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, buffer, buffer->mmal_buffer, index);
 
-  YUVBUFFER &buf = m_buffers[index];
-  assert(!buf.MMALBuffer);
-  memset(&buf, 0, sizeof buf);
-  buf.MMALBuffer = buffer->Acquire();
+  m_buffers[index] = buffer->Acquire();
 }
 
 bool CMMALRenderer::Configure(unsigned int width, unsigned int height, unsigned int d_width, unsigned int d_height, float fps, unsigned flags, ERenderFormat format, unsigned extended_format, unsigned int orientation)
@@ -281,7 +218,7 @@
   m_dst_rect.SetRect(0, 0, 0, 0);
 
   CLog::Log(LOGDEBUG, "%s::%s - %dx%d->%dx%d@%.2f flags:%x format:%d ext:%x orient:%d", CLASSNAME, __func__, width, height, d_width, d_height, fps, flags, format, extended_format, orientation);
-  if (format != RENDER_FMT_YUV420P && format != RENDER_FMT_BYPASS && format != RENDER_FMT_MMAL)
+  if (format != RENDER_FMT_BYPASS && format != RENDER_FMT_MMAL)
   {
     CLog::Log(LOGERROR, "%s::%s - format:%d not supported", CLASSNAME, __func__, format);
     return false;
@@ -290,9 +227,9 @@
   // calculate the input frame aspect ratio
   CalculateFrameAspectRatio(d_width, d_height);
   SetViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode);
-  ManageDisplay();
+  ManageRenderArea();
 
-  m_bMMALConfigured = init_vout(format);
+  m_bMMALConfigured = init_vout(format, m_opaque);
   m_bConfigured = m_bMMALConfigured;
   assert(m_bConfigured);
   return m_bConfigured;
@@ -300,101 +237,32 @@
 
 int CMMALRenderer::GetImage(YV12Image *image, int source, bool readonly)
 {
-  if (!image || source < 0)
+  if (!image || source < 0 || m_format != RENDER_FMT_MMAL)
   {
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - invalid: image:%p source:%d ro:%d flight:%d", CLASSNAME, __func__, image, source, readonly, m_inflight);
+      CLog::Log(LOGDEBUG, "%s::%s - invalid: format:%d image:%p source:%d ro:%d flight:%d", CLASSNAME, __func__, m_format, image, source, readonly, m_inflight);
     return -1;
   }
-
-  if (m_format == RENDER_FMT_MMAL)
-  {
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - MMAL: image:%p source:%d ro:%d flight:%d", CLASSNAME, __func__, image, source, readonly, m_inflight);
-  }
-  else if (m_format == RENDER_FMT_YUV420P)
-  {
-    const int pitch = ALIGN_UP(m_sourceWidth, 32);
-    const int aligned_height = ALIGN_UP(m_sourceHeight, 16);
-
-    MMAL_BUFFER_HEADER_T *buffer = mmal_queue_timedwait(m_vout_input_pool->queue, 500);
-    if (!buffer)
-    {
-      CLog::Log(LOGERROR, "%s::%s - mmal_queue_get failed", CLASSNAME, __func__);
-      return -1;
-    }
-
-    m_inflight++;
-    mmal_buffer_header_reset(buffer);
-
-    buffer->length = 3 * pitch * aligned_height >> 1;
-    assert(buffer->length <= buffer->alloc_size);
-
-    image->width    = m_sourceWidth;
-    image->height   = m_sourceHeight;
-    image->flags    = 0;
-    image->cshift_x = 1;
-    image->cshift_y = 1;
-    image->bpp      = 1;
-
-    image->stride[0] = pitch;
-    image->stride[1] = image->stride[2] = pitch>>image->cshift_x;
-
-    image->planesize[0] = pitch * aligned_height;
-    image->planesize[1] = image->planesize[2] = (pitch>>image->cshift_x)*(aligned_height>>image->cshift_y);
-
-    image->plane[0] = (uint8_t *)buffer->data;
-    image->plane[1] = image->plane[0] + image->planesize[0];
-    image->plane[2] = image->plane[1] + image->planesize[1];
-
-    YUVBUFFER &buf = m_buffers[source];
-    memset(&buf, 0, sizeof buf);
-    buf.YUVBuffer = new CYUVVideoBuffer;
-    if (!buf.YUVBuffer)
-      return -1;
-    buf.YUVBuffer->mmal_buffer = buffer;
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - YUV: image:%p source:%d ro:%d omvb:%p mmal:%p flight:%d", CLASSNAME, __func__, image, source, readonly, buf.YUVBuffer, buffer, m_inflight);
-    buf.YUVBuffer->Acquire();
-  }
-  else assert(0);
-
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - MMAL: image:%p source:%d ro:%d flight:%d", CLASSNAME, __func__, image, source, readonly, m_inflight);
   return source;
 }
 
 void CMMALRenderer::ReleaseBuffer(int idx)
 {
   CSingleLock lock(m_sharedSection);
-  if (!m_bMMALConfigured)
+  if (!m_bMMALConfigured || m_format != RENDER_FMT_MMAL)
   {
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
       CLog::Log(LOGDEBUG, "%s::%s - not configured: source:%d", CLASSNAME, __func__, idx);
     return;
   }
-  if (m_format == RENDER_FMT_BYPASS)
-  {
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - bypass: source:%d", CLASSNAME, __func__, idx);
-    return;
-  }
 
-  YUVBUFFER *buffer = &m_buffers[idx];
-  if (m_format == RENDER_FMT_MMAL)
-  {
-    CMMALVideoBuffer *omvb = buffer->MMALBuffer;
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - MMAL: source:%d omvb:%p mmal:%p", CLASSNAME, __func__, idx, omvb, omvb ? omvb->mmal_buffer:NULL);
-    SAFE_RELEASE(buffer->MMALBuffer);
-  }
-  else if (m_format == RENDER_FMT_YUV420P)
-  {
-    CYUVVideoBuffer *omvb = buffer->YUVBuffer;
-    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - YUV: source:%d omvb:%p mmal:%p flight:%d", CLASSNAME, __func__, idx, omvb, omvb ? omvb->mmal_buffer:NULL, m_inflight);
-    if (omvb && omvb->mmal_buffer)
-      SAFE_RELEASE(buffer->YUVBuffer);
-  }
-  else assert(0);
+  CMMALBuffer *omvb = m_buffers[idx];
+  if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+    CLog::Log(LOGDEBUG, "%s::%s - MMAL: source:%d omvb:%p mmal:%p flight:%d", CLASSNAME, __func__, idx, omvb, omvb ? omvb->mmal_buffer:NULL, m_inflight);
+  if (omvb)
+    SAFE_RELEASE(m_buffers[idx]);
 }
 
 void CMMALRenderer::ReleaseImage(int source, bool preserve)
@@ -417,7 +285,7 @@
   if (g_advancedSettings.CanLogComponent(LOGVIDEO))
     CLog::Log(LOGDEBUG, "%s::%s", CLASSNAME, __func__);
   if (!m_bConfigured) return;
-  ManageDisplay();
+  ManageRenderArea();
 }
 
 void CMMALRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
@@ -432,63 +300,60 @@
     return;
   }
 
-  ManageDisplay();
+  ManageRenderArea();
 
-  if (m_format == RENDER_FMT_BYPASS)
+  if (m_format != RENDER_FMT_MMAL)
   {
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - bypass: clear:%d flags:%x alpha:%d source:%d", CLASSNAME, __func__, clear, flags, alpha, source);
+      CLog::Log(LOGDEBUG, "%s::%s - bypass: clear:%d flags:%x alpha:%d source:%d format:%d", CLASSNAME, __func__, clear, flags, alpha, source, m_format);
     return;
   }
   SetVideoRect(m_sourceRect, m_destRect);
 
-  YUVBUFFER *buffer = &m_buffers[source];
-  if (m_format == RENDER_FMT_MMAL)
+  CMMALBuffer *omvb = m_buffers[source];
+  if (omvb && omvb->mmal_buffer)
   {
-    CMMALVideoBuffer *omvb = buffer->MMALBuffer;
-    if (omvb && omvb->mmal_buffer)
-    {
-      if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-        CLog::Log(LOGDEBUG, "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x", CLASSNAME, __func__, clear, flags, alpha, source, omvb, omvb->mmal_buffer, omvb->mmal_buffer->flags);
-      // we only want to upload frames once
-      if (omvb->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_USER1)
-        return;
-      omvb->Acquire();
-      omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
-      mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
-    }
-    else
-      CLog::Log(LOGDEBUG, "%s::%s - No buffer to update", CLASSNAME, __func__);
-  }
-  else if (m_format == RENDER_FMT_YUV420P)
-  {
-    CYUVVideoBuffer *omvb = buffer->YUVBuffer;
-    if (omvb && omvb->mmal_buffer)
+    if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+      CLog::Log(LOGDEBUG, "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x", CLASSNAME, __func__, clear, flags, alpha, source, omvb, omvb->mmal_buffer, omvb->mmal_buffer->flags);
+    // we only want to upload frames once
+    if (omvb->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_USER1)
+      return;
+    // check for changes in aligned sizes
+    if (omvb->m_width != (uint32_t)m_vout_input->format->es->video.crop.width || omvb->m_height != (uint32_t)m_vout_input->format->es->video.crop.height ||
+        omvb->m_aligned_width != m_vout_input->format->es->video.width || omvb->m_aligned_height != m_vout_input->format->es->video.height)
     {
-      if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-        CLog::Log(LOGDEBUG, "%s::%s - YUV: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x", CLASSNAME, __func__, clear, flags, alpha, source, omvb, omvb->mmal_buffer, omvb->mmal_buffer->flags);
-      // we only want to upload frames once
-      if (omvb->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_USER1)
+      CLog::Log(LOGDEBUG, "%s::%s Changing dimensions from %dx%d (%dx%d) to %dx%d (%dx%d)", CLASSNAME, __func__,
+          m_vout_input->format->es->video.crop.width, m_vout_input->format->es->video.crop.height, omvb->m_width, omvb->m_height,
+          m_vout_input->format->es->video.width, m_vout_input->format->es->video.height, omvb->m_aligned_width, omvb->m_aligned_height);
+      m_vout_input->format->es->video.width = omvb->m_aligned_width;
+      m_vout_input->format->es->video.height = omvb->m_aligned_height;
+      m_vout_input->format->es->video.crop.width = omvb->m_width;
+      m_vout_input->format->es->video.crop.height = omvb->m_height;
+      MMAL_STATUS_T status = mmal_port_format_commit(m_vout_input);
+      if (status != MMAL_SUCCESS)
+      {
+        CLog::Log(LOGERROR, "%s::%s Failed to commit vout input format (status=%x %s)", CLASSNAME, __func__, status, mmal_status_to_string(status));
         return;
-      // sanity check it is not on display
-      omvb->Acquire();
-      omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
-      omvb->mmal_buffer->user_data = omvb;
-      mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
+      }
     }
-    else
-      CLog::Log(LOGDEBUG, "%s::%s - No buffer to update: clear:%d flags:%x alpha:%d source:%d", CLASSNAME, __func__, clear, flags, alpha, source);
+    m_inflight++;
+    assert(omvb->mmal_buffer && omvb->mmal_buffer->data && omvb->mmal_buffer->length);
+    omvb->Acquire();
+    omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_FLAG_USER1 | MMAL_BUFFER_HEADER_FLAG_USER2;
+    omvb->mmal_buffer->user_data = omvb;
+    mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
   }
-  else assert(0);
+  else
+    CLog::Log(LOGDEBUG, "%s::%s - MMAL: No buffer to update clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p", CLASSNAME, __func__, clear, flags, alpha, source, omvb, omvb ? omvb->mmal_buffer : nullptr);
 }
 
 void CMMALRenderer::FlipPage(int source)
 {
   CSingleLock lock(m_sharedSection);
-  if (!m_bConfigured || m_format == RENDER_FMT_BYPASS)
+  if (!m_bConfigured || m_format != RENDER_FMT_MMAL)
   {
     if (g_advancedSettings.CanLogComponent(LOGVIDEO))
-      CLog::Log(LOGDEBUG, "%s::%s - not configured: source:%d", CLASSNAME, __func__, source);
+      CLog::Log(LOGDEBUG, "%s::%s - not configured: source:%d format:%d", CLASSNAME, __func__, source, m_format);
     return;
   }
 
@@ -509,7 +374,6 @@
   CLog::Log(LOGDEBUG, "%s::%s", CLASSNAME, __func__);
 
   m_formats.clear();
-  m_formats.push_back(RENDER_FMT_YUV420P);
   m_formats.push_back(RENDER_FMT_MMAL);
   m_formats.push_back(RENDER_FMT_BYPASS);
 
@@ -533,7 +397,6 @@
   if (m_vout)
   {
     mmal_component_disable(m_vout);
-    mmal_port_disable(m_vout->control);
   }
 
   if (m_vout_input)
@@ -602,13 +465,6 @@
 
 bool CMMALRenderer::Supports(EINTERLACEMETHOD method)
 {
-  if (m_format == RENDER_FMT_YUV420P)
-  {
-    if (method == VS_INTERLACEMETHOD_DEINTERLACE_HALF)
-      return true;
-    else
-      return false;
-  }
   if (method == VS_INTERLACEMETHOD_AUTO)
     return true;
   if (method == VS_INTERLACEMETHOD_MMAL_ADVANCED)
@@ -642,8 +498,6 @@
 
 EINTERLACEMETHOD CMMALRenderer::AutoInterlaceMethod()
 {
-  if (m_format == RENDER_FMT_YUV420P)
-    return VS_INTERLACEMETHOD_DEINTERLACE_HALF;
   return m_sourceWidth * m_sourceHeight <= 576 * 720 ? VS_INTERLACEMETHOD_MMAL_ADVANCED : VS_INTERLACEMETHOD_MMAL_BOB;
 }

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/MMALRenderer.h Changed

@@ -38,30 +38,12 @@
 #define AUTOSOURCE -1
 
 class CBaseTexture;
-class CMMALVideoBuffer;
+class CMMALBuffer;
 
 struct DVDVideoPicture;
 
-class CYUVVideoBuffer
-{
-public:
-  CYUVVideoBuffer();
-  ~CYUVVideoBuffer();
-  // reference counting
-  CYUVVideoBuffer *Acquire();
-  long Release();
-  MMAL_BUFFER_HEADER_T *mmal_buffer;
-protected:
-  long m_refs;
-};
-
 class CMMALRenderer : public CBaseRenderer
 {
-  struct YUVBUFFER
-  {
-    CMMALVideoBuffer *MMALBuffer; // used for hw decoded buffers
-    CYUVVideoBuffer  *YUVBuffer;  // used for sw decoded buffers
-  };
 public:
   CMMALRenderer();
   ~CMMALRenderer();
@@ -99,13 +81,14 @@
   virtual bool         IsGuiLayer() { return false; }
 
   void vout_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer);
+  MMAL_POOL_T *GetPool(ERenderFormat format, bool opaque);
 protected:
   int m_iYV12RenderBuffer;
   int m_NumYV12Buffers;
 
   std::vector<ERenderFormat> m_formats;
 
-  YUVBUFFER            m_buffers[NUM_BUFFERS];
+  CMMALBuffer         *m_buffers[NUM_BUFFERS];
   bool                 m_bConfigured;
   bool                 m_bMMALConfigured;
   unsigned int         m_extended_format;
@@ -117,13 +100,14 @@
   RENDER_STEREO_MODE        m_display_stereo_mode;
   bool                      m_StereoInvert;
   int                       m_inflight;
+  bool                      m_opaque;
 
   CCriticalSection m_sharedSection;
   MMAL_COMPONENT_T *m_vout;
   MMAL_PORT_T *m_vout_input;
   MMAL_POOL_T *m_vout_input_pool;
 
-  bool init_vout(ERenderFormat format);
+  bool init_vout(ERenderFormat format, bool opaque);
   void ReleaseBuffers();
   void UnInitMMAL();
 };

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererIMX.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodecSurface.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.cpp Changed

@@ -337,7 +337,7 @@
   CSingleLock lock2(m_presentlock);
   CSingleLock lock3(m_datalock);
 
-  if (m_pRenderer && m_pRenderer->GetRenderFormat() != m_format)
+  if (m_pRenderer && !m_pRenderer->HandlesRenderFormat(m_format))
   {
     DeleteRenderer();
   }
@@ -724,10 +724,10 @@
 
 void CRenderManager::DeleteRenderer()
 {
-  CLog::Log(LOGDEBUG, "%s - deleting renderer", __FUNCTION__);
-
   if (m_pRenderer)
   {
+    CLog::Log(LOGDEBUG, "%s - deleting renderer", __FUNCTION__);
+
     delete m_pRenderer;
     m_pRenderer = NULL;
   }
@@ -1236,17 +1236,28 @@
   if (!m_pRenderer)
     return -1;
 
-  // TODO: this is a Windows onl thing and should go away
-  if(m_pRenderer->AddVideoPicture(&pic, index))
-    return 1;
-
   YV12Image image;
   if (m_pRenderer->GetImage(&image, index) < 0)
     return -1;
 
-  if(pic.format == RENDER_FMT_YUV420P
-  || pic.format == RENDER_FMT_YUV420P10
-  || pic.format == RENDER_FMT_YUV420P16)
+  if(pic.format == RENDER_FMT_VDPAU
+  || pic.format == RENDER_FMT_VDPAU_420
+  || pic.format == RENDER_FMT_OMXEGL
+  || pic.format == RENDER_FMT_CVBREF
+  || pic.format == RENDER_FMT_VAAPI
+  || pic.format == RENDER_FMT_VAAPINV12
+  || pic.format == RENDER_FMT_MEDIACODEC
+  || pic.format == RENDER_FMT_MEDIACODECSURFACE
+  || pic.format == RENDER_FMT_AML
+  || pic.format == RENDER_FMT_IMXMAP
+  || pic.format == RENDER_FMT_MMAL
+  || m_pRenderer->IsPictureHW(pic))
+  {
+    m_pRenderer->AddVideoPictureHW(pic, index);
+  }
+  else if(pic.format == RENDER_FMT_YUV420P
+       || pic.format == RENDER_FMT_YUV420P10
+       || pic.format == RENDER_FMT_YUV420P16)
   {
     CDVDCodecUtils::CopyPicture(&image, &pic);
   }
@@ -1259,18 +1270,6 @@
   {
     CDVDCodecUtils::CopyYUV422PackedPicture(&image, &pic);
   }
-  else if(pic.format == RENDER_FMT_VDPAU
-       || pic.format == RENDER_FMT_VDPAU_420
-       || pic.format == RENDER_FMT_OMXEGL
-       || pic.format == RENDER_FMT_CVBREF
-       || pic.format == RENDER_FMT_VAAPI
-       || pic.format == RENDER_FMT_VAAPINV12
-       || pic.format == RENDER_FMT_MEDIACODEC
-       || pic.format == RENDER_FMT_MEDIACODECSURFACE
-       || pic.format == RENDER_FMT_AML
-       || pic.format == RENDER_FMT_IMXMAP
-       || pic.format == RENDER_FMT_MMAL)
-    m_pRenderer->AddVideoPictureHW(pic, index);
 
   m_pRenderer->ReleaseImage(index, false);

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.cpp Changed

@@ -304,7 +304,6 @@
     { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0,  0, D3D11_INPUT_PER_VERTEX_DATA, 0 },
     { "TEXCOORD", 0, DXGI_FORMAT_R32G32_FLOAT,    0, 12, D3D11_INPUT_PER_VERTEX_DATA, 0 },
     { "TEXCOORD", 1, DXGI_FORMAT_R32G32_FLOAT,    0, 20, D3D11_INPUT_PER_VERTEX_DATA, 0 },
-    { "TEXCOORD", 2, DXGI_FORMAT_R32G32_FLOAT,    0, 28, D3D11_INPUT_PER_VERTEX_DATA, 0 },
   };
 
   if (!CWinShader::CreateInputLayout(layout, ARRAYSIZE(layout)))
@@ -353,32 +352,32 @@
     v[0].z = 0.0f;
     v[0].tu = sourceRect.x1 / m_sourceWidth;
     v[0].tv = sourceRect.y1 / m_sourceHeight;
-    v[0].tu2 = v[0].tu3 = (sourceRect.x1 / 2.0f) / (m_sourceWidth>>1);
-    v[0].tv2 = v[0].tv3 = (sourceRect.y1 / 2.0f) / (m_sourceHeight>>1);
+    v[0].tu2 = (sourceRect.x1 / 2.0f) / (m_sourceWidth>>1);
+    v[0].tv2 = (sourceRect.y1 / 2.0f) / (m_sourceHeight>>1);
 
     v[1].x = m_dest[1].x;
     v[1].y = m_dest[1].y;
     v[1].z = 0.0f;
     v[1].tu = sourceRect.x2 / m_sourceWidth;
     v[1].tv = sourceRect.y1 / m_sourceHeight;
-    v[1].tu2 = v[1].tu3 = (sourceRect.x2 / 2.0f) / (m_sourceWidth>>1);
-    v[1].tv2 = v[1].tv3 = (sourceRect.y1 / 2.0f) / (m_sourceHeight>>1);
+    v[1].tu2 = (sourceRect.x2 / 2.0f) / (m_sourceWidth>>1);
+    v[1].tv2 = (sourceRect.y1 / 2.0f) / (m_sourceHeight>>1);
 
     v[2].x = m_dest[2].x;
     v[2].y = m_dest[2].y;
     v[2].z = 0.0f;
     v[2].tu = sourceRect.x2 / m_sourceWidth;
     v[2].tv = sourceRect.y2 / m_sourceHeight;
-    v[2].tu2 = v[2].tu3 = (sourceRect.x2 / 2.0f) / (m_sourceWidth>>1);
-    v[2].tv2 = v[2].tv3 = (sourceRect.y2 / 2.0f) / (m_sourceHeight>>1);
+    v[2].tu2 = (sourceRect.x2 / 2.0f) / (m_sourceWidth>>1);
+    v[2].tv2 = (sourceRect.y2 / 2.0f) / (m_sourceHeight>>1);
 
     v[3].x = m_dest[3].x;
     v[3].y = m_dest[3].y;
     v[3].z = 0.0f;
     v[3].tu = sourceRect.x1 / m_sourceWidth;
     v[3].tv = sourceRect.y2 / m_sourceHeight;
-    v[3].tu2 = v[3].tu3 = (sourceRect.x1 / 2.0f) / (m_sourceWidth>>1);
-    v[3].tv2 = v[3].tv3 = (sourceRect.y2 / 2.0f) / (m_sourceHeight>>1);
+    v[3].tu2 = (sourceRect.x1 / 2.0f) / (m_sourceWidth>>1);
+    v[3].tv2 = (sourceRect.y2 / 2.0f) / (m_sourceHeight>>1);
 
     CWinShader::UnlockVertexBuffer();
   }
@@ -392,12 +391,15 @@
 void CYUV2RGBShader::SetShaderParameters(YUVBuffer* YUVbuf)
 {
   m_effect.SetTechnique("YUV2RGB_T");
+  SVideoPlane *planes = YUVbuf->planes;
+  ID3D11ShaderResourceView* ppSRView[3] =
+  {
+    planes[0].texture.GetShaderResource(),
+    planes[1].texture.GetShaderResource(),
+    planes[2].texture.GetShaderResource(),
+  };
+  m_effect.SetResources("g_Texture", ppSRView, YUVbuf->GetActivePlanes());
   m_effect.SetMatrix("g_ColorMatrix", m_matrix.Matrix());
-  m_effect.SetTexture("g_YTexture", YUVbuf->planes[0].texture);
-  if (YUVbuf->GetActivePlanes() > 1)
-    m_effect.SetTexture("g_UTexture", YUVbuf->planes[1].texture);
-  if (YUVbuf->GetActivePlanes() > 2)
-    m_effect.SetTexture("g_VTexture", YUVbuf->planes[2].texture);
   m_effect.SetFloatArray("g_StepXY", m_texSteps, ARRAY_SIZE(m_texSteps));
 
   UINT numPorts = 1;
@@ -901,14 +903,28 @@
 }
 
 //==========================================================
+#define SHADER_SOURCE(...) #__VA_ARGS__
 
 bool CTestShader::Create()
 {
-  std::string effectString = "special://xbmc/system/shaders/testshader.fx";
+  std::string strShader = SHADER_SOURCE(
+    float4 TEST() : SV_TARGET
+    {
+      return float4(0.0, 0.0, 0.0, 0.0);
+    }
 
-  if(!LoadEffect(effectString, nullptr))
+    technique11 TEST_T
+    {
+      pass P0
+      {
+        SetPixelShader(CompileShader(ps_4_0_level_9_1, TEST()));
+      }
+    };
+  );
+
+  if (!m_effect.Create(strShader, nullptr))
   {
-    CLog::Log(LOGERROR, __FUNCTION__": Failed to load shader %s.", effectString.c_str());
+    CLog::Log(LOGERROR, __FUNCTION__": Failed to create test shader: %s", strShader.c_str());
     return false;
   }
   return true;

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/WinVideoFilter.h Changed

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.cpp Changed

@@ -106,6 +106,21 @@
   return AV_PIX_FMT_NONE;
 }
 
+bool CWinRenderer::HandlesRenderFormat(ERenderFormat format)
+{
+  if(format == RENDER_FMT_DXVA
+  || format == RENDER_FMT_YUV420P
+  || format == RENDER_FMT_YUV420P10
+  || format == RENDER_FMT_YUV420P16
+  || format == RENDER_FMT_NV12
+  || format == RENDER_FMT_UYVY422
+  || format == RENDER_FMT_YUYV422)
+  {
+    return true;
+  }
+  return false;
+}
+
 void CWinRenderer::ManageTextures()
 {
   if( m_NumYV12Buffers < m_neededBuffers )
@@ -117,11 +132,11 @@
   }
   else if( m_NumYV12Buffers > m_neededBuffers )
   {
+    for (int i = m_NumYV12Buffers - 1; i >= m_neededBuffers; i--)
+      DeleteYV12Texture(i);
+
     m_NumYV12Buffers = m_neededBuffers;
     m_iYV12RenderBuffer = m_iYV12RenderBuffer % m_NumYV12Buffers;
-
-    for(int i = m_NumYV12Buffers-1; i>=m_neededBuffers;i--)
-      DeleteYV12Texture(i);
   }
 }
 
@@ -211,11 +226,8 @@
 
   // calculate the input frame aspect ratio
   CalculateFrameAspectRatio(d_width, d_height);
-  RESOLUTION_INFO res = CDisplaySettings::GetInstance().GetResolutionInfo(RES_DESKTOP);
-  m_destWidth = res.iWidth;
-  m_destHeight = res.iHeight;
   SetViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode);
-  ManageDisplay();
+  ManageRenderArea();
 
   SelectRenderMethod();
   m_bConfigured = true;
@@ -231,49 +243,40 @@
     return -1;
 }
 
-bool CWinRenderer::AddVideoPicture(DVDVideoPicture* picture, int index)
+bool CWinRenderer::IsPictureHW(DVDVideoPicture &picture)
 {
-  if (!m_NumYV12Buffers)
-    return false;
-
-  int source = index;
-  if (source < 0 || NextYV12Texture() < 0)
-    return false;
-
-  if (m_renderMethod == RENDER_DXVA || picture->format == RENDER_FMT_DXVA)
+  if (m_renderMethod == RENDER_DXVA
+    || picture.format == RENDER_FMT_DXVA)
   {
-    if (m_renderMethod == RENDER_DXVA)
-    {
-      DXVABuffer *buf = reinterpret_cast<DXVABuffer*>(m_VideoBuffers[source]);
-      SAFE_RELEASE(buf->pic);
-
-      if (picture->format == RENDER_FMT_DXVA)
-      {
-        if (picture->dxva)
-          buf->pic = picture->dxva->Acquire();
-      }
-      else
-      {
-        buf->pic = m_processor->Convert(picture);
-      }
-      buf->frameIdx = m_frameIdx;
-      m_frameIdx += 2;
-      return true;
-    }
-    else if (picture->format == RENDER_FMT_DXVA)
-    {
-      YUVBuffer *buf = reinterpret_cast<YUVBuffer*>(m_VideoBuffers[source]);
-      if (buf->IsReadyToRender())
-        return false;
-
-      return buf->CopyFromDXVA(reinterpret_cast<ID3D11VideoDecoderOutputView*>(picture->dxva->view));
-    }
+    return true;
   }
   return false;
 }
 
+void CWinRenderer::AddVideoPictureHW(DVDVideoPicture &picture, int index)
+{
+  if (m_renderMethod == RENDER_DXVA)
+  {
+    DXVABuffer *buf = reinterpret_cast<DXVABuffer*>(m_VideoBuffers[index]);
+    SAFE_RELEASE(buf->pic);
+    buf->pic = m_processor->Convert(picture);
+    buf->frameIdx = m_frameIdx;
+    m_frameIdx += 2;
+  }
+  else if (picture.format == RENDER_FMT_DXVA)
+  {
+    YUVBuffer *buf = reinterpret_cast<YUVBuffer*>(m_VideoBuffers[index]);
+    if (buf->IsReadyToRender())
+      return;
+    buf->CopyFromPicture(picture);
+  }
+}
+
 int CWinRenderer::GetImage(YV12Image *image, int source, bool readonly)
 {
+  if (!image) return -1;
+  if (!m_NumYV12Buffers) return -1;
+
   /* take next available buffer */
   if( source == AUTOSOURCE )
     source = NextYV12Texture();
@@ -281,10 +284,15 @@
   if (source < 0 || NextYV12Texture() < 0)
     return -1;
 
+  if (m_renderMethod == RENDER_DXVA)
+    return source;
+
   YUVBuffer *buf = reinterpret_cast<YUVBuffer*>(m_VideoBuffers[source]);
-  if (!buf || buf->IsReadyToRender())
+  if (!buf)
     return -1;
 
+  buf->StartDecode();
+
   image->cshift_x = 1;
   image->cshift_y = 1;
   image->height = m_sourceHeight;
@@ -307,7 +315,8 @@
 
 void CWinRenderer::ReleaseImage(int source, bool preserve)
 {
-  // no need to release anything here since we're using system memory
+  if (m_VideoBuffers[source] != nullptr)
+    m_VideoBuffers[source]->StartRender();
 }
 
 void CWinRenderer::Reset()
@@ -318,7 +327,7 @@
 {
   if (!m_bConfigured) 
     return;
-  ManageDisplay();
+  ManageRenderArea();
   ManageTextures();
 }
 
@@ -332,25 +341,16 @@
 
   g_Windowing.SetAlphaBlendEnable(alpha < 255);
   ManageTextures();
-  ManageDisplay();
+  ManageRenderArea();
   Render(flags);
 }
 
 void CWinRenderer::FlipPage(int source)
 {
-  if(source == AUTOSOURCE)
-    source = NextYV12Texture();
-
-  if (m_VideoBuffers[m_iYV12RenderBuffer] != nullptr)
-    m_VideoBuffers[m_iYV12RenderBuffer]->StartDecode();
-
   if( source >= 0 && source < m_NumYV12Buffers )
     m_iYV12RenderBuffer = source;
   else
-    m_iYV12RenderBuffer = 0;
-
-  if (m_VideoBuffers[m_iYV12RenderBuffer] != nullptr)
-    m_VideoBuffers[m_iYV12RenderBuffer]->StartRender();
+    m_iYV12RenderBuffer = NextYV12Texture();;
 
   return;
 }
@@ -546,6 +546,10 @@
 
 void CWinRenderer::UpdatePSVideoFilter()
 {
+  RESOLUTION_INFO res = g_graphicsContext.GetResInfo();
+  m_destWidth = res.iScreenWidth;
+  m_destHeight = res.iScreenHeight;
+
   SAFE_DELETE(m_scalerShader);
 
   if (m_bUseHQScaler)
@@ -603,6 +607,11 @@
 
     // we're in big trouble - fallback to sw method
     m_renderMethod = RENDER_SW;
+    if (m_NumYV12Buffers)
+    {
+      m_NumYV12Buffers = 0;
+      ManageTextures();
+    }
     SelectSWVideoFilter();
   }
 }
@@ -987,6 +996,7 @@
 
   m_VideoBuffers[index]->StartDecode();
   m_VideoBuffers[index]->Clear();
+  m_VideoBuffers[index]->StartRender();
 
   CLog::Log(LOGDEBUG, "created video buffer %i", index);
   return true;
@@ -1304,6 +1314,15 @@
   return !m_locked;
 }
 
+bool YUVBuffer::CopyFromPicture(DVDVideoPicture &picture)
+{
+  if (picture.format == RENDER_FMT_DXVA)
+  {
+    return CopyFromDXVA(reinterpret_cast<ID3D11VideoDecoderOutputView*>(picture.dxva->view));
+  }
+  return false;
+}
+
 bool YUVBuffer::CopyFromDXVA(ID3D11VideoDecoderOutputView* pView)
 {
   if (!pView)

_service:download_url:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderer.h Changed

@@ -114,11 +114,11 @@
   virtual void Clear();
   unsigned int GetActivePlanes() { return m_activeplanes; }
   virtual bool IsReadyToRender();
-  bool CopyFromDXVA(ID3D11VideoDecoderOutputView* pView);
-
+  bool CopyFromPicture(DVDVideoPicture &picture);
   SVideoPlane planes[MAX_PLANES];
 
 private:
+  bool CopyFromDXVA(ID3D11VideoDecoderOutputView* pView);
   void PerformCopy();
 
   unsigned int     m_width;
@@ -150,33 +150,31 @@
   bool RenderCapture(CRenderCapture* capture);
 
   // Player functions
-  virtual bool         Configure(unsigned int width, unsigned int height, unsigned int d_width, unsigned int d_height, float fps, unsigned flags, ERenderFormat format, unsigned extended_format, unsigned int orientation);
-  virtual int          GetImage(YV12Image *image, int source = AUTOSOURCE, bool readonly = false);
-  virtual void         ReleaseImage(int source, bool preserve = false);
-  virtual bool         AddVideoPicture(DVDVideoPicture* picture, int index);
-  virtual void         FlipPage(int source);
-  virtual void         PreInit();
-  virtual void         UnInit();
-  virtual void         Reset(); /* resets renderer after seek for example */
-  virtual bool         IsConfigured() { return m_bConfigured; }
-  virtual void         Flush();
-
+  virtual bool Configure(unsigned int width, unsigned int height, unsigned int d_width, unsigned int d_height, float fps, unsigned flags, ERenderFormat format, unsigned extended_format, unsigned int orientation);
+  virtual int GetImage(YV12Image *image, int source = AUTOSOURCE, bool readonly = false);
+  virtual void ReleaseImage(int source, bool preserve = false);
+  virtual void AddVideoPictureHW(DVDVideoPicture &picture, int index) override;
+  virtual bool IsPictureHW(DVDVideoPicture &picture) override;
+  virtual void FlipPage(int source);
+  virtual void PreInit();
+  virtual void UnInit();
+  virtual void Reset(); /* resets renderer after seek for example */
+  virtual bool IsConfigured() { return m_bConfigured; }
+  virtual void Flush();
+  virtual EINTERLACEMETHOD AutoInterlaceMethod();
   virtual CRenderInfo GetRenderInfo();
+  virtual void RenderUpdate(bool clear, unsigned int flags = 0, unsigned int alpha = 255);
+  virtual void SetBufferSize(int numBuffers) { m_neededBuffers = numBuffers; }
+  virtual void ReleaseBuffer(int idx);
+  virtual bool NeedBufferForRef(int idx);
+  virtual bool HandlesRenderFormat(ERenderFormat format) override;
 
   // Feature support
-  virtual bool         SupportsMultiPassRendering() { return false; }
-  virtual bool         Supports(ERENDERFEATURE feature);
-  virtual bool         Supports(EDEINTERLACEMODE mode);
-  virtual bool         Supports(EINTERLACEMETHOD method);
-  virtual bool         Supports(ESCALINGMETHOD method);
-
-  virtual EINTERLACEMETHOD AutoInterlaceMethod();
-
-  void                 RenderUpdate(bool clear, unsigned int flags = 0, unsigned int alpha = 255);
-
-  virtual void         SetBufferSize(int numBuffers) { m_neededBuffers = numBuffers; }
-  virtual void         ReleaseBuffer(int idx);
-  virtual bool         NeedBufferForRef(int idx);
+  virtual bool SupportsMultiPassRendering() { return false; }
+  virtual bool Supports(ERENDERFEATURE feature);
+  virtual bool Supports(EDEINTERLACEMODE mode);
+  virtual bool Supports(EINTERLACEMETHOD method);
+  virtual bool Supports(ESCALINGMETHOD method);
 
 protected:
   virtual void Render(DWORD flags);

_service:download_url:master.tar.gz/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/omxplayer/OMXHelper.cpp Changed

_service:download_url:master.tar.gz/xbmc/cores/paplayer/CodecFactory.cpp Changed

@@ -23,8 +23,9 @@
 #include "URL.h"
 #include "VideoPlayerCodec.h"
 #include "utils/StringUtils.h"
-#include "addons/AddonManager.h"
 #include "addons/AudioDecoder.h"
+#include "addons/BinaryAddonCache.h"
+#include "ServiceBroker.h"
 
 using namespace ADDON;
 
@@ -33,7 +34,8 @@
   std::string fileType = strFileType;
   StringUtils::ToLower(fileType);
   VECADDONS codecs;
-  CAddonMgr::GetInstance().GetAddons(codecs, ADDON_AUDIODECODER);
+  ADDON::CBinaryAddonCache &addonCache = CServiceBroker::GetBinaryAddonCache();
+  addonCache.GetAddons(codecs, ADDON::ADDON_AUDIODECODER);
   for (size_t i=0;i<codecs.size();++i)
   {
     std::shared_ptr<CAudioDecoder> dec(std::static_pointer_cast<CAudioDecoder>(codecs[i]));
@@ -58,7 +60,8 @@
   if (!content.empty())
   {
     VECADDONS codecs;
-    CAddonMgr::GetInstance().GetAddons(codecs, ADDON_AUDIODECODER);
+    CBinaryAddonCache &addonCache = CServiceBroker::GetBinaryAddonCache();
+    addonCache.GetAddons(codecs, ADDON_AUDIODECODER);
     for (size_t i=0;i<codecs.size();++i)
     {
       std::shared_ptr<CAudioDecoder> dec(std::static_pointer_cast<CAudioDecoder>(codecs[i]));

_service:download_url:master.tar.gz/xbmc/cores/paplayer/VideoPlayerCodec.cpp Changed

_service:download_url:master.tar.gz/xbmc/dbwrappers/Database.cpp Changed

_service:download_url:master.tar.gz/xbmc/dbwrappers/mysqldataset.cpp Changed

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogContextMenu.cpp Changed

@@ -88,7 +88,7 @@
   if (message.GetMessage() == GUI_MSG_CLICKED)
   { // someone has been clicked - deinit...
     if (message.GetSenderId() >= BUTTON_START && message.GetSenderId() <= BUTTON_END)
-      m_clickedButton = (int)m_buttons[message.GetSenderId() - BUTTON_START].first;
+      m_clickedButton = message.GetSenderId() - BUTTON_START;
     Close();
     return true;
   }
@@ -229,11 +229,6 @@
   {
     if (item->IsDVD() || item->IsCDDA())
     {
-      // We need to check if there is a detected is inserted!
-      buttons.Add(CONTEXT_BUTTON_PLAY_DISC, 341); // Play CD/DVD!
-      if (CGUIWindowVideoBase::HasResumeItemOffset(item.get()))
-        buttons.Add(CONTEXT_BUTTON_RESUME_DISC, CGUIWindowVideoBase::GetResumeString(*(item.get())));     // Resume Disc
-
       buttons.Add(CONTEXT_BUTTON_EJECT_DISC, 13391);  // Eject/Load CD/DVD!
     }
     else // Must be HDD
@@ -258,13 +253,6 @@
       bool isAddon = ADDON::TranslateContent(url.GetProtocol()) != CONTENT_NONE;
       if (!share->m_ignore && !isAddon)
         buttons.Add(CONTEXT_BUTTON_EDIT_SOURCE, 1027); // Edit Source
-      else
-      {
-        ADDON::AddonPtr plugin;
-        if (ADDON::CAddonMgr::GetInstance().GetAddon(url.GetHostName(), plugin))
-        if (plugin->HasSettings())
-          buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045); // Plugin Settings
-      }
       if (type != "video")
         buttons.Add(CONTEXT_BUTTON_SET_DEFAULT, 13335); // Set as Default
       if (!share->m_ignore && !isAddon)
@@ -324,12 +312,6 @@
     return g_mediaManager.Eject(item->GetPath());
 
 #ifdef HAS_DVD_DRIVE
-  case CONTEXT_BUTTON_PLAY_DISC:
-    return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, true); // restart
-
-  case CONTEXT_BUTTON_RESUME_DISC:
-    return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, false); // resume
-
   case CONTEXT_BUTTON_EJECT_DISC:
     g_mediaManager.ToggleTray(g_mediaManager.TranslateDevicePath(item->GetPath())[0]);
 #endif
@@ -669,6 +651,21 @@
   }
 }
 
+int CGUIDialogContextMenu::Show(const CContextButtons& choices)
+{
+  auto dialog = static_cast<CGUIDialogContextMenu*>(g_windowManager.GetWindow(WINDOW_DIALOG_CONTEXT_MENU));
+  if (!dialog)
+    return -1;
+
+  dialog->m_buttons = choices;
+  dialog->Initialize();
+  dialog->SetInitialVisibility();
+  dialog->SetupButtons();
+  dialog->PositionAtCurrentFocus();
+  dialog->Open();
+  return dialog->m_clickedButton;
+}
+
 int CGUIDialogContextMenu::ShowAndGetChoice(const CContextButtons &choices)
 {
   if (choices.empty())
@@ -683,7 +680,10 @@
     pMenu->SetupButtons();
     pMenu->PositionAtCurrentFocus();
     pMenu->Open();
-    return pMenu->m_clickedButton;
+
+    int idx = pMenu->m_clickedButton;
+    if (idx != -1)
+      return choices[idx].first;
   }
   return -1;
 }

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogContextMenu.h Changed

@@ -36,8 +36,6 @@
                       CONTEXT_BUTTON_ADD_FAVOURITE,
                       CONTEXT_BUTTON_SETTINGS,
                       CONTEXT_BUTTON_GOTO_ROOT,
-                      CONTEXT_BUTTON_PLAY_DISC,
-                      CONTEXT_BUTTON_RESUME_DISC,
                       CONTEXT_BUTTON_RIP_CD,
                       CONTEXT_BUTTON_CANCEL_RIP_CD,
                       CONTEXT_BUTTON_RIP_TRACK,
@@ -72,7 +70,6 @@
                       CONTEXT_BUTTON_PLAY_PARTYMODE,
                       CONTEXT_BUTTON_PLAY_PART,
                       CONTEXT_BUTTON_RESUME_ITEM,
-                      CONTEXT_BUTTON_RESTART_ITEM,
                       CONTEXT_BUTTON_EDIT,
                       CONTEXT_BUTTON_EDIT_SMART_PLAYLIST,
                       CONTEXT_BUTTON_INFO,
@@ -87,7 +84,6 @@
                       CONTEXT_BUTTON_MARK_UNWATCHED,
                       CONTEXT_BUTTON_SET_CONTENT,
                       CONTEXT_BUTTON_ADD_TO_LIBRARY,
-                      CONTEXT_BUTTON_SONG_INFO,
                       CONTEXT_BUTTON_EDIT_PARTYMODE,
                       CONTEXT_BUTTON_LINK_MOVIE,
                       CONTEXT_BUTTON_UNLINK_MOVIE,
@@ -96,7 +92,6 @@
                       CONTEXT_BUTTON_PLAY_OTHER,
                       CONTEXT_BUTTON_SET_ACTOR_THUMB,
                       CONTEXT_BUTTON_UNLINK_BOOKMARK,
-                      CONTEXT_BUTTON_PLUGIN_SETTINGS,
                       CONTEXT_BUTTON_SCRIPT_SETTINGS,
                       CONTEXT_BUTTON_LASTFM_UNLOVE_ITEM,
                       CONTEXT_BUTTON_LASTFM_UNBAN_ITEM,
@@ -110,6 +105,7 @@
                       CONTEXT_BUTTON_EDIT_TIMER,
                       CONTEXT_BUTTON_EDIT_TIMER_RULE,
                       CONTEXT_BUTTON_DELETE_TIMER,
+                      CONTEXT_BUTTON_DELETE_TIMER_RULE,
                       CONTEXT_BUTTON_GROUP_MANAGER,
                       CONTEXT_BUTTON_CHANNEL_MANAGER,
                       CONTEXT_BUTTON_FILTER,
@@ -149,10 +145,6 @@
                       CONTEXT_BUTTON_USER8,
                       CONTEXT_BUTTON_USER9,
                       CONTEXT_BUTTON_USER10,
-
-                      //NOTE: this has to be the last in this enum,
-                      //because this one, and the ones higher will be used by context addons
-                      CONTEXT_BUTTON_FIRST_ADDON
                     };
 
 class CContextButtons : public std::vector< std::pair<unsigned int, std::string> >
@@ -178,10 +170,12 @@
   static void GetContextButtons(const std::string &type, const CFileItemPtr& item, CContextButtons &buttons);
   static bool OnContextButton(const std::string &type, const CFileItemPtr& item, CONTEXT_BUTTON button);
 
-  /*! \brief Show the context menu with the given choices
-   \param choices the choices available for the user.
-   \return -1 if no choice is made, else the chosen option.
+  /*! Show the context menu with the given choices and return the index of the selected item,
+    or -1 if cancelled.
    */
+  static int Show(const CContextButtons& choices);
+
+  /*! Legacy method that returns the context menu id, or -1 on cancel */
   static int ShowAndGetChoice(const CContextButtons &choices);
 
 protected:

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogFavourites.cpp Changed

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogMediaFilter.cpp Changed

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogMediaSource.cpp Changed

@@ -253,6 +253,20 @@
     share1.m_ignore = true;
     extraShares.push_back(share1);
 
+    // add the recordings dir as needed
+    if (CPVRDirectory::HasRadioRecordings())
+    {
+      share1.strPath = PVR::CPVRRecordingsPath::PATH_ACTIVE_RADIO_RECORDINGS;
+      share1.strName = g_localizeStrings.Get(19017); // Recordings
+      extraShares.push_back(share1);
+    }
+    if (CPVRDirectory::HasDeletedRadioRecordings())
+    {
+      share1.strPath = PVR::CPVRRecordingsPath::PATH_DELETED_RADIO_RECORDINGS;
+      share1.strName = g_localizeStrings.Get(19184); // Deleted recordings
+      extraShares.push_back(share1);
+    }
+
     if (CSettings::GetInstance().GetString(CSettings::SETTING_AUDIOCDS_RECORDINGPATH) != "")
     {
       share1.strPath = "special://recordings/";
@@ -282,16 +296,16 @@
     extraShares.push_back(share1);
 
     // add the recordings dir as needed
-    if (CPVRDirectory::HasRecordings())
+    if (CPVRDirectory::HasTVRecordings())
     {
-      share1.strPath = PVR::CPVRRecordingsPath::PATH_ACTIVE_RECORDINGS;
-      share1.strName = g_localizeStrings.Get(19017); // TV Recordings
+      share1.strPath = PVR::CPVRRecordingsPath::PATH_ACTIVE_TV_RECORDINGS;
+      share1.strName = g_localizeStrings.Get(19017); // Recordings
       extraShares.push_back(share1);
     }
-    if (CPVRDirectory::HasDeletedRecordings())
+    if (CPVRDirectory::HasDeletedTVRecordings())
     {
-      share1.strPath = PVR::CPVRRecordingsPath::PATH_DELETED_RECORDINGS;
-      share1.strName = g_localizeStrings.Get(19108); // Deleted TV Recordings
+      share1.strPath = PVR::CPVRRecordingsPath::PATH_DELETED_TV_RECORDINGS;
+      share1.strName = g_localizeStrings.Get(19184); // Deleted recordings
       extraShares.push_back(share1);
     }
   }

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp Changed

@@ -24,6 +24,7 @@
 
 #include "FileItem.h"
 #include "filesystem/File.h"
+#include "GUIDialogContextMenu.h"
 #include "GUIDialogSmartPlaylistRule.h"
 #include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindowManager.h"
@@ -128,6 +129,8 @@
         OnGroupBy();
       else if (iControl == CONTROL_GROUP_MIXED)
         OnGroupMixed();
+      else if (iControl == CONTROL_RULE_LIST && (iAction == ACTION_CONTEXT_MENU || iAction == ACTION_MOUSE_RIGHT_CLICK))
+        OnPopupMenu(GetSelectedItem());
       else
         return CGUIDialog::OnMessage(message);
       return true;
@@ -183,6 +186,27 @@
   return CGUIDialog::OnMessage(message);
 }
 
+void CGUIDialogSmartPlaylistEditor::OnPopupMenu(int item)
+{
+  if (item < 0 || item >= m_ruleLabels->Size())
+    return;
+  if (m_playlist.m_ruleCombination.m_rules.size() == 1 && m_playlist.m_ruleCombination.m_rules[0]->m_field == FieldNone)
+    return;
+  // highlight the item
+  m_ruleLabels->Get(item)->Select(true);
+
+  CContextButtons choices;
+  choices.Add(1, 15015);
+
+  int button = CGUIDialogContextMenu::ShowAndGetChoice(choices);
+
+  // unhighlight the item
+  m_ruleLabels->Get(item)->Select(false);
+
+  if (button == 1)
+    OnRuleRemove(item);
+}
+
 void CGUIDialogSmartPlaylistEditor::OnRuleList(int item)
 {
   if (item < 0 || item >= (int)m_playlist.m_ruleCombination.m_rules.size()) return;

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogSmartPlaylistEditor.h Changed

_service:download_url:master.tar.gz/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp Changed

_service:download_url:master.tar.gz/xbmc/epg/Epg.cpp Changed

@@ -28,6 +28,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "pvr/addons/PVRClients.h"
 #include "pvr/PVRManager.h"
+#include "pvr/timers/PVRTimers.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
@@ -320,6 +321,7 @@
     newTag->Update(tag);
     newTag->SetPVRChannel(m_pvrChannel);
     newTag->SetEpg(this);
+    newTag->SetTimer(g_PVRTimers->GetTimerForEpgTag(newTag));
   }
 }
 
@@ -332,17 +334,20 @@
   return UpdateEntry(tag, false, bUpdateDatabase);
 }
 
-bool CEpg::UpdateEntry(const CEpgInfoTagPtr &tag, bool bNotifyObeservers, bool bUpdateDatabase /* = false */)
+bool CEpg::UpdateEntry(const CEpgInfoTagPtr &tag, bool bNotifyObservers, bool bUpdateDatabase /* = false */)
 {
   CSingleLock lock(m_critSection);
   auto it = m_tags.find(tag->StartAsUTC());
   EPG_EVENT_STATE state = (it == m_tags.end()) ? EPG_EVENT_CREATED : EPG_EVENT_UPDATED;
 
-  if (UpdateEntry(tag, state, it, bUpdateDatabase) && bNotifyObeservers)
+  if (UpdateEntry(tag, state, it, bUpdateDatabase))
   {
-    SetChanged();
-    lock.Leave();
-    NotifyObservers(ObservableMessageEpg);
+    if (bNotifyObservers)
+    {
+      SetChanged();
+      lock.Leave();
+      NotifyObservers(ObservableMessageEpg);
+    }
     return true;
   }
   return false;
@@ -430,6 +435,7 @@
   infoTag->Update(*tag, bNewTag);
   infoTag->SetEpg(this);
   infoTag->SetPVRChannel(m_pvrChannel);
+  infoTag->SetTimer(g_PVRTimers->GetTimerForEpgTag(infoTag));
 
   if (bUpdateDatabase)
     m_changedTags.insert(std::make_pair(infoTag->UniqueBroadcastID(), infoTag));

_service:download_url:master.tar.gz/xbmc/epg/EpgInfoTag.cpp Changed

_service:download_url:master.tar.gz/xbmc/epg/EpgInfoTag.h Changed

_service:download_url:master.tar.gz/xbmc/epg/GUIEPGGridContainer.cpp Changed

@@ -1553,7 +1553,7 @@
   return label;
 }
 
-GridItemsPtr *CGUIEPGGridContainer::GetClosestItem(const int &channel)
+GridItemsPtr *CGUIEPGGridContainer::GetClosestItem(int channel)
 {
   GridItemsPtr *closest = GetItem(channel);
 
@@ -1595,7 +1595,7 @@
   return MathUtils::round_int(item->width / m_blockSize);
 }
 
-int CGUIEPGGridContainer::GetBlock(const CGUIListItemPtr &item, const int &channel)
+int CGUIEPGGridContainer::GetBlock(const CGUIListItemPtr &item, int channel)
 {
   if (!item)
     return 0;
@@ -1603,7 +1603,7 @@
   return GetRealBlock(item, channel) - m_blockOffset;
 }
 
-int CGUIEPGGridContainer::GetRealBlock(const CGUIListItemPtr &item, const int &channel)
+int CGUIEPGGridContainer::GetRealBlock(const CGUIListItemPtr &item, int channel)
 {
   int channelIndex = channel + m_channelOffset;
   int block = 0;
@@ -1614,7 +1614,7 @@
   return block;
 }
 
-GridItemsPtr *CGUIEPGGridContainer::GetNextItem(const int &channel)
+GridItemsPtr *CGUIEPGGridContainer::GetNextItem(int channel)
 {
   int channelIndex = channel + m_channelOffset;
   int blockIndex = m_blockCursor + m_blockOffset;
@@ -1629,7 +1629,7 @@
   return &m_gridIndex[channelIndex][i + m_blockOffset];
 }
 
-GridItemsPtr *CGUIEPGGridContainer::GetPrevItem(const int &channel)
+GridItemsPtr *CGUIEPGGridContainer::GetPrevItem(int channel)
 {
   int channelIndex = channel + m_channelOffset;
   int blockIndex = m_blockCursor + m_blockOffset;
@@ -1644,7 +1644,7 @@
   return &m_gridIndex[channelIndex][i + m_blockOffset];
 }
 
-GridItemsPtr *CGUIEPGGridContainer::GetItem(const int &channel)
+GridItemsPtr *CGUIEPGGridContainer::GetItem(int channel)
 {
   int channelIndex = channel + m_channelOffset;
   int blockIndex = m_blockCursor + m_blockOffset;
@@ -2048,12 +2048,12 @@
 void CGUIEPGGridContainer::FreeItemsMemory()
 {
   // free memory of items
-  for (std::vector<CFileItemPtr>::iterator it = m_channelItems.begin(); it != m_channelItems.end(); ++it)
-    (*it)->FreeMemory();
-  for (std::vector<CFileItemPtr>::iterator it = m_rulerItems.begin(); it != m_rulerItems.end(); ++it)
-    (*it)->FreeMemory();
-  for (std::vector<CFileItemPtr>::iterator it = m_programmeItems.begin(); it != m_programmeItems.end(); ++it)
-    (*it)->FreeMemory();
+  for (const auto &i : m_channelItems)
+    i->FreeMemory();
+  for (const auto &i : m_rulerItems)
+    i->FreeMemory();
+  for (const auto &i : m_programmeItems)
+    i->FreeMemory();
 }
 
 void CGUIEPGGridContainer::FreeChannelMemory(int keepStart, int keepEnd)

_service:download_url:master.tar.gz/xbmc/epg/GUIEPGGridContainer.h Changed

@@ -27,7 +27,6 @@
 
 namespace EPG
 {
-  #define MAXCHANNELS 20
   #define MAXBLOCKS   (33 * 24 * 60 / 5) //! 33 days of 5 minute blocks (31 days for upcoming data + 1 day for past data + 1 day for fillers)
 
   struct GridItemsPtr
@@ -106,14 +105,14 @@
     void Reset();
     void ClearGridIndex(void);
 
-    GridItemsPtr *GetItem(const int &channel);
-    GridItemsPtr *GetNextItem(const int &channel);
-    GridItemsPtr *GetPrevItem(const int &channel);
-    GridItemsPtr *GetClosestItem(const int &channel);
+    GridItemsPtr *GetItem(int channel);
+    GridItemsPtr *GetNextItem(int channel);
+    GridItemsPtr *GetPrevItem(int channel);
+    GridItemsPtr *GetClosestItem(int channel);
 
     int GetItemSize(GridItemsPtr *item);
-    int GetBlock(const CGUIListItemPtr &item, const int &channel);
-    int GetRealBlock(const CGUIListItemPtr &item, const int &channel);
+    int GetBlock(const CGUIListItemPtr &item, int channel);
+    int GetRealBlock(const CGUIListItemPtr &item, int channel);
     void MoveToRow(int row);
 
     CGUIListItemLayout *GetFocusedLayout() const;

_service:download_url:master.tar.gz/xbmc/events/windows/GUIViewStateEventLog.cpp Changed

_service:download_url:master.tar.gz/xbmc/events/windows/GUIViewStateEventLog.h Changed

_service:download_url:master.tar.gz/xbmc/events/windows/GUIWindowEventLog.cpp Changed

@@ -48,17 +48,6 @@
 {
   switch (message.GetMessage())
   {
-  case GUI_MSG_WINDOW_INIT:
-  {
-    m_rootDir.AllowNonLocalSources(false);
-
-    // is this the first time the window is opened?
-    if (m_vecItems->GetPath() == "?" && message.GetStringParam().empty())
-      m_vecItems->SetPath("");
-
-    break;
-  }
-
   case GUI_MSG_CLICKED:
   {
     int iControl = message.GetSenderId();
@@ -168,10 +157,7 @@
   if (eventPtr == nullptr)
     return;
 
-  buttons.Add(CONTEXT_BUTTON_INFO, g_localizeStrings.Get(19033));
   buttons.Add(CONTEXT_BUTTON_DELETE, g_localizeStrings.Get(1210));
-  if (eventPtr->CanExecute())
-    buttons.Add(CONTEXT_BUTTON_ACTIVATE, eventPtr->GetExecutionLabel());
 }
 
 bool CGUIWindowEventLog::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
@@ -185,15 +171,9 @@
 
   switch (button)
   {
-  case CONTEXT_BUTTON_INFO:
-    return OnSelect(item);
-
   case CONTEXT_BUTTON_DELETE:
     return OnDelete(item);
 
-  case CONTEXT_BUTTON_ACTIVATE:
-    return OnExecute(item);
-
   default:
     break;
   }
@@ -250,17 +230,6 @@
   return result;
 }
 
-std::string CGUIWindowEventLog::GetStartFolder(const std::string &dir)
-{
-  if (dir.empty())
-    return "events://";
-
-  if (URIUtils::PathStarts(dir, "events://"))
-    return dir;
-
-  return CGUIMediaWindow::GetStartFolder(dir);
-}
-
 bool CGUIWindowEventLog::OnSelect(CFileItemPtr item)
 {
   if (item == nullptr)

_service:download_url:master.tar.gz/xbmc/events/windows/GUIWindowEventLog.h Changed

_service:download_url:master.tar.gz/xbmc/filesystem/AddonsDirectory.cpp Changed

@@ -24,6 +24,7 @@
 #include <set>
 #include "AddonsDirectory.h"
 #include "addons/AddonDatabase.h"
+#include "addons/AddonSystemSettings.h"
 #include "interfaces/generic/ScriptInvocationManager.h"
 #include "FileItem.h"
 #include "addons/AddonInstaller.h"
@@ -32,6 +33,7 @@
 #include "dialogs/GUIDialogOK.h"
 #include "guilib/TextureManager.h"
 #include "File.h"
+#include "settings/Settings.h"
 #include "SpecialProtocol.h"
 #include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
@@ -48,6 +50,7 @@
 
 const auto CATEGORY_INFO_PROVIDERS = "category.infoproviders";
 const auto CATEGORY_LOOK_AND_FEEL = "category.lookandfeel";
+const auto CATEGORY_GAME_ADDONS = "category.gameaddons";
 
 const std::set<TYPE> dependencyTypes = {
     ADDON_SCRAPER_LIBRARY,
@@ -72,6 +75,10 @@
   ADDON_VIZ,
 };
 
+const std::set<TYPE> gameTypes = {
+  ADDON_GAME_CONTROLLER,
+};
+
 static bool IsInfoProviderType(TYPE type)
 {
   return infoProviderTypes.find(type) != infoProviderTypes.end();
@@ -92,6 +99,16 @@
   return IsLookAndFeelType(addon->Type());
 }
 
+static bool IsGameType(TYPE type)
+{
+  return gameTypes.find(type) != gameTypes.end();
+}
+
+static bool IsGameAddon(const AddonPtr& addon)
+{
+  return IsGameType(addon->Type());
+}
+
 static bool IsDependecyType(TYPE type)
 {
   return dependencyTypes.find(type) != dependencyTypes.end();
@@ -168,6 +185,16 @@
       item->SetArt("thumb", thumb);
     items.Add(item);
   }
+  if (std::any_of(addons.begin(), addons.end(), IsGameAddon))
+  {
+    CFileItemPtr item(new CFileItem(g_localizeStrings.Get(35049))); // Game add-ons
+    item->SetPath(URIUtils::AddFileToFolder(path.Get(), CATEGORY_GAME_ADDONS));
+    item->m_bIsFolder = true;
+    const std::string thumb = "DefaultGameAddons.png";
+    if (g_TextureManager.HasTexture(thumb))
+      item->SetArt("thumb", thumb);
+    items.Add(item);
+  }
 
   std::set<TYPE> uncategorized;
   for (unsigned int i = ADDON_UNKNOWN + 1; i < ADDON_MAX - 1; ++i)
@@ -196,6 +223,12 @@
     items.SetLabel(g_localizeStrings.Get(24997));
     GenerateTypeListing(path, lookAndFeelTypes, addons, items);
   }
+  else if (category == CATEGORY_GAME_ADDONS)
+  {
+    items.SetProperty("addoncategory", g_localizeStrings.Get(35049)); // Game add-ons
+    items.SetLabel(g_localizeStrings.Get(35049)); // Game add-ons
+    GenerateTypeListing(path, gameTypes, addons, items);
+  }
   else
   { // fallback to addon type
     TYPE type = TranslateType(category);
@@ -356,6 +389,22 @@
   return true;
 }
 
+static bool GetRecentlyUpdatedAddons(VECADDONS& addons)
+{
+  if (!CAddonMgr::GetInstance().GetInstalledAddons(addons))
+    return false;
+
+  auto limit = CDateTime::GetCurrentDateTime() - CDateTimeSpan(14, 0, 0, 0);
+  auto isOld = [limit](const AddonPtr& addon){ return addon->LastUpdated() < limit; };
+  addons.erase(std::remove_if(addons.begin(), addons.end(), isOld), addons.end());
+  return true;
+}
+
+static bool HasRecentlyUpdatedAddons()
+{
+  VECADDONS addons;
+  return GetRecentlyUpdatedAddons(addons) && !addons.empty();
+}
 
 static bool Repos(const CURL& path, CFileItemList &items)
 {
@@ -380,16 +429,75 @@
   return true;
 }
 
+static void RootDirectory(CFileItemList& items)
+{
+  items.SetLabel(g_localizeStrings.Get(24033));
+  {
+    CFileItemPtr item(new CFileItem("addons://user/", true));
+    item->SetLabel(g_localizeStrings.Get(24998));
+    item->SetIconImage("DefaultAddonsInstalled.png");
+    items.Add(item);
+  }
+  if (CAddonMgr::GetInstance().HasAvailableUpdates())
+  {
+    CFileItemPtr item(new CFileItem("addons://outdated/", true));
+    item->SetLabel(g_localizeStrings.Get(24043));
+    item->SetIconImage("DefaultAddonsUpdates.png");
+    items.Add(item);
+  }
+  if (CAddonInstaller::GetInstance().IsDownloading())
+  {
+    CFileItemPtr item(new CFileItem("addons://downloading/", true));
+    item->SetLabel(g_localizeStrings.Get(24067));
+    item->SetIconImage("DefaultNetwork.png");
+    items.Add(item);
+  }
+  if (CSettings::GetInstance().GetInt(CSettings::SETTING_ADDONS_AUTOUPDATES) == ADDON::AUTO_UPDATES_ON
+      && HasRecentlyUpdatedAddons())
+  {
+    CFileItemPtr item(new CFileItem("addons://recently_updated/", true));
+    item->SetLabel(g_localizeStrings.Get(24004));
+    item->SetIconImage("DefaultAddonsRecentlyUpdated.png");
+    items.Add(item);
+  }
+  if (CAddonMgr::GetInstance().HasAddons(ADDON_REPOSITORY))
+  {
+    CFileItemPtr item(new CFileItem("addons://repos/", true));
+    item->SetLabel(g_localizeStrings.Get(24033));
+    item->SetIconImage("DefaultAddonsRepo.png");
+    items.Add(item);
+  }
+  {
+    CFileItemPtr item(new CFileItem("addons://install/", false));
+    item->SetLabel(g_localizeStrings.Get(24041));
+    item->SetIconImage("DefaultAddonsZip.png");
+    items.Add(item);
+  }
+  {
+    CFileItemPtr item(new CFileItem("addons://search/", true));
+    item->SetLabel(g_localizeStrings.Get(137));
+    item->SetIconImage("DefaultAddonsSearch.png");
+    items.Add(item);
+  }
+}
+
 bool CAddonsDirectory::GetDirectory(const CURL& url, CFileItemList &items)
 {
   std::string tmp(url.Get());
   URIUtils::RemoveSlashAtEnd(tmp);
   CURL path(tmp);
   const std::string endpoint = path.GetHostName();
+  items.ClearItems();
   items.ClearProperties();
+  items.SetCacheToDisc(CFileItemList::CACHE_NEVER);
   items.SetPath(path.Get());
 
-  if (endpoint == "user")
+  if (endpoint.empty())
+  {
+    RootDirectory(items);
+    return true;
+  }
+  else if (endpoint == "user")
   {
     UserInstalledAddons(path, items);
     return true;
@@ -441,6 +549,26 @@
   {
     return GetSearchResults(path, items);
   }
+  else if (endpoint == "recently_updated")
+  {
+    VECADDONS addons;
+    if (!GetRecentlyUpdatedAddons(addons))
+      return false;
+
+    std::sort(addons.begin(), addons.end(),
+        [](const AddonPtr& a, const AddonPtr& b){ return a->LastUpdated() > b->LastUpdated(); });
+
+    CAddonsDirectory::GenerateAddonListing(path, addons, items, g_localizeStrings.Get(24004));
+    return true;
+
+  }
+  else if (endpoint == "downloading")
+  {
+    VECADDONS addons;
+    CAddonInstaller::GetInstance().GetInstallList(addons);
+    CAddonsDirectory::GenerateAddonListing(path, addons, items, g_localizeStrings.Get(24067));
+    return true;
+  }
   else if (endpoint == "more")
   {
     std::string type = path.GetFileName();

_service:download_url:master.tar.gz/xbmc/filesystem/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/filesystem/CurlFile.cpp Changed

@@ -406,6 +406,8 @@
 
 CCurlFile::CCurlFile()
  : m_writeOffset(0)
+ , m_proxytype(PROXY_HTTP)
+ , m_proxyport(3128)
  , m_overflowBuffer(NULL)
  , m_overflowSize(0)
 {
@@ -428,7 +430,6 @@
   m_password = "";
   m_httpauth = "";
   m_cipherlist = "";
-  m_proxytype = PROXY_HTTP;
   m_state = new CReadState();
   m_oldState = NULL;
   m_skipshout = false;
@@ -607,13 +608,18 @@
   if (g_advancedSettings.m_curlDisableIPV6)
     g_curlInterface.easy_setopt(h, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
 
-  if (m_proxy.length() > 0)
+  if (!m_proxyhost.empty())
   {
-    g_curlInterface.easy_setopt(h, CURLOPT_PROXY, m_proxy.c_str());
     g_curlInterface.easy_setopt(h, CURLOPT_PROXYTYPE, proxyType2CUrlProxyType[m_proxytype]);
-    if (m_proxyuserpass.length() > 0)
-      g_curlInterface.easy_setopt(h, CURLOPT_PROXYUSERPWD, m_proxyuserpass.c_str());
 
+    const std::string hostport = m_proxyhost +
+      StringUtils::Format(":%d", m_proxyport);
+    g_curlInterface.easy_setopt(h, CURLOPT_PROXY, hostport.c_str());
+
+    const std::string userpass =
+      m_proxyuser + std::string(":") + m_proxypassword;
+    if (!userpass.empty())
+      g_curlInterface.easy_setopt(h, CURLOPT_PROXYUSERPWD, userpass.c_str());
   }
   if (m_customrequest.length() > 0)
     g_curlInterface.easy_setopt(h, CURLOPT_CUSTOMREQUEST, m_customrequest.c_str());
@@ -754,20 +760,19 @@
   else if( url2.IsProtocol("http")
        ||  url2.IsProtocol("https"))
   {
-    if (CSettings::GetInstance().GetBool(CSettings::SETTING_NETWORK_USEHTTPPROXY)
-        && !CSettings::GetInstance().GetString(CSettings::SETTING_NETWORK_HTTPPROXYSERVER).empty()
-        && CSettings::GetInstance().GetInt(CSettings::SETTING_NETWORK_HTTPPROXYPORT) > 0
-        && m_proxy.empty())
+    const CSettings &s = CSettings::GetInstance();
+    if (m_proxyhost.empty()
+        && s.GetBool(CSettings::SETTING_NETWORK_USEHTTPPROXY)
+        && !s.GetString(CSettings::SETTING_NETWORK_HTTPPROXYSERVER).empty()
+        && s.GetInt(CSettings::SETTING_NETWORK_HTTPPROXYPORT) > 0)
     {
-      m_proxy = CSettings::GetInstance().GetString(CSettings::SETTING_NETWORK_HTTPPROXYSERVER);
-      m_proxy += StringUtils::Format(":%d", CSettings::GetInstance().GetInt(CSettings::SETTING_NETWORK_HTTPPROXYPORT));
-      if (CSettings::GetInstance().GetString(CSettings::SETTING_NETWORK_HTTPPROXYUSERNAME).length() > 0 && m_proxyuserpass.empty())
-      {
-        m_proxyuserpass = CSettings::GetInstance().GetString(CSettings::SETTING_NETWORK_HTTPPROXYUSERNAME);
-        m_proxyuserpass += ":" + CSettings::GetInstance().GetString(CSettings::SETTING_NETWORK_HTTPPROXYPASSWORD);
-      }
-      m_proxytype = (ProxyType)CSettings::GetInstance().GetInt(CSettings::SETTING_NETWORK_HTTPPROXYTYPE);
-      CLog::Log(LOGDEBUG, "Using proxy %s, type %d", m_proxy.c_str(), proxyType2CUrlProxyType[m_proxytype]);
+      m_proxytype = (ProxyType)s.GetInt(CSettings::SETTING_NETWORK_HTTPPROXYTYPE);
+      m_proxyhost = s.GetString(CSettings::SETTING_NETWORK_HTTPPROXYSERVER);
+      m_proxyport = s.GetInt(CSettings::SETTING_NETWORK_HTTPPROXYPORT);
+      m_proxyuser = s.GetString(CSettings::SETTING_NETWORK_HTTPPROXYUSERNAME);
+      m_proxypassword = s.GetString(CSettings::SETTING_NETWORK_HTTPPROXYPASSWORD);
+      CLog::Log(LOGDEBUG, "Using proxy %s, type %d", m_proxyhost.c_str(),
+                proxyType2CUrlProxyType[m_proxytype]);
     }
 
     // get username and password
@@ -806,8 +811,6 @@
           m_seekable = false;
         else if (name == "accept-charset")
           SetAcceptCharset(value);
-        else if (name == "httpproxy")
-          SetStreamProxy(value, PROXY_HTTP);
         else if (name == "sslcipherlist")
           m_cipherlist = value;
         else if (name == "connection-timeout")
@@ -827,17 +830,6 @@
     m_url = url2.Get();
 }
 
-void CCurlFile::SetStreamProxy(const std::string &proxy, ProxyType type)
-{
-  CURL url(proxy);
-  m_proxy = url.GetWithoutUserDetails();
-  m_proxyuserpass = url.GetUserName();
-  if (!url.GetPassWord().empty())
-    m_proxyuserpass += ":" + url.GetPassWord();
-  m_proxytype = type;
-  CLog::Log(LOGDEBUG, "Overriding proxy from URL parameter: %s, type %d", m_proxy.c_str(), proxyType2CUrlProxyType[m_proxytype]);
-}
-
 bool CCurlFile::Post(const std::string& strURL, const std::string& strPostData, std::string& strHTML)
 {
   m_postdata = strPostData;
@@ -938,6 +930,28 @@
   m_state->m_cancelled = false;
 }
 
+void CCurlFile::SetProxy(const std::string &type, const std::string &host,
+  uint16_t port, const std::string &user, const std::string &password)
+{
+  m_proxytype = CCurlFile::PROXY_HTTP;
+  if (type == "http")
+    m_proxytype = CCurlFile::PROXY_HTTP;
+  else if (type == "socks4")
+    m_proxytype = CCurlFile::PROXY_SOCKS4;
+  else if (type == "socks4a")
+    m_proxytype = CCurlFile::PROXY_SOCKS4A;
+  else if (type == "socks5")
+    m_proxytype = CCurlFile::PROXY_SOCKS5;
+  else if (type == "socks5-remote")
+    m_proxytype = CCurlFile::PROXY_SOCKS5_REMOTE;
+  else
+    CLog::Log(LOGERROR, "Invalid proxy type \"%s\"", type.c_str());
+  m_proxyhost = host;
+  m_proxyport = port;
+  m_proxyuser = user;
+  m_proxypassword = password;
+}
+
 bool CCurlFile::Open(const CURL& url)
 {
   if (!g_curlInterface.IsLoaded())

_service:download_url:master.tar.gz/xbmc/filesystem/CurlFile.h Changed

@@ -36,7 +36,7 @@
 {
   class CCurlFile : public IFile
   {
-    public:
+    private:
       typedef enum
       {
         PROXY_HTTP = 0,
@@ -46,6 +46,7 @@
         PROXY_SOCKS5_REMOTE,
       } ProxyType;
     
+    public:
       CCurlFile();
       virtual ~CCurlFile();
       virtual bool Open(const CURL& url);
@@ -73,10 +74,8 @@
       void Cancel();
       void Reset();
       void SetUserAgent(const std::string& sUserAgent)           { m_userAgent = sUserAgent; }
-      void SetProxy(const std::string &proxy)                    { m_proxy = proxy; }
-      void SetProxyUserPass(const std::string &proxyuserpass)    { m_proxyuserpass = proxyuserpass; }
-      void SetProxyType(ProxyType proxytype)                     { m_proxytype = proxytype; }
-      void SetStreamProxy(const std::string &proxy, ProxyType type);
+      void SetProxy(const std::string &type, const std::string &host, uint16_t port,
+                    const std::string &user, const std::string &password);
       void SetCustomRequest(const std::string &request)          { m_customrequest = request; }
       void UseOldHttpVersion(bool bUse)                          { m_useOldHttpVersion = bUse; }
       void SetAcceptEncoding(const std::string& encoding)        { m_acceptencoding = encoding; }
@@ -165,9 +164,11 @@
 
       std::string     m_url;
       std::string     m_userAgent;
-      std::string     m_proxy;
-      std::string     m_proxyuserpass;
       ProxyType       m_proxytype;
+      std::string     m_proxyhost;
+      uint16_t        m_proxyport;
+      std::string     m_proxyuser;
+      std::string     m_proxypassword;
       std::string     m_customrequest;
       std::string     m_acceptencoding;
       std::string     m_acceptCharset;

_service:download_url:master.tar.gz/xbmc/filesystem/FileDirectoryFactory.cpp Changed

_service:download_url:master.tar.gz/xbmc/filesystem/FileFactory.cpp Changed

_service:download_url:master.tar.gz/xbmc/filesystem/ILiveTV.h Deleted

@@ -1,51 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-class CFileItem;
-
-namespace XFILE
-{
-class ILiveTVInterface
-{
-public:
-  virtual ~ILiveTVInterface() {}
-  virtual bool           NextChannel(bool preview = false) = 0;
-  virtual bool           PrevChannel(bool preview = false) = 0;
-  virtual bool           SelectChannelById(unsigned int channelid) = 0;
-
-  virtual int            GetTotalTime() = 0;
-  virtual int            GetStartTime() = 0;
-
-  virtual bool           UpdateItem(CFileItem& item)=0;
-};
-
-class IRecordable
-{
-public:
-  virtual ~IRecordable() {}
-
-  virtual bool CanRecord() = 0;
-  virtual bool IsRecording() = 0;
-  virtual bool Record(bool bOnOff) = 0;
-};
-
-}
-

_service:download_url:master.tar.gz/xbmc/filesystem/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/filesystem/MusicDatabaseDirectory.cpp Changed

_service:download_url:master.tar.gz/xbmc/filesystem/MusicDatabaseDirectory.h Changed

_service:download_url:master.tar.gz/xbmc/filesystem/PVRDirectory.cpp Changed

_service:download_url:master.tar.gz/xbmc/filesystem/PVRDirectory.h Changed

_service:download_url:master.tar.gz/xbmc/filesystem/PVRFile.cpp Deleted

@@ -1,330 +0,0 @@
-/*
- *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "PVRFile.h"
-#include "cores/VideoPlayer/DVDInputStreams/DVDInputStream.h"
-#include "pvr/PVRManager.h"
-#include "pvr/channels/PVRChannelGroupsContainer.h"
-#include "pvr/recordings/PVRRecordings.h"
-#include "pvr/recordings/PVRRecordingsPath.h"
-#include "pvr/addons/PVRClients.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "URL.h"
-
-using namespace XFILE;
-using namespace PVR;
-
-CPVRFile::CPVRFile()
-{
-  m_isPlayRecording = false;
-}
-
-CPVRFile::~CPVRFile()
-{
-}
-
-bool CPVRFile::Open(const CURL& url)
-{
-  Close();
-
-  if (!g_PVRManager.IsStarted())
-    return false;
-
-  std::string strURL = url.Get();
-
-  if (StringUtils::StartsWith(strURL, "pvr://channels/tv/") ||
-      StringUtils::StartsWith(strURL, "pvr://channels/radio/"))
-  {
-    CFileItemPtr tag = g_PVRChannelGroups->GetByPath(strURL);
-    if (tag && tag->HasPVRChannelInfoTag())
-    {
-      if (!g_PVRManager.OpenLiveStream(*tag))
-        return false;
-
-      m_isPlayRecording = false;
-      CLog::Log(LOGDEBUG, "PVRFile - %s - playback has started on filename %s", __FUNCTION__, strURL.c_str());
-    }
-    else
-    {
-      CLog::Log(LOGERROR, "PVRFile - %s - channel not found with filename %s", __FUNCTION__, strURL.c_str());
-      return false;
-    }
-  }
-  else if (CPVRRecordingsPath(strURL).IsActive())
-  {
-    CFileItemPtr tag = g_PVRRecordings->GetByPath(strURL);
-    if (tag && tag->HasPVRRecordingInfoTag())
-    {
-      if (!g_PVRManager.OpenRecordedStream(tag->GetPVRRecordingInfoTag()))
-        return false;
-
-      m_isPlayRecording = true;
-      CLog::Log(LOGDEBUG, "%s - playback has started on recording %s (%s)", __FUNCTION__, strURL.c_str(), tag->GetPVRRecordingInfoTag()->m_strIconPath.c_str());
-    }
-    else
-    {
-      CLog::Log(LOGERROR, "PVRFile - Recording not found with filename %s", strURL.c_str());
-      return false;
-    }
-  }
-  else if (CPVRRecordingsPath(strURL).IsDeleted())
-  {
-    CLog::Log(LOGNOTICE, "PVRFile - Playback of deleted recordings is not possible (%s)", strURL.c_str());
-    return false;
-  }
-  else
-  {
-    CLog::Log(LOGERROR, "%s - invalid path specified %s", __FUNCTION__, strURL.c_str());
-    return false;
-  }
-
-  return true;
-}
-
-void CPVRFile::Close()
-{
-  g_PVRManager.CloseStream();
-}
-
-ssize_t CPVRFile::Read(void* buffer, size_t size)
-{
-  if (size > SSIZE_MAX)
-    size = SSIZE_MAX;
-
-  if (!g_PVRManager.IsStarted())
-    return -1;
-
-  // TODO: Fix overflow in case of sizeof(int) != sizeof(size_t)
-  const int ret = g_PVRClients->ReadStream((BYTE*)buffer, size);
-  if (ret < 0)
-    return -1;
-
-  return ret;
-}
-
-int64_t CPVRFile::GetLength()
-{
-  return g_PVRManager.IsStarted() ? g_PVRClients->GetStreamLength() : 0;
-}
-
-int64_t CPVRFile::Seek(int64_t pos, int whence)
-{
-  return g_PVRManager.IsStarted() ? g_PVRClients->SeekStream(pos, whence) : 0;
-}
-
-int64_t CPVRFile::GetPosition()
-{
-  return g_PVRManager.IsStarted() ? g_PVRClients->GetStreamPosition() : 0;
-}
-
-int CPVRFile::GetTotalTime()
-{
-  // for recordings leave this to demuxer
-  return m_isPlayRecording ? 0 : g_PVRManager.GetTotalTime();
-}
-
-int CPVRFile::GetStartTime()
-{
-  return g_PVRManager.GetStartTime();
-}
-
-bool CPVRFile::NextChannel(bool preview/* = false*/)
-{
-  unsigned int newchannel;
-
-  if (m_isPlayRecording)
-  {
-    /* We are inside a recording, skip channelswitch */
-    return true;
-  }
-
-  /* Do channel switch and save new channel number, it is not always
-   * increased by one in a case if next channel is encrypted or we
-   * on the beginning or end of the channel list!
-   */
-  if (g_PVRManager.ChannelUp(&newchannel, preview))
-  {
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-bool CPVRFile::PrevChannel(bool preview/* = false*/)
-{
-  unsigned int newchannel;
-
-  if (m_isPlayRecording)
-  {
-    /* We are inside a recording, skip channelswitch */
-    return true;
-  }
-
-  /* Do channel switch and save new channel number, it is not always
-   * increased by one in a case if next channel is encrypted or we
-   * on the beginning or end of the channel list!
-   */
-  if (g_PVRManager.ChannelDown(&newchannel, preview))
-  {
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-bool CPVRFile::SelectChannelById(unsigned int channelid)
-{
-  if (m_isPlayRecording)
-  {
-    /* We are inside a recording, skip channelswitch */
-    /** TODO:
-     ** Add support for cutting keys (functions becomes the numeric keys as integer)
-     **/
-    return true;
-  }
-
-  if (g_PVRManager.ChannelSwitchById(channelid))
-  {
-    return true;
-  }
-  else
-  {
-    return false;
-  }
-}
-
-bool CPVRFile::UpdateItem(CFileItem& item)
-{
-  return g_PVRManager.UpdateItem(item);
-}
-
-std::string CPVRFile::TranslatePVRFilename(const std::string& pathFile)
-{
-  if (!g_PVRManager.IsStarted())
-    return "";
-
-  std::string FileName = pathFile;
-  if (FileName.substr(0, 14) == "pvr://channels")
-  {
-    CFileItemPtr channel = g_PVRChannelGroups->GetByPath(FileName);
-    if (channel && channel->HasPVRChannelInfoTag())
-    {
-      std::string stream = channel->GetPVRChannelInfoTag()->StreamURL();
-      if(!stream.empty())
-      {
-        if (stream.compare(6, 7, "stream/") == 0)
-        {
-          // pvr://stream
-          // This function was added to retrieve the stream URL for this item
-          // Is is used for the MediaPortal (ffmpeg) PVR addon
-          // see PVRManager.cpp
-          return g_PVRClients->GetStreamURL(channel->GetPVRChannelInfoTag());
-        }
-        else
-        {
-          return stream;
-        }
-      }
-    }
-  }
-  return FileName;
-}
-
-bool CPVRFile::CanRecord()
-{
-  if (m_isPlayRecording || !g_PVRManager.IsStarted())
-    return false;
-
-  return g_PVRClients->CanRecordInstantly();
-}
-
-bool CPVRFile::IsRecording()
-{
-  return g_PVRManager.IsStarted() && g_PVRClients->IsRecordingOnPlayingChannel();
-}
-
-bool CPVRFile::Record(bool bOnOff)
-{
-  return g_PVRManager.StartRecordingOnPlayingChannel(bOnOff);
-}
-
-bool CPVRFile::Delete(const CURL& url)
-{
-  if (!g_PVRManager.IsStarted())
-    return false;
-
-  std::string path(url.GetFileName());
-  if (StringUtils::StartsWith(path, "recordings/") && path[path.size()-1] != '/')
-  {
-    std::string strURL = url.Get();
-    CFileItemPtr tag = g_PVRRecordings->GetByPath(strURL);
-    if (tag && tag->HasPVRRecordingInfoTag())
-      return tag->GetPVRRecordingInfoTag()->Delete();
-  }
-  return false;
-}
-
-bool CPVRFile::Rename(const CURL& url, const CURL& urlnew)
-{
-  if (!g_PVRManager.IsStarted())
-    return false;
-
-  std::string path(url.GetFileName());
-  std::string newname(urlnew.GetFileName());
-
-  size_t found = newname.find_last_of("/");
-  if (found != std::string::npos)
-    newname = newname.substr(found+1);
-
-  if (StringUtils::StartsWith(path, "recordings/active/") && path[path.size()-1] != '/')
-  {
-    std::string strURL = url.Get();
-    CFileItemPtr tag = g_PVRRecordings->GetByPath(strURL);
-    if (tag && tag->HasPVRRecordingInfoTag())
-      return tag->GetPVRRecordingInfoTag()->Rename(newname);
-  }
-  return false;
-}
-
-bool CPVRFile::Exists(const CURL& url)
-{
-  return g_PVRManager.IsStarted() &&
-      g_PVRRecordings->GetByPath(url.Get())->HasPVRRecordingInfoTag();
-}
-
-int CPVRFile::IoControl(EIoControl request, void *param)
-{
-  if (request == IOCTRL_SEEK_POSSIBLE)
-  {
-    if (!g_PVRManager.IsStarted())
-      return 0;
-    else if (g_PVRClients->CanSeekStream())
-      return 1;
-    else
-      return 0;
-  }
-
-  return -1;
-}

_service:download_url:master.tar.gz/xbmc/filesystem/PVRFile.h Deleted

@@ -1,78 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "IFile.h"
-#include "ILiveTV.h"
-
-
-class CPVRSession;
-
-namespace XFILE {
-
-class CPVRFile
-  : public  IFile
-  ,         ILiveTVInterface
-  ,         IRecordable
-{
-public:
-  CPVRFile();
-  virtual ~CPVRFile();
-  virtual bool          Open(const CURL& url);
-  virtual int64_t       Seek(int64_t pos, int whence=SEEK_SET);
-  virtual int64_t       GetPosition();
-  virtual int64_t       GetLength();
-  virtual int           Stat(const CURL& url, struct __stat64* buffer) { return -1; }
-  virtual void          Close();
-  virtual ssize_t       Read(void* buffer, size_t size);
-  virtual std::string   GetContent()                                   { return ""; }
-  virtual bool          SkipNext()                                     { return !m_isPlayRecording; }
-
-  virtual bool          Delete(const CURL& url);
-  virtual bool          Rename(const CURL& url, const CURL& urlnew);
-  virtual bool          Exists(const CURL& url);
-
-  virtual ILiveTVInterface* GetLiveTV() {return (ILiveTVInterface*)this;}
-
-  virtual bool           NextChannel(bool preview = false);
-  virtual bool           PrevChannel(bool preview = false);
-  virtual bool           SelectChannelById(unsigned int channelid);
-
-  virtual int            GetTotalTime();
-  virtual int            GetStartTime();
-  virtual bool           UpdateItem(CFileItem& item);
-
-  virtual IRecordable* GetRecordable() {return (IRecordable*)this;}
-
-  virtual bool           CanRecord();
-  virtual bool           IsRecording();
-  virtual bool           Record(bool bOnOff);
-
-  virtual int            IoControl(EIoControl request, void *param);
-
-  static std::string     TranslatePVRFilename(const std::string& pathFile);
-
-protected:
-  bool            m_isPlayRecording;
-};
-
-}
-
-

_service:download_url:master.tar.gz/xbmc/games Added

_service:download_url:master.tar.gz/xbmc/games/controllers Added

_service:download_url:master.tar.gz/xbmc/games/controllers/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/games/controllers/Controller.cpp Added

@@ -0,0 +1,91 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "Controller.h"
+#include "ControllerDefinitions.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/log.h"
+#include "utils/URIUtils.h"
+#include "utils/XBMCTinyXML.h"
+
+using namespace GAME;
+
+const ControllerPtr CController::EmptyPtr;
+
+std::unique_ptr<CController> CController::FromExtension(ADDON::AddonProps props, const cp_extension_t* ext)
+{
+  return std::unique_ptr<CController>(new CController(std::move(props)));
+}
+
+CController::CController(ADDON::AddonProps addonprops) :
+  CAddon(std::move(addonprops)),
+  m_bLoaded(false)
+{
+}
+
+std::string CController::Label(void)
+{
+  if (m_layout.Label() > 0)
+    return g_localizeStrings.GetAddonString(ID(), m_layout.Label());
+  return "";
+}
+
+std::string CController::ImagePath(void) const
+{
+  if (!m_layout.Image().empty())
+    return URIUtils::AddFileToFolder(URIUtils::GetDirectory(LibPath()), m_layout.Image());
+  return "";
+}
+
+std::string CController::OverlayPath(void) const
+{
+  if (!m_layout.Overlay().empty())
+    return URIUtils::AddFileToFolder(URIUtils::GetDirectory(LibPath()), m_layout.Overlay());
+  return "";
+}
+
+bool CController::LoadLayout(void)
+{
+  if (!m_bLoaded)
+  {
+    std::string strLayoutXmlPath = LibPath();
+
+    CXBMCTinyXML xmlDoc;
+    if (!xmlDoc.LoadFile(strLayoutXmlPath))
+    {
+      CLog::Log(LOGDEBUG, "Unable to load %s: %s at line %d", strLayoutXmlPath.c_str(), xmlDoc.ErrorDesc(), xmlDoc.ErrorRow());
+      return false;
+    }
+
+    TiXmlElement* pRootElement = xmlDoc.RootElement();
+    if (!pRootElement || pRootElement->NoChildren() || pRootElement->ValueStr() != LAYOUT_XML_ROOT)
+    {
+      CLog::Log(LOGERROR, "%s: Can't find root <%s> tag", strLayoutXmlPath.c_str(), LAYOUT_XML_ROOT);
+      return false;
+    }
+
+    CLog::Log(LOGINFO, "Loading controller layout %s", strLayoutXmlPath.c_str());
+
+    if (m_layout.Deserialize(pRootElement, this))
+      m_bLoaded = true;
+  }
+
+  return m_bLoaded;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/Controller.h Added

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "ControllerLayout.h"
+#include "ControllerTypes.h"
+#include "addons/Addon.h"
+
+#include <string>
+
+namespace GAME
+{
+
+class CController : public ADDON::CAddon
+{
+public:
+  static std::unique_ptr<CController> FromExtension(ADDON::AddonProps props, const cp_extension_t* ext);
+
+  CController(ADDON::AddonProps addonprops);
+
+  virtual ~CController(void) { }
+
+  static const ControllerPtr EmptyPtr;
+
+  std::string Label(void);
+  std::string ImagePath(void) const;
+  std::string OverlayPath(void) const;
+
+  bool LoadLayout(void);
+
+  const CControllerLayout& Layout(void) const { return m_layout; }
+
+private:
+  CControllerLayout m_layout;
+  bool              m_bLoaded;
+};
+
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerDefinitions.h Added

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#define LAYOUT_XML_ROOT                    "layout"
+
+#define LAYOUT_XML_ELM_BUTTON              "button"
+#define LAYOUT_XML_ELM_ANALOG_STICK        "analogstick"
+#define LAYOUT_XML_ELM_ACCELEROMETER       "accelerometer"
+
+#define LAYOUT_XML_ATTR_LAYOUT_LABEL       "label"
+#define LAYOUT_XML_ATTR_LAYOUT_IMAGE       "image"
+#define LAYOUT_XML_ATTR_LAYOUT_OVERLAY     "overlay"
+
+#define LAYOUT_XML_ATTR_FEATURE_NAME       "name"
+#define LAYOUT_XML_ATTR_FEATURE_LABEL      "label"
+
+#define LAYOUT_XML_ATTR_INPUT_TYPE         "type"

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerFeature.cpp Added

@@ -0,0 +1,115 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ControllerFeature.h"
+#include "Controller.h"
+#include "ControllerDefinitions.h"
+#include "ControllerTranslator.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/log.h"
+#include "utils/XMLUtils.h"
+
+#include <sstream>
+
+using namespace GAME;
+using namespace JOYSTICK;
+
+void CControllerFeature::Reset(void)
+{
+  m_type = FEATURE_TYPE::UNKNOWN;
+  m_strName.clear();
+  m_strLabel.clear();
+  m_labelId = 0;
+  m_inputType = INPUT_TYPE::UNKNOWN;
+}
+
+CControllerFeature& CControllerFeature::operator=(const CControllerFeature& rhs)
+{
+  if (this != &rhs)
+  {
+    m_type       = rhs.m_type;
+    m_strName    = rhs.m_strName;
+    m_strLabel   = rhs.m_strLabel;
+    m_labelId    = rhs.m_labelId;
+    m_inputType  = rhs.m_inputType;
+  }
+  return *this;
+}
+
+bool CControllerFeature::Deserialize(const TiXmlElement* pElement, const CController* controller)
+{
+  Reset();
+
+  if (!pElement)
+    return false;
+
+  std::string strType(pElement->Value());
+
+  // Type
+  m_type = CControllerTranslator::TranslateFeatureType(strType);
+  if (m_type == FEATURE_TYPE::UNKNOWN)
+  {
+    CLog::Log(LOGERROR, "Invalid feature: <%s> ", pElement->Value());
+    return false;
+  }
+
+  // Name
+  m_strName = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_FEATURE_NAME);
+  if (m_strName.empty())
+  {
+    CLog::Log(LOGERROR, "<%s> tag has no \"%s\" attribute", strType.c_str(), LAYOUT_XML_ATTR_FEATURE_NAME);
+    return false;
+  }
+
+  // Label ID
+  std::string strLabel = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_FEATURE_LABEL);
+  if (strLabel.empty())
+  {
+    CLog::Log(LOGERROR, "<%s> tag has no \"%s\" attribute", strType.c_str(), LAYOUT_XML_ATTR_FEATURE_LABEL);
+    return false;
+  }
+  std::istringstream(strLabel) >> m_labelId;
+
+  // Label (string)
+  m_strLabel = g_localizeStrings.GetAddonString(controller->ID(), m_labelId);
+
+  // Input type
+  if (m_type == FEATURE_TYPE::SCALAR)
+  {
+    std::string strInputType = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_INPUT_TYPE);
+    if (strInputType.empty())
+    {
+      CLog::Log(LOGERROR, "<%s> tag has no \"%s\" attribute", strType.c_str(), LAYOUT_XML_ATTR_INPUT_TYPE);
+      return false;
+    }
+    else
+    {
+      m_inputType = CControllerTranslator::TranslateInputType(strInputType);
+      if (m_inputType == INPUT_TYPE::UNKNOWN)
+      {
+        CLog::Log(LOGERROR, "<%s> tag - attribute \"%s\" is invalid: \"%s\"",
+                  strType.c_str(), LAYOUT_XML_ATTR_INPUT_TYPE, strInputType.c_str());
+        return false;
+      }
+    }
+  }
+
+  return true;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerFeature.h Added

@@ -0,0 +1,58 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "ControllerTypes.h"
+#include "input/joysticks/JoystickTypes.h"
+
+#include <string>
+
+class TiXmlElement;
+
+namespace GAME
+{
+
+class CControllerFeature
+{
+public:
+  CControllerFeature(void) { Reset(); }
+  CControllerFeature(const CControllerFeature& other) { *this = other; }
+
+  void Reset(void);
+
+  CControllerFeature& operator=(const CControllerFeature& rhs);
+
+  JOYSTICK::FEATURE_TYPE Type(void) const       { return m_type; }
+  const std::string&     Name(void) const       { return m_strName; }
+  const std::string&     Label(void) const      { return m_strLabel; }
+  unsigned int           LabelID(void) const    { return m_labelId; }
+  JOYSTICK::INPUT_TYPE   InputType(void) const  { return m_inputType; }
+
+  bool Deserialize(const TiXmlElement* pElement, const CController* controller);
+
+private:
+  JOYSTICK::FEATURE_TYPE m_type;
+  std::string            m_strName;
+  std::string            m_strLabel;
+  unsigned int           m_labelId;
+  JOYSTICK::INPUT_TYPE   m_inputType;
+};
+
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerLayout.cpp Added

@@ -0,0 +1,121 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ControllerLayout.h"
+#include "ControllerDefinitions.h"
+#include "utils/log.h"
+#include "utils/XMLUtils.h"
+
+#include <algorithm>
+#include <sstream>
+
+using namespace GAME;
+using namespace JOYSTICK;
+
+// --- FeatureTypeEqual --------------------------------------------------------
+
+struct FeatureTypeEqual
+{
+  FeatureTypeEqual(FEATURE_TYPE type, INPUT_TYPE inputType) : type(type), inputType(inputType) { }
+
+  bool operator()(const CControllerFeature& feature) const
+  {
+    if (type == FEATURE_TYPE::UNKNOWN)
+      return true; // Match all feature types
+
+    if (type == FEATURE_TYPE::SCALAR && feature.Type() == FEATURE_TYPE::SCALAR)
+    {
+      if (inputType == INPUT_TYPE::UNKNOWN)
+        return true; // Match all input types
+
+      return inputType == feature.InputType();
+    }
+
+    return type == feature.Type();
+  }
+
+  const FEATURE_TYPE type;
+  const INPUT_TYPE   inputType;
+};
+
+// --- CControllerLayout ---------------------------------------------------
+
+void CControllerLayout::Reset(void)
+{
+  m_label = 0;
+  m_strImage.clear();
+  m_strOverlay.clear();
+  m_width = 0;
+  m_height = 0;
+  m_features.clear();
+}
+
+unsigned int CControllerLayout::FeatureCount(FEATURE_TYPE type      /* = FEATURE_TYPE::UNKNOWN */,
+                                             INPUT_TYPE   inputType /* = INPUT_TYPE::UNKNOWN */) const
+{
+  return std::count_if(m_features.begin(), m_features.end(), FeatureTypeEqual(type, inputType));
+}
+
+bool CControllerLayout::Deserialize(const TiXmlElement* pElement, const CController* controller)
+{
+  Reset();
+
+  if (!pElement)
+    return false;
+
+  // Label
+  std::string strLabel = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_LAYOUT_LABEL);
+  if (strLabel.empty())
+  {
+    CLog::Log(LOGERROR, "<%s> tag has no \"%s\" attribute", LAYOUT_XML_ROOT, LAYOUT_XML_ATTR_LAYOUT_LABEL);
+    return false;
+  }
+  std::istringstream(strLabel) >> m_label;
+
+  // Image
+  m_strImage = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_LAYOUT_IMAGE);
+  if (m_strImage.empty())
+    CLog::Log(LOGDEBUG, "<%s> tag has no \"%s\" attribute", LAYOUT_XML_ROOT, LAYOUT_XML_ATTR_LAYOUT_IMAGE);
+
+  // Overlay
+  m_strOverlay = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_LAYOUT_OVERLAY);
+  if (m_strOverlay.empty())
+    CLog::Log(LOGDEBUG, "<%s> tag has no \"%s\" attribute", LAYOUT_XML_ROOT, LAYOUT_XML_ATTR_LAYOUT_OVERLAY);
+
+  // Features
+  for (const TiXmlElement* pCategory = pElement->FirstChildElement(); pCategory != NULL; pCategory = pCategory->NextSiblingElement())
+  {
+    std::string strCategory = pElement->Value();
+
+    // TODO: Something with category
+
+    for (const TiXmlElement* pFeature = pCategory->FirstChildElement(); pFeature != NULL; pFeature = pFeature->NextSiblingElement())
+    {
+      CControllerFeature feature;
+
+      if (!feature.Deserialize(pFeature, controller))
+        return false;
+
+      m_features.push_back(feature);
+    }
+  }
+
+  return true;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerLayout.h Added

@@ -0,0 +1,62 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "ControllerFeature.h"
+
+#include <string>
+#include <vector>
+
+class TiXmlElement;
+
+namespace GAME
+{
+
+class CControllerLayout
+{
+public:
+  CControllerLayout(void) { Reset(); }
+
+  void Reset(void);
+
+  unsigned int       Label(void) const   { return m_label; }
+  const std::string& Image(void) const   { return m_strImage; }
+  const std::string& Overlay(void) const { return m_strOverlay; }
+  unsigned int       Width(void) const   { return m_width; }
+  unsigned int       Height(void) const  { return m_height; }
+
+  const std::vector<CControllerFeature>& Features(void) const { return m_features; }
+
+  unsigned int FeatureCount(JOYSTICK::FEATURE_TYPE type = JOYSTICK::FEATURE_TYPE::UNKNOWN,
+                            JOYSTICK::INPUT_TYPE buttonType = JOYSTICK::INPUT_TYPE::UNKNOWN) const;
+
+  bool Deserialize(const TiXmlElement* pLayoutElement, const CController* controller);
+
+private:
+  unsigned int m_label;
+  std::string  m_strImage;
+  std::string  m_strOverlay;
+  unsigned int m_width;
+  unsigned int m_height;
+
+  std::vector<CControllerFeature> m_features;
+};
+
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerTranslator.cpp Added

@@ -0,0 +1,67 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ControllerTranslator.h"
+#include "ControllerDefinitions.h"
+
+using namespace GAME;
+using namespace JOYSTICK;
+
+const char* CControllerTranslator::TranslateFeatureType(FEATURE_TYPE type)
+{
+  switch (type)
+  {
+    case FEATURE_TYPE::SCALAR:           return LAYOUT_XML_ELM_BUTTON;
+    case FEATURE_TYPE::ANALOG_STICK:     return LAYOUT_XML_ELM_ANALOG_STICK;
+    case FEATURE_TYPE::ACCELEROMETER:    return LAYOUT_XML_ELM_ACCELEROMETER;
+    default:
+      break;
+  }
+  return "";
+}
+
+FEATURE_TYPE CControllerTranslator::TranslateFeatureType(const std::string& strType)
+{
+  if (strType == LAYOUT_XML_ELM_BUTTON)           return FEATURE_TYPE::SCALAR;
+  if (strType == LAYOUT_XML_ELM_ANALOG_STICK)     return FEATURE_TYPE::ANALOG_STICK;
+  if (strType == LAYOUT_XML_ELM_ACCELEROMETER)    return FEATURE_TYPE::ACCELEROMETER;
+
+  return FEATURE_TYPE::UNKNOWN;
+}
+
+const char* CControllerTranslator::TranslateInputType(INPUT_TYPE type)
+{
+  switch (type)
+  {
+    case INPUT_TYPE::DIGITAL: return "digital";
+    case INPUT_TYPE::ANALOG:  return "analog";
+    default:
+      break;
+  }
+  return "";
+}
+
+INPUT_TYPE CControllerTranslator::TranslateInputType(const std::string& strType)
+{
+  if (strType == "digital") return INPUT_TYPE::DIGITAL;
+  if (strType == "analog")  return INPUT_TYPE::ANALOG;
+
+  return INPUT_TYPE::UNKNOWN;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerTranslator.h Added

@@ -0,0 +1,40 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "ControllerTypes.h"
+#include "input/joysticks/JoystickTypes.h"
+
+#include <string>
+
+namespace GAME
+{
+
+class CControllerTranslator
+{
+public:
+  static const char* TranslateFeatureType(JOYSTICK::FEATURE_TYPE type);
+  static JOYSTICK::FEATURE_TYPE TranslateFeatureType(const std::string& strType);
+
+  static const char* TranslateInputType(JOYSTICK::INPUT_TYPE type);
+  static JOYSTICK::INPUT_TYPE TranslateInputType(const std::string& strType);
+};
+
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/ControllerTypes.h Added

_service:download_url:master.tar.gz/xbmc/games/controllers/Makefile Added

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols Added

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp Added

@@ -0,0 +1,105 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIAnalogStickButton.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/StringUtils.h"
+
+#include <string>
+
+using namespace GAME;
+
+CGUIAnalogStickButton::CGUIAnalogStickButton(const CGUIButtonControl& buttonTemplate,
+                                             IConfigurationWizard* wizard,
+                                             const CControllerFeature& feature,
+                                             unsigned int index) :
+  CGUIFeatureButton(buttonTemplate, wizard, feature, index)
+{
+  Reset();
+}
+
+bool CGUIAnalogStickButton::PromptForInput(CEvent& waitEvent)
+{
+  using namespace JOYSTICK;
+
+  bool bInterrupted = false;
+
+  // Get the prompt for the current analog stick direction
+  std::string strPrompt;
+  std::string strWarn;
+  switch (m_state)
+  {
+    case STATE::ANALOG_STICK_UP:
+      strPrompt = g_localizeStrings.Get(35092); // "Move %s up"
+      strWarn   = g_localizeStrings.Get(35093); // "Move %s up (%d)"
+      break;
+    case STATE::ANALOG_STICK_RIGHT:
+      strPrompt = g_localizeStrings.Get(35096); // "Move %s right"
+      strWarn   = g_localizeStrings.Get(35097); // "Move %s right (%d)"
+      break;
+    case STATE::ANALOG_STICK_DOWN:
+      strPrompt = g_localizeStrings.Get(35094); // "Move %s down"
+      strWarn   = g_localizeStrings.Get(35095); // "Move %s down (%d)"
+      break;
+    case STATE::ANALOG_STICK_LEFT:
+      strPrompt = g_localizeStrings.Get(35098); // "Move %s left"
+      strWarn   = g_localizeStrings.Get(35099); // "Move %s left (%d)"
+      break;
+    default:
+      break;
+  }
+
+  if (!strPrompt.empty())
+  {
+    bInterrupted = DoPrompt(strPrompt, strWarn, m_feature.Label(), waitEvent);
+
+    if (!bInterrupted)
+      m_state = STATE::FINISHED; // Not interrupted, must have timed out
+    else
+      m_state = GetNextState(m_state); // Interrupted by input, proceed
+  }
+
+  return bInterrupted;
+}
+
+bool CGUIAnalogStickButton::IsFinished(void) const
+{
+  return m_state >= STATE::FINISHED;
+}
+
+JOYSTICK::CARDINAL_DIRECTION CGUIAnalogStickButton::GetDirection(void) const
+{
+  switch (m_state)
+  {
+    case STATE::ANALOG_STICK_UP:    return JOYSTICK::CARDINAL_DIRECTION::UP;
+    case STATE::ANALOG_STICK_RIGHT: return JOYSTICK::CARDINAL_DIRECTION::RIGHT;
+    case STATE::ANALOG_STICK_DOWN:  return JOYSTICK::CARDINAL_DIRECTION::DOWN;
+    case STATE::ANALOG_STICK_LEFT:  return JOYSTICK::CARDINAL_DIRECTION::LEFT;
+    default:
+      break;
+  }
+
+  return JOYSTICK::CARDINAL_DIRECTION::UNKNOWN;
+}
+
+void CGUIAnalogStickButton::Reset(void)
+{
+  m_state = STATE::ANALOG_STICK_UP;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIAnalogStickButton.h Added

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "GUIFeatureButton.h"
+
+namespace GAME
+{
+  class CGUIAnalogStickButton : public CGUIFeatureButton
+  {
+  public:
+    CGUIAnalogStickButton(const CGUIButtonControl& buttonTemplate,
+                          IConfigurationWizard* wizard,
+                          const CControllerFeature& feature,
+                          unsigned int index);
+
+    virtual ~CGUIAnalogStickButton(void) { }
+
+    // implementation of IFeatureButton
+    virtual bool PromptForInput(CEvent& waitEvent) override;
+    virtual bool IsFinished(void) const override;
+    virtual JOYSTICK::CARDINAL_DIRECTION GetDirection(void) const override;
+    virtual void Reset(void) override;
+
+  private:
+    enum class STATE
+    {
+      ANALOG_STICK_UP,
+      ANALOG_STICK_RIGHT,
+      ANALOG_STICK_DOWN,
+      ANALOG_STICK_LEFT,
+      FINISHED,
+    };
+
+    STATE m_state;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIControllerButton.cpp Added

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIControllerButton.h"
+#include "games/controllers/windows/GUIControllerDefines.h"
+
+using namespace GAME;
+
+CGUIControllerButton::CGUIControllerButton(const CGUIButtonControl& buttonControl, const std::string& label, unsigned int index) :
+  CGUIButtonControl(buttonControl)
+{
+  // Initialize CGUIButtonControl
+  SetLabel(label);
+  SetID(CONTROL_CONTROLLER_BUTTONS_START + index);
+  SetVisible(true);
+  AllocResources();
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIControllerButton.h Added

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "guilib/GUIButtonControl.h"
+
+#include <string>
+
+namespace GAME
+{
+  class CGUIControllerButton : public CGUIButtonControl
+  {
+  public:
+    CGUIControllerButton(const CGUIButtonControl& buttonControl, const std::string& label, unsigned int index);
+
+    virtual ~CGUIControllerButton(void) { }
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureButton.cpp Added

@@ -0,0 +1,95 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIFeatureButton.h"
+#include "games/controllers/windows/GUIControllerDefines.h"
+#include "guilib/GUIMessage.h"
+#include "guilib/WindowIDs.h"
+#include "messaging/ApplicationMessenger.h"
+#include "threads/Event.h"
+#include "utils/StringUtils.h"
+
+using namespace GAME;
+
+CGUIFeatureButton::CGUIFeatureButton(const CGUIButtonControl& buttonTemplate,
+                                     IConfigurationWizard* wizard,
+                                     const CControllerFeature& feature,
+                                     unsigned int index) :
+  CGUIButtonControl(buttonTemplate),
+  m_feature(feature),
+  m_wizard(wizard)
+{
+  // Initialize CGUIButtonControl
+  SetLabel(m_feature.Label());
+  SetID(CONTROL_FEATURE_BUTTONS_START + index);
+  SetVisible(true);
+  AllocResources();
+}
+
+void CGUIFeatureButton::OnUnFocus(void)
+{
+  CGUIButtonControl::OnUnFocus();
+  m_wizard->OnUnfocus(this);
+}
+
+bool CGUIFeatureButton::DoPrompt(const std::string& strPrompt, const std::string& strWarn, const std::string& strFeature, CEvent& waitEvent)
+{
+  using namespace KODI::MESSAGING;
+
+  bool bInterrupted = false;
+
+  if (!HasFocus())
+  {
+    CGUIMessage msgFocus(GUI_MSG_SETFOCUS, GetID(), GetID());
+    CApplicationMessenger::GetInstance().SendGUIMessage(msgFocus, WINDOW_INVALID, false);
+  }
+
+  CGUIMessage msgLabel(GUI_MSG_LABEL_SET, GetID(), GetID());
+
+  for (unsigned int i = 0; i < COUNTDOWN_DURATION_SEC; i++)
+  {
+    const unsigned int secondsElapsed = i;
+    const unsigned int secondsRemaining = COUNTDOWN_DURATION_SEC - i;
+
+    const bool bWarn = secondsElapsed >= WAIT_TO_WARN_SEC;
+
+    std::string strLabel;
+
+    if (bWarn)
+      strLabel = StringUtils::Format(strWarn.c_str(), strFeature.c_str(), secondsRemaining);
+    else
+      strLabel = StringUtils::Format(strPrompt.c_str(), strFeature.c_str(), secondsRemaining);
+
+    msgLabel.SetLabel(strLabel);
+    CApplicationMessenger::GetInstance().SendGUIMessage(msgLabel, WINDOW_INVALID, false);
+
+    waitEvent.Reset();
+    bInterrupted = waitEvent.WaitMSec(1000); // Wait 1 second
+
+    if (bInterrupted)
+      break;
+  }
+
+  // Reset label
+  msgLabel.SetLabel(m_feature.Label());
+  CApplicationMessenger::GetInstance().SendGUIMessage(msgLabel, WINDOW_INVALID, false);
+
+  return bInterrupted;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureButton.h Added

@@ -0,0 +1,64 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "games/controllers/ControllerFeature.h"
+#include "games/controllers/windows/IConfigurationWindow.h"
+#include "guilib/GUIButtonControl.h"
+
+#include <string>
+
+namespace GAME
+{
+  class CGUIFeatureButton : public CGUIButtonControl,
+                            public IFeatureButton
+
+  {
+  public:
+    CGUIFeatureButton(const CGUIButtonControl& buttonTemplate,
+                      IConfigurationWizard* wizard,
+                      const CControllerFeature& feature,
+                      unsigned int index);
+
+    virtual ~CGUIFeatureButton(void) { }
+
+    // implementation of CGUIControl via CGUIButtonControl
+    virtual void OnUnFocus(void) override;
+
+    // partial implementation of IFeatureButton
+    virtual const CControllerFeature& Feature(void) const override { return m_feature; }
+    virtual JOYSTICK::CARDINAL_DIRECTION GetDirection(void) const override { return JOYSTICK::CARDINAL_DIRECTION::UNKNOWN; }
+
+  protected:
+    bool DoPrompt(const std::string& strPrompt, const std::string& strWarn, const std::string& strFeature, CEvent& waitEvent);
+
+    // FSM helper
+    template <typename T>
+    T GetNextState(T state)
+    {
+      return static_cast<T>(static_cast<int>(state) + 1);
+    }
+
+    const CControllerFeature m_feature;
+
+  private:
+    IConfigurationWizard* const  m_wizard;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIGameController.cpp Added

@@ -0,0 +1,72 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIGameController.h"
+#include "games/controllers/Controller.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
+
+using namespace GAME;
+
+CGUIGameController::CGUIGameController(int parentID, int controlID, float posX, float posY, float width, float height)
+  : CGUIImage(parentID, controlID, posX, posY, width, height, CTextureInfo())
+{
+  // Initialize CGUIControl
+  ControlType = GUICONTROL_GAMECONTROLLER;
+}
+
+CGUIGameController::CGUIGameController(const CGUIGameController &from)
+  : CGUIImage(from)
+{
+  // Initialize CGUIControl
+  ControlType = GUICONTROL_GAMECONTROLLER;
+}
+
+CGUIGameController* CGUIGameController::Clone(void) const
+{
+  return new CGUIGameController(*this);
+}
+
+void CGUIGameController::Render(void)
+{
+  CGUIImage::Render();
+
+  CSingleLock lock(m_mutex);
+
+  if (m_currentController)
+  {
+    // TODO: Render pressed buttons
+  }
+}
+
+void CGUIGameController::ActivateController(const ControllerPtr& controller)
+{
+  CSingleLock lock(m_mutex);
+
+  if (controller && controller != m_currentController)
+  {
+    m_currentController = controller;
+
+    lock.Leave();
+
+    // TODO: Sometimes this fails on window init
+    SetFileName(m_currentController->ImagePath());
+  }
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIGameController.h Added

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "games/controllers/ControllerTypes.h"
+#include "guilib/GUIImage.h"
+#include "threads/CriticalSection.h"
+
+namespace GAME
+{
+  class CGUIGameController : public CGUIImage
+  {
+  public:
+    CGUIGameController(int parentID, int controlID, float posX, float posY, float width, float height);
+    CGUIGameController(const CGUIGameController &from);
+
+    virtual ~CGUIGameController(void) { }
+
+    // implementation of CGUIControl via CGUIImage
+    virtual CGUIGameController* Clone(void) const override;
+    virtual void Render(void) override;
+
+    void ActivateController(const ControllerPtr& controller);
+
+  private:
+    ControllerPtr       m_currentController;
+    CCriticalSection    m_mutex;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIScalarFeatureButton.cpp Added

@@ -0,0 +1,70 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIScalarFeatureButton.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/StringUtils.h"
+
+#include <string>
+
+using namespace GAME;
+
+CGUIScalarFeatureButton::CGUIScalarFeatureButton(const CGUIButtonControl& buttonTemplate,
+                                                 IConfigurationWizard* wizard,
+                                                 const CControllerFeature& feature,
+                                                 unsigned int index) :
+  CGUIFeatureButton(buttonTemplate, wizard, feature, index)
+{
+  Reset();
+}
+
+bool CGUIScalarFeatureButton::PromptForInput(CEvent& waitEvent)
+{
+  bool bInterrupted = false;
+
+  switch (m_state)
+  {
+    case STATE::NEED_INPUT:
+    {
+      std::string strPrompt = g_localizeStrings.Get(35090);  // "Press %s"
+      std::string strWarn = g_localizeStrings.Get(35091);  // "Press %s (%d)"
+
+      bInterrupted = DoPrompt(strPrompt, strWarn, m_feature.Label(), waitEvent);
+
+      m_state = GetNextState(m_state);
+
+      break;
+    }
+    default:
+      break;
+  }
+
+  return bInterrupted;
+}
+
+bool CGUIScalarFeatureButton::IsFinished(void) const
+{
+  return m_state >= STATE::FINISHED;
+}
+
+void CGUIScalarFeatureButton::Reset(void)
+{
+  m_state = STATE::NEED_INPUT;
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/GUIScalarFeatureButton.h Added

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "GUIFeatureButton.h"
+
+namespace GAME
+{
+  class CGUIScalarFeatureButton : public CGUIFeatureButton
+  {
+  public:
+    CGUIScalarFeatureButton(const CGUIButtonControl& buttonTemplate,
+                            IConfigurationWizard* wizard,
+                            const CControllerFeature& feature,
+                            unsigned int index);
+
+    virtual ~CGUIScalarFeatureButton(void) { }
+
+    // implementation of IFeatureButton
+    virtual bool PromptForInput(CEvent& waitEvent) override;
+    virtual bool IsFinished(void) const override;
+    virtual void Reset(void) override;
+
+  private:
+    enum class STATE
+    {
+      NEED_INPUT,
+      FINISHED,
+    };
+
+    STATE m_state;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/guicontrols/Makefile Added

_service:download_url:master.tar.gz/xbmc/games/controllers/windows Added

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp Added

@@ -0,0 +1,247 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIConfigurationWizard.h"
+#include "games/controllers/guicontrols/GUIFeatureButton.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/ControllerFeature.h"
+#include "input/joysticks/IButtonMap.h"
+#include "input/InputManager.h"
+#include "peripherals/Peripherals.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
+
+using namespace GAME;
+
+#define ESC_KEY_CODE  27
+
+CGUIConfigurationWizard::CGUIConfigurationWizard() :
+  CThread("GUIConfigurationWizard")
+{
+  InitializeState();
+}
+
+void CGUIConfigurationWizard::InitializeState(void)
+{
+  m_currentButton = nullptr;
+  m_currentDirection = JOYSTICK::CARDINAL_DIRECTION::UNKNOWN;
+  m_history.clear();
+}
+
+void CGUIConfigurationWizard::Run(const std::string& strControllerId, const std::vector<IFeatureButton*>& buttons)
+{
+  Abort();
+
+  {
+    CSingleLock lock(m_stateMutex);
+
+    // Set Run() parameters
+    m_strControllerId = strControllerId;
+    m_buttons = buttons;
+
+    // Initialize state variables
+    InitializeState();
+  }
+
+  Create();
+}
+
+void CGUIConfigurationWizard::OnUnfocus(IFeatureButton* button)
+{
+  CSingleLock lock(m_stateMutex);
+
+  if (button == m_currentButton)
+    Abort(false);
+}
+
+bool CGUIConfigurationWizard::Abort(bool bWait /* = true */)
+{
+  if (IsRunning())
+  {
+    StopThread(false);
+
+    m_inputEvent.Set();
+
+    if (bWait)
+      StopThread(true);
+
+    return true;
+  }
+  return false;
+}
+
+void CGUIConfigurationWizard::Process(void)
+{
+  CLog::Log(LOGDEBUG, "Starting configuration wizard");
+
+  InstallHooks();
+
+  {
+    CSingleLock lock(m_stateMutex);
+    for (IFeatureButton* button : m_buttons)
+    {
+      // Allow other threads to access the button we're using
+      m_currentButton = button;
+
+      while (!button->IsFinished())
+      {
+        // Allow other threads to access which direction the analog stick is on
+        m_currentDirection = button->GetDirection();
+
+        // Wait for input
+        {
+          CSingleExit exit(m_stateMutex);
+          if (!button->PromptForInput(m_inputEvent))
+            Abort(false);
+        }
+
+        if (m_bStop)
+          break;
+      }
+
+      button->Reset();
+
+      if (m_bStop)
+        break;
+    }
+
+    m_currentButton = nullptr;
+  }
+
+  RemoveHooks();
+
+  CLog::Log(LOGDEBUG, "Configuration wizard ended");
+}
+
+bool CGUIConfigurationWizard::MapPrimitive(JOYSTICK::IButtonMap* buttonMap, const JOYSTICK::CDriverPrimitive& primitive)
+{
+  using namespace JOYSTICK;
+
+  bool bHandled = false;
+
+  // Handle esc key separately
+  if (primitive.Type() == CDriverPrimitive::BUTTON &&
+      primitive.Index() == ESC_KEY_CODE)
+  {
+    bHandled = Abort(false);
+  }
+  else if (m_history.find(primitive) != m_history.end())
+  {
+    // Primitive has already been mapped this round, ignore it
+    bHandled = true;
+  }
+  else
+  {
+    // Get the current state of the thread
+    IFeatureButton* currentButton;
+    CARDINAL_DIRECTION currentDirection;
+    {
+      CSingleLock lock(m_stateMutex);
+      currentButton = m_currentButton;
+      currentDirection = m_currentDirection;
+    }
+
+    if (currentButton)
+    {
+      const CControllerFeature& feature = currentButton->Feature();
+      switch (feature.Type())
+      {
+        case FEATURE_TYPE::SCALAR:
+        {
+          bHandled = buttonMap->AddScalar(feature.Name(), primitive);
+          break;
+        }
+        case FEATURE_TYPE::ANALOG_STICK:
+        {
+          CDriverPrimitive up;
+          CDriverPrimitive down;
+          CDriverPrimitive right;
+          CDriverPrimitive left;
+
+          buttonMap->GetAnalogStick(feature.Name(), up, down, right, left);
+
+          switch (currentDirection)
+          {
+            case CARDINAL_DIRECTION::UP:    up    = primitive; break;
+            case CARDINAL_DIRECTION::DOWN:  down  = primitive; break;
+            case CARDINAL_DIRECTION::RIGHT: right = primitive; break;
+            case CARDINAL_DIRECTION::LEFT:  left  = primitive; break;
+            default:
+              break;
+          }
+
+          bHandled = buttonMap->AddAnalogStick(feature.Name(), up, down, right, left);
+
+          break;
+        }
+        default:
+          break;
+      }
+
+      if (bHandled)
+      {
+        m_history.insert(primitive);
+        m_inputEvent.Set();
+      }
+    }
+  }
+  
+  return bHandled;
+}
+
+bool CGUIConfigurationWizard::OnKeyPress(const CKey& key)
+{
+  return Abort(false);
+}
+
+void CGUIConfigurationWizard::InstallHooks(void)
+{
+  using namespace PERIPHERALS;
+
+  g_peripherals.RegisterJoystickButtonMapper(this);
+  g_peripherals.RegisterObserver(this);
+  CInputManager::GetInstance().RegisterKeyboardHandler(this);
+}
+
+void CGUIConfigurationWizard::RemoveHooks(void)
+{
+  using namespace PERIPHERALS;
+
+  CInputManager::GetInstance().UnregisterKeyboardHandler(this);
+  g_peripherals.UnregisterObserver(this);
+  g_peripherals.UnregisterJoystickButtonMapper(this);
+}
+
+void CGUIConfigurationWizard::Notify(const Observable& obs, const ObservableMessage msg)
+{
+  using namespace PERIPHERALS;
+
+  switch (msg)
+  {
+    case ObservableMessagePeripheralsChanged:
+    {
+      g_peripherals.UnregisterJoystickButtonMapper(this);
+      g_peripherals.RegisterJoystickButtonMapper(this);
+      break;
+    }
+    default:
+      break;
+  }
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.h Added

@@ -0,0 +1,87 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "IConfigurationWindow.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMapper.h"
+#include "input/keyboard/IKeyboardHandler.h"
+#include "threads/CriticalSection.h"
+#include "threads/Event.h"
+#include "threads/Thread.h"
+#include "utils/Observer.h"
+
+#include <set>
+#include <string>
+#include <vector>
+
+namespace GAME
+{
+  class CGUIConfigurationWizard : public IConfigurationWizard,
+                                  public JOYSTICK::IButtonMapper,
+                                  public KEYBOARD::IKeyboardHandler,
+                                  public Observer,
+                                  protected CThread
+  {
+  public:
+    CGUIConfigurationWizard();
+
+    virtual ~CGUIConfigurationWizard(void) { }
+
+    // implementation of IConfigurationWizard
+    virtual void Run(const std::string& strControllerId, const std::vector<IFeatureButton*>& buttons) override;
+    virtual void OnUnfocus(IFeatureButton* button) override;
+    virtual bool Abort(bool bWait = true) override;
+
+    // implementation of IButtonMapper
+    virtual std::string ControllerID(void) const override { return m_strControllerId; }
+    virtual bool MapPrimitive(JOYSTICK::IButtonMap* buttonMap, const JOYSTICK::CDriverPrimitive& primitive) override;
+
+    // implementation of IKeyboardHandler
+    virtual bool OnKeyPress(const CKey& key) override;
+    virtual void OnKeyRelease(const CKey& key) override { }
+
+    // implementation of Observer
+    virtual void Notify(const Observable& obs, const ObservableMessage msg) override;
+
+  protected:
+    // implementation of CThread
+    virtual void Process(void) override;
+
+  private:
+    void InitializeState(void);
+
+    void InstallHooks(void);
+    void RemoveHooks(void);
+
+    // Run() parameters
+    std::string                          m_strControllerId;
+    std::vector<IFeatureButton*>         m_buttons;
+
+    // State variables and mutex
+    IFeatureButton*                      m_currentButton;
+    JOYSTICK::CARDINAL_DIRECTION         m_currentDirection;
+    std::set<JOYSTICK::CDriverPrimitive> m_history; // History to avoid repeated features
+    CCriticalSection                     m_stateMutex;
+
+    // Synchronization event
+    CEvent                               m_inputEvent;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIControllerDefines.h Added

@@ -0,0 +1,45 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+// Duration to wait for input from the user
+#define COUNTDOWN_DURATION_SEC  6
+
+// Warn the user that time is running out after this duration
+#define WAIT_TO_WARN_SEC        2
+
+// GUI Control IDs
+#define CONTROL_CONTROLLER_LIST             3
+#define CONTROL_FEATURE_LIST                5
+#define CONTROL_FEATURE_BUTTON_TEMPLATE     7
+#define CONTROL_CONTROLLER_BUTTON_TEMPLATE  10
+#define CONTROL_HELP_BUTTON                 17
+#define CONTROL_CLOSE_BUTTON                18
+#define CONTROL_RESET_BUTTON                19
+#define CONTROL_GET_MORE                    20
+#define CONTROL_GAME_CONTROLLER             31
+
+#define MAX_CONTROLLER_COUNT  100 // large enough
+#define MAX_FEATURE_COUNT     100 // large enough
+
+#define CONTROL_CONTROLLER_BUTTONS_START  100
+#define CONTROL_CONTROLLER_BUTTONS_END    (CONTROL_CONTROLLER_BUTTONS_START + MAX_CONTROLLER_COUNT)
+#define CONTROL_FEATURE_BUTTONS_START     CONTROL_CONTROLLER_BUTTONS_END
+#define CONTROL_FEATURE_BUTTONS_END       (CONTROL_FEATURE_BUTTONS_START + MAX_FEATURE_COUNT)

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIControllerList.cpp Added

@@ -0,0 +1,232 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIControllerList.h"
+#include "GUIControllerDefines.h"
+#include "GUIControllerWindow.h"
+#include "GUIFeatureList.h"
+#include "addons/AddonManager.h"
+#include "dialogs/GUIDialogYesNo.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/guicontrols/GUIControllerButton.h"
+#include "games/controllers/guicontrols/GUIGameController.h"
+#include "guilib/GUIButtonControl.h"
+#include "guilib/GUIControlGroupList.h"
+#include "guilib/GUIWindow.h"
+#include "input/joysticks/DefaultJoystick.h" // for DEFAULT_CONTROLLER_ID
+#include "peripherals/Peripherals.h"
+
+#include <assert.h>
+
+using namespace ADDON;
+using namespace GAME;
+
+CGUIControllerList::CGUIControllerList(CGUIWindow* window, IFeatureList* featureList) :
+  m_guiWindow(window),
+  m_featureList(featureList),
+  m_controllerList(nullptr),
+  m_controllerButton(nullptr),
+  m_focusedController(-1) // Initially unfocused
+{
+  assert(m_featureList != nullptr);
+}
+
+bool CGUIControllerList::Initialize(void)
+{
+  m_controllerList = dynamic_cast<CGUIControlGroupList*>(m_guiWindow->GetControl(CONTROL_CONTROLLER_LIST));
+  m_controllerButton = dynamic_cast<CGUIButtonControl*>(m_guiWindow->GetControl(CONTROL_CONTROLLER_BUTTON_TEMPLATE));
+
+  if (m_controllerButton)
+    m_controllerButton->SetVisible(false);
+
+  Refresh();
+
+  CAddonMgr::GetInstance().RegisterObserver(this);
+
+  return m_controllerList != nullptr &&
+         m_controllerButton != nullptr;
+}
+
+void CGUIControllerList::Deinitialize(void)
+{
+  CAddonMgr::GetInstance().UnregisterObserver(this);
+
+  CleanupButtons();
+
+  m_controllerList = nullptr;
+  m_controllerButton = nullptr;
+}
+
+void CGUIControllerList::Refresh(void)
+{
+  CleanupButtons();
+
+  if (!RefreshControllers())
+    return;
+
+  if (m_controllerList)
+  {
+    unsigned int buttonId = 0;
+    for (ControllerVector::const_iterator it = m_controllers.begin(); it != m_controllers.end(); ++it)
+    {
+      const ControllerPtr& controller = *it;
+
+      CGUIButtonControl* pButton = new CGUIControllerButton(*m_controllerButton, controller->Label(), buttonId++);
+      m_controllerList->AddControl(pButton);
+
+      // Just in case
+      if (buttonId >= MAX_CONTROLLER_COUNT)
+        break;
+    }
+  }
+}
+
+void CGUIControllerList::OnFocus(unsigned int controllerIndex)
+{
+  if (controllerIndex < m_controllers.size())
+  {
+    m_focusedController = controllerIndex;
+
+    const ControllerPtr& controller = m_controllers[controllerIndex];
+    m_featureList->Load(controller);
+
+    // TODO: Activate controller for all game controller controls
+    CGUIGameController* pController = dynamic_cast<CGUIGameController*>(m_guiWindow->GetControl(CONTROL_GAME_CONTROLLER));
+    if (pController)
+      pController->ActivateController(controller);
+  }
+}
+
+void CGUIControllerList::OnSelect(unsigned int controllerIndex)
+{
+  if (controllerIndex < m_controllers.size())
+  {
+    // TODO
+  }
+}
+
+void CGUIControllerList::ResetController(void)
+{
+  if (0 <= m_focusedController && m_focusedController < (int)m_controllers.size())
+  {
+    const std::string strControllerId = m_controllers[m_focusedController]->ID();
+
+    // TODO: Choose peripheral
+    // For now, ask the user if they would like to reset all peripherals
+    // "Reset controller profile"
+    // "Would you like to reset this controller profile for all devices?"
+    if (!CGUIDialogYesNo::ShowAndGetInput(35060, 35061))
+      return;
+
+    PERIPHERALS::g_peripherals.ResetButtonMaps(strControllerId);
+  }
+}
+
+void CGUIControllerList::Notify(const Observable& obs, const ObservableMessage msg)
+{
+  if (msg == ObservableMessageAddons)
+    Refresh();
+}
+
+bool CGUIControllerList::RefreshControllers(void)
+{
+  bool bChanged = false;
+
+  // Get controller add-ons
+  ADDON::VECADDONS addons;
+  CAddonMgr::GetInstance().GetAddons(addons, ADDON_GAME_CONTROLLER);
+
+  // Convert to controllers
+  ControllerVector controllers;
+  std::transform(addons.begin(), addons.end(), std::back_inserter(controllers),
+    [](const AddonPtr& addon)
+    {
+      return std::static_pointer_cast<CController>(addon);
+    });
+
+  // Look for new controllers
+  ControllerVector newControllers;
+  for (ControllerVector::const_iterator it = controllers.begin(); it != controllers.end(); ++it)
+  {
+    const ControllerPtr& controller = *it;
+
+    if (std::find_if(m_controllers.begin(), m_controllers.end(),
+      [controller](const ControllerPtr& ctrl)
+      {
+        return ctrl->ID() == controller->ID();
+      }) == m_controllers.end())
+    {
+      newControllers.push_back(controller);
+    }
+  }
+
+  // Remove old controllers
+  for (ControllerVector::iterator it = m_controllers.begin(); it != m_controllers.end(); /* ++it */)
+  {
+    ControllerPtr& controller = *it;
+
+    if (std::find_if(controllers.begin(), controllers.end(),
+      [controller](const ControllerPtr& ctrl)
+      {
+        return ctrl->ID() == controller->ID();
+      }) == newControllers.end())
+    {
+      it = m_controllers.erase(it); // Not found, remove it
+      bChanged = true;
+    }
+    else
+    {
+      ++it;
+    }
+  }
+
+  // Add new controllers
+  for (ControllerVector::iterator it = newControllers.begin(); it != newControllers.end(); ++it)
+  {
+    ControllerPtr& newController = *it;
+
+    if (newController->LoadLayout())
+    {
+      m_controllers.push_back(newController);
+      bChanged = true;
+    }
+  }
+
+  // Sort add-ons, with default controller first
+  if (bChanged)
+  {
+    std::sort(m_controllers.begin(), m_controllers.end(),
+      [](const ControllerPtr& i, const ControllerPtr& j)
+      {
+        if (i->ID() == DEFAULT_CONTROLLER_ID && j->ID() != DEFAULT_CONTROLLER_ID) return true;
+        if (i->ID() != DEFAULT_CONTROLLER_ID && j->ID() == DEFAULT_CONTROLLER_ID) return false;
+
+        return i->ID() < j->ID();
+      });
+  }
+
+  return bChanged;
+}
+
+void CGUIControllerList::CleanupButtons(void)
+{
+  if (m_controllerList)
+    m_controllerList->ClearAll();
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIControllerList.h Added

@@ -0,0 +1,67 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "IConfigurationWindow.h"
+#include "games/controllers/ControllerTypes.h"
+#include "utils/Observer.h"
+
+class CGUIButtonControl;
+class CGUIControlGroupList;
+class CGUIWindow;
+
+namespace GAME
+{
+  class CGUIControllerWindow;
+
+  class CGUIControllerList : public IControllerList,
+                             public Observer
+  {
+  public:
+    CGUIControllerList(CGUIWindow* window, IFeatureList* featureList);
+    virtual ~CGUIControllerList(void) { Deinitialize(); }
+
+    // implementation of IControllerList
+    virtual bool Initialize(void) override;
+    virtual void Deinitialize(void) override;
+    virtual void Refresh(void) override;
+    virtual void OnFocus(unsigned int controllerIndex) override;
+    virtual void OnSelect(unsigned int controllerIndex) override;
+    virtual void ResetController(void) override;
+
+    // implementation of Observer
+    virtual void Notify(const Observable& obs, const ObservableMessage msg) override;
+
+  private:
+    bool RefreshControllers(void);
+
+    void CleanupButtons(void);
+
+    // GUI stuff
+    CGUIWindow* const     m_guiWindow;
+    IFeatureList* const   m_featureList;
+    CGUIControlGroupList* m_controllerList;
+    CGUIButtonControl*    m_controllerButton;
+
+    // Game stuff
+    ControllerVector      m_controllers;
+    int                   m_focusedController;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIControllerWindow.cpp Added

@@ -0,0 +1,274 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIControllerWindow.h"
+#include "GUIControllerDefines.h"
+#include "GUIControllerList.h"
+#include "GUIFeatureList.h"
+#include "IConfigurationWindow.h"
+#include "addons/GUIWindowAddonBrowser.h"
+#include "addons/IAddon.h"
+#include "addons/AddonManager.h"
+#include "guilib/GUIMessage.h"
+#include "guilib/WindowIDs.h"
+
+// To check for button mapping support
+#include "dialogs/GUIDialogOK.h"
+#include "peripherals/bus/virtual/PeripheralBusAddon.h"
+#include "peripherals/Peripherals.h"
+#include "utils/log.h"
+
+// To check for installable controllers
+#include "addons/AddonDatabase.h"
+#include "addons/AddonManager.h"
+
+using namespace GAME;
+
+CGUIControllerWindow::CGUIControllerWindow(void) :
+  CGUIDialog(WINDOW_DIALOG_GAME_CONTROLLERS, "DialogGameControllers.xml"),
+  m_controllerList(nullptr),
+  m_featureList(nullptr)
+{
+  // initialize CGUIWindow
+  m_loadType = KEEP_IN_MEMORY;
+}
+
+CGUIControllerWindow::~CGUIControllerWindow(void)
+{
+  delete m_controllerList;
+  delete m_featureList;
+}
+
+bool CGUIControllerWindow::OnMessage(CGUIMessage& message)
+{
+  switch (message.GetMessage())
+  {
+    case GUI_MSG_WINDOW_INIT:
+    {
+      // TODO: Process parameter
+      //std::string strParam = message.GetStringParam();
+      break;
+    }
+    case GUI_MSG_CLICKED:
+    {
+      int controlId = message.GetSenderId();
+
+      if (controlId == CONTROL_CLOSE_BUTTON)
+      {
+        Close();
+        return true;
+      }
+      else if (controlId == CONTROL_GET_MORE)
+      {
+        GetMoreControllers();
+        return true;
+      }
+      else if (controlId == CONTROL_RESET_BUTTON)
+      {
+        ResetController();
+        return true;
+      }
+      else if (controlId == CONTROL_HELP_BUTTON)
+      {
+        ShowHelp();
+        return true;
+      }
+      else if (CONTROL_CONTROLLER_BUTTONS_START <= controlId && controlId < CONTROL_CONTROLLER_BUTTONS_END)
+      {
+        OnControllerSelected(controlId - CONTROL_CONTROLLER_BUTTONS_START);
+        return true;
+      }
+      else if (CONTROL_FEATURE_BUTTONS_START <= controlId && controlId < CONTROL_FEATURE_BUTTONS_END)
+      {
+        OnFeatureSelected(controlId - CONTROL_FEATURE_BUTTONS_START);
+        return true;
+      }
+      break;
+    }
+    case GUI_MSG_FOCUSED:
+    {
+      int controlId = message.GetControlId();
+
+      if (CONTROL_CONTROLLER_BUTTONS_START <= controlId && controlId < CONTROL_CONTROLLER_BUTTONS_END)
+      {
+        OnControllerFocused(controlId - CONTROL_CONTROLLER_BUTTONS_START);
+      }
+      else if (CONTROL_FEATURE_BUTTONS_START <= controlId && controlId < CONTROL_FEATURE_BUTTONS_END)
+      {
+        OnFeatureFocused(controlId - CONTROL_FEATURE_BUTTONS_START);
+      }
+      break;
+    }
+    case GUI_MSG_SETFOCUS:
+    {
+      int controlId = message.GetControlId();
+
+      if (CONTROL_CONTROLLER_BUTTONS_START <= controlId && controlId < CONTROL_CONTROLLER_BUTTONS_END)
+      {
+        OnControllerFocused(controlId - CONTROL_CONTROLLER_BUTTONS_START);
+      }
+      else if (CONTROL_FEATURE_BUTTONS_START <= controlId && controlId < CONTROL_FEATURE_BUTTONS_END)
+      {
+        OnFeatureFocused(controlId - CONTROL_FEATURE_BUTTONS_START);
+      }
+      break;
+    }
+    default:
+      break;
+  }
+
+  return CGUIDialog::OnMessage(message);
+}
+
+void CGUIControllerWindow::Notify(const Observable &obs, const ObservableMessage msg)
+{
+  if (msg == ObservableMessageAddons)
+    UpdateButtons();
+}
+
+void CGUIControllerWindow::OnInitWindow(void)
+{
+  using namespace PERIPHERALS;
+
+  CGUIDialog::OnInitWindow();
+
+  if (!m_featureList)
+  {
+    m_featureList = new CGUIFeatureList(this);
+    if (!m_featureList->Initialize())
+    {
+      delete m_featureList;
+      m_featureList = nullptr;
+    }
+  }
+
+  if (!m_controllerList && m_featureList)
+  {
+    m_controllerList = new CGUIControllerList(this, m_featureList);
+    if (!m_controllerList->Initialize())
+    {
+      delete m_controllerList;
+      m_controllerList = nullptr;
+    }
+  }
+
+  // Focus the first controller so that the feature list is loaded properly
+  CGUIMessage msgFocus(GUI_MSG_SETFOCUS, GetID(), CONTROL_CONTROLLER_BUTTONS_START);
+  OnMessage(msgFocus);
+
+  // Check for button mapping support (TODO: remove this)
+  PeripheralBusAddonPtr bus = std::static_pointer_cast<CPeripheralBusAddon>(g_peripherals.GetBusByType(PERIPHERAL_BUS_ADDON));
+  if (bus && !bus->HasFeature(FEATURE_JOYSTICK))
+  {
+    // TODO: Move the XML implementation of button map storage from add-on to
+    // Kodi while keeping support for add-on button-mapping
+
+    CLog::Log(LOGERROR, "Joystick support not found");
+
+    // "Joystick support not found"
+    // "Controller configuration is disabled. Install the proper joystick support add-on."
+    CGUIDialogOK::ShowAndGetInput(CVariant{35056}, CVariant{35057});
+
+    // close the window as there's nothing that can be done
+    Close();
+  }
+
+  UpdateButtons();
+
+  ADDON::CAddonMgr::GetInstance().RegisterObserver(this);
+}
+
+void CGUIControllerWindow::OnDeinitWindow(int nextWindowID)
+{
+  ADDON::CAddonMgr::GetInstance().UnregisterObserver(this);
+
+  if (m_controllerList)
+  {
+    m_controllerList->Deinitialize();
+    delete m_controllerList;
+    m_controllerList = nullptr;
+  }
+
+  if (m_featureList)
+  {
+    m_featureList->Deinitialize();
+    delete m_featureList;
+    m_featureList = nullptr;
+  }
+
+  CGUIDialog::OnDeinitWindow(nextWindowID);
+}
+
+void CGUIControllerWindow::OnControllerFocused(unsigned int controllerIndex)
+{
+  if (m_controllerList)
+    m_controllerList->OnFocus(controllerIndex);
+}
+
+void CGUIControllerWindow::OnControllerSelected(unsigned int controllerIndex)
+{
+  // jump to the feature list
+  SET_CONTROL_FOCUS(CONTROL_FEATURE_BUTTONS_START, 0);
+}
+
+void CGUIControllerWindow::OnFeatureFocused(unsigned int featureIndex)
+{
+  if (m_featureList)
+    m_featureList->OnFocus(featureIndex);
+}
+
+void CGUIControllerWindow::OnFeatureSelected(unsigned int featureIndex)
+{
+  if (m_featureList)
+    m_featureList->OnSelect(featureIndex);
+}
+
+void CGUIControllerWindow::UpdateButtons(void)
+{
+  using namespace ADDON;
+
+  VECADDONS addons;
+  CONTROL_ENABLE_ON_CONDITION(CONTROL_GET_MORE, CAddonMgr::GetInstance().GetInstallableAddons(addons, ADDON::ADDON_GAME_CONTROLLER) && !addons.empty());
+}
+
+void CGUIControllerWindow::GetMoreControllers(void)
+{
+  std::string strAddonId;
+  if (CGUIWindowAddonBrowser::SelectAddonID(ADDON::ADDON_GAME_CONTROLLER, strAddonId, false, true, false, true, false) < 0)
+  {
+    // "Controller profiles"
+    // "All available controller profiles are installed."
+    CGUIDialogOK::ShowAndGetInput(CVariant{ 35050 }, CVariant{ 35062 });
+    return;
+  }
+}
+
+void CGUIControllerWindow::ResetController(void)
+{
+  if (m_controllerList)
+    m_controllerList->ResetController();
+}
+
+void CGUIControllerWindow::ShowHelp(void)
+{
+  // "Help"
+  // <help text>
+  CGUIDialogOK::ShowAndGetInput(CVariant{10043}, CVariant{35055});
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIControllerWindow.h Added

@@ -0,0 +1,64 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "guilib/GUIDialog.h"
+#include "utils/Observer.h"
+
+namespace GAME
+{
+  class IControllerList;
+  class IFeatureList;
+
+  class CGUIControllerWindow : public CGUIDialog,
+                               public Observer
+  {
+  public:
+    CGUIControllerWindow(void);
+    virtual ~CGUIControllerWindow(void);
+
+    // implementation of CGUIControl via CGUIDialog
+    virtual bool OnMessage(CGUIMessage& message) override;
+
+    // implementation of Observer
+    void Notify(const Observable &obs, const ObservableMessage msg) override;
+
+  protected:
+    // implementation of CGUIWindow via CGUIDialog
+    virtual void OnInitWindow(void) override;
+    virtual void OnDeinitWindow(int nextWindowID) override;
+
+  private:
+    void OnControllerFocused(unsigned int controllerIndex);
+    void OnControllerSelected(unsigned int controllerIndex);
+    void OnFeatureFocused(unsigned int featureIndex);
+    void OnFeatureSelected(unsigned int featureIndex);
+
+    void UpdateButtons(void);
+
+    // Action for the available button
+    void GetMoreControllers(void);
+    void ResetController(void);
+    void ShowHelp(void);
+
+    IControllerList* m_controllerList;
+    IFeatureList*    m_featureList;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.cpp Added

@@ -0,0 +1,137 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "GUIFeatureList.h"
+#include "GUIConfigurationWizard.h"
+#include "GUIControllerDefines.h"
+#include "games/controllers/guicontrols/GUIAnalogStickButton.h"
+#include "games/controllers/guicontrols/GUIScalarFeatureButton.h"
+#include "games/controllers/Controller.h"
+#include "guilib/GUIButtonControl.h"
+#include "guilib/GUIControlGroupList.h"
+#include "guilib/GUIWindow.h"
+
+using namespace GAME;
+
+CGUIFeatureList::CGUIFeatureList(CGUIWindow* window) :
+  m_window(window),
+  m_guiList(nullptr),
+  m_guiButtonTemplate(nullptr),
+  m_wizard(new CGUIConfigurationWizard)
+{
+}
+
+CGUIFeatureList::~CGUIFeatureList(void)
+{
+  Deinitialize();
+  delete m_wizard;
+}
+
+bool CGUIFeatureList::Initialize(void)
+{
+  m_guiList = dynamic_cast<CGUIControlGroupList*>(m_window->GetControl(CONTROL_FEATURE_LIST));
+  m_guiButtonTemplate = dynamic_cast<CGUIButtonControl*>(m_window->GetControl(CONTROL_FEATURE_BUTTON_TEMPLATE));
+
+  if (m_guiButtonTemplate)
+    m_guiButtonTemplate->SetVisible(false);
+
+  return m_guiList && m_guiButtonTemplate;
+}
+
+void CGUIFeatureList::Deinitialize(void)
+{
+  CleanupButtons();
+
+  m_guiList = nullptr;
+  m_guiButtonTemplate = nullptr;
+}
+
+void CGUIFeatureList::Load(const ControllerPtr& controller)
+{
+  if (m_controller && m_controller->ID() == controller->ID())
+    return; // Already loaded
+
+  CleanupButtons();
+
+  m_controller = controller;
+
+  const std::vector<CControllerFeature>& features = controller->Layout().Features();
+
+  for (unsigned int buttonIndex = 0; buttonIndex < features.size(); buttonIndex++)
+  {
+    const CControllerFeature& feature = features[buttonIndex];
+
+    CGUIButtonControl* pButton = nullptr;
+    switch (feature.Type())
+    {
+      case JOYSTICK::FEATURE_TYPE::SCALAR:
+      {
+        pButton = new CGUIScalarFeatureButton(*m_guiButtonTemplate, m_wizard, feature, buttonIndex);
+        break;
+      }
+      case JOYSTICK::FEATURE_TYPE::ANALOG_STICK:
+      {
+        pButton = new CGUIAnalogStickButton(*m_guiButtonTemplate, m_wizard, feature, buttonIndex);
+        break;
+      }
+      default:
+        break;
+    }
+    if (pButton)
+      m_guiList->AddControl(pButton);
+
+    // Just in case
+    if (buttonIndex >= MAX_FEATURE_COUNT)
+      break;
+  }
+}
+
+void CGUIFeatureList::OnSelect(unsigned int index)
+{
+  const unsigned int featureCount = m_controller->Layout().FeatureCount();
+
+  // Generate list of buttons for the wizard
+  std::vector<IFeatureButton*> buttons;
+  for ( ; index < featureCount; index++)
+  {
+    IFeatureButton* control = GetButtonControl(index);
+    if (!control)
+      break;
+
+    buttons.push_back(control);
+  }
+
+  m_wizard->Run(m_controller->ID(), buttons);
+}
+
+IFeatureButton* CGUIFeatureList::GetButtonControl(unsigned int featureIndex)
+{
+  CGUIControl* control = m_guiList->GetControl(CONTROL_FEATURE_BUTTONS_START + featureIndex);
+
+  return dynamic_cast<CGUIFeatureButton*>(control);
+}
+
+void CGUIFeatureList::CleanupButtons(void)
+{
+  m_wizard->Abort(true);
+
+  if (m_guiList)
+    m_guiList->ClearAll();
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.h Added

@@ -0,0 +1,59 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "IConfigurationWindow.h"
+#include "games/controllers/ControllerTypes.h"
+#include "threads/Thread.h"
+
+class CGUIButtonControl;
+class CGUIControlGroupList;
+class CGUIWindow;
+
+namespace GAME
+{
+  class CGUIFeatureList : public IFeatureList
+  {
+  public:
+    CGUIFeatureList(CGUIWindow* window);
+    virtual ~CGUIFeatureList(void);
+
+    // implementation of IFeatureList
+    virtual bool Initialize(void) override;
+    virtual void Deinitialize(void) override;
+    virtual void Load(const ControllerPtr& controller) override;
+    virtual void OnFocus(unsigned int index) override { }
+    virtual void OnSelect(unsigned int index) override;
+
+  private:
+    IFeatureButton* GetButtonControl(unsigned int featureIndex);
+
+    void CleanupButtons(void);
+
+    // GUI stuff
+    CGUIWindow* const       m_window;
+    CGUIControlGroupList*   m_guiList;
+    CGUIButtonControl*      m_guiButtonTemplate;
+
+    // Game window stuff 
+    ControllerPtr           m_controller;
+    IConfigurationWizard*   m_wizard;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/IConfigurationWindow.h Added

@@ -0,0 +1,203 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "games/controllers/ControllerTypes.h"
+#include "input/joysticks/JoystickTypes.h"
+
+#include <string>
+
+class CEvent;
+
+/*!
+ * \brief Controller configuration window
+ *
+ * The configuration window presents a list of controllers. Also on the screen
+ * is a list of features belonging to that controller.
+ *
+ * The configuration utility reacts to several events:
+ *
+ *   1) When a controller is focused, the feature list is populated with the
+ *      controller's features.
+ *
+ *   2) When a feature is selected, the user is prompted for controller input.
+ *      This initiates a "wizard" that walks the user through the subsequent
+ *      features.
+ *
+ *   3) When the wizard's active feature loses focus, the wizard is cancelled
+ *      and the prompt for input ends.
+ */
+namespace GAME
+{
+  class CControllerFeature;
+
+  /*!
+   * \brief A list populated by installed controllers
+   */
+  class IControllerList
+  {
+  public:
+    virtual ~IControllerList(void) { }
+
+    /*!
+     * \brief  Initialize the resource
+     * \return true if the resource is initialized and can be used
+     *         false if the resource failed to initialize and must not be used
+     */
+    virtual bool Initialize(void) = 0;
+
+    /*!
+     * \brief  Deinitialize the resource
+     */
+    virtual void Deinitialize(void) = 0;
+
+    /*!
+     * \brief Refresh the contents of the list
+     */
+    virtual void Refresh(void) = 0;
+
+    /*
+     * \brief  The specified controller has been focused
+     * \param  controllerIndex The index of the controller being focused
+     */
+    virtual void OnFocus(unsigned int controllerIndex) = 0;
+
+    /*!
+     * \brief  The specified controller has been selected
+     * \param  controllerIndex The index of the controller being selected
+     */
+    virtual void OnSelect(unsigned int controllerIndex) = 0;
+
+    /*!
+     * \brief Reset the focused controller
+     */
+    virtual void ResetController(void) = 0;
+  };
+
+  /*!
+   * \brief A list populated by the controller's features
+   */
+  class IFeatureList
+  {
+  public:
+    virtual ~IFeatureList(void) { }
+
+    /*!
+     * \brief  Initialize the resource
+     * \return true if the resource is initialized and can be used
+     *         false if the resource failed to initialize and must not be used
+     */
+    virtual bool Initialize(void) = 0;
+
+    /*!
+     * \brief  Deinitialize the resource
+     * \remark This must be called if Initialize() returned true
+     */
+    virtual void Deinitialize(void) = 0;
+
+    /*!
+     * \brief Load the features for the specified controller
+     * \param controller The controller to load
+     */
+    virtual void Load(const ControllerPtr& controller) = 0;
+
+    /*!
+     * \brief  Focus has been set to the specified feature
+     * \param  featureIndex The index of the feature being focused
+     */
+    virtual void OnFocus(unsigned int index) = 0;
+
+    /*!
+     * \brief  The specified feature has been selected
+     * \param  featureIndex The index of the feature being selected
+     */
+    virtual void OnSelect(unsigned int index) = 0;
+  };
+
+  /*!
+   * \brief A button in a feature list
+   */
+  class IFeatureButton
+  {
+  public:
+    virtual ~IFeatureButton(void) { }
+
+    /*!
+     * \brief Get the feature represented by this button
+     */
+    virtual const CControllerFeature& Feature(void) const = 0;
+
+    /*!
+     * \brief Prompt the user for a single input element
+     * \param waitEvent The event to block on while prompting for input
+     * \return true if input was received (event fired), false if the prompt timed out
+     *
+     * After the button has finished prompting the user for all the input
+     * elements it requires, this will return false until Reset() is called.
+     */
+    virtual bool PromptForInput(CEvent& waitEvent) = 0;
+
+    /*!
+     * \brief Check if the button supports further calls to PromptForInput()
+     * \return true if the button requires no more input elements from the user
+     */
+    virtual bool IsFinished(void) const = 0;
+
+    /*!
+     * \brief Get the direction of the next analog stick prompt
+     * \return The next direction to be prompted, or UNKNOWN if this isn't an
+     *         analog stick or the prompt is finished
+     */
+    virtual JOYSTICK::CARDINAL_DIRECTION GetDirection(void) const = 0;
+
+    /*!
+     * \brief Reset button after prompting for input has finished
+     */
+    virtual void Reset(void) = 0;
+  };
+
+  /*!
+   * \brief A wizard to direct user input
+   */
+  class IConfigurationWizard
+  {
+  public:
+    virtual ~IConfigurationWizard(void) { }
+
+    /*!
+     * \brief Start the wizard at the specified feature
+     * \param featureIndex The index of the feature to start at
+     */
+    virtual void Run(const std::string& strControllerId, const std::vector<IFeatureButton*>& buttons) = 0;
+
+    /*!
+     * \brief Callback for feature losing focus
+     * \param button The feature button losing focus
+     */
+    virtual void OnUnfocus(IFeatureButton* button) = 0;
+
+    /*!
+     * \brief Abort a running wizard
+     * \param bWait True if the call should block until the wizard is fully aborted
+     * \return true if aborted, or false if the wizard wasn't running
+     */
+    virtual bool Abort(bool bWait = true) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/games/controllers/windows/Makefile Added

_service:download_url:master.tar.gz/xbmc/guiinfo/GUIInfoLabels.h Changed

@@ -307,13 +307,15 @@
 #define CONTAINER_SORT_ORDER        378
 #define CONTAINER_TOTALWATCHED      379
 #define CONTAINER_TOTALUNWATCHED    380
-#define MUSICPM_ENABLED             381
-#define MUSICPM_SONGSPLAYED         382
-#define MUSICPM_MATCHINGSONGS       383
-#define MUSICPM_MATCHINGSONGSPICKED 384
-#define MUSICPM_MATCHINGSONGSLEFT   385
-#define MUSICPM_RELAXEDSONGSPICKED  386
-#define MUSICPM_RANDOMSONGSPICKED   387
+#define CONTAINER_VIEWCOUNT         381
+#define CONTAINER_SHOWTITLE         382
+#define MUSICPM_ENABLED             383
+#define MUSICPM_SONGSPLAYED         384
+#define MUSICPM_MATCHINGSONGS       385
+#define MUSICPM_MATCHINGSONGSPICKED 386
+#define MUSICPM_MATCHINGSONGSLEFT   387
+#define MUSICPM_RELAXEDSONGSPICKED  388
+#define MUSICPM_RANDOMSONGSPICKED   389
 
 #define PLAYLIST_LENGTH             390
 #define PLAYLIST_POSITION           391
@@ -330,11 +332,23 @@
 #define VISUALISATION_HAS_PRESETS   404
 
 #define STRING_IS_EMPTY             410
-#define STRING_COMPARE              411
-#define STRING_STR                  412
-#define INTEGER_GREATER_THAN        413
-#define STRING_STR_LEFT             414
-#define STRING_STR_RIGHT            415
+#define STRING_IS_EQUAL             411
+#define STRING_STARTS_WITH          412
+#define STRING_ENDS_WITH            413
+#define STRING_CONTAINS             414
+// deprecated begin
+// should be removed before L*** v18
+#define STRING_COMPARE              415
+#define STRING_STR                  416
+#define STRING_STR_LEFT             418
+#define STRING_STR_RIGHT            419
+// deprecated end
+
+#define INTEGER_IS_EQUAL            450
+#define INTEGER_GREATER_THAN        451
+#define INTEGER_GREATER_OR_EQUAL    452
+#define INTEGER_LESS_THAN           453
+#define INTEGER_LESS_OR_EQUAL       454
 
 #define SKIN_BOOL                   600
 #define SKIN_STRING                 601
@@ -360,7 +374,6 @@
 #define SYSTEM_TOTAL_SPACE          681
 #define SYSTEM_USED_SPACE_PERCENT   682
 #define SYSTEM_FREE_SPACE_PERCENT   683
-#define SYSTEM_DVD_TRAY_STATE       700
 #define SYSTEM_GET_BOOL             704
 #define SYSTEM_GET_CORE_USAGE       705
 #define SYSTEM_HAS_CORE_ID          706
@@ -427,14 +440,13 @@
 #define PVR_HAS_NONRECORDING_TIMER  (PVR_CONDITIONS_START + 2)
 #define PVR_HAS_EPG                 (PVR_CONDITIONS_START + 3)
 #define PVR_HAS_TXT                 (PVR_CONDITIONS_START + 4)
-#define PVR_HAS_DIRECTOR            (PVR_CONDITIONS_START + 5)
-#define PVR_IS_PLAYING_TV           (PVR_CONDITIONS_START + 6)
-#define PVR_IS_PLAYING_RADIO        (PVR_CONDITIONS_START + 7)
-#define PVR_IS_PLAYING_RECORDING    (PVR_CONDITIONS_START + 8)
-#define PVR_ACTUAL_STREAM_ENCRYPTED (PVR_CONDITIONS_START + 9)
-#define PVR_HAS_TV_CHANNELS         (PVR_CONDITIONS_START + 10)
-#define PVR_HAS_RADIO_CHANNELS      (PVR_CONDITIONS_START + 11)
-#define PVR_IS_TIMESHIFTING         (PVR_CONDITIONS_START + 12)
+#define PVR_IS_PLAYING_TV           (PVR_CONDITIONS_START + 5)
+#define PVR_IS_PLAYING_RADIO        (PVR_CONDITIONS_START + 6)
+#define PVR_IS_PLAYING_RECORDING    (PVR_CONDITIONS_START + 7)
+#define PVR_ACTUAL_STREAM_ENCRYPTED (PVR_CONDITIONS_START + 8)
+#define PVR_HAS_TV_CHANNELS         (PVR_CONDITIONS_START + 9)
+#define PVR_HAS_RADIO_CHANNELS      (PVR_CONDITIONS_START + 10)
+#define PVR_IS_TIMESHIFTING         (PVR_CONDITIONS_START + 11)
 #define PVR_CONDITIONS_END          PVR_IS_TIMESHIFTING
 
 #define PVR_STRINGS_START           1200

_service:download_url:master.tar.gz/xbmc/guilib/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/guilib/D3DResource.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/D3DResource.h Changed

_service:download_url:master.tar.gz/xbmc/guilib/FFmpegImage.cpp Changed

@@ -327,7 +327,7 @@
   }
 
   av_frame_free(&frame);
-  av_free_packet(&pkt);
+  av_packet_unref(&pkt);
 
   return clone;
 }
@@ -375,24 +375,28 @@
 
 bool CFFmpegImage::DecodeFrame(AVFrame* frame, unsigned int width, unsigned int height, unsigned int pitch, unsigned char * const pixels)
 {
-  AVPicture* pictureRGB = static_cast<AVPicture*>(av_mallocz(sizeof(AVPicture)));
+  AVFrame* pictureRGB = av_frame_alloc();
   if (!pictureRGB)
   {
-    CLog::LogFunction(LOGERROR, __FUNCTION__, "AVPicture could not be allocated");
+    CLog::LogFunction(LOGERROR, __FUNCTION__, "AVFrame could not be allocated");
     return false;
   }
 
-  int size = avpicture_fill(pictureRGB, NULL, AV_PIX_FMT_RGB32, width, height);
+  int size = av_image_fill_arrays(pictureRGB->data, pictureRGB->linesize, NULL, AV_PIX_FMT_RGB32, width, height, 16);
   if (size < 0)
   {
-    CLog::LogFunction(LOGERROR, __FUNCTION__, "Could not allocate AVPicture member with %i x %i pixes", width, height);
-    av_free(pictureRGB);
+    CLog::LogFunction(LOGERROR, __FUNCTION__, "Could not allocate AVFrame member with %i x %i pixes", width, height);
+    av_frame_free(&pictureRGB);
     return false;
   }
 
   bool needsCopy = false;
   int pixelsSize = pitch * height;
-  if (size == pixelsSize && (int)pitch == pictureRGB->linesize[0])
+  bool aligned = (((uintptr_t)(const void *)(pixels)) % (16) == 0);
+  if (!aligned)
+    CLog::Log(LOGDEBUG, "Alignment of external buffer is not suitable for ffmpeg intrinsics - please fix your malloc");
+
+  if (aligned && size == pixelsSize && (int)pitch == pictureRGB->linesize[0])
   {
     // We can use the pixels buffer directly
     pictureRGB->data[0] = pixels;
@@ -400,10 +404,13 @@
   else
   {
     // We need an extra buffer and copy it manually afterwards
-    if (avpicture_alloc(pictureRGB, AV_PIX_FMT_RGB32, width, height) < 0)
+    pictureRGB->format = AV_PIX_FMT_RGB32;
+    pictureRGB->width = width;
+    pictureRGB->height = height;
+    if (av_frame_get_buffer(pictureRGB, 16) < 0)
     {
       CLog::LogFunction(LOGERROR, __FUNCTION__, "Could not allocate temp buffer of size %i bytes", size);
-      av_free(pictureRGB);
+      av_frame_free(&pictureRGB);
       return false;
     }
     needsCopy = true;
@@ -464,12 +471,14 @@
       src += pictureRGB->linesize[0];
       dst += pitch;
     }
-
-    avpicture_free(pictureRGB);
+    av_frame_free(&pictureRGB);
+  }
+  else
+  {
+    // we only lended the data so don't get it deleted
+    pictureRGB->data[0] = nullptr;
+    av_frame_free(&pictureRGB);
   }
-  pictureRGB->data[0] = nullptr;
-  avpicture_free(pictureRGB);
-  av_free(pictureRGB);
 
   // update width and height original dimensions are kept
   m_height = nHeight;
@@ -531,7 +540,7 @@
 
   unsigned int internalBufOutSize = 0;
 
-  int size = avpicture_get_size(tdm.avOutctx->pix_fmt, tdm.avOutctx->width, tdm.avOutctx->height);
+  int size = av_image_get_buffer_size(tdm.avOutctx->pix_fmt, tdm.avOutctx->width, tdm.avOutctx->height, 16);
   if (size < 0)
   {
     CLog::Log(LOGERROR, "Could not compute picture size for thumbnail: %s", destFile.c_str());
@@ -582,7 +591,7 @@
     return false;
   }
 
-  if (avpicture_fill((AVPicture*)tdm.frame_temporary, tdm.intermediateBuffer, jpg_output ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_RGBA, width, height) < 0)
+  if (av_image_fill_arrays(tdm.frame_temporary->data, tdm.frame_temporary->linesize, tdm.intermediateBuffer, jpg_output ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_RGBA, width, height, 16) < 0)
   {
     CLog::Log(LOGERROR, "Could not fill picture for thumbnail: %s", destFile.c_str());
     CleanupLocalOutputBuffer();

_service:download_url:master.tar.gz/xbmc/guilib/GUIBaseContainer.cpp Changed

@@ -348,16 +348,33 @@
         return CGUIControl::OnAction(action);
       }
     }
+  case ACTION_CONTEXT_MENU:
+    if (m_listProvider)
+    {
+      int selected = GetSelectedItem();
+      if (selected >= 0 && selected < m_items.size())
+      {
+        m_listProvider->OnContextMenu(m_items[selected]);
+        return true;
+      }
+    }
     break;
-
   case ACTION_SHOW_INFO:
+    if (m_listProvider)
     {
-      if (OnInfo())
+      int selected = GetSelectedItem();
+      if (selected >= 0 && selected < m_items.size())
+      {
+        m_listProvider->OnInfo(m_items[selected]);
         return true;
-      else if (action.GetID())
-        return OnClick(action.GetID());
+      }
     }
-    break;
+    else if (OnInfo())
+      return true;
+    else if (action.GetID())
+      return OnClick(action.GetID());
+    else
+      return false;
 
   case ACTION_FIRST_PAGE:
     SelectItem(0);
@@ -369,17 +386,11 @@
     return true;
 
   case ACTION_NEXT_LETTER:
-    {
-      OnNextLetter();
-      return true;
-    }
-    break;
+    OnNextLetter();
+    return true;
   case ACTION_PREV_LETTER:
-    {
-      OnPrevLetter();
-      return true;
-    }
-    break;
+    OnPrevLetter();
+    return true;
   case ACTION_JUMP_SMS2:
   case ACTION_JUMP_SMS3:
   case ACTION_JUMP_SMS4:
@@ -388,19 +399,13 @@
   case ACTION_JUMP_SMS7:
   case ACTION_JUMP_SMS8:
   case ACTION_JUMP_SMS9:
-    {
-      OnJumpSMS(action.GetID() - ACTION_JUMP_SMS2 + 2);
-      return true;
-    }
-    break;
+    OnJumpSMS(action.GetID() - ACTION_JUMP_SMS2 + 2);
+    return true;
 
   default:
-    if (action.GetID())
-    {
-      return OnClick(action.GetID());
-    }
+    break;
   }
-  return false;
+  return action.GetID() && OnClick(action.GetID());
 }
 
 bool CGUIBaseContainer::OnMessage(CGUIMessage& message)
@@ -1095,17 +1100,15 @@
   TiXmlElement *itemElement = layout->FirstChildElement("itemlayout");
   while (itemElement)
   { // we have a new item layout
-    CGUIListItemLayout itemLayout;
-    itemLayout.LoadLayout(itemElement, GetParentID(), false);
-    m_layouts.push_back(itemLayout);
+    m_layouts.emplace_back();
+    m_layouts.back().LoadLayout(itemElement, GetParentID(), false);
     itemElement = itemElement->NextSiblingElement("itemlayout");
   }
   itemElement = layout->FirstChildElement("focusedlayout");
   while (itemElement)
   { // we have a new item layout
-    CGUIListItemLayout itemLayout;
-    itemLayout.LoadLayout(itemElement, GetParentID(), true);
-    m_focusedLayouts.push_back(itemLayout);
+    m_focusedLayouts.emplace_back();
+    m_focusedLayouts.back().LoadLayout(itemElement, GetParentID(), true);
     itemElement = itemElement->NextSiblingElement("focusedlayout");
   }
 }
@@ -1201,28 +1204,28 @@
 void CGUIBaseContainer::GetCurrentLayouts()
 {
   m_layout = NULL;
-  for (unsigned int i = 0; i < m_layouts.size(); i++)
+  for (auto &layout : m_layouts)
   {
-    if (m_layouts[i].CheckCondition())
+    if (layout.CheckCondition())
     {
-      m_layout = &m_layouts[i];
+      m_layout = &layout;
       break;
     }
   }
-  if (!m_layout && m_layouts.size())
-    m_layout = &m_layouts[0];  // failsafe
+  if (!m_layout && !m_layouts.empty())
+    m_layout = &m_layouts.front(); // failsafe
 
   m_focusedLayout = NULL;
-  for (unsigned int i = 0; i < m_focusedLayouts.size(); i++)
+  for (auto &layout : m_focusedLayouts)
   {
-    if (m_focusedLayouts[i].CheckCondition())
+    if (layout.CheckCondition())
     {
-      m_focusedLayout = &m_focusedLayouts[i];
+      m_focusedLayout = &layout;
       break;
     }
   }
-  if (!m_focusedLayout && m_focusedLayouts.size())
-    m_focusedLayout = &m_focusedLayouts[0];  // failsafe
+  if (!m_focusedLayout && !m_focusedLayouts.empty())
+    m_focusedLayout = &m_focusedLayouts.front(); // failsafe
 }
 
 bool CGUIBaseContainer::HasNextPage() const

_service:download_url:master.tar.gz/xbmc/guilib/GUIControl.h Changed

_service:download_url:master.tar.gz/xbmc/guilib/GUIControlFactory.cpp Changed

@@ -64,6 +64,7 @@
 #include "utils/RssManager.h"
 #include "utils/StringUtils.h"
 #include "GUIAction.h"
+#include "games/controllers/guicontrols/GUIGameController.h"
 #include "Util.h"
 
 using namespace EPG;
@@ -105,6 +106,7 @@
     {"grouplist",         CGUIControl::GUICONTROL_GROUPLIST},
     {"scrollbar",         CGUIControl::GUICONTROL_SCROLLBAR},
     {"multiselect",       CGUIControl::GUICONTROL_MULTISELECT},
+    {"gamecontroller",    CGUIControl::GUICONTROL_GAMECONTROLLER},
     {"list",              CGUIControl::GUICONTAINER_LIST},
     {"wraplist",          CGUIControl::GUICONTAINER_WRAPLIST},
     {"fixedlist",         CGUIControl::GUICONTAINER_FIXEDLIST},
@@ -1494,6 +1496,9 @@
   case CGUIControl::GUICONTROL_RENDERADDON:
     control = new CGUIRenderingControl(parentID, id, posX, posY, width, height);
     break;
+  case CGUIControl::GUICONTROL_GAMECONTROLLER:
+    control = new GAME::CGUIGameController(parentID, id, posX, posY, width, height);
+    break;
   default:
     break;
   }

_service:download_url:master.tar.gz/xbmc/guilib/GUIControlGroup.cpp Changed

@@ -52,8 +52,8 @@
   m_renderFocusedLast = from.m_renderFocusedLast;
 
   // run through and add our controls
-  for (ciControls it = from.m_children.begin(); it != from.m_children.end(); ++it)
-    AddControl((*it)->Clone());
+  for (auto *i : from.m_children)
+    AddControl(i->Clone());
 
   // defaults
   m_focusedControl = 0;
@@ -68,9 +68,8 @@
 void CGUIControlGroup::AllocResources()
 {
   CGUIControl::AllocResources();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     if (!control->IsDynamicallyAllocated())
       control->AllocResources();
   }
@@ -79,18 +78,16 @@
 void CGUIControlGroup::FreeResources(bool immediately)
 {
   CGUIControl::FreeResources(immediately);
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     control->FreeResources(immediately);
   }
 }
 
 void CGUIControlGroup::DynamicResourceAlloc(bool bOnOff)
 {
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     control->DynamicResourceAlloc(bOnOff);
   }
 }
@@ -101,9 +98,8 @@
   g_graphicsContext.SetOrigin(pos.x, pos.y);
 
   CRect rect;
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     control->UpdateVisibility();
     unsigned int oldDirty = dirtyregions.size();
     control->DoProcess(currentTime, dirtyregions);
@@ -121,9 +117,8 @@
   CPoint pos(GetPosition());
   g_graphicsContext.SetOrigin(pos.x, pos.y);
   CGUIControl *focusedControl = NULL;
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     if (m_renderFocusedLast && control->HasFocus())
       focusedControl = control;
     else
@@ -137,8 +132,8 @@
 
 void CGUIControlGroup::RenderEx()
 {
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->RenderEx();
+  for (auto *control : m_children)
+    control->RenderEx();
   CGUIControl::RenderEx();
 }
 
@@ -150,9 +145,8 @@
 
 bool CGUIControlGroup::HasFocus() const
 {
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     if (control->HasFocus())
       return true;
   }
@@ -226,8 +220,8 @@
   case GUI_MSG_LOSTFOCUS:
     {
       // set all subcontrols unfocused
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-        (*it)->SetFocus(false);
+      for (auto *control : m_children)
+        control->SetFocus(false);
       if (!HasID(message.GetParam1()))
       { // we don't have the new id, so unfocus
         SetFocus(false);
@@ -242,10 +236,10 @@
   case GUI_MSG_REFRESH_LIST:
   case GUI_MSG_WINDOW_RESIZE:
     { // send to all child controls (make sure the target is the control id)
-      for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+      for (auto *control : m_children)
       {
-        CGUIMessage msg(message.GetMessage(), message.GetSenderId(), (*it)->GetID(), message.GetParam1());
-        (*it)->OnMessage(msg);
+        CGUIMessage msg(message.GetMessage(), message.GetSenderId(), control->GetID(), message.GetParam1());
+        control->OnMessage(msg);
       }
       return true;
     }
@@ -255,9 +249,8 @@
   //not intented for any specific control, send to all childs and our base handler.
   if (message.GetControlId() == 0)
   {
-    for (iControls it = m_children.begin();it != m_children.end(); ++it)
+    for (auto *control : m_children)
     {
-      CGUIControl* control = *it;
       handled |= control->OnMessage(message);
     }
     return CGUIControl::OnMessage(message) || handled;
@@ -272,9 +265,8 @@
 bool CGUIControlGroup::SendControlMessage(CGUIMessage &message)
 {
   // see if a child matches, and send to the child control if so
-  for (iControls it = m_children.begin();it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl* control = *it;
     if (control->HasVisibleID(message.GetControlId()))
     {
       if (control->OnMessage(message))
@@ -283,9 +275,8 @@
   }
   // Unhandled - send to all matching invisible controls as well
   bool handled(false);
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl* control = *it;
     if (control->HasID(message.GetControlId()))
     {
       if (control->OnMessage(message))
@@ -299,9 +290,9 @@
 {
   if (!CGUIControl::CanFocus()) return false;
   // see if we have any children that can be focused
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    if ((*it)->CanFocus())
+    if (control->CanFocus())
       return true;
   }
   return false;
@@ -310,8 +301,8 @@
 void CGUIControlGroup::SetInitialVisibility()
 {
   CGUIControl::SetInitialVisibility();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->SetInitialVisibility();
+  for (auto *control : m_children)
+    control->SetInitialVisibility();
 }
 
 void CGUIControlGroup::QueueAnimation(ANIMATION_TYPE animType)
@@ -320,8 +311,8 @@
   // send window level animations to our children as well
   if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
   {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      (*it)->QueueAnimation(animType);
+    for (auto *control : m_children)
+      control->QueueAnimation(animType);
   }
 }
 
@@ -331,16 +322,16 @@
   // send window level animations to our children as well
   if (animType == ANIM_TYPE_WINDOW_OPEN || animType == ANIM_TYPE_WINDOW_CLOSE)
   {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      (*it)->ResetAnimation(animType);
+    for (auto *control : m_children)
+      control->ResetAnimation(animType);
   }
 }
 
 void CGUIControlGroup::ResetAnimations()
 { // resets all animations, regardless of condition
   CGUIControl::ResetAnimations();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->ResetAnimations();
+  for (auto *control : m_children)
+    control->ResetAnimations();
 }
 
 bool CGUIControlGroup::IsAnimating(ANIMATION_TYPE animType)
@@ -350,9 +341,9 @@
 
   if (IsVisible())
   {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    for (auto *control : m_children)
     {
-      if ((*it)->IsAnimating(animType))
+      if (control->IsAnimating(animType))
         return true;
     }
   }
@@ -366,9 +357,9 @@
 
   if (IsVisible())
   {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+    for (auto *control : m_children)
     {
-      if ((*it)->HasAnimation(animType))
+      if (control->HasAnimation(animType))
         return true;
     }
   }
@@ -408,9 +399,8 @@
   CPoint controlCoords(point);
   m_transform.InverseTransformPosition(controlCoords.x, controlCoords.y);
   controlCoords -= GetPosition();
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *child : m_children)
   {
-    CGUIControl *child = *it;
     child->UnfocusFromPoint(controlCoords);
   }
   CGUIControl::UnfocusFromPoint(point);
@@ -419,9 +409,8 @@
 bool CGUIControlGroup::HasID(int id) const
 {
   if (CGUIControl::HasID(id)) return true;
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *child : m_children)
   {
-    CGUIControl *child = *it;
     if (child->HasID(id))
       return true;
   }
@@ -434,9 +423,8 @@
   if (CGUIControl::HasVisibleID(id)) return true;
   // if the group isn't visible, then none of it's children can be
   if (!IsVisible()) return false;
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *child : m_children)
   {
-    CGUIControl *child = *it;
     if (child->HasVisibleID(id))
       return true;
   }
@@ -504,9 +492,8 @@
   }
 
   // if lookup didn't find focused control, iterate m_children to find it
-  for (ciControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    const CGUIControl* control = *it;
     // Avoid calling HasFocus() on control group as it will (possibly) recursively
     // traverse entire group tree just to check if there is focused control.
     // We are recursively traversing it here so no point in doing it twice.
@@ -527,9 +514,8 @@
 {
   if (!CanFocus()) return NULL;
   if (id && id == (int) GetID()) return this; // we're focusable and they want us
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *pControl : m_children)
   {
-    CGUIControl* pControl = *it;
     if (pControl->IsGroup())
     {
       CGUIControlGroup *group = (CGUIControlGroup *)pControl;
@@ -559,8 +545,8 @@
   if (control->IsGroup())
   { // first add all the subitems of this group (if they exist)
     const LookupMap map = ((CGUIControlGroup *)control)->GetLookup();
-    for (LookupMap::const_iterator i = map.begin(); i != map.end(); ++i)
-      m_lookup.insert(m_lookup.upper_bound(i->first), std::make_pair(i->first, i->second));
+    for (const auto &i : map)
+      m_lookup.insert(m_lookup.upper_bound(i.first), std::make_pair(i.first, i.second));
   }
   if (control->GetID())
     m_lookup.insert(m_lookup.upper_bound(control->GetID()), std::make_pair(control->GetID(), control));
@@ -574,11 +560,11 @@
   if (control->IsGroup())
   { // remove the group's lookup
     const LookupMap &map = ((CGUIControlGroup *)control)->GetLookup();
-    for (LookupMap::const_iterator i = map.begin(); i != map.end(); ++i)
+    for (const auto &i : map)
     { // remove this control
       for (LookupMap::iterator it = m_lookup.begin(); it != m_lookup.end(); ++it)
       {
-        if (i->second == it->second)
+        if (i.second == it->second)
         {
           m_lookup.erase(it);
           break;
@@ -606,9 +592,9 @@
 {
   if (control->GetID())
   {
-    for (LookupMap::const_iterator it = m_lookup.begin(); it != m_lookup.end(); ++it)
+    for (const auto &i : m_lookup)
     {
-      if (control == it->second)
+      if (control == i.second)
         return true;
     }
   }
@@ -636,8 +622,8 @@
 {
   // save our state, and that of our children
   states.push_back(CControlState(GetID(), m_focusedControl));
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->SaveStates(states);
+  for (auto *control : m_children)
+    control->SaveStates(states);
 }
 
 // Note: This routine doesn't delete the control.  It just removes it from the control list
@@ -664,13 +650,12 @@
   // first remove from the lookup table
   if (m_parentControl)
   {
-    for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-      ((CGUIControlGroup *)m_parentControl)->RemoveLookup(*it);
+    for (auto *control : m_children)
+      ((CGUIControlGroup *)m_parentControl)->RemoveLookup(control);
   }
   // and delete all our children
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    CGUIControl *control = *it;
     delete control;
   }
   m_focusedControl = 0;
@@ -681,19 +666,19 @@
 
 void CGUIControlGroup::GetContainers(std::vector<CGUIControl *> &containers) const
 {
-  for (ciControls it = m_children.begin();it != m_children.end(); ++it)
+  for (auto *control : m_children)
   {
-    if ((*it)->IsContainer())
-      containers.push_back(*it);
-    else if ((*it)->IsGroup())
-      ((CGUIControlGroup *)(*it))->GetContainers(containers);
+    if (control->IsContainer())
+      containers.push_back(control);
+    else if (control->IsGroup())
+      ((CGUIControlGroup *)control)->GetContainers(containers);
   }
 }
 
 #ifdef _DEBUG
 void CGUIControlGroup::DumpTextureUse()
 {
-  for (iControls it = m_children.begin(); it != m_children.end(); ++it)
-    (*it)->DumpTextureUse();
+  for (auto *control : m_children)
+    control->DumpTextureUse();
 }
 #endif

_service:download_url:master.tar.gz/xbmc/guilib/GUIFontTTF.cpp Changed

@@ -50,6 +50,8 @@
 
 #define CHARS_PER_TEXTURE_LINE 20 // number of characters to cache per texture line
 #define CHAR_CHUNK    64      // 64 chars allocated at a time (1024 bytes)
+#define GLYPH_STRENGTH_BOLD 24
+#define GLYPH_STRENGTH_LIGHT -48
 
 
 class CFreeTypeLibrary
@@ -697,13 +699,13 @@
   }
   // make bold if applicable
   if (style & FONT_STYLE_BOLD)
-    EmboldenGlyph(m_face->glyph);
+    SetGlyphStrength(m_face->glyph, GLYPH_STRENGTH_BOLD);
   // and italics if applicable
   if (style & FONT_STYLE_ITALICS)
     ObliqueGlyph(m_face->glyph);
   // and light if applicable
   if (style & FONT_STYLE_LIGHT)
-    LightenGlyph(m_face->glyph);
+    SetGlyphStrength(m_face->glyph, GLYPH_STRENGTH_LIGHT);
   // grab the glyph
   if (FT_Get_Glyph(m_face->glyph, &glyph))
   {
@@ -968,14 +970,14 @@
 
 
 // Embolden code - original taken from freetype2 (ftsynth.c)
-void CGUIFontTTFBase::EmboldenGlyph(FT_GlyphSlot slot)
+void CGUIFontTTFBase::SetGlyphStrength(FT_GlyphSlot slot, int glyphStrength)
 {
   if ( slot->format != FT_GLYPH_FORMAT_OUTLINE )
     return;
 
   /* some reasonable strength */
   FT_Pos strength = FT_MulFix( m_face->units_per_EM,
-                    m_face->size->metrics.y_scale ) / 24;
+                    m_face->size->metrics.y_scale ) / glyphStrength;
 
   FT_BBox bbox_before, bbox_after;
   FT_Outline_Get_CBox( &slot->outline, &bbox_before );
@@ -999,39 +1001,3 @@
   slot->metrics.vertBearingY += dy;
   slot->metrics.vertAdvance  += dy;
 }
- 
-// Lighten code - original taken from freetype2 (ftsynth.c)  
-void CGUIFontTTFBase::LightenGlyph(FT_GlyphSlot slot)
-{
-  if (slot->format != FT_GLYPH_FORMAT_OUTLINE)
-    return;
-
-  /* some reasonable strength */
-  FT_Pos strength = FT_MulFix(m_face->units_per_EM,
-                              m_face->size->metrics.y_scale) / -48;
-
-  FT_BBox bbox_before, bbox_after;
-  FT_Outline_Get_CBox(&slot->outline, &bbox_before);
-  FT_Outline_Embolden(&slot->outline, strength);  // ignore error  
-  FT_Outline_Get_CBox(&slot->outline, &bbox_after);
-
-  FT_Pos dx = bbox_after.xMax - bbox_before.xMax;
-  FT_Pos dy = bbox_after.yMax - bbox_before.yMax;
-
-  if (slot->advance.x)
-    slot->advance.x += dx;
-
-  if (slot->advance.y)
-    slot->advance.y += dy;
-
-  slot->metrics.width += dx;
-  slot->metrics.height += dy;
-  slot->metrics.horiBearingY += dy;
-  slot->metrics.horiAdvance += dx;
-  slot->metrics.vertBearingX -= dx / 2;
-  slot->metrics.vertBearingY += dy;
-  slot->metrics.vertAdvance += dy;
-}
-
-
-

_service:download_url:master.tar.gz/xbmc/guilib/GUIFontTTF.h Changed

_service:download_url:master.tar.gz/xbmc/guilib/GUIIncludes.cpp Changed

@@ -83,6 +83,13 @@
   m_constantNodes.insert("fadetime");
   m_constantNodes.insert("pauseatend");
   m_constantNodes.insert("depth");
+
+  m_expressionAttributes.insert("condition");
+
+  m_expressionNodes.insert("visible");
+  m_expressionNodes.insert("enable");
+  m_expressionNodes.insert("usealttexture");
+  m_expressionNodes.insert("selected");
 }
 
 CGUIIncludes::~CGUIIncludes()
@@ -96,6 +103,7 @@
   m_constants.clear();
   m_skinvariables.clear();
   m_files.clear();
+  m_expressions.clear();
 }
 
 bool CGUIIncludes::LoadIncludes(const std::string &includeFile)
@@ -197,6 +205,17 @@
     node = node->NextSiblingElement("variable");
   }
 
+  node = root->FirstChildElement("expression");
+  while (node)
+  {
+    if (node->Attribute("name") && node->FirstChild())
+    {
+      std::string tagName = node->Attribute("name");
+      m_expressions.insert(make_pair(tagName, node->FirstChild()->ValueStr()));
+    }
+    node = node->NextSiblingElement("expression");
+  }
+
   return true;
 }
 
@@ -341,11 +360,15 @@
   { // check the attribute against our set
     if (m_constantAttributes.count(attribute->Name()))
       attribute->SetValue(ResolveConstant(attribute->ValueStr()));
+    if (m_expressionAttributes.count(attribute->Name()))
+      attribute->SetValue(ResolveExpressions(attribute->ValueStr()));
     attribute = attribute->Next();
   }
   // also do the value
   if (node->FirstChild() && node->FirstChild()->Type() == TiXmlNode::TINYXML_TEXT && m_constantNodes.count(node->ValueStr()))
     node->FirstChild()->SetValue(ResolveConstant(node->FirstChild()->ValueStr()));
+  if (node->FirstChild() && node->FirstChild()->Type() == TiXmlNode::TINYXML_TEXT && m_expressionNodes.count(node->ValueStr()))
+    node->FirstChild()->SetValue(ResolveExpressions(node->FirstChild()->ValueStr()));
 }
 
 bool CGUIIncludes::GetParameters(const TiXmlElement *include, const char *valueAttribute, Params& params)
@@ -490,6 +513,19 @@
   return StringUtils::Join(values, ",");
 }
 
+std::string CGUIIncludes::ResolveExpressions(const std::string &expression) const
+{
+  std::string work(expression);
+  CGUIInfoLabel::ReplaceSpecialKeywordReferences(work, "EXP", [&](const std::string &str) -> std::string {
+    std::map<std::string, std::string>::const_iterator it = m_expressions.find(str);
+    if (it != m_expressions.end())
+      return it->second;
+    return "";
+  });
+
+  return work;
+}
+
 const INFO::CSkinVariableString* CGUIIncludes::CreateSkinVariable(const std::string& name, int context)
 {
   std::map<std::string, TiXmlElement>::const_iterator it = m_skinvariables.find(name);

_service:download_url:master.tar.gz/xbmc/guilib/GUIIncludes.h Changed

_service:download_url:master.tar.gz/xbmc/guilib/GUIListContainer.cpp Changed

@@ -285,14 +285,12 @@
                                  float textureHeight, float itemWidth, float itemHeight, float spaceBetweenItems)
 : CGUIBaseContainer(parentID, controlID, posX, posY, width, height, VERTICAL, 200, 0)
 {
-  CGUIListItemLayout layout;
-  layout.CreateListControlLayouts(width, textureHeight + spaceBetweenItems, false, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, "", "");
-  m_layouts.push_back(layout);
+  m_layouts.emplace_back();
+  m_layouts.back().CreateListControlLayouts(width, textureHeight + spaceBetweenItems, false, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, "", "");
   std::string condition = StringUtils::Format("control.hasfocus(%i)", controlID);
   std::string condition2 = "!" + condition;
-  CGUIListItemLayout focusLayout;
-  focusLayout.CreateListControlLayouts(width, textureHeight + spaceBetweenItems, true, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, condition2, condition);
-  m_focusedLayouts.push_back(focusLayout);
+  m_focusedLayouts.emplace_back();
+  m_focusedLayouts.back().CreateListControlLayouts(width, textureHeight + spaceBetweenItems, true, labelInfo, labelInfo2, textureButton, textureButtonFocus, textureHeight, itemWidth, itemHeight, condition2, condition);
   m_height = floor(m_height / (textureHeight + spaceBetweenItems)) * (textureHeight + spaceBetweenItems);
   ControlType = GUICONTAINER_LIST;
 }

_service:download_url:master.tar.gz/xbmc/guilib/GUIWindow.h Changed

_service:download_url:master.tar.gz/xbmc/guilib/GUIWindowManager.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/GraphicContext.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/Resolution.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/StereoscopicsManager.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/Texture.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/TextureDX.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/TextureGL.cpp Changed

_service:download_url:master.tar.gz/xbmc/guilib/WindowIDs.h Changed

_service:download_url:master.tar.gz/xbmc/input/ButtonTranslator.cpp Changed

@@ -41,14 +41,6 @@
 #include "utils/XBMCTinyXML.h"
 #include "XBIRRemote.h"
 
-#if defined(TARGET_WINDOWS)
-#include "input/windows/WINJoystick.h"
-#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-#include "SDLJoystick.h"
-#endif
-
-#define JOYSTICK_DEFAULT_MAP "_xbmc_"
-
 using namespace XFILE;
 
 typedef struct
@@ -244,6 +236,8 @@
     { "playpvrtv"                , ACTION_PVR_PLAY_TV },
     { "playpvrradio"             , ACTION_PVR_PLAY_RADIO },
     { "record"                   , ACTION_RECORD },
+    { "togglecommskip"           , ACTION_TOGGLE_COMMSKIP },
+    { "showtimerrule"            , ACTION_PVR_SHOW_TIMER_RULE },
 
     // Mouse actions
     { "leftclick"                , ACTION_MOUSE_LEFT_CLICK },
@@ -272,6 +266,31 @@
     { "noop"                     , ACTION_NOOP }
 };
 
+bool CButtonTranslator::IsAnalog(int actionID)
+{
+  switch (actionID)
+  {
+  case ACTION_ANALOG_SEEK_FORWARD:
+  case ACTION_ANALOG_SEEK_BACK:
+  case ACTION_SCROLL_UP:
+  case ACTION_SCROLL_DOWN:
+  case ACTION_ANALOG_FORWARD:
+  case ACTION_ANALOG_REWIND:
+  case ACTION_ANALOG_MOVE:
+  case ACTION_ANALOG_MOVE_X:
+  case ACTION_ANALOG_MOVE_Y:
+  case ACTION_CURSOR_LEFT:
+  case ACTION_CURSOR_RIGHT:
+  case ACTION_VOLUME_UP:
+  case ACTION_VOLUME_DOWN:
+  case ACTION_ZOOM_IN:
+  case ACTION_ZOOM_OUT:
+    return true;
+  default:
+    return false;
+  }
+}
+
 static const ActionMapping windows[] =
 {
     { "home"                     , WINDOW_HOME },
@@ -294,6 +313,7 @@
     { "radioguide"               , WINDOW_RADIO_GUIDE },
     { "radiotimers"              , WINDOW_RADIO_TIMERS },
     { "radiosearch"              , WINDOW_RADIO_SEARCH },
+    { "gamecontrollers"          , WINDOW_DIALOG_GAME_CONTROLLERS },
     { "pvrguideinfo"             , WINDOW_DIALOG_PVR_GUIDE_INFO },
     { "pvrrecordinginfo"         , WINDOW_DIALOG_PVR_RECORDING_INFO },
     { "pvrradiordsinfo"          , WINDOW_DIALOG_PVR_RADIO_RDS_INFO },
@@ -651,9 +671,7 @@
       const char *szWindow = pWindow->Value();
       if (szWindow)
       {
-        if (strcmpi(szWindow, "joystickFamily") == 0)
-          MapJoystickFamily(pWindow);
-        else if (strcmpi(szWindow, "global") == 0)
+        if (strcmpi(szWindow, "global") == 0)
           windowID = -1;
         else
           windowID = TranslateWindow(szWindow);
@@ -760,297 +778,6 @@
   return TranslateRemoteString((*it2).second.c_str());
 }
 
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-void CButtonTranslator::MapJoystickFamily(TiXmlNode *pNode)
-{
-  TiXmlElement *pFamily = pNode->ToElement();
-  if (pFamily && pFamily->Attribute("name"))
-  {
-    std::string joyFamilyName = pFamily->Attribute("name");
-    JoystickFamily* joyFamily = &m_joystickFamilies[joyFamilyName];
-
-    TiXmlElement *pMember = pFamily->FirstChildElement();
-    while (pMember)
-    {
-      TiXmlNode* pName = pMember->FirstChild();
-      if (pName && pName->ValueStr() != "") {
-        std::shared_ptr<CRegExp> re(new CRegExp(true, CRegExp::asciiOnly));
-        std::string joyRe = JoynameToRegex(pName->ValueStr());
-        if (!re->RegComp(joyRe, CRegExp::StudyRegExp))
-        {
-          CLog::Log(LOGNOTICE, "Invalid joystick regex specified: '%s'", pName->Value());
-          continue;
-        }
-        AddFamilyRegex(joyFamily, re);
-      }
-      pMember = pMember->NextSiblingElement();
-    }
-  }
-  else
-  {
-    CLog::Log(LOGNOTICE, "Ignoring nameless joystick family");
-  }
-}
-
-void CButtonTranslator::MapJoystickActions(int windowID, TiXmlNode *pJoystick)
-{
-  std::string joyFamilyName;
-  std::map<int, std::string> buttonMap;
-  std::map<int, std::string> axisMap;
-  AxesConfig axesConfig;
-  ActionMap hatMap;
-
-  TiXmlElement *pJoy = pJoystick->ToElement();
-  if (pJoy && pJoy->Attribute("family"))
-    joyFamilyName = pJoy->Attribute("family");
-  else if (pJoy) {
-    // transform loose name to new family, including altnames
-    std::string joyName = JOYSTICK_DEFAULT_MAP; // default global map name
-    if (pJoy->Attribute("name"))
-      joyName = pJoy->Attribute("name");
-    joyFamilyName = joyName;    
-    JoystickFamily* joyFamily = &m_joystickFamilies[joyFamilyName];
-
-    std::shared_ptr<CRegExp> re(new CRegExp(true, CRegExp::asciiOnly));
-    std::string joyRe = JoynameToRegex(joyName);
-    if (!re->RegComp(joyRe, CRegExp::StudyRegExp))
-    {
-      CLog::Log(LOGNOTICE, "Invalid joystick regex specified: '%s'", joyName.c_str());
-      return;
-    }
-    AddFamilyRegex(joyFamily, re);
-
-    // add altnames to family
-    TiXmlElement *pNode = pJoystick->FirstChildElement();
-    while (pNode) {
-      const std::string &type = pNode->ValueStr();
-      if (type == "altname") {
-        std::string altName = pNode->FirstChild()->ValueStr();
-        std::shared_ptr<CRegExp> altRe(new CRegExp(true, CRegExp::asciiOnly));
-        std::string altReStr = JoynameToRegex(altName);
-        if (!altRe->RegComp(altReStr, CRegExp::StudyRegExp))
-          CLog::Log(LOGNOTICE, "Ignoring invalid joystick altname regex: '%s'", altReStr.c_str());
-        else
-          AddFamilyRegex(joyFamily, altRe);
-      }
-      pNode = pNode->NextSiblingElement();
-    }
-
-  }
-
-  // parse map
-  TiXmlElement *pButton = pJoystick->FirstChildElement();
-  int id = 0;
-  while (pButton)
-  {
-    const std::string &type = pButton->ValueStr();
-    std::string action;
-    if (!pButton->NoChildren())
-      action = pButton->FirstChild()->ValueStr();
-
-    // skip altname tags here because those contain no mappings ...
-    if (type == "altname")
-    {
-      pButton = pButton->NextSiblingElement();
-      continue;
-    }
-
-    if ((pButton->QueryIntAttribute("id", &id) == TIXML_SUCCESS) && id>=0 && id<=256)
-    {
-      if (type == "button")
-      {
-        buttonMap[id] = action;
-      }
-      else if (type == "axis")
-      {
-        int limit = 0;
-        if (pButton->QueryIntAttribute("limit", &limit) == TIXML_SUCCESS)
-        {
-          if (limit==-1)
-            axisMap[-id] = action;
-          else if (limit==1)
-            axisMap[id] = action;
-          else if (limit==0)
-            axisMap[id|0xFFFF0000] = action;
-          else
-          {
-            axisMap[id] = action;
-            axisMap[-id] = action;
-            CLog::Log(LOGERROR, "Error in joystick map, invalid limit specified %d for axis %d", limit, id);
-          }
-        }
-        else
-        {
-          axisMap[id] = action;
-          axisMap[-id] = action;
-        }
-
-        if (windowID == -1) {
-          // in <global> we can override the rest state value of axes and whether they are triggers
-          bool trigger = false;
-          int restStateValue = 0;
-          pButton->QueryBoolAttribute("trigger", &trigger);
-          pButton->QueryIntAttribute("rest", &restStateValue);
-          // if it deviates from the defaults
-          if (trigger || restStateValue != 0)
-            axesConfig.push_back(AxisConfig(id, trigger, restStateValue));
-        }
-      }
-      else if (type == "hat")
-      {
-        std::string position;
-        if (pButton->QueryValueAttribute("position", &position) == TIXML_SUCCESS)
-        {
-          uint32_t hatID = id|0xFFF00000;
-          if (position.compare("up") == 0)
-            hatMap[(JACTIVE_HAT_UP<<16)|hatID] = action;
-          else if (position.compare("down") == 0)
-            hatMap[(JACTIVE_HAT_DOWN<<16)|hatID] = action;
-          else if (position.compare("right") == 0)
-            hatMap[(JACTIVE_HAT_RIGHT<<16)|hatID] = action;
-          else if (position.compare("left") == 0)
-            hatMap[(JACTIVE_HAT_LEFT<<16)|hatID] = action;
-          else
-            CLog::Log(LOGERROR, "Error in joystick map, invalid position specified %s for axis %d", position.c_str(), id);
-        }
-      }
-      else
-        CLog::Log(LOGERROR, "Error reading joystick map element, unknown button type: %s", type.c_str());
-    }
-    else
-      CLog::Log(LOGERROR, "Error reading joystick map element, Invalid id: %d", id);
-
-    pButton = pButton->NextSiblingElement();
-  }
-
-  // add/overwrite keys with mapped actions
-  for (auto button : buttonMap)
-    m_joystickButtonMap[joyFamilyName][windowID][button.first] = button.second;
-
-  for (auto axis : axisMap)
-    m_joystickAxisMap[joyFamilyName][windowID][axis.first] = axis.second;
-
-  for (auto hat : hatMap)
-    m_joystickHatMap[joyFamilyName][windowID][hat.first] = hat.second;
-
-  if (windowID == -1) 
-    m_joystickAxesConfigs[joyFamilyName] = axesConfig;
-}
-
-std::string CButtonTranslator::JoynameToRegex(const std::string& joyName) const
-{
-  if (joyName.empty()) 
-    return joyName;
-
-  // names already presented as regex are identified by a leading /
-  else if (joyName[0] == '/') 
-    return joyName.substr(1);
-
-  // the others we'll have to escape
-  return "\\Q" + joyName + "\\E";
-}
-
-bool CButtonTranslator::AddFamilyRegex(JoystickFamily* family, std::shared_ptr<CRegExp> regex)
-{
-  // even though family is a set, this does not prevent the same regex 
-  // from being added twice, so we manually match on pattern equality
-  JoystickFamily::iterator it;
-  for (it = family->begin(); it != family->end(); it++)
-  {
-    if ((*it)->GetPattern() == regex->GetPattern())
-      return false;
-  }
-  family->insert(regex);
-  return true;
-}
-
-const AxesConfig* CButtonTranslator::GetAxesConfigFor(const std::string& joyName) const
-{
-  JoystickFamilyMap::const_iterator familyIt = FindJoystickFamily(joyName);
-  if (familyIt == m_joystickFamilies.end())
-    return NULL;
-  else {
-    std::map<std::string, AxesConfig>::const_iterator it = m_joystickAxesConfigs.find(familyIt->first);
-    if (it == m_joystickAxesConfigs.end())
-      return NULL;
-    else
-      return &it->second;
-  }
-}
-
-CButtonTranslator::JoystickMap::const_iterator CButtonTranslator::FindWindowMap(const std::string& joyName, const JoystickMap &maps) const
-{
-  JoystickFamilyMap::const_iterator familyIt = FindJoystickFamily(joyName);
-  if (familyIt == m_joystickFamilies.end())
-    return maps.end();
-  else
-    return maps.find(familyIt->first);
-}
-
-CButtonTranslator::JoystickFamilyMap::const_iterator CButtonTranslator::FindJoystickFamily(const std::string& joyName) const
-{
-  // find the family corresponding to a joystick name
-  JoystickFamilyMap::const_iterator it;
-  for (it = m_joystickFamilies.begin(); it != m_joystickFamilies.end(); it++)
-  {
-    JoystickFamily::const_iterator regexIt;
-    for (regexIt = it->second.begin(); regexIt != it->second.end(); regexIt++)
-    {
-      if ((*regexIt)->RegFind(joyName) >= 0)
-      {
-        // CLog::Log(LOGDEBUG, "Regex %s matches joystick %s", it->first->GetPattern().c_str(), joyName.c_str());
-        return it;
-      }
-    }
-  }
-  return it;
-}
-
-bool CButtonTranslator::TranslateJoystickString(int window, const std::string& joyName, int id, short inputType, int& action, std::string& strAction, bool &fullrange)
-{
-  fullrange = false;
-
-  // resolve the correct JoystickMap
-  JoystickMap *jmap;
-  if (inputType == JACTIVE_AXIS)
-    jmap = &m_joystickAxisMap;
-  else if (inputType == JACTIVE_BUTTON)
-    jmap = &m_joystickButtonMap;
-  else if (inputType == JACTIVE_HAT)
-    jmap = &m_joystickHatMap;
-  else
-  {
-    CLog::Log(LOGERROR, "Error reading joystick input type '%i'", (int) inputType);
-    return false;
-  }
-
-  JoystickMap::const_iterator it = FindWindowMap(joyName, *jmap);
-  if (it==jmap->end())
-  {
-    it = FindWindowMap(JOYSTICK_DEFAULT_MAP, *jmap); // default global map name
-    if (it==jmap->end())
-      return false;
-  }
-
-  const WindowMap *wmap = &it->second;
-
-  // try to get the action from the current window
-  action = GetActionCode(window, id, *wmap, strAction, fullrange);
-
-  // if it's invalid, try to get it from a fallback window or the global map
-  if (action == 0)
-  {
-    int fallbackWindow = GetFallbackWindow(window);
-    if (fallbackWindow > -1)
-      action = GetActionCode(fallbackWindow, id, *wmap, strAction, fullrange);
-    // still no valid action? use global map
-    if (action == 0)
-      action = GetActionCode(-1, id, *wmap, strAction, fullrange);
-  }
-
-  return (action > 0);
-}
-
 bool CButtonTranslator::TranslateTouchAction(int window, int touchAction, int touchPointers, int &action, std::string &actionString)
 {
   action = 0;
@@ -1086,48 +813,6 @@
   return it2->second.id;
 }
 
-/*
- * Translates a joystick input to an action code
- */
-int CButtonTranslator::GetActionCode(int window, int id, const WindowMap &wmap, std::string &strAction, bool &fullrange) const
-{
-  int action = 0;
-  bool found = false;
-
-  WindowMap::const_iterator it = wmap.find(window);
-  if (it != wmap.end())
-  {
-    const std::map<int, std::string> &windowbmap = it->second;
-    std::map<int, std::string>::const_iterator it2 = windowbmap.find(id);
-    if (it2 != windowbmap.end())
-    {
-      strAction = (it2->second).c_str();
-      found = true;
-    }
-
-    it2 = windowbmap.find(abs(id)|0xFFFF0000);
-    if (it2 != windowbmap.end())
-    {
-      strAction = (it2->second).c_str();
-      found = true;
-      fullrange = true;
-    }
-
-    // Hats joystick
-    it2 = windowbmap.find(id|0xFFF00000);
-    if (it2 != windowbmap.end())
-    {
-      strAction = (it2->second).c_str();
-      found = true;
-    }
-  }
-
-  if (found)
-    TranslateActionString(strAction.c_str(), action);
-  return action;
-}
-#endif
-
 void CButtonTranslator::GetActions(std::vector<std::string> &actionList)
 {
   unsigned int size = sizeof(actions) / sizeof(ActionMapping);
@@ -1294,7 +979,7 @@
 
   TiXmlNode* pDevice;
 
-  const char* types[] = {"gamepad", "remote", "universalremote", "keyboard", "mouse", "appcommand", NULL};
+  const char* types[] = {"gamepad", "remote", "universalremote", "keyboard", "mouse", "appcommand", "joystick", NULL};
   for (int i = 0; types[i]; ++i)
   {
     std::string type(types[i]);
@@ -1327,6 +1012,8 @@
             buttonCode = TranslateMouseCommand(pButton);
         else if (type == "appcommand")
             buttonCode = TranslateAppCommand(pButton->Value());
+        else if (type == "joystick")
+            buttonCode = TranslateJoystickString(pButton->Value());
 
         if (buttonCode)
         {
@@ -1351,18 +1038,6 @@
     }
   }
 
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-  if ((pDevice = pWindow->FirstChild("joystick")) != NULL)
-  {
-    // map joystick actions
-    while (pDevice)
-    {
-      MapJoystickActions(windowID, pDevice);
-      pDevice = pDevice->NextSibling("joystick");
-    }
-  }
-#endif
-
   if ((pDevice = pWindow->FirstChild("touch")) != NULL)
   {
     // map touch actions
@@ -1714,12 +1389,6 @@
   lircRemotesMap.clear();
 #endif
 
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-  m_joystickButtonMap.clear();
-  m_joystickAxisMap.clear();
-  m_joystickHatMap.clear();
-#endif
-
   m_Loaded = false;
 }
 
@@ -1829,3 +1498,41 @@
   actionString = touchIt->second.strID;
   return touchIt->second.id;
 }
+
+uint32_t CButtonTranslator::TranslateJoystickString(const char *szButton)
+{
+  if (!szButton)
+    return 0;
+  uint32_t buttonCode = 0;
+  std::string strButton = szButton;
+  StringUtils::ToLower(strButton);
+
+  if (strButton == "a") buttonCode = KEY_JOYSTICK_BUTTON_A;
+  else if (strButton == "b") buttonCode = KEY_JOYSTICK_BUTTON_B;
+  else if (strButton == "x") buttonCode = KEY_JOYSTICK_BUTTON_X;
+  else if (strButton == "y") buttonCode = KEY_JOYSTICK_BUTTON_Y;
+  else if (strButton == "start") buttonCode = KEY_JOYSTICK_BUTTON_START;
+  else if (strButton == "back") buttonCode = KEY_JOYSTICK_BUTTON_BACK;
+  else if (strButton == "left") buttonCode = KEY_JOYSTICK_BUTTON_DPAD_LEFT;
+  else if (strButton == "right") buttonCode = KEY_JOYSTICK_BUTTON_DPAD_RIGHT;
+  else if (strButton == "up") buttonCode = KEY_JOYSTICK_BUTTON_DPAD_UP;
+  else if (strButton == "down") buttonCode = KEY_JOYSTICK_BUTTON_DPAD_DOWN;
+  else if (strButton == "leftthumb") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_STICK_BUTTON;
+  else if (strButton == "rightthumb") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_STICK_BUTTON;
+  else if (strButton == "leftstickup") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_UP;
+  else if (strButton == "leftstickdown") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_DOWN;
+  else if (strButton == "leftstickleft") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_LEFT;
+  else if (strButton == "leftstickright") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_RIGHT;
+  else if (strButton == "rightstickup") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_UP;
+  else if (strButton == "rightstickdown") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_DOWN;
+  else if (strButton == "rightstickleft") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_LEFT;
+  else if (strButton == "rightstickright") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_RIGHT;
+  else if (strButton == "lefttrigger") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_TRIGGER;
+  else if (strButton == "righttrigger") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_TRIGGER;
+  else if (strButton == "leftbumper") buttonCode = KEY_JOYSTICK_BUTTON_LEFT_SHOULDER;
+  else if (strButton == "rightbumper") buttonCode = KEY_JOYSTICK_BUTTON_RIGHT_SHOULDER;
+  else if (strButton == "guide") buttonCode = KEY_JOYSTICK_BUTTON_GUIDE;
+  else CLog::Log(LOGERROR, "Joystick Translator: Can't find button %s", strButton.c_str());
+
+  return buttonCode;
+}

_service:download_url:master.tar.gz/xbmc/input/ButtonTranslator.h Changed

@@ -26,9 +26,7 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <set>
-#include <memory>
-#include "system.h" // for HAS_EVENT_SERVER, HAS_SDL_JOYSTICK
+#include "system.h" // for HAS_EVENT_SERVER
 
 #ifdef HAS_EVENT_SERVER
 #include "network/EventClient.h"
@@ -37,9 +35,7 @@
 class CKey;
 class CAction;
 class TiXmlNode;
-struct AxisConfig;
 class CRegExp;
-typedef std::vector<AxisConfig> AxesConfig; // [<axis, isTrigger, rest state value>]
 
 struct CButtonAction
 {
@@ -99,6 +95,8 @@
    */
   CAction GetGlobalAction(const CKey &key);
 
+  static bool IsAnalog(int actionID);
+
   /*! \brief Translate between a window name and it's id
    \param window name of the window
    \return id of the window, or WINDOW_INVALID if not found
@@ -114,13 +112,6 @@
   static bool TranslateActionString(const char *szAction, int &action);
 
   int TranslateLircRemoteString(const char* szDevice, const char *szButton);
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-  bool TranslateJoystickString(int window, const std::string& szDevice, int id,
-                               short inputType, int& action, std::string& strAction,
-                               bool &fullrange);
-
-  const AxesConfig* GetAxesConfigFor(const std::string& joyName) const;
-#endif
 
   bool TranslateTouchAction(int window, int touchAction, int touchPointers, int &action, std::string &actionString);
 
@@ -134,19 +125,12 @@
 
   int GetActionCode(int window, int action);
   int GetActionCode(int window, const CKey &key, std::string &strAction) const;
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-  typedef std::set<std::shared_ptr<CRegExp> > JoystickFamily;
-  typedef std::map<std::string, JoystickFamily> JoystickFamilyMap;
-  typedef std::map<int, std::string> ActionMap; // <button/axis, action>
-  typedef std::map<int, ActionMap > WindowMap; // <window, actionMap>
-  typedef std::map<std::string, WindowMap> JoystickMap; // <family name, windowMap>
-  int GetActionCode(int window, int id, const WindowMap &wmap, std::string &strAction, bool &fullrange) const;
-#endif
   int GetFallbackWindow(int windowID);
 
   static uint32_t TranslateGamepadString(const char *szButton);
   static uint32_t TranslateRemoteString(const char *szButton);
   static uint32_t TranslateUniversalRemoteString(const char *szButton);
+  static uint32_t TranslateJoystickString(const char *szButton);
 
   static uint32_t TranslateKeyboardString(const char *szButton);
   static uint32_t TranslateKeyboardButton(TiXmlElement *pButton);
@@ -167,21 +151,6 @@
   typedef std::map<std::string, std::string> lircButtonMap;
   std::map<std::string, lircButtonMap*> lircRemotesMap;
 
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-  void MapJoystickFamily(TiXmlNode *pFamily);
-  void MapJoystickActions(int windowID, TiXmlNode *pJoystick);
-  std::string JoynameToRegex(const std::string& joyName) const;
-  bool AddFamilyRegex(JoystickFamily* family, std::shared_ptr<CRegExp> regex);
-  void MergeMap(std::shared_ptr<CRegExp> joyName, JoystickMap *joystick, int windowID, const ActionMap &actionMap);
-  JoystickMap::const_iterator FindWindowMap(const std::string& joyName, const JoystickMap &maps) const;
-  JoystickFamilyMap::const_iterator FindJoystickFamily(const std::string& joyName) const;
-  JoystickFamilyMap m_joystickFamilies;
-  JoystickMap m_joystickButtonMap;                           // <joy family, button map>
-  JoystickMap m_joystickAxisMap;                             // <joy family, axis map>
-  JoystickMap m_joystickHatMap;                              // <joy family, hat map>
-  std::map<std::string, AxesConfig> m_joystickAxesConfigs;   // <joy family, axes config>
-#endif
-
   void MapTouchActions(int windowID, TiXmlNode *pTouch);
   static uint32_t TranslateTouchCommand(TiXmlElement *pButton, CButtonAction &action);
   int GetTouchActionCode(int window, int action, std::string &actionString);

_service:download_url:master.tar.gz/xbmc/input/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/input/InputManager.cpp Changed

@@ -22,6 +22,7 @@
 
 #include "Application.h"
 #include "InputManager.h"
+#include "input/keyboard/IKeyboardHandler.h"
 #include "input/Key.h"
 #include "messaging/ApplicationMessenger.h"
 #include "guilib/Geometry.h"
@@ -43,17 +44,6 @@
 #include "input/windows/IRServerSuite.h"
 #endif
 
-#if HAVE_SDL_VERSION == 1
-#include <SDL/SDL.h>
-#elif HAVE_SDL_VERSION == 2
-#include <SDL2/SDL.h>
-#endif
-
-#if defined(TARGET_WINDOWS)
-#include "input/windows/WINJoystick.h"
-#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-#include "input/SDLJoystick.h"
-#endif
 #include "ButtonTranslator.h"
 #include "peripherals/Peripherals.h"
 #include "peripherals/devices/PeripheralImon.h"
@@ -69,6 +59,8 @@
 #define MEASURE_FUNCTION
 #endif
 
+#include <algorithm>
+
 #ifdef HAS_EVENT_SERVER
 using EVENTSERVER::CEventServer;
 #endif
@@ -88,138 +80,15 @@
   m_RemoteControl.Initialize();
 #endif
 
-#ifdef HAS_SDL_JOYSTICK
-  // Pass the mapping of axis to triggers to m_Joystick
-  m_Joystick.Initialize();
-#endif
-
   m_Keyboard.Initialize();
 
   m_Mouse.Initialize();
   m_Mouse.SetEnabled(CSettings::GetInstance().GetBool(CSettings::SETTING_INPUT_ENABLEMOUSE));
 }
 
-void CInputManager::ReInitializeJoystick()
-{
-#ifdef HAS_SDL_JOYSTICK
-  m_Joystick.Reinitialize();
-#endif
-}
-
 void CInputManager::SetEnabledJoystick(bool enabled /* = true */)
 {
-#ifdef HAS_SDL_JOYSTICK
-  m_Joystick.SetEnabled(enabled);
-#endif
-}
-
-#if defined(HAS_SDL_JOYSTICK) && !defined(TARGET_WINDOWS)
-void CInputManager::UpdateJoystick(SDL_Event& joyEvent)
-{
-  m_Joystick.Update(joyEvent);
-}
-#endif
-
-bool CInputManager::ProcessGamepad(int windowId)
-{
-#ifdef HAS_SDL_JOYSTICK
-  if (!g_application.IsAppFocused())
-    return false;
-
-  int keymapId, joyId;
-  m_Joystick.Update();
-  std::string joyName;
-  if (m_Joystick.GetButton(joyName, joyId))
-  {
-    g_application.ResetSystemIdleTimer();
-
-    g_application.ResetScreenSaver();
-    if (g_application.WakeUpScreenSaverAndDPMS())
-    {
-      m_Joystick.Reset();
-      return true;
-    }
-
-    int actionID;
-    std::string actionName;
-    bool fullrange;
-    keymapId = joyId + 1;
-
-    if (CButtonTranslator::GetInstance().TranslateJoystickString(windowId, joyName, keymapId, JACTIVE_BUTTON, actionID, actionName, fullrange))
-    {
-      CAction action(actionID, 1.0f, 0.0f, actionName);
-      m_Mouse.SetActive(false);
-      return ExecuteInputAction(action);
-    }
-  }
-  std::list<std::pair<std::string, int> > usedAxes;
-  if (m_Joystick.GetAxes(usedAxes))
-  {
-    bool compoundReturn = false;
-    for (std::list<std::pair<std::string, int> >::iterator it = usedAxes.begin();
-         it != usedAxes.end();
-         ++it)
-    {
-      joyName = it->first;
-      joyId = it->second;
-
-      keymapId = joyId + 1;
-      if (m_Joystick.GetAmount(joyName, joyId) < 0)
-      {
-        keymapId = -keymapId;
-      }
-
-      int actionID;
-      std::string actionName;
-      bool fullrange;
-      if (CButtonTranslator::GetInstance().TranslateJoystickString(windowId, joyName, keymapId, JACTIVE_AXIS, actionID, actionName, fullrange))
-      {
-        g_application.ResetScreenSaver();
-        if (g_application.WakeUpScreenSaverAndDPMS())
-        {
-          return true;
-        }
-
-        float amount = m_Joystick.GetAmount(joyName, joyId);
-        amount = fullrange ? (amount + 1.0f) / 2.0f : amount;
-
-        CAction action(actionID, amount, 0.0f, actionName);
-
-        m_Mouse.SetActive(false);
-        compoundReturn |= ExecuteInputAction(action);
-      }
-    }
-    return compoundReturn;
-  }
-  int position = 0;
-  if (m_Joystick.GetHat(joyName, joyId, position))
-  {
-    keymapId = joyId + 1;
-    // reset Idle Timer
-    g_application.ResetSystemIdleTimer();
-
-    g_application.ResetScreenSaver();
-    if (g_application.WakeUpScreenSaverAndDPMS())
-    {
-      m_Joystick.Reset();
-      return true;
-    }
-
-    int actionID;
-    std::string actionName;
-    bool fullrange;
-
-    keymapId = position << 16 | keymapId;
-
-    if (keymapId && CButtonTranslator::GetInstance().TranslateJoystickString(windowId, joyName, keymapId, JACTIVE_HAT, actionID, actionName, fullrange))
-    {
-      CAction action(actionID, 1.0f, 0.0f, actionName);
-      m_Mouse.SetActive(false);
-      return ExecuteInputAction(action);
-    }
-  }
-#endif
-  return false;
+  // TODO
 }
 
 bool CInputManager::ProcessRemote(int windowId)
@@ -336,15 +205,7 @@
   {
     if (joystickName.length() > 0)
     {
-      if (isAxis == true)
-      {
-        if (fabs(fAmount) >= 0.08)
-          m_lastAxisMap[joystickName][wKeyID] = fAmount;
-        else
-          m_lastAxisMap[joystickName].erase(wKeyID);
-      }
-
-      return ProcessJoystickEvent(windowId, joystickName, wKeyID, isAxis ? JACTIVE_AXIS : JACTIVE_BUTTON, fAmount);
+      return false;
     }
     else
     {
@@ -382,16 +243,6 @@
     }
   }
 
-  if (!m_lastAxisMap.empty())
-  {
-    // Process all the stored axis.
-    for (std::map<std::string, std::map<int, float> >::iterator iter = m_lastAxisMap.begin(); iter != m_lastAxisMap.end(); ++iter)
-    {
-      for (std::map<int, float>::iterator iterAxis = (*iter).second.begin(); iterAxis != (*iter).second.end(); ++iterAxis)
-        ProcessJoystickEvent(windowId, (*iter).first, (*iterAxis).first, JACTIVE_AXIS, (*iterAxis).second);
-    }
-  }
-
   {
     CPoint pos;
     if (es->GetMousePos(pos.x, pos.y) && m_Mouse.IsEnabled())
@@ -412,6 +263,35 @@
   return false;
 }
 
+void CInputManager::ProcessQueuedActions()
+{
+  std::vector<CAction> queuedActions;
+  {
+    CSingleLock lock(m_actionMutex);
+    queuedActions.swap(m_queuedActions);
+  }
+
+  for (const CAction& action : queuedActions)
+    g_application.OnAction(action);
+}
+
+void CInputManager::QueueAction(const CAction& action)
+{
+  CSingleLock lock(m_actionMutex);
+
+  // Avoid dispatching multiple analog actions per frame with the same ID
+  if (action.IsAnalog())
+  {
+    m_queuedActions.erase(std::remove_if(m_queuedActions.begin(), m_queuedActions.end(),
+      [&action](const CAction& queuedAction)
+      {
+        return action.GetID() == queuedAction.GetID();
+      }), m_queuedActions.end());
+  }
+
+  m_queuedActions.push_back(action);
+}
+
 bool CInputManager::Process(int windowId, float frameTime)
 {
 #if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
@@ -421,51 +301,26 @@
 
   // process input actions
   ProcessRemote(windowId);
-  ProcessGamepad(windowId);
   ProcessEventServer(windowId, frameTime);
   ProcessPeripherals(frameTime);
+  ProcessQueuedActions();
   
   return true;
 }
 
-bool CInputManager::ProcessJoystickEvent(int windowId, const std::string& joystickName, int wKeyID, short inputType, float fAmount, unsigned int holdTime /*=0*/)
-{
-#if defined(HAS_EVENT_SERVER)
-  g_application.ResetSystemIdleTimer();
-  g_application.ResetScreenSaver();
-
-  if (g_application.WakeUpScreenSaverAndDPMS())
-    return true;
-
-  m_Mouse.SetActive(false);
-
-  int actionID;
-  std::string actionName;
-  bool fullRange = false;
-
-  // Translate using regular joystick translator.
-  if (CButtonTranslator::GetInstance().TranslateJoystickString(windowId, joystickName, wKeyID, inputType, actionID, actionName, fullRange))
-    return ExecuteInputAction(CAction(actionID, fAmount, 0.0f, actionName, holdTime));
-  else
-    CLog::Log(LOGDEBUG, "ERROR mapping joystick action. Joystick: %s %i", joystickName.c_str(), wKeyID);
-#endif
-
-  return false;
-}
-
 bool CInputManager::OnEvent(XBMC_Event& newEvent)
 {
   switch (newEvent.type)
   {
   case XBMC_KEYDOWN:
   {
-    if (m_LastKey.GetButtonCode() & CKey::MODIFIER_LONG)
+    m_Keyboard.ProcessKeyDown(newEvent.key.keysym);
+    CKey key = m_Keyboard.TranslateKey(newEvent.key.keysym);
+    if (key.GetButtonCode() == m_LastKey.GetButtonCode() && m_LastKey.GetButtonCode() & CKey::MODIFIER_LONG)
     {
       // Do not repeat long presses
       break;
     }
-    m_Keyboard.ProcessKeyDown(newEvent.key.keysym);
-    CKey key = m_Keyboard.TranslateKey(newEvent.key.keysym);
     if (!CButtonTranslator::GetInstance().HasLonpressMapping(g_windowManager.GetActiveWindowID(), key))
     {
       m_LastKey.Reset();
@@ -492,6 +347,7 @@
     }
     else
       m_LastKey.Reset();
+    OnKeyUp(m_Keyboard.TranslateKey(newEvent.key.keysym));
     break;
   case XBMC_MOUSEBUTTONDOWN:
   case XBMC_MOUSEBUTTONUP:
@@ -552,6 +408,11 @@
 
 bool CInputManager::OnKey(const CKey& key)
 {
+  for (std::vector<KEYBOARD::IKeyboardHandler*>::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
+  {
+    if ((*it)->OnKeyPress(key))
+      return true;
+  }
 
   // Turn the mouse off, as we've just got a keypress from controller or remote
   m_Mouse.SetActive(false);
@@ -695,6 +556,12 @@
   return ExecuteInputAction(action);
 }
 
+void CInputManager::OnKeyUp(const CKey& key)
+{
+  for (std::vector<KEYBOARD::IKeyboardHandler*>::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
+    (*it)->OnKeyRelease(key);
+}
+
 bool CInputManager::AlwaysProcess(const CAction& action)
 {
   // check if this button is mapped to a built-in function
@@ -867,10 +734,15 @@
   const std::string &settingId = setting->GetId();
   if (settingId == CSettings::SETTING_INPUT_ENABLEMOUSE)
     m_Mouse.SetEnabled(dynamic_cast<const CSettingBool*>(setting)->GetValue());
+}
 
-#if defined(HAS_SDL_JOYSTICK)
-  if (settingId == CSettings::SETTING_INPUT_ENABLEJOYSTICK)
-    m_Joystick.SetEnabled(dynamic_cast<const CSettingBool*>(setting)->GetValue() &&
-    PERIPHERALS::CPeripheralImon::GetCountOfImonsConflictWithDInput() == 0);
-#endif
+void CInputManager::RegisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler)
+{
+  if (std::find(m_keyboardHandlers.begin(), m_keyboardHandlers.end(), handler) == m_keyboardHandlers.end())
+    m_keyboardHandlers.push_back(handler);
+}
+
+void CInputManager::UnregisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler)
+{
+  m_keyboardHandlers.erase(std::remove(m_keyboardHandlers.begin(), m_keyboardHandlers.end(), handler), m_keyboardHandlers.end());
 }

_service:download_url:master.tar.gz/xbmc/input/InputManager.h Changed

@@ -23,11 +23,6 @@
 #include <string>
 #include <vector>
 
-#if defined(TARGET_WINDOWS)
-#include "input/windows/WINJoystick.h"
-#elif defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-#include "input/SDLJoystick.h"
-#endif
 #if defined(HAS_LIRC)
 #include "input/linux/LIRC.h"
 #endif
@@ -39,9 +34,15 @@
 #include "input/KeyboardStat.h"
 #include "input/MouseStat.h"
 #include "settings/lib/ISettingCallback.h"
+#include "threads/CriticalSection.h"
 
 class CKey;
 
+namespace KEYBOARD
+{
+  class IKeyboardHandler;
+}
+
 class CInputManager : public ISettingCallback
 {
 private:
@@ -69,13 +70,6 @@
   */
   bool ProcessMouse(int windowId);
 
-  /*! \brief decode a gamepad or joystick event, reset idle timers.
-
-  \param windowId Currently active window
-  \return true if event is handled, false otherwise
-  */
-  bool ProcessGamepad(int windowId);
-
   /*! \brief decode an event from the event service, this can be mouse, key, joystick, reset idle timers.
 
   \param windowId Currently active window
@@ -91,6 +85,14 @@
   */
   bool ProcessPeripherals(float frameTime);
 
+  /*! \brief Dispatch actions queued since the last call to Process()
+   */
+  void ProcessQueuedActions();
+
+  /*! \brief Queue an action to be processed on the next call to Process()
+   */
+  void QueueAction(const CAction& action);
+
   /*! \brief Process all inputs
    *
    * \param windowId Currently active window
@@ -111,18 +113,6 @@
    */
   void SetEnabledJoystick(bool enabled = true);
 
-  /*! \brief Run joystick initialization again, e.g. a new device is connected
-  *
-  * \return void
-  */
-  void ReInitializeJoystick();
-
-  bool ProcessJoystickEvent(int windowId, const std::string& joystickName, int wKeyID, short inputType, float fAmount, unsigned int holdTime = 0);
-
-#if defined(HAS_SDL_JOYSTICK) && !defined(TARGET_WINDOWS)
-  void UpdateJoystick(SDL_Event& joyEvent);
-#endif
-
   /*! \brief Handle an input event
    * 
    * \param newEvent event details
@@ -225,6 +215,9 @@
 
   virtual void OnSettingChanged(const CSetting *setting) override;
 
+  void RegisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler);
+  void UnregisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler);
+
 private:
 
   /*! \brief Process keyboard event and translate into an action
@@ -235,6 +228,13 @@
   */
   bool OnKey(const CKey& key);
 
+  /*! \brief Process key up event
+   *
+   * \param CKey details of released key
+   * \sa CKey
+   */
+  void OnKeyUp(const CKey& key);
+
   /*! \brief Determine if an action should be processed or just
   *   cancel the screensaver
   *
@@ -265,7 +265,8 @@
   std::map<std::string, std::map<int, float> > m_lastAxisMap;
 #endif
 
-#if defined(HAS_SDL_JOYSTICK) 
-  CJoystick m_Joystick;
-#endif
+  std::vector<CAction> m_queuedActions;
+  CCriticalSection     m_actionMutex;
+
+  std::vector<KEYBOARD::IKeyboardHandler*> m_keyboardHandlers;
 };

_service:download_url:master.tar.gz/xbmc/input/Key.cpp Changed

_service:download_url:master.tar.gz/xbmc/input/Key.h Changed

@@ -31,6 +31,9 @@
 //  XBIRRemote.h
 //  XINPUT_IR_REMOTE-*
 
+/*
+ * EventServer "gamepad" keys based on original Xbox controller
+ */
 // Analogue - don't change order
 #define KEY_BUTTON_A                        256
 #define KEY_BUTTON_B                        257
@@ -69,6 +72,35 @@
 #define KEY_BUTTON_LEFT_THUMB_STICK_LEFT    282
 #define KEY_BUTTON_LEFT_THUMB_STICK_RIGHT   283
 
+/*
+ * joystick.xml keys based on Xbox 360 controller
+ */
+#define KEY_JOYSTICK_BUTTON_A                        284
+#define KEY_JOYSTICK_BUTTON_B                        285
+#define KEY_JOYSTICK_BUTTON_X                        286
+#define KEY_JOYSTICK_BUTTON_Y                        287
+#define KEY_JOYSTICK_BUTTON_LEFT_SHOULDER            288
+#define KEY_JOYSTICK_BUTTON_RIGHT_SHOULDER           289
+#define KEY_JOYSTICK_BUTTON_LEFT_TRIGGER             290
+#define KEY_JOYSTICK_BUTTON_RIGHT_TRIGGER            291
+#define KEY_JOYSTICK_BUTTON_LEFT_STICK_BUTTON        292
+#define KEY_JOYSTICK_BUTTON_RIGHT_STICK_BUTTON       293
+#define KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_UP     294
+#define KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_DOWN   295
+#define KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_LEFT   296
+#define KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_RIGHT  297
+#define KEY_JOYSTICK_BUTTON_DPAD_UP                  298
+#define KEY_JOYSTICK_BUTTON_DPAD_DOWN                299
+#define KEY_JOYSTICK_BUTTON_DPAD_LEFT                300
+#define KEY_JOYSTICK_BUTTON_DPAD_RIGHT               301
+#define KEY_JOYSTICK_BUTTON_START                    302
+#define KEY_JOYSTICK_BUTTON_BACK                     303
+#define KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_UP      304
+#define KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_DOWN    305
+#define KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_LEFT    306
+#define KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_RIGHT   307
+#define KEY_JOYSTICK_BUTTON_GUIDE                    308
+
 // 0xF000 -> 0xF200 is reserved for the keyboard; a keyboard press is either
 #define KEY_VKEY            0xF000 // a virtual key/functional key e.g. cursor left
 #define KEY_ASCII           0xF100 // a printable character in the range of TRUE ASCII (from 0 to 127) // FIXME make it clean and pure unicode! remove the need for KEY_ASCII
@@ -310,6 +342,7 @@
 #define ACTION_PVR_PLAY               188
 #define ACTION_PVR_PLAY_TV            189
 #define ACTION_PVR_PLAY_RADIO         190
+#define ACTION_PVR_SHOW_TIMER_RULE    191
 
 #define ACTION_TOGGLE_FULLSCREEN      199 //!< switch 2 desktop resolution
 #define ACTION_TOGGLE_WATCHED         200 //!< Toggle watched status (videos)
@@ -352,6 +385,7 @@
 #define ACTION_TRIGGER_OSD            243 //!< show autoclosing OSD. Can b used in videoFullScreen.xml window id=2005
 #define ACTION_INPUT_TEXT             244
 #define ACTION_VOLUME_SET             245
+#define ACTION_TOGGLE_COMMSKIP        246
 
 #define ACTION_TOUCH_TAP              401 //!< touch actions
 #define ACTION_TOUCH_TAP_TEN          410 //!< touch actions
@@ -412,6 +446,9 @@
   CAction(int actionID, const std::string &name, const CKey &key);
   CAction(int actionID, const std::string &name);
 
+  CAction(const CAction& other) { *this = other; }
+  CAction& operator=(const CAction& rhs);
+
   /*! \brief Identifier of the action
    \return id of the action
    */
@@ -465,6 +502,8 @@
    */
   unsigned int GetButtonCode() const { return m_buttonCode; };
 
+  bool IsAnalog() const;
+
 private:
   int          m_id;
   std::string   m_name;

_service:download_url:master.tar.gz/xbmc/input/Makefile Changed

_service:download_url:master.tar.gz/xbmc/input/SDLJoystick.cpp Deleted

@@ -1,554 +0,0 @@
-/*
- *      Copyright (C) 2007-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "system.h"
-#include "SDLJoystick.h"
-#include "input/ButtonTranslator.h"
-#include "settings/AdvancedSettings.h"
-#include "settings/lib/Setting.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "utils/RegExp.h"
-
-#include <math.h>
-
-#ifdef HAS_SDL_JOYSTICK
-#include <SDL2/SDL.h>
-
-CJoystick::CJoystick()
-{
-  m_joystickEnabled = false;
-  SetDeadzone(0);
-  Reset();
-}
-
-void CJoystick::Reset()
-{
-  m_AxisIdx = -1;
-  m_ButtonIdx = -1;
-  m_HatIdx = -1;
-  m_HatState = SDL_HAT_CENTERED;
-  for (std::vector<AxisState>::iterator it = m_Axes.begin(); it != m_Axes.end(); ++it)
-    it->reset();
-}
-
-void CJoystick::Initialize()
-{
-  if (!IsEnabled())
-    return;
-
-  if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) != 0)
-  {
-    CLog::Log(LOGERROR, "(Re)start joystick subsystem failed : %s",SDL_GetError());
-    return;
-  }
-
-  Reset();
-
-  // Set deadzone range
-  SetDeadzone(g_advancedSettings.m_controllerDeadzone);
-
-  // joysticks will be loaded once SDL sees them
-}
-
-void CJoystick::AddJoystick(int joyIndex)
-{
-  SDL_Joystick *joy = SDL_JoystickOpen(joyIndex);
-  if (!joy)
-    return;
-
-  std::string joyName = std::string(SDL_JoystickName(joy));
-
-
-  // Some (Microsoft) Keyboards are recognized as Joysticks by modern kernels
-  // Don't enumerate them
-  // https://bugs.launchpad.net/ubuntu/+source/linux/+bug/390959
-  // NOTICE: Enabled Joystick: Microsoft Wired Keyboard 600
-  // Details: Total Axis: 37 Total Hats: 0 Total Buttons: 57
-  // NOTICE: Enabled Joystick: Microsoft Microsoft® 2.4GHz Transceiver v6.0
-  // Details: Total Axis: 37 Total Hats: 0 Total Buttons: 57
-  // also checks if we have at least 1 button, fixes
-  // NOTICE: Enabled Joystick: ST LIS3LV02DL Accelerometer
-  // Details: Total Axis: 3 Total Hats: 0 Total Buttons: 0
-  int num_axis = SDL_JoystickNumAxes(joy);
-  int num_buttons = SDL_JoystickNumButtons(joy);
-  int num_hats = SDL_JoystickNumHats(joy);
-  if ((num_axis > 20 && num_buttons > 50) || num_buttons == 0)
-  {
-    CLog::Log(LOGNOTICE, "Ignoring Joystick %s Axis: %d Buttons: %d: invalid device properties",
-      joyName.c_str(), num_axis, num_buttons);
-    return;
-  }
-
-  // get details
-  CLog::Log(LOGNOTICE, "Enabled Joystick: %s", joyName.c_str());
-  CLog::Log(LOGNOTICE, "Details: Total Axis: %d Total Hats: %d Total Buttons: %d",
-    num_axis, num_hats, num_buttons);
-
-  // store joystick and its instance id for lookups
-  int id = SDL_JoystickInstanceID(joy);
-  m_Joysticks[id] = joy;
-  m_Axes.resize(m_Axes.size() + num_axis);
-
-  // all indices may have changed in m_Joysticks, so we have to invalidate m_Axes
-  ApplyAxesConfigs();
-  Reset();
-}
-
-void CJoystick::RemoveJoystick(int id)
-{
-  CLog::Log(LOGDEBUG, "Joystick with id %d removed", id);
-
-  // invalidate our current values
-  SDL_Joystick *joy = m_Joysticks[id];
-  m_Axes.resize(m_Axes.size() - SDL_JoystickNumAxes(joy));
-  SDL_JoystickClose(joy);
-  m_Joysticks.erase(id);
-  // all indices may have changed in m_Joysticks, so we have to invalidate m_Axes
-  ApplyAxesConfigs();
-  Reset();
-}
-
-void CJoystick::Update()
-{
-  if (!IsEnabled())
-    return;
-
-  // update the state of all opened joysticks
-  SDL_JoystickUpdate();
-  int axisNum;
-  int buttonIdx = -1, buttonNum;
-  int hatIdx = -1, hatNum;
-
-  // go through all joysticks
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-  {
-    SDL_Joystick *joy = it->second;
-    int numb = SDL_JoystickNumButtons(joy);
-    int numhat = SDL_JoystickNumHats(joy);
-    int numax = SDL_JoystickNumAxes(joy);
-    uint8_t hatval;
-
-    for (int b = 0 ; b<numb ; b++)
-    {
-      if (SDL_JoystickGetButton(joy, b))
-      {
-        buttonIdx = MapButton(joy, b);
-        break;
-      }
-    }
-
-    for (int h = 0; h < numhat; h++)
-    {
-      hatval = SDL_JoystickGetHat(joy, h);
-      if (hatval != SDL_HAT_CENTERED)
-      {
-        hatIdx = MapHat(joy, h);
-        m_HatState = hatval;
-        break; 
-      }
-    }
-
-    // get axis states
-    for (int a = 0 ; a<numax ; a++)
-    {
-      int axisIdx = MapAxis(joy, a);
-      m_Axes[axisIdx].val = SDL_JoystickGetAxis(joy, a);
-    }
-  }
-
-  SDL_Joystick *joy;
-  m_AxisIdx = GetAxisWithMaxAmount();
-  if (m_AxisIdx >= 0)
-  {
-    MapAxis(m_AxisIdx, joy, axisNum);
-    // CLog::Log(LOGDEBUG, "Joystick %d Axis %d Amount %d", JoystickIndex(joy), axisNum + 1, m_Axes[m_AxisIdx].val);
-  }
-
-  if (hatIdx == -1 && m_HatIdx != -1)
-  {
-    // now centered
-    MapHat(m_HatIdx, joy, hatNum);
-    CLog::Log(LOGDEBUG, "Joystick %d hat %u hat centered", JoystickIndex(joy), hatNum + 1);
-    m_pressTicksHat = 0;
-  }
-  else if (hatIdx != m_HatIdx)
-  {
-    MapHat(hatIdx, joy, hatNum);
-    CLog::Log(LOGDEBUG, "Joystick %d hat %u value %d", JoystickIndex(joy), hatNum + 1, m_HatState);
-    m_pressTicksHat = SDL_GetTicks();
-  }
-  m_HatIdx = hatIdx;
-
-  if (buttonIdx == -1 && m_ButtonIdx != -1)
-  {
-    MapButton(m_ButtonIdx, joy, buttonNum);
-    CLog::Log(LOGDEBUG, "Joystick %d button %d Up", JoystickIndex(joy), buttonNum + 1);
-    m_pressTicksButton = 0;
-    m_ButtonIdx = -1;
-  }
-  else if (buttonIdx != m_ButtonIdx)
-  {
-    MapButton(buttonIdx, joy, buttonNum);
-    CLog::Log(LOGDEBUG, "Joystick %d button %d Down", JoystickIndex(joy), buttonNum + 1);
-    m_pressTicksButton = SDL_GetTicks();
-  }
-  m_ButtonIdx = buttonIdx;
-}
-
-void CJoystick::Update(SDL_Event& joyEvent)
-{
-  if (!IsEnabled())
-    return;
-
-  switch(joyEvent.type)
-  {
-  // we do not handle the button/axis/hat events here because
-  // only Update() is equipped to handle keyrepeats
-  case SDL_JOYDEVICEADDED:
-    AddJoystick(joyEvent.jdevice.which);
-    break;
-
-  case SDL_JOYDEVICEREMOVED:
-    RemoveJoystick(joyEvent.jdevice.which);
-    break;
-  }
-}
-
-bool CJoystick::GetHat(std::string &joyName, int &id, int &position, bool consider_repeat)
-{
-  if (!IsEnabled() || !IsHatActive())
-    return false;
-
-  SDL_Joystick *joy;
-  MapHat(m_HatIdx, joy, id);
-  joyName = std::string(SDL_JoystickName(joy));
-  position = m_HatState;
-
-  if (!consider_repeat)
-    return true;
-
-  static uint32_t lastPressTicksHat = 0;
-  // allow it if it is the first press
-  if (lastPressTicksHat < m_pressTicksHat)
-  {
-    lastPressTicksHat = m_pressTicksHat;
-    return true;
-  }
-  uint32_t nowTicks = SDL_GetTicks();
-  if (nowTicks - m_pressTicksHat < 500) // 500ms delay before we repeat
-    return false;
-  if (nowTicks - lastPressTicksHat < 100) // 100ms delay before successive repeats
-    return false;
-  lastPressTicksHat = nowTicks;
-
-  return true;
-}
-
-bool CJoystick::GetButton(std::string &joyName, int& id, bool consider_repeat)
-{
-  if (!IsEnabled() || !IsButtonActive())
-    return false;
-
-  SDL_Joystick *joy;
-  MapButton(m_ButtonIdx, joy, id);
-  joyName = SDL_JoystickName(joy);
-
-  if (!consider_repeat)
-    return true;
-
-  static uint32_t lastPressTicksButton = 0;
-  // allow it if it is the first press
-  if (lastPressTicksButton < m_pressTicksButton)
-  {
-    lastPressTicksButton = m_pressTicksButton;
-    return true;
-  }
-  uint32_t nowTicks = SDL_GetTicks();
-  if (nowTicks - m_pressTicksButton < 500) // 500ms delay before we repeat
-    return false;
-  if (nowTicks - lastPressTicksButton < 100) // 100ms delay before successive repeats
-    return false;
-
-  lastPressTicksButton = nowTicks;
-  return true;
-}
-
-bool CJoystick::GetAxis(std::string &joyName, int& id) const
-{ 
-  if (!IsEnabled() || !IsAxisActive()) 
-    return false;
-
-  SDL_Joystick *joy;
-  MapAxis(m_AxisIdx, joy, id);
-  joyName = std::string(SDL_JoystickName(joy));
-
-  return true;
-}
-
-bool CJoystick::GetAxes(std::list<std::pair<std::string, int> >& axes, bool consider_still)
-{
-  std::list<std::pair<std::string, int> > ret;
-  if (!IsEnabled() || !IsAxisActive())
-    return false;
-
-  SDL_Joystick *joy;
-  int axisId;
-
-  for (size_t i = 0; i < m_Axes.size(); ++i)
-  {
-    int deadzone = m_Axes[i].trigger ? 0 : m_DeadzoneRange;
-    int amount = m_Axes[i].val - m_Axes[i].rest;
-    if (consider_still || abs(amount) > deadzone)
-    {
-      MapAxis(i, joy, axisId);
-      ret.push_back(std::pair<std::string, int>(SDL_JoystickName(joy), axisId));
-    }
-  }
-  axes = ret;
-  return true;
-}
-
-int CJoystick::GetAxisWithMaxAmount() const
-{
-  int maxAmount= 0, axis = -1;
-  for (size_t i = 0; i < m_Axes.size(); i++)
-  {
-    int deadzone = m_Axes[i].trigger ? 0 : m_DeadzoneRange,
-        amount = abs(m_Axes[i].val - m_Axes[i].rest);
-    if (amount > deadzone && amount > maxAmount)
-    {
-      maxAmount = amount;
-      axis = i;
-    }
-  }
-  return axis;
-}
-
-float CJoystick::GetAmount(std::string &joyName, int axisNum) const
-{
-  // find matching SDL_Joystick*
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-    if (std::string(SDL_JoystickName(it->second)) == joyName)
-      break;
-
-  if (it == m_Joysticks.end())
-    return 0; // invalid joy name
-
-  int axisIdx = MapAxis(it->second, axisNum);
-  int amount = m_Axes[axisIdx].val - m_Axes[axisIdx].rest;
-  int range = MAX_AXISAMOUNT - m_Axes[axisIdx].rest;
-  // deadzones on axes are undesirable
-  int deadzone = m_Axes[axisIdx].trigger ? 0 : m_DeadzoneRange;
-  if (amount > deadzone)
-    return (float)(amount - deadzone) / (float)(range - deadzone);
-  else if (amount < -deadzone)
-    return (float)(amount + deadzone) / (float)(range - deadzone);
-
-  return 0;
-}
-
-void CJoystick::SetEnabled(bool enabled /*=true*/)
-{
-  if( enabled && !m_joystickEnabled )
-  {
-    m_joystickEnabled = true;
-    Initialize();
-  }
-  else if( !enabled && m_joystickEnabled )
-  {
-    ReleaseJoysticks();
-    m_joystickEnabled = false;
-  }
-}
-
-float CJoystick::SetDeadzone(float val)
-{
-  if (val<0) val=0;
-  if (val>1) val=1;
-  m_DeadzoneRange = (int)(val*MAX_AXISAMOUNT);
-  return val;
-}
-
-bool CJoystick::ReleaseJoysticks()
-{
-  // close open joysticks
-  for (std::map<int, SDL_Joystick*>::const_iterator it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-    SDL_JoystickClose(it->second);
-  m_Joysticks.clear();
-  m_Axes.clear();
-  Reset();
-
-  // Restart SDL joystick subsystem
-  SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
-  if (SDL_WasInit(SDL_INIT_JOYSTICK) !=  0)
-  {
-    CLog::Log(LOGERROR, "Stop joystick subsystem failed");
-    return false;
-  }
-  return true;
-}
-
-bool CJoystick::Reinitialize()
-{
-  if( !ReleaseJoysticks() ) return false;
-  Initialize();
-
-  return true;
-}
-
-void CJoystick::ApplyAxesConfigs()
-{
-  // load axes configuration from keymap
-  int axesCount = 0;
-  for (std::map<int, SDL_Joystick*>::const_iterator it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-  {
-    std::string joyName(SDL_JoystickName(it->second));
-    const AxesConfig* axesCfg = CButtonTranslator::GetInstance().GetAxesConfigFor(joyName);
-    if (axesCfg != NULL)
-    {
-      for (AxesConfig::const_iterator it = axesCfg->begin(); it != axesCfg->end(); ++it)
-      {
-        int axis = axesCount + it->axis - 1;
-        m_Axes[axis].trigger = it->isTrigger;
-        m_Axes[axis].rest = it->rest;
-      }
-    }
-    axesCount += SDL_JoystickNumAxes(it->second);
-  }
-}
-  
-int CJoystick::JoystickIndex(const std::string &joyName) const
-{
-  int i = 0;
-  for (std::map<int, SDL_Joystick*>::const_iterator it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-  {
-    if (joyName == std::string(SDL_JoystickName(it->second)))
-      return i;
-    i++;
-  }
-  return -1;
-}
-
-int CJoystick::JoystickIndex(SDL_Joystick *joy) const
-{
-  int i = 0;
-  for (std::map<int, SDL_Joystick*>::const_iterator it = m_Joysticks.begin(); it != m_Joysticks.end(); ++it)
-  {
-    if (it->second == joy)
-      return i;
-    i++;
-  }
-  return -1;
-}
-
-int CJoystick::MapAxis(SDL_Joystick *joy, int axisNum) const
-{
-  int idx = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && it->second != joy; ++it)
-    idx += SDL_JoystickNumAxes(it->second);
-  if (it == m_Joysticks.end())
-    return -1;
-  else
-    return idx + axisNum;
-}
-
-void CJoystick::MapAxis(int axisIdx, SDL_Joystick *&joy, int &axisNum) const
-{
-  int axisCount = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && axisCount + SDL_JoystickNumAxes(it->second) <= axisIdx; ++it)
-    axisCount += SDL_JoystickNumAxes(it->second);
-  if (it != m_Joysticks.end())
-  {
-    joy = it->second;
-    axisNum = axisIdx - axisCount;
-  }
-  else
-  {
-    joy = NULL;
-    axisNum = -1;
-  }
-}
-
-int CJoystick::MapButton(SDL_Joystick *joy, int buttonNum) const
-{
-  int idx = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && it->second != joy; ++it)
-    idx += SDL_JoystickNumButtons(it->second);
-  if (it == m_Joysticks.end())
-    return -1;
-  else
-    return idx + buttonNum;
-}
-
-void CJoystick::MapButton(int buttonIdx, SDL_Joystick *&joy, int &buttonNum) const
-{
-  int buttonCount = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && buttonCount + SDL_JoystickNumButtons(it->second) <= buttonIdx; ++it)
-    buttonCount += SDL_JoystickNumButtons(it->second);
-  if (it != m_Joysticks.end())
-  {
-    joy = it->second;
-    buttonNum = buttonIdx - buttonCount;
-  }
-  else
-  {
-    joy = NULL;
-    buttonNum = -1;
-  }
-}
-
-int CJoystick::MapHat(SDL_Joystick *joy, int hatNum) const
-{
-  int idx = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && it->second != joy; ++it)
-    idx += SDL_JoystickNumHats(it->second);
-  if (it == m_Joysticks.end())
-    return -1;
-  else
-    return idx + hatNum;
-}
-
-void CJoystick::MapHat(int hatIdx, SDL_Joystick *&joy, int& hatNum) const
-{
-  int hatCount = 0;
-  std::map<int, SDL_Joystick*>::const_iterator it;
-  for (it = m_Joysticks.begin(); it != m_Joysticks.end() && hatCount + SDL_JoystickNumHats(it->second) <= hatIdx; ++it)
-    hatCount += SDL_JoystickNumHats(it->second);
-  if (it != m_Joysticks.end())
-  {
-    joy = it->second;
-    hatNum = hatIdx - hatCount;
-  }
-  else
-  {
-    joy = NULL;
-    hatNum = -1;
-  }
-}
-
-#endif

_service:download_url:master.tar.gz/xbmc/input/SDLJoystick.h Deleted

@@ -1,126 +0,0 @@
-/*
- *      Copyright (C) 2007-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef SDL_JOYSTICK_H
-#define SDL_JOYSTICK_H
-
-#include "system.h" // for HAS_SDL_JOYSTICK
-#include <vector>
-#include <list>
-#include <utility>
-#include <string>
-#include <map>
-#include <memory>
-
-#define JACTIVE_BUTTON 0x00000001
-#define JACTIVE_AXIS   0x00000002
-#define JACTIVE_HAT    0x00000004
-#define JACTIVE_NONE   0x00000000
-#define JACTIVE_HAT_UP    0x01
-#define JACTIVE_HAT_RIGHT 0x02
-#define JACTIVE_HAT_DOWN  0x04
-#define JACTIVE_HAT_LEFT  0x08
-
-#if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
-struct AxisConfig {
-  int axis;
-  bool isTrigger;
-  int rest;
-  AxisConfig(int axis, bool isTrigger, int rest) : axis(axis), isTrigger(isTrigger), rest(rest) { }
-};
-typedef std::vector<AxisConfig> AxesConfig; // [<axis, isTrigger, rest state value>]
-#endif
-
-#ifdef HAS_SDL_JOYSTICK
-
-#include <SDL2/SDL_joystick.h>
-#include <SDL2/SDL_events.h>
-
-#define MAX_AXISAMOUNT 32768
-
-struct AxisState {
-  int val;
-  int rest;
-  bool trigger;
-  AxisState() : val(0), rest(0), trigger(false) { }
-  void reset() { val = rest; }
-};
-
-class CRegExp;
-
-// Class to manage all connected joysticks
-// Note: 'index' always refers to indices specific to this class,
-//       whereas 'ids' always refer to SDL instance id's
-class CJoystick
-{
-public:
-  CJoystick();
-
-  void Initialize();
-  void Reset();
-  void Update();
-  void Update(SDL_Event& joyEvent);
-  bool GetAxis(std::string &joyName, int &id) const;
-  bool GetButton(std::string &joyName, int &id, bool consider_repeat = true);
-  bool GetHat(std::string &joyName, int &id, int &position, bool consider_repeat = true);
-  bool GetAxes(std::list<std::pair<std::string, int> >& axes, bool consider_still = false);
-  float GetAmount(std::string &joyName, int axisNum) const;
-  bool IsEnabled() const { return m_joystickEnabled; }
-  void SetEnabled(bool enabled = true);
-  float SetDeadzone(float val);
-  bool Reinitialize();
-  typedef std::vector<AxisConfig> AxesConfig; // [<axis, isTrigger, rest state value>]
-  void ApplyAxesConfigs();
-
-private:
-  bool IsButtonActive() const { return m_ButtonIdx != -1; }
-  bool IsAxisActive() const { return m_AxisIdx != -1; }
-  bool IsHatActive() const { return m_HatIdx != -1; }
-
-  void AddJoystick(int joyIndex);
-  void RemoveJoystick(int id);
-  bool ReleaseJoysticks();
-
-  int GetAxisWithMaxAmount() const;
-  int JoystickIndex(const std::string &joyName) const;
-  int JoystickIndex(SDL_Joystick *joy) const;
-  int MapAxis(SDL_Joystick *joy, int axisNum) const ; // <joy, axis> --> axisIdx
-  void MapAxis(int axisIdx, SDL_Joystick *&joy, int &axisNum) const; // axisIdx --> <joy, axis>
-  int MapButton(SDL_Joystick *joy, int buttonNum) const; // <joy, button> --> buttonIdx
-  void MapButton(int buttonIdx, SDL_Joystick *&joy, int &buttonNum) const; // buttonIdx --> <joy, button>
-  int MapHat(SDL_Joystick *joy, int hatNum) const; // <joy, hat> --> hatIdx
-  void MapHat(int hatIdx, SDL_Joystick *&joy, int &hatNum) const; // hatIdx --> <joy, hat>
-
-  std::vector<AxisState> m_Axes;
-  int m_AxisIdx; // active axis
-  int m_ButtonIdx; // active button
-  uint8_t m_HatState; // state of active hat
-  int m_HatIdx; // active hat
-
-  int m_DeadzoneRange;
-  bool m_joystickEnabled;
-  uint32_t m_pressTicksButton;
-  uint32_t m_pressTicksHat;
-  std::map<int, SDL_Joystick*> m_Joysticks;
-};
-
-#endif
-
-#endif

_service:download_url:master.tar.gz/xbmc/input/joysticks Added

_service:download_url:master.tar.gz/xbmc/input/joysticks/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/input/joysticks/DefaultJoystick.cpp Added

@@ -0,0 +1,212 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DefaultJoystick.h"
+#include "KeymapHandler.h"
+#include "JoystickTranslator.h"
+#include "input/Key.h"
+
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+
+#define ANALOG_DIGITAL_THRESHOLD   0.5f
+
+using namespace JOYSTICK;
+
+CDefaultJoystick::CDefaultJoystick(void) :
+  m_handler(new CKeymapHandler)
+{
+}
+
+CDefaultJoystick::~CDefaultJoystick(void)
+{
+  delete m_handler;
+}
+
+std::string CDefaultJoystick::ControllerID(void) const
+{
+  return DEFAULT_CONTROLLER_ID;
+}
+
+bool CDefaultJoystick::HasFeature(const FeatureName& feature) const
+{
+  if (GetKeyID(feature) != 0)
+    return true;
+
+  // Try analog stick direction
+  if (GetKeyID(feature, CARDINAL_DIRECTION::UP) != 0)
+    return true;
+
+  return false;
+}
+
+INPUT_TYPE CDefaultJoystick::GetInputType(const FeatureName& feature) const
+{
+  return m_handler->GetInputType(GetKeyID(feature));
+}
+
+bool CDefaultJoystick::OnButtonPress(const FeatureName& feature, bool bPressed)
+{
+  const unsigned int keyId = GetKeyID(feature);
+
+  if (m_handler->GetInputType(keyId) == INPUT_TYPE::DIGITAL)
+  {
+    m_handler->OnDigitalKey(keyId, bPressed);
+    return true;
+  }
+
+  return false;
+}
+
+bool CDefaultJoystick::OnButtonMotion(const FeatureName& feature, float magnitude)
+{
+  const unsigned int keyId = GetKeyID(feature);
+
+  if (m_handler->GetInputType(keyId) == INPUT_TYPE::ANALOG)
+  {
+    m_handler->OnAnalogKey(keyId, magnitude);
+    return true;
+  }
+
+  return false;
+}
+
+bool CDefaultJoystick::OnAnalogStickMotion(const FeatureName& feature, float x, float y)
+{
+  // Calculate the direction of the stick's position
+  const CARDINAL_DIRECTION analogStickDir = CJoystickTranslator::VectorToCardinalDirection(x, y);
+
+  // Calculate the magnitude projected onto that direction
+  const float magnitude = std::max(std::abs(x), std::abs(y));
+
+  // Deactivate directions in which the stick is not pointing first
+  for (std::vector<CARDINAL_DIRECTION>::const_iterator it = GetDirections().begin(); it != GetDirections().end(); ++it)
+  {
+    if (*it != analogStickDir)
+      DeactivateDirection(feature, *it);
+  }
+
+  // Now activate direction the analog stick is pointing
+  return ActivateDirection(feature, magnitude, analogStickDir);
+}
+
+bool CDefaultJoystick::OnAccelerometerMotion(const FeatureName& feature, float x, float y, float z)
+{
+  return false; // TODO
+}
+
+bool CDefaultJoystick::ActivateDirection(const FeatureName& feature, float magnitude, CARDINAL_DIRECTION dir)
+{
+  // Calculate the button key ID and input type for the analog stick's direction
+  const unsigned int  keyId     = GetKeyID(feature, dir);
+  const INPUT_TYPE    inputType = m_handler->GetInputType(keyId);
+
+  if (inputType == INPUT_TYPE::DIGITAL)
+  {
+    const bool bIsPressed = (magnitude >= ANALOG_DIGITAL_THRESHOLD);
+    m_handler->OnDigitalKey(keyId, bIsPressed);
+    return true;
+  }
+  else if (inputType == INPUT_TYPE::ANALOG)
+  {
+    m_handler->OnAnalogKey(keyId, magnitude);
+    return true;
+  }
+
+  return false;
+}
+
+void CDefaultJoystick::DeactivateDirection(const FeatureName& feature, CARDINAL_DIRECTION dir)
+{
+  // Calculate the button key ID and input type for this direction
+  const unsigned int  keyId     = GetKeyID(feature, dir);
+  const INPUT_TYPE    inputType = m_handler->GetInputType(keyId);
+
+  if (inputType == INPUT_TYPE::DIGITAL)
+  {
+    m_handler->OnDigitalKey(keyId, false);
+  }
+  else if (inputType == INPUT_TYPE::ANALOG)
+  {
+    m_handler->OnAnalogKey(keyId, 0.0f);
+  }
+}
+
+unsigned int CDefaultJoystick::GetKeyID(const FeatureName& feature, CARDINAL_DIRECTION dir /* = CARDINAL_DIRECTION::UNKNOWN */)
+{
+  if      (feature == "a")             return KEY_JOYSTICK_BUTTON_A;
+  else if (feature == "b")             return KEY_JOYSTICK_BUTTON_B;
+  else if (feature == "x")             return KEY_JOYSTICK_BUTTON_X;
+  else if (feature == "y")             return KEY_JOYSTICK_BUTTON_Y;
+  else if (feature == "start")         return KEY_JOYSTICK_BUTTON_START;
+  else if (feature == "back")          return KEY_JOYSTICK_BUTTON_BACK;
+  else if (feature == "guide")         return KEY_JOYSTICK_BUTTON_GUIDE;
+  else if (feature == "leftbumper")    return KEY_JOYSTICK_BUTTON_LEFT_SHOULDER;
+  else if (feature == "rightbumper")   return KEY_JOYSTICK_BUTTON_RIGHT_SHOULDER;
+  else if (feature == "leftthumb")     return KEY_JOYSTICK_BUTTON_LEFT_STICK_BUTTON;
+  else if (feature == "rightthumb")    return KEY_JOYSTICK_BUTTON_RIGHT_STICK_BUTTON;
+  else if (feature == "up")            return KEY_JOYSTICK_BUTTON_DPAD_UP;
+  else if (feature == "down")          return KEY_JOYSTICK_BUTTON_DPAD_DOWN;
+  else if (feature == "right")         return KEY_JOYSTICK_BUTTON_DPAD_RIGHT;
+  else if (feature == "left")          return KEY_JOYSTICK_BUTTON_DPAD_LEFT;
+  else if (feature == "lefttrigger")   return KEY_JOYSTICK_BUTTON_LEFT_TRIGGER;
+  else if (feature == "righttrigger")  return KEY_JOYSTICK_BUTTON_RIGHT_TRIGGER;
+  else if (feature == "leftstick")
+  {
+    switch (dir)
+    {
+      case CARDINAL_DIRECTION::UP:     return KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_UP;
+      case CARDINAL_DIRECTION::DOWN:   return KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_DOWN;
+      case CARDINAL_DIRECTION::RIGHT:  return KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_RIGHT;
+      case CARDINAL_DIRECTION::LEFT:   return KEY_JOYSTICK_BUTTON_LEFT_THUMB_STICK_LEFT;
+      default:
+        break;
+    }
+  }
+  else if (feature == "rightstick")
+  {
+    switch (dir)
+    {
+      case CARDINAL_DIRECTION::UP:     return KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_UP;
+      case CARDINAL_DIRECTION::DOWN:   return KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_DOWN;
+      case CARDINAL_DIRECTION::RIGHT:  return KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_RIGHT;
+      case CARDINAL_DIRECTION::LEFT:   return KEY_JOYSTICK_BUTTON_RIGHT_THUMB_STICK_LEFT;
+      default:
+        break;
+    }
+  }
+  else if (feature == "accelerometer") return 0; // TODO
+
+  return 0;
+}
+
+const std::vector<CARDINAL_DIRECTION>& CDefaultJoystick::GetDirections(void)
+{
+  static std::vector<CARDINAL_DIRECTION> directions;
+  if (directions.empty())
+  {
+    directions.push_back(CARDINAL_DIRECTION::UP);
+    directions.push_back(CARDINAL_DIRECTION::DOWN);
+    directions.push_back(CARDINAL_DIRECTION::RIGHT);
+    directions.push_back(CARDINAL_DIRECTION::LEFT);
+  }
+  return directions;
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/DefaultJoystick.h Added

@@ -0,0 +1,76 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "IInputHandler.h"
+#include "JoystickTypes.h"
+
+#include <vector>
+
+#define DEFAULT_CONTROLLER_ID    "game.controller.default"
+
+namespace JOYSTICK
+{
+  class IKeymapHandler;
+
+  /*!
+   * \brief Implementation of IInputHandler for Kodi input
+   *
+   * \sa IInputHandler
+   */
+  class CDefaultJoystick : public JOYSTICK::IInputHandler
+  {
+  public:
+    CDefaultJoystick(void);
+
+    virtual ~CDefaultJoystick(void);
+
+    // implementation of IInputHandler
+    virtual std::string ControllerID(void) const override;
+    virtual bool HasFeature(const FeatureName& feature) const override;
+    virtual INPUT_TYPE GetInputType(const FeatureName& feature) const override;
+    virtual bool OnButtonPress(const FeatureName& feature, bool bPressed) override;
+    virtual bool OnButtonMotion(const FeatureName& feature, float magnitude) override;
+    virtual bool OnAnalogStickMotion(const FeatureName& feature, float x, float y) override;
+    virtual bool OnAccelerometerMotion(const FeatureName& feature, float x, float y, float z) override;
+
+  private:
+    bool ActivateDirection(const FeatureName& feature, float magnitude, CARDINAL_DIRECTION dir);
+    void DeactivateDirection(const FeatureName& feature, CARDINAL_DIRECTION dir);
+
+    /*!
+     * \brief Get the keymap key, as defined in Key.h, for the specified
+     *        joystick feature/direction
+     *
+     * \param           feature The name of the feature on the default controller
+     * \param[optional] dir     The direction (used for analog sticks)
+     *
+     * \return The key ID, or 0 if unknown
+     */
+    static unsigned int GetKeyID(const FeatureName& feature, CARDINAL_DIRECTION dir = CARDINAL_DIRECTION::UNKNOWN);
+
+    /*!
+     * \brief Return a vector of the four cardinal directions
+     */
+    static const std::vector<CARDINAL_DIRECTION>& GetDirections(void);
+
+    IKeymapHandler* const  m_handler;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/DriverPrimitive.cpp Added

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "DriverPrimitive.h"
+
+using namespace JOYSTICK;
+
+CDriverPrimitive::CDriverPrimitive(void)
+  : m_type(),
+    m_driverIndex(0),
+    m_hatDirection(),
+    m_semiAxisDirection()
+{
+}
+
+CDriverPrimitive::CDriverPrimitive(unsigned int buttonIndex)
+  : m_type(BUTTON),
+    m_driverIndex(buttonIndex),
+    m_hatDirection(),
+    m_semiAxisDirection()
+{
+}
+
+CDriverPrimitive::CDriverPrimitive(unsigned int hatIndex, HAT_DIRECTION direction)
+  : m_type(HAT),
+    m_driverIndex(hatIndex),
+    m_hatDirection(direction),
+    m_semiAxisDirection()
+{
+}
+
+CDriverPrimitive::CDriverPrimitive(unsigned int axisIndex, SEMIAXIS_DIRECTION direction)
+  : m_type(SEMIAXIS),
+    m_driverIndex(axisIndex),
+    m_hatDirection(),
+    m_semiAxisDirection(direction)
+{
+}
+
+bool CDriverPrimitive::operator==(const CDriverPrimitive& rhs) const
+{
+  if (m_type == rhs.m_type)
+  {
+    switch (m_type)
+    {
+    case BUTTON:
+      return m_driverIndex == rhs.m_driverIndex;
+    case HAT:
+      return m_driverIndex == rhs.m_driverIndex && m_hatDirection == rhs.m_hatDirection;
+    case SEMIAXIS:
+      return m_driverIndex == rhs.m_driverIndex && m_semiAxisDirection == rhs.m_semiAxisDirection;
+    default:
+      return true;
+    }
+  }
+  return false;
+}
+
+bool CDriverPrimitive::operator<(const CDriverPrimitive& rhs) const
+{
+  if (m_type < rhs.m_type) return true;
+  if (m_type > rhs.m_type) return false;
+
+  // Driver index is common to all valid primitives
+  if (m_type != UNKNOWN)
+  {
+    if (m_driverIndex < rhs.m_driverIndex) return true;
+    if (m_driverIndex > rhs.m_driverIndex) return false;
+  }
+
+  if (m_type == HAT)
+  {
+    if (m_hatDirection < rhs.m_hatDirection) return true;
+    if (m_hatDirection > rhs.m_hatDirection) return false;
+  }
+
+  if (m_type == SEMIAXIS)
+  {
+    if (m_semiAxisDirection < rhs.m_semiAxisDirection) return true;
+    if (m_semiAxisDirection > rhs.m_semiAxisDirection) return false;
+  }
+
+  return false;
+}
+
+bool CDriverPrimitive::IsValid(void) const
+{
+  if (m_type == BUTTON)
+    return true;
+
+  if (m_type == HAT)
+  {
+    return m_hatDirection == HAT_DIRECTION::UP    ||
+           m_hatDirection == HAT_DIRECTION::DOWN  ||
+           m_hatDirection == HAT_DIRECTION::RIGHT ||
+           m_hatDirection == HAT_DIRECTION::LEFT;
+  }
+
+  if (m_type == SEMIAXIS)
+  {
+    return m_semiAxisDirection == SEMIAXIS_DIRECTION::POSITIVE ||
+           m_semiAxisDirection == SEMIAXIS_DIRECTION::NEGATIVE;
+  }
+
+  return false;
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/DriverPrimitive.h Added

@@ -0,0 +1,141 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+#include <stdint.h>
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Basic driver element associated with input events
+   *
+   * Driver input (bools, floats and enums) is split into primitives that better
+   * map to the physical features on a joystick.
+   *
+   * A bool obviously only maps to a single feature, so it is a driver
+   * primitive. Here, these are called "buttons".
+   *
+   * A hat enum encodes the state of the four hat directions. Each direction
+   * can map to a different feature, so a hat enum consists of four driver
+   * primitives called "hat directions".
+   *
+   * A float is a little trickier. Trivially, it can map to an analog stick or
+   * trigger. However, DirectInput combines two triggers onto a single axis.
+   * Therefore, the axis is split into two primitives called "semiaxes".
+   *
+   * The type determines the fields in use:
+   *
+   *    Button:
+   *       - driver index
+   *
+   *    Hat direction:
+   *       - driver index
+   *       - hat direction (up/right/down/left)
+   *
+   *    Semiaxis:
+   *       - driver index
+   *       - semiaxis direction (positive/negative)
+   *
+   * For more info, see "Chapter 2. Joystick drivers" in the documentation
+   * thread: http://forum.kodi.tv/showthread.php?tid=257764
+   */
+  class CDriverPrimitive
+  {
+  public:
+    /*!
+     * \brief Type of driver primitive
+     */
+    enum PrimitiveType
+    {
+      UNKNOWN = 0, // primitive has no type (invalid)
+      BUTTON,      // a digital button
+      HAT,         // one of the four direction arrows on a D-pad
+      SEMIAXIS,    // the positive or negative half of an axis
+    };
+
+    /*!
+     * \brief Construct an invalid driver primitive
+     */
+    CDriverPrimitive(void);
+
+    /*!
+     * \brief Construct a driver primitive representing a button
+     */
+    CDriverPrimitive(unsigned int buttonIndex);
+
+    /*!
+     * \brief Construct a driver primitive representing one of the four
+     *        direction arrows on a dpad
+     */
+    CDriverPrimitive(unsigned int hatIndex, HAT_DIRECTION direction);
+
+    /*!
+     * \brief Construct a driver primitive representing the positive or negative
+     *        half of an axis
+     */
+    CDriverPrimitive(unsigned int axisIndex, SEMIAXIS_DIRECTION direction);
+
+    bool operator==(const CDriverPrimitive& rhs) const;
+    bool operator<(const CDriverPrimitive& rhs) const;
+
+    bool operator!=(const CDriverPrimitive& rhs) const { return !operator==(rhs); }
+    bool operator>(const CDriverPrimitive& rhs) const  { return !(operator<(rhs) || operator==(rhs)); }
+    bool operator<=(const CDriverPrimitive& rhs) const { return   operator<(rhs) || operator==(rhs); }
+    bool operator>=(const CDriverPrimitive& rhs) const { return  !operator<(rhs); }
+
+    /*!
+     * \brief The type of driver primitive
+     */
+    PrimitiveType Type(void) const { return m_type; }
+
+    /*!
+     * \brief The index used by the driver (valid for all types)
+     */
+    unsigned int Index(void) const { return m_driverIndex; }
+
+    /*!
+     * \brief The direction arrow (valid for hat directions)
+     */
+    HAT_DIRECTION HatDirection(void) const { return m_hatDirection; }
+
+    /*!
+     * \brief The semiaxis direction (valid for semiaxes)
+     */
+    SEMIAXIS_DIRECTION SemiAxisDirection(void) const { return m_semiAxisDirection; }
+
+    /*!
+     * \brief Test if an driver primitive is valid
+     *
+     * A driver primitive is valid if it has a known type and:
+     *
+     *   1) for hats, it is a cardinal direction
+     *   2) for semi-axes, it is a positive or negative direction
+     */
+    bool IsValid(void) const;
+
+  private:
+    PrimitiveType      m_type;
+    unsigned int       m_driverIndex;
+    HAT_DIRECTION      m_hatDirection;
+    SEMIAXIS_DIRECTION m_semiAxisDirection;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/IButtonMap.h Added

@@ -0,0 +1,204 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "DriverPrimitive.h"
+#include "JoystickTypes.h"
+
+#include <string>
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Button map interface to translate between the driver's raw
+   *        button/hat/axis elements and physical joystick features.
+   *
+   * \sa IButtonMapper
+   */
+  class IButtonMap
+  {
+  public:
+    virtual ~IButtonMap(void) { }
+
+    /*!
+     * \brief The add-on ID of the game controller associated with this button map
+     *
+     * The controller ID provided by the implementation serves as the context
+     * for the feature names below.
+     *
+     * \return The ID of this button map's game controller add-on
+     */
+    virtual std::string ControllerID(void) const = 0;
+
+    /*!
+     * \brief Load the button map into memory
+     *
+     * \return True if button map is ready to start translating buttons, false otherwise
+     */
+    virtual bool Load(void) = 0;
+
+    /*!
+     * \brief Reset the button map to its defaults, or clear button map if no defaults
+     */
+    virtual void Reset(void) = 0;
+
+    /*!
+     * \brief Get the feature associated with a driver primitive
+     *
+     * Multiple primitives can be mapped to the same feature. For example,
+     * analog sticks use one primitive for each direction.
+     *
+     * \param primitive    The driver primitive (a button, hat direction or semi-axis)
+     * \param feature      The name of the resolved joystick feature, or
+     *                     invalid if false is returned
+     *
+     * \return True if the driver primitive is associated with a feature, false otherwise
+     */
+    virtual bool GetFeature(
+      const CDriverPrimitive& primitive,
+      FeatureName& feature
+    ) = 0;
+
+    /*!
+     * \brief Get the type of the feature for the given name
+     *
+     * \param feature      The feature to look up
+     *
+     * \return The feature's type
+     */
+    virtual FEATURE_TYPE GetFeatureType(const FeatureName& feature) = 0;
+
+    /*!
+     * \brief Get the driver primitive for a scalar feature
+     *
+     * When a feature can be represented by a single driver primitive, it is
+     * called a scalar feature.
+     *
+     *   - This includes buttons and triggers, because they can be mapped to a
+     *     single button/hat/semiaxis
+     *
+     *   - This does not include analog sticks, because they require two axes
+     *     and four driver primitives (one for each semiaxis)
+     *
+     * \param feature        Must be a scalar feature (a feature that only
+     *                       requires a single driver primitive)
+     * \param primitive      The resolved driver primitive
+     *
+     * \return True if the feature resolved to a driver primitive, false if the
+     *         feature didn't resolve or isn't a scalar feature
+     */
+    virtual bool GetScalar(
+      const FeatureName& feature,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a scalar feature
+     *
+     * \param feature        Must be a scalar feature
+     * \param primitive      The feature's driver primitive
+     *
+     * \return True if the feature was updated, false if the feature is
+     *         unchanged or failure occurs
+     */
+    virtual bool AddScalar(
+      const FeatureName& feature,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Get an analog stick from the button map
+     *
+     * \param feature  Must be an analog stick or this will return false
+     * \param up       The primitive mapped to the up direction (possibly unknown)
+     * \param down     The primitive mapped to the down direction (possibly unknown)
+     * \param right    The primitive mapped to the right direction (possibly unknown)
+     * \param left     The primitive mapped to the left direction (possibly unknown)
+     *
+     * \return True if the feature resolved to an analog stick with at least 1 known direction
+     */
+    virtual bool GetAnalogStick(
+      const FeatureName& feature,
+      CDriverPrimitive& up,
+      CDriverPrimitive& down,
+      CDriverPrimitive& right,
+      CDriverPrimitive& left
+    ) = 0;
+
+    /*!
+     * \brief Add or update an analog stick
+     *
+     * \param feature  Must be an analog stick or this will return false
+     * \param up       The driver primitive for the up direction
+     * \param down     The driver primitive for the down direction
+     * \param right    The driver primitive for the right direction
+     * \param left     The driver primitive for the left direction
+     *
+     * It is not required that these primitives be axes. If a primitive is a
+     * semiaxis, its opposite should point to the same axis index but with
+     * opposite direction.
+     *
+     * \return True if the analog stick was updated, false otherwise
+     */
+    virtual bool AddAnalogStick(
+      const FeatureName& feature,
+      const CDriverPrimitive& up,
+      const CDriverPrimitive& down,
+      const CDriverPrimitive& right,
+      const CDriverPrimitive& left
+    ) = 0;
+
+    /*!
+     * \brief Get an accelerometer from the button map
+     *
+     * \param feature       Must be an accelerometer or this will return false
+     * \param positiveX     The semiaxis mapped to the positive X direction (possibly unknown)
+     * \param positiveY     The semiaxis mapped to the positive Y direction (possibly unknown)
+     * \param positiveZ     The semiaxis mapped to the positive Z direction (possibly unknown)
+     *
+     * \return True if the feature resolved to an accelerometer with at least 1 known axis
+     */
+    virtual bool GetAccelerometer(
+      const FeatureName& feature,
+      CDriverPrimitive& positiveX,
+      CDriverPrimitive& positiveY,
+      CDriverPrimitive& positiveZ
+    ) = 0;
+
+    /*!
+     * \brief Get or update an accelerometer
+     *
+     * \param feature       Must be an accelerometer or this will return false
+     * \param positiveX     The semiaxis corresponding to the positive X direction
+     * \param positiveY     The semiaxis corresponding to the positive Y direction
+     * \param positiveZ     The semiaxis corresponding to the positive Z direction
+     *
+     * The driver primitives must be mapped to a semiaxis or this function will fail.
+     *
+     * \return True if the accelerometer was updated, false if unchanged or failure occurred
+     */
+    virtual bool AddAccelerometer(
+      const FeatureName& feature,
+      const CDriverPrimitive& positiveX,
+      const CDriverPrimitive& positiveY,
+      const CDriverPrimitive& positiveZ
+    ) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/IButtonMapper.h Added

@@ -0,0 +1,59 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <string>
+
+namespace JOYSTICK
+{
+  class CDriverPrimitive;
+  class IButtonMap;
+
+  /*!
+   * \ingroup joysticks
+   *
+   * \brief Button mapper interface to assign the driver's raw button/hat/axis
+   *        elements to physical joystick features using a provided button map.
+   *
+   * \sa IButtonMap
+   */
+  class IButtonMapper
+  {
+  public:
+    virtual ~IButtonMapper(void) { }
+
+    /*!
+     * \brief The add-on ID of the game controller associated with this button mapper
+     *
+     * \return The ID of the add-on extending kodi.game.controller
+     */
+    virtual std::string ControllerID(void) const = 0;
+
+    /*!
+     * \brief Handle button/hat press or axis threshold
+     *
+     * \param buttonMap  The button map being manipulated
+     * \param primitive  The source of the action
+     *
+     * \return True if action was mapped to a feature
+     */
+    virtual bool MapPrimitive(IButtonMap* buttonMap, const CDriverPrimitive& primitive) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/IDriverHandler.h Added

@@ -0,0 +1,80 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Interface defining methods to handle joystick events for raw driver
+   *        elements (buttons, hats, axes)
+   */
+  class IDriverHandler
+  {
+  public:
+    virtual ~IDriverHandler(void) { }
+
+    /*!
+     * \brief Handle button motion
+     *
+     * \param buttonIndex The index of the button as reported by the driver
+     * \param bPressed    true for press motion, false for release motion
+     *
+     * \return True if a press was handled, false otherwise
+     */
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) = 0;
+
+    /*!
+     * \brief Handle hat motion
+     *
+     * \param hatIndex     The index of the hat as reported by the driver
+     * \param state        The direction the hat is now being pressed
+     *
+     * \return True if the new direction was handled, false otherwise
+     */
+    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) = 0;
+
+    /*!
+     * \brief Handle axis motion
+     *
+     * If a joystick feature requires multiple axes (analog sticks, accelerometers),
+     * they can be buffered for later processing.
+     *
+     * \param axisIndex   The index of the axis as reported by the driver
+     * \param position    The position of the axis in the closed interval [-1.0, 1.0]
+     *
+     * \return True if the motion was handled, false otherwise
+     */
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) = 0;
+
+    /*!
+     * \brief Handle buffered axis positions for features that require multiple axes
+     *
+     * ProcessAxisMotions() is called at the end of the frame when all axis motions
+     * have been reported. This has several uses, including:
+     *
+     *  - Combining multiple axes into a single analog stick or accelerometer event
+     *  - Imitating an analog feature with a digital button so that events can be
+     *    dispatched every frame.
+     */
+    virtual void ProcessAxisMotions(void) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/IInputHandler.h Added

@@ -0,0 +1,97 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+#include <string>
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Interface for handling input events for game controllers
+   */
+  class IInputHandler
+  {
+  public:
+    virtual ~IInputHandler(void) { }
+
+    /*!
+     * \brief The add-on ID of the game controller associated with this input handler
+     *
+     * \return The ID of the add-on extending kodi.game.controller
+     */
+    virtual std::string ControllerID(void) const = 0;
+
+    virtual bool HasFeature(const FeatureName& feature) const = 0;
+
+    /*!
+     * \brief Get the type of input handled by the specified feature
+     *
+     * \return INPUT_TYPE::DIGITAL for digital buttons, INPUT::ANALOG for analog
+     *         buttons, or INPUT::UNKNOWN otherwise
+     */
+    virtual INPUT_TYPE GetInputType(const FeatureName& feature) const = 0;
+
+    /*!
+     * \brief A digital button has been pressed or released
+     *
+     * \param feature      The feature being pressed
+     * \param bPressed     True if pressed, false if released
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnButtonPress(const FeatureName& feature, bool bPressed) = 0;
+
+    /*!
+     * \brief An analog button (trigger or a pressure-sensitive button) has changed state
+     *
+     * \param feature      The feature changing state
+     * \param magnitude    The button pressure or trigger travel distance in the
+     *                     closed interval [0, 1]
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnButtonMotion(const FeatureName& feature, float magnitude) = 0;
+
+    /*!
+     * \brief An analog stick has moved
+     *
+     * \param feature      The analog stick being moved
+     * \param x            The x coordinate in the closed interval [-1, 1]
+     * \param y            The y coordinate in the closed interval [-1, 1]
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnAnalogStickMotion(const FeatureName& feature, float x, float y) = 0;
+
+    /*!
+     * \brief An accelerometer's state has changed
+     *
+     * \param feature      The accelerometer being accelerated
+     * \param x            The x coordinate in the closed interval [-1, 1]
+     * \param y            The y coordinate in the closed interval [-1, 1]
+     * \param z            The z coordinate in the closed interval [-1, 1]
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnAccelerometerMotion(const FeatureName& feature, float x, float y, float z) { return false; }
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/IKeymapHandler.h Added

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Interface for handling keymap keys
+   *
+   * Keys can be mapped to analog actions (e.g. "AnalogSeekForward") or digital
+   * actions (e.g. "Up").
+   */
+  class IKeymapHandler
+  {
+  public:
+    virtual ~IKeymapHandler(void) { }
+
+    /*!
+     * \brief Get the type of action mapped to the specified key ID
+     *
+     * \param keyId  The key ID from Key.h
+     *
+     * \return The type of action mapped to keyId, or INPUT_TYPE::UNKNOWN if
+     *         no action is mapped to the specified key
+     */
+    virtual INPUT_TYPE GetInputType(unsigned int keyId) const = 0;
+
+    /*!
+     * \brief A key mapped to a digital action has been pressed or released
+     *
+     * \param keyId     The key ID from Key.h
+     * \param bPressed  true if the key's button/axis is activated, false if deactivated
+     */
+    virtual void OnDigitalKey(unsigned int keyId, bool bPressed) = 0;
+
+    /*!
+     * \brief Callback for keys mapped to analog actions
+     *
+     * \param keyId      The button key ID from Key.h
+     * \param magnitude  The amount of the analog action
+     *
+     * If keyId is not mapped to an analog action, no action need be taken
+     */
+    virtual void OnAnalogKey(unsigned int buttonKeyId, float magnitude) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickMonitor.cpp Added

@@ -0,0 +1,65 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "JoystickMonitor.h"
+#include "Application.h"
+#include "input/InputManager.h"
+
+using namespace JOYSTICK;
+
+bool CJoystickMonitor::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  if (bPressed)
+  {
+    CInputManager::GetInstance().SetMouseActive(false);
+    return ResetTimers();
+  }
+
+  return false;
+}
+
+bool CJoystickMonitor::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  if (state != HAT_STATE::UNPRESSED)
+  {
+    CInputManager::GetInstance().SetMouseActive(false);
+    return ResetTimers();
+  }
+
+  return false;
+}
+
+bool CJoystickMonitor::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  if (position)
+  {
+    CInputManager::GetInstance().SetMouseActive(false);
+    return ResetTimers();
+  }
+
+  return false;
+}
+
+bool CJoystickMonitor::ResetTimers(void)
+{
+  g_application.ResetSystemIdleTimer();
+  g_application.ResetScreenSaver();
+  return g_application.WakeUpScreenSaverAndDPMS();
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickMonitor.h Added

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "IDriverHandler.h"
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Monitors joystick input and resets screensaver/shutdown timers
+   *        whenever motion occurs.
+   */
+  class CJoystickMonitor : public IDriverHandler
+  {
+  public:
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override { }
+
+  private:
+    /*!
+     * \brief  Reset screensaver and shutdown timers
+     * \return True if the application was woken from screensaver
+     */
+    bool ResetTimers(void);
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickTranslator.cpp Added

@@ -0,0 +1,61 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "JoystickTranslator.h"
+
+using namespace JOYSTICK;
+
+const char* CJoystickTranslator::HatStateToString(HAT_STATE state)
+{
+  switch (state)
+  {
+    case HAT_STATE::UP:        return "UP";
+    case HAT_STATE::DOWN:      return "DOWN";
+    case HAT_STATE::RIGHT:     return "RIGHT";
+    case HAT_STATE::LEFT:      return "LEFT";
+    case HAT_STATE::RIGHTUP:   return "UP RIGHT";
+    case HAT_STATE::RIGHTDOWN: return "DOWN RIGHT";
+    case HAT_STATE::LEFTUP:    return "UP LEFT";
+    case HAT_STATE::LEFTDOWN:  return "DOWN LEFT";
+    case HAT_STATE::UNPRESSED:
+    default:
+      break;
+  }
+
+  return "RELEASED";
+}
+
+SEMIAXIS_DIRECTION CJoystickTranslator::PositionToSemiAxisDirection(float position)
+{
+  if      (position > 0) return SEMIAXIS_DIRECTION::POSITIVE;
+  else if (position < 0) return SEMIAXIS_DIRECTION::NEGATIVE;
+
+  return SEMIAXIS_DIRECTION::ZERO;
+}
+
+CARDINAL_DIRECTION CJoystickTranslator::VectorToCardinalDirection(float x, float y)
+{
+  if      (y >= x && y >  -x) return CARDINAL_DIRECTION::UP;
+  else if (y <  x && y >= -x) return CARDINAL_DIRECTION::RIGHT;
+  else if (y <= x && y <  -x) return CARDINAL_DIRECTION::DOWN;
+  else if (y >  x && y <= -x) return CARDINAL_DIRECTION::LEFT;
+
+  return CARDINAL_DIRECTION::UNKNOWN;
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickTranslator.h Added

@@ -0,0 +1,61 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+namespace JOYSTICK
+{
+  class CJoystickTranslator
+  {
+  public:
+    /*!
+     * \brief Translate a hat state to a string representation
+     *
+     * \param state The hat state
+     *
+     * \return A capitalized string representation, or "RELEASED" if the hat is centered.
+     */
+    static const char* HatStateToString(HAT_STATE state);
+
+    /*!
+     * \brief Get the semi-axis direction containing the specified position
+     *
+     * \param position The position of the axis
+     *
+     * \return POSITIVE, NEGATIVE, or UNKNOWN if position is 0
+     */
+    static SEMIAXIS_DIRECTION PositionToSemiAxisDirection(float position);
+
+    /*!
+     * \brief Get the closest cardinal direction to the given vector
+     *
+     * Ties are resolved in the clockwise direction: (0.5, 0.5) will resolve to
+     * RIGHT.
+     *
+     * \param x  The x component of the vector
+     * \param y  The y component of the vector
+     *
+     * \return The closest cardinal directon (up, down, right or left), or unknown
+     *         if x and y are both 0.
+     */
+    static CARDINAL_DIRECTION VectorToCardinalDirection(float x, float y);
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickTypes.h Added

@@ -0,0 +1,109 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <string>
+
+namespace JOYSTICK
+{
+  /*!
+   * \brief Name of a physical feature belonging to the joystick
+   */
+  typedef std::string FeatureName;
+
+  /*!
+   * \brief Types of features used in the joystick library
+   *
+   * Available types:
+   *
+   *   1) scalar[1]
+   *   2) analog stick
+   *   3) accelerometer
+   *
+   * [1] All three driver primitives (buttons, hats and axes) have a state that
+   *     can be represented using a single scalar value. For this reason,
+   *     features that map to a single primitive are called "scalar features".
+   */
+  enum class FEATURE_TYPE
+  {
+    UNKNOWN,
+    SCALAR,
+    ANALOG_STICK,
+    ACCELEROMETER,
+  };
+
+  /*!
+   * \brief Direction arrows on the hat (directional pad)
+   */
+  enum class HAT_DIRECTION
+  {
+    UNKNOWN = 0x0,
+    UP      = 0x1,
+    DOWN    = 0x2,
+    RIGHT   = 0x4,
+    LEFT    = 0x8,
+  };
+
+  /*!
+   * \brief Generic typedef for cardinal directions
+   */
+  typedef HAT_DIRECTION CARDINAL_DIRECTION;
+
+  /*!
+   * \brief States in which a hat can be
+   */
+  enum class HAT_STATE
+  {
+    UNPRESSED = 0x0,    /*!< @brief no directions are pressed */
+    UP        = 0x1,    /*!< @brief only up is pressed */
+    DOWN      = 0x2,    /*!< @brief only down is pressed */
+    RIGHT     = 0x4,    /*!< @brief only right is pressed */
+    LEFT      = 0x8,    /*!< @brief only left is pressed */
+    RIGHTUP   = RIGHT | UP,
+    RIGHTDOWN = RIGHT | DOWN,
+    LEFTUP    = LEFT  | UP,
+    LEFTDOWN  = LEFT  | DOWN,
+  };
+
+  /*!
+   * \brief Generic typedef for intercardinal directions
+   */
+  typedef HAT_STATE  INTERCARDINAL_DIRECTION;
+
+  /*!
+   * \brief Directions in which a semiaxis can point
+   */
+  enum class SEMIAXIS_DIRECTION
+  {
+    NEGATIVE = -1,  // semiaxis lies in the interval [-1.0, 0.0]
+    ZERO     =  0,  // semiaxis is unknown or invalid
+    POSITIVE =  1,  // semiaxis lies in the interval [0.0, 1.0]
+  };
+
+  /*!
+   * \brief Types of input available for scalar features
+   */
+  enum class INPUT_TYPE
+  {
+    UNKNOWN,
+    DIGITAL,
+    ANALOG,
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/JoystickUtils.h Added

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "JoystickTypes.h"
+
+inline JOYSTICK::HAT_DIRECTION& operator|=(JOYSTICK::HAT_DIRECTION& lhs, JOYSTICK::HAT_DIRECTION rhs)
+{
+  return lhs = static_cast<JOYSTICK::HAT_DIRECTION>(static_cast<int>(lhs) | static_cast<int>(rhs));
+}
+
+inline JOYSTICK::HAT_STATE& operator|=(JOYSTICK::HAT_STATE& lhs, JOYSTICK::HAT_STATE rhs)
+{
+  return lhs = static_cast<JOYSTICK::HAT_STATE>(static_cast<int>(lhs) | static_cast<int>(rhs));
+}
+
+inline bool operator&(JOYSTICK::HAT_STATE lhs, JOYSTICK::HAT_DIRECTION rhs)
+{
+  return (static_cast<int>(lhs) & static_cast<int>(rhs)) ? true : false;
+}
+
+inline JOYSTICK::SEMIAXIS_DIRECTION operator*(JOYSTICK::SEMIAXIS_DIRECTION lhs, int rhs)
+{
+  return static_cast<JOYSTICK::SEMIAXIS_DIRECTION>(static_cast<int>(lhs) * rhs);
+}
+
+inline float operator*(float lhs, JOYSTICK::SEMIAXIS_DIRECTION rhs)
+{
+  return lhs * static_cast<int>(rhs);
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/KeymapHandler.cpp Added

@@ -0,0 +1,216 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "KeymapHandler.h"
+#include "guilib/GUIWindowManager.h"
+#include "input/ButtonTranslator.h"
+#include "input/InputManager.h"
+#include "input/Key.h"
+
+#include <algorithm>
+
+using namespace KODI;
+using namespace MESSAGING;
+
+#define HOLD_TIMEOUT_MS     500
+#define REPEAT_TIMEOUT_MS   50
+
+using namespace JOYSTICK;
+
+CKeymapHandler::CKeymapHandler(void)
+  : CThread("KeymapHandler"),
+    m_state(STATE_UNPRESSED),
+    m_lastButtonPress(0)
+{
+  Create(false);
+}
+
+CKeymapHandler::~CKeymapHandler(void)
+{
+  StopThread(true);
+}
+
+INPUT_TYPE CKeymapHandler::GetInputType(unsigned int keyId) const
+{
+  if (keyId != 0)
+  {
+    CAction action(CButtonTranslator::GetInstance().GetAction(g_windowManager.GetActiveWindowID(), CKey(keyId)));
+    if (action.GetID() > 0)
+    {
+      if (action.IsAnalog())
+        return INPUT_TYPE::ANALOG;
+      else
+        return INPUT_TYPE::DIGITAL;
+    }
+  }
+
+  return INPUT_TYPE::UNKNOWN;
+}
+
+void CKeymapHandler::OnDigitalKey(unsigned int keyId, bool bPressed)
+{
+  if (keyId != 0)
+  {
+    CSingleLock lock(m_digitalMutex);
+
+    if (bPressed && !IsPressed(keyId))
+      ProcessButtonPress(keyId);
+    else if (!bPressed && IsPressed(keyId))
+      ProcessButtonRelease(keyId);
+  }
+}
+
+void CKeymapHandler::OnAnalogKey(unsigned int keyId, float magnitude)
+{
+  if (keyId != 0)
+    SendAnalogAction(keyId, magnitude);
+}
+
+void CKeymapHandler::Process()
+{
+  unsigned int holdStartTime = 0;
+  unsigned int pressedButton = 0;
+
+  while (!m_bStop)
+  {
+    switch (m_state)
+    {
+      case STATE_UNPRESSED:
+      {
+        // Wait for button press
+        WaitResponse waitResponse = AbortableWait(m_pressEvent);
+
+        CSingleLock lock(m_digitalMutex);
+
+        if (waitResponse == WAIT_SIGNALED && m_lastButtonPress != 0)
+        {
+          pressedButton = m_lastButtonPress;
+          m_state = STATE_BUTTON_PRESSED;
+        }
+        break;
+      }
+
+      case STATE_BUTTON_PRESSED:
+      {
+        holdStartTime = XbmcThreads::SystemClockMillis();
+
+        // Wait for hold time to elapse
+        WaitResponse waitResponse = AbortableWait(m_pressEvent, HOLD_TIMEOUT_MS);
+
+        CSingleLock lock(m_digitalMutex);
+
+        if (m_lastButtonPress == 0)
+        {
+          m_state = STATE_UNPRESSED;
+        }
+        else if (waitResponse == WAIT_SIGNALED || m_lastButtonPress != pressedButton)
+        {
+          pressedButton = m_lastButtonPress;
+          // m_state is unchanged
+        }
+        else if (waitResponse == WAIT_TIMEDOUT)
+        {
+          m_state = STATE_BUTTON_HELD;
+        }
+        break;
+      }
+
+      case STATE_BUTTON_HELD:
+      {
+        const unsigned int holdTimeMs = XbmcThreads::SystemClockMillis() - holdStartTime;
+        SendDigitalAction(pressedButton, holdTimeMs);
+
+        // Wait for repeat time to elapse
+        WaitResponse waitResponse = AbortableWait(m_pressEvent, REPEAT_TIMEOUT_MS);
+
+        CSingleLock lock(m_digitalMutex);
+
+        if (m_lastButtonPress == 0)
+        {
+          m_state = STATE_UNPRESSED;
+        }
+        else if (waitResponse == WAIT_SIGNALED || m_lastButtonPress != pressedButton)
+        {
+          pressedButton = m_lastButtonPress;
+          m_state = STATE_BUTTON_PRESSED;
+        }
+        break;
+      }
+
+      default:
+        break;
+    }
+  }
+}
+
+bool CKeymapHandler::ProcessButtonPress(unsigned int keyId)
+{
+  m_pressedButtons.push_back(keyId);
+
+  if (SendDigitalAction(keyId))
+  {
+    m_lastButtonPress = keyId;
+    m_pressEvent.Set();
+    return true;
+  }
+
+  return false;
+}
+
+void CKeymapHandler::ProcessButtonRelease(unsigned int keyId)
+{
+  m_pressedButtons.erase(std::remove(m_pressedButtons.begin(), m_pressedButtons.end(), keyId), m_pressedButtons.end());
+
+  if (keyId == m_lastButtonPress || m_pressedButtons.empty())
+  {
+    m_lastButtonPress = 0;
+    m_pressEvent.Set();
+  }
+}
+
+bool CKeymapHandler::IsPressed(unsigned int keyId) const
+{
+  return std::find(m_pressedButtons.begin(), m_pressedButtons.end(), keyId) != m_pressedButtons.end();
+}
+
+bool CKeymapHandler::SendDigitalAction(unsigned int keyId, unsigned int holdTimeMs /* = 0 */)
+{
+  CAction action(CButtonTranslator::GetInstance().GetAction(g_windowManager.GetActiveWindowID(), CKey(keyId, holdTimeMs)));
+  if (action.GetID() > 0)
+  {
+    CInputManager::GetInstance().QueueAction(action);
+    return true;
+  }
+
+  return false;
+}
+
+bool CKeymapHandler::SendAnalogAction(unsigned int keyId, float magnitude)
+{
+  CAction action(CButtonTranslator::GetInstance().GetAction(g_windowManager.GetActiveWindowID(), CKey(keyId)));
+  if (action.GetID() > 0)
+  {
+    CAction actionWithAmount(action.GetID(), magnitude, 0.0f, action.GetName());
+    CInputManager::GetInstance().QueueAction(actionWithAmount);
+    return true;
+  }
+
+  return false;
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/KeymapHandler.h Added

@@ -0,0 +1,69 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/IKeymapHandler.h"
+#include "threads/CriticalSection.h"
+#include "threads/Event.h"
+#include "threads/Thread.h"
+
+#include <vector>
+
+namespace JOYSTICK
+{
+  class CKeymapHandler : public IKeymapHandler,
+                         protected CThread
+  {
+  public:
+    CKeymapHandler(void);
+
+    virtual ~CKeymapHandler(void);
+
+    // implementation of IKeymapHandler
+    virtual INPUT_TYPE GetInputType(unsigned int keyId) const override;
+    virtual void OnDigitalKey(unsigned int keyId, bool bPressed) override;
+    virtual void OnAnalogKey(unsigned int keyId, float magnitude) override;
+
+  protected:
+    // implementation of CThread
+    virtual void Process(void) override;
+
+  private:
+    enum BUTTON_STATE
+    {
+      STATE_UNPRESSED,
+      STATE_BUTTON_PRESSED,
+      STATE_BUTTON_HELD,
+    };
+
+    bool ProcessButtonPress(unsigned int keyId);
+    void ProcessButtonRelease(unsigned int keyId);
+    bool IsPressed(unsigned int keyId) const;
+
+    static bool SendDigitalAction(unsigned int keyId, unsigned int holdTimeMs = 0);
+    static bool SendAnalogAction(unsigned int keyId, float magnitude);
+
+    BUTTON_STATE              m_state;
+    unsigned int              m_lastButtonPress;
+    std::vector<unsigned int> m_pressedButtons;
+    CEvent                    m_pressEvent;
+    CCriticalSection          m_digitalMutex;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/Makefile Added

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic Added

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.cpp Added

@@ -0,0 +1,155 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ButtonMapping.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMapper.h"
+#include "input/joysticks/JoystickTranslator.h"
+#include "input/joysticks/JoystickUtils.h"
+#include "threads/SystemClock.h"
+#include "utils/log.h"
+
+#include <algorithm>
+#include <assert.h>
+#include <cmath>
+
+using namespace JOYSTICK;
+using namespace XbmcThreads;
+
+#define MAPPING_COOLDOWN_MS  50    // Guard against repeated input
+#define AXIS_THRESHOLD       0.75f // Axis must exceed this value to be mapped
+
+CButtonMapping::CButtonMapping(IButtonMapper* buttonMapper, IButtonMap* buttonMap)
+  : m_buttonMapper(buttonMapper),
+    m_buttonMap(buttonMap),
+    m_lastAction(0)
+{
+  assert(m_buttonMapper != NULL);
+  assert(m_buttonMap != NULL);
+}
+
+bool CButtonMapping::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  if (bPressed)
+  {
+    CDriverPrimitive buttonPrimitive(buttonIndex);
+    if (buttonPrimitive.IsValid())
+    {
+      MapPrimitive(buttonPrimitive);
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool CButtonMapping::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  CDriverPrimitive hatPrimitive(hatIndex, static_cast<HAT_DIRECTION>(state));
+  if (hatPrimitive.IsValid())
+  {
+    MapPrimitive(hatPrimitive);
+    return true;
+  }
+
+  return false;
+}
+
+bool CButtonMapping::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  SEMIAXIS_DIRECTION dir = CJoystickTranslator::PositionToSemiAxisDirection(position);
+
+  CDriverPrimitive axis(axisIndex, dir);
+  CDriverPrimitive oppositeAxis(axisIndex, dir * -1);
+
+  if (position == 0.0f)
+  {
+    Deactivate(axis);
+    Deactivate(oppositeAxis);
+  }
+  else
+  {
+    Deactivate(oppositeAxis);
+
+    if (std::abs(position) >= AXIS_THRESHOLD)
+      Activate(axis);
+    else
+      Deactivate(axis);
+  }
+
+  return true;
+}
+
+void CButtonMapping::ProcessAxisMotions(void)
+{
+  for (std::vector<ActivatedAxis>::iterator it = m_activatedAxes.begin(); it != m_activatedAxes.end(); ++it)
+  {
+    ActivatedAxis& semiaxis = *it;
+
+    // Only emit once
+    if (!semiaxis.bEmitted)
+    {
+      semiaxis.bEmitted = true;
+      MapPrimitive(semiaxis.driverPrimitive);
+    }
+  }
+}
+
+void CButtonMapping::MapPrimitive(const CDriverPrimitive& primitive)
+{
+  const unsigned int now = SystemClockMillis();
+
+  bool bTimeoutElapsed = (now >= m_lastAction + MAPPING_COOLDOWN_MS);
+  if (bTimeoutElapsed)
+  {
+    m_lastAction = SystemClockMillis();
+    m_buttonMapper->MapPrimitive(m_buttonMap, primitive);
+  }
+  else
+  {
+    const unsigned int elapsed = now - m_lastAction;
+    CLog::Log(LOGDEBUG, "Button mapping: rapid input after %ums dropped for profile \"%s\"",
+              elapsed, m_buttonMapper->ControllerID().c_str());
+  }
+}
+
+void CButtonMapping::Activate(const CDriverPrimitive& semiaxis)
+{
+  if (!IsActive(semiaxis))
+    m_activatedAxes.push_back(ActivatedAxis{semiaxis});
+}
+
+void CButtonMapping::Deactivate(const CDriverPrimitive& semiaxis)
+{
+  m_activatedAxes.erase(std::remove_if(m_activatedAxes.begin(), m_activatedAxes.end(),
+    [&semiaxis](const ActivatedAxis& axis)
+    {
+      return semiaxis == axis.driverPrimitive;
+    }), m_activatedAxes.end());
+}
+
+bool CButtonMapping::IsActive(const CDriverPrimitive& semiaxis)
+{
+  return std::find_if(m_activatedAxes.begin(), m_activatedAxes.end(),
+    [&semiaxis](const ActivatedAxis& axis)
+    {
+      return semiaxis == axis.driverPrimitive;
+    }) != m_activatedAxes.end();
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.h Added

@@ -0,0 +1,79 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IDriverHandler.h"
+
+#include <vector>
+
+namespace JOYSTICK
+{
+  class IButtonMap;
+  class IButtonMapper;
+
+  /*
+   * \brief Generic implementation of a class that provides button mapping by
+   *        translating driver events to button mapping commands
+   *
+   * Button mapping commands are invoked instantly for buttons and hats.
+   *
+   * Button mapping commands are deferred for a short while after an axis is
+   * activated, and only one command will be invoked per activation.
+   */
+  class CButtonMapping : public IDriverHandler
+  {
+  public:
+    /*
+     * \brief Constructor for CButtonMapping
+     *
+     * \param buttonMapper Carries out button-mapping commands using <buttonMap>
+     * \param buttonMap The button map given to <buttonMapper> on each command
+     */
+    CButtonMapping(IButtonMapper* buttonMapper, IButtonMap* buttonMap);
+
+    virtual ~CButtonMapping(void) { }
+
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override;
+
+  private:
+    void MapPrimitive(const CDriverPrimitive& primitive);
+
+    void Activate(const CDriverPrimitive& semiAxis);
+    void Deactivate(const CDriverPrimitive& semiAxis);
+    bool IsActive(const CDriverPrimitive& semiAxis);
+
+    IButtonMapper* const m_buttonMapper;
+    IButtonMap* const    m_buttonMap;
+
+    struct ActivatedAxis
+    {
+      CDriverPrimitive driverPrimitive;
+      bool             bEmitted; // true if this axis has emited a button-mapping command
+    };
+
+    std::vector<ActivatedAxis> m_activatedAxes;
+    unsigned int               m_lastAction;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/FeatureHandling.cpp Added

@@ -0,0 +1,222 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "FeatureHandling.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMap.h"
+#include "input/joysticks/IInputHandler.h"
+#include "utils/log.h"
+
+using namespace JOYSTICK;
+
+#define ANALOG_DIGITAL_THRESHOLD  0.5f
+
+// --- CJoystickFeature --------------------------------------------------------
+
+CJoystickFeature::CJoystickFeature(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap) :
+  m_name(name),
+  m_handler(handler),
+  m_buttonMap(buttonMap)
+{
+}
+
+// --- CScalarFeature ----------------------------------------------------------
+
+CScalarFeature::CScalarFeature(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap) :
+  CJoystickFeature(name, handler, buttonMap),
+  m_inputType(handler->GetInputType(name)),
+  m_bDigitalState(false),
+  m_analogState(0.0f)
+{
+}
+
+bool CScalarFeature::OnDigitalMotion(const CDriverPrimitive& source, bool bPressed)
+{
+  bool bHandled = false;
+
+  if (m_inputType == INPUT_TYPE::DIGITAL)
+  {
+    if (m_bDigitalState != bPressed)
+    {
+      m_bDigitalState = bPressed;
+      bHandled = OnDigitalMotion(bPressed);
+    }
+  }
+  else if (m_inputType == INPUT_TYPE::ANALOG)
+  {
+    bHandled = OnAnalogMotion(source, bPressed ? 1.0f : 0.0f);
+  }
+
+  return bHandled;
+}
+
+bool CScalarFeature::OnAnalogMotion(const CDriverPrimitive& source, float magnitude)
+{
+  bool bHandled = false;
+
+  if (m_inputType == INPUT_TYPE::DIGITAL)
+  {
+    bHandled = OnDigitalMotion(source, magnitude >= ANALOG_DIGITAL_THRESHOLD);
+  }
+  else if (m_inputType == INPUT_TYPE::ANALOG)
+  {
+    if (m_analogState != 0.0f || magnitude != 0.0f)
+    {
+      m_analogState = magnitude;
+      bHandled = OnAnalogMotion(magnitude);
+    }
+  }
+
+  return bHandled;
+}
+
+bool CScalarFeature::OnDigitalMotion(bool bPressed)
+{
+  CLog::Log(LOGDEBUG, "Feature [ %s ] on %s %s",
+            m_name.c_str(), m_handler->ControllerID().c_str(), bPressed ? "pressed" : "released");
+
+  return m_handler->OnButtonPress(m_name, bPressed);
+}
+
+bool CScalarFeature::OnAnalogMotion(float magnitude)
+{
+  const bool bActivated = (magnitude != 0.0f);
+
+  if (m_bDigitalState != bActivated)
+  {
+    m_bDigitalState = bActivated;
+
+    CLog::Log(LOGDEBUG, "Feature [ %s ] on %s %s",
+              m_name.c_str(), m_handler->ControllerID().c_str(), bActivated ? "activated" : "deactivated");
+  }
+
+  return m_handler->OnButtonMotion(m_name, magnitude);
+}
+
+// --- CAnalogStick ------------------------------------------------------------
+
+CAnalogStick::CAnalogStick(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap) :
+  CJoystickFeature(name, handler, buttonMap),
+  m_vertState(0.0f),
+  m_horizState(0.0f)
+{
+}
+
+bool CAnalogStick::OnDigitalMotion(const CDriverPrimitive& source, bool bPressed)
+{
+  return OnAnalogMotion(source, bPressed ? 1.0f : 0.0f);
+}
+
+bool CAnalogStick::OnAnalogMotion(const CDriverPrimitive& source, float magnitude)
+{
+  CDriverPrimitive up;
+  CDriverPrimitive down;
+  CDriverPrimitive right;
+  CDriverPrimitive left;
+
+  m_buttonMap->GetAnalogStick(m_name, up, down, right,  left);
+
+  if (source == up)
+    m_vertAxis.SetPositiveDistance(magnitude);
+  else if (source == down)
+    m_vertAxis.SetNegativeDistance(magnitude);
+  else if (source == right)
+    m_horizAxis.SetPositiveDistance(magnitude);
+  else if (source == left)
+    m_horizAxis.SetNegativeDistance(magnitude);
+  else
+  {
+    // Just in case, avoid sticking
+    m_vertAxis.Reset();
+    m_horizAxis.Reset();
+  }
+
+  return true;
+}
+
+void CAnalogStick::ProcessMotions(void)
+{
+  const float newVertState = m_vertAxis.GetPosition();
+  const float newHorizState = m_horizAxis.GetPosition();
+
+  if (m_vertState != 0 || m_horizState != 0 ||
+      newVertState != 0 || newHorizState != 0)
+  {
+    m_vertState = newVertState;
+    m_horizState = newHorizState;
+    m_handler->OnAnalogStickMotion(m_name, newHorizState, newVertState);
+  }
+}
+
+// --- CAccelerometer ----------------------------------------------------------
+
+CAccelerometer::CAccelerometer(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap) :
+  CJoystickFeature(name, handler, buttonMap),
+  m_xAxisState(0.0f),
+  m_yAxisState(0.0f),
+  m_zAxisState(0.0f)
+{
+}
+
+bool CAccelerometer::OnDigitalMotion(const CDriverPrimitive& source, bool bPressed)
+{
+  return OnAnalogMotion(source, bPressed ? 1.0f : 0.0f);
+}
+
+bool CAccelerometer::OnAnalogMotion(const CDriverPrimitive& source, float magnitude)
+{
+  CDriverPrimitive positiveX;
+  CDriverPrimitive positiveY;
+  CDriverPrimitive positiveZ;
+
+  m_buttonMap->GetAccelerometer(m_name, positiveX, positiveY, positiveZ);
+
+  if (source == positiveX)
+    m_xAxis.SetPositiveDistance(magnitude);
+  else if (source == positiveY)
+    m_yAxis.SetPositiveDistance(magnitude);
+  else if (source == positiveZ)
+    m_zAxis.SetPositiveDistance(magnitude);
+  else
+  {
+    // Just in case, avoid sticking
+    m_xAxis.Reset();
+    m_xAxis.Reset();
+    m_yAxis.Reset();
+  }
+
+  return true;
+}
+
+void CAccelerometer::ProcessMotions(void)
+{
+  const float newXAxis = m_xAxis.GetPosition();
+  const float newYAxis = m_yAxis.GetPosition();
+  const float newZAxis = m_zAxis.GetPosition();
+
+  if (m_xAxisState != 0 || m_yAxisState != 0 || m_zAxisState != 0 ||
+      newXAxis != 0 || newYAxis != 0 || newZAxis)
+  {
+    m_xAxisState = newXAxis;
+    m_yAxisState = newYAxis;
+    m_zAxisState = newZAxis;
+    m_handler->OnAccelerometerMotion(m_name, newXAxis, newYAxis, newZAxis);
+  }
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/FeatureHandling.h Added

@@ -0,0 +1,208 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/JoystickTypes.h"
+
+#include <memory>
+
+namespace JOYSTICK
+{
+  class CDriverPrimitive;
+  class IInputHandler;
+  class IButtonMap;
+
+  class CJoystickFeature;
+  typedef std::shared_ptr<CJoystickFeature> FeaturePtr;
+
+  /*!
+   * \brief Base class for joystick features
+   *
+   * See list of feature types in JoystickTypes.h.
+   */
+  class CJoystickFeature
+  {
+  public:
+    CJoystickFeature(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap);
+    virtual ~CJoystickFeature(void) { }
+
+    /*!
+     * \brief A digital motion has occured
+     *
+     * \param source The source of the motion. Must be digital (button or hat)
+     * \param bPressed True for press motion, false for release motion
+     *
+     * \return true if the motion was handled, false otherwise
+     */
+    virtual bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed) = 0;
+
+    /*!
+     * \brief An analog motion has occured
+     *
+     * \param source The source of the motion. Must be a semiaxis
+     * \param magnitude The magnitude of the press or motion in the interval [0.0, 1.0]
+     *
+     * For semiaxes, the magnitude is the force or travel distance in the
+     * direction of the semiaxis. If the value is in the opposite direction,
+     * the magnitude is 0.0.
+     *
+     * For example, if the analog stick goes left, the negative semiaxis will
+     * have a value of 1.0 and the positive semiaxis will have a value of 0.0.
+     */
+    virtual bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude) = 0;
+
+    /*!
+     * \brief Process the motions that have occured since the last invocation
+     *
+     * This allows features with motion on multiple driver primitives to call
+     * their handler once all driver primitives are accounted for.
+     */
+    virtual void ProcessMotions(void) = 0;
+
+  protected:
+    const FeatureName            m_name;
+    IInputHandler* const m_handler;
+    IButtonMap* const    m_buttonMap;
+  };
+
+  class CScalarFeature : public CJoystickFeature
+  {
+  public:
+    CScalarFeature(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap);
+    virtual ~CScalarFeature(void) { }
+
+    // implementation of CJoystickFeature
+    virtual bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed) override;
+    virtual bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude) override;
+    virtual void ProcessMotions(void) override { } // Actions are dispatched immediately
+
+  private:
+    bool OnDigitalMotion(bool bPressed);
+    bool OnAnalogMotion(float magnitude);
+
+    const INPUT_TYPE m_inputType;
+    bool             m_bDigitalState;
+    float            m_analogState;
+  };
+
+  /*!
+   * \brief Axis of a feature (analog stick, accelerometer, etc)
+   *
+   * Axes are composed of two driver primitives, one for the positive semiaxis
+   * and one for the negative semiaxis.
+   *
+   * This effectively means that an axis is two-dimensional, with each dimension
+   * either:
+   *
+   *    - a digital value (0.0 or 1.0)
+   *    - an analog value (continuous in the interval [0.0, 1.0])
+   */
+  class CFeatureAxis
+  {
+  public:
+    CFeatureAxis(void) { Reset(); }
+
+    /*!
+     * \brief Set value of positive axis
+     */
+    void SetPositiveDistance(float distance) { m_positiveDistance = distance; }
+
+    /*!
+     * \brief Set value of negative axis
+     */
+    void SetNegativeDistance(float distance) { m_negativeDistance = distance; }
+
+    /*!
+     * \brief Get the final value of this axis.
+     *
+     * This axis is two-dimensional, so we need to compress these into a single
+     * dimension. This is done by subtracting the negative from the positive.
+     * Some examples:
+     *
+     *      Positive axis:  1.0 (User presses right or analog stick moves right)
+     *      Negative axis:  0.0
+     *      -------------------
+     *      Pos - Neg:      1.0 (Emulated analog stick moves right)
+     *
+     *
+     *      Positive axis:  0.0
+     *      Negative axis:  1.0 (User presses left or analog stick moves left)
+     *      -------------------
+     *      Pos - Neg:     -1.0 (Emulated analog stick moves left)
+     *
+     *
+     *      Positive axis:  1.0 (User presses both buttons)
+     *      Negative axis:  1.0
+     *      -------------------
+     *      Pos - Neg:      0.0 (Emulated analog stick is centered)
+     *
+     */
+    float GetPosition(void) const { return m_positiveDistance - m_negativeDistance; }
+
+    /*!
+     * \brief Reset both positive and negative values to zero
+     */
+    void Reset(void) { m_positiveDistance = m_negativeDistance = 0.0f; }
+
+  protected:
+    float m_positiveDistance;
+    float m_negativeDistance;
+  };
+
+  class CAnalogStick : public CJoystickFeature
+  {
+  public:
+    CAnalogStick(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap);
+    virtual ~CAnalogStick(void) { }
+
+    // implementation of CJoystickFeature
+    virtual bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed) override;
+    virtual bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude) override;
+    virtual void ProcessMotions(void) override;
+
+  protected:
+    CFeatureAxis m_vertAxis;
+    CFeatureAxis m_horizAxis;
+
+    float m_vertState;
+    float m_horizState;
+  };
+
+  class CAccelerometer : public CJoystickFeature
+  {
+  public:
+    CAccelerometer(const FeatureName& name, IInputHandler* handler, IButtonMap* buttonMap);
+    virtual ~CAccelerometer(void) { }
+
+    // implementation of CJoystickFeature
+    virtual bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed) override;
+    virtual bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude) override;
+    virtual void ProcessMotions(void) override;
+
+  protected:
+    CFeatureAxis m_xAxis;
+    CFeatureAxis m_yAxis;
+    CFeatureAxis m_zAxis;
+
+    float m_xAxisState;
+    float m_yAxisState;
+    float m_zAxisState;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/InputHandling.cpp Added

@@ -0,0 +1,139 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "InputHandling.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMap.h"
+#include "input/joysticks/IInputHandler.h"
+#include "input/joysticks/JoystickUtils.h"
+
+using namespace JOYSTICK;
+
+CInputHandling::CInputHandling(IInputHandler* handler, IButtonMap* buttonMap)
+ : m_handler(handler),
+   m_buttonMap(buttonMap)
+{
+}
+
+CInputHandling::~CInputHandling(void)
+{
+}
+
+bool CInputHandling::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  return OnDigitalMotion(CDriverPrimitive(buttonIndex), bPressed);
+}
+
+bool CInputHandling::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  bool bHandled = false;
+
+  bHandled |= OnDigitalMotion(CDriverPrimitive(hatIndex, HAT_DIRECTION::UP),    state & HAT_DIRECTION::UP);
+  bHandled |= OnDigitalMotion(CDriverPrimitive(hatIndex, HAT_DIRECTION::RIGHT), state & HAT_DIRECTION::RIGHT);
+  bHandled |= OnDigitalMotion(CDriverPrimitive(hatIndex, HAT_DIRECTION::DOWN),  state & HAT_DIRECTION::DOWN);
+  bHandled |= OnDigitalMotion(CDriverPrimitive(hatIndex, HAT_DIRECTION::LEFT),  state & HAT_DIRECTION::LEFT);
+
+  return bHandled;
+}
+
+bool CInputHandling::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  bool bHandled = false;
+
+  CDriverPrimitive positiveSemiaxis(axisIndex, SEMIAXIS_DIRECTION::POSITIVE);
+  CDriverPrimitive negativeSemiaxis(axisIndex, SEMIAXIS_DIRECTION::NEGATIVE);
+
+  bHandled |= OnAnalogMotion(positiveSemiaxis, position > 0.0f ? position : 0.0f);
+  bHandled |= OnAnalogMotion(negativeSemiaxis, position < 0.0f ? -position : 0.0f);
+
+  return bHandled;
+}
+
+void CInputHandling::ProcessAxisMotions(void)
+{
+  for (std::map<FeatureName, FeaturePtr>::iterator it = m_features.begin(); it != m_features.end(); ++it)
+    it->second->ProcessMotions();
+}
+
+bool CInputHandling::OnDigitalMotion(const CDriverPrimitive& source, bool bPressed)
+{
+  bool bHandled = false;
+
+  FeatureName featureName;
+  if (m_buttonMap->GetFeature(source, featureName))
+  {
+    FeaturePtr& feature = m_features[featureName];
+
+    if (!feature)
+      feature = FeaturePtr(CreateFeature(featureName));
+
+    if (feature)
+      bHandled = feature->OnDigitalMotion(source, bPressed);
+  }
+
+  return bHandled;
+}
+
+bool CInputHandling::OnAnalogMotion(const CDriverPrimitive& source, float magnitude)
+{
+  bool bHandled = false;
+
+  FeatureName featureName;
+  if (m_buttonMap->GetFeature(source, featureName))
+  {
+    FeaturePtr& feature = m_features[featureName];
+
+    if (!feature)
+      feature = FeaturePtr(CreateFeature(featureName));
+
+    if (feature)
+      bHandled = feature->OnAnalogMotion(source, magnitude);
+  }
+
+  return bHandled;
+}
+
+CJoystickFeature* CInputHandling::CreateFeature(const FeatureName& featureName)
+{
+  CJoystickFeature* feature = nullptr;
+
+  switch (m_buttonMap->GetFeatureType(featureName))
+  {
+    case FEATURE_TYPE::SCALAR:
+    {
+      feature = new CScalarFeature(featureName, m_handler, m_buttonMap);
+      break;
+    }
+    case FEATURE_TYPE::ANALOG_STICK:
+    {
+      feature = new CAnalogStick(featureName, m_handler, m_buttonMap);
+      break;
+    }
+    case FEATURE_TYPE::ACCELEROMETER:
+    {
+      feature = new CAccelerometer(featureName, m_handler, m_buttonMap);
+      break;
+    }
+    default:
+      break;
+  }
+  
+  return feature;
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/InputHandling.h Added

@@ -0,0 +1,70 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "FeatureHandling.h"
+#include "input/joysticks/IDriverHandler.h"
+#include "input/joysticks/JoystickTypes.h"
+
+#include <map>
+
+namespace JOYSTICK
+{
+  class CDriverPrimitive;
+  class IInputHandler;
+  class IButtonMap;
+
+  /*!
+   * \brief Class to translate input from the driver into higher-level features
+   *
+   * Raw driver input arrives for three elements: buttons, hats and axes. When
+   * driver input is handled by this class, it translates the raw driver
+   * elements into physical joystick features, such as buttons, analog sticks,
+   * etc.
+   *
+   * A button map is used to translate driver primitives to controller features.
+   * The button map has been abstracted away behind the IButtonMap
+   * interface so that it can be provided by an add-on.
+   */
+  class CInputHandling : public IDriverHandler
+  {
+  public:
+    CInputHandling(IInputHandler* handler, IButtonMap* buttonMap);
+
+    virtual ~CInputHandling(void);
+
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override;
+
+  private:
+    bool OnDigitalMotion(const CDriverPrimitive& source, bool bPressed);
+    bool OnAnalogMotion(const CDriverPrimitive& source, float magnitude);
+
+    CJoystickFeature* CreateFeature(const FeatureName& featureName);
+
+    IInputHandler* const m_handler;
+    IButtonMap* const    m_buttonMap;
+
+    std::map<FeatureName, FeaturePtr> m_features;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/joysticks/generic/Makefile Added

_service:download_url:master.tar.gz/xbmc/input/keyboard Added

_service:download_url:master.tar.gz/xbmc/input/keyboard/IKeyboardHandler.h Added

@@ -0,0 +1,51 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+class CKey;
+
+namespace KEYBOARD
+{
+  /*!
+   * \ingroup input
+   * \brief Interface for handling keyboard events
+   */
+  class IKeyboardHandler
+  {
+  public:
+    virtual ~IKeyboardHandler(void) { }
+
+    /*!
+     * \brief A key has been pressed
+     *
+     * \param key      The pressed key
+     *
+     * \return True if the event was handled otherwise false
+     */
+    virtual bool OnKeyPress(const CKey& key) = 0;
+
+    /*!
+     * \brief A key has been released
+     *
+     * \param key      The released key
+     */
+    virtual void OnKeyRelease(const CKey& key) = 0;
+  };
+}

_service:download_url:master.tar.gz/xbmc/input/linux/LinuxInputDevices.cpp Changed

@@ -43,6 +43,10 @@
 
 #include <linux/input.h>
 
+#if defined(HAVE_LIBUDEV)
+#include <libudev.h>
+#endif
+
 #ifndef EV_CNT
 #define EV_CNT (EV_MAX+1)
 #define KEY_CNT (KEY_MAX+1)
@@ -1081,6 +1085,97 @@
   return m_bUnplugged;
 }
 
+CLinuxInputDevicesCheckHotplugged::CLinuxInputDevicesCheckHotplugged(CLinuxInputDevices &parent) :
+    CThread("CLinuxInputDevicesCheckHotplugged"), m_parent(parent)
+{
+  Create();
+  SetPriority(THREAD_PRIORITY_BELOW_NORMAL);
+}
+
+CLinuxInputDevicesCheckHotplugged::~CLinuxInputDevicesCheckHotplugged()
+{
+  m_bStop = true;
+  m_quitEvent.Set();
+  StopThread(true);
+}
+
+void CLinuxInputDevicesCheckHotplugged::Process()
+{
+  while (!m_bStop)
+  {
+    m_parent.CheckHotplugged();
+    // every ten seconds
+    m_quitEvent.WaitMSec(10000);
+  }
+}
+
+/*
+ * this function is not powerful because it reinitializes a new udev search each
+ * time it would be nicer to call this only one time + one time at each hotplug
+ * but it is already very fast, so, let's keep it simple and non intrusive
+ */
+bool CLinuxInputDevices::IsUdevJoystick(const char *devpath)
+{
+#if defined(HAVE_LIBUDEV)
+  struct udev *udev;
+  struct udev_enumerate *enumerate;
+  struct udev_list_entry *devices, *dev_list_entry;
+  struct udev_device *dev;
+  const char *path;
+  const char *devfoundpath;
+
+  udev = udev_new();
+  if (!udev)
+    return false; // can't create udev
+
+  enumerate = udev_enumerate_new(udev);
+  if (enumerate == NULL)
+  {
+    udev_unref(udev);
+    return false;
+  }
+
+  if (udev_enumerate_add_match_subsystem(enumerate, "input") == 0)
+  {
+    if (udev_enumerate_add_match_property(enumerate, "ID_INPUT_JOYSTICK", "1") == 0)
+    {
+      if (udev_enumerate_scan_devices(enumerate) >= 0)
+      {
+        devices = udev_enumerate_get_list_entry(enumerate);
+
+        udev_list_entry_foreach(dev_list_entry, devices)
+        {
+          path = udev_list_entry_get_name(dev_list_entry);
+          dev = udev_device_new_from_syspath(udev, path);
+          if (dev != NULL)
+          {
+            devfoundpath = udev_device_get_devnode(dev);
+            if (devfoundpath != NULL)
+            {
+              // found (finally !)
+              //printf("=> %s\n", devfoundpath);
+              if (strcmp(devfoundpath, devpath) == 0)
+              {
+                udev_device_unref(dev);
+                udev_enumerate_unref(enumerate);
+                udev_unref(udev);
+                return true;
+              }
+            }
+            udev_device_unref(dev);
+          }
+        }
+      }
+    }
+  }
+
+  udev_enumerate_unref(enumerate);
+  udev_unref(udev);
+#endif
+
+  return false;
+}
+
 bool CLinuxInputDevices::CheckDevice(const char *device)
 {
   int fd;
@@ -1095,6 +1190,13 @@
   if (fd < 0)
     return false;
 
+  // let others handle joysticks
+  if (IsUdevJoystick(device))
+  {
+    close(fd);
+    return false;
+  }
+
   if (ioctl(fd, EVIOCGRAB, 1) && errno != EINVAL)
   {
     close(fd);
@@ -1147,10 +1249,6 @@
  */
 void CLinuxInputDevices::CheckHotplugged()
 {
-  CSingleLock lock(m_devicesListLock);
-
-  int deviceId = m_devices.size();
-
   /* No devices specified. Try to guess some. */
   for (int i = 0; i < MAX_LINUX_INPUT_DEVICES; i++)
   {
@@ -1158,18 +1256,22 @@
     bool ispresent = false;
 
     snprintf(buf, 32, "/dev/input/event%d", i);
-
-    for (size_t j = 0; j < m_devices.size(); j++)
     {
-      if (m_devices[j]->GetFileName().compare(buf) == 0)
+      CSingleLock lock(m_devicesListLock);
+      for (size_t j = 0; j < m_devices.size(); j++)
       {
-        ispresent = true;
-        break;
+        if (m_devices[j]->GetFileName().compare(buf) == 0)
+        {
+          ispresent = true;
+          break;
+        }
       }
     }
 
     if (!ispresent && CheckDevice(buf))
     {
+      CSingleLock lock(m_devicesListLock);
+      int deviceId = m_devices.size();
       CLog::Log(LOGINFO, "Found input device %s", buf);
       m_devices.push_back(new CLinuxInputDevice(buf, deviceId));
       ++deviceId;
@@ -1360,18 +1462,6 @@
     InitAvailable();
     m_bReInitialize = false;
   }
-  else
-  {
-    time_t now;
-    time(&now);
-
-    if ((now - m_lastHotplugCheck) >= 10)
-    {
-      CheckHotplugged();
-      m_lastHotplugCheck = now;
-    }
-  }
-
   CSingleLock lock(m_devicesListLock);
 
   XBMC_Event event;

_service:download_url:master.tar.gz/xbmc/input/linux/LinuxInputDevices.h Changed

_service:download_url:master.tar.gz/xbmc/input/windows/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/input/windows/WINJoystick.cpp Deleted

@@ -1,633 +0,0 @@
-/*
- *      Copyright (C) 2012-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "WINJoystick.h"
-#include "input/ButtonTranslator.h"
-#include "settings/AdvancedSettings.h"
-#include "utils/log.h"
-
-#include <memory>
-#include <dinput.h>
-
-extern HWND g_hWnd;
-
-#define MAX_AXISAMOUNT  32768
-#define AXIS_MIN       -32768  /* minimum value for axis coordinate */
-#define AXIS_MAX        32767  /* maximum value for axis coordinate */
-
-#if !defined(HAS_SDL)
-#define SDL_HAT_CENTERED    0x00
-#define SDL_HAT_UP          0x01
-#define SDL_HAT_RIGHT       0x02
-#define SDL_HAT_DOWN        0x04
-#define SDL_HAT_LEFT        0x08
-#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
-#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
-#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
-#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
-#endif
-
-CJoystick::CJoystick()
-{
-  CSingleLock lock(m_critSection);
-  m_joystickEnabled = false;
-  SetDeadzone(0);
-  Reset();
-}
-
-CJoystick::~CJoystick()
-{
-  ReleaseJoysticks();
-}
-
-void CJoystick::Reset()
-{
-  m_AxisIdx = -1;
-  m_ButtonIdx = -1;
-  m_HatIdx = -1;
-  m_HatState = SDL_HAT_CENTERED;
-  for (std::vector<AxisState>::iterator it = m_Axes.begin(); it != m_Axes.end(); ++it)
-    it->reset();
-}
-
-void CJoystick::ReleaseJoysticks()
-{
-  CSingleLock lock(m_critSection);
-  // Unacquire the device one last time just in case
-  // the app tried to exit while the device is still acquired.
-  for(std::vector<LPDIRECTINPUTDEVICE8>::iterator it = m_pJoysticks.begin(); it != m_pJoysticks.end(); ++it)
-  {
-    if( (*it) )
-      (*it)->Unacquire();
-    SAFE_RELEASE( (*it) );
-  }
-  m_pJoysticks.clear();
-  m_JoystickNames.clear();
-  m_Axes.clear();
-  m_devCaps.clear();
-  Reset();
-  // Release any DirectInput objects.
-  SAFE_RELEASE( m_pDI );
-}
-
-BOOL CALLBACK CJoystick::EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
-{
-  HRESULT hr;
-  CJoystick* p_this = (CJoystick*) pContext;
-  LPDIRECTINPUTDEVICE8    pJoystick = NULL;
-
-  // Obtain an interface to the enumerated joystick.
-  hr = p_this->m_pDI->CreateDevice( pdidInstance->guidInstance, &pJoystick, NULL );
-  if( SUCCEEDED( hr ) )
-  {
-    // Set the data format to "simple joystick" - a predefined data format
-    //
-    // A data format specifies which controls on a device we are interested in,
-    // and how they should be reported. This tells DInput that we will be
-    // passing a DIJOYSTATE2 structure to IDirectInputDevice::GetDeviceState().
-    if( SUCCEEDED( hr = pJoystick->SetDataFormat( &c_dfDIJoystick2 ) ) )
-    {
-      // Set the cooperative level to let DInput know how this device should
-      // interact with the system and with other DInput applications.
-      if( SUCCEEDED( hr = pJoystick->SetCooperativeLevel( g_hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND ) ) )
-      {
-        DIDEVCAPS diDevCaps;
-        diDevCaps.dwSize = sizeof(DIDEVCAPS);
-        if (SUCCEEDED(hr = pJoystick->GetCapabilities(&diDevCaps)))
-        {
-          CLog::Log(LOGNOTICE, __FUNCTION__" : Enabled Joystick: %s", pdidInstance->tszProductName);
-          CLog::Log(LOGNOTICE, __FUNCTION__" : Total Axis: %d Total Hats: %d Total Buttons: %d", diDevCaps.dwAxes, diDevCaps.dwPOVs, diDevCaps.dwButtons);
-          p_this->m_pJoysticks.push_back(pJoystick);
-          std::string joyName(pdidInstance->tszProductName);
-          p_this->m_JoystickNames.push_back(joyName);
-          p_this->m_Axes.resize(p_this->m_Axes.size() + 6); // dinput hardcodes to 6 axes
-          p_this->m_devCaps.push_back(diDevCaps);
-
-          // load axes configuration from keymap
-          const AxesConfig* axesCfg = CButtonTranslator::GetInstance().GetAxesConfigFor(joyName);
-          if (axesCfg != NULL)
-          {
-            for (AxesConfig::const_iterator it = axesCfg->begin(); it != axesCfg->end(); ++it)
-            {
-              int axis = p_this->MapAxis(pJoystick, it->axis - 1);
-              p_this->m_Axes[axis].trigger = it->isTrigger;
-              p_this->m_Axes[axis].rest = it->rest;
-            }
-          }
-        }
-        else
-          CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to GetCapabilities for: %s", pdidInstance->tszProductName);
-      }
-      else
-        CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to SetCooperativeLevel on: %s", pdidInstance->tszProductName);
-
-    }
-    else
-      CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to SetDataFormat on: %s", pdidInstance->tszProductName);
-  }
-  else
-    CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to CreateDevice: %s", pdidInstance->tszProductName);
-
-  return DIENUM_CONTINUE;
-}
-
-//-----------------------------------------------------------------------------
-// Name: EnumObjectsCallback()
-// Desc: Callback function for enumerating objects (axes, buttons, POVs) on a
-//       joystick. This function enables user interface elements for objects
-//       that are found to exist, and scales axes min/max values.
-//-----------------------------------------------------------------------------
-BOOL CALLBACK CJoystick::EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext )
-{
-
-  LPDIRECTINPUTDEVICE8 pJoy = (LPDIRECTINPUTDEVICE8) pContext;
-
-  // For axes that are returned, set the DIPROP_RANGE property for the
-  // enumerated axis in order to scale min/max values.
-  if( pdidoi->dwType & DIDFT_AXIS )
-  {
-      DIPROPRANGE diprg;
-      diprg.diph.dwSize = sizeof( DIPROPRANGE );
-      diprg.diph.dwHeaderSize = sizeof( DIPROPHEADER );
-      diprg.diph.dwHow = DIPH_BYID;
-      diprg.diph.dwObj = pdidoi->dwType; // Specify the enumerated axis
-      diprg.lMin = AXIS_MIN;
-      diprg.lMax = AXIS_MAX;
-
-      // Set the range for the axis
-      if( FAILED( pJoy->SetProperty( DIPROP_RANGE, &diprg.diph ) ) )
-        CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to set property on %s", pdidoi->tszName);
-  }
-
-  return DIENUM_CONTINUE;
-}
-
-void CJoystick::Initialize()
-{
-  if (!IsEnabled())
-    return;
-
-  HRESULT hr;
-
-  // clear old joystick names
-  ReleaseJoysticks();
-  CSingleLock lock(m_critSection);
-
-  if( FAILED( hr = DirectInput8Create( GetModuleHandle( NULL ), DIRECTINPUT_VERSION, IID_IDirectInput8, ( VOID** )&m_pDI, NULL ) ) )
-  {
-    CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to create DirectInput");
-    return;
-  }
-
-  if( FAILED( hr = m_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL, EnumJoysticksCallback, this, DIEDFL_ATTACHEDONLY ) ) )
-    return;
-
-  if(m_pJoysticks.empty())
-  {
-    CLog::Log(LOGDEBUG, __FUNCTION__" : No Joystick found");
-    return;
-  }
-
-  for(std::vector<LPDIRECTINPUTDEVICE8>::iterator it = m_pJoysticks.begin(); it != m_pJoysticks.end(); ++it)
-  {
-    LPDIRECTINPUTDEVICE8 pJoy = (*it);
-    // Enumerate the joystick objects. The callback function enabled user
-    // interface elements for objects that are found, and sets the min/max
-    // values property for discovered axes.
-    if( FAILED( hr = pJoy->EnumObjects( EnumObjectsCallback, pJoy, DIDFT_ALL ) ) )
-      CLog::Log(LOGDEBUG, __FUNCTION__" : Failed to enumerate objects");
-  }
-
-  // Set deadzone range
-  SetDeadzone(g_advancedSettings.m_controllerDeadzone);
-}
-
-void CJoystick::Update()
-{
-  if (!IsEnabled())
-    return;
-
-  int axisNum;
-  int buttonIdx = -1, buttonNum;
-  int hatIdx = -1, hatNum;
-
-  // go through all joysticks
-  for (size_t j = 0; j < m_pJoysticks.size(); j++)
-  {
-    LPDIRECTINPUTDEVICE8 pjoy = m_pJoysticks[j];
-    DIDEVCAPS caps = m_devCaps[j];
-    HRESULT hr;
-    DIJOYSTATE2 js;           // DInput joystick state
-    hr = pjoy->Poll();
-    if( FAILED( hr ) )
-    {
-      int i=0;
-      // DInput is telling us that the input stream has been
-      // interrupted. We aren't tracking any state between polls, so
-      // we don't have any special reset that needs to be done. We
-      // just re-acquire and try again.
-      hr = pjoy->Acquire();
-      while( (hr == DIERR_INPUTLOST) && (i++ < 10)  )
-          hr = pjoy->Acquire();
-
-      // hr may be DIERR_OTHERAPPHASPRIO or other errors.  This
-      // may occur when the app is minimized or in the process of
-      // switching, so just try again later
-      Reset();
-      return;
-    }
-
-    // Get the input's device state
-    if( FAILED( hr = pjoy->GetDeviceState( sizeof( DIJOYSTATE2 ), &js ) ) )
-    {
-      Reset();
-      return; // The device should have been acquired during the Poll()
-    }
-
-    // get button states first, they take priority over axis
-    for (int b = 0; b < caps.dwButtons; b++)
-    {
-      if (js.rgbButtons[b] & 0x80)
-      {
-        buttonIdx = MapButton(pjoy, b);
-        j = m_pJoysticks.size();
-        break;
-      }
-    }
-
-    // get hat position
-    for (int h = 0; h < caps.dwPOVs; h++)
-    {
-      if ((LOWORD(js.rgdwPOV[h]) == 0xFFFF) != true)
-      {
-        uint8_t hatval = SDL_HAT_CENTERED;
-
-        if ((js.rgdwPOV[0] > JOY_POVLEFT) || (js.rgdwPOV[0] < JOY_POVRIGHT))
-          hatval |= SDL_HAT_UP;
-
-        if ((js.rgdwPOV[0] > JOY_POVFORWARD) && (js.rgdwPOV[0] < JOY_POVBACKWARD))
-          hatval |= SDL_HAT_RIGHT;
-
-        if ((js.rgdwPOV[0] > JOY_POVRIGHT) && (js.rgdwPOV[0] < JOY_POVLEFT))
-          hatval |= SDL_HAT_DOWN;
-
-        if (js.rgdwPOV[0] > JOY_POVBACKWARD)
-          hatval |= SDL_HAT_LEFT;
-
-        if (hatval != SDL_HAT_CENTERED)
-        {
-          hatIdx = MapHat(pjoy, h);
-          j = m_pJoysticks.size();
-          m_HatState = hatval;
-        }
-      }
-    }
-
-    // get axis states
-    int axisIdx = MapAxis(pjoy, 0);
-    m_Axes[axisIdx + 0].val = js.lX;
-    m_Axes[axisIdx + 1].val = js.lY;
-    m_Axes[axisIdx + 2].val = js.lZ;
-    m_Axes[axisIdx + 3].val = js.lRx;
-    m_Axes[axisIdx + 4].val = js.lRy;
-    m_Axes[axisIdx + 5].val = js.lRz;
-  }
-
-  LPDIRECTINPUTDEVICE8 pjoy;
-  m_AxisIdx = GetAxisWithMaxAmount();
-  if (m_AxisIdx >= 0)
-  {
-    MapAxis(m_AxisIdx, pjoy, axisNum);
-    // CLog::Log(LOGDEBUG, "Joystick %d Axis %d Amount %d", JoystickIndex(pjoy), axisNum + 1, m_Axes[m_AxisIdx].val);
-  }
-
-  if (hatIdx == -1 && m_HatIdx != -1)
-  {
-    // now centered
-    MapHat(m_HatIdx, pjoy, hatNum);
-    CLog::Log(LOGDEBUG, "Joystick %d hat %u hat centered", JoystickIndex(pjoy), hatNum + 1);
-    m_pressTicksHat = 0;
-  }
-  else if (hatIdx != m_HatIdx)
-  {
-    MapHat(hatIdx, pjoy, hatNum);
-    CLog::Log(LOGDEBUG, "Joystick %d hat %u value %d", JoystickIndex(pjoy), hatNum + 1, m_HatState);
-    m_pressTicksHat = XbmcThreads::SystemClockMillis();
-  }
-  m_HatIdx = hatIdx;
-
-  if (buttonIdx == -1 && m_ButtonIdx != -1)
-  {
-    MapButton(m_ButtonIdx, pjoy, buttonNum);
-    CLog::Log(LOGDEBUG, "Joystick %d button %d Up", JoystickIndex(pjoy), buttonNum + 1);
-    m_pressTicksButton = 0;
-    m_ButtonIdx = -1;
-  }
-  else if (buttonIdx != m_ButtonIdx)
-  {
-    MapButton(buttonIdx, pjoy, buttonNum);
-    CLog::Log(LOGDEBUG, "Joystick %d button %d Down", JoystickIndex(pjoy), buttonNum + 1);
-    m_pressTicksButton = XbmcThreads::SystemClockMillis();
-  }
-  m_ButtonIdx = buttonIdx;
-
-}
-
-bool CJoystick::GetHat(std::string &joyName, int &id, int &position, bool consider_repeat)
-{
-  if (!IsEnabled() || !IsHatActive())
-    return false;
-  LPDIRECTINPUTDEVICE8 joy;
-  MapHat(m_HatIdx, joy, id);
-  joyName = m_JoystickNames[JoystickIndex(joy)];
-  position = m_HatState;
-
-  if (!consider_repeat)
-    return true;
-
-  static uint32_t lastPressTicksHat = 0;
-  // allow it if it is the first press
-  if (lastPressTicksHat < m_pressTicksHat)
-  {
-    lastPressTicksHat = m_pressTicksHat;
-    return true;
-  }
-  uint32_t nowTicks = XbmcThreads::SystemClockMillis();
-  if (nowTicks - m_pressTicksHat < 500) // 500ms delay before we repeat
-    return false;
-  if (nowTicks - lastPressTicksHat < 100) // 100ms delay before successive repeats
-    return false;
-  lastPressTicksHat = nowTicks;
-
-  return true;
-}
-
-bool CJoystick::GetButton(std::string &joyName, int &id, bool consider_repeat)
-{
-  if (!IsEnabled() || !IsButtonActive())
-    return false;
-
-  LPDIRECTINPUTDEVICE8 joy;
-  MapButton(m_ButtonIdx, joy, id);
-  joyName = m_JoystickNames[JoystickIndex(joy)];
-
-  if (!consider_repeat)
-    return true;
-
-  static uint32_t lastPressTicksButton = 0;
-  // allow it if it is the first press
-  if (lastPressTicksButton < m_pressTicksButton)
-  {
-    lastPressTicksButton = m_pressTicksButton;
-    return true;
-  }
-  uint32_t nowTicks = XbmcThreads::SystemClockMillis();
-  if (nowTicks - m_pressTicksButton < 500) // 500ms delay before we repeat
-    return false;
-  if (nowTicks - lastPressTicksButton < 100) // 100ms delay before successive repeats
-    return false;
-
-  lastPressTicksButton = nowTicks;
-  return true;
-}
-
-bool CJoystick::GetAxis(std::string &joyName, int &id)
-{
-  if (!IsEnabled() || !IsAxisActive())
-    return false;
-
-  LPDIRECTINPUTDEVICE8 joy;
-  MapAxis(m_AxisIdx, joy, id);
-  joyName = m_JoystickNames[JoystickIndex(joy)];
-
-  return true;
-}
-
-bool CJoystick::GetAxes(std::list<std::pair<std::string, int> >& axes, bool consider_still)
-{
-  std::list<std::pair<std::string, int> > ret;
-  if (!IsEnabled() || !IsAxisActive())
-    return false;
-
-  LPDIRECTINPUTDEVICE8 joy;
-  int axisId;
-
-  for (size_t i = 0; i < m_Axes.size(); ++i)
-  {
-    int deadzone = m_Axes[i].trigger ? 0 : m_DeadzoneRange;
-    int amount = m_Axes[i].val - m_Axes[i].rest;
-    if (consider_still || abs(amount) > deadzone)
-    {
-      MapAxis(i, joy, axisId);
-      ret.push_back(std::pair<std::string, int>(m_JoystickNames[JoystickIndex(joy)], axisId));
-    }
-  }
-  axes = ret;
-
-  return true;
-}
-
-int CJoystick::GetAxisWithMaxAmount() const
-{
-  int maxAmount = 0, axis = -1;
-  for (size_t i = 0; i < m_Axes.size(); i++)
-  {
-    int deadzone = m_Axes[i].trigger ? 0 : m_DeadzoneRange,
-      amount = abs(m_Axes[i].val - m_Axes[i].rest);
-    if (amount > deadzone && amount > maxAmount)
-    {
-      maxAmount = amount;
-      axis = i;
-    }
-  }
-  return axis;
-}
-
-float CJoystick::GetAmount(const std::string &joyName, int axisNum) const
-{
-  int joyIdx = JoystickIndex(joyName);
-  if (joyIdx == -1)
-    return 0;
-
-  int axisIdx = MapAxis(m_pJoysticks[joyIdx], axisNum);
-  int amount = m_Axes[axisIdx].val - m_Axes[axisIdx].rest;
-  int range = MAX_AXISAMOUNT - m_Axes[axisIdx].rest;
-  // deadzones on axes are undesirable
-  int deadzone = m_Axes[axisIdx].trigger ? 0 : m_DeadzoneRange;
-  if (amount > deadzone)
-    return (float)(amount - deadzone) / (float)(range - deadzone);
-  else if (amount < -deadzone)
-    return (float)(amount + deadzone) / (float)(range - deadzone);
-
-  return 0;
-}
-
-void CJoystick::SetEnabled(bool enabled /*=true*/)
-{
-  if( enabled && !m_joystickEnabled )
-  {
-    m_joystickEnabled = true;
-    Initialize();
-  }
-  else if( !enabled && m_joystickEnabled )
-  {
-    ReleaseJoysticks();
-    m_joystickEnabled = false;
-  }
-}
-
-float CJoystick::SetDeadzone(float val)
-{
-  if (val<0) val=0;
-  if (val>1) val=1;
-  m_DeadzoneRange = (int)(val*MAX_AXISAMOUNT);
-  return val;
-}
-
-bool CJoystick::Reinitialize()
-{
-  Initialize();
-  return true;
-}
-
-void CJoystick::Acquire()
-{
-  if (!IsEnabled())
-    return;
-  if(!m_pJoysticks.empty())
-  {
-    CLog::Log(LOGDEBUG, __FUNCTION__": Focus back, acquire Joysticks");
-    for(std::vector<LPDIRECTINPUTDEVICE8>::iterator it = m_pJoysticks.begin(); it != m_pJoysticks.end(); ++it)
-    {
-      if( (*it) )
-        (*it)->Acquire();
-    }
-  }
-}
-
-int CJoystick::JoystickIndex(const std::string &joyName) const
-{
-  for (size_t i = 0; i < m_JoystickNames.size(); ++i)
-  {
-    if (joyName == m_JoystickNames[i])
-      return i;
-  }
-  return -1;
-}
-
-int CJoystick::JoystickIndex(LPDIRECTINPUTDEVICE8 joy) const
-{
-  for (size_t i = 0; i < m_pJoysticks.size(); ++i)
-  {
-    if (joy == m_pJoysticks[i])
-      return i;
-  }
-  return -1;
-}
-
-int CJoystick::MapAxis(LPDIRECTINPUTDEVICE8 joy, int axisNum) const
-{
-  int idx = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy; ++i)
-    idx += m_devCaps[i].dwAxes;
-  if (i == m_pJoysticks.size())
-    return -1;
-  else
-    return idx + axisNum;
-}
-
-void CJoystick::MapAxis(int axisIdx, LPDIRECTINPUTDEVICE8 &joy, int &axisNum) const
-{
-  int axisCount = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy && axisCount + m_devCaps[i].dwAxes <= axisIdx; ++i)
-    axisCount += m_devCaps[i].dwAxes;
-  if (i != m_pJoysticks.size())
-  {
-    joy = m_pJoysticks[i];
-    axisNum = axisIdx - axisCount;
-  }
-  else
-  {
-    joy = NULL;
-    axisNum = -1;
-  }
-}
-
-int CJoystick::MapButton(LPDIRECTINPUTDEVICE8 joy, int buttonNum) const
-{
-  int idx = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy; ++i)
-    idx += m_devCaps[i].dwButtons;
-  if (i == m_pJoysticks.size())
-    return -1;
-  else
-    return idx + buttonNum;
-}
-
-void CJoystick::MapButton(int buttonIdx, LPDIRECTINPUTDEVICE8 &joy, int &buttonNum) const
-{
-  int buttonCount = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy && buttonCount + m_devCaps[i].dwButtons <= buttonIdx; ++i)
-    buttonCount += m_devCaps[i].dwButtons;
-  if (i != m_pJoysticks.size())
-  {
-    joy = m_pJoysticks[i];
-    buttonNum = buttonIdx - buttonCount;
-  }
-  else
-  {
-    joy = NULL;
-    buttonNum = -1;
-  }
-}
-
-int CJoystick::MapHat(LPDIRECTINPUTDEVICE8 joy, int hatNum) const
-{
-  int idx = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy; ++i)
-    idx += m_devCaps[i].dwPOVs;
-  if (i == m_pJoysticks.size())
-    return -1;
-  else
-    return idx + hatNum;
-}
-
-void CJoystick::MapHat(int hatIdx, LPDIRECTINPUTDEVICE8 &joy, int &hatNum) const
-{
-  int hatCount = 0;
-  size_t i;
-  for (i = 0; i != m_pJoysticks.size() && m_pJoysticks[i] != joy && hatCount + m_devCaps[i].dwPOVs <= hatIdx; ++i)
-    hatCount += m_devCaps[i].dwPOVs;
-  if (i != m_pJoysticks.size())
-  {
-    joy = m_pJoysticks[i];
-    hatNum = hatIdx - hatCount;
-  }
-  else
-  {
-    joy = NULL;
-    hatNum = -1;
-  }
-}

_service:download_url:master.tar.gz/xbmc/input/windows/WINJoystick.h Deleted

@@ -1,119 +0,0 @@
-#pragma once
-/*
-*      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <list>
-#include <map>
-#include <memory>
-#include <string>
-#include <stdint.h>
-#include <utility>
-#include <vector>
-
-#include "threads/CriticalSection.h"
-
-#define JACTIVE_BUTTON 0x00000001
-#define JACTIVE_AXIS   0x00000002
-#define JACTIVE_HAT    0x00000004
-#define JACTIVE_NONE   0x00000000
-#define JACTIVE_HAT_UP    0x01
-#define JACTIVE_HAT_RIGHT 0x02
-#define JACTIVE_HAT_DOWN  0x04
-#define JACTIVE_HAT_LEFT  0x08
-
-struct AxisState {
-  int val;
-  int rest;
-  bool trigger;
-  AxisState() : val(0), rest(0), trigger(false) { }
-  void reset() { val = rest; }
-};
-
-struct AxisConfig {
-  int axis;
-  bool isTrigger;
-  int rest;
-  AxisConfig(int axis, bool isTrigger, int rest) : axis(axis), isTrigger(isTrigger), rest(rest) { }
-};
-
-typedef std::vector<AxisConfig> AxesConfig; // [<axis, isTrigger, rest state value>]
-class CRegExp;
-
-// Class to manage all connected joysticks
-class CJoystick
-{
-public:
-  CJoystick();
-  ~CJoystick();
-
-  void Initialize();
-  void Reset();
-  void Update();
-
-  bool GetButton(std::string &joyName, int &id, bool consider_repeat = true);
-  bool GetAxis(std::string &joyName, int &id);
-  bool GetAxes(std::list<std::pair<std::string, int> >& axes, bool consider_still = false);
-  bool GetHat(std::string &joyName, int &id, int &position, bool consider_repeat = true);
-  float GetAmount(const std::string &joyName, int axisNum) const;
-
-  bool IsEnabled() const { return m_joystickEnabled; }
-  void SetEnabled(bool enabled = true);
-  float SetDeadzone(float val);
-  bool Reinitialize();
-  void Acquire();
-  typedef std::vector<AxisConfig> AxesConfig; // [<axis, isTrigger, rest state value>]
-
-private:
-  bool IsButtonActive() const { return m_ButtonIdx != -1; }
-  bool IsAxisActive() const { return m_AxisIdx != -1; }
-  bool IsHatActive() const { return m_HatIdx != -1; }
-
-  void ReleaseJoysticks();
-
-  int GetAxisWithMaxAmount() const;
-  int JoystickIndex(const std::string &joyName) const;
-  int JoystickIndex(LPDIRECTINPUTDEVICE8 joy) const;
-  int MapAxis(LPDIRECTINPUTDEVICE8 joy, int axisNum) const; // <joy, axis> --> axisIdx
-  void MapAxis(int axisIdx, LPDIRECTINPUTDEVICE8 &joy, int &axisNum) const; // axisIdx --> <joy, axis>
-  int MapButton(LPDIRECTINPUTDEVICE8 joy, int buttonNum) const; // <joy, button> --> buttonIdx
-  void MapButton(int buttonIdx, LPDIRECTINPUTDEVICE8 &joy, int &buttonNum) const; // buttonIdx --> <joy, button>
-  int MapHat(LPDIRECTINPUTDEVICE8 joy, int hatNum) const; // <joy, hat> --> hatIdx
-  void MapHat(int hatIdx, LPDIRECTINPUTDEVICE8 &joy, int &hatNum) const; // hatIdx --> <joy, hat>
-
-  static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext );
-  static BOOL CALLBACK EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, VOID* pContext );
-
-  std::vector<AxisState> m_Axes;
-  int m_AxisIdx; // active axis
-  int m_ButtonIdx; // active button
-  uint8_t m_HatState; // state of active hat
-  int m_HatIdx; // active hat
-
-  int m_DeadzoneRange;
-  bool m_joystickEnabled;
-  uint32_t m_pressTicksButton;
-  uint32_t m_pressTicksHat;
-  CCriticalSection m_critSection;
-
-  LPDIRECTINPUT8  m_pDI;
-  std::vector<LPDIRECTINPUTDEVICE8> m_pJoysticks;
-  std::vector<std::string> m_JoystickNames;
-  std::vector<DIDEVCAPS> m_devCaps;
-};

_service:download_url:master.tar.gz/xbmc/interfaces/AnnouncementManager.cpp Changed

@@ -30,13 +30,15 @@
 #include "video/VideoDatabase.h"
 #include "pvr/channels/PVRChannel.h"
 #include "PlayListPlayer.h"
+#include "ServiceBroker.h"
 
 #define LOOKUP_PROPERTY "database-lookup"
 
 using namespace ANNOUNCEMENT;
 
-CAnnouncementManager::CAnnouncementManager()
-{ }
+CAnnouncementManager::CAnnouncementManager() : CThread("Announce")
+{
+}
 
 CAnnouncementManager::~CAnnouncementManager()
 {
@@ -45,12 +47,19 @@
 
 CAnnouncementManager& CAnnouncementManager::GetInstance()
 {
-  static CAnnouncementManager s_instance;
-  return s_instance;
+  return CServiceBroker::GetAnnouncementManager();
+}
+
+void CAnnouncementManager::Start()
+{
+  Create();
 }
 
 void CAnnouncementManager::Deinitialize()
 {
+  m_bStop = true;
+  m_queueEvent.Set();
+  StopThread();
   CSingleLock lock (m_critSection);
   m_announcers.clear();
 }
@@ -83,32 +92,55 @@
 void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message)
 {
   CVariant data;
-  Announce(flag, sender, message, data);
+  Announce(flag, sender, message, CFileItemPtr(), data);
+}
+
+void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
+{
+  Announce(flag, sender, message, CFileItemPtr(), data);
+}
+
+void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item)
+{
+  CVariant data;
+  Announce(flag, sender, message, item, data);
+}
+
+void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, const CVariant &data)
+{
+  CAnnounceData announcement;
+  announcement.flag = flag;
+  announcement.sender = sender;
+  announcement.message = message;
+  announcement.data = data;
+
+  if (item != nullptr)
+    announcement.item = CFileItemPtr(new CFileItem(*item));
+
+  {
+    CSingleLock lock (m_critSection);
+    m_announcementQueue.push_back(announcement);
+  }
+  m_queueEvent.Set();
 }
 
-void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, CVariant &data)
+void CAnnouncementManager::DoAnnounce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data)
 {
   CLog::Log(LOGDEBUG, "CAnnouncementManager - Announcement: %s from %s", message, sender);
 
   CSingleLock lock (m_critSection);
 
   // Make a copy of announers. They may be removed or even remove themselves during execution of IAnnouncer::Announce()!
-  std::vector<IAnnouncer *> announcers(m_announcers); 
+  std::vector<IAnnouncer *> announcers(m_announcers);
   for (unsigned int i = 0; i < announcers.size(); i++)
     announcers[i]->Announce(flag, sender, message, data);
 }
 
-void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item)
-{
-  CVariant data;
-  Announce(flag, sender, message, item, data);
-}
-
-void CAnnouncementManager::Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, CVariant &data)
+void CAnnouncementManager::DoAnnounce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, const CVariant &data)
 {
-  if (!item.get())
+  if (item == nullptr)
   {
-    Announce(flag, sender, message, data);
+    DoAnnounce(flag, sender, message, data);
     return;
   }
 
@@ -248,5 +280,29 @@
   if (id > 0)
     object["item"]["id"] = id;
 
-  Announce(flag, sender, message, object);
+  DoAnnounce(flag, sender, message, object);
+}
+
+void CAnnouncementManager::Process()
+{
+  SetPriority(GetMinPriority());
+
+  while (!m_bStop)
+  {
+    CSingleLock lock (m_critSection);
+    if (!m_announcementQueue.empty())
+    {
+      auto announcement = m_announcementQueue.front();
+      m_announcementQueue.pop_front();
+      {
+        CSingleExit ex(m_critSection);
+        DoAnnounce(announcement.flag, announcement.sender.c_str(), announcement.message.c_str(), announcement.item, announcement.data);
+      }
+    }
+    else
+    {
+      CSingleExit ex(m_critSection);
+      m_queueEvent.Wait();
+    }
+  }
 }

_service:download_url:master.tar.gz/xbmc/interfaces/AnnouncementManager.h Changed

@@ -23,30 +23,50 @@
 #include "IAnnouncer.h"
 #include "FileItem.h"
 #include "threads/CriticalSection.h"
-#include "utils/GlobalsHandling.h"
+#include "threads/Thread.h"
+#include "threads/Event.h"
+#include "utils/Variant.h"
 
 class CVariant;
 
 namespace ANNOUNCEMENT
 {
-  class CAnnouncementManager
+  class CAnnouncementManager : public CThread
   {
   public:
+    CAnnouncementManager();
     virtual ~CAnnouncementManager();
 
     static CAnnouncementManager& GetInstance();
 
+    void Start();
     void Deinitialize();
 
     void AddAnnouncer(IAnnouncer *listener);
     void RemoveAnnouncer(IAnnouncer *listener);
 
     void Announce(AnnouncementFlag flag, const char *sender, const char *message);
-    void Announce(AnnouncementFlag flag, const char *sender, const char *message, CVariant &data);
+    void Announce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data);
     void Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item);
-    void Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, CVariant &data);
+    void Announce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, const CVariant &data);
+
+  protected:
+    void Process();
+    void DoAnnounce(AnnouncementFlag flag, const char *sender, const char *message, CFileItemPtr item, const CVariant &data);
+    void DoAnnounce(AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data);
+
+    struct CAnnounceData
+    {
+      AnnouncementFlag flag;
+      std::string sender;
+      std::string message;
+      CFileItemPtr item;
+      CVariant data;
+    };
+    std::list<CAnnounceData> m_announcementQueue;
+    CEvent m_queueEvent;
+
   private:
-    CAnnouncementManager();
     CAnnouncementManager(const CAnnouncementManager&);
     CAnnouncementManager const& operator=(CAnnouncementManager const&);

_service:download_url:master.tar.gz/xbmc/interfaces/builtins/AddonBuiltins.cpp Changed

_service:download_url:master.tar.gz/xbmc/interfaces/builtins/PVRBuiltins.cpp Changed

@@ -23,25 +23,6 @@
 #include "Application.h"
 #include "pvr/PVRManager.h"
 
-/*! \brief Start the PVR manager.
- *  \param params (ignored)
- */
-static int Start(const std::vector<std::string>& params)
-{
-  g_application.StartPVRManager();
-
-  return 0;
-}
-
-/*! \brief Stop the PVR manager.
- *   \param params (ignored)
- */
-static int Stop(const std::vector<std::string>& params)
-{
-  g_application.StopPVRManager();
-
-  return 0;
-}
 
 /*! \brief Search for missing channel icons
  *   \param params (ignored)
@@ -65,18 +46,6 @@
 ///     Function,
 ///     Description }
 ///   \table_row2_l{
-///     <b>`PVR.StartManager`</b>\n
-///     <b>`StartPVRManager`</b> (deprecated)
-///     ,
-///     (Re)Starts the PVR manager
-///   }
-///   \table_row2_l{
-///     <b>`PVR.StartManager`</b>\n
-///     <b>`StopPVRManager`</b> (deprecated)
-///     ,
-///     Stops the PVR manager
-///   }
-///   \table_row2_l{
 ///     <b>`PVR.SearchMissingChannelIcons`</b>
 ///     ,
 ///     Will start a search for missing channel icons
@@ -87,10 +56,6 @@
 CBuiltins::CommandMap CPVRBuiltins::GetOperations() const
 {
   return {
-           {"startpvrmanager",                {"(Re)Starts the PVR manager",       0, Start}}, // deprecated alias
-           {"pvr.startmanager",               {"(Re)Starts the PVR manager",       0, Start}},
-           {"stoppvrmanager",                 {"Stops the PVR manager",            0, Stop}},
-           {"pvr.stopmanager",                {"Stops the PVR manager",            0, Stop}},
            {"pvr.searchmissingchannelicons",  {"Search for missing channel icons", 0, SearchMissingIcons}}
          };
 }

_service:download_url:master.tar.gz/xbmc/interfaces/builtins/SkinBuiltins.cpp Changed

@@ -112,14 +112,17 @@
 
   CGUIDialogSelect* pDlgSelect = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
   pDlgSelect->Reset();
-  pDlgSelect->SetHeading(CVariant{g_localizeStrings.Get(424)});
+  pDlgSelect->SetHeading(CVariant{g_localizeStrings.Get(atoi(params[0].c_str()))});
 
-  for (unsigned int i = 0 ; i < params.size() ; i++)
+  for (unsigned int i = 1 ; i < params.size() ; i++)
   {
-    std::vector<std::string> values = StringUtils::Split(params[i], '|');
-    std::string label = g_localizeStrings.Get(atoi(values[0].c_str()));
-    settings.push_back(std::make_pair(label,values[1].c_str()));
-    pDlgSelect->Add(label);
+    if (params[i].find('|') != std::string::npos)
+    {
+      std::vector<std::string> values = StringUtils::Split(params[i], '|');
+      std::string label = g_localizeStrings.Get(atoi(values[0].c_str()));
+      settings.push_back(std::make_pair(label, values[1].c_str()));
+      pDlgSelect->Add(label);
+    }
   }
 
   pDlgSelect->Open();
@@ -581,7 +584,7 @@
            {"skin.reset",         {"Resets a skin setting to default", 1, SkinReset}},
            {"skin.resetsettings", {"Resets all skin settings", 0, SkinResetAll}},
            {"skin.setaddon",      {"Prompts and set an addon", 2, SetAddon}},
-           {"skin.selectbool",    {"Prompts and set a skin setting", 1, SelectBool}},
+           {"skin.selectbool",    {"Prompts and set a skin setting", 2, SelectBool}},
            {"skin.setbool",       {"Sets a skin setting on", 1, SetBool}},
            {"skin.setfile",       {"Prompts and sets a file", 1, SetFile}},
            {"skin.setimage",      {"Prompts and sets a skin image", 1, SetImage}},

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/AudioLibrary.cpp Changed

@@ -41,6 +41,23 @@
 using namespace XFILE;
 using namespace KODI::MESSAGING;
 
+JSONRPC_STATUS CAudioLibrary::GetProperties(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+{
+  CVariant properties = CVariant(CVariant::VariantTypeObject);
+  for (CVariant::const_iterator_array it = parameterObject["properties"].begin_array(); it != parameterObject["properties"].end_array(); it++)
+  {
+    std::string propertyName = it->asString();
+    CVariant property;
+    if (propertyName == "missingartistid")
+      property = (int)BLANKARTIST_ID;
+
+    properties[propertyName] = property;
+  }
+
+  result = properties;
+  return OK;
+}
+
 JSONRPC_STATUS CAudioLibrary::GetArtists(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   CMusicDatabase musicdatabase;
@@ -51,16 +68,28 @@
   if (!musicUrl.FromString("musicdb://artists/"))
     return InternalError;
 
+  bool allroles = false;
+  if (parameterObject["allroles"].isBoolean())
+    allroles = parameterObject["allroles"].asBoolean();
+  
   int genreID = -1, albumID = -1, songID = -1;
   const CVariant &filter = parameterObject["filter"];
-  if (filter.isMember("genreid"))
-    genreID = (int)filter["genreid"].asInteger();
-  else if (filter.isMember("genre"))
-    musicUrl.AddOption("genre", filter["genre"].asString());
+  
+  if (allroles)
+    musicUrl.AddOption("roleid", -1000); //All roles, any negative parameter overrides implicit roleid=1 filter required for backward compatibility
   else if (filter.isMember("roleid"))
     musicUrl.AddOption("roleid", (int)filter["roleid"].asInteger());
   else if (filter.isMember("role"))
     musicUrl.AddOption("role", filter["role"].asString());
+  // Only one of (song) genreid/genre, albumid/album or songid/song or rules type filter is allowed by filter syntax
+  if (filter.isMember("genreid"))  //Deprecated. Use "songgenre" or "artistgenre"
+    genreID = (int)filter["genreid"].asInteger();
+  else if (filter.isMember("genre"))
+    musicUrl.AddOption("genre", filter["genre"].asString());
+  if (filter.isMember("songgenreid"))
+    genreID = (int)filter["songgenreid"].asInteger();
+  else if (filter.isMember("songgenre"))
+    musicUrl.AddOption("genre", filter["songgenre"].asString());
   else if (filter.isMember("albumid"))
     albumID = (int)filter["albumid"].asInteger();
   else if (filter.isMember("album"))
@@ -86,6 +115,7 @@
     return InvalidParams;
 
   CFileItemList items;
+  musicdatabase.SetTranslateBlankArtist(false);  
   if (!musicdatabase.GetArtistsNav(musicUrl.ToString(), items, albumArtistsOnly, genreID, albumID, songID, CDatabase::Filter(), sorting))
     return InternalError;
 
@@ -95,6 +125,11 @@
     param["properties"] = CVariant(CVariant::VariantTypeArray);
   param["properties"].append("artist");
 
+  //Get roleids, songgenreids etc, if needed
+  JSONRPC_STATUS ret = GetAdditionalArtistDetails(parameterObject, items, musicdatabase);
+  if (ret != OK)
+    return ret;
+
   int size = items.Size();
   if (items.HasProperty("total") && items.GetProperty("total").asInteger() > size)
     size = (int)items.GetProperty("total").asInteger();
@@ -127,6 +162,11 @@
     param["properties"] = CVariant(CVariant::VariantTypeArray);
   param["properties"].append("artist");
 
+  //Get roleids, roles etc. if needed
+  JSONRPC_STATUS ret = GetAdditionalArtistDetails(parameterObject, items, musicdatabase);
+  if (ret != OK)
+    return ret;
+
   HandleFileItem("artistid", false, "artistdetails", items[0], param, param["properties"], result, false);
   return OK;
 }
@@ -144,7 +184,19 @@
   if (parameterObject["includesingles"].asBoolean())
     musicUrl.AddOption("show_singles", true);
 
+  bool allroles = false;
+  if (parameterObject["allroles"].isBoolean())
+    allroles = parameterObject["allroles"].asBoolean();
+
   const CVariant &filter = parameterObject["filter"];
+
+  if (allroles)
+    musicUrl.AddOption("roleid", -1000); //All roles, override implicit roleid=1 filter required for backward compatibility
+  else if (filter.isMember("roleid"))
+    musicUrl.AddOption("roleid", (int)filter["roleid"].asInteger());
+  else if (filter.isMember("role"))
+    musicUrl.AddOption("role", filter["role"].asString());
+  // Only one of genreid/genre, artistid/artist or rules type filter is allowed by filter syntax
   if (filter.isMember("artistid"))
     musicUrl.AddOption("artistid", (int)filter["artistid"].asInteger());
   else if (filter.isMember("artist"))
@@ -241,7 +293,19 @@
   if (!parameterObject["includesingles"].asBoolean())
     musicUrl.AddOption("singles", false);
 
+  bool allroles = false;
+  if (parameterObject["allroles"].isBoolean())
+    allroles = parameterObject["allroles"].asBoolean();
+
   const CVariant &filter = parameterObject["filter"];
+
+  if (allroles)
+    musicUrl.AddOption("roleid", -1000); //All roles, override implicit roleid=1 filter required for backward compatibility
+  else if (filter.isMember("roleid"))
+    musicUrl.AddOption("roleid", (int)filter["roleid"].asInteger());
+  else if (filter.isMember("role"))
+    musicUrl.AddOption("role", filter["role"].asString());
+  // Only one of genreid/genre, artistid/artist, albumid/album or rules type filter is allowed by filter syntax
   if (filter.isMember("artistid"))
     musicUrl.AddOption("artistid", (int)filter["artistid"].asInteger());
   else if (filter.isMember("artist"))
@@ -250,10 +314,6 @@
     musicUrl.AddOption("genreid", (int)filter["genreid"].asInteger());
   else if (filter.isMember("genre"))
     musicUrl.AddOption("genre", filter["genre"].asString());
-  else if (filter.isMember("roleid"))
-    musicUrl.AddOption("roleid", (int)filter["roleid"].asInteger());
-  else if (filter.isMember("role"))
-    musicUrl.AddOption("role", filter["role"].asString());
   else if (filter.isMember("albumid"))
     musicUrl.AddOption("albumid", (int)filter["albumid"].asInteger());
   else if (filter.isMember("album"))
@@ -441,7 +501,7 @@
   return OK;
 }
 
-JSONRPC_STATUS CAudioLibrary::GetContributorRoles(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+JSONRPC_STATUS CAudioLibrary::GetRoles(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
   CMusicDatabase musicdatabase;
   if (!musicdatabase.Open())
@@ -770,7 +830,9 @@
     return OK;
 
   CMusicDatabase musicdb;
-  if (CMediaTypes::IsMediaType(items.GetContent(), MediaTypeAlbum))
+  if (CMediaTypes::IsMediaType(items.GetContent(), MediaTypeArtist))
+    return GetAdditionalArtistDetails(parameterObject, items, musicdb);
+  else if (CMediaTypes::IsMediaType(items.GetContent(), MediaTypeAlbum))
     return GetAdditionalAlbumDetails(parameterObject, items, musicdb);
   else if (CMediaTypes::IsMediaType(items.GetContent(), MediaTypeSong))
     return GetAdditionalSongDetails(parameterObject, items, musicdb);
@@ -778,6 +840,46 @@
   return OK;
 }
 
+JSONRPC_STATUS CAudioLibrary::GetAdditionalArtistDetails(const CVariant &parameterObject, CFileItemList &items, CMusicDatabase &musicdatabase)
+{
+  if (!musicdatabase.Open())
+    return InternalError;
+
+  std::set<std::string> checkProperties;
+  checkProperties.insert("roles");
+  checkProperties.insert("songgenres");
+  checkProperties.insert("isalbumartist");
+  std::set<std::string> additionalProperties;
+  if (!CheckForAdditionalProperties(parameterObject["properties"], checkProperties, additionalProperties))
+    return OK;
+
+  if (additionalProperties.find("roles") != additionalProperties.end())
+  {
+    for (int i = 0; i < items.Size(); i++)
+    {
+      CFileItemPtr item = items[i];
+      musicdatabase.GetRolesByArtist(item->GetMusicInfoTag()->GetDatabaseId(), item.get());
+    }
+  }
+  if (additionalProperties.find("songgenres") != additionalProperties.end())
+  {
+    for (int i = 0; i < items.Size(); i++)
+    {
+      CFileItemPtr item = items[i];
+      musicdatabase.GetGenresByArtist(item->GetMusicInfoTag()->GetDatabaseId(), item.get());
+    }
+  }
+  if (additionalProperties.find("isalbumartist") != additionalProperties.end())
+  {
+    for (int i = 0; i < items.Size(); i++)
+    {
+      CFileItemPtr item = items[i];
+      musicdatabase.GetIsAlbumArtist(item->GetMusicInfoTag()->GetDatabaseId(), item.get());
+    }
+  }
+  return OK;
+}
+
 JSONRPC_STATUS CAudioLibrary::GetAdditionalAlbumDetails(const CVariant &parameterObject, CFileItemList &items, CMusicDatabase &musicdatabase)
 {
   if (!musicdatabase.Open())

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/AudioLibrary.h Changed

@@ -32,6 +32,7 @@
   class CAudioLibrary : public CFileItemHandler
   {
   public:
+    static JSONRPC_STATUS GetProperties(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetArtists(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetArtistDetails(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetAlbums(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
@@ -39,7 +40,7 @@
     static JSONRPC_STATUS GetSongs(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetSongDetails(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetGenres(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
-    static JSONRPC_STATUS GetContributorRoles(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
+    static JSONRPC_STATUS GetRoles(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
 
     static JSONRPC_STATUS GetRecentlyAddedAlbums(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
     static JSONRPC_STATUS GetRecentlyAddedSongs(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result);
@@ -58,6 +59,7 @@
     static bool FillFileItemList(const CVariant &parameterObject, CFileItemList &list);
 
     static JSONRPC_STATUS GetAdditionalDetails(const CVariant &parameterObject, CFileItemList &items);
+    static JSONRPC_STATUS GetAdditionalArtistDetails(const CVariant &parameterObject, CFileItemList &items, CMusicDatabase &musicdatabase);
     static JSONRPC_STATUS GetAdditionalAlbumDetails(const CVariant &parameterObject, CFileItemList &items, CMusicDatabase &musicdatabase);
     static JSONRPC_STATUS GetAdditionalSongDetails(const CVariant &parameterObject, CFileItemList &items, CMusicDatabase &musicdatabase);

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp Changed

@@ -100,6 +100,7 @@
   { "Files.Download",                               CFileOperations::Download },
 
 // Music Library
+  { "AudioLibrary.GetProperties",                   CAudioLibrary::GetProperties },
   { "AudioLibrary.GetArtists",                      CAudioLibrary::GetArtists },
   { "AudioLibrary.GetArtistDetails",                CAudioLibrary::GetArtistDetails },
   { "AudioLibrary.GetAlbums",                       CAudioLibrary::GetAlbums },
@@ -111,7 +112,7 @@
   { "AudioLibrary.GetRecentlyPlayedAlbums",         CAudioLibrary::GetRecentlyPlayedAlbums },
   { "AudioLibrary.GetRecentlyPlayedSongs",          CAudioLibrary::GetRecentlyPlayedSongs },
   { "AudioLibrary.GetGenres",                       CAudioLibrary::GetGenres },
-  { "AudioLibrary.GetContributorRoles",             CAudioLibrary::GetContributorRoles },
+  { "AudioLibrary.GetRoles",                        CAudioLibrary::GetRoles },
   { "AudioLibrary.SetArtistDetails",                CAudioLibrary::SetArtistDetails },
   { "AudioLibrary.SetAlbumDetails",                 CAudioLibrary::SetAlbumDetails },
   { "AudioLibrary.SetSongDetails",                  CAudioLibrary::SetSongDetails },

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/PVROperations.cpp Changed

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/schema/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/schema/methods.json Changed

@@ -639,28 +639,53 @@
       }
     }
   },
+  "AudioLibrary.GetProperties": {
+    "type": "method",
+    "description": "Retrieves the values of the music library properties",
+    "transport": "Response",
+    "permission": "ReadData",
+    "params": [      
+      { "name": "properties", "type": "array", "uniqueItems": true, "required": true, "items": { "$ref": "Audio.Property.Name" } }
+    ],
+    "returns":  { "$ref": "Audio.Property.Value", "required": true }
+  },
   "AudioLibrary.GetArtists": {
     "type": "method",
-    "description": "Retrieve all artists",
+    "description": "Retrieve all artists. For backward compatibility by default this implicity does not include those that only contribute other roles, however absolutely all artists can be returned using allroles=true",
     "transport": "Response",
     "permission": "ReadData",
     "params": [
-      { "name": "albumartistsonly", "$ref": "Optional.Boolean", "description": "Whether or not to only include album artists rather than the artists of individual songs as well. If the parameter is not passed or is passed as null the GUI setting will be used" },
+      { "name": "albumartistsonly", "$ref": "Optional.Boolean", "description": "Whether or not to only include album artists rather than the artists of only individual songs as well. If the parameter is not passed or is passed as null the GUI setting will be used" },
       { "name": "properties", "$ref": "Audio.Fields.Artist" },
       { "name": "limits", "$ref": "List.Limits" },
       { "name": "sort", "$ref": "List.Sort" },
       { "name": "filter",
         "type": [
-          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Deprecated, use songgenreid. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true, "description": "Song genreid. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenreid": { "$ref": "Library.Id", "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Deprecated, use songgenre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "songgenre": { "type": "string", "minLength": 1, "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "albumid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "album": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "roleid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "role": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "songid": { "$ref": "Library.Id", "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "roleid": { "$ref": "Library.Id", "required": true, "description": "Role contributed by artist. Overriden by allroles parameter" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "role": { "type": "string", "minLength": 1, "required": true, "description": "Role contributed by artist. Overriden by allroles parameter" } }, "additionalProperties": false },
           { "$ref": "List.Filter.Artists" }
         ]
-      }
+      },
+      { "name": "allroles", "type": "boolean", "default":false, "description": "Whether or not to include all artists irrespective of the role they contributed. When true it overrides any role filter value." }
     ],
     "returns": {
       "type": "object",
@@ -689,7 +714,7 @@
   },
   "AudioLibrary.GetAlbums": {
     "type": "method",
-    "description": "Retrieve all albums from specified artist or genre",
+    "description": "Retrieve all albums from specified artist (and role) or that has songs of the specified genre",
     "transport": "Response",
     "permission": "ReadData",
     "params": [
@@ -698,14 +723,23 @@
       { "name": "sort", "$ref": "List.Sort" },
       { "name": "filter",
         "type": [
-          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Song genre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "$ref": "List.Filter.Albums" }
         ]
       },
-      { "name": "includesingles", "type": "boolean", "default": false }
+      { "name": "includesingles", "type": "boolean", "default": false },
+      { "name": "allroles", "type": "boolean", "default":false, "description": "Whether or not to include all roles when filtering by artist, rather than the default of excluding other contributions. When true it overrides any role filter value." }
     ],
     "returns": {
       "type": "object",
@@ -743,18 +777,25 @@
       { "name": "sort", "$ref": "List.Sort" },
       { "name": "filter",
         "type": [
-          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "genreid": { "$ref": "Library.Id", "required": true, "description": "Song genre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
+          { "type": "object", "properties": { "genre": { "type": "string", "minLength": 1, "required": true, "description": "Song genre. Filter for existance of songs with this genre" } }, "additionalProperties": false },
           { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "artistid": { "$ref": "Library.Id", "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+                                              "roleid": { "$ref": "Library.Id", "required": true }}, "additionalProperties": false },
+          { "type": "object", "properties": { "artist": { "type": "string", "minLength": 1, "required": true }, 
+                                              "role": { "type": "string", "minLength": 1, "required": true }}, "additionalProperties": false },
           { "type": "object", "properties": { "albumid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
           { "type": "object", "properties": { "album": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "roleid": { "$ref": "Library.Id", "required": true } }, "additionalProperties": false },
-          { "type": "object", "properties": { "role": { "type": "string", "minLength": 1, "required": true } }, "additionalProperties": false },
           { "$ref": "List.Filter.Songs" }
         ]
       },
-      { "name": "includesingles", "type": "boolean", "default": true }
+      { "name": "includesingles", "type": "boolean", "default": true },
+      { "name": "allroles", "type": "boolean", "default":false, "description": "Whether or not to include all roles when filtering by artist, rather than default of excluding other contributors. When true it overrides any role filter value." }
     ],
     "returns": {
       "type": "object",
@@ -882,13 +923,13 @@
       }
     }
   },
-  "AudioLibrary.GetContributorRoles": {
+  "AudioLibrary.GetRoles": {
     "type": "method",
     "description": "Retrieve all contributor roles",
     "transport": "Response",
     "permission": "ReadData",
     "params": [
-      { "name": "properties", "$ref": "Library.Fields.Role" },
+      { "name": "properties", "$ref": "Audio.Fields.Role" },
       { "name": "limits", "$ref": "List.Limits" },
       { "name": "sort", "$ref": "List.Sort" }
     ],
@@ -897,7 +938,7 @@
       "properties": {
         "limits": { "$ref": "List.LimitsReturned", "required": true },
         "roles": { "type": "array", "required": true,
-          "items": { "$ref": "Library.Details.Role" }
+          "items": { "$ref": "Audio.Details.Role" }
         }
       }
     }
@@ -1459,7 +1500,8 @@
       { "name": "art", "type": [ "null", { "$ref": "Media.Artwork.Set", "required": true } ], "default": null },
       { "name": "userrating", "$ref": "Optional.Integer" },
       { "name": "ratings", "$ref": "Video.Ratings" },
-      { "name": "dateadded", "$ref": "Optional.String" }
+      { "name": "dateadded", "$ref": "Optional.String" },
+      { "name": "runtime", "$ref": "Optional.Integer", "description": "Runtime in seconds" }
     ],
     "returns": "string"
   },

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/schema/types.json Changed

@@ -404,11 +404,11 @@
       "thumbnail": { "type": "string" }
     }
   },
-  "Library.Fields.Role": {
+  "Audio.Fields.Role": {
     "extends": "Item.Fields.Base",
     "items": { "type": "string", "enum": [ "title" ] }
   },
-  "Library.Details.Role": {
+  "Audio.Details.Role": {
     "extends": "Item.Details.Base",
     "properties": {
       "roleid": { "$ref": "Library.Id", "required": true },
@@ -418,10 +418,12 @@
   "Audio.Fields.Artist": {
     "extends": "Item.Fields.Base",
     "items": { "type": "string",
+      "description": "Requesting the (song)genreid/genre, or roleid/role fields will result in increased response times",
       "enum": [ "instrument", "style", "mood", "born", "formed",
                 "description", "genre", "died", "disbanded",
                 "yearsactive", "musicbrainzartistid", "fanart",
-                "thumbnail", "compilationartist", "dateadded" ]
+                "thumbnail", "compilationartist", "dateadded",
+                "roles", "songgenres", "isalbumartist"]
     }
   },
   "Audio.Fields.Album": {
@@ -460,14 +462,36 @@
   "Audio.Contributors": {
     "type": "array",
     "items": { "type": "object",
+      "description": "The artist and the role they contribute to a song",
       "properties": {
         "name": { "type": "string", "required": true },
         "role": { "type": "string", "required": true },
-        "artistid": { "type": "integer", "required": true }
+        "roleid": { "$ref": "Library.Id", "required": true },
+        "artistid": { "$ref": "Library.Id", "required": true }
       },
       "additionalProperties": false
     }
   },
+  "Audio.Artist.Roles": {
+    "type": "array",
+    "items": { "type": "object",
+      "description": "The various roles contributed by an artist to one or more songs",
+      "properties": {
+        "roleid": { "$ref": "Library.Id", "required": true },
+        "role": { "type": "string", "required": true }
+      },
+      "additionalProperties": false
+    }
+  },
+  "Audio.Details.Genres": {
+    "type": "array",
+    "items": { "type": "object",
+      "properties": {
+        "genreid": { "$ref": "Library.Id", "required": true },
+        "title": { "type": "string" }
+	  }
+    }
+  },
   "Audio.Details.Base": {
     "extends": "Media.Details.Base",
     "properties": {
@@ -506,7 +530,10 @@
       "disbanded": { "type": "string" },
       "yearsactive": { "$ref": "Array.String" },
       "compilationartist": { "type": "boolean" },
-      "musicbrainzartistid": { "type": "string" }
+      "musicbrainzartistid": { "type": "string" },
+      "roles": {"$ref": "Audio.Artist.Roles"},
+      "songgenres": {"$ref": "Audio.Details.Genres"},
+      "isalbumartist": { "type": "boolean" }
     }
   },
   "Audio.Details.Album": {
@@ -551,6 +578,16 @@
       "displaylyricist": { "type": "string"}
     }
   },
+  "Audio.Property.Name": {
+    "type": "string",
+    "enum": [ "missingartistid" ]
+  },
+  "Audio.Property.Value": {
+    "type": "object",
+    "properties": {
+      "missingartistid": { "$ref": "Library.Id" }
+    }
+  },
   "Video.Fields.Movie": {
     "extends": "Item.Fields.Base",
     "items": { "type": "string",
@@ -578,7 +615,7 @@
                 "imdbnumber", "premiered", "votes", "lastplayed",
                 "fanart", "thumbnail", "file", "originaltitle",
                 "sorttitle", "episodeguide", "season", "watchedepisodes",
-                "dateadded", "tag", "art", "userrating", "ratings" ]
+                "dateadded", "tag", "art", "userrating", "ratings", "runtime" ]
     }
   },
   "Video.Fields.Season": {
@@ -776,7 +813,8 @@
       "season": { "type": "integer" },
       "tag": { "$ref": "Array.String" },
       "userrating": { "type": "integer" },
-      "ratings": { "type": "Video.Ratings" }
+      "ratings": { "type": "Video.Ratings" },
+      "runtime": { "type": "integer", "description": "Runtime in seconds" }
     }
   },
   "Video.Details.Season": {
@@ -966,7 +1004,7 @@
       "enum": [ "title", "plot", "plotoutline", "genre", "playcount",
                 "resume", "channel", "starttime","endtime", "runtime",
                 "lifetime", "icon", "art", "streamurl", "file",
-                "directory" ]
+                "directory", "radio" ]
     }
   },
   "PVR.Details.Recording": {
@@ -988,7 +1026,8 @@
       "art": { "$ref": "Media.Artwork" },
       "streamurl": { "type": "string" },
       "file": { "type": "string" },
-      "directory": { "type": "string" }
+      "directory": { "type": "string" },
+      "radio": { "type": "boolean" }
     }
   },
   "Textures.Details.Size": {

_service:download_url:master.tar.gz/xbmc/interfaces/json-rpc/schema/version.txt Changed

_service:download_url:master.tar.gz/xbmc/interfaces/legacy/ListItem.cpp Changed

_service:download_url:master.tar.gz/xbmc/interfaces/legacy/ListItem.h Changed

_service:download_url:master.tar.gz/xbmc/interfaces/python/XBPython.h Changed

_service:download_url:master.tar.gz/xbmc/linux/RBP.cpp Changed

@@ -27,6 +27,16 @@
 
 #include "cores/omxplayer/OMXImage.h"
 
+#include <sys/ioctl.h>
+#include "rpi/rpi_user_vcsm.h"
+
+#define MAJOR_NUM 100
+#define IOCTL_MBOX_PROPERTY _IOWR(MAJOR_NUM, 0, char *)
+#define DEVICE_FILE_NAME "/dev/vcio"
+
+static int mbox_open();
+static void mbox_close(int file_desc);
+
 CRBP::CRBP()
 {
   m_initialized     = false;
@@ -34,6 +44,8 @@
   m_DllBcmHost      = new DllBcmHost();
   m_OMX             = new COMXCore();
   m_display = DISPMANX_NO_HANDLE;
+  m_mb = mbox_open();
+  vcsm_init();
 }
 
 CRBP::~CRBP()
@@ -214,5 +226,107 @@
   m_omx_image_init  = false;
   m_initialized     = false;
   m_omx_initialized = false;
+  if (m_mb)
+    mbox_close(m_mb);
+  m_mb = 0;
+  vcsm_exit();
+}
+
+static int mbox_property(int file_desc, void *buf)
+{
+   int ret_val = ioctl(file_desc, IOCTL_MBOX_PROPERTY, buf);
+
+   if (ret_val < 0)
+   {
+     CLog::Log(LOGERROR, "%s: ioctl_set_msg failed:%d", __FUNCTION__, ret_val);
+   }
+   return ret_val;
 }
+
+static int mbox_open()
+{
+   int file_desc;
+
+   // open a char device file used for communicating with kernel mbox driver
+   file_desc = open(DEVICE_FILE_NAME, 0);
+   if (file_desc < 0)
+     CLog::Log(LOGERROR, "%s: Can't open device file: %s (%d)", __FUNCTION__, DEVICE_FILE_NAME, file_desc);
+
+   return file_desc;
+}
+
+static void mbox_close(int file_desc)
+{
+  close(file_desc);
+}
+
+static unsigned mem_lock(int file_desc, unsigned handle)
+{
+   int i=0;
+   unsigned p[32];
+   p[i++] = 0; // size
+   p[i++] = 0x00000000; // process request
+
+   p[i++] = 0x3000d; // (the tag id)
+   p[i++] = 4; // (size of the buffer)
+   p[i++] = 4; // (size of the data)
+   p[i++] = handle;
+
+   p[i++] = 0x00000000; // end tag
+   p[0] = i*sizeof *p; // actual size
+
+   mbox_property(file_desc, p);
+   return p[5];
+}
+
+unsigned mem_unlock(int file_desc, unsigned handle)
+{
+   int i=0;
+   unsigned p[32];
+   p[i++] = 0; // size
+   p[i++] = 0x00000000; // process request
+
+   p[i++] = 0x3000e; // (the tag id)
+   p[i++] = 4; // (size of the buffer)
+   p[i++] = 4; // (size of the data)
+   p[i++] = handle;
+
+   p[i++] = 0x00000000; // end tag
+   p[0] = i*sizeof *p; // actual size
+
+   mbox_property(file_desc, p);
+   return p[5];
+}
+
+CGPUMEM::CGPUMEM(unsigned int numbytes, bool cached)
+{
+  m_numbytes = numbytes;
+  m_vcsm_handle = vcsm_malloc_cache(numbytes, cached ? VCSM_CACHE_TYPE_HOST : VCSM_CACHE_TYPE_NONE, (char *)"CGPUMEM");
+  assert(m_vcsm_handle);
+  m_vc_handle = vcsm_vc_hdl_from_hdl(m_vcsm_handle);
+  assert(m_vc_handle);
+  m_arm = vcsm_lock(m_vcsm_handle);
+  assert(m_arm);
+  m_vc = mem_lock(g_RBP.GetMBox(), m_vc_handle);
+  assert(m_vc);
+}
+
+CGPUMEM::~CGPUMEM()
+{
+  mem_unlock(g_RBP.GetMBox(), m_vc_handle);
+  vcsm_unlock_ptr(m_arm);
+  vcsm_free(m_vcsm_handle);
+}
+
+// Call this to clean and invalidate a region of memory
+void CGPUMEM::Flush()
+{
+  struct vcsm_user_clean_invalid_s iocache = {};
+  iocache.s[0].handle = m_vcsm_handle;
+  iocache.s[0].cmd = 3; // clean+invalidate
+  iocache.s[0].addr = (int) m_arm;
+  iocache.s[0].size  = m_numbytes;
+  vcsm_clean_invalid( &iocache );
+}
+
 #endif

_service:download_url:master.tar.gz/xbmc/linux/RBP.h Changed

_service:download_url:master.tar.gz/xbmc/linux/rpi Added

_service:download_url:master.tar.gz/xbmc/linux/rpi/rpi_user_vcsm.h Added

@@ -0,0 +1,437 @@
+/*
+ *  Copyright (C) 2015-2016 Raspberry Pi (Trading) Ltd.
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+
+/* VideoCore Shared Memory - user interface library.
+**
+** This library provides all the necessary abstraction for any application to
+** make use of the shared memory service which is distributed accross a kernel
+** driver and a videocore service.
+**
+** It is an application design decision to choose or not to use this service.
+**
+** The logical flow of operations that a user application needs to follow when
+** using this service is:
+**
+**       1) Initialize the service.
+**       2) Allocate shared memory blocks.
+**       3) Start using the allocated blocks.
+**          - In order to gain ownership on a block, lock the allocated block,
+**            locking a block returns a valid address that the user application
+**            can access.
+**          - When finished with using the block for the current execution cycle
+**            or function, and so when giving up the ownership, unlock the block.
+**       4) A block can be locked/unlocked as many times required - within or outside
+**          of - a specific execution context.
+**       5) To completely release an allocated block, free it.
+**       6) If the service is no longer required, terminate it.
+**
+**
+** Some generic considerations:
+
+** Allocating memory blocks.
+**
+**   Memory blocks can be allocated in different manners depending on the cache
+**   behavior desired.  A given block can either be:
+
+**       - Allocated in a non cached fashion all the way through host and videocore.
+**       - Allocated in a cached fashion on host OR videocore.
+**       - Allocated in a cached fashion on host AND videocore.
+**
+**   It is an application decision to determine how to allocate a block.  Evidently
+**   if the application will be doing substantial read/write accesses to a given block,
+**   it is recommended to allocate the block at least in a 'host cached' fashion for
+**   better results.
+**
+**
+** Locking memory blocks.
+**
+**   When the memory block has been allocated in a host cached fashion, locking the
+**   memory block (and so taking ownership of it) will trigger a cache invalidation.
+**
+**   For the above reason and when using host cached allocation, it is important that
+**   an application properly implements the lock/unlock mechanism to ensure cache will
+**   stay coherent, otherwise there is no guarantee it will at all be.
+**
+**   It is possible to dynamically change the host cache behavior (ie cached or non
+**   cached) of a given allocation without needing to free and re-allocate the block.
+**   This feature can be useful for such application which requires access to the block
+**   only at certain times and not otherwise.  By changing the cache behavior dynamically
+**   the application can optimize performances for a given duration of use.
+**   Such dynamic cache behavior remapping only applies to host cache and not videocore
+**   cache.  If one requires to change the videocore cache behavior, then a new block
+**   must be created to replace the old one.
+**
+**   On successful locking, a valid pointer is returned that the application can use
+**   to access to data inside the block.  There is no guarantee that the pointer will
+**   stay valid following the unlock action corresponding to this lock.
+**
+**
+** Unocking memory blocks.
+**
+**   When the memory block has been allocated in a host cached fashion, unlocking the
+**   memory block (and so forgiving its ownership) will trigger a cache flush unless
+**   explicitely asked not to flush the cache for performances reasons.
+**
+**   For the above reason and when using host cached allocation, it is important that
+**   an application properly implements the lock/unlock mechanism to ensure cache will
+**   stay coherent, otherwise there is no guarantee it will at all be.
+**
+**
+** A complete API is defined below.
+*/
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Different status that can be dumped.
+*/
+typedef enum
+{
+   VCSM_STATUS_VC_WALK_ALLOC = 0,   // Walks *all* the allocation on videocore.
+                                    // Result of the walk is seen in the videocore
+                                    // log.
+   VCSM_STATUS_HOST_WALK_MAP,       // Walks the *full* mapping allocation on host
+                                    // driver (ie for all processes).  Result of
+                                    // the walk is seen in the kernel log.
+   VCSM_STATUS_HOST_WALK_PID_MAP,   // Walks the per process mapping allocation on host
+                                    // driver (for current process).  Result of
+                                    // the walk is seen in the kernel log.
+   VCSM_STATUS_HOST_WALK_PID_ALLOC, // Walks the per process host allocation on host
+                                    // driver (for current process).  Result of
+                                    // the walk is seen in the kernel log.
+   VCSM_STATUS_VC_MAP_ALL,          // Equivalent to both VCSM_STATUS_VC_WALK_ALLOC and
+                                    // VCSM_STATUS_HOST_WALK_MAP.
+                                    //
+   VCSM_STATUS_NONE,                // Must be last - invalid.
+
+} VCSM_STATUS_T;
+
+/* Different kind of cache behavior.
+*/
+typedef enum
+{
+   VCSM_CACHE_TYPE_NONE = 0,        // No caching applies.
+   VCSM_CACHE_TYPE_HOST,            // Allocation is cached on host (user space).
+   VCSM_CACHE_TYPE_VC,              // Allocation is cached on videocore.
+   VCSM_CACHE_TYPE_HOST_AND_VC,     // Allocation is cached on both host and videocore.
+
+} VCSM_CACHE_TYPE_T;
+
+/* Initialize the vcsm processing.
+**
+** Must be called once before attempting to do anything else.
+**
+** Returns 0 on success, -1 on error.
+*/
+int vcsm_init( void );
+
+
+/* Terminates the vcsm processing.
+**
+** Must be called vcsm services are no longer needed, it will
+** take care of removing any allocation under the current process
+** control if deemed necessary.
+*/
+void vcsm_exit( void );
+
+
+/* Queries the status of the the vcsm.
+**
+** Triggers dump of various kind of information, see the
+** different variants specified in VCSM_STATUS_T.
+**
+** Pid is optional.
+*/
+void vcsm_status( VCSM_STATUS_T status, int pid );
+
+
+/* Allocates a non-cached block of memory of size 'size' via the vcsm memory
+** allocator.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+**
+** On success, the user must invoke vcsm_lock with the returned opaque
+** handle to gain access to the memory associated with the opaque handle.
+** When finished using the memory, the user calls vcsm_unlock_xx (see those
+** function definition for more details on the one that can be used).
+** 
+** A well behaved application should make every attempt to lock/unlock
+** only for the duration it needs to access the memory data associated with
+** the opaque handle.
+*/
+unsigned int vcsm_malloc( unsigned int size, char *name );
+
+
+/* Allocates a cached block of memory of size 'size' via the vcsm memory
+** allocator, the type of caching requested is passed as argument of the
+** function call.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+**
+** On success, the user must invoke vcsm_lock with the returned opaque
+** handle to gain access to the memory associated with the opaque handle.
+** When finished using the memory, the user calls vcsm_unlock_xx (see those
+** function definition for more details on the one that can be used).
+** 
+** A well behaved application should make every attempt to lock/unlock
+** only for the duration it needs to access the memory data associated with
+** the opaque handle.
+*/
+unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char *name );
+
+
+/* Shares an allocated block of memory via the vcsm memory allocator.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+**
+** On success, the user must invoke vcsm_lock with the returned opaque
+** handle to gain access to the memory associated with the opaque handle.
+** When finished using the memory, the user calls vcsm_unlock_xx (see those
+** function definition for more details on the one that can be used).
+**
+** A well behaved application should make every attempt to lock/unlock
+** only for the duration it needs to access the memory data associated with
+** the opaque handle.
+*/
+unsigned int vcsm_malloc_share( unsigned int handle );
+
+
+/* Resizes a block of memory allocated previously by vcsm_alloc.
+**
+** Returns:        0 on success
+**                 -errno on error.
+**
+** The handle must be unlocked by user prior to attempting any
+** resize action.
+**
+** On error, the original size allocated against the handle
+** remains available the same way it would be following a
+** successful vcsm_malloc.
+*/
+int vcsm_resize( unsigned int handle, unsigned int new_size );
+
+
+/* Frees a block of memory that was successfully allocated by
+** a prior call the vcms_alloc.
+**
+** The handle should be considered invalid upon return from this
+** call.
+**
+** Whether any memory is actually freed up or not as the result of
+** this call will depends on many factors, if all goes well it will
+** be freed.  If something goes wrong, the memory will likely end up
+** being freed up as part of the vcsm_exit process.  In the end the
+** memory is guaranteed to be freed one way or another.
+*/
+void vcsm_free( unsigned int handle );
+
+
+/* Retrieves a videocore opaque handle from a mapped user address
+** pointer.  The videocore handle will correspond to the actual
+** memory mapped in videocore.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+**
+** Note: the videocore opaque handle is distinct from the user
+**       opaque handle (allocated via vcsm_malloc) and it is only
+**       significant for such application which knows what to do
+**       with it, for the others it is just a number with little
+**       use since nothing can be done with it (in particular
+**       for safety reason it cannot be used to map anything).
+*/
+unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr );
+
+
+/* Retrieves a videocore opaque handle from a opaque handle
+** pointer.  The videocore handle will correspond to the actual
+** memory mapped in videocore.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+**
+** Note: the videocore opaque handle is distinct from the user
+**       opaque handle (allocated via vcsm_malloc) and it is only
+**       significant for such application which knows what to do
+**       with it, for the others it is just a number with little
+**       use since nothing can be done with it (in particular
+**       for safety reason it cannot be used to map anything).
+*/
+unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle );
+
+
+/* Retrieves a user opaque handle from a mapped user address
+** pointer.
+**
+** Returns:        0 on error
+**                 a non-zero opaque handle on success.
+*/
+unsigned int vcsm_usr_handle( void *usr_ptr );
+
+
+/* Retrieves a mapped user address from an opaque user
+** handle.
+**
+** Returns:        0 on error
+**                 a non-zero address on success.
+**
+** On success, the address corresponds to the pointer
+** which can access the data allocated via the vcsm_malloc
+** call.
+*/
+void *vcsm_usr_address( unsigned int handle );
+
+
+/* Locks the memory associated with this opaque handle.
+**
+** Returns:        NULL on error
+**                 a valid pointer on success.
+**
+** A user MUST lock the handle received from vcsm_malloc
+** in order to be able to use the memory associated with it.
+**
+** On success, the pointer returned is only valid within
+** the lock content (ie until a corresponding vcsm_unlock_xx
+** is invoked).
+*/
+void *vcsm_lock( unsigned int handle );
+
+
+/* Locks the memory associated with this opaque handle.  The lock
+** also gives a chance to update the *host* cache behavior of the
+** allocated buffer if so desired.  The *videocore* cache behavior
+** of the allocated buffer cannot be changed by this call and such
+** attempt will be ignored.
+**
+** The system will attempt to honour the cache_update mode request,
+** the cache_result mode will provide the final answer on which cache
+** mode is really in use.  Failing to change the cache mode will not
+** result in a failure to lock the buffer as it is an application
+** decision to choose what to do if (cache_result != cache_update)
+**
+** The value returned in cache_result can only be considered valid if
+** the returned pointer is non NULL.  The cache_result pointer may be
+** NULL if the application does not care about the actual outcome of
+** its action with regards to the cache behavior change.
+**
+** Returns:        NULL on error
+**                 a valid pointer on success.
+**
+** A user MUST lock the handle received from vcsm_malloc
+** in order to be able to use the memory associated with it.
+**
+** On success, the pointer returned is only valid within
+** the lock content (ie until a corresponding vcsm_unlock_xx
+** is invoked).
+*/
+void *vcsm_lock_cache( unsigned int handle,
+                       VCSM_CACHE_TYPE_T cache_update,
+                       VCSM_CACHE_TYPE_T *cache_result );
+
+
+/* Unlocks the memory associated with this user mapped address.
+**
+** Returns:        0 on success
+**                 -errno on error.
+**
+** After unlocking a mapped address, the user should no longer
+** attempt to reference it.
+*/
+int vcsm_unlock_ptr( void *usr_ptr );
+
+
+/* Unlocks the memory associated with this user mapped address.
+** Apply special processing that would override the otherwise
+** default behavior.
+**
+** If 'cache_no_flush' is specified:
+**    Do not flush cache as the result of the unlock (if cache
+**    flush was otherwise applicable in this case).
+**
+** Returns:        0 on success
+**                 -errno on error.
+**
+** After unlocking a mapped address, the user should no longer
+** attempt to reference it.
+*/
+int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush );
+
+
+/* Unlocks the memory associated with this user opaque handle.
+**
+** Returns:        0 on success
+**                 -errno on error.
+**
+** After unlocking an opaque handle, the user should no longer
+** attempt to reference the mapped addressed once associated
+** with it.
+*/
+int vcsm_unlock_hdl( unsigned int handle );
+
+
+/* Unlocks the memory associated with this user opaque handle.
+** Apply special processing that would override the otherwise
+** default behavior.
+**
+** If 'cache_no_flush' is specified:
+**    Do not flush cache as the result of the unlock (if cache
+**    flush was otherwise applicable in this case).
+**
+** Returns:        0 on success
+**                 -errno on error.
+**
+** After unlocking an opaque handle, the user should no longer
+** attempt to reference the mapped addressed once associated
+** with it.
+*/
+int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush );
+
+/* Clean and/or invalidate the memory associated with this user opaque handle
+**
+** Returns:        non-zero on error
+**
+** structure contains a list of flush/invalidate commands. Commands are:
+** 0: nop
+** 1: invalidate       given virtual range in L1/L2
+** 2: clean            given virtual range in L1/L2
+** 3: clean+invalidate given virtual range in L1/L2
+** 4: flush all L1/L2
+*/
+struct vcsm_user_clean_invalid_s {
+   struct {
+      unsigned int cmd;
+      unsigned int handle;
+      unsigned int addr;
+      unsigned int size;
+   } s[8];
+};
+
+int vcsm_clean_invalid( struct vcsm_user_clean_invalid_s *s );
+
+#ifdef __cplusplus
+}
+#endif
+

_service:download_url:master.tar.gz/xbmc/listproviders/DirectoryProvider.cpp Changed

@@ -23,12 +23,15 @@
 #include <memory>
 #include <utility>
 
+#include "addons/GUIDialogAddonInfo.h"
+#include "ContextMenuManager.h"
 #include "FileItem.h"
 #include "filesystem/Directory.h"
 #include "filesystem/FavouritesDirectory.h"
 #include "guilib/GUIWindowManager.h"
 #include "interfaces/AnnouncementManager.h"
 #include "messaging/ApplicationMessenger.h"
+#include "music/dialogs/GUIDialogMusicInfo.h"
 #include "music/MusicThumbLoader.h"
 #include "pictures/PictureThumbLoader.h"
 #include "settings/Settings.h"
@@ -39,6 +42,9 @@
 #include "utils/Variant.h"
 #include "utils/XMLUtils.h"
 #include "video/VideoThumbLoader.h"
+#include "video/dialogs/GUIDialogVideoInfo.h"
+
+
 
 using namespace XFILE;
 using namespace ANNOUNCEMENT;
@@ -99,21 +105,21 @@
   {
     if (item->IsVideo())
     {
-      initThumbLoader<CVideoThumbLoader>(VIDEO);
-      return m_thumbloaders[VIDEO];
+      initThumbLoader<CVideoThumbLoader>(InfoTagType::VIDEO);
+      return m_thumbloaders[InfoTagType::VIDEO];
     }
     if (item->IsAudio())
     {
-      initThumbLoader<CMusicThumbLoader>(AUDIO);
-      return m_thumbloaders[AUDIO];
+      initThumbLoader<CMusicThumbLoader>(InfoTagType::AUDIO);
+      return m_thumbloaders[InfoTagType::AUDIO];
     }
     if (item->IsPicture())
     {
-      initThumbLoader<CPictureThumbLoader>(PICTURE);
-      return m_thumbloaders[PICTURE];
+      initThumbLoader<CPictureThumbLoader>(InfoTagType::PICTURE);
+      return m_thumbloaders[InfoTagType::PICTURE];
     }
-    initThumbLoader<CProgramThumbLoader>(PROGRAM);
-    return m_thumbloaders[PROGRAM];
+    initThumbLoader<CProgramThumbLoader>(InfoTagType::PROGRAM);
+    return m_thumbloaders[InfoTagType::PROGRAM];
   }
 
   template<class CThumbLoaderClass>
@@ -219,9 +225,9 @@
     // we don't need to refresh anything if there are no fitting
     // items in this list provider for the announcement flag
     if (((flag & VideoLibrary) &&
-         (std::find(m_itemTypes.begin(), m_itemTypes.end(), VIDEO) == m_itemTypes.end())) ||
+         (std::find(m_itemTypes.begin(), m_itemTypes.end(), InfoTagType::VIDEO) == m_itemTypes.end())) ||
         ((flag & AudioLibrary) &&
-         (std::find(m_itemTypes.begin(), m_itemTypes.end(), AUDIO) == m_itemTypes.end())))
+         (std::find(m_itemTypes.begin(), m_itemTypes.end(), InfoTagType::AUDIO) == m_itemTypes.end())))
       return;
 
     // if we're in a database transaction, don't bother doing anything just yet
@@ -306,6 +312,31 @@
   return false;
 }
 
+bool CDirectoryProvider::OnInfo(const CGUIListItemPtr& item)
+{
+  auto fileItem = std::static_pointer_cast<CFileItem>(item);
+
+  if (fileItem->HasAddonInfo())
+    return CGUIDialogAddonInfo::ShowForItem(fileItem);
+  else if (fileItem->HasVideoInfoTag())
+  {
+    CGUIDialogVideoInfo::ShowFor(*fileItem.get());
+    return true;
+  }
+  else if (fileItem->HasMusicInfoTag())
+  {
+    CGUIDialogMusicInfo::ShowFor(*fileItem.get());
+    return true;
+  }
+  return false;
+}
+
+bool CDirectoryProvider::OnContextMenu(const CGUIListItemPtr& item)
+{
+  auto fileItem = std::static_pointer_cast<CFileItem>(item);
+  return CONTEXTMENU::ShowFor(fileItem);
+}
+
 bool CDirectoryProvider::IsUpdating() const
 {
   CSingleLock lock(m_section);

_service:download_url:master.tar.gz/xbmc/listproviders/DirectoryProvider.h Changed

_service:download_url:master.tar.gz/xbmc/listproviders/IListProvider.h Changed

_service:download_url:master.tar.gz/xbmc/listproviders/StaticProvider.h Changed

_service:download_url:master.tar.gz/xbmc/music/Artist.h Changed

_service:download_url:master.tar.gz/xbmc/music/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/music/ContextMenus.cpp Added

@@ -0,0 +1,44 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenus.h"
+#include "guilib/GUIWindowManager.h"
+#include "music/dialogs/GUIDialogMusicInfo.h"
+#include "tags/MusicInfoTag.h"
+
+
+namespace CONTEXTMENU
+{
+
+CMusicInfo::CMusicInfo(MediaType mediaType)
+      : CStaticContextMenuAction(19033), m_mediaType(mediaType) {}
+
+bool CMusicInfo::IsVisible(const CFileItem& item) const
+{
+  return item.HasMusicInfoTag() && item.GetMusicInfoTag()->GetType() == m_mediaType;
+}
+
+bool CMusicInfo::Execute(const CFileItemPtr& item) const
+{
+  CGUIDialogMusicInfo::ShowFor(*item);
+  return true;
+}
+
+}

_service:download_url:master.tar.gz/xbmc/music/ContextMenus.h Added

@@ -0,0 +1,52 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenuItem.h"
+
+
+namespace CONTEXTMENU
+{
+
+struct CMusicInfo : CStaticContextMenuAction
+{
+  explicit CMusicInfo(MediaType mediaType);
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+private:
+  const MediaType m_mediaType;
+};
+
+struct CAlbumInfo : CMusicInfo
+{
+  CAlbumInfo() : CMusicInfo(MediaTypeAlbum) {}
+};
+
+struct CArtistInfo : CMusicInfo
+{
+  CArtistInfo() : CMusicInfo(MediaTypeArtist) {}
+};
+
+struct CSongInfo : CMusicInfo
+{
+  CSongInfo() : CMusicInfo(MediaTypeSong) {}
+};
+
+}

_service:download_url:master.tar.gz/xbmc/music/Makefile Changed

_service:download_url:master.tar.gz/xbmc/music/MusicDatabase.cpp Changed

@@ -105,6 +105,7 @@
 
 CMusicDatabase::CMusicDatabase(void)
 {
+  m_translateBlankArtist = true;
 }
 
 CMusicDatabase::~CMusicDatabase(void)
@@ -127,6 +128,11 @@
               " strDied text, strDisbanded text, strYearsActive text, "
               " strImage text, strFanart text, "
               " lastScraped varchar(20) default NULL)");
+  // Create missing artist tag artist [Missing].
+  std::string strSQL = PrepareSQL("INSERT INTO artist (idArtist, strArtist, strMusicBrainzArtistID) VALUES( %i, '%s', '%s' )",
+                                  BLANKARTIST_ID, BLANKARTIST_NAME.c_str(), BLANKARTIST_FAKEMUSICBRAINZID.c_str());
+  m_pDS->exec(strSQL);
+
   CLog::Log(LOGINFO, "create album table");
   m_pDS->exec("CREATE TABLE album (idAlbum integer primary key, "
               " strAlbum varchar(256), strMusicBrainzAlbumID text, "
@@ -170,8 +176,6 @@
   CLog::Log(LOGINFO, "create role table");
   m_pDS->exec("CREATE TABLE role (idRole integer primary key, strRole text)");
   m_pDS->exec("INSERT INTO role(idRole, strRole) VALUES (1, 'Artist')");   //Default role
-  m_pDS->exec("INSERT INTO role(idRole, strRole) VALUES (2, 'Composer')");
-  m_pDS->exec("INSERT INTO role(idRole, strRole) VALUES (3, 'Conductor')");
 
   CLog::Log(LOGINFO, "create albuminfosong table");
   m_pDS->exec("CREATE TABLE albuminfosong (idAlbumInfoSong integer primary key, idAlbumInfo integer, iTrack integer, strTitle text, iDuration integer)");
@@ -216,7 +220,9 @@
   m_pDS->exec("CREATE UNIQUE INDEX idxSong7 ON song( idAlbum, strMusicBrainzTrackID(36) )");
 
   m_pDS->exec("CREATE UNIQUE INDEX idxSongArtist_1 ON song_artist ( idSong, idArtist, idRole )");
-  m_pDS->exec("CREATE UNIQUE INDEX idxSongArtist_2 ON song_artist ( idArtist, idSong, idRole )");
+  m_pDS->exec("CREATE INDEX idxSongArtist_2 ON song_artist ( idSong, idRole )");
+  m_pDS->exec("CREATE INDEX idxSongArtist_3 ON song_artist ( idArtist, idRole )");
+  m_pDS->exec("CREATE INDEX idxSongArtist_4 ON song_artist ( idRole )");
 
   m_pDS->exec("CREATE UNIQUE INDEX idxSongGenre_1 ON song_genre ( idSong, idGenre )");
   m_pDS->exec("CREATE UNIQUE INDEX idxSongGenre_2 ON song_genre ( idGenre, idSong )");
@@ -309,7 +315,7 @@
               "        album.iUserrating, "
               "        album.iVotes, "
               "        bCompilation, "
-              "        (SELECT MIN(song.iTimesPlayed) FROM song WHERE song.idAlbum = album.idAlbum) AS iTimesPlayed, "
+              "        (SELECT AVG(song.iTimesPlayed) FROM song WHERE song.idAlbum = album.idAlbum) AS iTimesPlayed, "
               "        strReleaseType, "
               "        (SELECT MAX(song.dateAdded) FROM song WHERE song.idAlbum = album.idAlbum) AS dateAdded, "
               "        (SELECT MAX(song.lastplayed) FROM song WHERE song.idAlbum = album.idAlbum) AS lastplayed "
@@ -488,6 +494,8 @@
                            album.bCompilation, album.releaseType);
 
   // Add the album artists
+  if (album.artistCredits.empty())
+    AddAlbumArtist(BLANKARTIST_ID, album.idAlbum, BLANKARTIST_NAME, 0); // Album must have at least one artist so set artist to [Missing]
   for (VECARTISTCREDITS::iterator artistCredit = album.artistCredits.begin(); artistCredit != album.artistCredits.end(); ++artistCredit)
   {
     artistCredit->idArtist = AddArtist(artistCredit->GetArtist(), artistCredit->GetMusicBrainzArtistID());
@@ -514,7 +522,9 @@
                            song->userrating,
                            song->votes);
 
-
+    if (song->artistCredits.empty())    
+      AddSongArtist(BLANKARTIST_ID, song->idSong, ROLE_ARTIST, BLANKARTIST_NAME, 0); // Song must have at least one artist so set artist to [Missing]
+    
     for (VECARTISTCREDITS::iterator artistCredit = song->artistCredits.begin(); artistCredit != song->artistCredits.end(); ++artistCredit)
     {
       artistCredit->idArtist = AddArtist(artistCredit->GetArtist(),
@@ -562,6 +572,8 @@
   {
     // Replace the album artists 
     DeleteAlbumArtistsByAlbum(album.idAlbum);
+    if (album.artistCredits.empty())
+      AddAlbumArtist(BLANKARTIST_ID, album.idAlbum, BLANKARTIST_NAME, 0); // Album must have at least one artist so set artist to [Missing]
     for (VECARTISTCREDITS::iterator artistCredit = album.artistCredits.begin(); artistCredit != album.artistCredits.end(); ++artistCredit)
     {
       artistCredit->idArtist = AddArtist(artistCredit->GetArtist(),
@@ -595,6 +607,8 @@
         song->votes);
       //Replace song artists and contributors
       DeleteSongArtistsBySong(song->idSong);
+      if (song->artistCredits.empty())
+        AddSongArtist(BLANKARTIST_ID, song->idSong, ROLE_ARTIST, BLANKARTIST_NAME, 0); // Song must have at least one artist so set artist to [Missing]
       for (VECARTISTCREDITS::iterator artistCredit = song->artistCredits.begin(); artistCredit != song->artistCredits.end(); ++artistCredit)
       {
         artistCredit->idArtist = AddArtist(artistCredit->GetArtist(),
@@ -734,7 +748,7 @@
     if (NULL == m_pDS.get()) return false;
 
     std::string strSQL=PrepareSQL("SELECT songview.*,songartistview.* FROM songview "
-                                 " LEFT JOIN songartistview ON songview.idSong = songartistview.idSong "
+                                 " JOIN songartistview ON songview.idSong = songartistview.idSong "
                                  " WHERE songview.idSong = %i "
                                  " ORDER BY songartistview.idRole, songartistview.iOrder", idSong);
 
@@ -985,7 +999,7 @@
     std::string sql;
     sql = PrepareSQL("SELECT albumview.*,albumartistview.* "
       " FROM albumview "
-      " LEFT JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
+      " JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
       " WHERE albumview.idAlbum = %ld "
       " ORDER BY albumartistview.iOrder", idAlbum);
 
@@ -1017,7 +1031,7 @@
     {
       sql = PrepareSQL("SELECT songview.*, songartistview.*"
         " FROM songview "
-        " LEFT JOIN songartistview ON songview.idSong = songartistview.idSong "
+        " JOIN songartistview ON songview.idSong = songartistview.idSong "
         " WHERE songview.idAlbum = %ld "
         " ORDER BY songview.iTrack, songartistview.idRole, songartistview.iOrder", idAlbum);
 
@@ -1343,6 +1357,32 @@
   return false;
 }
 
+bool CMusicDatabase::GetArtistExists(int idArtist)
+{
+  try
+  {
+    if (NULL == m_pDB.get()) return false;
+    if (NULL == m_pDS.get()) return false;
+
+    std::string strSQL = PrepareSQL("SELECT 1 FROM artist WHERE artist.idArtist = %i LIMIT 1", idArtist);
+
+    if (!m_pDS->query(strSQL)) return false;
+    if (m_pDS->num_rows() == 0)
+    {
+      m_pDS->close();
+      return false;
+    }    
+    m_pDS->close(); // cleanup recordset data
+    return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idArtist);
+  }
+
+  return false;
+}
+
 bool CMusicDatabase::HasArtistBeenScraped(int idArtist)
 {
   std::string strSQL = PrepareSQL("SELECT idArtist FROM artist WHERE idArtist = %i AND lastScraped IS NULL", idArtist);
@@ -1466,7 +1506,7 @@
     if (NULL == m_pDS.get()) return false;
 
     std::string strSQL;
-    strSQL = PrepareSQL("SELECT idRole FROM Role WHERE strRole like '%s'", strRole.c_str());
+    strSQL = PrepareSQL("SELECT idRole FROM role WHERE strRole like '%s'", strRole.c_str());
     // run query
     if (!m_pDS->query(strSQL)) return false;
     int iRowsFound = m_pDS->num_rows();
@@ -1485,6 +1525,42 @@
 
 }
 
+bool CMusicDatabase::GetRolesByArtist(int idArtist, CFileItem* item)
+{
+  try
+  {
+    std::string strSQL = PrepareSQL("SELECT DISTINCT song_artist.idRole, Role.strRole FROM song_artist JOIN role ON "
+                                    " song_artist.idRole = Role.idRole WHERE idArtist = %i ORDER BY song_artist.idRole ASC", idArtist);
+    if (!m_pDS->query(strSQL))
+      return false;
+    if (m_pDS->num_rows() == 0)
+    {
+      m_pDS->close();
+      return true;
+    }
+    
+    CVariant artistRoles(CVariant::VariantTypeArray);
+    
+    while (!m_pDS->eof())
+    {
+      CVariant roleObj;
+      roleObj["role"] = m_pDS->fv("strRole").get_asString();
+      roleObj["roleid"] = m_pDS->fv("idrole").get_asInt();
+      artistRoles.push_back(roleObj);
+      m_pDS->next();
+    }
+    m_pDS->close();
+
+    item->SetProperty("roles", artistRoles);
+    return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idArtist);
+  }
+  return false;
+}
+
 bool CMusicDatabase::DeleteSongArtistsBySong(int idSong)
 {
   return ExecuteQuery(PrepareSQL("DELETE FROM song_artist WHERE idSong = %i", idSong));
@@ -1674,6 +1750,45 @@
   return false;
 }
 
+bool CMusicDatabase::GetGenresByArtist(int idArtist, CFileItem* item)
+{
+  try
+  {
+    std::string strSQL = PrepareSQL("SELECT DISTINCT song_genre.idGenre, Genre.strGenre FROM "
+      "song_artist JOIN song ON song_artist.idSong = song.idSong JOIN "
+      "song_genre ON song.idSong = song_genre.idSong JOIN "
+      "genre ON song_genre.idGenre = genre.idGenre "
+      "WHERE song_artist.idArtist = %i ORDER BY song_genre.idGenre", idArtist);
+    if (!m_pDS->query(strSQL))
+      return false;
+    if (m_pDS->num_rows() == 0)
+    {
+      m_pDS->close();
+      return true;
+    }
+
+    CVariant artistSongGenres(CVariant::VariantTypeArray);
+
+    while (!m_pDS->eof())
+    {
+      CVariant genreObj;
+      genreObj["title"] = m_pDS->fv("strGenre").get_asString();
+      genreObj["genreid"] = m_pDS->fv("idGenre").get_asInt();
+      artistSongGenres.push_back(genreObj);
+      m_pDS->next();
+    }
+    m_pDS->close();
+
+    item->SetProperty("songgenres", artistSongGenres);
+    return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idArtist);
+  }
+  return false;
+}
+
 bool CMusicDatabase::GetGenresByAlbum(int idAlbum, std::vector<int>& genres)
 {
   try
@@ -1732,6 +1847,24 @@
   return false;
 }
 
+bool CMusicDatabase::GetIsAlbumArtist(int idArtist, CFileItem* item)
+{
+  try
+  {    
+    int countalbum = strtol(GetSingleValue("album_artist", "count(idArtist)", PrepareSQL("idArtist=%i", idArtist)).c_str(), NULL, 10);
+    CVariant IsAlbumArtistObj(CVariant::VariantTypeBoolean);
+    IsAlbumArtistObj = (countalbum > 0);
+    item->SetProperty("isalbumartist", IsAlbumArtistObj);
+    return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s(%i) failed", __FUNCTION__, idArtist);
+  }
+  return false;
+}
+
+
 int CMusicDatabase::AddPath(const std::string& strPath1)
 {
   std::string strSQL;
@@ -1879,14 +2012,24 @@
   std::vector<std::string> musicBrainzID;
   std::vector<std::string> songartists;
   CVariant artistidObj(CVariant::VariantTypeArray);
-  for (VECARTISTCREDITS::const_iterator artistCredit = artistCredits.begin(); artistCredit != artistCredits.end(); ++artistCredit)
+
+  // When "missing tag" artist, it is the only artist when present.
+  if (artistCredits.begin()->GetArtistId() == BLANKARTIST_ID)
   {
-    artistidObj.push_back(artistCredit->GetArtistId());
-    songartists.push_back(artistCredit->GetArtist());
-    if (!artistCredit->GetMusicBrainzArtistID().empty())
-      musicBrainzID.push_back(artistCredit->GetMusicBrainzArtistID());
+    artistidObj.push_back((int)BLANKARTIST_ID);
+    songartists.push_back(StringUtils::Empty);
+  }
+  else
+  {
+    for (VECARTISTCREDITS::const_iterator artistCredit = artistCredits.begin(); artistCredit != artistCredits.end(); ++artistCredit)
+    {
+      artistidObj.push_back(artistCredit->GetArtistId());
+      songartists.push_back(artistCredit->GetArtist());
+      if (!artistCredit->GetMusicBrainzArtistID().empty())
+        musicBrainzID.push_back(artistCredit->GetMusicBrainzArtistID());
+    }
   }
-  item->GetMusicInfoTag()->SetArtist(songartists);
+  item->GetMusicInfoTag()->SetArtist(songartists); // Also sets ArtistDesc if empty from song.strArtist field
   item->GetMusicInfoTag()->SetMusicBrainzArtistID(musicBrainzID);
   // Add album artistIds as separate property as not part of CMusicInfoTag
   item->SetProperty("artistid", artistidObj);
@@ -1932,8 +2075,13 @@
 {
   CArtistCredit artistCredit;
   artistCredit.idArtist = record->at(offset + artistCredit_idArtist).get_asInt();
-  artistCredit.m_strArtist = record->at(offset + artistCredit_strArtist).get_asString();
-  artistCredit.m_strMusicBrainzArtistID = record->at(offset + artistCredit_strMusicBrainzArtistID).get_asString();
+  if (artistCredit.idArtist == BLANKARTIST_ID)
+    artistCredit.m_strArtist = StringUtils::Empty;
+  else
+  {
+    artistCredit.m_strArtist = record->at(offset + artistCredit_strArtist).get_asString();
+    artistCredit.m_strMusicBrainzArtistID = record->at(offset + artistCredit_strMusicBrainzArtistID).get_asString();
+  }
   return artistCredit;
 }
 
@@ -1955,7 +2103,10 @@
 {
   CArtist artist;
   artist.idArtist = record->at(offset + artist_idArtist).get_asInt();
-  artist.strArtist = record->at(offset + artist_strArtist).get_asString();
+  if (artist.idArtist == BLANKARTIST_ID && m_translateBlankArtist)
+    artist.strArtist = g_localizeStrings.Get(38042);  //Missing artist tag in current language
+  else
+    artist.strArtist = record->at(offset + artist_strArtist).get_asString();
   artist.strMusicBrainzArtistID = record->at(offset + artist_strMusicBrainzArtistID).get_asString();
   artist.genre = StringUtils::Split(record->at(offset + artist_strGenres).get_asString(), g_advancedSettings.m_musicItemSeparator);
   artist.strBiography = record->at(offset + artist_strBiography).get_asString();
@@ -2173,7 +2324,7 @@
 
     // Get data from album and album_artist tables to fully populate albums
     std::string strSQL = "SELECT albumview.*, albumartistview.* FROM albumview "
-      "LEFT JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
+      "JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
       "WHERE albumartistview.idAlbum in "
       "(SELECT albumview.idAlbum FROM albumview "
       "WHERE albumview.strAlbum != '' AND albumview.iTimesPlayed>0 "
@@ -2273,7 +2424,7 @@
       "(SELECT idAlbum FROM albumview WHERE albumview.lastplayed IS NOT NULL "
       "ORDER BY albumview.lastplayed DESC LIMIT %u) as playedalbums "
       "JOIN albumview ON albumview.idAlbum = playedalbums.idAlbum "
-      "LEFT JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
+      "JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
       "ORDER BY albumview.lastplayed DESC, albumartistview.iorder ", RECENTLY_PLAYED_LIMIT);
 
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
@@ -2327,7 +2478,7 @@
       "(SELECT idAlbum FROM albumview WHERE albumview.lastplayed IS NOT NULL "
       "ORDER BY albumview.lastplayed DESC LIMIT %u) as playedalbums "
       "JOIN songview ON songview.idAlbum = playedalbums.idAlbum "
-      "LEFT JOIN songartistview ON songview.idSong = songartistview.idSong ", 
+      "JOIN songartistview ON songview.idSong = songartistview.idSong ", 
       g_advancedSettings.m_iMusicLibraryRecentlyAddedItems);
     CLog::Log(LOGDEBUG,"GetRecentlyPlayedAlbumSongs() query: %s", strSQL.c_str());
     if (!m_pDS->query(strSQL)) return false;
@@ -2403,7 +2554,7 @@
     std::string strSQL = PrepareSQL("SELECT albumview.*, albumartistview.* FROM "
       "(SELECT idAlbum FROM album WHERE strAlbum != '' ORDER BY idAlbum DESC LIMIT %u) AS recentalbums "
       "JOIN albumview ON albumview.idAlbum = recentalbums.idAlbum "
-      "LEFT JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
+      "JOIN albumartistview ON albumview.idAlbum = albumartistview.idAlbum "
       "ORDER BY albumview.idAlbum desc, albumartistview.iOrder ",
        limit ? limit : g_advancedSettings.m_iMusicLibraryRecentlyAddedItems);
 
@@ -2880,14 +3031,16 @@
   {
     // (nested queries by Bobbin007)
     // must be executed AFTER the song, album and their artist link tables are cleaned.
-    // don't delete the "Various Artists" string
+    // Don't delete [Missing] the missing artist tag artist
 
     // Create temp table to avoid 1442 trigger hell on mysql
     m_pDS->exec("CREATE TEMPORARY TABLE tmp_delartists (idArtist integer)");
     m_pDS->exec("INSERT INTO tmp_delartists select idArtist from song_artist");
     m_pDS->exec("INSERT INTO tmp_delartists select idArtist from album_artist");
+    m_pDS->exec(PrepareSQL("INSERT INTO tmp_delartists VALUES(%i)", BLANKARTIST_ID));
     m_pDS->exec("delete from artist where idArtist not in (select idArtist from tmp_delartists)");
     m_pDS->exec("DROP TABLE tmp_delartists");
+
     return true;
   }
   catch (...)
@@ -3936,7 +4089,7 @@
   {
     total = -1;
     // Get data from album and album_artist tables to fully populate albums
-    std::string strSQL = "SELECT %s FROM albumview LEFT JOIN albumartistview on albumartistview.idalbum = albumview.idalbum ";
+    std::string strSQL = "SELECT %s FROM albumview JOIN albumartistview on albumartistview.idalbum = albumview.idalbum ";
 
     Filter extFilter = filter;
     CMusicDbUrl musicUrl;
@@ -4065,32 +4218,15 @@
     std::string strSQL;
     if (artistData)
     { // Get data from song and song_artist tables to fully populate songs with artists
-      // Some songs may not have artists so Left join.
-      // Bug in SQLite optimiser for left join on views means have to use tables not songartistview
+      // All songs now have at least one artist so inner join sufficient
       if (limited)
         //Apply where clause and limits to songview, then join as mutiple records in result set per song
-        strSQL = "SELECT sv.*, "
-          "song_artist.idArtist AS idArtist, "
-          "song_artist.idRole AS idRole, "
-          "role.strRole AS strRole, "
-          "artist.strArtist AS strArtist, "
-          "artist.strMusicBrainzArtistID AS strMusicBrainzArtistID, "
-          "song_artist.iOrder AS iOrder "
+        strSQL = "SELECT sv.*, songartistview.* "
           "FROM (SELECT songview.* FROM songview " + strSQLExtra + ") AS sv "
-          "LEFT JOIN song_artist on song_artist.idsong = sv.idsong "
-          "LEFT JOIN artist ON song_artist.idArtist = artist.idArtist "
-          "LEFT JOIN role ON song_artist.idRole = role.idRole ";
+          "JOIN songartistview ON songartistview.idsong = sv.idsong ";
       else
-        strSQL = "SELECT songview.*, "
-          "song_artist.idArtist AS idArtist, "
-          "song_artist.idRole AS idRole, "
-          "role.strRole AS strRole, "
-          "artist.strArtist AS strArtist, "
-          "artist.strMusicBrainzArtistID AS strMusicBrainzArtistID, "
-          "song_artist.iOrder AS iOrder "
-          "FROM songview LEFT JOIN song_artist ON song_artist.idsong = songview.idsong "
-          "LEFT JOIN artist ON song_artist.idArtist = artist.idArtist "
-          "LEFT JOIN role ON song_artist.idRole = role.idRole " + strSQLExtra;
+        strSQL = "SELECT songview.*, songartistview.* "
+          "FROM songview JOIN songartistview ON songartistview.idsong = songview.idsong " + strSQLExtra;
     }
     else
       strSQL = "SELECT songview.* FROM songview " + strSQLExtra;
@@ -4117,7 +4253,7 @@
 
     // Get songs from returned rows. If join songartistview then there is a row for every album artist
     items.Reserve(total);
-    int songArtistOffset = song_enumCount - 1; // Unlike songartistview, not query idsong from song_artist
+    int songArtistOffset = song_enumCount;
     int songId = -1;
     VECARTISTCREDITS artistCredits;
     const dbiplus::query_data &data = m_pDS->get_result_set().records;
@@ -4664,11 +4800,121 @@
     CMediaSettings::GetInstance().SetMusicNeedsUpdate(58);
     CSettings::GetInstance().Save();
   }
+  if (version < 60)
+  { 
+    // From now on artist ID = 1 will be an artificial artist [Missing] use for songs that
+    // do not have an artist tag to ensure all songs in the library have at least one artist.
+    std::string strSQL;
+    if (GetArtistExists(BLANKARTIST_ID))
+    { 
+      // When BLANKARTIST_ID (=1) is already in use, move the record
+      try
+      { //No mbid index yet, so can have record for artist twice even with mbid
+        strSQL = PrepareSQL("INSERT INTO artist SELECT null, "
+          "strArtist, strMusicBrainzArtistID, "
+          "strBorn, strFormed, strGenres, strMoods, "
+          "strStyles, strInstruments, strBiography, "
+          "strDied, strDisbanded, strYearsActive, "
+          "strImage, strFanart, lastScraped "
+          "FROM artist WHERE artist.idArtist = %i", BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+        int idArtist = (int)m_pDS->lastinsertid();
+        //No triggers, so can delete artist without effecting other tables.
+        strSQL = PrepareSQL("DELETE FROM artist WHERE artist.idArtist = %i", BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+
+        // Update related tables with the new artist ID
+        // Indices have been dropped making transactions very slow, so create appropriate temp indices     
+        m_pDS->exec("CREATE INDEX idxSongArtist2 ON song_artist ( idArtist )");
+        m_pDS->exec("CREATE INDEX idxAlbumArtist2 ON album_artist ( idArtist )");
+        m_pDS->exec("CREATE INDEX idxDiscography ON discography ( idArtist )");
+        m_pDS->exec("CREATE INDEX ix_art ON art ( media_id, media_type(20) )");
+        strSQL = PrepareSQL("UPDATE song_artist SET idArtist = %i WHERE idArtist = %i", idArtist, BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+        strSQL = PrepareSQL("UPDATE album_artist SET idArtist = %i WHERE idArtist = %i", idArtist, BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+        strSQL = PrepareSQL("UPDATE art SET media_id = %i WHERE media_id = %i AND media_type='artist'", idArtist, BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+        strSQL = PrepareSQL("UPDATE discography SET idArtist = %i WHERE idArtist = %i", idArtist, BLANKARTIST_ID);
+        m_pDS->exec(strSQL);
+        // Drop temp indices
+        m_pDS->exec("DROP INDEX idxSongArtist2 ON song_artist");
+        m_pDS->exec("DROP INDEX idxAlbumArtist2 ON album_artist");
+        m_pDS->exec("DROP INDEX idxDiscography ON discography");
+        m_pDS->exec("DROP INDEX ix_art ON art");
+      }
+      catch (...)
+      {
+        CLog::Log(LOGERROR, "Moving existing artist to add missing tag artist has failed");
+      }
+    }
+
+    // Create missing artist tag artist [Missing].
+    // Fake MusicbrainzId assures uniqueness and avoids updates from scanned songs
+    strSQL = PrepareSQL("INSERT INTO artist (idArtist, strArtist, strMusicBrainzArtistID) VALUES( %i, '%s', '%s' )",
+      BLANKARTIST_ID, BLANKARTIST_NAME.c_str(), BLANKARTIST_FAKEMUSICBRAINZID.c_str());
+    m_pDS->exec(strSQL);
+
+    // Indices have been dropped making transactions very slow, so create temp index
+    m_pDS->exec("CREATE INDEX idxSongArtist1 ON song_artist ( idSong, idRole )");
+    m_pDS->exec("CREATE INDEX idxAlbumArtist1 ON album_artist ( idAlbum )");
+
+    // Ensure all songs have at least one artist, set those without to [Missing] 
+    strSQL = "SELECT count(idSong) FROM song "
+             "WHERE NOT EXISTS(SELECT idSong FROM song_artist "
+             "WHERE song_artist.idsong = song.idsong AND song_artist.idRole = 1)";
+    int numsongs = strtol(GetSingleValue(strSQL).c_str(), NULL, 10);
+    if (numsongs > 0)
+    { 
+      CLog::Log(LOGDEBUG, "%i songs have no artist, setting artist to [Missing]", numsongs);
+      // Insert song_artist records for songs that don't have any
+      try
+      {
+        strSQL = PrepareSQL("INSERT INTO song_artist(idArtist, idSong, idRole, strArtist, iOrder) "
+          "SELECT %i, idSong, %i, '%s', 0 FROM song "
+          "WHERE NOT EXISTS(SELECT idSong FROM song_artist "
+          "WHERE song_artist.idsong = song.idsong AND song_artist.idRole = %i)", 
+          BLANKARTIST_ID, ROLE_ARTIST, BLANKARTIST_NAME.c_str(), ROLE_ARTIST);
+        ExecuteQuery(strSQL);
+      }
+      catch (...)
+      {
+        CLog::Log(LOGERROR, "Setting missing artist for songs without an artist has failed");
+      }
+    }
+    
+    // Ensure all albums have at least one artist, set those without to [Missing]
+    strSQL = "SELECT count(idAlbum) FROM album "
+      "WHERE NOT EXISTS(SELECT idAlbum FROM album_artist "
+      "WHERE album_artist.idAlbum = album.idAlbum)";
+    int numalbums = strtol(GetSingleValue(strSQL).c_str(), NULL, 10);
+    if (numalbums > 0)
+    {
+      CLog::Log(LOGDEBUG, "%i albums have no artist, setting artist to [Missing]", numalbums);
+      // Insert album_artist records for albums that don't have any
+      try
+      {
+        strSQL = PrepareSQL("INSERT INTO album_artist(idArtist, idAlbum, strArtist, iOrder) "
+          "SELECT %i, idAlbum, '%s', 0 FROM album "
+          "WHERE NOT EXISTS(SELECT idAlbum FROM album_artist "
+          "WHERE album_artist.idAlbum = album.idAlbum)", 
+          BLANKARTIST_ID, BLANKARTIST_NAME.c_str());
+        ExecuteQuery(strSQL);
+      }
+      catch (...)
+      {
+        CLog::Log(LOGERROR, "Setting artist missing for albums without an artist has failed");
+      }
+    }
+    //Remove temp indices, full analyics for database created later
+    m_pDS->exec("DROP INDEX idxSongArtist1 ON song_artist");
+    m_pDS->exec("DROP INDEX idxAlbumArtist1 ON album_artist");
+  }
 }
 
 int CMusicDatabase::GetSchemaVersion() const
 {
-  return 59;
+  return 60;
 }
 
 unsigned int CMusicDatabase::GetSongIDs(const Filter &filter, std::vector<std::pair<int,int> > &songIDs)
@@ -6115,7 +6361,7 @@
       if (!albumArtistsOnly || idRole > 1)  //Song and album artists or album artists with specific role, check song_artist
         strSQL += PrepareSQL("(SELECT song_artist.idArtist FROM song_artist WHERE song_artist.idRole = %i)", idRole);
 
-      if (idRole < -1) //All artists contributing to songs, all roles.
+      if (idRole < 0) //All artists contributing to songs, all roles.
         strSQL = "(artistview.idArtist IN (SELECT song_artist.idArtist FROM song_artist) OR"
                  " artistview.idArtist IN (SELECT album_artist.idArtist FROM album_artist )";
     }
@@ -6227,7 +6473,7 @@
     if (option != options.end())
       filter.AppendWhere(PrepareSQL(
         "songview.idSong IN (SELECT song_artist.idSong FROM song_artist JOIN artist ON artist.idArtist = song_artist.idArtist "
-        "WHERE artist.strArtist like '%s' %s) OR" // song artists
+        "WHERE artist.strArtist like '%s' %s) OR " // song artists
         "songview.idSong IN (SELECT song.idSong FROM song JOIN album_artist ON song.idAlbum=album_artist.idAlbum "
         "JOIN artist ON artist.idArtist = album_artist.idArtist WHERE artist.strArtist like '%s')", // album artists
         option->second.asString().c_str(), strRoleSQL.c_str(), option->second.asString().c_str()));

_service:download_url:master.tar.gz/xbmc/music/MusicDatabase.h Changed

@@ -257,6 +257,7 @@
 
   int  AddArtist(const std::string& strArtist, const std::string& strMusicBrainzArtistID);
   bool GetArtist(int idArtist, CArtist& artist, bool fetchAll = true);
+  bool GetArtistExists(int idArtist);
   int  UpdateArtist(int idArtist,
                     const std::string& strArtist, const std::string& strMusicBrainzArtistID,
                     const std::string& strBorn, const std::string& strFormed,
@@ -265,6 +266,8 @@
                     const std::string& strBiography, const std::string& strDied,
                     const std::string& strDisbanded, const std::string& strYearsActive,
                     const std::string& strImage, const std::string& strFanart);
+  bool GetTranslateBlankArtist() { return m_translateBlankArtist; }
+  void SetTranslateBlankArtist(bool translate) { m_translateBlankArtist = translate; }
   bool HasArtistBeenScraped(int idArtist);
   bool ClearArtistLastScrapedTime(int idArtist);
   int  AddArtistDiscography(int idArtist, const std::string& strAlbum, const std::string& strYear);
@@ -311,6 +314,7 @@
   int  AddSongContributor(int idSong, const std::string& strRole, const std::string& strArtist);
   void AddSongContributors(int idSong, const VECMUSICROLES& contributors);
   int GetRoleByName(const std::string& strRole);
+  bool GetRolesByArtist(int idArtist, CFileItem* item);
   bool GetSongsByArtist(int idArtist, std::vector<int>& songs);
   bool GetArtistsBySong(int idSong, std::vector<int>& artists);
   bool DeleteSongArtistsBySong(int idSong);
@@ -323,6 +327,9 @@
   bool GetGenresByAlbum(int idAlbum, std::vector<int>& genres);
   bool DeleteAlbumGenresByAlbum(int idAlbum);
 
+  bool GetGenresByArtist(int idArtist, CFileItem* item);
+  bool GetIsAlbumArtist(int idArtist, CFileItem* item);
+
   /////////////////////////////////////////////////
   // Top 100
   /////////////////////////////////////////////////
@@ -529,6 +536,8 @@
   bool SearchSongs(const std::string& strSearch, CFileItemList &songs);
   int GetSongIDFromPath(const std::string &filePath);
 
+  bool m_translateBlankArtist;
+
   // Fields should be ordered as they
   // appear in the songview
   static enum _SongFields

_service:download_url:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicInfo.cpp Changed

_service:download_url:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicInfo.h Changed

_service:download_url:master.tar.gz/xbmc/music/infoscanner/MusicInfoScanner.cpp Changed

@@ -35,6 +35,7 @@
 #include "filesystem/File.h"
 #include "filesystem/MusicDatabaseDirectory.h"
 #include "filesystem/MusicDatabaseDirectory/DirectoryNode.h"
+#include "filesystem/SmartPlaylistDirectory.h" 
 #include "GUIInfoManager.h"
 #include "guilib/GUIKeyboardFactory.h"
 #include "guilib/GUIWindowManager.h"
@@ -73,6 +74,7 @@
   m_currentItem=0;
   m_itemCount=0;
   m_flags = 0;
+  m_bClean = false;
 }
 
 CMusicInfoScanner::~CMusicInfoScanner()
@@ -316,8 +318,14 @@
   }
   else
   {
-    if (URIUtils::HasSlashAtEnd(strDirectory)) // directory
+    if (URIUtils::IsMusicDb(strDirectory))
       CDirectory::GetDirectory(strDirectory,items);
+    else if (StringUtils::EndsWith(strDirectory, ".xsp"))
+    {
+      CURL url(strDirectory);
+      CSmartPlaylistDirectory dir;
+      dir.GetDirectory(url, items);
+    }
     else
     {
       CFileItemPtr item(new CFileItem(strDirectory,false));
@@ -355,13 +363,19 @@
   if (strDirectory.empty())
   {
     m_musicDatabase.Open();
-    m_musicDatabase.GetArtistsNav("musicdb://artists/", items, false, -1);
+    m_musicDatabase.GetArtistsNav("musicdb://artists/", items, !CSettings::GetInstance().GetBool(CSettings::SETTING_MUSICLIBRARY_SHOWCOMPILATIONARTISTS), -1);
     m_musicDatabase.Close();
   }
   else
   {
-    if (URIUtils::HasSlashAtEnd(strDirectory)) // directory
+    if (URIUtils::IsMusicDb(strDirectory))
       CDirectory::GetDirectory(strDirectory,items);
+    else if (StringUtils::EndsWith(strDirectory, ".xsp"))
+    {
+      CURL url(strDirectory);
+      CSmartPlaylistDirectory dir;
+      dir.GetDirectory(url, items);
+    }
     else
     {
       CFileItemPtr newItem(new CFileItem(strDirectory,false));
@@ -795,6 +809,8 @@
       if (!albumScraper || !artistScraper)
         continue;
 
+      bool albumartistsonly = !CSettings::GetInstance().GetBool(CSettings::SETTING_MUSICLIBRARY_SHOWCOMPILATIONARTISTS);
+
       INFO_RET albumScrapeStatus = INFO_NOT_FOUND;
       if (!m_musicDatabase.HasAlbumBeenScraped(album->idAlbum))
         albumScrapeStatus = UpdateDatabaseAlbumInfo(*album, albumScraper, false);
@@ -815,27 +831,29 @@
             UpdateDatabaseArtistInfo(artist, artistScraper, false);
           }
         }
-
-        for (VECSONGS::iterator song  = album->songs.begin();
-                                song != album->songs.end();
-                                ++song)
+        if (!albumartistsonly)
         {
-          if (m_bStop)
-            break;
-
-          for (VECARTISTCREDITS::const_iterator artistCredit  = song->artistCredits.begin();
-                                                artistCredit != song->artistCredits.end();
-                                              ++artistCredit)
+          for (VECSONGS::iterator song = album->songs.begin();
+            song != album->songs.end();
+            ++song)
           {
             if (m_bStop)
               break;
 
-            CMusicArtistInfo musicArtistInfo;
-            if (!m_musicDatabase.HasArtistBeenScraped(artistCredit->GetArtistId()))
+            for (VECARTISTCREDITS::const_iterator artistCredit = song->artistCredits.begin();
+              artistCredit != song->artistCredits.end();
+              ++artistCredit)
             {
-              CArtist artist;
-              m_musicDatabase.GetArtist(artistCredit->GetArtistId(), artist);
-              UpdateDatabaseArtistInfo(artist, artistScraper, false);
+              if (m_bStop)
+                break;
+
+              CMusicArtistInfo musicArtistInfo;
+              if (!m_musicDatabase.HasArtistBeenScraped(artistCredit->GetArtistId()))
+              {
+                CArtist artist;
+                m_musicDatabase.GetArtist(artistCredit->GetArtistId(), artist);
+                UpdateDatabaseArtistInfo(artist, artistScraper, false);
+              }
             }
           }
         }

_service:download_url:master.tar.gz/xbmc/music/tags/MusicInfoTag.cpp Changed

_service:download_url:master.tar.gz/xbmc/music/windows/GUIWindowMusicBase.cpp Changed

@@ -317,12 +317,10 @@
   std::string strPath = m_vecItems->GetPath();
   if (bCurrent)
     strPath = m_vecItems->Get(iItem)->GetPath();
-
-  if (dir.HasAlbumInfo(strPath) ||
-      CMusicDatabaseDirectory::GetDirectoryChildType(strPath) == 
-      MUSICDATABASEDIRECTORY::NODE_TYPE_ALBUM)
+  
+  if (StringUtils::EqualsNoCase(m_vecItems->GetContent(), "albums"))
     g_application.StartMusicAlbumScan(strPath,refresh);
-  else
+  else if (StringUtils::EqualsNoCase(m_vecItems->GetContent(), "artists"))
     g_application.StartMusicArtistScan(strPath,refresh);
 }
 
@@ -837,8 +835,6 @@
   {
     if (item && !item->IsParentFolder())
     {
-      if (!m_vecItems->IsPlugin() && (item->IsPlugin() || item->IsScript()))
-        buttons.Add(CONTEXT_BUTTON_INFO,24003); // Add-on info
       if (item->CanQueue() && !item->IsAddonsPath() && !item->IsScript())
       {
         buttons.Add(CONTEXT_BUTTON_QUEUE_ITEM, 13347); //queue
@@ -933,12 +929,6 @@
     OnItemInfo(itemNumber);
     return true;
 
-  case CONTEXT_BUTTON_SONG_INFO:
-    {
-      ShowSongInfo(item.get());
-      return true;
-    }
-
   case CONTEXT_BUTTON_EDIT:
     {
       std::string playlist = item->IsPlayList() ? item->GetPath() : m_vecItems->GetPath(); // save path as activatewindow will destroy our items

_service:download_url:master.tar.gz/xbmc/music/windows/GUIWindowMusicNav.cpp Changed

@@ -46,7 +46,6 @@
 #include "Application.h"
 #include "messaging/ApplicationMessenger.h"
 #include "settings/Settings.h"
-#include "settings/AdvancedSettings.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/LegacyPathTranslation.h"
 #include "utils/log.h"
@@ -54,7 +53,6 @@
 #include "utils/Variant.h"
 #include "Util.h"
 #include "URL.h"
-#include "ContextMenuManager.h"
 #include "storage/MediaManager.h"
 
 using namespace XFILE;
@@ -187,7 +185,7 @@
     int item = m_viewControl.GetSelectedItem();
     CMusicDatabaseDirectory dir;
     if (item > -1 && m_vecItems->Get(item)->m_bIsFolder
-                  && (dir.HasAlbumInfo(m_vecItems->Get(item)->GetPath())||
+                  && (m_vecItems->Get(item)->IsAlbum()||
                       dir.IsArtistDir(m_vecItems->Get(item)->GetPath())))
     {
       OnContextButton(item,CONTEXT_BUTTON_INFO);
@@ -482,42 +480,16 @@
       CGUIWindowMusicBase::GetContextButtons(itemNumber, buttons);
 
       CMusicDatabaseDirectory dir;
-      // enable music info button on an album or on a song.
-      if (item->IsAudio() && !item->IsPlayList() && !item->IsSmartPlayList() &&
-          !item->m_bIsFolder)
-        buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658);
-      else if (item->IsVideoDb())
-      {
-        if (!item->m_bIsFolder) // music video
-         buttons.Add(CONTEXT_BUTTON_INFO, 20393);
-        if (StringUtils::StartsWithNoCase(item->GetPath(), "videodb://musicvideos/artists/") && item->m_bIsFolder)
-        {
-          long idArtist = m_musicdatabase.GetArtistByName(m_vecItems->Get(itemNumber)->GetLabel());
-          if (idArtist > - 1)
-            buttons.Add(CONTEXT_BUTTON_INFO,21891);
-        }
-      }
-      else if (!inPlaylists && (dir.HasAlbumInfo(item->GetPath())||
-                                dir.IsArtistDir(item->GetPath())   )      &&
-               !dir.IsAllItem(item->GetPath()) && !item->IsParentFolder() &&
-               !item->IsPlugin() && !item->IsScript() &&
-               !StringUtils::StartsWithNoCase(item->GetPath(), "musicsearch://"))
-      {
-        if (dir.IsArtistDir(item->GetPath()))
-          buttons.Add(CONTEXT_BUTTON_INFO, 21891);
-        else
-          buttons.Add(CONTEXT_BUTTON_INFO, 13351);
-      }
 
       // enable query all albums button only in album view
-      if (dir.HasAlbumInfo(item->GetPath()) && !dir.IsAllItem(item->GetPath()) &&
+      if (item->IsAlbum() && !dir.IsAllItem(item->GetPath()) &&
           item->m_bIsFolder && !item->IsVideoDb() && !item->IsParentFolder()   &&
          !item->IsPlugin() && !StringUtils::StartsWithNoCase(item->GetPath(), "musicsearch://"))
       {
         buttons.Add(CONTEXT_BUTTON_INFO_ALL, 20059);
       }
 
-      // enable query all artist button only in album view
+      // enable query all artist button only in artist view
       if (dir.IsArtistDir(item->GetPath()) && !dir.IsAllItem(item->GetPath()) &&
         item->m_bIsFolder && !item->IsVideoDb())
       {
@@ -574,10 +546,6 @@
       }
       if (item->HasVideoInfoTag() && !item->m_bIsFolder)
       {
-        if (item->GetVideoInfoTag()->m_playCount > 0)
-          buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched
-        else
-          buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
         if ((CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !item->IsPlugin())
         {
           buttons.Add(CONTEXT_BUTTON_RENAME, 16105);
@@ -588,9 +556,6 @@
                       && (item->IsPlayList() || item->IsSmartPlayList()))
         buttons.Add(CONTEXT_BUTTON_DELETE, 117);
 
-      if (item->IsPlugin() || item->IsScript() || m_vecItems->IsPlugin())
-        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
-
       if (!item->IsReadOnly() && CSettings::GetInstance().GetBool("filelists.allowfiledeletion"))
       {
         buttons.Add(CONTEXT_BUTTON_DELETE, 117);
@@ -601,8 +566,6 @@
   // noncontextual buttons
 
   CGUIWindowMusicBase::GetNonContextButtons(buttons);
-
-  CContextMenuManager::GetInstance().AddVisibleItems(item, buttons);
 }
 
 bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
@@ -654,13 +617,8 @@
 
       if (item->HasVideoInfoTag() && !item->GetVideoInfoTag()->m_strTitle.empty())
       {
-        CGUIWindowVideoNav* pWindow = (CGUIWindowVideoNav*)g_windowManager.GetWindow(WINDOW_VIDEO_NAV);
-        if (pWindow)
-        {
-          ADDON::ScraperPtr info;
-          pWindow->OnItemInfo(item.get(),info);
-          Refresh();
-        }
+        CGUIDialogVideoInfo::ShowFor(*item);
+        Refresh();
       }
       return true;
     }

_service:download_url:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylist.cpp Changed

@@ -31,7 +31,6 @@
 #include "guilib/GUIKeyboardFactory.h"
 #include "input/Key.h"
 #include "GUIUserMessages.h"
-#include "ContextMenuManager.h"
 #include "filesystem/FavouritesDirectory.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/MediaSettings.h"
@@ -517,7 +516,6 @@
       if (players.size() > 1)
         buttons.Add(CONTEXT_BUTTON_PLAY_WITH, 15213); // Play With...
 
-      buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); // Song Info
       if (XFILE::CFavouritesDirectory::IsFavourite(item.get(), GetID()))
         buttons.Add(CONTEXT_BUTTON_ADD_FAVOURITE, 14077);     // Remove Favourite
       else
@@ -538,9 +536,6 @@
     buttons.Add(CONTEXT_BUTTON_EDIT_PARTYMODE, 21439);
     buttons.Add(CONTEXT_BUTTON_CANCEL_PARTYMODE, 588);      // cancel party mode
   }
-
-  if (itemNumber >= 0 && itemNumber < m_vecItems->Size())
-    CContextMenuManager::GetInstance().AddVisibleItems(m_vecItems->Get(itemNumber), buttons);
 }
 
 bool CGUIWindowMusicPlayList::OnContextButton(int itemNumber, CONTEXT_BUTTON button)

_service:download_url:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylist.h Changed

_service:download_url:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp Changed

_service:download_url:master.tar.gz/xbmc/network/WebServer.cpp Changed

@@ -30,6 +30,10 @@
 #include <stdexcept>
 #include <utility>
 
+#if defined(TARGET_POSIX)
+#include <pthread.h>
+#endif
+
 #include "filesystem/File.h"
 #include "network/httprequesthandler/IHTTPRequestHandler.h"
 #include "settings/Settings.h"
@@ -99,9 +103,22 @@
     m_daemon_ip4(nullptr),
     m_running(false),
     m_needcredentials(false),
+    m_thread_stacksize(0),
     m_Credentials64Encoded("eGJtYzp4Ym1j") // xbmc:xbmc
-
-{ }
+{
+#if defined(TARGET_DARWIN)
+  void *stack_addr;
+  pthread_attr_t attr;
+  pthread_attr_init(&attr);
+  pthread_attr_getstack(&attr, &stack_addr, &m_thread_stacksize);
+  pthread_attr_destroy(&attr);
+  // double the stack size under darwin, not sure why yet
+  // but it stoped crashing using Kodi iOS remote -> play video.
+  // non-darwin will pass a value of zero which means 'system default'
+  m_thread_stacksize *= 2;
+  CLog::Log(LOGDEBUG, "CWebServer: increasing thread stack to %zu", m_thread_stacksize);
+#endif
+}
 
 HTTPMethod CWebServer::GetMethod(const char *method)
 {
@@ -1143,6 +1160,7 @@
 #if (MHD_VERSION >= 0x00040001)
                           MHD_OPTION_EXTERNAL_LOGGER, &logFromMHD, nullptr,
 #endif // MHD_VERSION >= 0x00040001
+                          MHD_OPTION_THREAD_STACK_SIZE, m_thread_stacksize,
                           MHD_OPTION_END);
 }

_service:download_url:master.tar.gz/xbmc/network/WebServer.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/peripherals/EventScanRate.cpp Added

@@ -0,0 +1,37 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "EventScanRate.h"
+
+#include <assert.h>
+
+using namespace PERIPHERALS;
+
+CEventRateHandle::CEventRateHandle(float RateHz, IEventRateCallback* callback) :
+  m_rateHz(RateHz),
+  m_callback(callback)
+{
+  assert(m_callback != nullptr);
+}
+
+void CEventRateHandle::Release(void)
+{
+  m_callback->Release(this);
+}

_service:download_url:master.tar.gz/xbmc/peripherals/EventScanRate.h Added

@@ -0,0 +1,67 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include <memory>
+
+namespace PERIPHERALS
+{
+  class CEventRateHandle;
+  typedef std::shared_ptr<CEventRateHandle> EventRateHandle;
+
+  /*!
+   * \brief Callback implemented by event scanner
+   */
+  class IEventRateCallback
+  {
+  public:
+    virtual ~IEventRateCallback(void) { }
+
+    /*!
+     * \brief Release the specified handle
+     */
+    virtual void Release(CEventRateHandle* handle) = 0;
+  };
+
+  /*!
+   * \brief Handle returned by the event scanner when a scan rate is requested
+   */
+  class CEventRateHandle
+  {
+  public:
+    CEventRateHandle(float rateHz, IEventRateCallback* callback);
+
+    ~CEventRateHandle(void) { }
+
+    /*!
+     * \brief Get the rate this handle represents
+     */
+    float GetRateHz(void) const { return m_rateHz; }
+
+    /*!
+     * \brief Release the handle
+     */
+    void Release(void);
+
+  private:
+    const float               m_rateHz;
+    IEventRateCallback* const m_callback;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/EventScanner.cpp Added

@@ -0,0 +1,124 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "EventScanner.h"
+#include "threads/SingleLock.h"
+#include "threads/SystemClock.h"
+#include "utils/log.h"
+
+#include <algorithm>
+#include <assert.h>
+
+using namespace PERIPHERALS;
+using namespace XbmcThreads;
+
+#define DEFAULT_SCAN_RATE_HZ  60
+
+CEventScanner::CEventScanner(IEventScannerCallback* callback) :
+  CThread("PeripEventScanner"),
+  m_callback(callback)
+{
+  assert(m_callback != nullptr);
+}
+
+void CEventScanner::Start(void)
+{
+  Create();
+}
+
+void CEventScanner::Stop(void)
+{
+  m_scanEvent.Set();
+  StopThread(true);
+}
+
+EventRateHandle CEventScanner::SetRate(float rateHz)
+{
+  CSingleLock lock(m_mutex);
+
+  const float oldRate = GetRateHz();
+
+  EventRateHandle handle = EventRateHandle(new CEventRateHandle(rateHz, this));
+  m_handles.push_back(handle);
+
+  const float newRate = GetRateHz();
+
+  CLog::Log(LOGDEBUG, "PERIPHERALS: Event sampling rate set from %.2f to %.2f", oldRate, newRate);
+
+  return handle;
+}
+
+void CEventScanner::Release(CEventRateHandle* handle)
+{
+  CSingleLock lock(m_mutex);
+
+  const float oldRate = GetRateHz();
+
+  m_handles.erase(std::remove_if(m_handles.begin(), m_handles.end(),
+    [handle](const EventRateHandle& myHandle)
+    {
+      return handle == myHandle.get();
+    }), m_handles.end());
+
+  const float newRate = GetRateHz();
+
+  CLog::Log(LOGDEBUG, "PERIPHERALS: Event sampling rate set from %.2f to %.2f", oldRate, newRate);
+}
+
+void CEventScanner::Process(void)
+{
+  float nextScanMs = static_cast<float>(SystemClockMillis());
+
+  while (!m_bStop)
+  {
+    m_scanEvent.Reset();
+
+    m_callback->ProcessEvents();
+
+    const float nowMs = static_cast<float>(SystemClockMillis());
+    const float scanIntervalMs = GetScanIntervalMs();
+
+    while (nextScanMs <= nowMs)
+      nextScanMs += scanIntervalMs;
+
+    unsigned int waitTimeMs = static_cast<unsigned int>(nextScanMs - nowMs);
+
+    if (!m_bStop && waitTimeMs > 0)
+      m_scanEvent.WaitMSec(waitTimeMs);
+  }
+}
+
+float CEventScanner::GetRateHz(void) const
+{
+  CSingleLock lock(m_mutex);
+
+  float scanRateHz = 0.0f;
+
+  for (const EventRateHandle& handle : m_handles)
+  {
+    if (handle->GetRateHz() > scanRateHz)
+      scanRateHz = handle->GetRateHz();
+  }
+
+  if (scanRateHz == 0.0f)
+    scanRateHz = DEFAULT_SCAN_RATE_HZ;
+
+  return scanRateHz;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/EventScanner.h Added

@@ -0,0 +1,76 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "EventScanRate.h"
+#include "threads/CriticalSection.h"
+#include "threads/Event.h"
+#include "threads/Thread.h"
+
+namespace PERIPHERALS
+{
+  class IEventScannerCallback
+  {
+  public:
+    virtual ~IEventScannerCallback(void) { }
+
+    virtual void ProcessEvents(void) = 0;
+  };
+
+  /*!
+   * \brief Class to scan for peripheral events
+   *
+   * A default rate of 60 Hz is used. This can be overridden by calling
+   * SetRate(). The scanner will run at this new rate until the handle it
+   * returns has been released.
+   *
+   * If two instances hold handles from SetRate(), the one with the higher
+   * rate wins.
+   */
+  class CEventScanner : public IEventRateCallback,
+                        protected CThread
+  {
+  public:
+    CEventScanner(IEventScannerCallback* callback);
+
+    virtual ~CEventScanner(void) { }
+
+    void Start(void);
+    void Stop(void);
+
+    EventRateHandle SetRate(float rateHz);
+
+    // implementation of IEventRateCallback
+    virtual void Release(CEventRateHandle* handle);
+
+  protected:
+    // implementation of CThread
+    virtual void Process(void) override;
+
+  private:
+    float GetRateHz(void) const;
+    float GetScanIntervalMs(void) const { return 1000.0f / GetRateHz(); }
+
+    IEventScannerCallback* const m_callback;
+    std::vector<EventRateHandle> m_handles;
+    CEvent                       m_scanEvent;
+    CCriticalSection             m_mutex;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/Makefile Changed

_service:download_url:master.tar.gz/xbmc/peripherals/PeripheralTypes.h Changed

@@ -21,8 +21,10 @@
 
 #include <algorithm>
 #include <map>
+#include <memory>
 #include <string>
 #include <stdio.h>
+#include <vector>
 #ifdef TARGET_WINDOWS
 #include "PlatformDefs.h"
 #endif
@@ -38,7 +40,11 @@
     PERIPHERAL_BUS_USB,
     PERIPHERAL_BUS_PCI,
     PERIPHERAL_BUS_RPI,
-    PERIPHERAL_BUS_CEC
+    PERIPHERAL_BUS_CEC,
+    PERIPHERAL_BUS_ADDON,
+#ifdef TARGET_ANDROID
+    PERIPHERAL_BUS_ANDROID,
+#endif
   };
 
   enum PeripheralFeature
@@ -51,7 +57,8 @@
     FEATURE_CEC,
     FEATURE_BLUETOOTH,
     FEATURE_TUNER,
-    FEATURE_IMON
+    FEATURE_IMON,
+    FEATURE_JOYSTICK,
   };
 
   enum PeripheralType
@@ -64,9 +71,14 @@
     PERIPHERAL_CEC,
     PERIPHERAL_BLUETOOTH,
     PERIPHERAL_TUNER,
-    PERIPHERAL_IMON 
+    PERIPHERAL_IMON,
+    PERIPHERAL_JOYSTICK,
   };
 
+  class CPeripheralAddon;
+  typedef std::shared_ptr<CPeripheralAddon> PeripheralAddonPtr;
+  typedef std::vector<PeripheralAddonPtr>   PeripheralAddonVector;
+
   struct PeripheralID
   {
     int m_iVendorId;
@@ -112,6 +124,8 @@
         return "tuner";
       case PERIPHERAL_IMON:
         return "imon";
+      case PERIPHERAL_JOYSTICK:
+        return "joystick";
       default:
         return "unknown";
       }
@@ -138,6 +152,8 @@
         return PERIPHERAL_TUNER;
       else if (strTypeLowerCase == "imon")
         return PERIPHERAL_IMON;
+      else if (strTypeLowerCase == "joystick")
+        return PERIPHERAL_JOYSTICK;
 
       return PERIPHERAL_UNKNOWN;
     };
@@ -154,6 +170,12 @@
         return "rpi";
       case PERIPHERAL_BUS_CEC:
         return "cec";
+      case PERIPHERAL_BUS_ADDON:
+        return "addon";
+#ifdef TARGET_ANDROID
+      case PERIPHERAL_BUS_ANDROID:
+        return "android";
+#endif
       default:
         return "unknown";
       }
@@ -172,6 +194,12 @@
         return PERIPHERAL_BUS_RPI;
       else if (strTypeLowerCase == "cec")
         return PERIPHERAL_BUS_CEC;
+      else if (strTypeLowerCase == "addon")
+        return PERIPHERAL_BUS_ADDON;
+#ifdef TARGET_ANDROID
+      else if (strTypeLowerCase == "android")
+        return PERIPHERAL_BUS_ANDROID;
+#endif
 
       return PERIPHERAL_BUS_UNKNOWN;
     };

_service:download_url:master.tar.gz/xbmc/peripherals/Peripherals.cpp Changed

@@ -22,13 +22,20 @@
 
 #include <utility>
 
+#include "addons/PeripheralAddon.h"
+#include "addons/AddonButtonMap.h"
 #include "bus/PeripheralBus.h"
 #include "bus/PeripheralBusUSB.h"
+#if defined(TARGET_ANDROID)
+#include "bus/android/PeripheralBusAndroid.h"
+#endif
+#include "bus/virtual/PeripheralBusAddon.h"
 #include "devices/PeripheralBluetooth.h"
 #include "devices/PeripheralCecAdapter.h"
 #include "devices/PeripheralDisk.h"
 #include "devices/PeripheralHID.h"
 #include "devices/PeripheralImon.h"
+#include "devices/PeripheralJoystick.h"
 #include "devices/PeripheralNIC.h"
 #include "devices/PeripheralNyxboard.h"
 #include "devices/PeripheralTuner.h"
@@ -40,6 +47,7 @@
 #include "filesystem/Directory.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
+#include "guilib/WindowIDs.h"
 #include "GUIUserMessages.h"
 #include "input/Key.h"
 #include "messaging/ApplicationMessenger.h"
@@ -58,15 +66,17 @@
 #endif
 
 
+using namespace JOYSTICK;
 using namespace PERIPHERALS;
 using namespace XFILE;
 
-CPeripherals::CPeripherals(void)
+CPeripherals::CPeripherals() :
+  m_eventScanner(this)
 {
   Clear();
 }
 
-CPeripherals::~CPeripherals(void)
+CPeripherals::~CPeripherals()
 {
   Clear();
 }
@@ -77,59 +87,74 @@
   return peripheralsInstance;
 }
 
-void CPeripherals::Initialise(void)
+void CPeripherals::Initialise()
 {
   CSingleLock lock(m_critSection);
-  if (!m_bIsStarted)
-  {
-    m_bIsStarted = true;
+  if (m_bIsStarted)
+    return;
 
-    CDirectory::Create("special://profile/peripheral_data");
+  m_bIsStarted = true;
 
-    /* load mappings from peripherals.xml */
-    LoadMappings();
+  CDirectory::Create("special://profile/peripheral_data");
 
+  /* load mappings from peripherals.xml */
+  LoadMappings();
+
+  {
+    CSingleLock bussesLock(m_critSectionBusses);
 #if defined(HAVE_PERIPHERAL_BUS_USB)
-    m_busses.push_back(new CPeripheralBusUSB(this));
+    m_busses.push_back(std::make_shared<CPeripheralBusUSB>(this));
 #endif
 #if defined(HAVE_LIBCEC)
-    m_busses.push_back(new CPeripheralBusCEC(this));
+    m_busses.push_back(std::make_shared<CPeripheralBusCEC>(this));
+#endif
+    m_busses.push_back(std::make_shared<CPeripheralBusAddon>(this));
+#if defined(TARGET_ANDROID)
+    m_busses.push_back(std::make_shared<CPeripheralBusAndroid>(this));
 #endif
 
-    /* initialise all known busses */
-    for (int iBusPtr = (int)m_busses.size() - 1; iBusPtr >= 0; iBusPtr--)
+    /* initialise all known busses and run an initial scan for devices */
+    for (auto& bus : m_busses)
     {
-      if (!m_busses.at(iBusPtr)->Initialise())
-      {
-        CLog::Log(LOGERROR, "%s - failed to initialise bus %s", __FUNCTION__, PeripheralTypeTranslator::BusTypeToString(m_busses.at(iBusPtr)->Type()));
-        delete m_busses.at(iBusPtr);
-        m_busses.erase(m_busses.begin() + iBusPtr);
-      }
+      bus->Initialise();
+      bus->TriggerDeviceScan();
     }
-
-    m_bInitialised = true;
-    KODI::MESSAGING::CApplicationMessenger::GetInstance().RegisterReceiver(this);
   }
+
+  m_eventScanner.Start();
+
+  m_bInitialised = true;
+  KODI::MESSAGING::CApplicationMessenger::GetInstance().RegisterReceiver(this);
 }
 
-void CPeripherals::Clear(void)
+void CPeripherals::Clear()
 {
-  CSingleLock lock(m_critSection);
-  /* delete busses and devices */
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
-    delete m_busses.at(iBusPtr);
-  m_busses.clear();
+  m_eventScanner.Stop();
 
-  /* delete mappings */
-  for (unsigned int iMappingPtr = 0; iMappingPtr < m_mappings.size(); iMappingPtr++)
+  // avoid deadlocks by copying all busses into a temporary variable and destroying them from there
+  std::vector<PeripheralBusPtr> busses;
   {
-    std::map<std::string, PeripheralDeviceSetting> settings = m_mappings.at(iMappingPtr).m_settings;
-    for (std::map<std::string, PeripheralDeviceSetting>::iterator itr = settings.begin(); itr != settings.end(); ++itr)
-      delete itr->second.m_setting;
-    m_mappings.at(iMappingPtr).m_settings.clear();
+    CSingleLock bussesLock(m_critSectionBusses);
+    /* delete busses and devices */
+    busses = m_busses;
+    m_busses.clear();
   }
-  m_mappings.clear();
+  busses.clear();
 
+  {
+    CSingleLock mappingsLock(m_critSectionMappings);
+    /* delete mappings */
+    for (auto& mapping : m_mappings)
+    {
+      std::map<std::string, PeripheralDeviceSetting> settings = mapping.m_settings;
+      for (const auto& setting : mapping.m_settings)
+        delete setting.second.m_setting;
+      mapping.m_settings.clear();
+    }
+    m_mappings.clear();
+  }
+
+  CSingleLock lock(m_critSection);
   /* reset class state */
   m_bIsStarted   = false;
   m_bInitialised = false;
@@ -140,81 +165,85 @@
 
 void CPeripherals::TriggerDeviceScan(const PeripheralBusType type /* = PERIPHERAL_BUS_UNKNOWN */)
 {
-  CSingleLock lock(m_critSection);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
+  CSingleLock lock(m_critSectionBusses);
+  for (auto& bus : m_busses)
   {
-    if (type == PERIPHERAL_BUS_UNKNOWN || m_busses.at(iBusPtr)->Type() == type)
-    {
-      m_busses.at(iBusPtr)->TriggerDeviceScan();
-      if (type != PERIPHERAL_BUS_UNKNOWN)
-        break;
-    }
+    bool bScan = false;
+
+    if (type == PERIPHERAL_BUS_UNKNOWN)
+      bScan = true;
+    else if (bus->Type() == PERIPHERAL_BUS_ADDON)
+      bScan = true;
+    else if (bus->Type() == type)
+      bScan = true;
+
+    if (bScan)
+      bus->TriggerDeviceScan();
   }
 }
 
-CPeripheralBus *CPeripherals::GetBusByType(const PeripheralBusType type) const
+PeripheralBusPtr CPeripherals::GetBusByType(const PeripheralBusType type) const
 {
-  CSingleLock lock(m_critSection);
-  CPeripheralBus *bus(NULL);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
-  {
-    if (m_busses.at(iBusPtr)->Type() == type)
-    {
-      bus = m_busses.at(iBusPtr);
-      break;
-    }
-  }
+  CSingleLock lock(m_critSectionBusses);
+
+  const auto& bus = std::find_if(m_busses.cbegin(), m_busses.cend(),
+    [type](const PeripheralBusPtr& bus) {
+      return bus->Type() == type;
+    });
+  if (bus != m_busses.cend())
+    return *bus;
 
-  return bus;
+  return nullptr;
 }
 
 CPeripheral *CPeripherals::GetPeripheralAtLocation(const std::string &strLocation, PeripheralBusType busType /* = PERIPHERAL_BUS_UNKNOWN */) const
 {
-  CSingleLock lock(m_critSection);
-  CPeripheral *peripheral(NULL);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
+  CSingleLock lock(m_critSectionBusses);
+  for (const auto& bus : m_busses)
   {
     /* check whether the bus matches if a bus type other than unknown was passed */
-    if (busType != PERIPHERAL_BUS_UNKNOWN && m_busses.at(iBusPtr)->Type() != busType)
+    if (busType != PERIPHERAL_BUS_UNKNOWN && bus->Type() != busType)
       continue;
 
     /* return the first device that matches */
-    if ((peripheral = m_busses.at(iBusPtr)->GetPeripheral(strLocation)) != NULL)
-      break;
+    CPeripheral* peripheral = bus->GetPeripheral(strLocation);
+    if (peripheral != nullptr)
+      return peripheral;
   }
 
-  return peripheral;
+  return nullptr;
 }
 
 bool CPeripherals::HasPeripheralAtLocation(const std::string &strLocation, PeripheralBusType busType /* = PERIPHERAL_BUS_UNKNOWN */) const
 {
-  return (GetPeripheralAtLocation(strLocation, busType) != NULL);
+  return (GetPeripheralAtLocation(strLocation, busType) != nullptr);
 }
 
-CPeripheralBus *CPeripherals::GetBusWithDevice(const std::string &strLocation) const
+PeripheralBusPtr CPeripherals::GetBusWithDevice(const std::string &strLocation) const
 {
-  CSingleLock lock(m_critSection);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
-  {
-    /* return the first bus that matches */
-    if (m_busses.at(iBusPtr)->HasPeripheral(strLocation))
-      return m_busses.at(iBusPtr);
-  }
+  CSingleLock lock(m_critSectionBusses);
+
+  const auto& bus = std::find_if(m_busses.cbegin(), m_busses.cend(),
+    [&strLocation](const PeripheralBusPtr& bus) {
+    return bus->HasPeripheral(strLocation);
+  });
+  if (bus != m_busses.cend())
+    return *bus;
 
-  return NULL;
+  return nullptr;
 }
 
 int CPeripherals::GetPeripheralsWithFeature(std::vector<CPeripheral *> &results, const PeripheralFeature feature, PeripheralBusType busType /* = PERIPHERAL_BUS_UNKNOWN */) const
 {
-  CSingleLock lock(m_critSection);
+  CSingleLock lock(m_critSectionBusses);
   int iReturn(0);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
+  for (const auto& bus : m_busses)
   {
     /* check whether the bus matches if a bus type other than unknown was passed */
-    if (busType != PERIPHERAL_BUS_UNKNOWN && m_busses.at(iBusPtr)->Type() != busType)
+    if (busType != PERIPHERAL_BUS_UNKNOWN && bus->Type() != busType)
       continue;
 
-    iReturn += m_busses.at(iBusPtr)->GetPeripheralsWithFeature(results, feature);
+    iReturn += bus->GetPeripheralsWithFeature(results, feature);
   }
 
   return iReturn;
@@ -224,10 +253,8 @@
 {
   size_t iReturn(0);
   CSingleLock lock(m_critSection);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
-  {
-    iReturn += m_busses.at(iBusPtr)->GetNumberOfPeripherals();
-  }
+  for (const auto& bus : m_busses)
+    iReturn += bus->GetNumberOfPeripherals();
 
   return iReturn;
 }
@@ -240,48 +267,44 @@
 
 CPeripheral *CPeripherals::CreatePeripheral(CPeripheralBus &bus, const PeripheralScanResult& result)
 {
-  CPeripheral *peripheral = NULL;
+  CPeripheral *peripheral = nullptr;
   PeripheralScanResult mappedResult = result;
   if (mappedResult.m_busType == PERIPHERAL_BUS_UNKNOWN)
     mappedResult.m_busType = bus.Type();
 
   /* check whether there's something mapped in peripherals.xml */
-  if (!GetMappingForDevice(bus, mappedResult))
-  {
-    /* don't create instances for devices that aren't mapped in peripherals.xml */
-    return NULL;
-  }
+  GetMappingForDevice(bus, mappedResult);
 
   switch(mappedResult.m_mappedType)
   {
   case PERIPHERAL_HID:
-    peripheral = new CPeripheralHID(mappedResult);
+    peripheral = new CPeripheralHID(mappedResult, &bus);
     break;
 
   case PERIPHERAL_NIC:
-    peripheral = new CPeripheralNIC(mappedResult);
+    peripheral = new CPeripheralNIC(mappedResult, &bus);
     break;
 
   case PERIPHERAL_DISK:
-    peripheral = new CPeripheralDisk(mappedResult);
+    peripheral = new CPeripheralDisk(mappedResult, &bus);
     break;
 
   case PERIPHERAL_NYXBOARD:
-    peripheral = new CPeripheralNyxboard(mappedResult);
+    peripheral = new CPeripheralNyxboard(mappedResult, &bus);
     break;
 
   case PERIPHERAL_TUNER:
-    peripheral = new CPeripheralTuner(mappedResult);
+    peripheral = new CPeripheralTuner(mappedResult, &bus);
     break;
 
   case PERIPHERAL_BLUETOOTH:
-    peripheral = new CPeripheralBluetooth(mappedResult);
+    peripheral = new CPeripheralBluetooth(mappedResult, &bus);
     break;
 
   case PERIPHERAL_CEC:
 #if defined(HAVE_LIBCEC)
     if (bus.Type() == PERIPHERAL_BUS_CEC)
-      peripheral = new CPeripheralCecAdapter(mappedResult);
+      peripheral = new CPeripheralCecAdapter(mappedResult, &bus);
 #else
     if (!m_bMissingLibCecWarningDisplayed)
     {
@@ -293,7 +316,11 @@
     break;
 
   case PERIPHERAL_IMON:
-    peripheral = new CPeripheralImon(mappedResult);
+    peripheral = new CPeripheralImon(mappedResult, &bus);
+    break;
+
+  case PERIPHERAL_JOYSTICK:
+    peripheral = new CPeripheralJoystick(mappedResult, &bus);
     break;
 
   default:
@@ -305,14 +332,12 @@
     /* try to initialise the new peripheral
      * Initialise() will make sure that each device is only initialised once */
     if (peripheral->Initialise())
-    {
       bus.Register(peripheral);
-    }
     else
     {
       CLog::Log(LOGDEBUG, "%s - failed to initialise peripheral on '%s'", __FUNCTION__, mappedResult.m_strLocation.c_str());
       delete peripheral;
-      peripheral = NULL;
+      peripheral = nullptr;
     }
   }
 
@@ -346,20 +371,18 @@
 
 bool CPeripherals::GetMappingForDevice(const CPeripheralBus &bus, PeripheralScanResult& result) const
 {
+  CSingleLock lock(m_critSectionMappings);
+
   /* check all mappings in the order in which they are defined in peripherals.xml */
-  for (unsigned int iMappingPtr = 0; iMappingPtr < m_mappings.size(); iMappingPtr++)
+  for (const auto& mapping : m_mappings)
   {
-    PeripheralDeviceMapping mapping = m_mappings.at(iMappingPtr);
-
     bool bProductMatch = false;
     if (mapping.m_PeripheralID.empty())
-    {
       bProductMatch = true;
-    }
     else
     {
-      for (unsigned int i = 0; i < mapping.m_PeripheralID.size(); i++)
-        if (mapping.m_PeripheralID[i].m_iVendorId == result.m_iVendorId && mapping.m_PeripheralID[i].m_iProductId == result.m_iProductId)
+      for (const auto& peripheralID : mapping.m_PeripheralID)
+        if (peripheralID.m_iVendorId == result.m_iVendorId && peripheralID.m_iProductId == result.m_iProductId)
           bProductMatch = true;
     }
 
@@ -372,8 +395,8 @@
       PeripheralTypeTranslator::FormatHexString(result.m_iVendorId, strVendorId);
       PeripheralTypeTranslator::FormatHexString(result.m_iProductId, strProductId);
       CLog::Log(LOGDEBUG, "%s - device (%s:%s) mapped to %s (type = %s)", __FUNCTION__, strVendorId.c_str(), strProductId.c_str(), mapping.m_strDeviceName.c_str(), PeripheralTypeTranslator::TypeToString(mapping.m_mappedTo));
-      result.m_mappedType    = m_mappings[iMappingPtr].m_mappedTo;
-      result.m_strDeviceName = m_mappings[iMappingPtr].m_strDeviceName;
+      result.m_mappedType    = mapping.m_mappedTo;
+      result.m_strDeviceName = mapping.m_strDeviceName;
       return true;
     }
   }
@@ -383,37 +406,37 @@
 
 void CPeripherals::GetSettingsFromMapping(CPeripheral &peripheral) const
 {
+  CSingleLock lock(m_critSectionMappings);
+
   /* check all mappings in the order in which they are defined in peripherals.xml */
-  for (unsigned int iMappingPtr = 0; iMappingPtr < m_mappings.size(); iMappingPtr++)
+  for (const auto& mapping : m_mappings)
   {
-    const PeripheralDeviceMapping *mapping = &m_mappings.at(iMappingPtr);
-
     bool bProductMatch = false;
-    if (mapping->m_PeripheralID.empty())
-    {
+    if (mapping.m_PeripheralID.empty())
       bProductMatch = true;
-    }
     else
     {
-      for (unsigned int i = 0; i < mapping->m_PeripheralID.size(); i++)
-        if (mapping->m_PeripheralID[i].m_iVendorId == peripheral.VendorId() && mapping->m_PeripheralID[i].m_iProductId == peripheral.ProductId())
+      for (const auto& peripheralID : mapping.m_PeripheralID)
+        if (peripheralID.m_iVendorId == peripheral.VendorId() && peripheralID.m_iProductId == peripheral.ProductId())
           bProductMatch = true;
     }
 
-    bool bBusMatch = (mapping->m_busType == PERIPHERAL_BUS_UNKNOWN || mapping->m_busType == peripheral.GetBusType());
-    bool bClassMatch = (mapping->m_class == PERIPHERAL_UNKNOWN || mapping->m_class == peripheral.Type());
+    bool bBusMatch = (mapping.m_busType == PERIPHERAL_BUS_UNKNOWN || mapping.m_busType == peripheral.GetBusType());
+    bool bClassMatch = (mapping.m_class == PERIPHERAL_UNKNOWN || mapping.m_class == peripheral.Type());
 
     if (bBusMatch && bProductMatch && bClassMatch)
     {
-      for (std::map<std::string, PeripheralDeviceSetting>::const_iterator itr = mapping->m_settings.begin(); itr != mapping->m_settings.end(); ++itr)
+      for (auto itr = mapping.m_settings.begin(); itr != mapping.m_settings.end(); ++itr)
         peripheral.AddSetting((*itr).first, (*itr).second.m_setting, (*itr).second.m_order);
     }
   }
 }
 
 #define SS(x) ((x) ? x : "")
-bool CPeripherals::LoadMappings(void)
+bool CPeripherals::LoadMappings()
 {
+  CSingleLock lock(m_critSectionMappings);
+
   CXBMCTinyXML xmlDoc;
   if (!xmlDoc.LoadFile("special://xbmc/system/peripherals.xml"))
   {
@@ -440,9 +463,9 @@
     {
       // The vendor_product attribute is a list of comma separated vendor:product pairs
       std::vector<std::string> vpArray = StringUtils::Split(currentNode->Attribute("vendor_product"), ",");
-      for (std::vector<std::string>::const_iterator i = vpArray.begin(); i != vpArray.end(); ++i)
+      for (const auto& i : vpArray)
       {
-        std::vector<std::string> idArray = StringUtils::Split(*i, ":");
+        std::vector<std::string> idArray = StringUtils::Split(i, ":");
         if (idArray.size() != 2)
         {
           CLog::Log(LOGERROR, "%s - ignoring node \"%s\" with invalid vendor_product attribute", __FUNCTION__, mapping.m_strDeviceName.c_str());
@@ -474,7 +497,7 @@
 
   while (currentNode)
   {
-    CSetting *setting = NULL;
+    CSetting *setting = nullptr;
     std::string strKey = XMLUtils::GetAttribute(currentNode, "key");
     if (strKey.empty())
       continue;
@@ -550,10 +573,10 @@
   }
 
   /* add the settings without an order attribute or an invalid order attribute set at the end */
-  for (std::map<std::string, PeripheralDeviceSetting>::iterator it = settings.begin(); it != settings.end(); ++it)
+  for (auto& it : settings)
   {
-    if (it->second.m_order == 0)
-      it->second.m_order = ++iMaxOrder;
+    if (it.second.m_order == 0)
+      it.second.m_order = ++iMaxOrder;
   }
 }
 
@@ -565,31 +588,31 @@
   std::string strPathCut = strPath.substr(14);
   std::string strBus = strPathCut.substr(0, strPathCut.find('/'));
 
-  CSingleLock lock(m_critSection);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
+  CSingleLock lock(m_critSectionBusses);
+  for (const auto& bus : m_busses)
   {
     if (StringUtils::EqualsNoCase(strBus, "all") ||
-        StringUtils::EqualsNoCase(strBus, PeripheralTypeTranslator::BusTypeToString(m_busses.at(iBusPtr)->Type())))
-      m_busses.at(iBusPtr)->GetDirectory(strPath, items);
+        StringUtils::EqualsNoCase(strBus, PeripheralTypeTranslator::BusTypeToString(bus->Type())))
+      bus->GetDirectory(strPath, items);
   }
 }
 
 CPeripheral *CPeripherals::GetByPath(const std::string &strPath) const
 {
   if (!StringUtils::StartsWithNoCase(strPath, "peripherals://"))
-    return NULL;
+    return nullptr;
 
   std::string strPathCut = strPath.substr(14);
   std::string strBus = strPathCut.substr(0, strPathCut.find('/'));
 
-  CSingleLock lock(m_critSection);
-  for (unsigned int iBusPtr = 0; iBusPtr < m_busses.size(); iBusPtr++)
+  CSingleLock lock(m_critSectionBusses);
+  for (const auto& bus : m_busses)
   {
-    if (StringUtils::EqualsNoCase(strBus, PeripheralTypeTranslator::BusTypeToString(m_busses.at(iBusPtr)->Type())))
-      return m_busses.at(iBusPtr)->GetByPath(strPath);
+    if (StringUtils::EqualsNoCase(strBus, PeripheralTypeTranslator::BusTypeToString(bus->Type())))
+      return bus->GetByPath(strPath);
   }
 
-  return NULL;
+  return nullptr;
 }
 
 bool CPeripherals::OnAction(const CAction &action)
@@ -604,9 +627,9 @@
     std::vector<CPeripheral *> peripherals;
     if (GetPeripheralsWithFeature(peripherals, FEATURE_CEC))
     {
-      for (unsigned int iPeripheralPtr = 0; iPeripheralPtr < peripherals.size(); iPeripheralPtr++)
+      for (auto& peripheral : peripherals)
       {
-        CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
+        CPeripheralCecAdapter *cecDevice = reinterpret_cast<CPeripheralCecAdapter*>(peripheral);
         if (cecDevice && cecDevice->HasAudioControl())
         {
           if (action.GetID() == ACTION_VOLUME_UP)
@@ -622,14 +645,14 @@
   return false;
 }
 
-bool CPeripherals::IsMuted(void)
+bool CPeripherals::IsMuted()
 {
   std::vector<CPeripheral *> peripherals;
   if (SupportsCEC() && GetPeripheralsWithFeature(peripherals, FEATURE_CEC))
   {
-    for (unsigned int iPeripheralPtr = 0; iPeripheralPtr < peripherals.size(); iPeripheralPtr++)
+    for (const auto& peripheral : peripherals)
     {
-      CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
+      CPeripheralCecAdapter *cecDevice = reinterpret_cast<CPeripheralCecAdapter*>(peripheral);
       if (cecDevice && cecDevice->IsMuted())
         return true;
     }
@@ -638,14 +661,14 @@
   return false;
 }
 
-bool CPeripherals::ToggleMute(void)
+bool CPeripherals::ToggleMute()
 {
   std::vector<CPeripheral *> peripherals;
   if (SupportsCEC() && GetPeripheralsWithFeature(peripherals, FEATURE_CEC))
   {
-    for (unsigned int iPeripheralPtr = 0; iPeripheralPtr < peripherals.size(); iPeripheralPtr++)
+    for (auto& peripheral : peripherals)
     {
-      CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
+      CPeripheralCecAdapter *cecDevice = reinterpret_cast<CPeripheralCecAdapter*>(peripheral);
       if (cecDevice && cecDevice->HasAudioControl())
       {
         cecDevice->ToggleMute();
@@ -664,9 +687,9 @@
 
   if (SupportsCEC() && GetPeripheralsWithFeature(peripherals, FEATURE_CEC))
   {
-    for (unsigned int iPeripheralPtr = iPeripheral; iPeripheralPtr < peripherals.size(); iPeripheralPtr++)
+    for (auto& peripheral : peripherals)
     {
-      CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
+      CPeripheralCecAdapter *cecDevice = reinterpret_cast<CPeripheralCecAdapter*>(peripheral);
       if (cecDevice)
         ret = cecDevice->ToggleDeviceState(mode);
       if (iPeripheral)
@@ -682,9 +705,9 @@
   std::vector<CPeripheral *> peripherals;
   if (SupportsCEC() && GetPeripheralsWithFeature(peripherals, FEATURE_CEC))
   {
-    for (unsigned int iPeripheralPtr = 0; iPeripheralPtr < peripherals.size(); iPeripheralPtr++)
+    for (auto& peripheral : peripherals)
     {
-      CPeripheralCecAdapter *cecDevice = (CPeripheralCecAdapter *) peripherals.at(iPeripheralPtr);
+      CPeripheralCecAdapter *cecDevice = reinterpret_cast<CPeripheralCecAdapter*>(peripheral);
       if (cecDevice && cecDevice->GetButton())
       {
         CKey newKey(cecDevice->GetButton(), cecDevice->GetHoldTime());
@@ -698,9 +721,82 @@
   return false;
 }
 
+void CPeripherals::ProcessEvents(void)
+{
+  std::vector<PeripheralBusPtr> busses;
+  {
+    CSingleLock lock(m_critSection);
+    busses = m_busses;
+  }
+
+  for (PeripheralBusPtr& bus : busses)
+    bus->ProcessEvents();
+}
+
+PeripheralAddonPtr CPeripherals::GetAddon(const CPeripheral* device)
+{
+  PeripheralAddonPtr addon;
+
+  PeripheralBusAddonPtr addonBus = std::static_pointer_cast<CPeripheralBusAddon>(GetBusByType(PERIPHERAL_BUS_ADDON));
+  if (device && addonBus)
+  {
+    PeripheralBusType busType = device->GetBusType();
+
+    if (busType == PERIPHERAL_BUS_ADDON)
+    {
+      // If device is from an add-on, use that add-on
+      unsigned int index;
+      addonBus->SplitLocation(device->Location(), addon, index);
+    }
+    else
+    {
+      // Otherwise, have the add-on bus find a suitable add-on
+      addonBus->GetAddonWithButtonMap(device, addon);
+    }
+  }
+
+  return addon;
+}
+
+void CPeripherals::ResetButtonMaps(const std::string& controllerId)
+{
+  PeripheralBusAddonPtr addonBus = std::static_pointer_cast<CPeripheralBusAddon>(GetBusByType(PERIPHERAL_BUS_ADDON));
+
+  std::vector<CPeripheral*> peripherals;
+  GetPeripheralsWithFeature(peripherals, FEATURE_JOYSTICK);
+
+  for (auto& peripheral : peripherals)
+  {
+    PeripheralAddonPtr addon;
+    if (addonBus->GetAddonWithButtonMap(peripheral, addon))
+    {
+      CAddonButtonMap buttonMap(peripheral, addon, controllerId);
+      buttonMap.Reset();
+    }
+  }
+}
+
+void CPeripherals::RegisterJoystickButtonMapper(IButtonMapper* mapper)
+{
+  std::vector<CPeripheral*> peripherals;
+  GetPeripheralsWithFeature(peripherals, FEATURE_JOYSTICK);
+
+  for (auto& peripheral : peripherals)
+    peripheral->RegisterJoystickButtonMapper(mapper);
+}
+
+void CPeripherals::UnregisterJoystickButtonMapper(IButtonMapper* mapper)
+{
+  std::vector<CPeripheral*> peripherals;
+  GetPeripheralsWithFeature(peripherals, FEATURE_JOYSTICK);
+
+  for (auto& peripheral : peripherals)
+    peripheral->UnregisterJoystickButtonMapper(mapper);
+}
+
 void CPeripherals::OnSettingChanged(const CSetting *setting)
 {
-  if (setting == NULL)
+  if (setting == nullptr)
     return;
 
   const std::string &settingId = setting->GetId();
@@ -710,21 +806,20 @@
     std::vector<CPeripheral *> cecDevices;
     if (GetPeripheralsWithFeature(cecDevices, FEATURE_CEC) > 0)
     {
-      for (std::vector<CPeripheral *>::iterator it = cecDevices.begin(); it != cecDevices.end(); ++it)
-        (*it)->SetSetting("use_tv_menu_language", false);
+      for (auto& cecDevice : cecDevices)
+        cecDevice->SetSetting("use_tv_menu_language", false);
     }
   }
 }
 
 void CPeripherals::OnSettingAction(const CSetting *setting)
 {
-  if (setting == NULL)
+  if (setting == nullptr)
     return;
 
   const std::string &settingId = setting->GetId();
   if (settingId == CSettings::SETTING_INPUT_PERIPHERALS)
   {
-
     CGUIDialogSelect* pDialog = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
 
     CFileItemList items;
@@ -773,6 +868,8 @@
       }
     } while (pDialog->IsConfirmed());
   }
+  else if (settingId == CSettings::SETTING_INPUT_CONTROLLERCONFIG)
+    g_windowManager.ActivateWindow(WINDOW_DIALOG_GAME_CONTROLLERS);
 }
 
 void CPeripherals::OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg)

_service:download_url:master.tar.gz/xbmc/peripherals/Peripherals.h Changed

@@ -19,6 +19,7 @@
  *
  */
 
+#include "EventScanner.h"
 #include "bus/PeripheralBus.h"
 #include "devices/Peripheral.h"
 #include "messaging/IMessageTarget.h"
@@ -35,27 +36,33 @@
 class CAction;
 class CKey;
 
+namespace JOYSTICK
+{
+  class IButtonMapper;
+}
+
 namespace PERIPHERALS
 {
   #define g_peripherals CPeripherals::GetInstance()
 
   class CPeripherals :  public ISettingCallback,
                         public Observable,
-                        public KODI::MESSAGING::IMessageTarget
+                        public KODI::MESSAGING::IMessageTarget,
+                        public IEventScannerCallback
   {
   public:
     static CPeripherals &GetInstance();
-    virtual ~CPeripherals(void);
+    virtual ~CPeripherals();
 
     /*!
      * @brief Initialise the peripherals manager.
      */
-    virtual void Initialise(void);
+    virtual void Initialise();
 
     /*!
      * @brief Clear all data known by the peripherals manager.
      */
-    virtual void Clear(void);
+    virtual void Clear();
 
     /*!
      * @brief Get the instance of the peripheral at the given location.
@@ -78,7 +85,7 @@
      * @param strLocation The location.
      * @return The bus or NULL if no device was found.
      */
-    virtual CPeripheralBus *GetBusWithDevice(const std::string &strLocation) const;
+    virtual PeripheralBusPtr GetBusWithDevice(const std::string &strLocation) const;
 
     /*!
      * @brief Get all peripheral instances that have the given feature.
@@ -137,7 +144,7 @@
      * @param type The bus type.
      * @return The bus or NULL if it wasn't found.
      */
-    virtual CPeripheralBus *GetBusByType(const PeripheralBusType type) const;
+    virtual PeripheralBusPtr GetBusByType(const PeripheralBusType type) const;
 
     /*!
      * @brief Get all fileitems for a path.
@@ -164,13 +171,13 @@
      * @brief Check whether there's a peripheral that reports to be muted.
      * @return True when at least one peripheral reports to be muted, false otherwise.
      */
-    virtual bool IsMuted(void);
+    virtual bool IsMuted();
 
     /*!
      * @brief Try to toggle the mute status via a peripheral.
      * @return True when this change was handled by a peripheral (and should not be handled by anything else), false otherwise.
      */
-    virtual bool ToggleMute(void);
+    virtual bool ToggleMute();
 
     /*!
      * @brief Try to toggle the playing device state via a peripheral.
@@ -184,13 +191,13 @@
      * @brief Try to mute the audio via a peripheral.
      * @return True when this change was handled by a peripheral (and should not be handled by anything else), false otherwise.
      */
-    virtual bool Mute(void) { return ToggleMute(); } // TODO CEC only supports toggling the mute status at this time
+    virtual bool Mute() { return ToggleMute(); } // TODO CEC only supports toggling the mute status at this time
 
     /*!
      * @brief Try to unmute the audio via a peripheral.
      * @return True when this change was handled by a peripheral (and should not be handled by anything else), false otherwise.
      */
-    virtual bool UnMute(void) { return ToggleMute(); } // TODO CEC only supports toggling the mute status at this time
+    virtual bool UnMute() { return ToggleMute(); } // TODO CEC only supports toggling the mute status at this time
 
     /*!
      * @brief Try to get a keypress from a peripheral.
@@ -200,7 +207,14 @@
      */
     virtual bool GetNextKeypress(float frameTime, CKey &key);
 
-    bool SupportsCEC(void) const
+    /*!
+     * @brief Request event scan rate
+     * @brief rateHz The rate in Hz
+     * @return A handle that unsets its rate when expired
+     */
+    EventRateHandle SetEventScanRate(float rateHz) { return m_eventScanner.SetRate(rateHz); }
+
+    bool SupportsCEC() const
     {
 #if defined(HAVE_LIBCEC)
       return true;
@@ -208,7 +222,17 @@
       return false;
 #endif
     }
-    
+
+    // implementation of IEventScannerCallback
+    virtual void ProcessEvents(void) override;
+
+    virtual PeripheralAddonPtr GetAddon(const CPeripheral* device);
+
+    virtual void ResetButtonMaps(const std::string& controllerId);
+
+    void RegisterJoystickButtonMapper(JOYSTICK::IButtonMapper* mapper);
+    void UnregisterJoystickButtonMapper(JOYSTICK::IButtonMapper* mapper);
+
     virtual void OnSettingChanged(const CSetting *setting) override;
     virtual void OnSettingAction(const CSetting *setting) override;
 
@@ -216,8 +240,8 @@
     virtual int GetMessageMask() override;
 
   private:
-    CPeripherals(void);
-    bool LoadMappings(void);
+    CPeripherals();
+    bool LoadMappings();
     bool GetMappingForDevice(const CPeripheralBus &bus, PeripheralScanResult& result) const;
     static void GetSettingsFromMappingsFile(TiXmlElement *xmlNode, std::map<std::string, PeripheralDeviceSetting> &m_settings);
 
@@ -228,8 +252,11 @@
 #if !defined(HAVE_LIBCEC)
     bool                                 m_bMissingLibCecWarningDisplayed;
 #endif
-    std::vector<CPeripheralBus *>        m_busses;
+    std::vector<PeripheralBusPtr>        m_busses;
     std::vector<PeripheralDeviceMapping> m_mappings;
+    CEventScanner                        m_eventScanner;
     CCriticalSection                     m_critSection;
+    CCriticalSection                     m_critSectionBusses;
+    CCriticalSection                     m_critSectionMappings;
   };
 }

_service:download_url:master.tar.gz/xbmc/peripherals/addons Added

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.cpp Added

@@ -0,0 +1,452 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonButtonMap.h"
+#include "PeripheralAddonTranslator.h"
+#include "input/joysticks/JoystickUtils.h"
+#include "peripherals/devices/Peripheral.h"
+#include "utils/log.h"
+
+#include <assert.h>
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+
+CAddonButtonMap::CAddonButtonMap(CPeripheral* device, const std::weak_ptr<CPeripheralAddon>& addon, const std::string& strControllerId)
+  : m_device(device),
+    m_addon(addon),
+    m_strControllerId(strControllerId)
+{
+  auto peripheralAddon = m_addon.lock();
+  assert(peripheralAddon != nullptr);
+
+  peripheralAddon->RegisterButtonMap(device, this);
+}
+
+CAddonButtonMap::~CAddonButtonMap(void)
+{
+  if (auto addon = m_addon.lock())
+    addon->UnregisterButtonMap(this);
+}
+
+bool CAddonButtonMap::Load(void)
+{
+  m_features.clear();
+  m_driverMap.clear();
+
+  bool bSuccess = false;
+  if (auto addon = m_addon.lock())
+    bSuccess = addon->GetFeatures(m_device, m_strControllerId, m_features);
+
+  // GetFeatures() was changed to always return false if no features were
+  // retrieved. Check here, just in case its contract is changed or violated in
+  // the future.
+  if (bSuccess && m_features.empty())
+    bSuccess = false;
+
+  if (bSuccess)
+    m_driverMap = CreateLookupTable(m_features);
+  else
+    CLog::Log(LOGDEBUG, "Failed to load button map for \"%s\"", m_device->DeviceName().c_str());
+
+  return true;
+}
+
+void CAddonButtonMap::Reset(void)
+{
+  if (auto addon = m_addon.lock())
+    addon->ResetButtonMap(m_device, m_strControllerId);
+}
+
+bool CAddonButtonMap::GetFeature(const CDriverPrimitive& primitive, FeatureName& feature)
+{
+  DriverMap::const_iterator it = m_driverMap.find(primitive);
+  if (it != m_driverMap.end())
+  {
+    feature = it->second;
+    return true;
+  }
+
+  return false;
+}
+
+FEATURE_TYPE CAddonButtonMap::GetFeatureType(const FeatureName& feature)
+{
+  FEATURE_TYPE type = FEATURE_TYPE::UNKNOWN;
+
+  FeatureMap::const_iterator it = m_features.find(feature);
+  if (it != m_features.end())
+    type = CPeripheralAddonTranslator::TranslateFeatureType(it->second.Type());
+
+  return type;
+}
+
+bool CAddonButtonMap::GetScalar(const FeatureName& feature, CDriverPrimitive& primitive)
+{
+  bool retVal(false);
+
+  FeatureMap::const_iterator it = m_features.find(feature);
+  if (it != m_features.end())
+  {
+    const ADDON::JoystickFeature& addonFeature = it->second;
+
+    if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_SCALAR)
+    {
+      primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive());
+      retVal = true;
+    }
+  }
+
+  return retVal;
+}
+
+bool CAddonButtonMap::AddScalar(const FeatureName& feature, const CDriverPrimitive& primitive)
+{
+  if (!primitive.IsValid())
+  {
+    FeatureMap::iterator it = m_features.find(feature);
+    if (it != m_features.end())
+      m_features.erase(it);
+  }
+  else
+  {
+    UnmapPrimitive(primitive);
+
+    ADDON::JoystickFeature scalar(feature, JOYSTICK_FEATURE_TYPE_SCALAR);
+    scalar.SetPrimitive(CPeripheralAddonTranslator::TranslatePrimitive(primitive));
+
+    m_features[feature] = scalar;
+  }
+
+  m_driverMap = CreateLookupTable(m_features);
+
+  if (auto addon = m_addon.lock())
+    return addon->MapFeatures(m_device, m_strControllerId, m_features);
+
+  return false;
+}
+
+bool CAddonButtonMap::GetAnalogStick(const FeatureName& feature,
+                                             CDriverPrimitive& up,
+                                             CDriverPrimitive& down,
+                                             CDriverPrimitive& right,
+                                             CDriverPrimitive& left)
+{
+  bool retVal(false);
+
+  FeatureMap::const_iterator it = m_features.find(feature);
+  if (it != m_features.end())
+  {
+    const ADDON::JoystickFeature& addonFeature = it->second;
+
+    if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_ANALOG_STICK)
+    {
+      up     = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Up());
+      down   = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Down());
+      right  = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Right());
+      left   = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Left());
+      retVal = true;
+    }
+  }
+
+  return retVal;
+}
+
+bool CAddonButtonMap::AddAnalogStick(const FeatureName& feature,
+                                             const CDriverPrimitive& up,
+                                             const CDriverPrimitive& down,
+                                             const CDriverPrimitive& right,
+                                             const CDriverPrimitive& left)
+{
+  if (!up.IsValid() && !down.IsValid() && !right.IsValid() && !left.IsValid())
+  {
+    FeatureMap::iterator it = m_features.find(feature);
+    if (it != m_features.end())
+      m_features.erase(it);
+  }
+  else
+  {
+    ADDON::JoystickFeature analogStick(feature, JOYSTICK_FEATURE_TYPE_ANALOG_STICK);
+
+    if (up.IsValid())
+    {
+      UnmapPrimitive(up);
+      analogStick.SetUp(CPeripheralAddonTranslator::TranslatePrimitive(up));
+    }
+    if (down.IsValid())
+    {
+      UnmapPrimitive(down);
+      analogStick.SetDown(CPeripheralAddonTranslator::TranslatePrimitive(down));
+    }
+    if (right.IsValid())
+    {
+      UnmapPrimitive(right);
+      analogStick.SetRight(CPeripheralAddonTranslator::TranslatePrimitive(right));
+    }
+    if (left.IsValid())
+    {
+      UnmapPrimitive(left);
+      analogStick.SetLeft(CPeripheralAddonTranslator::TranslatePrimitive(left));
+    }
+
+    m_features[feature] = analogStick;
+  }
+
+  m_driverMap = CreateLookupTable(m_features);
+
+  if (auto addon = m_addon.lock())
+    return addon->MapFeatures(m_device, m_strControllerId, m_features);
+
+  return false;
+}
+
+bool CAddonButtonMap::GetAccelerometer(const FeatureName& feature,
+                                               CDriverPrimitive& positiveX,
+                                               CDriverPrimitive& positiveY,
+                                               CDriverPrimitive& positiveZ)
+{
+  bool retVal(false);
+
+  FeatureMap::const_iterator it = m_features.find(feature);
+  if (it != m_features.end())
+  {
+    const ADDON::JoystickFeature& addonFeature = it->second;
+
+    if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_ACCELEROMETER)
+    {
+      positiveX = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.PositiveX());
+      positiveY = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.PositiveY());
+      positiveZ = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.PositiveZ());
+      retVal    = true;
+    }
+  }
+
+  return retVal;
+}
+
+bool CAddonButtonMap::AddAccelerometer(const FeatureName& feature,
+                                               const CDriverPrimitive& positiveX,
+                                               const CDriverPrimitive& positiveY,
+                                               const CDriverPrimitive& positiveZ)
+{
+  if (positiveX.IsValid() && positiveY.IsValid() && positiveZ.IsValid())
+  {
+    FeatureMap::iterator it = m_features.find(feature);
+    if (it != m_features.end())
+      m_features.erase(it);
+  }
+  else
+  {
+    ADDON::JoystickFeature accelerometer(feature, JOYSTICK_FEATURE_TYPE_ACCELEROMETER);
+
+    if (positiveX.IsValid())
+    {
+      UnmapPrimitive(positiveX);
+      accelerometer.SetPositiveX(CPeripheralAddonTranslator::TranslatePrimitive(positiveX));
+    }
+    if (positiveY.IsValid())
+    {
+      UnmapPrimitive(positiveY);
+      accelerometer.SetPositiveY(CPeripheralAddonTranslator::TranslatePrimitive(positiveY));
+    }
+    if (positiveZ.IsValid())
+    {
+      UnmapPrimitive(positiveZ);
+      accelerometer.SetPositiveZ(CPeripheralAddonTranslator::TranslatePrimitive(positiveZ));
+    }
+
+    // TODO: Unmap complementary semiaxes
+
+    m_features[feature] = accelerometer;
+  }
+
+  m_driverMap = CreateLookupTable(m_features);
+
+  if (auto addon = m_addon.lock())
+    return addon->MapFeatures(m_device, m_strControllerId, m_features);
+
+  return false;
+}
+
+CAddonButtonMap::DriverMap CAddonButtonMap::CreateLookupTable(const FeatureMap& features)
+{
+  DriverMap driverMap;
+
+  for (FeatureMap::const_iterator it = features.begin(); it != features.end(); ++it)
+  {
+    const ADDON::JoystickFeature& feature = it->second;
+
+    switch (feature.Type())
+    {
+      case JOYSTICK_FEATURE_TYPE_SCALAR:
+      {
+        driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Primitive())] = it->first;
+        break;
+      }
+
+      case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:
+      {
+        driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Up())] = it->first;
+        driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Down())] = it->first;
+        driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Right())] = it->first;
+        driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Left())] = it->first;
+        break;
+      }
+
+      case JOYSTICK_FEATURE_TYPE_ACCELEROMETER:
+      {
+        CDriverPrimitive x_axis(CPeripheralAddonTranslator::TranslatePrimitive(feature.PositiveX()));
+        CDriverPrimitive y_axis(CPeripheralAddonTranslator::TranslatePrimitive(feature.PositiveY()));
+        CDriverPrimitive z_axis(CPeripheralAddonTranslator::TranslatePrimitive(feature.PositiveZ()));
+
+        driverMap[x_axis] = it->first;
+        driverMap[y_axis] = it->first;
+        driverMap[z_axis] = it->first;
+
+        CDriverPrimitive x_axis_opposite(x_axis.Index(), x_axis.SemiAxisDirection() * -1);
+        CDriverPrimitive y_axis_opposite(y_axis.Index(), y_axis.SemiAxisDirection() * -1);
+        CDriverPrimitive z_axis_opposite(z_axis.Index(), z_axis.SemiAxisDirection() * -1);
+
+        driverMap[x_axis_opposite] = it->first;
+        driverMap[y_axis_opposite] = it->first;
+        driverMap[z_axis_opposite] = it->first;
+        break;
+      }
+        
+      default:
+        break;
+    }
+  }
+  
+  return driverMap;
+}
+
+bool CAddonButtonMap::UnmapPrimitive(const CDriverPrimitive& primitive)
+{
+  bool bModified = false;
+
+  DriverMap::iterator it = m_driverMap.find(primitive);
+  if (it != m_driverMap.end())
+  {
+    const FeatureName& featureName = it->second;
+    FeatureMap::iterator itFeature = m_features.find(featureName);
+    if (itFeature != m_features.end())
+    {
+      ADDON::JoystickFeature& addonFeature = itFeature->second;
+      ResetPrimitive(addonFeature, CPeripheralAddonTranslator::TranslatePrimitive(primitive));
+      if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_UNKNOWN)
+        m_features.erase(itFeature);
+      bModified = true;
+    }
+  }
+
+  return bModified;
+}
+
+bool CAddonButtonMap::ResetPrimitive(ADDON::JoystickFeature& feature, const ADDON::DriverPrimitive& primitive)
+{
+  bool bModified = false;
+
+  switch (feature.Type())
+  {
+    case JOYSTICK_FEATURE_TYPE_SCALAR:
+    {
+      if (primitive == feature.Primitive())
+      {
+        CLog::Log(LOGDEBUG, "Removing \"%s\" from button map due to conflict", feature.Name().c_str());
+        feature.SetType(JOYSTICK_FEATURE_TYPE_UNKNOWN);
+        bModified = true;
+      }
+      break;
+    }
+    case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:
+    {
+      if (primitive == feature.Up())
+      {
+        feature.SetUp(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+      else if (primitive == feature.Down())
+      {
+        feature.SetDown(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+      else if (primitive == feature.Right())
+      {
+        feature.SetRight(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+      else if (primitive == feature.Left())
+      {
+        feature.SetLeft(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+
+      if (bModified)
+      {
+        if (feature.Up().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN &&
+            feature.Down().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN &&
+            feature.Right().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN &&
+            feature.Left().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN)
+        {
+          CLog::Log(LOGDEBUG, "Removing \"%s\" from button map due to conflict", feature.Name().c_str());
+          feature.SetType(JOYSTICK_FEATURE_TYPE_UNKNOWN);
+        }
+      }
+      break;
+    }
+    case JOYSTICK_FEATURE_TYPE_ACCELEROMETER:
+    {
+      if (primitive == feature.PositiveX() ||
+          primitive == CPeripheralAddonTranslator::Opposite(feature.PositiveX()))
+      {
+        feature.SetPositiveX(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+      else if (primitive == feature.PositiveY() ||
+               primitive == CPeripheralAddonTranslator::Opposite(feature.PositiveY()))
+      {
+        feature.SetPositiveY(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+      else if (primitive == feature.PositiveZ() ||
+               primitive == CPeripheralAddonTranslator::Opposite(feature.PositiveZ()))
+      {
+        feature.SetPositiveZ(ADDON::DriverPrimitive());
+        bModified = true;
+      }
+
+      if (bModified)
+      {
+        if (feature.PositiveX().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN &&
+            feature.PositiveY().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN &&
+            feature.PositiveZ().Type() == JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN)
+        {
+          CLog::Log(LOGDEBUG, "Removing \"%s\" from button map due to conflict", feature.Name().c_str());
+          feature.SetType(JOYSTICK_FEATURE_TYPE_UNKNOWN);
+        }
+      }
+      break;
+    }
+    default:
+      break;
+  }
+  return bModified;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.h Added

@@ -0,0 +1,112 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "PeripheralAddon.h" // for FeatureMap
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMap.h"
+#include "input/joysticks/JoystickTypes.h"
+#include "peripherals/PeripheralTypes.h"
+
+namespace PERIPHERALS
+{
+  class CPeripheral;
+
+  class CAddonButtonMap : public JOYSTICK::IButtonMap
+  {
+  public:
+    CAddonButtonMap(CPeripheral* device, const std::weak_ptr<CPeripheralAddon>& addon, const std::string& strControllerId);
+
+    virtual ~CAddonButtonMap(void);
+
+    // Implementation of IButtonMap
+    virtual std::string ControllerID(void) const override { return m_strControllerId; }
+
+    virtual bool Load(void) override;
+
+    virtual void Reset(void) override;
+
+    virtual bool GetFeature(
+      const JOYSTICK::CDriverPrimitive& primitive,
+      JOYSTICK::FeatureName& feature
+    ) override;
+
+    virtual JOYSTICK::FEATURE_TYPE GetFeatureType(
+      const JOYSTICK::FeatureName& feature
+    ) override;
+
+    virtual bool GetScalar(
+      const JOYSTICK::FeatureName& feature,
+      JOYSTICK::CDriverPrimitive& primitive
+    ) override;
+
+    virtual bool AddScalar(
+      const JOYSTICK::FeatureName& feature,
+      const JOYSTICK::CDriverPrimitive& primitive
+    ) override;
+
+    virtual bool GetAnalogStick(
+      const JOYSTICK::FeatureName& feature,
+      JOYSTICK::CDriverPrimitive& up,
+      JOYSTICK::CDriverPrimitive& down,
+      JOYSTICK::CDriverPrimitive& right,
+      JOYSTICK::CDriverPrimitive& left
+    ) override;
+
+    virtual bool AddAnalogStick(
+      const JOYSTICK::FeatureName& feature,
+      const JOYSTICK::CDriverPrimitive& up,
+      const JOYSTICK::CDriverPrimitive& down,
+      const JOYSTICK::CDriverPrimitive& right,
+      const JOYSTICK::CDriverPrimitive& left
+    ) override;
+
+    virtual bool GetAccelerometer(
+      const JOYSTICK::FeatureName& feature,
+      JOYSTICK::CDriverPrimitive& positiveX,
+      JOYSTICK::CDriverPrimitive& positiveY,
+      JOYSTICK::CDriverPrimitive& positiveZ
+    ) override;
+
+    virtual bool AddAccelerometer(
+      const JOYSTICK::FeatureName& feature,
+      const JOYSTICK::CDriverPrimitive& positiveX,
+      const JOYSTICK::CDriverPrimitive& positiveY,
+      const JOYSTICK::CDriverPrimitive& positiveZ
+    ) override;
+
+  private:
+    typedef std::map<JOYSTICK::CDriverPrimitive, JOYSTICK::FeatureName> DriverMap;
+
+    // Utility functions
+    static DriverMap CreateLookupTable(const FeatureMap& features);
+
+    bool UnmapPrimitive(const JOYSTICK::CDriverPrimitive& primitive);
+
+    static bool ResetPrimitive(ADDON::JoystickFeature& feature, const ADDON::DriverPrimitive& primitive);
+
+    CPeripheral* const  m_device;
+    std::weak_ptr<CPeripheralAddon>  m_addon;
+    const std::string   m_strControllerId;
+    FeatureMap          m_features;
+    DriverMap           m_driverMap;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.cpp Added

@@ -0,0 +1,87 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonButtonMapping.h"
+#include "input/joysticks/generic/ButtonMapping.h"
+#include "input/joysticks/IButtonMapper.h"
+#include "peripherals/addons/AddonButtonMap.h"
+#include "peripherals/Peripherals.h"
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+
+#ifndef SAFE_DELETE
+  #define SATE_DELETE(x)  do { delete (x); (x) = NULL; } while (0)
+#endif
+
+CAddonButtonMapping::CAddonButtonMapping(CPeripheral* peripheral, IButtonMapper* mapper)
+  : m_driverHandler(NULL)
+{
+  PeripheralAddonPtr addon = g_peripherals.GetAddon(peripheral);
+
+  if (!addon)
+  {
+    CLog::Log(LOGDEBUG, "Failed to locate add-on for \"%s\"", peripheral->DeviceName().c_str());
+  }
+  else
+  {
+    m_buttonMap = new CAddonButtonMap(peripheral, addon, mapper->ControllerID());
+    if (m_buttonMap->Load())
+      m_driverHandler = new CButtonMapping(mapper, m_buttonMap);
+    else
+      SAFE_DELETE(m_buttonMap);
+  }
+}
+
+CAddonButtonMapping::~CAddonButtonMapping(void)
+{
+  delete m_driverHandler;
+  delete m_buttonMap;
+}
+
+bool CAddonButtonMapping::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnButtonMotion(buttonIndex, bPressed);
+
+  return false;
+}
+
+bool CAddonButtonMapping::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnHatMotion(hatIndex, state);
+
+  return false;
+}
+
+bool CAddonButtonMapping::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnAxisMotion(axisIndex, position);
+
+  return false;
+}
+
+void CAddonButtonMapping::ProcessAxisMotions(void)
+{
+  if (m_driverHandler)
+    m_driverHandler->ProcessAxisMotions();
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.h Added

@@ -0,0 +1,51 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/IDriverHandler.h"
+
+namespace JOYSTICK
+{
+  class IButtonMap;
+  class IButtonMapper;
+}
+
+namespace PERIPHERALS
+{
+  class CPeripheral;
+
+  class CAddonButtonMapping : public JOYSTICK::IDriverHandler
+  {
+  public:
+    CAddonButtonMapping(CPeripheral* peripheral, JOYSTICK::IButtonMapper* mapper);
+
+    virtual ~CAddonButtonMapping(void);
+
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, JOYSTICK::HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override;
+
+  private:
+    JOYSTICK::IDriverHandler* m_driverHandler;
+    JOYSTICK::IButtonMap*     m_buttonMap;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.cpp Added

@@ -0,0 +1,87 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "AddonInputHandling.h"
+#include "input/joysticks/generic/InputHandling.h"
+#include "input/joysticks/IInputHandler.h"
+#include "peripherals/addons/AddonButtonMap.h"
+#include "peripherals/Peripherals.h"
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+
+#ifndef SAFE_DELETE
+  #define SATE_DELETE(x)  do { delete (x); (x) = NULL; } while (0)
+#endif
+
+CAddonInputHandling::CAddonInputHandling(CPeripheral* peripheral, IInputHandler* handler)
+  : m_driverHandler(NULL)
+{
+  PeripheralAddonPtr addon = g_peripherals.GetAddon(peripheral);
+
+  if (!addon)
+  {
+    CLog::Log(LOGDEBUG, "Failed to locate add-on for \"%s\"", peripheral->DeviceName().c_str());
+  }
+  else
+  {
+    m_buttonMap = new CAddonButtonMap(peripheral, addon, handler->ControllerID());
+    if (m_buttonMap->Load())
+      m_driverHandler = new CInputHandling(handler, m_buttonMap);
+    else
+      SAFE_DELETE(m_buttonMap);
+  }
+}
+
+CAddonInputHandling::~CAddonInputHandling(void)
+{
+  delete m_driverHandler;
+  delete m_buttonMap;
+}
+
+bool CAddonInputHandling::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnButtonMotion(buttonIndex, bPressed);
+
+  return false;
+}
+
+bool CAddonInputHandling::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnHatMotion(hatIndex, state);
+
+  return false;
+}
+
+bool CAddonInputHandling::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  if (m_driverHandler)
+    return m_driverHandler->OnAxisMotion(axisIndex, position);
+
+  return false;
+}
+
+void CAddonInputHandling::ProcessAxisMotions(void)
+{
+  if (m_driverHandler)
+    m_driverHandler->ProcessAxisMotions();
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.h Added

@@ -0,0 +1,51 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "input/joysticks/IDriverHandler.h"
+
+namespace JOYSTICK
+{
+  class IButtonMap;
+  class IInputHandler;
+}
+
+namespace PERIPHERALS
+{
+  class CPeripheral;
+
+  class CAddonInputHandling : public JOYSTICK::IDriverHandler
+  {
+  public:
+    CAddonInputHandling(CPeripheral* peripheral, JOYSTICK::IInputHandler* handler);
+
+    virtual ~CAddonInputHandling(void);
+
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, JOYSTICK::HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override;
+
+  private:
+    JOYSTICK::IDriverHandler* m_driverHandler;
+    JOYSTICK::IButtonMap*     m_buttonMap;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/peripherals/addons/Makefile.in Added

_service:download_url:master.tar.gz/xbmc/peripherals/addons/PeripheralAddon.cpp Added

@@ -0,0 +1,652 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PeripheralAddon.h"
+#include "AddonButtonMap.h"
+#include "PeripheralAddonTranslator.h"
+#include "addons/AddonManager.h"
+#include "filesystem/Directory.h"
+#include "filesystem/SpecialProtocol.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/IButtonMap.h"
+#include "input/joysticks/IDriverHandler.h"
+#include "input/joysticks/JoystickTranslator.h"
+#include "input/joysticks/JoystickUtils.h"
+#include "peripherals/Peripherals.h"
+#include "peripherals/bus/virtual/PeripheralBusAddon.h"
+#include "peripherals/devices/PeripheralJoystick.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+
+#include <algorithm>
+#include <string.h>
+#include <utility>
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+using namespace XFILE;
+
+#ifndef SAFE_DELETE
+  #define SAFE_DELETE(p)  do { delete (p); (p) = NULL; } while (0)
+#endif
+
+std::unique_ptr<CPeripheralAddon> CPeripheralAddon::FromExtension(ADDON::AddonProps props, const cp_extension_t* ext)
+{
+  std::string strProvidesJoysticks = ADDON::CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@provides_joysticks");
+  std::string strProvidesButtonMaps = ADDON::CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@provides_buttonmaps");
+
+  bool bProvidesJoysticks = StringUtils::EqualsNoCase(strProvidesJoysticks, "true");
+  bool bProvidesButtonMaps = StringUtils::EqualsNoCase(strProvidesButtonMaps, "true");
+
+  return std::unique_ptr<CPeripheralAddon>(new CPeripheralAddon(std::move(props), bProvidesJoysticks, bProvidesButtonMaps));
+}
+
+CPeripheralAddon::CPeripheralAddon(ADDON::AddonProps props, bool bProvidesJoysticks, bool bProvidesButtonMaps) :
+  CAddonDll<DllPeripheral, PeripheralAddon, PERIPHERAL_PROPERTIES>(std::move(props)),
+  m_apiVersion("0.0.0"),
+  m_bProvidesJoysticks(bProvidesJoysticks),
+  m_bProvidesButtonMaps(bProvidesButtonMaps)
+{
+  ResetProperties();
+}
+
+CPeripheralAddon::~CPeripheralAddon(void)
+{
+  // delete all peripherals provided by this addon
+  for (const auto& peripheral : m_peripherals)
+    delete peripheral.second;
+  m_peripherals.clear();
+
+  // only clear buttonMaps but don't delete them as they are owned by a CAddonJoystickInputHandling instance
+  m_buttonMaps.clear();
+
+  Destroy();
+  SAFE_DELETE(m_pInfo);
+}
+
+void CPeripheralAddon::ResetProperties(void)
+{
+  // Initialise members
+  m_strUserPath        = CSpecialProtocol::TranslatePath(Profile());
+  m_strClientPath      = CSpecialProtocol::TranslatePath(Path());
+
+  SAFE_DELETE(m_pInfo);
+  m_pInfo              = new PERIPHERAL_PROPERTIES;
+  m_pInfo->user_path   = m_strUserPath.c_str();
+  m_pInfo->addon_path  = m_strClientPath.c_str();
+
+  m_apiVersion = ADDON::AddonVersion("0.0.0");
+}
+
+ADDON::AddonPtr CPeripheralAddon::GetRunningInstance(void) const
+{
+  PeripheralBusAddonPtr addonBus = std::static_pointer_cast<CPeripheralBusAddon>(g_peripherals.GetBusByType(PERIPHERAL_BUS_ADDON));
+  if (addonBus)
+  {
+    ADDON::AddonPtr peripheralAddon;
+    if (addonBus->GetAddon(ID(), peripheralAddon))
+      return peripheralAddon;
+  }
+  return CAddon::GetRunningInstance();
+}
+
+ADDON_STATUS CPeripheralAddon::CreateAddon(void)
+{
+  ADDON_STATUS status(ADDON_STATUS_UNKNOWN);
+
+  // Reset all properties to defaults
+  ResetProperties();
+
+  // Create directory for user data
+  if (!CDirectory::Exists(m_strUserPath))
+    CDirectory::Create(m_strUserPath);
+
+  // Initialise the add-on
+  CLog::Log(LOGDEBUG, "PERIPHERAL - %s - creating peripheral add-on instance '%s'", __FUNCTION__, Name().c_str());
+  try { status = CAddonDll<DllPeripheral, PeripheralAddon, PERIPHERAL_PROPERTIES>::Create(); }
+  catch (const std::exception& e) { LogException(e, __FUNCTION__); }
+
+  if (status == ADDON_STATUS_OK)
+  {
+    if (!GetAddonProperties())
+    {
+      Destroy();
+      status = ADDON_STATUS_PERMANENT_FAILURE;
+    }
+  }
+
+  return status;
+}
+
+bool CPeripheralAddon::GetAddonProperties(void)
+{
+  PERIPHERAL_CAPABILITIES addonCapabilities = { };
+
+  // Get the capabilities
+  try
+  {
+    PERIPHERAL_ERROR retVal = m_pStruct->GetAddonCapabilities(&addonCapabilities);
+    if (retVal != PERIPHERAL_NO_ERROR)
+    {
+      CLog::Log(LOGERROR, "PERIPHERAL - couldn't get the capabilities for add-on '%s'. Please contact the developer of this add-on: %s",
+          Name().c_str(), Author().c_str());
+      return false;
+    }
+  }
+  catch (std::exception& e) { LogException(e, "GetAddonCapabilities()"); return false; }
+
+  // Verify capabilities against addon.xml
+  if (m_bProvidesJoysticks != addonCapabilities.provides_joysticks)
+  {
+    CLog::Log(LOGERROR, "PERIPHERAL - Add-on '%s': provides_joysticks'(%s) in add-on DLL  doesn't match 'provides_joysticks'(%s) in addon.xml. Please contact the developer of this add-on: %s",
+        Name().c_str(), addonCapabilities.provides_joysticks ? "true" : "false",
+        m_bProvidesJoysticks ? "true" : "false", Author().c_str());
+    return false;
+  }
+
+  return true;
+}
+
+bool CPeripheralAddon::CheckAPIVersion(void)
+{
+  // Check the API version
+  ADDON::AddonVersion minVersion = ADDON::AddonVersion(PERIPHERAL_MIN_API_VERSION);
+  try { m_apiVersion = ADDON::AddonVersion(m_pStruct->GetPeripheralAPIVersion()); }
+  catch (std::exception &e) { LogException(e, "GetPeripheralAPIVersion()"); return false; }
+
+  if (!IsCompatibleAPIVersion(minVersion, m_apiVersion))
+  {
+    CLog::Log(LOGERROR, "PERIPHERAL - Add-on '%s' is using an incompatible API version. XBMC minimum API version = '%s', add-on API version '%s'", Name().c_str(), minVersion.asString().c_str(), m_apiVersion.asString().c_str());
+    return false;
+  }
+
+  return true;
+}
+
+bool CPeripheralAddon::IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version)
+{
+  ADDON::AddonVersion myMinVersion = ADDON::AddonVersion(PERIPHERAL_MIN_API_VERSION);
+  ADDON::AddonVersion myVersion = ADDON::AddonVersion(PERIPHERAL_API_VERSION);
+  return (version >= myMinVersion && minVersion <= myVersion);
+}
+
+bool CPeripheralAddon::Register(unsigned int peripheralIndex, CPeripheral *peripheral)
+{
+  if (!peripheral)
+    return false;
+
+  CSingleLock lock(m_critSection);
+
+  if (m_peripherals.find(peripheralIndex) == m_peripherals.end())
+  {
+    if (peripheral->Type() == PERIPHERAL_JOYSTICK)
+    {
+      m_peripherals[peripheralIndex] = static_cast<CPeripheralJoystick*>(peripheral);
+
+      CLog::Log(LOGNOTICE, "%s - new %s device registered on %s->%s: %s",
+          __FUNCTION__, PeripheralTypeTranslator::TypeToString(peripheral->Type()),
+          PeripheralTypeTranslator::BusTypeToString(PERIPHERAL_BUS_ADDON),
+          peripheral->Location().c_str(), peripheral->DeviceName().c_str());
+
+      return true;
+    }
+  }
+  return false;
+}
+
+void CPeripheralAddon::UnregisterRemovedDevices(const PeripheralScanResults &results, std::vector<CPeripheral*>& removedPeripherals)
+{
+  CSingleLock lock(m_critSection);
+  std::vector<unsigned int> removedIndexes;
+  for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+  {
+    CPeripheral *peripheral = it->second;
+    PeripheralScanResult updatedDevice(PERIPHERAL_BUS_ADDON);
+    if (!results.GetDeviceOnLocation(peripheral->Location(), &updatedDevice) ||
+      *peripheral != updatedDevice)
+    {
+      // Device removed
+      removedIndexes.push_back(it->first);
+    }
+  }
+  lock.Leave();
+
+  for (std::vector<unsigned int>::const_iterator it = removedIndexes.begin(); it != removedIndexes.end(); ++it)
+  {
+    CPeripheral *peripheral = m_peripherals[*it];
+    CLog::Log(LOGNOTICE, "%s - device removed from %s/%s: %s (%s:%s)", __FUNCTION__, PeripheralTypeTranslator::TypeToString(peripheral->Type()), peripheral->Location().c_str(), peripheral->DeviceName().c_str(), peripheral->VendorIdAsString(), peripheral->ProductIdAsString());
+    peripheral->OnDeviceRemoved();
+    removedPeripherals.push_back(peripheral);
+    m_peripherals.erase(*it);
+  }
+}
+
+bool CPeripheralAddon::HasFeature(const PeripheralFeature feature) const
+{
+  if (feature == FEATURE_JOYSTICK)
+    return m_bProvidesJoysticks;
+
+  return false;
+}
+
+void CPeripheralAddon::GetFeatures(std::vector<PeripheralFeature> &features) const
+{
+  if (m_bProvidesJoysticks && std::find(features.begin(), features.end(), FEATURE_JOYSTICK) == features.end())
+    features.push_back(FEATURE_JOYSTICK);
+}
+
+CPeripheral* CPeripheralAddon::GetPeripheral(unsigned int index) const
+{
+  CPeripheral* peripheral(NULL);
+  CSingleLock lock(m_critSection);
+  std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.find(index);
+  if (it != m_peripherals.end())
+    peripheral = it->second;
+  return peripheral;
+}
+
+CPeripheral *CPeripheralAddon::GetByPath(const std::string &strPath) const
+{
+  CSingleLock lock(m_critSection);
+  for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+  {
+    if (StringUtils::EqualsNoCase(strPath, it->second->FileLocation()))
+      return it->second;
+  }
+
+  return NULL;
+}
+
+int CPeripheralAddon::GetPeripheralsWithFeature(std::vector<CPeripheral*> &results, const PeripheralFeature feature) const
+{
+  int iReturn(0);
+  CSingleLock lock(m_critSection);
+  for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+  {
+    if (it->second->HasFeature(feature))
+    {
+      results.push_back(it->second);
+      ++iReturn;
+    }
+  }
+  return iReturn;
+}
+
+size_t CPeripheralAddon::GetNumberOfPeripherals(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_peripherals.size();
+}
+
+size_t CPeripheralAddon::GetNumberOfPeripheralsWithId(const int iVendorId, const int iProductId) const
+{
+  int iReturn(0);
+  CSingleLock lock(m_critSection);
+  for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+  {
+    if (it->second->VendorId() == iVendorId &&
+        it->second->ProductId() == iProductId)
+      iReturn++;
+  }
+
+  return iReturn;
+}
+
+void CPeripheralAddon::GetDirectory(const std::string &strPath, CFileItemList &items) const
+{
+  CSingleLock lock(m_critSection);
+  for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+  {
+    const CPeripheral *peripheral = it->second;
+    if (peripheral->IsHidden())
+      continue;
+
+    CFileItemPtr peripheralFile(new CFileItem(peripheral->DeviceName()));
+    peripheralFile->SetPath(peripheral->FileLocation());
+    peripheralFile->SetProperty("vendor", peripheral->VendorIdAsString());
+    peripheralFile->SetProperty("product", peripheral->ProductIdAsString());
+    peripheralFile->SetProperty("bus", PeripheralTypeTranslator::BusTypeToString(peripheral->GetBusType()));
+    peripheralFile->SetProperty("location", peripheral->Location());
+    peripheralFile->SetProperty("class", PeripheralTypeTranslator::TypeToString(peripheral->Type()));
+    peripheralFile->SetProperty("version", peripheral->GetVersionInfo());
+    peripheralFile->SetIconImage("DefaultAddon.png");
+    items.Add(peripheralFile);
+  }
+}
+
+bool CPeripheralAddon::PerformDeviceScan(PeripheralScanResults &results)
+{
+  unsigned int      peripheralCount;
+  PERIPHERAL_INFO*  pScanResults;
+  PERIPHERAL_ERROR  retVal;
+
+  try { LogError(retVal = m_pStruct->PerformDeviceScan(&peripheralCount, &pScanResults), "PerformDeviceScan()"); }
+  catch (std::exception &e) { LogException(e, "PerformDeviceScan()"); return false;  }
+
+  if (retVal == PERIPHERAL_NO_ERROR)
+  {
+    for (unsigned int i = 0; i < peripheralCount; i++)
+    {
+      ADDON::Peripheral peripheral(pScanResults[i]);
+
+      PeripheralScanResult result(PERIPHERAL_BUS_ADDON);
+      switch (peripheral.Type())
+      {
+      case PERIPHERAL_TYPE_JOYSTICK:
+        result.m_type = PERIPHERAL_JOYSTICK;
+        break;
+      default:
+        continue;
+      }
+
+      result.m_strDeviceName = peripheral.Name();
+      result.m_strLocation   = StringUtils::Format("%s/%d", ID().c_str(), peripheral.Index());
+      result.m_iVendorId     = peripheral.VendorID();
+      result.m_iProductId    = peripheral.ProductID();
+      result.m_mappedType    = PERIPHERAL_JOYSTICK;
+      result.m_mappedBusType = PERIPHERAL_BUS_ADDON;
+      result.m_iSequence     = 0;
+
+      if (!results.ContainsResult(result))
+        results.m_results.push_back(result);
+    }
+
+    try { m_pStruct->FreeScanResults(peripheralCount, pScanResults); }
+    catch (std::exception &e) { LogException(e, "FreeJoysticks()"); }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool CPeripheralAddon::ProcessEvents(void)
+{
+  if (!m_bProvidesJoysticks)
+    return false;
+
+  PERIPHERAL_ERROR retVal;
+
+  unsigned int      eventCount = 0;
+  PERIPHERAL_EVENT* pEvents = NULL;
+
+  try { LogError(retVal = m_pStruct->GetEvents(&eventCount, &pEvents), "GetEvents()"); }
+  catch (std::exception &e) { LogException(e, "GetEvents()"); return false;  }
+
+  if (retVal == PERIPHERAL_NO_ERROR)
+  {
+    for (unsigned int i = 0; i < eventCount; i++)
+    {
+      ADDON::PeripheralEvent event(pEvents[i]);
+      CPeripheral* device = GetPeripheral(event.PeripheralIndex());
+      if (!device)
+        continue;
+
+      switch (device->Type())
+      {
+      case PERIPHERAL_JOYSTICK:
+      {
+        CPeripheralJoystick* joystickDevice = static_cast<CPeripheralJoystick*>(device);
+
+        switch (event.Type())
+        {
+          case PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON:
+          {
+            const bool bPressed = (event.ButtonState() == JOYSTICK_STATE_BUTTON_PRESSED);
+            CLog::Log(LOGDEBUG, "Button [ %u ] on %s %s", event.DriverIndex(),
+                      joystickDevice->DeviceName().c_str(), bPressed ? "pressed" : "released");
+            if (joystickDevice->OnButtonMotion(event.DriverIndex(), bPressed))
+              CLog::Log(LOGDEBUG, "Joystick button event handled");
+            break;
+          }
+          case PERIPHERAL_EVENT_TYPE_DRIVER_HAT:
+          {
+            const HAT_STATE state = CPeripheralAddonTranslator::TranslateHatState(event.HatState());
+            CLog::Log(LOGDEBUG, "Hat [ %u ] on %s %s", event.DriverIndex(),
+                      joystickDevice->DeviceName().c_str(), CJoystickTranslator::HatStateToString(state));
+            if (joystickDevice->OnHatMotion(event.DriverIndex(), state))
+              CLog::Log(LOGDEBUG, "Joystick hat event handled");
+            break;
+          }
+          case PERIPHERAL_EVENT_TYPE_DRIVER_AXIS:
+          {
+            joystickDevice->OnAxisMotion(event.DriverIndex(), event.AxisState());
+            break;
+          }
+          default:
+            break;
+        }
+        break;
+      }
+      default:
+        break;
+      }
+    }
+
+    for (std::map<unsigned int, CPeripheral*>::const_iterator it = m_peripherals.begin(); it != m_peripherals.end(); ++it)
+    {
+      if (it->second->Type() == PERIPHERAL_JOYSTICK)
+        static_cast<CPeripheralJoystick*>(it->second)->ProcessAxisMotions();
+    }
+
+    try { m_pStruct->FreeEvents(eventCount, pEvents); }
+    catch (std::exception &e) { LogException(e, "FreeEvents()"); }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool CPeripheralAddon::GetJoystickProperties(unsigned int index, CPeripheralJoystick& joystick)
+{
+  if (!m_bProvidesJoysticks)
+    return false;
+
+  PERIPHERAL_ERROR retVal;
+
+  JOYSTICK_INFO joystickStruct;
+
+  try { LogError(retVal = m_pStruct->GetJoystickInfo(index, &joystickStruct), "GetJoystickInfo()"); }
+  catch (std::exception &e) { LogException(e, "GetJoystickInfo()"); return false;  }
+
+  if (retVal == PERIPHERAL_NO_ERROR)
+  {
+    ADDON::Joystick addonJoystick(joystickStruct);
+    SetJoystickInfo(joystick, addonJoystick);
+
+    try { m_pStruct->FreeJoystickInfo(&joystickStruct); }
+    catch (std::exception &e) { LogException(e, "FreeJoystickInfo()"); }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool CPeripheralAddon::GetFeatures(const CPeripheral* device,
+                                   const std::string& strControllerId,
+                                   FeatureMap& features)
+{
+  if (!m_bProvidesButtonMaps)
+    return false;
+
+  PERIPHERAL_ERROR retVal;
+
+  ADDON::Joystick joystickInfo;
+  GetJoystickInfo(device, joystickInfo);
+
+  JOYSTICK_INFO joystickStruct;
+  joystickInfo.ToStruct(joystickStruct);
+
+  unsigned int      featureCount = 0;
+  JOYSTICK_FEATURE* pFeatures = NULL;
+
+  try { LogError(retVal = m_pStruct->GetFeatures(&joystickStruct, strControllerId.c_str(),
+                                                 &featureCount, &pFeatures), "GetFeatures()"); }
+  catch (std::exception &e) { LogException(e, "GetFeatures()"); return false;  }
+
+  if (retVal == PERIPHERAL_NO_ERROR)
+  {
+    for (unsigned int i = 0; i < featureCount; i++)
+    {
+      ADDON::JoystickFeature feature(pFeatures[i]);
+      if (feature.Type() != JOYSTICK_FEATURE_TYPE_UNKNOWN)
+        features[feature.Name()] = std::move(feature);
+    }
+
+    try { m_pStruct->FreeFeatures(featureCount, pFeatures); }
+    catch (std::exception &e) { LogException(e, "FreeFeatures()"); }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool CPeripheralAddon::MapFeatures(const CPeripheral* device,
+                                   const std::string& strControllerId,
+                                   const FeatureMap& features)
+{
+  if (!m_bProvidesButtonMaps)
+    return false;
+
+  PERIPHERAL_ERROR retVal;
+
+  ADDON::Joystick joystickInfo;
+  GetJoystickInfo(device, joystickInfo);
+
+  JOYSTICK_INFO joystickStruct;
+  joystickInfo.ToStruct(joystickStruct);
+
+  std::vector<ADDON::JoystickFeature> featureVector;
+  for (FeatureMap::const_iterator it = features.begin(); it != features.end(); ++it)
+    featureVector.push_back(it->second);
+
+  unsigned int featureCount = featureVector.size();
+
+  JOYSTICK_FEATURE* pFeatures = NULL;
+  ADDON::JoystickFeatures::ToStructs(featureVector, &pFeatures);
+
+  try { LogError(retVal = m_pStruct->MapFeatures(&joystickStruct, strControllerId.c_str(),
+                                                 featureCount, pFeatures), "MapFeatures()"); }
+  catch (std::exception &e) { LogException(e, "MapFeatures()"); return false;  }
+
+  if (retVal == PERIPHERAL_NO_ERROR)
+  {
+    // Notify observing button maps
+    RefreshButtonMaps(device->DeviceName(), strControllerId);
+  }
+
+  return retVal == PERIPHERAL_NO_ERROR;
+}
+
+void CPeripheralAddon::ResetButtonMap(const CPeripheral* device, const std::string& strControllerId)
+{
+  if (!m_bProvidesButtonMaps)
+    return;
+
+  ADDON::Joystick joystickInfo;
+  GetJoystickInfo(device, joystickInfo);
+
+  JOYSTICK_INFO joystickStruct;
+  joystickInfo.ToStruct(joystickStruct);
+
+  try { m_pStruct->ResetButtonMap(&joystickStruct, strControllerId.c_str()); }
+  catch (std::exception &e) { LogException(e, "ResetButtonMap()"); return; }
+}
+
+void CPeripheralAddon::RegisterButtonMap(CPeripheral* device, IButtonMap* buttonMap)
+{
+  UnregisterButtonMap(buttonMap);
+  m_buttonMaps.push_back(std::make_pair(device, buttonMap));
+}
+
+void CPeripheralAddon::UnregisterButtonMap(IButtonMap* buttonMap)
+{
+  for (auto it = m_buttonMaps.begin(); it != m_buttonMaps.end(); ++it)
+  {
+    if (it->second == buttonMap)
+    {
+      m_buttonMaps.erase(it);
+      break;
+    }
+  }
+}
+
+void CPeripheralAddon::RefreshButtonMaps(const std::string& strDeviceName /* = "" */,
+                                         const std::string& strControllerId /* = "" */)
+{
+  for (auto it = m_buttonMaps.begin(); it != m_buttonMaps.end(); ++it)
+  {
+    if ((strDeviceName.empty() || strDeviceName == it->first->DeviceName()) &&
+        (strControllerId.empty() || strControllerId == it->second->ControllerID()))
+    {
+      it->second->Load();
+    }
+  }
+}
+
+void CPeripheralAddon::GetPeripheralInfo(const CPeripheral* device, ADDON::Peripheral& peripheralInfo)
+{
+  peripheralInfo.SetName(device->DeviceName());
+  peripheralInfo.SetVendorID(device->VendorId());
+  peripheralInfo.SetProductID(device->ProductId());
+}
+
+void CPeripheralAddon::GetJoystickInfo(const CPeripheral* device, ADDON::Joystick& joystickInfo)
+{
+  GetPeripheralInfo(device, joystickInfo);
+
+  if (device->Type() == PERIPHERAL_JOYSTICK)
+  {
+    const CPeripheralJoystick* joystick = static_cast<const CPeripheralJoystick*>(device);
+    joystickInfo.SetProvider(joystick->Provider());
+    joystickInfo.SetButtonCount(joystick->ButtonCount());
+    joystickInfo.SetHatCount(joystick->HatCount());
+    joystickInfo.SetAxisCount(joystick->AxisCount());
+  }
+}
+
+void CPeripheralAddon::SetJoystickInfo(CPeripheralJoystick& joystick, const ADDON::Joystick& joystickInfo)
+{
+  joystick.SetProvider(joystickInfo.Provider());
+  joystick.SetRequestedPort(joystickInfo.RequestedPort());
+  joystick.SetButtonCount(joystickInfo.ButtonCount());
+  joystick.SetHatCount(joystickInfo.HatCount());
+  joystick.SetAxisCount(joystickInfo.AxisCount());
+}
+
+bool CPeripheralAddon::LogError(const PERIPHERAL_ERROR error, const char *strMethod) const
+{
+  if (error != PERIPHERAL_NO_ERROR)
+  {
+    CLog::Log(LOGERROR, "PERIPHERAL - %s - addon '%s' returned an error: %s",
+        strMethod, Name().c_str(), CPeripheralAddonTranslator::TranslateError(error));
+    return false;
+  }
+  return true;
+}
+
+void CPeripheralAddon::LogException(const std::exception &e, const char *strFunctionName) const
+{
+  CLog::Log(LOGERROR, "PERIPHERAL - exception '%s' caught while trying to call '%s' on add-on '%s'. Please contact the developer of this add-on: %s",
+            e.what(), strFunctionName, Name().c_str(), Author().c_str());
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/PeripheralAddon.h Added

@@ -0,0 +1,149 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "addons/AddonDll.h"
+#include "addons/DllPeripheral.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"
+#include "input/joysticks/JoystickTypes.h"
+#include "peripherals/PeripheralTypes.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+namespace JOYSTICK
+{
+  class IButtonMap;
+  class IDriverHandler;
+}
+
+namespace PERIPHERALS
+{
+  class CPeripheral;
+  class CPeripheralJoystick;
+
+  typedef std::map<JOYSTICK::FeatureName, ADDON::JoystickFeature> FeatureMap;
+
+  class CPeripheralAddon : public ADDON::CAddonDll<DllPeripheral, PeripheralAddon, PERIPHERAL_PROPERTIES>
+  {
+  public:
+    static std::unique_ptr<CPeripheralAddon> FromExtension(ADDON::AddonProps props, const cp_extension_t* ext);
+
+    CPeripheralAddon(ADDON::AddonProps props, bool bProvidesJoysticks, bool bProvidesButtonMaps);
+
+    virtual ~CPeripheralAddon(void);
+
+    // implementation of IAddon
+    virtual ADDON::AddonPtr GetRunningInstance(void) const override;
+
+    /*!
+     * @brief Initialise the instance of this add-on
+     */
+    ADDON_STATUS CreateAddon(void);
+
+    bool         Register(unsigned int peripheralIndex, CPeripheral* peripheral);
+    void         UnregisterRemovedDevices(const PeripheralScanResults &results, std::vector<CPeripheral*>& removedPeripherals);
+    void         GetFeatures(std::vector<PeripheralFeature> &features) const;
+    bool         HasFeature(const PeripheralFeature feature) const;
+    CPeripheral* GetPeripheral(unsigned int index) const;
+    CPeripheral* GetByPath(const std::string &strPath) const;
+    int          GetPeripheralsWithFeature(std::vector<CPeripheral*> &results, const PeripheralFeature feature) const;
+    size_t       GetNumberOfPeripherals(void) const;
+    size_t       GetNumberOfPeripheralsWithId(const int iVendorId, const int iProductId) const;
+    void         GetDirectory(const std::string &strPath, CFileItemList &items) const;
+
+    /** @name Peripheral add-on methods */
+    //@{
+    bool PerformDeviceScan(PeripheralScanResults &results);
+    bool ProcessEvents(void);
+    //@}
+
+    /** @name Joystick methods */
+    //@{
+    bool GetJoystickProperties(unsigned int index, CPeripheralJoystick& joystick);
+    bool HasButtonMaps(void) const { return m_bProvidesButtonMaps; }
+    bool GetFeatures(const CPeripheral* device, const std::string& strControllerId, FeatureMap& features);
+    bool MapFeatures(const CPeripheral* device, const std::string& strControllerId, const FeatureMap& features);
+    void ResetButtonMap(const CPeripheral* device, const std::string& strControllerId);
+    //@}
+
+    void RegisterButtonMap(CPeripheral* device, JOYSTICK::IButtonMap* buttonMap);
+    void UnregisterButtonMap(JOYSTICK::IButtonMap* buttonMap);
+    void RefreshButtonMaps(const std::string& strDeviceName = "", const std::string& strControllerId = "");
+
+  protected:
+    /*!
+     * @brief Request the API version from the add-on, and check if it's compatible
+     * @return True when compatible, false otherwise.
+     * @remark Implementation of CAddonDll
+     */
+    virtual bool CheckAPIVersion(void) override;
+
+  private:
+    /*!
+     * @brief Helper functions
+     */
+    static void GetPeripheralInfo(const CPeripheral* device, ADDON::Peripheral& peripheralInfo);
+
+    static void GetJoystickInfo(const CPeripheral* device, ADDON::Joystick& joystickInfo);
+    static void SetJoystickInfo(CPeripheralJoystick& joystick, const ADDON::Joystick& joystickInfo);
+
+    /*!
+     * @brief Reset all class members to their defaults. Called by the constructors
+     */
+    void ResetProperties(void);
+
+    /*!
+     * @brief Retrieve add-on properties from the add-on
+     */
+    bool GetAddonProperties(void);
+
+    /*!
+     * @brief Checks whether the provided API version is compatible with XBMC
+     * @param minVersion The add-on's XBMC_PERIPHERAL_MIN_API_VERSION version
+     * @param version The add-on's XBMC_PERIPHERAL_API_VERSION version
+     * @return True when compatible, false otherwise
+     */
+    static bool IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version);
+
+    bool LogError(const PERIPHERAL_ERROR error, const char *strMethod) const;
+    void LogException(const std::exception &e, const char *strFunctionName) const;
+
+    /* @brief Cache for const char* members in PERIPHERAL_PROPERTIES */
+    std::string         m_strUserPath;    /*!< @brief translated path to the user profile */
+    std::string         m_strClientPath;  /*!< @brief translated path to this add-on */
+
+    /* @brief Add-on properties */
+    ADDON::AddonVersion m_apiVersion;
+    bool                m_bProvidesJoysticks;
+    bool                m_bProvidesButtonMaps;
+
+    /* @brief Map of peripherals belonging to the add-on */
+    std::map<unsigned int, CPeripheral*>  m_peripherals;
+
+    /* @brief Button map observers */
+    std::vector<std::pair<CPeripheral*, JOYSTICK::IButtonMap*> > m_buttonMaps;
+
+    /* @brief Thread synchronization */
+    CCriticalSection    m_critSection;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/PeripheralAddonTranslator.cpp Added

@@ -0,0 +1,207 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PeripheralAddonTranslator.h"
+#include "input/joysticks/JoystickUtils.h"
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+
+// --- Helper function ---------------------------------------------------------
+
+JOYSTICK_DRIVER_SEMIAXIS_DIRECTION operator*(JOYSTICK_DRIVER_SEMIAXIS_DIRECTION dir, int i)
+{
+  return static_cast<JOYSTICK_DRIVER_SEMIAXIS_DIRECTION>(static_cast<int>(dir) * i);
+}
+
+// --- CPeripheralAddonTranslator ----------------------------------------------
+
+const char* CPeripheralAddonTranslator::TranslateError(const PERIPHERAL_ERROR error)
+{
+  switch (error)
+  {
+    case PERIPHERAL_NO_ERROR:
+      return "no error";
+    case PERIPHERAL_ERROR_FAILED:
+      return "command failed";
+    case PERIPHERAL_ERROR_INVALID_PARAMETERS:
+      return "invalid parameters";
+    case PERIPHERAL_ERROR_NOT_IMPLEMENTED:
+      return "not implemented";
+    case PERIPHERAL_ERROR_NOT_CONNECTED:
+      return "not connected";
+    case PERIPHERAL_ERROR_CONNECTION_FAILED:
+      return "connection failed";
+    case PERIPHERAL_ERROR_UNKNOWN:
+    default:
+      return "unknown error";
+  }
+}
+
+CDriverPrimitive CPeripheralAddonTranslator::TranslatePrimitive(const ADDON::DriverPrimitive& primitive)
+{
+  CDriverPrimitive retVal;
+
+  switch (primitive.Type())
+  {
+    case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
+    {
+      retVal = CDriverPrimitive(primitive.DriverIndex());
+      break;
+    }
+    case JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION:
+    {
+      retVal = CDriverPrimitive(primitive.DriverIndex(), TranslateHatDirection(primitive.HatDirection()));
+      break;
+    }
+    case JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS:
+    {
+      retVal = CDriverPrimitive(primitive.DriverIndex(), TranslateSemiAxisDirection(primitive.SemiAxisDirection()));
+      break;
+    }
+    default:
+      break;
+  }
+
+  return retVal;
+}
+
+ADDON::DriverPrimitive CPeripheralAddonTranslator::TranslatePrimitive(const CDriverPrimitive& primitive)
+{
+  ADDON::DriverPrimitive retVal;
+
+  switch (primitive.Type())
+  {
+    case CDriverPrimitive::BUTTON:
+    {
+      retVal = ADDON::DriverPrimitive(primitive.Index());
+      break;
+    }
+    case CDriverPrimitive::HAT:
+    {
+      retVal = ADDON::DriverPrimitive(primitive.Index(), TranslateHatDirection(primitive.HatDirection()));
+      break;
+    }
+    case CDriverPrimitive::SEMIAXIS:
+    {
+      retVal = ADDON::DriverPrimitive(primitive.Index(), TranslateSemiAxisDirection(primitive.SemiAxisDirection()));
+      break;
+    }
+    default:
+      break;
+  }
+
+  return retVal;
+}
+
+HAT_DIRECTION CPeripheralAddonTranslator::TranslateHatDirection(JOYSTICK_DRIVER_HAT_DIRECTION dir)
+{
+  switch (dir)
+  {
+    case JOYSTICK_DRIVER_HAT_LEFT:   return HAT_DIRECTION::LEFT;
+    case JOYSTICK_DRIVER_HAT_RIGHT:  return HAT_DIRECTION::RIGHT;
+    case JOYSTICK_DRIVER_HAT_UP:     return HAT_DIRECTION::UP;
+    case JOYSTICK_DRIVER_HAT_DOWN:   return HAT_DIRECTION::DOWN;
+    default:
+      break;
+  }
+  return HAT_DIRECTION::UNKNOWN;
+}
+
+JOYSTICK_DRIVER_HAT_DIRECTION CPeripheralAddonTranslator::TranslateHatDirection(HAT_DIRECTION dir)
+{
+  switch (dir)
+  {
+    case HAT_DIRECTION::UP:     return JOYSTICK_DRIVER_HAT_UP;
+    case HAT_DIRECTION::DOWN:   return JOYSTICK_DRIVER_HAT_DOWN;
+    case HAT_DIRECTION::RIGHT:  return JOYSTICK_DRIVER_HAT_RIGHT;
+    case HAT_DIRECTION::LEFT:   return JOYSTICK_DRIVER_HAT_LEFT;
+    default:
+      break;
+  }
+  return JOYSTICK_DRIVER_HAT_UNKNOWN;
+}
+
+HAT_STATE CPeripheralAddonTranslator::TranslateHatState(JOYSTICK_STATE_HAT state)
+{
+  HAT_STATE translatedState = HAT_STATE::UNPRESSED;
+
+  if (state & JOYSTICK_STATE_HAT_UP)    translatedState |= HAT_STATE::UP;
+  if (state & JOYSTICK_STATE_HAT_DOWN)  translatedState |= HAT_STATE::DOWN;
+  if (state & JOYSTICK_STATE_HAT_RIGHT) translatedState |= HAT_STATE::RIGHT;
+  if (state & JOYSTICK_STATE_HAT_LEFT)  translatedState |= HAT_STATE::LEFT;
+
+  return translatedState;
+}
+
+SEMIAXIS_DIRECTION CPeripheralAddonTranslator::TranslateSemiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_DIRECTION dir)
+{
+  switch (dir)
+  {
+    case JOYSTICK_DRIVER_SEMIAXIS_POSITIVE: return SEMIAXIS_DIRECTION::POSITIVE;
+    case JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE: return SEMIAXIS_DIRECTION::NEGATIVE;
+    default:
+      break;
+  }
+  return SEMIAXIS_DIRECTION::ZERO;
+}
+
+JOYSTICK_DRIVER_SEMIAXIS_DIRECTION CPeripheralAddonTranslator::TranslateSemiAxisDirection(SEMIAXIS_DIRECTION dir)
+{
+  switch (dir)
+  {
+    case SEMIAXIS_DIRECTION::POSITIVE: return JOYSTICK_DRIVER_SEMIAXIS_POSITIVE;
+    case SEMIAXIS_DIRECTION::NEGATIVE: return JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE;
+    default:
+      break;
+  }
+  return JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
+}
+
+JOYSTICK::FEATURE_TYPE CPeripheralAddonTranslator::TranslateFeatureType(JOYSTICK_FEATURE_TYPE type)
+{
+  switch (type)
+  {
+    case JOYSTICK_FEATURE_TYPE_SCALAR:        return JOYSTICK::FEATURE_TYPE::SCALAR;
+    case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:  return JOYSTICK::FEATURE_TYPE::ANALOG_STICK;
+    case JOYSTICK_FEATURE_TYPE_ACCELEROMETER: return JOYSTICK::FEATURE_TYPE::ACCELEROMETER;
+    default:
+      break;
+  }
+  return JOYSTICK::FEATURE_TYPE::UNKNOWN;
+}
+
+JOYSTICK_FEATURE_TYPE CPeripheralAddonTranslator::TranslateFeatureType(JOYSTICK::FEATURE_TYPE type)
+{
+  switch (type)
+  {
+    case JOYSTICK::FEATURE_TYPE::SCALAR:        return JOYSTICK_FEATURE_TYPE_SCALAR;
+    case JOYSTICK::FEATURE_TYPE::ANALOG_STICK:  return JOYSTICK_FEATURE_TYPE_ANALOG_STICK;
+    case JOYSTICK::FEATURE_TYPE::ACCELEROMETER: return JOYSTICK_FEATURE_TYPE_ACCELEROMETER;
+    default:
+      break;
+  }
+  return JOYSTICK_FEATURE_TYPE_UNKNOWN;
+}
+
+ADDON::DriverPrimitive CPeripheralAddonTranslator::Opposite(const ADDON::DriverPrimitive& primitive)
+{
+  return ADDON::DriverPrimitive(primitive.DriverIndex(), primitive.SemiAxisDirection() * -1);
+}

_service:download_url:master.tar.gz/xbmc/peripherals/addons/PeripheralAddonTranslator.h Added

@@ -0,0 +1,50 @@
+/*
+ *      Copyright (C) 2015-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/joysticks/JoystickTypes.h"
+
+namespace PERIPHERALS
+{
+  class CPeripheralAddonTranslator
+  {
+  public:
+    static const char* TranslateError(PERIPHERAL_ERROR error);
+
+    static JOYSTICK::CDriverPrimitive TranslatePrimitive(const ADDON::DriverPrimitive& primitive);
+    static ADDON::DriverPrimitive     TranslatePrimitive(const JOYSTICK::CDriverPrimitive& primitive);
+
+    static JOYSTICK::HAT_DIRECTION       TranslateHatDirection(JOYSTICK_DRIVER_HAT_DIRECTION dir);
+    static JOYSTICK_DRIVER_HAT_DIRECTION TranslateHatDirection(JOYSTICK::HAT_DIRECTION dir);
+
+    static JOYSTICK::HAT_STATE TranslateHatState(JOYSTICK_STATE_HAT state);
+
+    static JOYSTICK::SEMIAXIS_DIRECTION       TranslateSemiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_DIRECTION dir);
+    static JOYSTICK_DRIVER_SEMIAXIS_DIRECTION TranslateSemiAxisDirection(JOYSTICK::SEMIAXIS_DIRECTION dir);
+
+    static JOYSTICK::FEATURE_TYPE TranslateFeatureType(JOYSTICK_FEATURE_TYPE type);
+    static JOYSTICK_FEATURE_TYPE  TranslateFeatureType(JOYSTICK::FEATURE_TYPE type);
+
+    static ADDON::DriverPrimitive Opposite(const ADDON::DriverPrimitive& semiaxis);
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/peripherals/bus/PeripheralBus.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/bus/PeripheralBus.h Changed

@@ -19,15 +19,17 @@
  *
  */
 
+#include <memory>
 #include <vector>
-#include "threads/Thread.h"
+
 #include "peripherals/PeripheralTypes.h"
-#include "peripherals/devices/Peripheral.h"
+#include "threads/Thread.h"
 
 class CFileItemList;
 
 namespace PERIPHERALS
 {
+  class CPeripheral;
   class CPeripherals;
 
   /*!
@@ -113,7 +115,7 @@
     /*!
      * @brief Initialise this bus and start a polling thread if this bus needs polling.
      */
-    virtual bool Initialise(void);
+    virtual void Initialise(void);
 
     /*!
      * @brief Stop the polling thread and clear all known devices on this bus.
@@ -149,6 +151,11 @@
 
     virtual bool IsInitialised(void) const { return m_bInitialised; }
 
+    /*!
+     * \brief Poll for events
+     */
+    virtual void ProcessEvents(void) { }
+
   protected:
     virtual void Process(void);
     virtual bool ScanForDevices(void);
@@ -172,4 +179,5 @@
     CCriticalSection           m_critSection;
     CEvent                     m_triggerEvent;
   };
+  using PeripheralBusPtr = std::shared_ptr<CPeripheralBus>;
 }

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android Added

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android/AndroidJoystickState.cpp Added

@@ -0,0 +1,465 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <algorithm>
+
+#include <android/input.h>
+
+#include "AndroidJoystickState.h"
+#include "platform/android/jni/View.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+
+using namespace PERIPHERALS;
+
+static std::string PrintAxisIds(const std::vector<int>& axisIds)
+{
+  if (axisIds.empty())
+    return "";
+
+  if (axisIds.size() == 1)
+    return StringUtils::Format("%d", axisIds.front());
+
+  std::string strAxisIds;
+  for (const auto& axisId : axisIds)
+  {
+    if (strAxisIds.empty())
+      strAxisIds = "[";
+    else
+      strAxisIds += " | ";
+
+    strAxisIds += StringUtils::Format("%d", axisId);
+  }
+  strAxisIds += "]";
+
+  return strAxisIds;
+}
+
+static void MapAxisIds(int axisId, int primaryAxisId, int secondaryAxisId, std::vector<int>& axisIds)
+{
+  if (axisId != primaryAxisId && axisId != secondaryAxisId)
+    return;
+
+  if (axisIds.empty())
+  {
+    axisIds.push_back(primaryAxisId);
+    axisIds.push_back(secondaryAxisId);
+  }
+
+  if (axisIds.size() > 1)
+    return;
+
+  if (axisId == primaryAxisId)
+    axisIds.push_back(secondaryAxisId);
+  else if (axisId == secondaryAxisId)
+    axisIds.insert(axisIds.begin(), primaryAxisId);
+}
+
+CAndroidJoystickState::CAndroidJoystickState()
+  : m_deviceId(-1)
+{ }
+
+CAndroidJoystickState::~CAndroidJoystickState()
+{
+  Deinitialize();
+}
+
+bool CAndroidJoystickState::Initialize(const CJNIViewInputDevice& inputDevice)
+{
+  if (!inputDevice)
+    return false;
+
+  const std::string deviceName = inputDevice.getName();
+
+  // get the device ID
+  m_deviceId = inputDevice.getId();
+
+  // get all motion ranges to be able to count the number of available buttons, hats and axis'
+  const CJNIList<CJNIViewInputDeviceMotionRange> motionRanges = inputDevice.getMotionRanges();
+  for (int index = 0; index < motionRanges.size(); ++index)
+  {
+    const CJNIViewInputDeviceMotionRange motionRange = motionRanges.get(index);
+    if (!motionRange.isFromSource(CJNIViewInputDevice::SOURCE_JOYSTICK) &&
+        !motionRange.isFromSource(CJNIViewInputDevice::SOURCE_GAMEPAD))
+    {
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState: ignoring axis %d from source %d for input device \"%s\" with ID %d", motionRange.getAxis(), motionRange.getSource(), deviceName.c_str(), m_deviceId);
+      continue;
+    }
+
+    int axisId = motionRange.getAxis();
+    JoystickAxis axis {
+      { axisId },
+      motionRange.getFlat(),
+      motionRange.getFuzz(),
+      motionRange.getMin(),
+      motionRange.getMax(),
+      motionRange.getRange(),
+      motionRange.getResolution()
+    };
+
+    // check if the axis ID belongs to a hat/D-PAD
+    if (axisId == AMOTION_EVENT_AXIS_HAT_X || axisId == AMOTION_EVENT_AXIS_HAT_Y)
+    {
+      // check if this hat is already known
+      if (ContainsAxis(axisId, m_hats))
+      {
+        CLog::Log(LOGWARNING, "CAndroidJoystickState: duplicate hat %d on input device \"%s\" with ID %d", axisId, deviceName.c_str(), m_deviceId);
+        continue;
+      }
+
+      // handle the two hat axes together as they belong to the same hat
+      MapAxisIds(axisId, AMOTION_EVENT_AXIS_HAT_X, AMOTION_EVENT_AXIS_HAT_Y, axis.ids);
+
+      m_hats.push_back(axis);
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState: hat %s on input device \"%s\" with ID %d detected", PrintAxisIds(axis.ids).c_str(), deviceName.c_str(), m_deviceId);
+    }
+    // check if the axis ID belongs to an analogue stick or trigger
+    else if (axisId == AMOTION_EVENT_AXIS_X || axisId == AMOTION_EVENT_AXIS_Y ||
+             axisId == AMOTION_EVENT_AXIS_Z || axisId == AMOTION_EVENT_AXIS_RZ ||
+             axisId == AMOTION_EVENT_AXIS_LTRIGGER || axisId == AMOTION_EVENT_AXIS_RTRIGGER ||
+             axisId == AMOTION_EVENT_AXIS_GAS || axisId == AMOTION_EVENT_AXIS_BRAKE ||
+             axisId == AMOTION_EVENT_AXIS_THROTTLE || axisId == AMOTION_EVENT_AXIS_RUDDER || axisId == AMOTION_EVENT_AXIS_WHEEL)
+    {
+       // check if this hat is already known
+      if (ContainsAxis(axisId, m_axes))
+      {
+        CLog::Log(LOGWARNING, "CAndroidJoystickState: duplicate axis %s on input device \"%s\" with ID %d", PrintAxisIds(axis.ids).c_str(), deviceName.c_str(), m_deviceId);
+        continue;
+      }
+
+      // map AMOTION_EVENT_AXIS_GAS to AMOTION_EVENT_AXIS_RTRIGGER and
+      // AMOTION_EVENT_AXIS_BRAKE to AMOTION_EVENT_AXIS_LTRIGGER
+      // to avoid duplicate events on controllers sending both events
+      MapAxisIds(axisId, AMOTION_EVENT_AXIS_LTRIGGER, AMOTION_EVENT_AXIS_BRAKE, axis.ids);
+      MapAxisIds(axisId, AMOTION_EVENT_AXIS_RTRIGGER, AMOTION_EVENT_AXIS_GAS, axis.ids);
+
+      m_axes.push_back(axis);
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState: axis %s on input device \"%s\" with ID %d detected", PrintAxisIds(axis.ids).c_str(), deviceName.c_str(), m_deviceId);
+    }
+    // check if the axis ID belongs to a known button
+    else if (axisId == AKEYCODE_HOME || axisId == AKEYCODE_BACK || axisId == AKEYCODE_MENU ||
+             axisId == AKEYCODE_BUTTON_A || axisId == AKEYCODE_BUTTON_B || axisId == AKEYCODE_BUTTON_C ||
+             axisId == AKEYCODE_BUTTON_X || axisId == AKEYCODE_BUTTON_Y || axisId == AKEYCODE_BUTTON_Z ||
+             axisId == AKEYCODE_BUTTON_L1 || axisId == AKEYCODE_BUTTON_R1 || axisId == AKEYCODE_BUTTON_L2 || axisId == AKEYCODE_BUTTON_R2 ||
+             axisId == AKEYCODE_BUTTON_THUMBL || axisId == AKEYCODE_BUTTON_THUMBR ||
+             axisId == AKEYCODE_BUTTON_START || axisId == AKEYCODE_BUTTON_SELECT || axisId == AKEYCODE_BUTTON_MODE)
+    {
+       // check if this hat is already known
+      if (ContainsAxis(axisId, m_buttons))
+      {
+        CLog::Log(LOGWARNING, "CAndroidJoystickState: duplicate button %d on input device \"%s\" with ID %d", axisId, deviceName.c_str(), m_deviceId);
+        continue;
+      }
+
+      // map AKEYCODE_BUTTON_SELECT to AKEYCODE_BACK and
+      // AKEYCODE_BUTTON_MODE to AKEYCODE_MENU and
+      // AKEYCODE_BUTTON_START to AKEYCODE_HOME to avoid
+      // duplicate events on controllers sending both events
+      MapAxisIds(axisId, AKEYCODE_BACK, AKEYCODE_BUTTON_SELECT, axis.ids);
+      MapAxisIds(axisId, AKEYCODE_MENU, AKEYCODE_BUTTON_MODE, axis.ids);
+      MapAxisIds(axisId, AKEYCODE_HOME, AKEYCODE_BUTTON_START, axis.ids);
+
+      m_buttons.push_back(axis);
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState: button %s on input device \"%s\" with ID %d detected", PrintAxisIds(axis.ids).c_str(), deviceName.c_str(), m_deviceId);
+    }
+    else
+      CLog::Log(LOGWARNING, "CAndroidJoystickState: ignoring unknown axis %d on input device \"%s\" with ID %d", axisId, deviceName.c_str(), m_deviceId);
+  }
+
+  // if there are no buttons add the usual suspects
+  if (GetButtonCount() <= 0)
+  {
+    m_buttons.push_back({ { AKEYCODE_BUTTON_A } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_B } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_X } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_Y } });
+    m_buttons.push_back({ { AKEYCODE_BACK, AKEYCODE_BUTTON_SELECT } });
+    m_buttons.push_back({ { AKEYCODE_MENU, AKEYCODE_BUTTON_MODE } });
+    m_buttons.push_back({ { AKEYCODE_HOME, AKEYCODE_BUTTON_START } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_L1 } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_R1 } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_THUMBL } });
+    m_buttons.push_back({ { AKEYCODE_BUTTON_THUMBR } });
+  }
+
+  // check if there are no buttons, hats or axes at all
+  if (GetButtonCount() == 0 && GetHatCount() == 0 && GetAxisCount() == 0)
+  {
+    CLog::Log(LOGWARNING, "CAndroidJoystickState: no buttons, hats or axes detected for input device \"%s\" with ID %d", deviceName.c_str(), m_deviceId);
+    return false;
+  }
+
+  m_state.buttons.assign(GetButtonCount(), JOYSTICK_STATE_BUTTON_UNPRESSED);
+  m_state.hats.assign(GetHatCount(), JOYSTICK_STATE_HAT_UNPRESSED);
+  m_state.axes.assign(GetAxisCount(), 0.0f);
+
+  m_stateBuffer.buttons.assign(GetButtonCount(), JOYSTICK_STATE_BUTTON_UNPRESSED);
+  m_stateBuffer.hats.assign(GetHatCount(), JOYSTICK_STATE_HAT_UNPRESSED);
+  m_stateBuffer.axes.assign(GetAxisCount(), 0.0f);
+
+  return true;
+}
+
+void CAndroidJoystickState::Deinitialize(void)
+{
+  m_buttons.clear();
+  m_hats.clear();
+  m_axes.clear();
+
+  m_state.buttons.clear();
+  m_state.hats.clear();
+  m_state.axes.clear();
+
+  m_stateBuffer.buttons.clear();
+  m_stateBuffer.hats.clear();
+  m_stateBuffer.axes.clear();
+}
+
+bool CAndroidJoystickState::ProcessEvent(const AInputEvent* event)
+{
+  int32_t type = AInputEvent_getType(event);
+
+  switch (type)
+  {
+    case AINPUT_EVENT_TYPE_KEY:
+    {
+      int32_t keycode = AKeyEvent_getKeyCode(event);
+      int32_t action = AKeyEvent_getAction(event);
+
+      JOYSTICK_STATE_BUTTON buttonState = JOYSTICK_STATE_BUTTON_UNPRESSED;
+      if (action == AKEY_EVENT_ACTION_DOWN)
+        buttonState = JOYSTICK_STATE_BUTTON_PRESSED;
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState::ProcessEvent(type = key, keycode = %d, action = %d): %s",
+                keycode, action, (buttonState == JOYSTICK_STATE_BUTTON_UNPRESSED ? "unpressed" : "pressed"));
+
+      bool result = SetButtonValue(keycode, buttonState);
+
+      // check if the key event belongs to the D-Pad which needs to be ignored
+      // if we handle the D-Pad as a hat
+      if (!result &&
+         (keycode == AKEYCODE_DPAD_UP || keycode == AKEYCODE_DPAD_DOWN || keycode == AKEYCODE_DPAD_LEFT || keycode == AKEYCODE_DPAD_RIGHT) &&
+         !m_hats.empty())
+        return true;
+
+      return result;
+    }
+
+    case AINPUT_EVENT_TYPE_MOTION:
+    {
+      size_t count = AMotionEvent_getPointerCount(event);
+      CLog::Log(LOGDEBUG, "CAndroidJoystickState::ProcessEvent(type = motion, pointers = %u)",
+                static_cast<unsigned int>(count));
+
+      bool success = false;
+      for (size_t pointer = 0; pointer < count; ++pointer)
+      {
+        // process the hats
+        for (const auto& hat : m_hats)
+        {
+          float valueX = AMotionEvent_getAxisValue(event, hat.ids[0], pointer);
+          float valueY = AMotionEvent_getAxisValue(event, hat.ids[1], pointer);
+          CLog::Log(LOGDEBUG, "CAndroidJoystickState::ProcessEvent(type = hat, axis = %s, pointers = %u): [%u] x = %f | y = %f",
+                    PrintAxisIds(hat.ids).c_str(), static_cast<unsigned int>(count), static_cast<unsigned int>(pointer), valueX, valueY);
+
+          int hatValue = JOYSTICK_STATE_HAT_UNPRESSED;
+          if (valueX < -hat.flat)
+            hatValue |= JOYSTICK_STATE_HAT_LEFT;
+          else if (valueX > hat.flat)
+            hatValue |= JOYSTICK_STATE_HAT_RIGHT;
+          if (valueY < -hat.flat)
+            hatValue |= JOYSTICK_STATE_HAT_UP;
+          else if (valueY > hat.flat)
+            hatValue |= JOYSTICK_STATE_HAT_DOWN;
+
+          success |= SetHatValue(hat.ids, static_cast<JOYSTICK_STATE_HAT>(hatValue));
+        }
+
+        // process all axes
+        for (const auto& axis : m_axes)
+        {
+          // get all potential values
+          std::vector<float> values;
+          for (const auto& axisId : axis.ids)
+            values.push_back(AMotionEvent_getAxisValue(event, axisId, pointer));
+
+          // remove all zero values
+          values.erase(std::remove(values.begin(), values.end(), 0.0f), values.end());
+
+          float value = 0.0f;
+          // pick the first non-zero value
+          if (!values.empty())
+            value = values.front();
+          CLog::Log(LOGDEBUG, "CAndroidJoystickState::ProcessEvent(type = axis, axis = %s, pointers = %u): [%u] value = %f",
+                    PrintAxisIds(axis.ids).c_str(), static_cast<unsigned int>(count), static_cast<unsigned int>(pointer), value);
+
+          success |= SetAxisValue(axis.ids, value);
+        }
+      }
+      return success;
+    }
+
+    default:
+      CLog::Log(LOGWARNING, "CAndroidJoystickState: unknown input event type %d from input device with ID %d", type, m_deviceId);
+      break;
+  }
+
+  return false;
+}
+
+void CAndroidJoystickState::GetEvents(std::vector<ADDON::PeripheralEvent>& events) const
+{
+  GetButtonEvents(events);
+  GetHatEvents(events);
+  GetAxisEvents(events);
+}
+
+void CAndroidJoystickState::GetButtonEvents(std::vector<ADDON::PeripheralEvent>& events) const
+{
+  const std::vector<JOYSTICK_STATE_BUTTON>& buttons = m_stateBuffer.buttons;
+
+  for (unsigned int i = 0; i < buttons.size(); i++)
+  {
+    if (buttons[i] != m_state.buttons[i])
+      events.push_back(ADDON::PeripheralEvent(m_deviceId, i, buttons[i]));
+  }
+
+  m_state.buttons.assign(buttons.begin(), buttons.end());
+}
+
+void CAndroidJoystickState::GetHatEvents(std::vector<ADDON::PeripheralEvent>& events) const
+{
+  const std::vector<JOYSTICK_STATE_HAT>& hats = m_stateBuffer.hats;
+
+  for (unsigned int i = 0; i < hats.size(); i++)
+  {
+    if (hats[i] != m_state.hats[i])
+      events.push_back(ADDON::PeripheralEvent(m_deviceId, i, hats[i]));
+  }
+
+  m_state.hats.assign(hats.begin(), hats.end());
+}
+
+void CAndroidJoystickState::GetAxisEvents(std::vector<ADDON::PeripheralEvent>& events) const
+{
+  const std::vector<JOYSTICK_STATE_AXIS>& axes = m_stateBuffer.axes;
+
+  for (unsigned int i = 0; i < axes.size(); i++)
+  {
+    if (axes[i] != 0.0f || m_state.axes[i] != 0.0f)
+      events.push_back(ADDON::PeripheralEvent(m_deviceId, i, axes[i]));
+  }
+
+  m_state.axes.assign(axes.begin(), axes.end());
+}
+
+bool CAndroidJoystickState::SetButtonValue(int axisId, JOYSTICK_STATE_BUTTON buttonValue)
+{
+  size_t buttonIndex = 0;
+  if (!GetAxesIndex({ axisId }, m_buttons, buttonIndex) || buttonIndex >= GetButtonCount())
+    return false;
+
+  CLog::Log(LOGDEBUG, "CAndroidJoystickState: setting value for button %s to %d", PrintAxisIds(m_buttons[buttonIndex].ids).c_str(), buttonValue);
+  m_stateBuffer.buttons[buttonIndex] = buttonValue;
+  return true;
+}
+
+bool CAndroidJoystickState::SetHatValue(const std::vector<int>& axisIds, JOYSTICK_STATE_HAT hatValue)
+{
+  size_t hatIndex = 25;
+  if (!GetAxesIndex(axisIds, m_hats, hatIndex) || hatIndex >= GetHatCount())
+    return false;
+
+  CLog::Log(LOGDEBUG, "CAndroidJoystickState: setting value for hat %s to %d", PrintAxisIds(axisIds).c_str(), hatValue);
+  m_stateBuffer.hats[hatIndex] = hatValue;
+  return true;
+}
+
+bool CAndroidJoystickState::SetAxisValue(const std::vector<int>& axisIds, JOYSTICK_STATE_AXIS axisValue)
+{
+  size_t axisIndex = 0;
+  if (!GetAxesIndex(axisIds, m_axes, axisIndex) || axisIndex >= GetAxisCount())
+    return false;
+
+  const JoystickAxis axis = m_axes[axisIndex];
+
+  // make sure that the axis value is in the valid range
+  axisValue = Contain(axisValue, axis.min, axis.max);
+  // apply deadzoning
+  axisValue = Deadzone(axisValue, axis.flat);
+  // scale the axis value down to a value between -1.0f and 1.0f
+  axisValue = Scale(axisValue, axis.max, 1.0f);
+
+  CLog::Log(LOGDEBUG, "CAndroidJoystickState: setting value for axis %s to %f", PrintAxisIds(axisIds).c_str(), axisValue);
+  m_stateBuffer.axes[axisIndex] = axisValue;
+  return true;
+}
+
+float CAndroidJoystickState::Contain(float value, float min, float max)
+{
+  if (value < min)
+    return min;
+  if (value > max)
+    return max;
+
+  return value;
+}
+
+float CAndroidJoystickState::Scale(float value, float max, float scaledMax)
+{
+  return value * (scaledMax / max);
+}
+
+float CAndroidJoystickState::Deadzone(float value, float deadzone)
+{
+  if ((value > 0.0f && value < deadzone) ||
+      (value < 0.0f && value > -deadzone))
+    return 0.0f;
+
+  return value;
+}
+
+CAndroidJoystickState::JoystickAxes::const_iterator CAndroidJoystickState::GetAxis(const std::vector<int>& axisIds, const JoystickAxes& axes)
+{
+  return std::find_if(axes.cbegin(), axes.cend(),
+                     [axisIds](const JoystickAxis& axis)
+                     {
+                       std::vector<int> matches(std::max(axisIds.size(), axis.ids.size()));
+                       const auto& matchesEnd = std::set_intersection(axisIds.begin(), axisIds.end(),
+                                                                      axis.ids.begin(), axis.ids.end(),
+                                                                      matches.begin());
+                       matches.resize(matchesEnd - matches.begin());
+                       return !matches.empty();
+                     });
+}
+
+bool CAndroidJoystickState::ContainsAxis(int axisId, const JoystickAxes& axes)
+{
+  return GetAxis({ axisId }, axes) != axes.cend();
+}
+
+bool CAndroidJoystickState::GetAxesIndex(const std::vector<int>& axisIds, const JoystickAxes& axes, size_t& axesIndex)
+{
+  auto axesIt = GetAxis(axisIds, axes);
+  if (axesIt == axes.end())
+    return false;
+
+  axesIndex = std::distance(axes.begin(), axesIt);
+  return true;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android/AndroidJoystickState.h Added

@@ -0,0 +1,113 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"
+
+#include <string>
+#include <utility>
+#include <vector>
+
+struct AInputEvent;
+class CJNIViewInputDevice;
+
+namespace PERIPHERALS
+{
+  class CAndroidJoystickState
+  {
+  public:
+    CAndroidJoystickState();
+    virtual ~CAndroidJoystickState();
+
+    int GetDeviceId() const { return m_deviceId; }
+
+    unsigned int GetButtonCount() const { return m_buttons.size(); }
+    unsigned int GetHatCount() const { return m_hats.size(); }
+    unsigned int GetAxisCount() const { return m_axes.size(); }
+
+    /*!
+     * Initialize the joystick object. Joystick will be initialized before the
+     * first call to GetEvents().
+     */
+    bool Initialize(const CJNIViewInputDevice& inputDevice);
+
+    /*!
+     * Deinitialize the joystick object. GetEvents() will not be called after
+     * deinitialization.
+     */
+    void Deinitialize();
+
+    /*!
+     * Processes the given input event.
+     */
+    bool ProcessEvent(const AInputEvent* event);
+
+    /*!
+     * Get events that have occurred since the last call to GetEvents()
+     */
+    void GetEvents(std::vector<ADDON::PeripheralEvent>& events) const;
+
+  private:
+    bool SetButtonValue(int axisId, JOYSTICK_STATE_BUTTON buttonValue);
+    bool SetHatValue(const std::vector<int>& axisIds, JOYSTICK_STATE_HAT hatValue);
+    bool SetAxisValue(const std::vector<int>& axisIds, JOYSTICK_STATE_AXIS axisValue);
+
+    void GetButtonEvents(std::vector<ADDON::PeripheralEvent>& events) const;
+    void GetHatEvents(std::vector<ADDON::PeripheralEvent>& events) const;
+    void GetAxisEvents(std::vector<ADDON::PeripheralEvent>& events) const;
+
+    static float Contain(float value, float min, float max);
+    static float Scale(float value, float max, float scaledMax);
+    static float Deadzone(float value, float deadzone);
+
+    struct JoystickAxis
+    {
+      std::vector<int> ids;
+      float flat;
+      float fuzz;
+      float min;
+      float max;
+      float range;
+      float resolution;
+    };
+
+    using JoystickAxes = std::vector<JoystickAxis>;
+
+    static JoystickAxes::const_iterator GetAxis(const std::vector<int>& axisIds, const JoystickAxes& axes);
+    static bool ContainsAxis(int axisId, const JoystickAxes& axes);
+    static bool GetAxesIndex(const std::vector<int>& axisIds, const JoystickAxes& axes, size_t& axesIndex);
+
+    struct JoystickState
+    {
+      std::vector<JOYSTICK_STATE_BUTTON> buttons;
+      std::vector<JOYSTICK_STATE_HAT> hats;
+      std::vector<JOYSTICK_STATE_AXIS> axes;
+    };
+
+    int m_deviceId;
+
+    JoystickAxes m_buttons;
+    JoystickAxes m_hats;
+    JoystickAxes m_axes;
+
+    mutable JoystickState m_state;
+    JoystickState m_stateBuffer;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android/CMakeLists.txt Added

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android/PeripheralBusAndroid.cpp Added

@@ -0,0 +1,365 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <android/input.h>
+
+#include "PeripheralBusAndroid.h"
+#include "input/joysticks/JoystickTranslator.h"
+#include "input/joysticks/JoystickTypes.h"
+#include "peripherals/addons/PeripheralAddonTranslator.h"
+#include "peripherals/devices/PeripheralJoystick.h"
+#include "platform/android/activity/XBMCApp.h"
+#include "platform/android/jni/View.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+
+using namespace PERIPHERALS;
+
+static const std::string DeviceLocationPrefix = "android/inputdevice/";
+
+CPeripheralBusAndroid::CPeripheralBusAndroid(CPeripherals *manager) :
+    CPeripheralBus("PeripBusAndroid", manager, PERIPHERAL_BUS_ANDROID)
+{
+  // we don't need polling as we get notified through the IInputDeviceCallbacks interface
+  m_bNeedsPolling = false;
+
+  // register for input device callbacks
+  CXBMCApp::RegisterInputDeviceCallbacks(this);
+
+  // register for input device events
+  CXBMCApp::RegisterInputDeviceEventHandler(this);
+
+  // get all currently connected input devices
+  m_scanResults = GetInputDevices();
+}
+
+CPeripheralBusAndroid::~CPeripheralBusAndroid()
+{
+  // unregister from input device events
+  CXBMCApp::UnregisterInputDeviceEventHandler();
+
+  // unregister from input device callbacks
+  CXBMCApp::UnregisterInputDeviceCallbacks();
+}
+
+bool CPeripheralBusAndroid::InitializeProperties(CPeripheral* peripheral) const
+{
+  if (peripheral == nullptr || peripheral->Type() != PERIPHERAL_JOYSTICK)
+  {
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: unknown peripheral");
+    return false;
+  }
+
+  int deviceId;
+  if (!GetDeviceId(peripheral->Location(), deviceId))
+  {
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to initialize properties for peripheral \"%s\"", peripheral->Location().c_str());
+    return false;
+  }
+
+  const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+  if (!device)
+  {
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to get input device with ID %d", deviceId);
+    return false;
+  }
+
+  CPeripheralJoystick* joystick = static_cast<CPeripheralJoystick*>(peripheral);
+  joystick->SetRequestedPort(device.getControllerNumber());
+  joystick->SetProvider("android");
+
+  // prepare the joystick state
+  CAndroidJoystickState state;
+  if (!state.Initialize(device))
+  {
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to initialize the state for input device \"%s\" with ID %d",
+              joystick->DeviceName().c_str(), deviceId);
+    return false;
+  }
+
+  // fill in the number of buttons, hats and axes
+  joystick->SetButtonCount(state.GetButtonCount());
+  joystick->SetHatCount(state.GetHatCount());
+  joystick->SetAxisCount(state.GetAxisCount());
+
+  // remember the joystick state
+  m_joystickStates.insert(std::make_pair(deviceId, std::move(state)));
+
+  CLog::Log(LOGDEBUG, "CPeripheralBusAndroid: input device \"%s\" with ID %d has %u buttons, %u hats and %u axes",
+            joystick->DeviceName().c_str(), deviceId, joystick->ButtonCount(), joystick->HatCount(), joystick->AxisCount());
+  return true;
+}
+
+void CPeripheralBusAndroid::ProcessEvents()
+{
+  std::vector<ADDON::PeripheralEvent> events;
+  {
+    CSingleLock lock(m_critSectionStates);
+    for (const auto& joystickState : m_joystickStates)
+      joystickState.second.GetEvents(events);
+  }
+
+  for (const auto& event : events)
+  {
+    CPeripheral* device = GetPeripheral(GetDeviceLocation(event.PeripheralIndex()));
+    if (device == nullptr || device->Type() != PERIPHERAL_JOYSTICK)
+      continue;
+
+    CPeripheralJoystick* joystick = static_cast<CPeripheralJoystick*>(device);
+    switch (event.Type())
+    {
+      case PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON:
+      {
+        const bool bPressed = (event.ButtonState() == JOYSTICK_STATE_BUTTON_PRESSED);
+        CLog::Log(LOGDEBUG, "Button [ %u ] on %s %s", event.DriverIndex(),
+                  joystick->DeviceName().c_str(), bPressed ? "pressed" : "released");
+        if (joystick->OnButtonMotion(event.DriverIndex(), bPressed))
+          CLog::Log(LOGDEBUG, "Joystick button event handled");
+        break;
+      }
+      case PERIPHERAL_EVENT_TYPE_DRIVER_HAT:
+      {
+        const JOYSTICK::HAT_STATE state = CPeripheralAddonTranslator::TranslateHatState(event.HatState());
+        CLog::Log(LOGDEBUG, "Hat [ %u ] on %s %s", event.DriverIndex(),
+                  joystick->DeviceName().c_str(), JOYSTICK::CJoystickTranslator::HatStateToString(state));
+        if (joystick->OnHatMotion(event.DriverIndex(), state))
+          CLog::Log(LOGDEBUG, "Joystick hat event handled");
+        break;
+      }
+      case PERIPHERAL_EVENT_TYPE_DRIVER_AXIS:
+      {
+        joystick->OnAxisMotion(event.DriverIndex(), event.AxisState());
+        break;
+      }
+      default:
+        break;
+    }
+  }
+
+  {
+    CSingleLock lock(m_critSectionStates);
+    for (const auto& joystickState : m_joystickStates)
+    {
+      CPeripheral* device = GetPeripheral(GetDeviceLocation(joystickState.second.GetDeviceId()));
+      if (device == nullptr || device->Type() != PERIPHERAL_JOYSTICK)
+        continue;
+
+      static_cast<CPeripheralJoystick*>(device)->ProcessAxisMotions();
+    }
+  }
+}
+
+void CPeripheralBusAndroid::OnInputDeviceAdded(int deviceId)
+{
+  const std::string deviceLocation = GetDeviceLocation(deviceId);
+  {
+    CSingleLock lock(m_critSectionResults);
+    // add the device to the cached result list
+    const auto& it = std::find_if(m_scanResults.m_results.cbegin(), m_scanResults.m_results.cend(),
+      [&deviceLocation](const PeripheralScanResult& scanResult) { return scanResult.m_strLocation == deviceLocation; });
+    if (it != m_scanResults.m_results.cend())
+    {
+        CLog::Log(LOGINFO, "CPeripheralBusAndroid: ignoring added input device with ID %d because we already know it", deviceId);
+        return;
+    }
+
+    const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+    if (!device)
+    {
+      CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to add input device with ID %d because it couldn't be found", deviceId);
+      return;
+    }
+
+    PeripheralScanResult result;
+    if (!ConvertToPeripheralScanResult(device, result))
+      return;
+    m_scanResults.m_results.push_back(result);
+  }
+
+  CLog::Log(LOGDEBUG, "CPeripheralBusAndroid: input device with ID %d added", deviceId);
+  OnDeviceAdded(deviceLocation);
+}
+
+void CPeripheralBusAndroid::OnInputDeviceChanged(int deviceId)
+{
+  bool changed = false;
+  const std::string deviceLocation = GetDeviceLocation(deviceId);
+  {
+    CSingleLock lock(m_critSectionResults);
+    // change the device in the cached result list
+    for (auto result = m_scanResults.m_results.begin(); result != m_scanResults.m_results.end(); ++result)
+    {
+      if (result->m_strLocation == deviceLocation)
+      {
+        const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+        if (!device)
+        {
+          CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to update input device \"%s\" with ID %d because it couldn't be found", result->m_strDeviceName.c_str(), deviceId);
+          return;
+        }
+
+        if (!ConvertToPeripheralScanResult(device, *result))
+          return;
+
+        CLog::Log(LOGINFO, "CPeripheralBusAndroid: input device \"%s\" with ID %d updated", result->m_strDeviceName.c_str(), deviceId);
+        changed = true;
+        break;
+      }
+    }
+  }
+
+  if (changed)
+    OnDeviceChanged(deviceLocation);
+  else
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to update input device with ID %d because it couldn't be found", deviceId);
+}
+
+void CPeripheralBusAndroid::OnInputDeviceRemoved(int deviceId)
+{
+  bool removed = false;
+  const std::string deviceLocation = GetDeviceLocation(deviceId);
+  {
+    CSingleLock lock(m_critSectionResults);
+    // remove the device from the cached result list
+    for (auto result = m_scanResults.m_results.begin(); result != m_scanResults.m_results.end(); ++result)
+    {
+      if (result->m_strLocation == deviceLocation)
+      {
+        CLog::Log(LOGINFO, "CPeripheralBusAndroid: input device \"%s\" with ID %d removed", result->m_strDeviceName.c_str(), deviceId);
+        m_scanResults.m_results.erase(result);
+        removed = true;
+        break;
+      }
+    }
+  }
+
+  if (removed)
+  {
+    m_joystickStates.erase(deviceId);
+
+    OnDeviceRemoved(deviceLocation);
+  }
+  else
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: failed to remove input device with ID %d because it couldn't be found", deviceId);
+}
+
+bool CPeripheralBusAndroid::OnInputDeviceEvent(const AInputEvent* event)
+{
+  if (event == nullptr)
+    return false;
+
+  CSingleLock lock(m_critSectionStates);
+  // get the id of the input device which generated the event
+  int32_t deviceId = AInputEvent_getDeviceId(event);
+
+  // find the matching joystick state
+  auto joystickState = m_joystickStates.find(deviceId);
+  if (joystickState == m_joystickStates.end())
+  {
+    CLog::Log(LOGWARNING, "CPeripheralBusAndroid: ignoring input event for unknown input device with ID %d", deviceId);
+    return false;
+  }
+
+  return joystickState->second.ProcessEvent(event);
+}
+
+bool CPeripheralBusAndroid::PerformDeviceScan(PeripheralScanResults &results)
+{
+  CSingleLock lock(m_critSectionResults);
+  results = m_scanResults;
+
+  return true;
+}
+
+PeripheralScanResults CPeripheralBusAndroid::GetInputDevices()
+{
+  CLog::Log(LOGINFO, "CPeripheralBusAndroid: scanning for input devices...");
+
+  PeripheralScanResults results;
+  std::vector<int> deviceIds = CXBMCApp::GetInputDeviceIds();
+
+  for (const auto& deviceId : deviceIds)
+  {
+    const CJNIViewInputDevice device = CXBMCApp::GetInputDevice(deviceId);
+    if (!device)
+    {
+      CLog::Log(LOGWARNING, "CPeripheralBusAndroid: no input device with ID %d found", deviceId);
+      continue;
+    }
+
+    PeripheralScanResult result;
+    if (!ConvertToPeripheralScanResult(device, result))
+      continue;
+
+    CLog::Log(LOGINFO, "CPeripheralBusAndroid: input device \"%s\" with ID %d detected", result.m_strDeviceName.c_str(), deviceId);
+    results.m_results.push_back(result);
+  }
+
+  return results;
+}
+
+std::string CPeripheralBusAndroid::GetDeviceLocation(int deviceId)
+{
+  return StringUtils::Format("%s%d", DeviceLocationPrefix.c_str(), deviceId);
+}
+
+bool CPeripheralBusAndroid::GetDeviceId(const std::string& deviceLocation, int& deviceId)
+{
+  if (deviceLocation.empty() ||
+      !StringUtils::StartsWith(deviceLocation, DeviceLocationPrefix) ||
+      deviceLocation.size() <= DeviceLocationPrefix.size())
+    return false;
+
+  std::string strDeviceId = deviceLocation.substr(DeviceLocationPrefix.size());
+  if (!StringUtils::IsNaturalNumber(strDeviceId))
+    return false;
+
+  deviceId = static_cast<int>(strtol(strDeviceId.c_str(), nullptr, 10));
+  return true;
+}
+
+bool CPeripheralBusAndroid::ConvertToPeripheralScanResult(const CJNIViewInputDevice& inputDevice, PeripheralScanResult& peripheralScanResult)
+{
+  int deviceId = inputDevice.getId();
+  std::string deviceName = inputDevice.getName();
+  if (inputDevice.isVirtual())
+  {
+    CLog::Log(LOGDEBUG, "CPeripheralBusAndroid: ignoring virtual input device \"%s\" with ID %d", deviceName.c_str(), deviceId);
+    return false;
+  }
+  if (!inputDevice.supportsSource(CJNIViewInputDevice::SOURCE_JOYSTICK) && !inputDevice.supportsSource(CJNIViewInputDevice::SOURCE_GAMEPAD))
+  {
+    CLog::Log(LOGDEBUG, "CPeripheralBusAndroid: ignoring unknown input device \"%s\" with ID %d", deviceName.c_str(), deviceId);
+    return false;
+  }
+
+  peripheralScanResult.m_type = PERIPHERAL_JOYSTICK;
+  peripheralScanResult.m_strLocation = GetDeviceLocation(deviceId);
+  peripheralScanResult.m_iVendorId = inputDevice.getVendorId();
+  peripheralScanResult.m_iProductId = inputDevice.getProductId();
+  peripheralScanResult.m_mappedType = PERIPHERAL_JOYSTICK;
+  peripheralScanResult.m_strDeviceName = deviceName;
+  peripheralScanResult.m_busType = PERIPHERAL_BUS_ANDROID;
+  peripheralScanResult.m_mappedBusType = PERIPHERAL_BUS_ANDROID;
+  peripheralScanResult.m_iSequence = 0;
+
+  return true;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/android/PeripheralBusAndroid.h Added

@@ -0,0 +1,78 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+ 
+#include <memory>
+#include <string>
+
+#include "peripherals/PeripheralTypes.h"
+#include "peripherals/bus/PeripheralBus.h"
+#include "peripherals/bus/android/AndroidJoystickState.h"
+#include "platform/android/activity/IInputDeviceCallbacks.h"
+#include "platform/android/activity/IInputDeviceEventHandler.h"
+#include "threads/CriticalSection.h"
+
+class CJNIViewInputDevice;
+
+namespace PERIPHERALS
+{
+  class CPeripheralBusAndroid : public CPeripheralBus,
+                                public IInputDeviceCallbacks,
+                                public IInputDeviceEventHandler
+  {
+  public:
+    CPeripheralBusAndroid(CPeripherals *manager);
+    virtual ~CPeripheralBusAndroid();
+
+    /*!
+     * \brief Initialize the properties of a peripheral with a known location
+     */
+    bool InitializeProperties(CPeripheral* peripheral) const;
+
+    // specialisation of CPeripheralBus
+    void ProcessEvents() override;
+
+    // implementations of IInputDeviceCallbacks
+    void OnInputDeviceAdded(int deviceId) override;
+    void OnInputDeviceChanged(int deviceId) override;
+    void OnInputDeviceRemoved(int deviceId) override;
+
+    // implementation of IInputDeviceEventHandler
+    bool OnInputDeviceEvent(const AInputEvent* event) override;
+
+  protected:
+    // implementation of CPeripheralBus
+    bool PerformDeviceScan(PeripheralScanResults &results) override;
+
+  private:
+    static PeripheralScanResults GetInputDevices();
+
+    static std::string GetDeviceLocation(int deviceId);
+    static bool GetDeviceId(const std::string& deviceLocation, int& deviceId);
+
+    static bool ConvertToPeripheralScanResult(const CJNIViewInputDevice& inputDevice, PeripheralScanResult& peripheralScanResult);
+
+    mutable std::map<int, CAndroidJoystickState> m_joystickStates;
+    PeripheralScanResults m_scanResults;
+    CCriticalSection m_critSectionStates;
+    CCriticalSection m_critSectionResults;
+  };
+  using PeripheralBusAndroidPtr = std::shared_ptr<CPeripheralBusAndroid>;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/virtual/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusAddon.cpp Added

@@ -0,0 +1,393 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PeripheralBusAddon.h"
+#include "addons/Addon.h"
+#include "addons/AddonManager.h"
+#include "peripherals/Peripherals.h"
+#include "peripherals/addons/PeripheralAddon.h"
+#include "peripherals/devices/PeripheralJoystick.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
+
+#include <algorithm>
+#include <memory>
+
+using namespace ADDON;
+using namespace PERIPHERALS;
+
+CPeripheralBusAddon::CPeripheralBusAddon(CPeripherals *manager) :
+    CPeripheralBus("PeripBusAddon", manager, PERIPHERAL_BUS_ADDON)
+{
+  CAddonMgr::GetInstance().RegisterAddonMgrCallback(ADDON_PERIPHERALDLL, this);
+  CAddonMgr::GetInstance().RegisterObserver(this);
+
+  UpdateAddons();
+}
+
+CPeripheralBusAddon::~CPeripheralBusAddon()
+{
+  CAddonMgr::GetInstance().UnregisterObserver(this);
+  CAddonMgr::GetInstance().UnregisterAddonMgrCallback(ADDON_PERIPHERALDLL);
+
+  // stop everything before destroying any (loaded) addons
+  Clear();
+
+  // destroy any (loaded) addons
+  m_failedAddons.clear();
+  m_addons.clear();
+}
+
+bool CPeripheralBusAddon::GetAddon(const std::string &strId, AddonPtr &addon) const
+{
+  CSingleLock lock(m_critSection);
+  for (const auto& addonIt : m_addons)
+  {
+    if (addonIt->ID() == strId)
+    {
+      addon = addonIt;
+      return true;
+    }
+  }
+  for (const auto& addonIt : m_failedAddons)
+  {
+    if (addonIt->ID() == strId)
+    {
+      addon = addonIt;
+      return true;
+    }
+  }
+  return false;
+}
+
+bool CPeripheralBusAddon::GetAddonWithButtonMap(const CPeripheral* device, PeripheralAddonPtr &addon) const
+{
+  CSingleLock lock(m_critSection);
+  for (const auto& addonIt : m_addons)
+  {
+    if (addonIt->HasButtonMaps())
+    {
+      addon = addonIt;
+      return true;
+    }
+  }
+  return false;
+}
+
+unsigned int CPeripheralBusAddon::GetAddonCount(void) const
+{
+  CSingleLock lock(m_critSection);
+  return m_addons.size();
+}
+
+bool CPeripheralBusAddon::PerformDeviceScan(PeripheralScanResults &results)
+{
+  PeripheralAddonVector addons;
+  {
+    CSingleLock lock(m_critSection);
+    addons = m_addons;
+  }
+  
+  for (const auto& addon : addons)
+    addon->PerformDeviceScan(results);
+
+  // Scan during bus initialization must return true or bus gets deleted
+  return true;
+}
+
+bool CPeripheralBusAddon::InitializeProperties(CPeripheral* peripheral)
+{
+  bool bSuccess = false;
+
+  PeripheralAddonPtr addon;
+  unsigned int index;
+
+  if (SplitLocation(peripheral->Location(), addon, index))
+  {
+    switch (peripheral->Type())
+    {
+      case PERIPHERAL_JOYSTICK:
+        bSuccess = addon->GetJoystickProperties(index, *static_cast<CPeripheralJoystick*>(peripheral));
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  return bSuccess;
+}
+
+void CPeripheralBusAddon::ProcessEvents(void)
+{
+  PeripheralAddonVector addons;
+
+  {
+    CSingleLock lock(m_critSection);
+    addons = m_addons;
+  }
+
+  for (const auto& addon : addons)
+    addon->ProcessEvents();
+}
+
+void CPeripheralBusAddon::UnregisterRemovedDevices(const PeripheralScanResults &results)
+{
+  CSingleLock lock(m_critSection);
+
+  std::vector<CPeripheral*> removedPeripherals;
+
+  for (const auto& addon : m_addons)
+    addon->UnregisterRemovedDevices(results, removedPeripherals);
+
+  for (const auto& peripheral : removedPeripherals)
+  {
+    m_manager->OnDeviceDeleted(*this, *peripheral);
+    delete peripheral;
+  }
+}
+
+void CPeripheralBusAddon::Register(CPeripheral* peripheral)
+{
+  if (!peripheral)
+    return;
+
+  PeripheralAddonPtr addon;
+  unsigned int       peripheralIndex;
+
+  CSingleLock lock(m_critSection);
+
+  if (SplitLocation(peripheral->Location(), addon, peripheralIndex))
+  {
+    if (addon->Register(peripheralIndex, peripheral))
+      m_manager->OnDeviceAdded(*this, *peripheral);
+  }
+}
+
+void CPeripheralBusAddon::GetFeatures(std::vector<PeripheralFeature> &features) const
+{
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    addon->GetFeatures(features);
+}
+
+bool CPeripheralBusAddon::HasFeature(const PeripheralFeature feature) const
+{
+  bool bReturn(false);
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    bReturn = bReturn || addon->HasFeature(feature);
+  return bReturn;
+}
+
+CPeripheral *CPeripheralBusAddon::GetPeripheral(const std::string &strLocation) const
+{
+  CPeripheral*       peripheral(NULL);
+  PeripheralAddonPtr addon;
+  unsigned int       peripheralIndex;
+
+  CSingleLock lock(m_critSection);
+
+  if (SplitLocation(strLocation, addon, peripheralIndex))
+    peripheral = addon->GetPeripheral(peripheralIndex);
+
+  return peripheral;
+}
+
+CPeripheral *CPeripheralBusAddon::GetByPath(const std::string &strPath) const
+{
+  CSingleLock lock(m_critSection);
+
+  for (const auto& addon : m_addons)
+  {
+    CPeripheral* peripheral = addon->GetByPath(strPath);
+    if (peripheral)
+      return peripheral;
+  }
+
+  return NULL;
+}
+
+int CPeripheralBusAddon::GetPeripheralsWithFeature(std::vector<CPeripheral *> &results, const PeripheralFeature feature) const
+{
+  int iReturn(0);
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    iReturn += addon->GetPeripheralsWithFeature(results, feature);
+  return iReturn;
+}
+
+size_t CPeripheralBusAddon::GetNumberOfPeripherals(void) const
+{
+  size_t iReturn(0);
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    iReturn += addon->GetNumberOfPeripherals();
+  return iReturn;
+}
+
+size_t CPeripheralBusAddon::GetNumberOfPeripheralsWithId(const int iVendorId, const int iProductId) const
+{
+  size_t iReturn(0);
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    iReturn += addon->GetNumberOfPeripheralsWithId(iVendorId, iProductId);
+  return iReturn;
+}
+
+void CPeripheralBusAddon::GetDirectory(const std::string &strPath, CFileItemList &items) const
+{
+  CSingleLock lock(m_critSection);
+  for (const auto& addon : m_addons)
+    addon->GetDirectory(strPath, items);
+}
+
+bool CPeripheralBusAddon::RequestRestart(ADDON::AddonPtr addon, bool datachanged)
+{
+  // make sure this is a peripheral addon
+  PeripheralAddonPtr peripheralAddon = std::dynamic_pointer_cast<CPeripheralAddon>(addon);
+  if (peripheralAddon == nullptr)
+    return false;
+
+  if (peripheralAddon->CreateAddon() != ADDON_STATUS_OK)
+  {
+    CSingleLock lock(m_critSection);
+    m_addons.erase(std::remove(m_addons.begin(), m_addons.end(), peripheralAddon), m_addons.end());
+    m_failedAddons.push_back(peripheralAddon);
+  }
+
+  return true;
+}
+
+bool CPeripheralBusAddon::RequestRemoval(ADDON::AddonPtr addon)
+{
+  // make sure this is a peripheral addon
+  PeripheralAddonPtr peripheralAddon = std::dynamic_pointer_cast<CPeripheralAddon>(addon);
+  if (peripheralAddon == nullptr)
+    return false;
+
+  CSingleLock lock(m_critSection);
+  // destroy the peripheral addon
+  peripheralAddon->Destroy();
+
+  // remove the peripheral addon from the list of addons
+  m_addons.erase(std::remove(m_addons.begin(), m_addons.end(), peripheralAddon), m_addons.end());
+
+  return true;
+}
+
+void CPeripheralBusAddon::Notify(const Observable &obs, const ObservableMessage msg)
+{
+  if (msg == ObservableMessageAddons)
+    UpdateAddons();
+}
+
+bool CPeripheralBusAddon::SplitLocation(const std::string& strLocation, PeripheralAddonPtr& addon, unsigned int& peripheralIndex) const
+{
+  std::vector<std::string> parts = StringUtils::Split(strLocation, "/");
+  if (parts.size() == 2)
+  {
+    addon.reset();
+
+    CSingleLock lock(m_critSection);
+
+    const std::string& strAddonId = parts[0];
+    for (const auto& addonIt : m_addons)
+    {
+      if (addonIt->ID() == strAddonId)
+      {
+        addon = addonIt;
+        break;
+      }
+    }
+
+    if (addon)
+    {
+      const char* strJoystickIndex = parts[1].c_str();
+      char* p = NULL;
+      peripheralIndex = strtol(strJoystickIndex, &p, 10);
+      if (strJoystickIndex != p)
+        return true;
+    }
+  }
+  return false;
+}
+
+void CPeripheralBusAddon::UpdateAddons(void)
+{
+  PeripheralAddonVector removedAddons;
+  PeripheralAddonVector newAddons;
+
+  VECADDONS addons;
+  CAddonMgr::GetInstance().GetAddons(addons, ADDON_PERIPHERALDLL);
+
+  {
+    CSingleLock lock(m_critSection);
+    
+    // Search for removed add-ons
+    for (const auto& addon : m_addons)
+    {
+      const bool bRemoved = (std::find(addons.begin(), addons.end(),
+        std::static_pointer_cast<CAddon>(addon)) == addons.end());
+
+      if (bRemoved)
+        removedAddons.push_back(addon);
+    }
+
+    // Search for new add-ons
+    for (const auto& addon : addons)
+    {
+      PeripheralAddonPtr peripheralAddon = std::dynamic_pointer_cast<CPeripheralAddon>(addon);
+      if (!peripheralAddon)
+        continue;
+
+      // If add-on failed to load, skip it
+      if (std::find(m_failedAddons.begin(), m_failedAddons.end(), peripheralAddon) != m_failedAddons.end())
+        continue;
+
+      // If add-on has already been created, skip it
+      if (std::find(m_addons.begin(), m_addons.end(), peripheralAddon) != m_addons.end())
+        continue;
+
+      newAddons.push_back(peripheralAddon);
+    }
+
+    // Update m_addons
+    for (const auto& addon : removedAddons)
+      m_addons.erase(std::remove(m_addons.begin(), m_addons.end(), addon), m_addons.end());
+    for (const auto& addon : newAddons)
+      m_addons.push_back(addon);
+  }
+
+  // Destroy removed add-ons
+  for (const auto& addon : removedAddons)
+    addon->Destroy();
+
+  // Create new add-ons
+  for (const auto& addon : newAddons)
+  {
+    if (addon->CreateAddon() != ADDON_STATUS_OK)
+    {
+      CSingleLock lock(m_critSection);
+      m_addons.erase(std::remove(m_addons.begin(), m_addons.end(), addon), m_addons.end());
+      m_failedAddons.push_back(addon);
+    }
+  }
+}

_service:download_url:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusAddon.h Added

@@ -0,0 +1,97 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "addons/AddonManager.h"
+#include "addons/IAddon.h"
+#include "guilib/IWindowManagerCallback.h"
+#include "peripherals/PeripheralTypes.h"
+#include "peripherals/bus/PeripheralBus.h"
+#include "threads/CriticalSection.h"
+#include "utils/Observer.h"
+
+#include <memory>
+#include <string>
+
+namespace PERIPHERALS
+{
+  class CPeripheralBusAddon : public CPeripheralBus,
+                              public ADDON::IAddonMgrCallback,
+                              public Observer
+  {
+  public:
+    CPeripheralBusAddon(CPeripherals *manager);
+    virtual ~CPeripheralBusAddon(void);
+
+    /*!
+     * \brief Get peripheral add-on by ID
+     */
+    bool GetAddon(const std::string &strId, ADDON::AddonPtr &addon) const;
+
+    /*!
+     * \brief Get peripheral add-on that can provide button maps for the given device
+     */
+    bool GetAddonWithButtonMap(const CPeripheral* device, PeripheralAddonPtr &addon) const;
+
+    /*!
+     * \brief Get the number of peripheral add-on libraries
+     */
+    unsigned int GetAddonCount(void) const;
+
+    /*!
+     * \brief Initialize the properties of a peripheral with a known location
+     */
+    bool InitializeProperties(CPeripheral* peripheral);
+
+    // Inherited from CPeripheralBus
+    virtual void         Register(CPeripheral *peripheral) override;
+    virtual void         GetFeatures(std::vector<PeripheralFeature> &features) const override;
+    virtual bool         HasFeature(const PeripheralFeature feature) const override;
+    virtual CPeripheral* GetPeripheral(const std::string &strLocation) const override;
+    virtual CPeripheral* GetByPath(const std::string &strPath) const override;
+    virtual int          GetPeripheralsWithFeature(std::vector<CPeripheral *> &results, const PeripheralFeature feature) const override;
+    virtual size_t       GetNumberOfPeripherals(void) const override;
+    virtual size_t       GetNumberOfPeripheralsWithId(const int iVendorId, const int iProductId) const override;
+    virtual void         GetDirectory(const std::string &strPath, CFileItemList &items) const override;
+
+    // implementation of IAddonMgrCallback
+    bool RequestRestart(ADDON::AddonPtr addon, bool datachanged) override;
+    bool RequestRemoval(ADDON::AddonPtr addon) override;
+
+    // implementation of Observer
+    void Notify(const Observable &obs, const ObservableMessage msg) override;
+
+    bool SplitLocation(const std::string& strLocation, PeripheralAddonPtr& addon, unsigned int& peripheralIndex) const;
+
+  protected:
+    // Inherited from CPeripheralBus
+    virtual bool PerformDeviceScan(PeripheralScanResults &results) override;
+    virtual void UnregisterRemovedDevices(const PeripheralScanResults &results) override;
+    virtual void ProcessEvents(void) override;
+
+  private:
+    void UpdateAddons(void);
+
+    PeripheralAddonVector m_addons;
+    PeripheralAddonVector m_failedAddons;
+    CCriticalSection      m_critSection;
+  };
+  using PeripheralBusAddonPtr = std::shared_ptr<CPeripheralBusAddon>;
+}

_service:download_url:master.tar.gz/xbmc/peripherals/devices/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/Peripheral.cpp Changed

@@ -25,11 +25,15 @@
 #include "guilib/LocalizeStrings.h"
 #include "peripherals/Peripherals.h"
 #include "settings/lib/Setting.h"
+#include "peripherals/addons/AddonButtonMapping.h"
+#include "peripherals/addons/AddonInputHandling.h"
+#include "peripherals/bus/PeripheralBus.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/XBMCTinyXML.h"
 #include "utils/XMLUtils.h"
 
+using namespace JOYSTICK;
 using namespace PERIPHERALS;
 
 struct SortBySettingsOrder
@@ -40,7 +44,7 @@
   }
 };
 
-CPeripheral::CPeripheral(const PeripheralScanResult& scanResult) :
+CPeripheral::CPeripheral(const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
   m_type(scanResult.m_mappedType),
   m_busType(scanResult.m_busType),
   m_mappedBusType(scanResult.m_mappedBusType),
@@ -51,7 +55,8 @@
   m_strVersionInfo(g_localizeStrings.Get(13205)), // "unknown"
   m_bInitialised(false),
   m_bHidden(false),
-  m_bError(false)
+  m_bError(false),
+  m_bus(bus)
 {
   PeripheralTypeTranslator::FormatHexString(scanResult.m_iVendorId, m_strVendorId);
   PeripheralTypeTranslator::FormatHexString(scanResult.m_iProductId, m_strProductId);
@@ -536,6 +541,50 @@
   m_settings.clear();
 }
 
+void CPeripheral::RegisterJoystickInputHandler(IInputHandler* handler)
+{
+  std::map<IInputHandler*, IDriverHandler*>::iterator it = m_inputHandlers.find(handler);
+  if (it == m_inputHandlers.end())
+  {
+    CAddonInputHandling* inputHandling = new CAddonInputHandling(this, handler);
+    RegisterJoystickDriverHandler(inputHandling, false);
+    m_inputHandlers[handler] = inputHandling;
+  }
+}
+
+void CPeripheral::UnregisterJoystickInputHandler(IInputHandler* handler)
+{
+  std::map<IInputHandler*, IDriverHandler*>::iterator it = m_inputHandlers.find(handler);
+  if (it != m_inputHandlers.end())
+  {
+    UnregisterJoystickDriverHandler(it->second);
+    delete it->second;
+    m_inputHandlers.erase(it);
+  }
+}
+
+void CPeripheral::RegisterJoystickButtonMapper(IButtonMapper* mapper)
+{
+  std::map<IButtonMapper*, IDriverHandler*>::iterator it = m_buttonMappers.find(mapper);
+  if (it == m_buttonMappers.end())
+  {
+    CAddonButtonMapping* addonMapping = new CAddonButtonMapping(this, mapper);
+    RegisterJoystickDriverHandler(addonMapping, false);
+    m_buttonMappers[mapper] = addonMapping;
+  }
+}
+
+void CPeripheral::UnregisterJoystickButtonMapper(IButtonMapper* mapper)
+{
+  std::map<IButtonMapper*, IDriverHandler*>::iterator it = m_buttonMappers.find(mapper);
+  if (it != m_buttonMappers.end())
+  {
+    UnregisterJoystickDriverHandler(it->second);
+    delete it->second;
+    m_buttonMappers.erase(it);
+  }
+}
+
 bool CPeripheral::operator ==(const PeripheralScanResult& right) const
 {
   return StringUtils::EqualsNoCase(m_strLocation, right.m_strLocation);

_service:download_url:master.tar.gz/xbmc/peripherals/devices/Peripheral.h Changed

@@ -19,17 +19,25 @@
  *
  */
 
+#include <map>
 #include <set>
 #include <string>
 #include "peripherals/PeripheralTypes.h"
 
 class TiXmlDocument;
-
 class CSetting;
 
+namespace JOYSTICK
+{
+  class IButtonMapper;
+  class IDriverHandler;
+  class IInputHandler;
+}
+
 namespace PERIPHERALS
 {
   class CGUIDialogPeripheralSettings;
+  class CPeripheralBus;
 
   typedef enum
   {
@@ -43,7 +51,7 @@
     friend class CGUIDialogPeripheralSettings;
 
   public:
-    CPeripheral(const PeripheralScanResult& scanResult);
+    CPeripheral(const PeripheralScanResult& scanResult, CPeripheralBus* bus);
     virtual ~CPeripheral(void);
 
     bool operator ==(const CPeripheral &right) const;
@@ -163,6 +171,15 @@
 
     virtual bool ErrorOccured(void) const { return m_bError; }
 
+    virtual void RegisterJoystickDriverHandler(JOYSTICK::IDriverHandler* handler, bool bPromiscuous) { }
+    virtual void UnregisterJoystickDriverHandler(JOYSTICK::IDriverHandler* handler) { }
+
+    virtual void RegisterJoystickInputHandler(JOYSTICK::IInputHandler* handler);
+    virtual void UnregisterJoystickInputHandler(JOYSTICK::IInputHandler* handler);
+
+    virtual void RegisterJoystickButtonMapper(JOYSTICK::IButtonMapper* mapper);
+    virtual void UnregisterJoystickButtonMapper(JOYSTICK::IButtonMapper* mapper);
+
   protected:
     virtual void ClearSettings(void);
 
@@ -185,5 +202,8 @@
     std::vector<CPeripheral *>       m_subDevices;
     std::map<std::string, PeripheralDeviceSetting> m_settings;
     std::set<std::string>             m_changedSettings;
+    CPeripheralBus*                  m_bus;
+    std::map<JOYSTICK::IInputHandler*, JOYSTICK::IDriverHandler*> m_inputHandlers;
+    std::map<JOYSTICK::IButtonMapper*, JOYSTICK::IDriverHandler*> m_buttonMappers;
   };
 }

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralBluetooth.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralBluetooth.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralCecAdapter.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralCecAdapter.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralDisk.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralDisk.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralHID.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralHID.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralImon.cpp Changed

@@ -29,8 +29,8 @@
 volatile long CPeripheralImon::m_lCountOfImonsConflictWithDInput = 0;
 
 
-CPeripheralImon::CPeripheralImon(const PeripheralScanResult& scanResult) :
-  CPeripheralHID(scanResult)
+CPeripheralImon::CPeripheralImon(const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
+  CPeripheralHID(scanResult, bus)
 {
   m_features.push_back(FEATURE_IMON);
   m_bImonConflictsWithDInput = false;
@@ -96,14 +96,5 @@
 
 void CPeripheralImon::ActionOnImonConflict(bool deviceInserted /*= true*/)
 {
-  if (deviceInserted || m_lCountOfImonsConflictWithDInput == 0)
-  {
-#if defined(TARGET_WINDOWS) && defined (HAS_SDL_JOYSTICK)
-    bool enableJoystickNow = !deviceInserted && CSettings::GetInstance().GetBool(CSettings::SETTING_INPUT_ENABLEJOYSTICK);
-    CLog::Log(LOGNOTICE, "Problematic iMON hardware %s. Joystick usage: %s", (deviceInserted ? "detected" : "was removed"),
-        (enableJoystickNow) ? "enabled." : "disabled." );
-    CInputManager::GetInstance().SetEnabledJoystick(enableJoystickNow);
-#endif
-  }
 }

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralImon.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystick.cpp Added

@@ -0,0 +1,221 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PeripheralJoystick.h"
+#include "peripherals/Peripherals.h"
+#include "peripherals/bus/android/PeripheralBusAndroid.h"
+#include "peripherals/bus/virtual/PeripheralBusAddon.h"
+#include "threads/SingleLock.h"
+#include "utils/log.h"
+
+#include <algorithm>
+
+using namespace JOYSTICK;
+using namespace PERIPHERALS;
+
+CPeripheralJoystick::CPeripheralJoystick(const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
+  CPeripheral(scanResult, bus),
+  m_requestedPort(JOYSTICK_PORT_UNKNOWN),
+  m_buttonCount(0),
+  m_hatCount(0),
+  m_axisCount(0)
+{
+  m_features.push_back(FEATURE_JOYSTICK);
+}
+
+CPeripheralJoystick::~CPeripheralJoystick(void)
+{
+  UnregisterJoystickInputHandler(&m_defaultInputHandler);
+  UnregisterJoystickDriverHandler(&m_joystickMonitor);
+}
+
+bool CPeripheralJoystick::InitialiseFeature(const PeripheralFeature feature)
+{
+  bool bSuccess = false;
+
+  if (CPeripheral::InitialiseFeature(feature))
+  {
+    if (feature == FEATURE_JOYSTICK)
+    {
+      if (m_mappedBusType == PERIPHERAL_BUS_ADDON)
+      {
+        CPeripheralBusAddon* addonBus = dynamic_cast<CPeripheralBusAddon*>(m_bus);
+        if (addonBus)
+        {
+          if (addonBus->InitializeProperties(this))
+            bSuccess = true;
+          else
+            CLog::Log(LOGERROR, "CPeripheralJoystick: Invalid location (%s)", m_strLocation.c_str());
+        }
+      }
+#ifdef TARGET_ANDROID
+      else if (m_mappedBusType == PERIPHERAL_BUS_ANDROID)
+      {
+        CPeripheralBusAndroid* androidBus = dynamic_cast<CPeripheralBusAndroid*>(m_bus);
+        if (androidBus)
+        {
+          if (androidBus->InitializeProperties(this))
+            bSuccess = true;
+          else
+            CLog::Log(LOGERROR, "CPeripheralJoystick: Invalid location (%s)", m_strLocation.c_str());
+        }
+      }
+#endif
+    }
+  }
+
+  if (bSuccess)
+  {
+    // Give joystick monitor priority over default controller
+    RegisterJoystickInputHandler(&m_defaultInputHandler);
+    RegisterJoystickDriverHandler(&m_joystickMonitor, false);
+  }
+
+  return bSuccess;
+}
+
+void CPeripheralJoystick::RegisterJoystickDriverHandler(IDriverHandler* handler, bool bPromiscuous)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  DriverHandler driverHandler = { handler, bPromiscuous };
+  m_driverHandlers.insert(m_driverHandlers.begin(), driverHandler);
+}
+
+void CPeripheralJoystick::UnregisterJoystickDriverHandler(IDriverHandler* handler)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  m_driverHandlers.erase(std::remove_if(m_driverHandlers.begin(), m_driverHandlers.end(),
+    [handler](const DriverHandler& driverHandler)
+    {
+      return driverHandler.handler == handler;
+    }), m_driverHandlers.end());
+}
+
+bool CPeripheralJoystick::OnButtonMotion(unsigned int buttonIndex, bool bPressed)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  // Process promiscuous handlers
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (it->bPromiscuous)
+      it->handler->OnButtonMotion(buttonIndex, bPressed);
+  }
+
+  bool bHandled = false;
+
+  // Process regular handlers until one is handled
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (!it->bPromiscuous)
+    {
+      bHandled |= it->handler->OnButtonMotion(buttonIndex, bPressed);
+
+      // If button is released, force bHandled to false to notify all handlers.
+      // This avoids "sticking".
+      if (!bPressed)
+        bHandled = false;
+
+      // Once a button is handled, we're done
+      if (bHandled)
+        break;
+    }
+  }
+
+  return bHandled;
+}
+
+bool CPeripheralJoystick::OnHatMotion(unsigned int hatIndex, HAT_STATE state)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  // Process promiscuous handlers
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (it->bPromiscuous)
+      it->handler->OnHatMotion(hatIndex, state);
+  }
+
+  bool bHandled = false;
+
+  // Process regular handlers until one is handled
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (!it->bPromiscuous)
+    {
+      bHandled |= it->handler->OnHatMotion(hatIndex, state);
+
+      // If hat is centered, force bHandled to false to notify all handlers.
+      // This avoids "sticking".
+      if (state == HAT_STATE::UNPRESSED)
+        bHandled = false;
+
+      // Once a hat is handled, we're done
+      if (bHandled)
+        break;
+    }
+  }
+
+  return bHandled;
+}
+
+bool CPeripheralJoystick::OnAxisMotion(unsigned int axisIndex, float position)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  // Process promiscuous handlers
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (it->bPromiscuous)
+      it->handler->OnAxisMotion(axisIndex, position);
+  }
+
+  bool bHandled = false;
+
+  // Process regular handlers until one is handled
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+  {
+    if (!it->bPromiscuous)
+    {
+      bHandled |= it->handler->OnAxisMotion(axisIndex, position);
+
+      // If axis is centered, force bHandled to false to notify all handlers.
+      // This avoids "sticking".
+      if (position == 0.0f)
+        bHandled = false;
+
+      // Once an axis is handled, we're done
+      if (bHandled)
+        break;
+    }
+  }
+
+  return bHandled;
+}
+
+void CPeripheralJoystick::ProcessAxisMotions(void)
+{
+  CSingleLock lock(m_handlerMutex);
+
+  for (std::vector<DriverHandler>::iterator it = m_driverHandlers.begin(); it != m_driverHandlers.end(); ++it)
+    it->handler->ProcessAxisMotions();
+}

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystick.h Added

@@ -0,0 +1,101 @@
+/*
+ *      Copyright (C) 2014-2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this Program; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
+
+#include "Peripheral.h"
+#include "input/joysticks/DefaultJoystick.h"
+#include "input/joysticks/IDriverHandler.h"
+#include "input/joysticks/JoystickMonitor.h"
+#include "input/joysticks/JoystickTypes.h"
+#include "threads/CriticalSection.h"
+
+#include <string>
+#include <vector>
+
+#define JOYSTICK_PORT_UNKNOWN  (-1)
+
+namespace PERIPHERALS
+{
+  class CPeripheralJoystick : public CPeripheral, // TODO: extend CPeripheralHID
+                              public JOYSTICK::IDriverHandler
+  {
+  public:
+    CPeripheralJoystick(const PeripheralScanResult& scanResult, CPeripheralBus* bus);
+
+    virtual ~CPeripheralJoystick(void);
+
+    // implementation of CPeripheral
+    virtual bool InitialiseFeature(const PeripheralFeature feature) override;
+    virtual void RegisterJoystickDriverHandler(IDriverHandler* handler, bool bPromiscuous) override;
+    virtual void UnregisterJoystickDriverHandler(IDriverHandler* handler) override;
+
+    // implementation of IDriverHandler
+    virtual bool OnButtonMotion(unsigned int buttonIndex, bool bPressed) override;
+    virtual bool OnHatMotion(unsigned int hatIndex, JOYSTICK::HAT_STATE state) override;
+    virtual bool OnAxisMotion(unsigned int axisIndex, float position) override;
+    virtual void ProcessAxisMotions(void) override;
+
+    /*!
+     * \brief Get the name of the driver or API providing this joystick
+     */
+    const std::string& Provider(void) const { return m_strProvider; }
+
+    /*!
+     * \brief Get the specific port number requested by this joystick
+     *
+     * This could indicate that the joystick is connected to a hardware port
+     * with a number label; some controllers, such as the Xbox 360 controller,
+     * also have LEDs that indicate the controller is on a specific port.
+     *
+     * \return The 0-indexed port number, or JOYSTICK_PORT_UNKNOWN if no port is requested
+     */
+    int RequestedPort(void) const { return m_requestedPort; }
+
+    /*!
+     * \brief Get the number of elements reported by the driver
+     */
+    unsigned int ButtonCount(void) const { return m_buttonCount; }
+    unsigned int HatCount(void) const    { return m_hatCount; }
+    unsigned int AxisCount(void) const   { return m_axisCount; }
+
+    void SetProvider(const std::string& provider) { m_strProvider   = provider; }
+    void SetRequestedPort(int port)               { m_requestedPort = port; }
+    void SetButtonCount(unsigned int buttonCount) { m_buttonCount   = buttonCount; }
+    void SetHatCount(unsigned int hatCount)       { m_hatCount      = hatCount; }
+    void SetAxisCount(unsigned int axisCount)     { m_axisCount     = axisCount; }
+
+  protected:
+    struct DriverHandler
+    {
+      JOYSTICK::IDriverHandler* handler;
+      bool                              bPromiscuous;
+    };
+
+    std::string                         m_strProvider;
+    int                                 m_requestedPort;
+    unsigned int                        m_buttonCount;
+    unsigned int                        m_hatCount;
+    unsigned int                        m_axisCount;
+    JOYSTICK::CDefaultJoystick          m_defaultInputHandler;
+    JOYSTICK::CJoystickMonitor          m_joystickMonitor;
+    std::vector<DriverHandler>          m_driverHandlers;
+    CCriticalSection                    m_handlerMutex;
+  };
+}

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralNIC.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralNIC.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralNyxboard.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralNyxboard.h Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralTuner.cpp Changed

_service:download_url:master.tar.gz/xbmc/peripherals/devices/PeripheralTuner.h Changed

_service:download_url:master.tar.gz/xbmc/pictures/GUIWindowPictures.cpp Changed

@@ -43,7 +43,6 @@
 #include "interfaces/AnnouncementManager.h"
 #include "utils/SortUtils.h"
 #include "utils/StringUtils.h"
-#include "ContextMenuManager.h"
 #include "GUIWindowSlideShow.h"
 
 #define CONTROL_BTNVIEWASICONS      2
@@ -464,8 +463,6 @@
     {
       if (item)
       {
-        if (!m_vecItems->IsPlugin() && (item->IsPlugin() || item->IsScript()))
-          buttons.Add(CONTEXT_BUTTON_INFO, 24003); // Add-on info
         if (!(item->m_bIsFolder || item->IsZIP() || item->IsRAR() || item->IsCBZ() || item->IsCBR() || item->IsScript()))
         {
           buttons.Add(CONTEXT_BUTTON_INFO, 13406); // picture info
@@ -483,9 +480,7 @@
         }
       }
 
-      if (item->IsPlugin() || item->IsScript() || m_vecItems->IsPlugin())
-        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
-      else
+      if (!item->IsPlugin() && !item->IsScript() && !m_vecItems->IsPlugin())
       {
         buttons.Add(CONTEXT_BUTTON_GOTO_ROOT, 20128);
         buttons.Add(CONTEXT_BUTTON_SWITCH_MEDIA, 523);
@@ -493,8 +488,6 @@
     }
   }
   CGUIMediaWindow::GetContextButtons(itemNumber, buttons);
-
-  CContextMenuManager::GetInstance().AddVisibleItems(item, buttons);
 }
 
 bool CGUIWindowPictures::OnContextButton(int itemNumber, CONTEXT_BUTTON button)

_service:download_url:master.tar.gz/xbmc/pictures/PictureInfoTag.cpp Changed

@@ -553,6 +553,407 @@
   return value;
 }
 
+/// \page modules__General__List_of_gui_access
+/// @{
+/// \table_start
+///   \table_row3{   <b>`Slideshow.Altitude`</b>,
+///                  \anchor Slideshow_Altitude
+///                  _string_,
+///     Shows the altitude in meters where the current picture was taken. This
+///     is the value of the EXIF GPSInfo.GPSAltitude tag.
+///   }
+///   \table_row3{   <b>`Slideshow.Aperture`</b>,
+///                  \anchor Slideshow_Aperture
+///                  _string_,
+///     Shows the F-stop used to take the current picture. This is the value of
+///     the EXIF FNumber tag (hex code 0x829D).
+///   }
+///   \table_row3{   <b>`Slideshow.Author`</b>,
+///                  \anchor Slideshow_Author
+///                  _string_,
+///     Shows the name of the person involved in writing about the current
+///     picture. This is the value of the IPTC Writer tag (hex code 0x7A).
+///   }
+///   \table_row3{   <b>`Slideshow.Byline`</b>,
+///                  \anchor Slideshow_Byline
+///                  _string_,
+///     Shows the name of the person who created the current picture. This is
+///     the value of the IPTC Byline tag (hex code 0x50).
+///   }
+///   \table_row3{   <b>`Slideshow.BylineTitle`</b>,
+///                  \anchor Slideshow_BylineTitle
+///                  _string_,
+///     Shows the title of the person who created the current picture. This is
+///     the value of the IPTC BylineTitle tag (hex code 0x55).
+///   }
+///   \table_row3{   <b>`Slideshow.CameraMake`</b>,
+///                  \anchor Slideshow_CameraMake
+///                  _string_,
+///     Shows the manufacturer of the camera used to take the current picture.
+///     This is the value of the EXIF Make tag (hex code 0x010F).
+///   }
+///   \table_row3{   <b>`Slideshow.CameraModel`</b>,
+///                  \anchor Slideshow_CameraModel
+///                  _string_,
+///     Shows the manufacturer's model name or number of the camera used to take
+///     the current picture. This is the value of the EXIF Model tag (hex code
+///     0x0110).
+///   }
+///   \table_row3{   <b>`Slideshow.Caption`</b>,
+///                  \anchor Slideshow_Caption
+///                  _string_,
+///     Shows a description of the current picture. This is the value of the
+///     IPTC Caption tag (hex code 0x78).
+///   }
+///   \table_row3{   <b>`Slideshow.Category`</b>,
+///                  \anchor Slideshow_Category
+///                  _string_,
+///     Shows the subject of the current picture as a category code. This is the
+///     value of the IPTC Category tag (hex code 0x0F).
+///   }
+///   \table_row3{   <b>`Slideshow.CCDWidth`</b>,
+///                  \anchor Slideshow_CCDWidth
+///                  _string_,
+///     Shows the width of the CCD in the camera used to take the current
+///     picture. This is calculated from three EXIF tags (0xA002 * 0xA210 / 0xA20e).
+///   }
+///   \table_row3{   <b>`Slideshow.City`</b>,
+///                  \anchor Slideshow_City
+///                  _string_,
+///     Shows the city where the current picture was taken. This is the value of
+///     the IPTC City tag (hex code 0x5A).
+///   }
+///   \table_row3{   <b>`Slideshow.Colour`</b>,
+///                  \anchor Slideshow_Colour
+///                  _string_,
+///     Shows whether the current picture is "Colour" or "Black and White".
+///   }
+///   \table_row3{   <b>`Slideshow.CopyrightNotice`</b>,
+///                  \anchor Slideshow_CopyrightNotice
+///                  _string_,
+///     Shows the copyright notice of the current picture. This is the value of
+///     the IPTC Copyright tag (hex code 0x74).
+///   }
+///   \table_row3{   <b>`Slideshow.Country`</b>,
+///                  \anchor Slideshow_Country
+///                  _string_,
+///     Shows the full name of the country where the current picture was taken.
+///     This is the value of the IPTC CountryName tag (hex code 0x65).
+///   }
+///   \table_row3{   <b>`Slideshow.CountryCode`</b>,
+///                  \anchor Slideshow_CountryCode
+///                  _string_,
+///     Shows the country code of the country where the current picture was
+///     taken. This is the value of the IPTC CountryCode tag (hex code 0x64).
+///   }
+///   \table_row3{   <b>`Slideshow.Credit`</b>,
+///                  \anchor Slideshow_Credit
+///                  _string_,
+///     Shows who provided the current picture. This is the value of the IPTC
+///     Credit tag (hex code 0x6E).
+///   }
+///   \table_row3{   <b>`Slideshow.DigitalZoom`</b>,
+///                  \anchor Slideshow_DigitalZoom
+///                  _string_,
+///     Shows the digital zoom ratio when the current picture was taken. This is
+///     the value of the EXIF .DigitalZoomRatio tag (hex code 0xA404).
+///   }
+///   \table_row3{   <b>`Slideshow.EXIFComment`</b>,
+///                  \anchor Slideshow_EXIFComment
+///                  _string_,
+///     Shows a description of the current picture. This is the value of the
+///     EXIF User Comment tag (hex code 0x9286). This is the same value as
+///     Slideshow.SlideComment.
+///   }
+///   \table_row3{   <b>`Slideshow.EXIFDate`</b>,
+///                  \anchor Slideshow_EXIFDate
+///                  _string_,
+///     Shows the localized date of the current picture. The short form of the
+///     date is used. The value of the EXIF DateTimeOriginal tag (hex code
+///     0x9003) is preferred. If the DateTimeOriginal tag is not found\, the
+///     value of DateTimeDigitized (hex code 0x9004) or of DateTime (hex code
+///     0x0132) might be used.
+///   }
+///   \table_row3{   <b>`Slideshow.EXIFDescription`</b>,
+///                  \anchor Slideshow_EXIFDescription
+///                  _string_,
+///     Shows a short description of the current picture. The SlideComment\,
+///     EXIFComment or Caption values might contain a longer description. This
+///     is the value of the EXIF ImageDescription tag (hex code 0x010E).
+///   }
+///   \table_row3{   <b>`Slideshow.EXIFSoftware`</b>,
+///                  \anchor Slideshow_EXIFSoftware
+///                  _string_,
+///     Shows the name and version of the firmware used by the camera that took
+///     the current picture. This is the value of the EXIF Software tag (hex
+///     code 0x0131).
+///   }
+///   \table_row3{   <b>`Slideshow.EXIFTime`</b>,
+///                  \anchor Slideshow_EXIFTime
+///                  _string_,
+///     Shows the date/timestamp of the current picture. The localized short
+///     form of the date and time is used. The value of the EXIF
+///     DateTimeOriginal tag (hex code 0x9003) is preferred. If the
+///     DateTimeOriginal tag is not found\, the value of DateTimeDigitized (hex
+///     code 0x9004) or of DateTime (hex code 0x0132) might be used.
+///   }
+///   \table_row3{   <b>`Slideshow.Exposure`</b>,
+///                  \anchor Slideshow_Exposure
+///                  _string_,
+///     Shows the class of the program used by the camera to set exposure when
+///     the current picture was taken. Values include "Manual"\,
+///     "Program (Auto)"\, "Aperture priority (Semi-Auto)"\, "Shutter priority
+///     (semi-auto)"\, etc. This is the value of the EXIF ExposureProgram tag
+///     (hex code 0x8822).
+///   }
+///   \table_row3{   <b>`Slideshow.ExposureBias`</b>,
+///                  \anchor Slideshow_ExposureBias
+///                  _string_,
+///     Shows the exposure bias of the current picture. Typically this is a
+///     number between -99.99 and 99.99. This is the value of the EXIF
+///     ExposureBiasValue tag (hex code 0x9204).
+///   }
+///   \table_row3{   <b>`Slideshow.ExposureMode`</b>,
+///                  \anchor Slideshow_ExposureMode
+///                  _string_,
+///     Shows the exposure mode of the current picture. The possible values are
+///     "Automatic"\, "Manual"\, and "Auto bracketing". This is the value of the
+///     EXIF ExposureMode tag (hex code 0xA402).
+///   }
+///   \table_row3{   <b>`Slideshow.ExposureTime`</b>,
+///                  \anchor Slideshow_ExposureTime
+///                  _string_,
+///     Shows the exposure time of the current picture\, in seconds. This is the
+///     value of the EXIF ExposureTime tag (hex code 0x829A). If the
+///     ExposureTime tag is not found\, the ShutterSpeedValue tag (hex code
+///     0x9201) might be used.
+///   }
+///   \table_row3{   <b>`Slideshow.Filedate`</b>,
+///                  \anchor Slideshow_Filedate
+///                  _string_,
+///     Shows the file date of the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.Filename`</b>,
+///                  \anchor Slideshow_Filename
+///                  _string_,
+///     Shows the file name of the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.Filesize`</b>,
+///                  \anchor Slideshow_Filesize
+///                  _string_,
+///     Shows the file size of the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.FlashUsed`</b>,
+///                  \anchor Slideshow_FlashUsed
+///                  _string_,
+///     Shows the status of flash when the current picture was taken. The value
+///     will be either "Yes" or "No"\, and might include additional information.
+///     This is the value of the EXIF Flash tag (hex code 0x9209).
+///   }
+///   \table_row3{   <b>`Slideshow.FocalLength`</b>,
+///                  \anchor Slideshow_FocalLength
+///                  _string_,
+///     Shows the focal length of the lens\, in mm. This is the value of the EXIF
+///     FocalLength tag (hex code 0x920A).
+///   }
+///   \table_row3{   <b>`Slideshow.FocusDistance`</b>,
+///                  \anchor Slideshow_FocusDistance
+///                  _string_,
+///     Shows the distance to the subject\, in meters. This is the value of the
+///     EXIF SubjectDistance tag (hex code 0x9206).
+///   }
+///   \table_row3{   <b>`Slideshow.Headline`</b>,
+///                  \anchor Slideshow_Headline
+///                  _string_,
+///     Shows a synopsis of the contents of the current picture. This is the
+///     value of the IPTC Headline tag (hex code 0x69).
+///   }
+///   \table_row3{   <b>`Slideshow.ImageType`</b>,
+///                  \anchor Slideshow_ImageType
+///                  _string_,
+///     Shows the color components of the current picture. This is the value of
+///     the IPTC ImageType tag (hex code 0x82).
+///   }
+///   \table_row3{   <b>`Slideshow.IPTCDate`</b>,
+///                  \anchor Slideshow_IPTCDate
+///                  _string_,
+///     Shows the date when the intellectual content of the current picture was
+///     created\, rather than when the picture was created. This is the value of
+///     the IPTC DateCreated tag (hex code 0x37).
+///   }
+///   \table_row3{   <b>`Slideshow.ISOEquivalence`</b>,
+///                  \anchor Slideshow_ISOEquivalence
+///                  _string_,
+///     Shows the ISO speed of the camera when the current picture was taken.
+///     This is the value of the EXIF ISOSpeedRatings tag (hex code 0x8827).
+///   }
+///   \table_row3{   <b>`Slideshow.Keywords`</b>,
+///                  \anchor Slideshow_Keywords
+///                  _string_,
+///     Shows keywords assigned to the current picture. This is the value of the
+///     IPTC Keywords tag (hex code 0x19).
+///   }
+///   \table_row3{   <b>`Slideshow.Latitude`</b>,
+///                  \anchor Slideshow_Latitude
+///                  _string_,
+///     Shows the latitude where the current picture was taken (degrees\,
+///     minutes\, seconds North or South). This is the value of the EXIF
+///     GPSInfo.GPSLatitude and GPSInfo.GPSLatitudeRef tags.
+///   }
+///   \table_row3{   <b>`Slideshow.LightSource`</b>,
+///                  \anchor Slideshow_LightSource
+///                  _string_,
+///     Shows the kind of light source when the picture was taken. Possible
+///     values include "Daylight"\, "Fluorescent"\, "Incandescent"\, etc. This is
+///     the value of the EXIF LightSource tag (hex code 0x9208).
+///   }
+///   \table_row3{   <b>`Slideshow.LongEXIFDate`</b>,
+///                  \anchor Slideshow_LongEXIFDate
+///                  _string_,
+///     Shows only the localized date of the current picture. The long form of
+///     the date is used. The value of the EXIF DateTimeOriginal tag (hex code
+///     0x9003) is preferred. If the DateTimeOriginal tag is not found\, the
+///     value of DateTimeDigitized (hex code 0x9004) or of DateTime (hex code
+///     0x0132) might be used.
+///   }
+///   \table_row3{   <b>`Slideshow.LongEXIFTime`</b>,
+///                  \anchor Slideshow_LongEXIFTime
+///                  _string_,
+///     Shows the date/timestamp of the current picture. The localized long form
+///     of the date and time is used. The value of the EXIF DateTimeOriginal tag
+///     (hex code 0x9003) is preferred. if the DateTimeOriginal tag is not found\,
+///     the value of DateTimeDigitized (hex code 0x9004) or of DateTime (hex
+///     code 0x0132) might be used.
+///   }
+///   \table_row3{   <b>`Slideshow.Longitude`</b>,
+///                  \anchor Slideshow_Longitude
+///                  _string_,
+///     Shows the longitude where the current picture was taken (degrees\,
+///     minutes\, seconds East or West). This is the value of the EXIF
+///     GPSInfo.GPSLongitude and GPSInfo.GPSLongitudeRef tags.
+///   }
+///   \table_row3{   <b>`Slideshow.MeteringMode`</b>,
+///                  \anchor Slideshow_MeteringMode
+///                  _string_,
+///     Shows the metering mode used when the current picture was taken. The
+///     possible values are "Center weight"\, "Spot"\, or "Matrix". This is the
+///     value of the EXIF MeteringMode tag (hex code 0x9207).
+///   }
+///   \table_row3{   <b>`Slideshow.ObjectName`</b>,
+///                  \anchor Slideshow_ObjectName
+///                  _string_,
+///     Shows a shorthand reference for the current picture. This is the value
+///     of the IPTC ObjectName tag (hex code 0x05).
+///   }
+///   \table_row3{   <b>`Slideshow.Orientation`</b>,
+///                  \anchor Slideshow_Orientation
+///                  _string_,
+///     Shows the orientation of the current picture. Possible values are "Top
+///     Left"\, "Top Right"\, "Left Top"\, "Right Bottom"\, etc. This is the value
+///     of the EXIF Orientation tag (hex code 0x0112).
+///   }
+///   \table_row3{   <b>`Slideshow.Path`</b>,
+///                  \anchor Slideshow_Path
+///                  _string_,
+///     Shows the file path of the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.Process`</b>,
+///                  \anchor Slideshow_Process
+///                  _string_,
+///     Shows the process used to compress the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.ReferenceService`</b>,
+///                  \anchor Slideshow_ReferenceService
+///                  _string_,
+///     Shows the Service Identifier of a prior envelope to which the current
+///     picture refers. This is the value of the IPTC ReferenceService tag (hex
+///     code 0x2D).
+///   }
+///   \table_row3{   <b>`Slideshow.Resolution`</b>,
+///                  \anchor Slideshow_Resolution
+///                  _string_,
+///     Shows the dimensions of the current picture (Width x Height)
+///   }
+///   \table_row3{   <b>`Slideshow.SlideComment`</b>,
+///                  \anchor Slideshow_SlideComment
+///                  _string_,
+///     Shows a description of the current picture. This is the value of the
+///     EXIF User Comment tag (hex code 0x9286). This is the same value as
+///     Slideshow.EXIFComment.
+///   }
+///   \table_row3{   <b>`Slideshow.SlideIndex`</b>,
+///                  \anchor Slideshow_SlideIndex
+///                  _string_,
+///     Shows the slide index of the current picture
+///   }
+///   \table_row3{   <b>`Slideshow.Source`</b>,
+///                  \anchor Slideshow_Source
+///                  _string_,
+///     Shows the original owner of the current picture. This is the value of
+///     the IPTC Source tag (hex code 0x73).
+///   }
+///   \table_row3{   <b>`Slideshow.SpecialInstructions`</b>,
+///                  \anchor Slideshow_SpecialInstructions
+///                  _string_,
+///     Shows other editorial instructions concerning the use of the current
+///     picture. This is the value of the IPTC SpecialInstructions tag (hex
+///     code 0x28).
+///   }
+///   \table_row3{   <b>`Slideshow.State`</b>,
+///                  \anchor Slideshow_State
+///                  _string_,
+///     Shows the State/Province where the current picture was taken. This is
+///     the value of the IPTC ProvinceState tag (hex code 0x5F).
+///   }
+///   \table_row3{   <b>`Slideshow.Sublocation`</b>,
+///                  \anchor Slideshow_Sublocation
+///                  _string_,
+///     Shows the location within a city where the current picture was taken -
+///     might indicate the nearest landmark. This is the value of the IPTC
+///     SubLocation tag (hex code 0x5C).
+///   }
+///   \table_row3{   <b>`Slideshow.SupplementalCategories`</b>,
+///                  \anchor Slideshow_SupplementalCategories
+///                  _string_,
+///     Shows supplemental category codes to further refine the subject of the
+///     current picture. This is the value of the IPTC SuppCategory tag (hex
+///     code 0x14).
+///   }
+///   \table_row3{   <b>`Slideshow.TimeCreated`</b>,
+///                  \anchor Slideshow_TimeCreated
+///                  _string_,
+///     Shows the time when the intellectual content of the current picture was
+///     created\, rather than when the picture was created. This is the value of
+///     the IPTC TimeCreated tag (hex code 0x3C).
+///   }
+///   \table_row3{   <b>`Slideshow.TransmissionReference`</b>,
+///                  \anchor Slideshow_TransmissionReference
+///                  _string_,
+///     Shows a code representing the location of original transmission of the
+///     current picture. This is the value of the IPTC TransmissionReference tag
+///     (hex code 0x67).
+///   }
+///   \table_row3{   <b>`Slideshow.Urgency`</b>,
+///                  \anchor Slideshow_Urgency
+///                  _string_,
+///     Shows the urgency of the current picture. Values are 1-9. The 1 is most
+///     urgent. Some image management programs use urgency to indicate picture
+///     rating\, where urgency 1 is 5 stars and urgency 5 is 1 star. Urgencies
+///     6-9 are not used for rating. This is the value of the IPTC Urgency tag
+///     (hex code 0x0A).
+///   }
+///   \table_row3{   <b>`Slideshow.WhiteBalance`</b>,
+///                  \anchor Slideshow_WhiteBalance
+///                  _string_,
+///     Shows the white balance mode set when the current picture was taken.
+///     The possible values are "Manual" and "Auto". This is the value of the
+///     EXIF WhiteBalance tag (hex code 0xA403).
+///   }
+/// \table_end
+///
+/// -----------------------------------------------------------------------------
+/// @}
+
 int CPictureInfoTag::TranslateString(const std::string &info)
 {
   if (StringUtils::EqualsNoCase(info, "filename")) return SLIDE_FILE_NAME;

_service:download_url:master.tar.gz/xbmc/platform/android/activity/AndroidJoyStick.cpp Changed

@@ -18,413 +18,20 @@
  *
  */
 
-#include "AndroidJoyStick.h"
-#include "AndroidExtra.h"
-#include "XBMCApp.h"
-#include "platform/android/jni/View.h"
-#include "platform/android/activity/AndroidFeatures.h"
-#include "utils/log.h"
-#include "windowing/WinEvents.h"
-#include "windowing/XBMC_events.h"
-#include "utils/TimeUtils.h"
-
 #include <android/input.h>
 
+#include "AndroidJoyStick.h"
+#include "platform/android/activity/XBMCApp.h"
 
-#include <math.h>
-
-//#define DEBUG_VERBOSE
-
-// mapping to axis IDs codes in keymaps.xmls
-enum {
-  AXIS_LEFT_STICK_L_R  = 1,
-  AXIS_LEFT_STICK_U_D  = 2,
-  AXIS_TRIGGER         = 3,
-  AXIS_RIGHT_STICK_L_R = 4,
-  AXIS_RIGHT_STICK_U_D = 5,
-};
-
-typedef struct {
-  int32_t nativeKey;
-  int16_t xbmcID;
-} KeyMap;
-
-// mapping to button codes in keymaps.xmls
-static const KeyMap ButtonMap[] = {
-  { AKEYCODE_BUTTON_A        , 1 },
-  { AKEYCODE_BUTTON_B        , 2 },
-  { AKEYCODE_BUTTON_X        , 3 },
-  { AKEYCODE_BUTTON_Y        , 4 },
-  { AKEYCODE_BUTTON_L1       , 5 },
-  { AKEYCODE_BUTTON_R1       , 6 },
-  { AKEYCODE_BUTTON_SELECT   , 7 },
-  { AKEYCODE_BUTTON_START    , 8 },
-  { AKEYCODE_BUTTON_THUMBL   , 9 },
-  { AKEYCODE_BUTTON_THUMBR   , 10 },
-  { AKEYCODE_DPAD_UP         , 11 },
-  { AKEYCODE_DPAD_DOWN       , 12 },
-  { AKEYCODE_DPAD_LEFT       , 13 },
-  { AKEYCODE_DPAD_RIGHT      , 14 },
-  { AKEYCODE_BUTTON_L2       , 16 },
-  { AKEYCODE_BUTTON_R2       , 17 },
-  { AKEYCODE_BUTTON_C        , 51 },
-  { AKEYCODE_BUTTON_Z        , 52 },
-};
-
-/************************************************************************/
-/************************************************************************/
-static float AxisClampAsButton(const APP_InputDeviceAxis &axis, float value)
-{
-  // Clamp Axis so it acts like a D-Pad, return -1, 0 or +1
-  if (fabs(value) < axis.buttonclamp)
-    return 0.0;
-  else
-    return value < 0.0 ? -1.0:1.0;
-}
-
-static void LogAxisValues(int axis_id, const APP_InputDeviceAxis &axis)
-{
-  CLog::Log(LOGDEBUG, "LogAxisValues: "
-    "axis(%d) Enabled(%d) Max(%f) Min(%f) Range(%f) Flat(%f) Fuzz(%f)",
-    axis_id, axis.enabled, axis.max, axis.min, axis.range, axis.flat, axis.fuzz);
-}
-
-static void SetAxisFromValues(const float min, const float max,
-  const float flat, const float fuzz, const float range, APP_InputDeviceAxis &axis)
-{
-  axis.min  = min;
-  axis.max  = max;
-  axis.flat = flat;
-  axis.fuzz = fuzz;
-  axis.range= range;
-  // precalc some internals
-  axis.deadzone= axis.flat + axis.fuzz;
-  if (axis.deadzone < 0.1f)
-    axis.deadzone = 0.1f;
-  axis.buttonclamp = axis.range / 4.0f;
-}
-
-static void SetupAxis(const CJNIViewInputDevice &input_device, APP_InputDeviceAxis &axis, int axis_id, int source)
-{
-  CJNIViewInputDeviceMotionRange range = input_device.getMotionRange(axis_id, source);
-
-  SetAxisFromValues(range.getMin(), range.getMax(), range.getFlat(), range.getFuzz(), range.getRange(), axis);
-  axis.enabled = true;
-}
-
-static void SetupJoySticks(APP_InputDeviceAxes *axes, int device)
-{
-  axes->id = device;
-  memset(&axes->x_hat,  0x00, sizeof(APP_InputDeviceAxis));
-  memset(&axes->y_hat,  0x00, sizeof(APP_InputDeviceAxis));
-  memset(&axes->x_axis, 0x00, sizeof(APP_InputDeviceAxis));
-  memset(&axes->y_axis, 0x00, sizeof(APP_InputDeviceAxis));
-  memset(&axes->z_axis, 0x00, sizeof(APP_InputDeviceAxis));
-  memset(&axes->rz_axis,0x00, sizeof(APP_InputDeviceAxis));
-
-  CJNIViewInputDevice  input_device = CJNIViewInputDevice::getDevice(axes->id);
-  int device_sources = input_device.getSources();
-  std::string device_name = input_device.getName();
-
-  CLog::Log(LOGDEBUG, "SetupJoySticks:caching  id(%d), sources(%d), device(%s)",
-    axes->id, device_sources, device_name.c_str());
-
-  CJNIList<CJNIViewInputDeviceMotionRange> device_ranges = input_device.getMotionRanges();
-  for (int i = 0; i < device_ranges.size(); i++)
-  {
-    int axis = device_ranges.get(i).getAxis();
-    int source = device_ranges.get(i).getSource();
-#ifdef DEBUG_VERBOSE
-    CLog::Log(LOGDEBUG, "SetupJoySticks:range(%d), axis(%d), source(%d)", i, axis, source);
-#endif
-
-    // ignore anything we do not understand
-    if (source != AINPUT_SOURCE_JOYSTICK)
-      continue;
-
-    // match axis/source to our handlers
-    // anything that is not present, will be disabled
-    switch(axis)
-    {
-      // Left joystick
-      case AMOTION_EVENT_AXIS_X:
-        SetupAxis(input_device, axes->x_axis,  axis, source);
-        break;
-      break;
-      case AMOTION_EVENT_AXIS_Y:
-        SetupAxis(input_device, axes->y_axis,  axis, source);
-        break;
-
-      // Right joystick
-      case AMOTION_EVENT_AXIS_Z:
-        SetupAxis(input_device, axes->z_axis,  axis, source);
-        break;
-      case AMOTION_EVENT_AXIS_RZ:
-        SetupAxis(input_device, axes->rz_axis, axis, source);
-        break;
-
-      // D-Pad
-      case AMOTION_EVENT_AXIS_HAT_X:
-        SetupAxis(input_device, axes->x_hat,   axis, source);
-        break;
-      case AMOTION_EVENT_AXIS_HAT_Y:
-        SetupAxis(input_device, axes->y_hat,   axis, source);
-      break;
-    }
-  }
-
-  if (device_name.find("GameStick Controller") != std::string::npos)
-  {
-    // Right joystick seems to have a range of -0.5 to 0.5, fix the range
-    // Production GameStick Controllers should not have this problem
-    // and this quirk can vanish once verified.
-    SetAxisFromValues(-0.5f, 0.5f, 0.1f, 0.0f, 1.0f, axes->z_axis);
-    SetAxisFromValues(-0.5f, 0.5f, 0.1f, 0.0f, 1.0f, axes->rz_axis);
-  }
-
-#ifdef DEBUG_VERBOSE
-  LogAxisValues(AMOTION_EVENT_AXIS_X,     axes->x_axis);
-  LogAxisValues(AMOTION_EVENT_AXIS_Y,     axes->y_axis);
-  LogAxisValues(AMOTION_EVENT_AXIS_Z,     axes->z_axis);
-  LogAxisValues(AMOTION_EVENT_AXIS_RZ,    axes->rz_axis);
-  LogAxisValues(AMOTION_EVENT_AXIS_HAT_X, axes->x_hat);
-  LogAxisValues(AMOTION_EVENT_AXIS_HAT_Y, axes->y_hat);
-#endif
-}
-
-/************************************************************************/
-/************************************************************************/
-CAndroidJoyStick::CAndroidJoyStick()
-  : m_prev_device(0)
-  , m_prev_button(0)
-  , m_prev_holdtime(0)
-{
-}
-
-CAndroidJoyStick::~CAndroidJoyStick()
-{
-  while (!m_input_devices.empty())
-  {
-    APP_InputDeviceAxes *device_axes = m_input_devices.back();
-    delete device_axes;
-    m_input_devices.pop_back();
-  }
-}
-
-bool CAndroidJoyStick::onJoyStickKeyEvent(AInputEvent *event)
+bool CAndroidJoyStick::onJoyStickEvent(AInputEvent* event)
 {
-  if (event == NULL)
-    return false;
-
-  int32_t keycode = AKeyEvent_getKeyCode(event);
-  // watch this check, others might be different.
-  // AML IR Controller is       AINPUT_SOURCE_GAMEPAD | AINPUT_SOURCE_KEYBOARD | AINPUT_SOURCE_DPAD
-  // Gamestick Controller    == AINPUT_SOURCE_GAMEPAD | AINPUT_SOURCE_KEYBOARD
-  // NVidiaShield Controller == AINPUT_SOURCE_GAMEPAD | AINPUT_SOURCE_KEYBOARD
-  // we want to reject AML IR Controller.
-  if (AInputEvent_getSource(event) == (AINPUT_SOURCE_GAMEPAD | AINPUT_SOURCE_KEYBOARD))
-  {
-    // GamePad events are AINPUT_EVENT_TYPE_KEY events,
-    // trap them here and revector valid ones as JoyButtons
-    // so we get keymap handling.
-    for (size_t i = 0; i < sizeof(ButtonMap) / sizeof(KeyMap); i++)
-    {
-      if (keycode == ButtonMap[i].nativeKey)
-      {
-        uint32_t holdtime = 0;
-        uint8_t  button = ButtonMap[i].xbmcID;
-        int32_t  action = AKeyEvent_getAction(event);
-        int32_t  device = AInputEvent_getDeviceId(event);
-
-        if ((action == AKEY_EVENT_ACTION_UP))
-        {
-          // ProcessJoystickEvent does not understand up, ignore it.
-          m_prev_holdtime = m_prev_device = m_prev_button = 0;
-          return false;
-        }
-        else
-        {
-          if (m_prev_holdtime && device == m_prev_device && button == m_prev_button)
-          {
-            holdtime = CTimeUtils::GetFrameTime() - m_prev_holdtime;
-          }
-          else
-          {
-            m_prev_holdtime = CTimeUtils::GetFrameTime();
-            m_prev_device = device;
-            m_prev_button = button;
-          }
-        }
+  int32_t source = AInputEvent_getSource(event);
 
-        XBMC_JoyButton(device, button, holdtime, action == AKEY_EVENT_ACTION_UP);
-        return true;
-      }
-    }
-  }
+  // only handle input events from a gamepad or joystick
+  if ((source & (AINPUT_SOURCE_GAMEPAD | AINPUT_SOURCE_JOYSTICK)) != 0)
+    return CXBMCApp::onInputDeviceEvent(event);
 
+  CXBMCApp::android_printf("CAndroidJoyStick::onJoyStickEvent(type = %d, keycode = %d, source = %d): ignoring non-joystick input event",
+                           AInputEvent_getType(event), AKeyEvent_getKeyCode(event), source);
   return false;
 }
-
-bool CAndroidJoyStick::onJoyStickMotionEvent(AInputEvent *event)
-{
-  if (event == NULL)
-    return false;
-
-  // match this device to a created device struct,
-  // create it if we do not find it.
-  APP_InputDeviceAxes *device_axes = NULL;
-  int32_t device = AInputEvent_getDeviceId(event);
-  // look for device name in our inputdevice cache.
-  for (size_t i = 0; i < m_input_devices.size(); i++)
-  {
-    if (m_input_devices[i]->id == device)
-      device_axes = m_input_devices[i];
-  }
-  if (!device_axes)
-  {
-    // as we see each axis, create a device axes and cache it.
-    device_axes = new APP_InputDeviceAxes;
-    SetupJoySticks(device_axes, device);
-    m_input_devices.push_back(device_axes);
-  }
-
-  // handle queued motion events, we
-  // ingnore history as it only relates to touch.
-  for (size_t p = 0; p < AMotionEvent_getPointerCount(event); p++)
-    ProcessMotionEvents(event, p, device, device_axes);
-
-  return true;
-}
-
-void CAndroidJoyStick::ProcessMotionEvents(AInputEvent *event,
-  size_t pointer_index, int32_t device, APP_InputDeviceAxes *axes)
-{
-  // Left joystick
-  if (axes->y_axis.enabled)
-    ProcessAxis(event, pointer_index, axes->y_axis, device, AXIS_LEFT_STICK_L_R, AMOTION_EVENT_AXIS_Y);
-  if (axes->x_axis.enabled)
-    ProcessAxis(event, pointer_index, axes->x_axis, device, AXIS_LEFT_STICK_U_D, AMOTION_EVENT_AXIS_X);
-
-  // Right joystick
-  if (axes->z_axis.enabled)
-    ProcessAxis(event, pointer_index, axes->z_axis, device, AXIS_RIGHT_STICK_L_R, AMOTION_EVENT_AXIS_Z);
-  if (axes->rz_axis.enabled)
-    ProcessAxis(event, pointer_index, axes->rz_axis,device, AXIS_RIGHT_STICK_U_D, AMOTION_EVENT_AXIS_RZ);
-
-  // Dpad
-  if (axes->y_hat.enabled)
-    ProcessHat(event, pointer_index,  axes->y_hat,  device, AMOTION_EVENT_AXIS_HAT_Y);
-  if (axes->x_hat.enabled)
-    ProcessHat(event, pointer_index,  axes->x_hat,  device, AMOTION_EVENT_AXIS_HAT_X);
-
-#ifdef DEBUG_VERBOSE
-  CLog::Log(LOGDEBUG, "joystick event. x(%f),  y(%f)", axes->x_axis.value, axes->y_axis.value);
-  CLog::Log(LOGDEBUG, "joystick event. z(%f), rz(%f)", axes->z_axis.value, axes->rz_axis.value);
-  CLog::Log(LOGDEBUG, "joystick event. xhat(%f), yhat(%f)", axes->x_hat.value, axes->y_hat.value);
-#endif
-}
-
-bool CAndroidJoyStick::ProcessHat(AInputEvent *event, size_t pointer_index,
-  APP_InputDeviceAxis &hat, int device, int android_axis)
-{
-  bool rtn = false;
-  // Dpad (quantized to -1.0, 0.0 and 1.0)
-  float value = AMotionEvent_getAxisValue(event, android_axis, pointer_index);
-  if (value != hat.value)
-  {
-    u_int8_t hatvalue = XBMC_HAT_CENTERED;
-    if (value != 0)
-      switch (android_axis)
-      {
-        case AMOTION_EVENT_AXIS_HAT_X:
-          if (value < 0)
-            hatvalue |= XBMC_HAT_LEFT;
-          else
-            hatvalue |= XBMC_HAT_RIGHT;
-          break;
-
-        case AMOTION_EVENT_AXIS_HAT_Y:
-          if (value < 0)
-            hatvalue |= XBMC_HAT_UP;
-          else
-            hatvalue |= XBMC_HAT_DOWN;
-          break;
-      }
-
-    XBMC_JoyHat(device, hatvalue);
-    rtn = true;
-  }
-  hat.value = value;
-
-  return rtn;
-}
-
-bool CAndroidJoyStick::ProcessAxis(AInputEvent *event, size_t pointer_index,
-  APP_InputDeviceAxis &axis, int device, int keymap_axis, int android_axis)
-{
-  bool rtn = false;
-
-  float value = AMotionEvent_getAxisValue(event, android_axis, pointer_index);
-  //CLog::Log(LOGDEBUG, "ProcessAxis: keymap_axis(%d), value(%f)", keymap_axis, value);
-
-  value = AxisClampAsButton(axis, value);
-  if (value != axis.value)
-  {
-    XBMC_JoyAxis(device, keymap_axis, value);
-    rtn = true;
-  }
-  axis.value = value;
-
-  return rtn;
-}
-
-void CAndroidJoyStick::XBMC_JoyAxis(uint8_t device, uint8_t axis, float value)
-{
-  XBMC_Event newEvent = {};
-
-  newEvent.type       = XBMC_JOYAXISMOTION;
-  newEvent.jaxis.type = XBMC_JOYAXISMOTION;
-  newEvent.jaxis.which  = device;
-  newEvent.jaxis.axis   = axis;
-  newEvent.jaxis.fvalue = value;
-
-#ifdef DEBUG_VERBOSE
-  CLog::Log(LOGDEBUG, "XBMC_Axis(%u, %u, %u, %f)", newEvent.type, device, axis, value);
-#endif
-  CWinEvents::MessagePush(&newEvent);
-}
-
-void CAndroidJoyStick::XBMC_JoyHat(uint8_t device, uint8_t value)
-{
-  XBMC_Event newEvent = {};
-
-  newEvent.type       = XBMC_JOYHATMOTION;
-  newEvent.jhat.type = XBMC_JOYHATMOTION;
-  newEvent.jhat.which  = device;
-  newEvent.jhat.hat   = 1;
-  newEvent.jhat.value = value;
-
-#ifdef DEBUG_VERBOSE
-  CLog::Log(LOGDEBUG, "XBMC_Hat(%u, %u, %u)", newEvent.type, device, value);
-#endif
-  CWinEvents::MessagePush(&newEvent);
-}
-
-void CAndroidJoyStick::XBMC_JoyButton(uint8_t device, uint8_t button, uint32_t holdtime, bool up)
-{
-  XBMC_Event newEvent = {};
-
-  unsigned char type = up ? XBMC_JOYBUTTONUP : XBMC_JOYBUTTONDOWN;
-  newEvent.type = type;
-  newEvent.jbutton.type = type;
-  newEvent.jbutton.which  = device;
-  newEvent.jbutton.button = button;
-  newEvent.jbutton.holdTime = holdtime;
-
-#ifdef DEBUG_VERBOSE
-  CXBMCApp::android_printf("CAndroidJoyStick::XBMC_JoyButton(%u, %u, %u, %d)",
-    newEvent.jbutton.type, newEvent.jbutton.which, newEvent.jbutton.button, newEvent.jbutton.holdTime);
-#endif
-
-  CWinEvents::MessagePush(&newEvent);
-}

_service:download_url:master.tar.gz/xbmc/platform/android/activity/AndroidJoyStick.h Changed

@@ -24,52 +24,11 @@
 
 struct AInputEvent;
 
-typedef struct {
-  float     flat;
-  float     fuzz;
-  float     min;
-  float     max;
-  float     range;
-  float     value;
-  // internal helper values
-  bool      enabled;
-  float     deadzone;
-  float     buttonclamp;
-} APP_InputDeviceAxis;
-
-typedef struct {
-  int32_t id;
-  APP_InputDeviceAxis x_hat;
-  APP_InputDeviceAxis y_hat;
-  APP_InputDeviceAxis x_axis;
-  APP_InputDeviceAxis y_axis;
-  APP_InputDeviceAxis z_axis;
-  APP_InputDeviceAxis rz_axis;
-} APP_InputDeviceAxes;
-
 class CAndroidJoyStick
 {
 public:
-  CAndroidJoyStick();
- ~CAndroidJoyStick();
-
-  bool onJoyStickKeyEvent(AInputEvent* event);
-  bool onJoyStickMotionEvent(AInputEvent* event);
-
-private:
-  void  ProcessMotionEvents(AInputEvent *event, size_t pointer_index,
-          int32_t device, APP_InputDeviceAxes *axes);
-  bool  ProcessHat( AInputEvent *event, size_t pointer_index,
-          APP_InputDeviceAxis &hat, int device, int android_axis);
-  bool  ProcessAxis(AInputEvent *event, size_t pointer_index,
-          APP_InputDeviceAxis &axis, int device, int keymap_axis, int android_axis);
-
-  void  XBMC_JoyAxis(uint8_t device, uint8_t axis, float value);
-  void  XBMC_JoyHat(uint8_t device, uint8_t value);
-  void  XBMC_JoyButton(uint8_t device, uint8_t button, uint32_t holdtime, bool up);
+  CAndroidJoyStick() { }
+  ~CAndroidJoyStick() { }
 
-  uint8_t               m_prev_device;
-  uint8_t               m_prev_button;
-  uint32_t              m_prev_holdtime;
-  std::vector<APP_InputDeviceAxes*> m_input_devices;
+  bool onJoyStickEvent(AInputEvent* event);
 };

_service:download_url:master.tar.gz/xbmc/platform/android/activity/EventLoop.cpp Changed

@@ -142,14 +142,16 @@
   int32_t type   = AInputEvent_getType(event);
   int32_t source = AInputEvent_getSource(event);
 
+  // handle joystick input
+  if (IS_FROM_SOURCE(source, AINPUT_SOURCE_GAMEPAD) || IS_FROM_SOURCE(source, AINPUT_SOURCE_JOYSTICK))
+  {
+    if (m_inputHandler->onJoyStickEvent(event))
+      return true;
+  }
+
   switch(type)
   {
     case AINPUT_EVENT_TYPE_KEY:
-      if (IS_FROM_SOURCE(source, AINPUT_SOURCE_GAMEPAD) || IS_FROM_SOURCE(source, AINPUT_SOURCE_JOYSTICK))
-      {
-        if (m_inputHandler->onJoyStickKeyEvent(event))
-          return true;
-      }
       rtn = m_inputHandler->onKeyboardEvent(event);
       break;
     case AINPUT_EVENT_TYPE_MOTION:
@@ -157,8 +159,6 @@
         rtn = m_inputHandler->onTouchEvent(event);
       else if (IS_FROM_SOURCE(source, AINPUT_SOURCE_MOUSE))
         rtn = m_inputHandler->onMouseEvent(event);
-      else if (IS_FROM_SOURCE(source, AINPUT_SOURCE_GAMEPAD) || IS_FROM_SOURCE(source, AINPUT_SOURCE_JOYSTICK))
-        rtn = m_inputHandler->onJoyStickMotionEvent(event);
       break;
   }

_service:download_url:master.tar.gz/xbmc/platform/android/activity/IInputDeviceCallbacks.h Added

@@ -0,0 +1,33 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+class IInputDeviceCallbacks
+{
+public:
+  virtual ~IInputDeviceCallbacks() { }
+
+  virtual void OnInputDeviceAdded(int deviceId) = 0;
+  virtual void OnInputDeviceChanged(int deviceId) = 0;
+  virtual void OnInputDeviceRemoved(int deviceId) = 0;
+
+protected:
+  IInputDeviceCallbacks() { }
+};

_service:download_url:master.tar.gz/xbmc/platform/android/activity/IInputDeviceEventHandler.h Added

@@ -0,0 +1,33 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+struct AInputEvent;
+
+class IInputDeviceEventHandler
+{
+public:
+  virtual ~IInputDeviceEventHandler() { }
+
+  virtual bool OnInputDeviceEvent(const AInputEvent* event) = 0;
+
+protected:
+  IInputDeviceEventHandler() { }
+};

_service:download_url:master.tar.gz/xbmc/platform/android/activity/JNIMainActivity.cpp Changed

_service:download_url:master.tar.gz/xbmc/platform/android/activity/JNIMainActivity.h Changed

@@ -20,9 +20,10 @@
  */
 
 #include "platform/android/jni/Activity.h"
+#include "platform/android/jni/InputManager.h"
 #include "platform/android/jni/Surface.h"
 
-class CJNIMainActivity : public CJNIActivity
+class CJNIMainActivity : public CJNIActivity, public CJNIInputManagerInputDeviceListener
 {
 public:
   CJNIMainActivity(const ANativeActivity *nativeActivity);
@@ -33,6 +34,9 @@
   static void _onNewIntent(JNIEnv *env, jobject context, jobject intent);
   static void _onVolumeChanged(JNIEnv *env, jobject context, jint volume);
   static void _onAudioFocusChange(JNIEnv *env, jobject context, jint focusChange);
+  static void _onInputDeviceAdded(JNIEnv *env, jobject context, jint deviceId);
+  static void _onInputDeviceChanged(JNIEnv *env, jobject context, jint deviceId);
+  static void _onInputDeviceRemoved(JNIEnv *env, jobject context, jint deviceId);
 
   static void _callNative(JNIEnv *env, jobject context, jlong funcAddr, jlong variantAddr);
   static void runNativeOnUiThread(void (*callback)(CVariant *), CVariant *variant);

_service:download_url:master.tar.gz/xbmc/platform/android/activity/XBMCApp.cpp Changed

@@ -50,6 +50,8 @@
 #include "platform/XbmcContext.h"
 #include <android/bitmap.h>
 #include "cores/AudioEngine/AEFactory.h"
+#include "platform/android/activity/IInputDeviceCallbacks.h"
+#include "platform/android/activity/IInputDeviceEventHandler.h"
 #include "platform/android/jni/JNIThreading.h"
 #include "platform/android/jni/BroadcastReceiver.h"
 #include "platform/android/jni/Intent.h"
@@ -100,6 +102,8 @@
 int CXBMCApp::m_batteryLevel = 0;
 bool CXBMCApp::m_hasFocus = false;
 bool CXBMCApp::m_headsetPlugged = false;
+IInputDeviceCallbacks* CXBMCApp::m_inputDeviceCallbacks = nullptr;
+IInputDeviceEventHandler* CXBMCApp::m_inputDeviceEventHandler = nullptr;
 CCriticalSection CXBMCApp::m_applicationsMutex;
 std::vector<androidPackage> CXBMCApp::m_applications;
 
@@ -145,6 +149,7 @@
     android_printf("%s: Already running, ignoring request to start", __PRETTY_FUNCTION__);
     return;
   }
+
   pthread_attr_t attr;
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -532,6 +537,18 @@
   ReleaseAudioFocus();
 }
 
+const CJNIViewInputDevice CXBMCApp::GetInputDevice(int deviceId)
+{
+  CJNIInputManager inputManager(getSystemService("input"));
+  return inputManager.getInputDevice(deviceId);
+}
+
+std::vector<int> CXBMCApp::GetInputDeviceIds()
+{
+  CJNIInputManager inputManager(getSystemService("input"));
+  return inputManager.getInputDeviceIds();
+}
+
 std::vector<androidPackage> CXBMCApp::GetApplications()
 {
   CSingleLock lock(m_applicationsMutex);
@@ -896,3 +913,61 @@
   m_windowCreated.WaitMSec(timeout);
   return (const ANativeWindow**)&m_window;
 }
+
+void CXBMCApp::RegisterInputDeviceCallbacks(IInputDeviceCallbacks* handler)
+{
+  if (handler == nullptr)
+    return;
+
+  m_inputDeviceCallbacks = handler;
+}
+
+void CXBMCApp::UnregisterInputDeviceCallbacks()
+{
+  m_inputDeviceCallbacks = nullptr;
+}
+
+void CXBMCApp::onInputDeviceAdded(int deviceId)
+{
+  CXBMCApp::android_printf("Input device added: %d", deviceId);
+
+  if (m_inputDeviceCallbacks != nullptr)
+    m_inputDeviceCallbacks->OnInputDeviceAdded(deviceId);
+}
+
+void CXBMCApp::onInputDeviceChanged(int deviceId)
+{
+  CXBMCApp::android_printf("Input device changed: %d", deviceId);
+
+  if (m_inputDeviceCallbacks != nullptr)
+    m_inputDeviceCallbacks->OnInputDeviceChanged(deviceId);
+}
+
+void CXBMCApp::onInputDeviceRemoved(int deviceId)
+{
+  CXBMCApp::android_printf("Input device removed: %d", deviceId);
+
+  if (m_inputDeviceCallbacks != nullptr)
+    m_inputDeviceCallbacks->OnInputDeviceRemoved(deviceId);
+}
+
+void CXBMCApp::RegisterInputDeviceEventHandler(IInputDeviceEventHandler* handler)
+{
+  if (handler == nullptr)
+    return;
+
+  m_inputDeviceEventHandler = handler;
+}
+
+void CXBMCApp::UnregisterInputDeviceEventHandler()
+{
+  m_inputDeviceEventHandler = nullptr;
+}
+
+bool CXBMCApp::onInputDeviceEvent(const AInputEvent* event)
+{
+  if (m_inputDeviceEventHandler != nullptr)
+    return m_inputDeviceEventHandler->OnInputDeviceEvent(event);
+
+  return false;
+}

_service:download_url:master.tar.gz/xbmc/platform/android/activity/XBMCApp.h Changed

@@ -33,6 +33,7 @@
 #include "platform/android/jni/Activity.h"
 #include "platform/android/jni/BroadcastReceiver.h"
 #include "platform/android/jni/AudioManager.h"
+#include "platform/android/jni/View.h"
 #include "threads/Event.h"
 
 #include "JNIMainActivity.h"
@@ -41,6 +42,8 @@
 class CJNIWakeLock;
 class CAESinkAUDIOTRACK;
 class CVariant;
+class IInputDeviceCallbacks;
+class IInputDeviceEventHandler;
 typedef struct _JNIEnv JNIEnv;
 
 struct androidIcon
@@ -57,7 +60,9 @@
   int icon;
 };
 
-class CXBMCApp : public IActivityHandler, public CJNIMainActivity, public CJNIBroadcastReceiver, public CJNIAudioManagerAudioFocusChangeListener
+class CXBMCApp : public IActivityHandler, public CJNIMainActivity,
+                 public CJNIBroadcastReceiver,
+                 public CJNIAudioManagerAudioFocusChangeListener
 {
 public:
   CXBMCApp(ANativeActivity *nativeActivity);
@@ -67,6 +72,11 @@
   virtual void onVolumeChanged(int volume);
   virtual void onAudioFocusChange(int focusChange);
 
+  // implementation of CJNIInputManagerInputDeviceListener
+  void onInputDeviceAdded(int deviceId) override;
+  void onInputDeviceChanged(int deviceId) override;
+  void onInputDeviceRemoved(int deviceId) override;
+
   bool isValid() { return m_activity != NULL; }
 
   void onStart();
@@ -120,6 +130,16 @@
   static void OnPlayBackStopped();
   static void OnPlayBackEnded();
 
+  // input device methods
+  static void RegisterInputDeviceCallbacks(IInputDeviceCallbacks* handler);
+  static void UnregisterInputDeviceCallbacks();
+  static const CJNIViewInputDevice GetInputDevice(int deviceId);
+  static std::vector<int> GetInputDeviceIds();
+
+  static void RegisterInputDeviceEventHandler(IInputDeviceEventHandler* handler);
+  static void UnregisterInputDeviceEventHandler();
+  static bool onInputDeviceEvent(const AInputEvent* event);
+
   static CXBMCApp* get() { return m_xbmcappinstance; }
 
 protected:
@@ -143,6 +163,8 @@
   static int m_batteryLevel;
   static bool m_hasFocus;
   static bool m_headsetPlugged;
+  static IInputDeviceCallbacks* m_inputDeviceCallbacks;
+  static IInputDeviceEventHandler* m_inputDeviceEventHandler;
   bool m_firstrun;
   bool m_exiting;
   pthread_t m_thread;

_service:download_url:master.tar.gz/xbmc/platform/android/activity/android_main.cpp Changed

@@ -93,6 +93,7 @@
   std::string frameListener = "org/xbmc/" + appName + "/XBMCOnFrameAvailableListener";
   std::string settingsObserver = "org/xbmc/" + appName + "/XBMCSettingsContentObserver";
   std::string audioFocusChangeListener = "org/xbmc/" + appName + "/XBMCOnAudioFocusChangeListener";
+  std::string inputDeviceListener = "org/xbmc/" + appName + "/XBMCInputDeviceListener";
 
   jclass cMain = env->FindClass(mainClass.c_str());
   if(cMain)
@@ -156,5 +157,16 @@
     env->RegisterNatives(cAudioFocusChangeListener, &mOnAudioFocusChange, 1);
   }
 
+  jclass cInputDeviceListener = env->FindClass(inputDeviceListener.c_str());
+  if(cInputDeviceListener)
+  {
+    JNINativeMethod mInputDeviceCallbacks[3] = {
+      { "_onInputDeviceAdded", "(I)V", (void*)&CJNIMainActivity::_onInputDeviceAdded },
+      { "_onInputDeviceChanged", "(I)V", (void*)&CJNIMainActivity::_onInputDeviceChanged },
+      { "_onInputDeviceRemoved", "(I)V", (void*)&CJNIMainActivity::_onInputDeviceRemoved }
+    };
+    env->RegisterNatives(cInputDeviceListener, mInputDeviceCallbacks, 3);
+  }
+
   return version;
 }

_service:download_url:master.tar.gz/xbmc/platform/android/jni/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/platform/android/jni/Context.cpp Changed

_service:download_url:master.tar.gz/xbmc/platform/android/jni/InputManager.cpp Added

@@ -0,0 +1,92 @@
+/*
+ *      Copyright (C) 2013 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <algorithm>
+
+#include "InputManager.h"
+#include "ClassLoader.h"
+#include "Context.h"
+#include "platform/android/activity/JNIMainActivity.h"
+
+#include "jutils/jutils-details.hpp"
+
+using namespace jni;
+
+/************************************************************************/
+/************************************************************************/
+CJNIInputManagerInputDeviceListener* CJNIInputManagerInputDeviceListener::m_listenerInstance = nullptr;
+
+CJNIInputManagerInputDeviceListener::CJNIInputManagerInputDeviceListener()
+  : CJNIBase(CJNIContext::getPackageName() + ".XBMCInputDeviceListener")
+{
+  CJNIMainActivity *appInstance = CJNIMainActivity::GetAppInstance();
+  if (!appInstance)
+    return;
+
+  // Convert "the/class/name" to "the.class.name" as loadClass() expects it.
+  std::string dotClassName = GetClassName();
+  std::replace(dotClassName.begin(), dotClassName.end(), '/', '.');
+  m_object = new_object(appInstance->getClassLoader().loadClass(dotClassName));
+  m_object.setGlobal();
+
+  m_listenerInstance = this;
+}
+
+void CJNIInputManagerInputDeviceListener::_onInputDeviceAdded(JNIEnv *env, jobject context, jint deviceId)
+{
+  static_cast<void>(env);
+  static_cast<void>(context);
+
+  if (m_listenerInstance != nullptr)
+    m_listenerInstance->onInputDeviceAdded(deviceId);
+}
+
+void CJNIInputManagerInputDeviceListener::_onInputDeviceChanged(JNIEnv *env, jobject context, jint deviceId)
+{
+  static_cast<void>(env);
+  static_cast<void>(context);
+
+  if (m_listenerInstance != nullptr)
+    m_listenerInstance->onInputDeviceChanged(deviceId);
+}
+
+void CJNIInputManagerInputDeviceListener::_onInputDeviceRemoved(JNIEnv *env, jobject context, jint deviceId)
+{
+  static_cast<void>(env);
+  static_cast<void>(context);
+
+  if (m_listenerInstance != nullptr)
+    m_listenerInstance->onInputDeviceRemoved(deviceId);
+}
+
+/************************************************************************/
+/************************************************************************/
+const CJNIViewInputDevice CJNIInputManager::getInputDevice(int id) const
+{
+  return call_method<jhobject>(m_object,
+    "getInputDevice", "(I)Landroid/view/InputDevice;",
+    id);
+}
+
+std::vector<int> CJNIInputManager::getInputDeviceIds() const
+{
+  return jcast<std::vector<int>>(call_method<jhintArray>(m_object,
+    "getInputDeviceIds", "()[I"));
+}

_service:download_url:master.tar.gz/xbmc/platform/android/jni/InputManager.h Added

@@ -0,0 +1,57 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "JNIBase.h"
+#include "View.h"
+
+class CJNIInputManagerInputDeviceListener : public CJNIBase
+{
+public:
+  CJNIInputManagerInputDeviceListener(const jni::jhobject &object) : CJNIBase(object) {};
+  ~CJNIInputManagerInputDeviceListener() {};
+
+  static void _onInputDeviceAdded(JNIEnv *env, jobject context, jint deviceId);
+  static void _onInputDeviceChanged(JNIEnv *env, jobject context, jint deviceId);
+  static void _onInputDeviceRemoved(JNIEnv *env, jobject context, jint deviceId);
+
+protected:
+  CJNIInputManagerInputDeviceListener();
+
+  virtual void onInputDeviceAdded(int deviceId) = 0;
+  virtual void onInputDeviceChanged(int deviceId) = 0;
+  virtual void onInputDeviceRemoved(int deviceId) = 0;
+
+private:
+  static CJNIInputManagerInputDeviceListener *m_listenerInstance;
+};
+
+class CJNIInputManager : public CJNIBase
+{
+public:
+  CJNIInputManager(const jni::jhobject &object) : CJNIBase(object) {};
+  ~CJNIInputManager() {};
+
+  const CJNIViewInputDevice getInputDevice(int id) const;
+  std::vector<int> getInputDeviceIds() const;
+
+private:
+  CJNIInputManager();
+};

_service:download_url:master.tar.gz/xbmc/platform/android/jni/List.cpp Changed

_service:download_url:master.tar.gz/xbmc/platform/android/jni/List.h Changed

_service:download_url:master.tar.gz/xbmc/platform/android/jni/Makefile.in Changed

_service:download_url:master.tar.gz/xbmc/platform/android/jni/Os.cpp Added

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (C) 2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "Os.h"
+
+#include "jutils/jutils-details.hpp"
+
+using namespace jni;
+
+/************************************************************************/
+/************************************************************************/
+void CJNIOsVibrator::cancel() const
+{
+  call_method<void>(m_object,
+    "cancel", "()V");
+}
+
+bool CJNIOsVibrator::hasVibrator() const
+{
+  return call_method<jboolean>(m_object,
+    "hasVibrator", "()Z");
+}
+
+void CJNIOsVibrator::vibrate(std::vector<int64_t> pattern, int repeat) const
+{
+  /* TODO
+  call_method<void>(m_object,
+    "vibrate", "([JI)F",
+    jcast<jlongArray>(pattern), repeat);
+  */
+}
+
+void	CJNIOsVibrator::vibrate(int64_t milliseconds) const
+{
+  call_method<void>(m_object,
+    "vibrate", "(J)V",
+    milliseconds);
+}

_service:download_url:master.tar.gz/xbmc/platform/android/jni/Os.h Added

@@ -0,0 +1,37 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "JNIBase.h"
+
+class CJNIOsVibrator : public CJNIBase
+{
+public:
+  CJNIOsVibrator(const jni::jhobject &object) : CJNIBase(object) {};
+ ~CJNIOsVibrator() {};
+
+  void cancel() const;
+  bool hasVibrator() const;
+  void vibrate(std::vector<int64_t> pattern, int repeat) const;
+  void vibrate(int64_t milliseconds) const;
+
+private:
+  CJNIOsVibrator();
+};

_service:download_url:master.tar.gz/xbmc/platform/android/jni/View.cpp Changed

@@ -18,7 +18,6 @@
  *
  */
 
-#include "Window.h"
 #include "View.h"
 #include "Display.h"
 
@@ -64,14 +63,29 @@
     "getRange", "()F");
 }
 
+float CJNIViewInputDeviceMotionRange::getResolution() const
+{
+  return call_method<jfloat>(m_object,
+    "getResolution", "()F");
+}
+
 int CJNIViewInputDeviceMotionRange::getSource() const
 {
   return call_method<int>(m_object,
     "getSource", "()I");
 }
 
+bool CJNIViewInputDeviceMotionRange::isFromSource(int source) const
+{
+  return call_method<jboolean>(m_object,
+    "isFromSource", "(I)Z",
+    source);
+}
+
 /************************************************************************/
 /************************************************************************/
+int CJNIViewInputDevice::SOURCE_GAMEPAD = 0;
+int CJNIViewInputDevice::SOURCE_JOYSTICK = 0;
 const char *CJNIViewInputDevice::m_classname = "android/view/InputDevice";
 
 const CJNIViewInputDevice CJNIViewInputDevice::getDevice(int id)
@@ -81,18 +95,73 @@
     id);
 }
 
+int CJNIViewInputDevice::getControllerNumber() const
+{
+  return call_method<int>(m_object,
+    "getControllerNumber", "()I");
+}
+
+std::string CJNIViewInputDevice::getDescriptor() const
+{
+  return jcast<std::string>(call_method<jhstring>(m_object,
+    "getDescriptor", "()Ljava/lang/String;"));
+}
+
+int CJNIViewInputDevice::getId() const
+{
+  return call_method<int>(m_object,
+    "getId", "()I");
+}
+
 std::string CJNIViewInputDevice::getName() const
 {
   return jcast<std::string>(call_method<jhstring>(m_object,
     "getName", "()Ljava/lang/String;"));
 }
 
+int CJNIViewInputDevice::getProductId() const
+{
+  return call_method<int>(m_object,
+    "getProductId", "()I");
+}
+
 int CJNIViewInputDevice::getSources() const
 {
   return call_method<int>(m_object,
     "getSources", "()I");
 }
 
+int CJNIViewInputDevice::getVendorId() const
+{
+  return call_method<int>(m_object,
+    "getVendorId", "()I");
+}
+
+const CJNIOsVibrator CJNIViewInputDevice::getVibrator() const
+{
+  return call_method<jhobject>(m_object,
+    "getVibrator", "()Landroid/os/Vibrator;");
+}
+
+bool CJNIViewInputDevice::hasMicrophone() const
+{
+  return call_method<jboolean>(m_object,
+    "hasMicrophone", "()Z");
+}
+
+bool CJNIViewInputDevice::isVirtual() const
+{
+  return call_method<jboolean>(m_object,
+    "isVirtual", "()Z");
+}
+
+bool CJNIViewInputDevice::supportsSource(int source) const
+{
+  return call_method<jboolean>(m_object,
+    "supportsSource", "(I)Z",
+    source);
+}
+
 const CJNIList<CJNIViewInputDeviceMotionRange> CJNIViewInputDevice::getMotionRanges() const
 {
   return call_method<jhobject>(m_object,
@@ -113,6 +182,13 @@
     axis, source);
 }
 
+void CJNIViewInputDevice::PopulateStaticFields()
+{
+  jhclass clazz = find_class(m_classname);
+  SOURCE_GAMEPAD = get_static_field<int>(clazz, "SOURCE_GAMEPAD");
+  SOURCE_JOYSTICK = get_static_field<int>(clazz, "SOURCE_JOYSTICK");
+}
+
 /************************************************************************/
 /************************************************************************/
 int CJNIView::SYSTEM_UI_FLAG_FULLSCREEN(0);

_service:download_url:master.tar.gz/xbmc/platform/android/jni/View.h Changed

@@ -21,6 +21,7 @@
 
 #include "JNIBase.h"
 #include "List.h"
+#include "Os.h"
 
 class CJNIDisplay;
 
@@ -30,13 +31,15 @@
   CJNIViewInputDeviceMotionRange(const jni::jhobject &object) : CJNIBase(object) {};
  ~CJNIViewInputDeviceMotionRange() {};
 
-  int   getAxis()   const;
-  float getFlat()   const;
-  float getFuzz()   const;
-  float	getMax()    const;
-  float	getMin()    const;
-  float	getRange()  const;
+  int   getAxis() const;
+  float getFlat() const;
+  float getFuzz() const;
+  float	getMax() const;
+  float	getMin() const;
+  float	getRange() const;
+  float getResolution() const;
   int   getSource() const;
+  bool  isFromSource(int source) const;
 
 private:
   CJNIViewInputDeviceMotionRange();
@@ -50,11 +53,24 @@
 
   static const CJNIViewInputDevice getDevice(int id);
 
+  int          getControllerNumber() const;
+  std::string  getDescriptor() const;
+  int          getId() const;
+  const CJNIViewInputDeviceMotionRange getMotionRange(int axis, int source) const;
+  const CJNIViewInputDeviceMotionRange getMotionRange(int axis) const;
+  const CJNIList<CJNIViewInputDeviceMotionRange> getMotionRanges() const;
   std::string  getName() const;
+  int          getProductId() const;
   int          getSources() const;
-  const CJNIList<CJNIViewInputDeviceMotionRange> getMotionRanges() const;
-  const CJNIViewInputDeviceMotionRange getMotionRange(int axis) const;
-  const CJNIViewInputDeviceMotionRange getMotionRange(int axis, int source) const;
+  int          getVendorId() const;
+  const CJNIOsVibrator getVibrator() const;
+  bool         hasMicrophone() const;
+  bool         isVirtual() const;
+  bool         supportsSource(int source) const;
+
+  static void PopulateStaticFields();
+  static int SOURCE_GAMEPAD;
+  static int SOURCE_JOYSTICK;
 
 private:
   CJNIViewInputDevice();

_service:download_url:master.tar.gz/xbmc/platform/android/jni/jutils/jutils-details.hpp Changed

@@ -78,6 +78,52 @@
 };
 
 template <>
+struct jcast_helper<std::vector<int>, jintArray>
+{
+    static std::vector<int> cast(jintArray const &v)
+    {
+        JNIEnv *env = xbmc_jnienv();
+        jsize size = 0;
+        if(v)
+            size = env->GetArrayLength(v);
+
+        std::vector<int> vec;
+        vec.reserve(size);
+
+        int *elements = env->GetIntArrayElements(v, NULL);
+        for (int i = 0; i < size; i++)
+        {
+            vec.emplace_back(elements[i]);
+        }
+        env->ReleaseIntArrayElements(v, elements, JNI_ABORT);
+        return vec;
+    }
+};
+
+template <>
+struct jcast_helper<std::vector<int64_t>, jlongArray>
+{
+    static std::vector<int64_t> cast(jlongArray const &v)
+    {
+        JNIEnv *env = xbmc_jnienv();
+        jsize size = 0;
+        if(v)
+            size = env->GetArrayLength(v);
+
+        std::vector<int64_t> vec;
+        vec.reserve(size);
+
+        int64_t *elements = env->GetLongArrayElements(v, NULL);
+        for (int i = 0; i < size; i++)
+        {
+            vec.emplace_back(elements[i]);
+        }
+        env->ReleaseLongArrayElements(v, elements, JNI_ABORT);
+        return vec;
+    }
+};
+
+template <>
 struct jcast_helper<std::vector<float>, jfloatArray>
 {
     static std::vector<float> cast(jfloatArray const &v)
@@ -140,6 +186,24 @@
 };
 
 template <>
+struct jcast_helper<std::vector<int>, jhintArray>
+{
+    static std::vector<int> cast(jhintArray const &v)
+    {
+        return jcast_helper<std::vector<int>, jintArray>::cast(v.get());
+    }
+};
+
+template <>
+struct jcast_helper<std::vector<int64_t>, jhlongArray>
+{
+    static std::vector<int64_t> cast(jhlongArray const &v)
+    {
+        return jcast_helper<std::vector<int64_t>, jlongArray>::cast(v.get());
+    }
+};
+
+template <>
 struct jcast_helper<std::vector<float>, jhfloatArray>
 {
     static std::vector<float> cast(jhfloatArray const &v)

_service:download_url:master.tar.gz/xbmc/platform/darwin/ios/IOSEAGLView.mm Changed

_service:download_url:master.tar.gz/xbmc/platform/darwin/ios/XBMCController.mm Changed

_service:download_url:master.tar.gz/xbmc/playlists/PlayListM3U.cpp Changed

@@ -22,7 +22,6 @@
 #include "filesystem/File.h"
 #include "URL.h"
 #include "Util.h"
-#include "utils/StringUtils.h"
 #include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
@@ -32,13 +31,13 @@
 using namespace PLAYLIST;
 using namespace XFILE;
 
-#define M3U_START_MARKER "#EXTM3U"
-#define M3U_INFO_MARKER  "#EXTINF"
-#define M3U_ARTIST_MARKER  "#EXTART"
-#define M3U_ALBUM_MARKER  "#EXTALB"
-#define M3U_STREAM_MARKER  "#EXT-X-STREAM-INF"
-#define M3U_BANDWIDTH_MARKER  "BANDWIDTH"
-#define M3U_OFFSET_MARKER  "#EXT-KX-OFFSET"
+const char* CPlayListM3U::StartMarker = "#EXTCPlayListM3U::M3U";
+const char* CPlayListM3U::InfoMarker = "#EXTINF";
+const char* CPlayListM3U::ArtistMarker = "#EXTART";
+const char* CPlayListM3U::AlbumMarker = "#EXTALB";
+const char* CPlayListM3U::StreamMarker = "#EXT-X-STREAM-INF";
+const char* CPlayListM3U::BandwidthMarker = "BANDWIDTH";
+const char* CPlayListM3U::OffsetMarker = "#EXT-KX-OFFSET";
 
 // example m3u file:
 //   #EXTM3U
@@ -93,7 +92,7 @@
     strLine = szLine;
     StringUtils::Trim(strLine);
 
-    if (StringUtils::StartsWith(strLine, M3U_INFO_MARKER))
+    if (StringUtils::StartsWith(strLine, InfoMarker))
     {
       // start of info
       size_t iColon = strLine.find(":");
@@ -111,7 +110,7 @@
         g_charsetConverter.unknownToUTF8(strInfo);
       }
     }
-    else if (StringUtils::StartsWith(strLine, M3U_OFFSET_MARKER))
+    else if (StringUtils::StartsWith(strLine, OffsetMarker))
     {
       size_t iColon = strLine.find(":");
       size_t iComma = strLine.find(",");
@@ -126,9 +125,9 @@
         iEndOffset = atoi(strLine.substr(iComma).c_str());
       }
     }
-    else if (strLine != M3U_START_MARKER &&
-             !StringUtils::StartsWith(strLine, M3U_ARTIST_MARKER) &&
-             !StringUtils::StartsWith(strLine, M3U_ALBUM_MARKER))
+    else if (strLine != StartMarker &&
+             !StringUtils::StartsWith(strLine, ArtistMarker) &&
+             !StringUtils::StartsWith(strLine, AlbumMarker))
     {
       std::string strFileName = strLine;
 
@@ -200,7 +199,7 @@
     CLog::Log(LOGERROR, "Could not save M3U playlist: [%s]", strPlaylist.c_str());
     return;
   }
-  std::string strLine = StringUtils::Format("%s\n",M3U_START_MARKER);
+  std::string strLine = StringUtils::Format("%s\n",StartMarker);
   if (file.Write(strLine.c_str(), strLine.size()) != static_cast<ssize_t>(strLine.size()))
     return; // error
 
@@ -209,12 +208,12 @@
     CFileItemPtr item = m_vecItems[i];
     std::string strDescription=item->GetLabel();
     g_charsetConverter.utf8ToStringCharset(strDescription);
-    strLine = StringUtils::Format( "%s:%i,%s\n", M3U_INFO_MARKER, item->GetMusicInfoTag()->GetDuration() / 1000, strDescription.c_str() );
+    strLine = StringUtils::Format( "%s:%i,%s\n", InfoMarker, item->GetMusicInfoTag()->GetDuration() / 1000, strDescription.c_str() );
     if (file.Write(strLine.c_str(), strLine.size()) != static_cast<ssize_t>(strLine.size()))
       return; // error
     if (item->m_lStartOffset != 0 || item->m_lEndOffset != 0)
     {
-      strLine = StringUtils::Format("%s:%i,%i\n", M3U_OFFSET_MARKER, item->m_lStartOffset, item->m_lEndOffset);
+      strLine = StringUtils::Format("%s:%i,%i\n", OffsetMarker, item->m_lStartOffset, item->m_lEndOffset);
       file.Write(strLine.c_str(),strLine.size());
     }
     std::string strFileName = ResolveURL(item);
@@ -226,97 +225,16 @@
   file.Close();
 }
 
-std::string CPlayListM3U::GetBestBandwidthStream(const std::string &strFileName, size_t bandwidth)
-{
-  // we may be passed a playlist that does not contain playlists of different
-  // bitrates (eg: this playlist is really the HLS video). So, default the
-  // return to the filename so it can be played
-  char szLine[4096];
-  std::string strLine;
-  size_t maxBandwidth = 0;
-
-  // open the file, and if it fails, return
-  CFile file;
-  if (!file.Open(strFileName) )
-  {
-    file.Close();
-    return strFileName;
-  }
-
-  // get protocol options if they were set, so we can restore them again at the end
-  CURL playlistUrl(strFileName);
-  
-  // and set the fallback value
-  CURL subStreamUrl = CURL(strFileName);
-  
-  // determine the base
-  CURL basePlaylistUrl(URIUtils::GetParentPath(strFileName));
-  basePlaylistUrl.SetOptions("");
-  basePlaylistUrl.SetProtocolOptions("");
-  std::string basePart = basePlaylistUrl.Get();
-
-  // convert bandwidth specified in kbps to bps used by the m3u8
-  bandwidth *= 1000;
-
-  while (file.ReadString(szLine, 1024))
-  {
-    // read and trim a line
-    strLine = szLine;
-    StringUtils::Trim(strLine);
-
-    // skip the first line
-    if (strLine == M3U_START_MARKER)
-        continue;
-    else if (StringUtils::StartsWith(strLine, M3U_STREAM_MARKER))
-    {
-      // parse the line so we can pull out the bandwidth
-      std::map< std::string, std::string > params = ParseStreamLine(strLine);
-      std::map< std::string, std::string >::iterator it = params.find(M3U_BANDWIDTH_MARKER);
-
-      if (it != params.end())
-      {
-        size_t streamBandwidth = atoi(it->second.c_str());
-        if ((maxBandwidth < streamBandwidth) && (streamBandwidth <= bandwidth))
-        {
-          // read the next line
-          if (!file.ReadString(szLine, 1024))
-            continue;
-
-          strLine = szLine;
-          StringUtils::Trim(strLine);
-
-          // this line was empty
-          if (strLine.empty())
-            continue;
-
-          // store the max bandwidth
-          maxBandwidth = streamBandwidth;
-
-          // if the path is absolute just use it
-          if (CURL::IsFullPath(strLine))
-            subStreamUrl = CURL(strLine);
-          else
-            subStreamUrl = CURL(basePart + strLine);
-        }
-      }
-    }
-  }
-
-  // if any protocol options were set, restore them
-  subStreamUrl.SetProtocolOptions(playlistUrl.GetProtocolOptions());
-  return subStreamUrl.Get();
-}
-
 std::map< std::string, std::string > CPlayListM3U::ParseStreamLine(const std::string &streamLine)
 {
   std::map< std::string, std::string > params;
 
   // ensure the line has something beyond the stream marker and ':'
-  if (streamLine.size() < strlen(M3U_STREAM_MARKER) + 2)
+  if (streamLine.size() < strlen(StreamMarker) + 2)
     return params;
 
   // get the actual params following the :
-  std::string strParams(streamLine.substr(strlen(M3U_STREAM_MARKER) + 1));
+  std::string strParams(streamLine.substr(strlen(StreamMarker) + 1));
 
   // separate the parameters
   std::vector<std::string> vecParams = StringUtils::Split(strParams, ",");

_service:download_url:master.tar.gz/xbmc/playlists/PlayListM3U.h Changed

_service:download_url:master.tar.gz/xbmc/programs/GUIWindowPrograms.cpp Changed

@@ -28,7 +28,6 @@
 #include "settings/MediaSourceSettings.h"
 #include "input/Key.h"
 #include "utils/StringUtils.h"
-#include "ContextMenuManager.h"
 
 #define CONTROL_BTNVIEWASICONS 2
 #define CONTROL_BTNSORTBY      3
@@ -108,17 +107,10 @@
     }
     else
     {
-      if (!m_vecItems->IsPlugin() && (item->IsPlugin() || item->IsScript()))
-        buttons.Add(CONTEXT_BUTTON_INFO, 24003); // Add-on info
-      if (item->IsPlugin() || item->IsScript() || m_vecItems->IsPlugin())
-        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
-
       buttons.Add(CONTEXT_BUTTON_GOTO_ROOT, 20128); // Go to Root
     }
   }
   CGUIMediaWindow::GetContextButtons(itemNumber, buttons);
-
-  CContextMenuManager::GetInstance().AddVisibleItems(item, buttons);
 }
 
 bool CGUIWindowPrograms::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
@@ -135,11 +127,6 @@
   case CONTEXT_BUTTON_GOTO_ROOT:
     Update("");
     return true;
-
-  case CONTEXT_BUTTON_INFO:
-    OnItemInfo(itemNumber);
-    return true;
-
   default:
     break;
   }

_service:download_url:master.tar.gz/xbmc/pvr/PVRDatabase.cpp Changed

@@ -23,7 +23,7 @@
 #include <utility>
 
 #include "dbwrappers/dataset.h"
-#include "pvr/addons/PVRClient.h"
+#include "addons/PVRClient.h"
 #include "pvr/channels/PVRChannelGroupInternal.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/PVRManager.h"
@@ -139,42 +139,6 @@
 
   if (iVersion < 28)
   {
-    VECADDONS addons;
-    CAddonDatabase database;
-    if (database.Open() && CAddonMgr::GetInstance().GetAddons(addons, ADDON_PVRDLL))
-    {
-      /** find all old client IDs */
-      std::string strQuery(PrepareSQL("SELECT idClient, sUid FROM clients"));
-      m_pDS->query(strQuery);
-      while (!m_pDS->eof() && !addons.empty())
-      {
-        /** try to find an add-on that matches the sUid */
-        for (VECADDONS::iterator it = addons.begin(); it != addons.end(); ++it)
-        {
-          if ((*it)->ID() == m_pDS->fv(1).get_asString())
-          {
-            /** try to get the current ID from the database */
-            int iAddonId = database.GetAddonId(*it);
-            /** register a new id if it didn't exist */
-            if (iAddonId <= 0)
-              iAddonId = database.AddAddon(*it, 0);
-            if (iAddonId > 0)
-            {
-              // this fails when an id becomes the id of one that's being replaced next iteration
-              // but since almost everyone only has 1 add-on enabled...
-              /** update the iClientId in the channels table */
-              strQuery = PrepareSQL("UPDATE channels SET iClientId = %u WHERE iClientId = %u", iAddonId, m_pDS->fv(0).get_asInt());
-              m_pDS->exec(strQuery);
-
-              /** no need to check this add-on again */
-              it = addons.erase(it);
-              break;
-            }
-          }
-        }
-        m_pDS->next();
-      }
-    }
     m_pDS->exec("DROP TABLE clients");
   }

_service:download_url:master.tar.gz/xbmc/pvr/PVRGUIInfo.cpp Changed

@@ -64,7 +64,8 @@
   m_strNextRecordingChannelIcon .clear();
   m_strNextRecordingTime        .clear();
   m_iTimerAmount                = 0;
-  m_bHasRecordings              = false;
+  m_bHasTVRecordings            = false;
+  m_bHasRadioRecordings         = false;
   m_iRecordingTimerAmount       = 0;
   m_iCurrentActiveClient        = 0;
   m_strPlayingClientName        .clear();
@@ -265,7 +266,8 @@
 {
   bool bStarted = g_PVRManager.IsStarted();
   std::string strPlayingClientName     = bStarted ? g_PVRClients->GetPlayingClientName() : "";
-  bool       bHasRecordings            = bStarted && g_PVRRecordings->GetNumRecordings() > 0;
+  bool       bHasTVRecordings          = bStarted && g_PVRRecordings->GetNumTVRecordings() > 0;
+  bool       bHasRadioRecordings       = bStarted && g_PVRRecordings->GetNumRadioRecordings() > 0;
   bool       bIsPlayingTV              = bStarted && g_PVRClients->IsPlayingTV();
   bool       bIsPlayingRadio           = bStarted && g_PVRClients->IsPlayingRadio();
   bool       bIsPlayingRecording       = bStarted && g_PVRClients->IsPlayingRecording();
@@ -279,7 +281,8 @@
 
   CSingleLock lock(m_critSection);
   m_strPlayingClientName      = strPlayingClientName;
-  m_bHasRecordings            = bHasRecordings;
+  m_bHasTVRecordings          = bHasTVRecordings;
+  m_bHasRadioRecordings       = bHasRadioRecordings;
   m_bHasNonRecordingTimers    = bHasNonRecordingTimers;
   m_bIsPlayingTV              = bIsPlayingTV;
   m_bIsPlayingRadio           = bIsPlayingRadio;

_service:download_url:master.tar.gz/xbmc/pvr/PVRGUIInfo.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/PVRManager.cpp Changed

@@ -65,6 +65,7 @@
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 #include "video/VideoDatabase.h"
+#include "ServiceBroker.h"
 
 using namespace MUSIC_INFO;
 using namespace PVR;
@@ -91,11 +92,6 @@
 
 CPVRManager::CPVRManager(void) :
     CThread("PVRManager"),
-    m_channelGroups(NULL),
-    m_recordings(NULL),
-    m_timers(NULL),
-    m_addons(NULL),
-    m_guiInfo(NULL),
     m_triggerEvent(true),
     m_currentFile(NULL),
     m_database(NULL),
@@ -105,13 +101,15 @@
     m_managerState(ManagerStateStopped)
 {
   CAnnouncementManager::GetInstance().AddAnnouncer(this);
-  ResetProperties();
+  m_addons.reset(new CPVRClients);
 }
 
 CPVRManager::~CPVRManager(void)
 {
+  CSettings::GetInstance().UnregisterCallback(this);
   CAnnouncementManager::GetInstance().RemoveAnnouncer(this);
   Stop();
+  m_addons.reset();
   CLog::Log(LOGDEBUG,"PVRManager - destroyed");
 }
 
@@ -139,18 +137,7 @@
 
 CPVRManager &CPVRManager::GetInstance()
 {
-  static CPVRManager pvrManagerInstance;
-  return pvrManagerInstance;
-}
-
-bool CPVRManager::RestartManagerOnAddonDisabled(void) const
-{
-  ManagerState ms(GetState());
-  if (ms == ManagerStateStarting)
-    return false;
-  else if (ms == ManagerStateStarted)
-    return m_addons->RestartManagerOnAddonDisabled();
-  return true;
+  return CServiceBroker::GetPVRManager();
 }
 
 void CPVRManager::OnSettingChanged(const CSetting *setting)
@@ -159,11 +146,7 @@
     return;
 
   const std::string &settingId = setting->GetId();
-  if (settingId == CSettings::SETTING_PVRMANAGER_ENABLED)
-  {
-    CApplicationMessenger::GetInstance().PostMsg(TMSG_SETPVRMANAGERSTATE, ((CSettingBool*)setting)->GetValue() ? 1 : 0);
-  }
-  else if (settingId == CSettings::SETTING_PVRPARENTAL_ENABLED)
+  if (settingId == CSettings::SETTING_PVRPARENTAL_ENABLED)
   {
     if (((CSettingBool*)setting)->GetValue() && CSettings::GetInstance().GetString(CSettings::SETTING_PVRPARENTAL_PIN).empty())
     {
@@ -325,7 +308,6 @@
   }
 
   m_guiInfo->Stop();
-  m_addons->Stop();
   Cleanup();
 
   // upgrade all add-ons
@@ -366,17 +348,13 @@
 
 void CPVRManager::Cleanup(void)
 {
-  if (m_addons)
-    m_addons->Unload();
-
   CSingleLock lock(m_critSection);
 
-  SAFE_DELETE(m_addons);
-  SAFE_DELETE(m_guiInfo);
-  SAFE_DELETE(m_timers);
-  SAFE_DELETE(m_recordings);
-  SAFE_DELETE(m_channelGroups);
-  SAFE_DELETE(m_parentalTimer);
+  m_guiInfo.reset();
+  m_timers.reset();
+  m_recordings.reset();
+  m_channelGroups.reset();
+  m_parentalTimer.reset();
   SAFE_DELETE(m_database);
   m_triggerEvent.Set();
 
@@ -405,64 +383,45 @@
   CSingleLock lock(m_critSection);
   Cleanup();
 
-  if (!g_application.m_bStop)
-  {
-    m_addons        = new CPVRClients;
-    m_channelGroups = new CPVRChannelGroupsContainer;
-    m_recordings    = new CPVRRecordings;
-    m_timers        = new CPVRTimers;
-    m_guiInfo       = new CPVRGUIInfo;
-    m_parentalTimer = new CStopWatch;
-  }
+  m_channelGroups.reset(new CPVRChannelGroupsContainer);
+  m_recordings.reset(new CPVRRecordings);
+  m_timers.reset(new CPVRTimers);
+  m_guiInfo.reset(new CPVRGUIInfo);
+  m_parentalTimer.reset(new CStopWatch);
 }
 
-class CPVRManagerStartJob : public CJob
+void CPVRManager::Init()
 {
-public:
-  CPVRManagerStartJob() {}
-  ~CPVRManagerStartJob(void) {}
+  std::set<std::string> settingSet;
+  settingSet.insert(CSettings::SETTING_PVRMANAGER_CHANNELMANAGER);
+  settingSet.insert(CSettings::SETTING_PVRMANAGER_GROUPMANAGER);
+  settingSet.insert(CSettings::SETTING_PVRMANAGER_CHANNELSCAN);
+  settingSet.insert(CSettings::SETTING_PVRMANAGER_RESETDB);
+  settingSet.insert(CSettings::SETTING_PVRCLIENT_MENUHOOK);
+  settingSet.insert(CSettings::SETTING_PVRMENU_SEARCHICONS);
+  settingSet.insert(CSettings::SETTING_EPG_RESETEPG);
+  settingSet.insert(CSettings::SETTING_EPG_DAYSTODISPLAY);
+  settingSet.insert(CSettings::SETTING_PVRPARENTAL_ENABLED);
+  CSettings::GetInstance().RegisterCallback(this, settingSet);
 
-  bool DoWork(void)
-  {
-    g_PVRManager.Start(false);
-    return true;
-  }
-};
+  m_addons->Start();
+}
 
-void CPVRManager::Start(bool bAsync /* = false */)
+void CPVRManager::Start()
 {
-  if (bAsync)
-  {
-    CPVRManagerStartJob *job = new CPVRManagerStartJob();
-    CJobManager::GetInstance().AddJob(job, NULL);
-    return;
-  }
+  Stop();
 
   CSingleLock lock(m_critSection);
 
-  /* first stop and remove any clients */
-  Stop();
-
-  /* don't start if Settings->Video->TV->Enable isn't checked */
-  if (!CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED))
+  if (!m_addons->HasCreatedClients())
     return;
 
   ResetProperties();
   SetState(ManagerStateStarting);
 
-  /* create and open database */
-  if (!m_database)
-    m_database = new CPVRDatabase;
-  m_database->Open();
-
-  /* register application action listener */
-  {
-    CSingleExit exit(m_critSection);
-    g_application.RegisterActionListener(&CPVRActionListener::GetInstance());
-  }
-
-  /* create the supervisor thread to do all background activities */
-  StartUpdateThreads();
+  /* create the pvrmanager thread, which will ensure that all data will be loaded */
+  Create();
+  SetPriority(-1);
 }
 
 void CPVRManager::Stop(void)
@@ -486,7 +445,11 @@
   }
 
   /* stop all update threads */
-  StopUpdateThreads();
+  SetState(ManagerStateInterrupted);
+
+  StopThread();
+  if (m_guiInfo)
+    m_guiInfo->Stop();
 
   /* executes the set wakeup command */
   SetWakeupCommand();
@@ -518,6 +481,17 @@
 
 void CPVRManager::Process(void)
 {
+  /* create and open database */
+  if (!m_database)
+    m_database = new CPVRDatabase;
+  m_database->Open();
+
+  /* register application action listener */
+  {
+    CSingleExit exit(m_critSection);
+    g_application.RegisterActionListener(&CPVRActionListener::GetInstance());
+  }
+
   g_EpgContainer.Stop();
 
   /* load the pvr data from the db and clients if it's not already loaded */
@@ -540,7 +514,7 @@
   CLog::Log(LOGDEBUG, "PVRManager - %s - entering main loop", __FUNCTION__);
 
   bool bRestart(false);
-  while (IsStarted() && m_addons && m_addons->HasConnectedClients() && !bRestart)
+  while (IsStarted() && m_addons->HasCreatedClients() && !bRestart)
   {
     /* first startup */
     if (m_bFirstStart)
@@ -611,44 +585,16 @@
   return false;
 }
 
-bool CPVRManager::StartUpdateThreads(void)
-{
-  StopUpdateThreads();
-  CLog::Log(LOGNOTICE, "PVRManager - starting up");
-
-  /* create the pvrmanager thread, which will ensure that all data will be loaded */
-  SetState(ManagerStateStarting);
-  Create();
-  SetPriority(-1);
-
-  return true;
-}
-
-void CPVRManager::StopUpdateThreads(void)
-{
-  SetState(ManagerStateInterrupted);
-
-  StopThread();
-  if (m_guiInfo)
-    m_guiInfo->Stop();
-  if (m_addons)
-    m_addons->Stop();
-}
-
 bool CPVRManager::Load(bool bShowProgress)
 {
   if (!bShowProgress)
     HideProgressDialog();
 
-  /* start the add-on update thread */
-  if (m_addons)
-    m_addons->Start();
-
   /* load at least one client */
-  while (IsInitialising() && m_addons && !m_addons->HasConnectedClients())
+  while (IsInitialising() && m_addons && !m_addons->HasCreatedClients())
     Sleep(50);
 
-  if (!IsInitialising() || !m_addons || !m_addons->HasConnectedClients())
+  if (!IsInitialising() || !m_addons->HasCreatedClients())
     return false;
 
   CLog::Log(LOGDEBUG, "PVRManager - %s - active clients found. continue to start", __FUNCTION__);
@@ -791,7 +737,7 @@
   pDlgProgress->Open();
   pDlgProgress->Progress();
 
-  if (m_addons && m_addons->IsPlaying())
+  if (m_addons->IsPlaying())
   {
     CLog::Log(LOGNOTICE,"PVRManager - %s - stopping playback", __FUNCTION__);
     CApplicationMessenger::GetInstance().SendMsg(TMSG_MEDIA_STOP);
@@ -854,13 +800,10 @@
 
   CLog::Log(LOGNOTICE,"PVRManager - %s - %s database cleared", __FUNCTION__, bResetEPGOnly ? "EPG" : "PVR and EPG");
 
-  if (CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED))
-  {
-    CLog::Log(LOGNOTICE,"PVRManager - %s - restarting the PVRManager", __FUNCTION__);
-    m_database->Open();
-    Cleanup();
-    Start();
-  }
+  CLog::Log(LOGNOTICE,"PVRManager - %s - restarting the PVRManager", __FUNCTION__);
+  m_database->Open();
+  Cleanup();
+  Start();
 
   pDlgProgress->SetPercentage(100);
   pDlgProgress->Close();
@@ -868,7 +811,7 @@
 
 bool CPVRManager::IsPlaying(void) const
 {
-  return IsStarted() && m_addons && m_addons->IsPlaying();
+  return IsStarted() && m_addons->IsPlaying();
 }
 
 bool CPVRManager::IsPlayingChannel(const CPVRChannelPtr &channel) const
@@ -887,7 +830,7 @@
 
 CPVRChannelPtr CPVRManager::GetCurrentChannel(void) const
 {
-  return m_addons ? m_addons->GetPlayingChannel() : CPVRChannelPtr();
+  return m_addons->GetPlayingChannel();
 }
 
 int CPVRManager::GetCurrentEpg(CFileItemList &results) const
@@ -1652,27 +1595,27 @@
 
 bool CPVRManager::IsPlayingTV(void) const
 {
-  return IsStarted() && m_addons && m_addons->IsPlayingTV();
+  return IsStarted() && m_addons->IsPlayingTV();
 }
 
 bool CPVRManager::IsPlayingRadio(void) const
 {
-  return IsStarted() && m_addons && m_addons->IsPlayingRadio();
+  return IsStarted() && m_addons->IsPlayingRadio();
 }
 
 bool CPVRManager::IsPlayingRecording(void) const
 {
-  return IsStarted() && m_addons && m_addons->IsPlayingRecording();
+  return IsStarted() && m_addons->IsPlayingRecording();
 }
 
 bool CPVRManager::IsRunningChannelScan(void) const
 {
-  return IsStarted() && m_addons && m_addons->IsRunningChannelScan();
+  return IsStarted() && m_addons->IsRunningChannelScan();
 }
 
 void CPVRManager::StartChannelScan(void)
 {
-  if (IsStarted() && m_addons)
+  if (IsStarted())
     m_addons->StartChannelScan();
 }
 
@@ -1743,6 +1686,11 @@
   CJobManager::GetInstance().AddJob(new CPVRSearchMissingChannelIconsJob(), NULL);
 }
 
+void CPVRManager::ConnectionStateChange(int clientId, std::string connectString, PVR_CONNECTION_STATE state, std::string message)
+{
+  CJobManager::GetInstance().AddJob(new CPVRClientConnectionJob(clientId, connectString, state, message), NULL);
+}
+
 void CPVRManager::ExecutePendingJobs(void)
 {
   CSingleLock lock(m_critSectionTriggers);
@@ -1790,6 +1738,12 @@
   return true;
 }
 
+bool CPVRClientConnectionJob::DoWork(void)
+{
+  g_PVRClients->ConnectionStateChange(m_clientId, m_connectString, m_state, m_message);
+  return true;
+}
+
 bool CPVRManager::CreateChannelEpgs(void)
 {
   if (EpgsCreated())

_service:download_url:master.tar.gz/xbmc/pvr/PVRManager.h Changed

@@ -31,6 +31,7 @@
 #include "pvr/recordings/PVRRecording.h"
 
 #include <map>
+#include <memory>
 
 class CGUIDialogProgressBarHandle;
 class CStopWatch;
@@ -94,12 +95,14 @@
   {
     friend class CPVRClients;
 
-  private:
+public:
     /*!
      * @brief Create a new CPVRManager instance, which handles all PVR related operations in XBMC.
      */
     CPVRManager(void);
 
+private:
+
     /*!
      * @brief Updates the last watched timestamps of the channel and group which are currently playing.
      * @param channel The channel which is updated
@@ -133,31 +136,30 @@
      * @brief Get the channel groups container.
      * @return The groups container.
      */
-    CPVRChannelGroupsContainer *ChannelGroups(void) const { return m_channelGroups; }
+    CPVRChannelGroupsContainer *ChannelGroups(void) const { return m_channelGroups.get(); }
 
     /*!
      * @brief Get the recordings container.
      * @return The recordings container.
      */
-    CPVRRecordings *Recordings(void) const { return m_recordings; }
+    CPVRRecordings *Recordings(void) const { return m_recordings.get(); }
 
     /*!
      * @brief Get the timers container.
      * @return The timers container.
      */
-    CPVRTimers *Timers(void) const { return m_timers; }
+    CPVRTimers *Timers(void) const { return m_timers.get(); }
 
     /*!
      * @brief Get the timers container.
      * @return The timers container.
      */
-    CPVRClients *Clients(void) const { return m_addons; }
+    CPVRClients *Clients(void) const { return m_addons.get(); }
 
     /*!
-     * @brief Start the PVRManager, which loads all PVR data and starts some threads to update the PVR data.
-     * @param bAsync True to (re)start the manager from another thread
+     * @brief Init PVRManager.
      */
-    void Start(bool bAsync = false);
+    void Init(void);
 
     /*!
      * @brief Stop the PVRManager and destroy all objects it created.
@@ -266,11 +268,6 @@
       return GetState() == ManagerStateStarted;
     }
 
-    /**
-     * Called by OnEnable() and OnDisable() to check if the manager should be restarted
-     * @return True if it should be restarted, false otherwise
-     */
-    bool RestartManagerOnAddonDisabled(void) const;
 
     /*!
      * @brief Check whether the PVRManager is stopping
@@ -586,8 +583,18 @@
     */
     std::string GetPlayingTVGroupName();
 
+    /*!
+     * @brief Signal a connection change of a client
+     */
+    void ConnectionStateChange(int clientId, std::string connectString, PVR_CONNECTION_STATE state, std::string message);
+
   protected:
     /*!
+     * @brief Start the PVRManager, which loads all PVR data and starts some threads to update the PVR data.
+     */
+    void Start();
+    
+    /*!
      * @brief PVR update and control thread.
      */
     virtual void Process(void) override;
@@ -616,16 +623,6 @@
     bool ChannelUpDown(unsigned int *iNewChannelNumber, bool bPreview, bool bUp);
 
     /*!
-     * @brief Stop the EPG and PVR threads but do not remove their data.
-     */
-    void StopUpdateThreads(void);
-
-    /*!
-     * @brief Restart the EPG and PVR threads after they've been stopped by StopUpdateThreads()
-     */
-    bool StartUpdateThreads(void);
-
-    /*!
      * @brief Continue playback on the last channel if it was stored in the database.
      * @return True if playback was continued, false otherwise.
      */
@@ -664,11 +661,11 @@
 
     /** @name containers */
     //@{
-    CPVRChannelGroupsContainer *    m_channelGroups;               /*!< pointer to the channel groups container */
-    CPVRRecordings *                m_recordings;                  /*!< pointer to the recordings container */
-    CPVRTimers *                    m_timers;                      /*!< pointer to the timers container */
-    CPVRClients *                   m_addons;                      /*!< pointer to the pvr addon container */
-    CPVRGUIInfo *                   m_guiInfo;                     /*!< pointer to the guiinfo data */
+    std::unique_ptr<CPVRChannelGroupsContainer>    m_channelGroups;               /*!< pointer to the channel groups container */
+    std::unique_ptr<CPVRRecordings>                m_recordings;                  /*!< pointer to the recordings container */
+    std::unique_ptr<CPVRTimers>                    m_timers;                      /*!< pointer to the timers container */
+    std::unique_ptr<CPVRClients>                   m_addons;                      /*!< pointer to the pvr addon container */
+    std::unique_ptr<CPVRGUIInfo>                   m_guiInfo;                     /*!< pointer to the guiinfo data */
     //@}
 
     CCriticalSection                m_critSectionTriggers;         /*!< critical section for triggered updates */
@@ -685,7 +682,7 @@
 
     CCriticalSection                m_managerStateMutex;
     ManagerState                    m_managerState;
-    CStopWatch                     *m_parentalTimer;
+    std::unique_ptr<CStopWatch>     m_parentalTimer;
     std::vector<std::string>        m_outdatedAddons;
     static const int                m_pvrWindowIds[12];
   };
@@ -762,4 +759,20 @@
 
     bool DoWork();
   };
+
+  class CPVRClientConnectionJob : public CJob
+  {
+  public:
+    CPVRClientConnectionJob(int clientId, std::string connectString, PVR_CONNECTION_STATE state, std::string message) :
+    m_clientId(clientId), m_connectString(connectString), m_state(state), m_message(message) {}
+    virtual ~CPVRClientConnectionJob() {}
+    virtual const char *GetType() const { return "pvr-client-connection"; }
+
+    virtual bool DoWork();
+  private:
+    int m_clientId;
+    std::string m_connectString;
+    PVR_CONNECTION_STATE m_state;
+    std::string m_message;
+  };
 }

_service:download_url:master.tar.gz/xbmc/pvr/addons/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/pvr/addons/Makefile Changed

_service:download_url:master.tar.gz/xbmc/pvr/addons/PVRClient.cpp Deleted

@@ -1,2029 +0,0 @@
-/*
- *      Copyright (C) 2012-2015 Team Kodi
- *      http://kodi.tv
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Kodi; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "Application.h"
-#include "addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h"
-#include "epg/Epg.h"
-#include "messaging/ApplicationMessenger.h"
-#include "messaging/helpers/DialogHelper.h"
-#include "settings/AdvancedSettings.h"
-#include "settings/Settings.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "utils/Variant.h"
-
-#include "pvr/PVRManager.h"
-#include "pvr/addons/PVRClients.h"
-#include "pvr/channels/PVRChannelGroupsContainer.h"
-#include "pvr/recordings/PVRRecordings.h"
-#include "pvr/timers/PVRTimers.h"
-#include "pvr/timers/PVRTimerInfoTag.h"
-#include "pvr/timers/PVRTimerType.h"
-
-#include "PVRClient.h"
-
-#include <assert.h>
-#include <memory>
-#include <algorithm>
-
-using namespace ADDON;
-using namespace PVR;
-using namespace EPG;
-using namespace KODI::MESSAGING;
-
-using KODI::MESSAGING::HELPERS::DialogResponse;
-
-#define DEFAULT_INFO_STRING_VALUE "unknown"
-
-std::unique_ptr<CPVRClient> CPVRClient::FromExtension(AddonProps props, const cp_extension_t* ext)
-{
-  std::string strAvahiType = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_type");
-  std::string strAvahiIpSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_ip_setting");
-  std::string strAvahiPortSetting = CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@avahi_port_setting");
-  bool bNeedsConfiguration = !(CAddonMgr::GetInstance().GetExtValue(ext->configuration, "@needs_configuration") == "false");
-  return std::unique_ptr<CPVRClient>(new CPVRClient(std::move(props), strAvahiType,
-      strAvahiIpSetting, strAvahiPortSetting, bNeedsConfiguration));
-}
-
-CPVRClient::CPVRClient(AddonProps props)
-  : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
-    m_bNeedsConfiguration(false),
-    m_apiVersion("0.0.0"),
-    m_bAvahiServiceAdded(false)
-{
-  ResetProperties();
-}
-
-CPVRClient::CPVRClient(AddonProps props, const std::string& strAvahiType, const std::string& strAvahiIpSetting,
-    const std::string& strAvahiPortSetting, bool bNeedsConfiguration)
-  : CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>(std::move(props)),
-    m_strAvahiType(strAvahiType),
-    m_strAvahiIpSetting(strAvahiIpSetting),
-    m_strAvahiPortSetting(strAvahiPortSetting),
-    m_bNeedsConfiguration(bNeedsConfiguration),
-    m_apiVersion("0.0.0"),
-    m_bAvahiServiceAdded(false)
-{
-  ResetProperties();
-}
-
-CPVRClient::~CPVRClient(void)
-{
-  if (m_bAvahiServiceAdded)
-    CZeroconfBrowser::GetInstance()->RemoveServiceType(m_strAvahiType);
-  Destroy();
-  SAFE_DELETE(m_pInfo);
-}
-
-void CPVRClient::OnDisabled()
-{
-  // restart the PVR manager if we're disabling a client
-  if (CPVRManager::GetInstance().IsStarted() && CPVRManager::GetInstance().RestartManagerOnAddonDisabled())
-    CPVRManager::GetInstance().Start(true);
-}
-
-void CPVRClient::OnEnabled()
-{
-  // restart the PVR manager if we're enabling a client
-  if (CPVRManager::GetInstance().RestartManagerOnAddonDisabled())
-    CPVRManager::GetInstance().Start(true);
-}
-
-AddonPtr CPVRClient::GetRunningInstance() const
-{
-  if (g_PVRManager.IsStarted())
-  {
-    AddonPtr pvrAddon;
-    if (g_PVRClients->GetClient(ID(), pvrAddon))
-      return pvrAddon;
-  }
-  return CAddon::GetRunningInstance();
-}
-
-void CPVRClient::OnPreInstall()
-{
-  // stop the pvr manager, so running pvr add-ons are stopped and closed
-  PVR::CPVRManager::GetInstance().Stop();
-}
-
-void CPVRClient::OnPostInstall(bool update, bool modal)
-{
-  // (re)start the pvr manager
-  PVR::CPVRManager::GetInstance().Start(true);
-}
-
-void CPVRClient::OnPreUnInstall()
-{
-  // stop the pvr manager, so running pvr add-ons are stopped and closed
-  PVR::CPVRManager::GetInstance().Stop();
-}
-
-void CPVRClient::OnPostUnInstall()
-{
-  if (CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED))
-    PVR::CPVRManager::GetInstance().Start(true);
-}
-
-bool CPVRClient::CanInstall()
-{
-  if (!PVR::CPVRManager::GetInstance().InstallAddonAllowed(ID()))
-  {
-    PVR::CPVRManager::GetInstance().MarkAsOutdated(ID());
-    return false;
-  }
-  return CAddon::CanInstall();
-}
-
-void CPVRClient::ResetProperties(int iClientId /* = PVR_INVALID_CLIENT_ID */)
-{
-  /* initialise members */
-  SAFE_DELETE(m_pInfo);
-  m_pInfo = new PVR_PROPERTIES;
-  m_strUserPath           = CSpecialProtocol::TranslatePath(Profile());
-  m_pInfo->strUserPath    = m_strUserPath.c_str();
-  m_strClientPath         = CSpecialProtocol::TranslatePath(Path());
-  m_pInfo->strClientPath  = m_strClientPath.c_str();
-  m_pInfo->iEpgMaxDays    = CSettings::GetInstance().GetInt(CSettings::SETTING_EPG_DAYSTODISPLAY);
-  m_menuhooks.clear();
-  m_timertypes.clear();
-  m_bReadyToUse           = false;
-  m_connectionState       = PVR_CONNECTION_STATE_UNKNOWN;
-  m_iClientId             = iClientId;
-  m_strBackendVersion     = DEFAULT_INFO_STRING_VALUE;
-  m_strConnectionString   = DEFAULT_INFO_STRING_VALUE;
-  m_strFriendlyName       = DEFAULT_INFO_STRING_VALUE;
-  m_strBackendName        = DEFAULT_INFO_STRING_VALUE;
-  m_strBackendHostname.clear();
-  m_bIsPlayingTV          = false;
-  m_bIsPlayingRecording   = false;
-  memset(&m_addonCapabilities, 0, sizeof(m_addonCapabilities));
-  m_apiVersion = AddonVersion("0.0.0");
-}
-
-ADDON_STATUS CPVRClient::Create(int iClientId)
-{
-  ADDON_STATUS status(ADDON_STATUS_UNKNOWN);
-  if (iClientId <= PVR_INVALID_CLIENT_ID)
-    return status;
-
-  /* reset all properties to defaults */
-  ResetProperties(iClientId);
-
-  /* initialise the add-on */
-  bool bReadyToUse(false);
-  CLog::Log(LOGDEBUG, "PVR - %s - creating PVR add-on instance '%s'", __FUNCTION__, Name().c_str());
-  try
-  {
-    if ((status = CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::Create()) == ADDON_STATUS_OK)
-      bReadyToUse = GetAddonProperties();
-  }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  m_bReadyToUse = bReadyToUse;
-  return status;
-}
-
-bool CPVRClient::DllLoaded(void) const
-{
-  try { return CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::DllLoaded(); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  return false;
-}
-
-void CPVRClient::Destroy(void)
-{
-  if (!m_bReadyToUse)
-    return;
-  m_bReadyToUse = false;
-
-  /* reset 'ready to use' to false */
-  CLog::Log(LOGDEBUG, "PVR - %s - destroying PVR add-on '%s'", __FUNCTION__, GetFriendlyName().c_str());
-
-  /* destroy the add-on */
-  try { CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>::Destroy(); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  /* reset all properties to defaults */
-  ResetProperties();
-}
-
-void CPVRClient::ReCreate(void)
-{
-  int iClientID(m_iClientId);
-  Destroy();
-
-  /* recreate the instance */
-  Create(iClientID);
-}
-
-bool CPVRClient::ReadyToUse(void) const
-{
-  return m_bReadyToUse;
-}
-
-void CPVRClient::SetConnectionState(PVR_CONNECTION_STATE state)
-{
-  if (m_connectionState != state)
-  {
-    m_connectionState = state;
-
-    if (state == PVR_CONNECTION_STATE_CONNECTED)
-    {
-      CLog::Log(LOGDEBUG, "PVRClient - %s - refetching addon properties", __FUNCTION__);
-      GetAddonProperties();
-    }
-  }
-}
-
-int CPVRClient::GetID(void) const
-{
-  return m_iClientId;
-}
-
-/*!
- * @brief Copy over group info from xbmcGroup to addonGroup.
- * @param xbmcGroup The group on XBMC's side.
- * @param addonGroup The group on the addon's side.
- */
-void CPVRClient::WriteClientGroupInfo(const CPVRChannelGroup &xbmcGroup, PVR_CHANNEL_GROUP &addonGroup)
-{
-  memset(&addonGroup, 0, sizeof(addonGroup));
-
-  addonGroup.bIsRadio     = xbmcGroup.IsRadio();
-  strncpy(addonGroup.strGroupName, xbmcGroup.GroupName().c_str(), sizeof(addonGroup.strGroupName) - 1);
-}
-
-/*!
- * @brief Copy over recording info from xbmcRecording to addonRecording.
- * @param xbmcRecording The recording on XBMC's side.
- * @param addonRecording The recording on the addon's side.
- */
-void CPVRClient::WriteClientRecordingInfo(const CPVRRecording &xbmcRecording, PVR_RECORDING &addonRecording)
-{
-  time_t recTime;
-  xbmcRecording.RecordingTimeAsUTC().GetAsTime(recTime);
-
-  memset(&addonRecording, 0, sizeof(addonRecording));
-
-  addonRecording.recordingTime       = recTime - g_advancedSettings.m_iPVRTimeCorrection;
-  strncpy(addonRecording.strRecordingId, xbmcRecording.m_strRecordingId.c_str(), sizeof(addonRecording.strRecordingId) - 1);
-  strncpy(addonRecording.strTitle, xbmcRecording.m_strTitle.c_str(), sizeof(addonRecording.strTitle) - 1);
-  strncpy(addonRecording.strPlotOutline, xbmcRecording.m_strPlotOutline.c_str(), sizeof(addonRecording.strPlotOutline) - 1);
-  strncpy(addonRecording.strPlot, xbmcRecording.m_strPlot.c_str(), sizeof(addonRecording.strPlot) - 1);
-  strncpy(addonRecording.strChannelName, xbmcRecording.m_strChannelName.c_str(), sizeof(addonRecording.strChannelName) - 1);
-  addonRecording.iDuration           = xbmcRecording.GetDuration();
-  addonRecording.iPriority           = xbmcRecording.m_iPriority;
-  addonRecording.iLifetime           = xbmcRecording.m_iLifetime;
-  addonRecording.iPlayCount          = xbmcRecording.m_playCount;
-  addonRecording.iLastPlayedPosition = (int)xbmcRecording.m_resumePoint.timeInSeconds;
-  addonRecording.bIsDeleted          = xbmcRecording.IsDeleted();
-  strncpy(addonRecording.strDirectory, xbmcRecording.m_strDirectory.c_str(), sizeof(addonRecording.strDirectory) - 1);
-  strncpy(addonRecording.strStreamURL, xbmcRecording.m_strStreamURL.c_str(), sizeof(addonRecording.strStreamURL) - 1);
-  strncpy(addonRecording.strIconPath, xbmcRecording.m_strIconPath.c_str(), sizeof(addonRecording.strIconPath) - 1);
-  strncpy(addonRecording.strThumbnailPath, xbmcRecording.m_strThumbnailPath.c_str(), sizeof(addonRecording.strThumbnailPath) - 1);
-  strncpy(addonRecording.strFanartPath, xbmcRecording.m_strFanartPath.c_str(), sizeof(addonRecording.strFanartPath) - 1);
-}
-
-/*!
- * @brief Copy over timer info from xbmcTimer to addonTimer.
- * @param xbmcTimer The timer on XBMC's side.
- * @param addonTimer The timer on the addon's side.
- */
-void CPVRClient::WriteClientTimerInfo(const CPVRTimerInfoTag &xbmcTimer, PVR_TIMER &addonTimer)
-{
-  time_t start, end, firstDay;
-  xbmcTimer.StartAsUTC().GetAsTime(start);
-  xbmcTimer.EndAsUTC().GetAsTime(end);
-  xbmcTimer.FirstDayAsUTC().GetAsTime(firstDay);
-  CEpgInfoTagPtr epgTag = xbmcTimer.GetEpgInfoTag();
-
-  memset(&addonTimer, 0, sizeof(addonTimer));
-
-  addonTimer.iClientIndex              = xbmcTimer.m_iClientIndex;
-  addonTimer.iParentClientIndex        = xbmcTimer.m_iParentClientIndex;
-  addonTimer.state                     = xbmcTimer.m_state;
-  addonTimer.iTimerType                = xbmcTimer.GetTimerType() ? xbmcTimer.GetTimerType()->GetTypeId() : PVR_TIMER_TYPE_NONE;
-  addonTimer.iClientChannelUid         = xbmcTimer.m_iClientChannelUid;
-  strncpy(addonTimer.strTitle, xbmcTimer.m_strTitle.c_str(), sizeof(addonTimer.strTitle) - 1);
-  strncpy(addonTimer.strEpgSearchString, xbmcTimer.m_strEpgSearchString.c_str(), sizeof(addonTimer.strEpgSearchString) - 1);
-  addonTimer.bFullTextEpgSearch        = xbmcTimer.m_bFullTextEpgSearch;
-  strncpy(addonTimer.strDirectory, xbmcTimer.m_strDirectory.c_str(), sizeof(addonTimer.strDirectory) - 1);
-  addonTimer.iPriority                 = xbmcTimer.m_iPriority;
-  addonTimer.iLifetime                 = xbmcTimer.m_iLifetime;
-  addonTimer.iMaxRecordings            = xbmcTimer.m_iMaxRecordings;
-  addonTimer.iPreventDuplicateEpisodes = xbmcTimer.m_iPreventDupEpisodes;
-  addonTimer.iRecordingGroup           = xbmcTimer.m_iRecordingGroup;
-  addonTimer.iWeekdays                 = xbmcTimer.m_iWeekdays;
-  addonTimer.startTime                 = start - g_advancedSettings.m_iPVRTimeCorrection;
-  addonTimer.endTime                   = end - g_advancedSettings.m_iPVRTimeCorrection;
-  addonTimer.bStartAnyTime             = xbmcTimer.m_bStartAnyTime;
-  addonTimer.bEndAnyTime               = xbmcTimer.m_bEndAnyTime;
-  addonTimer.firstDay                  = firstDay - g_advancedSettings.m_iPVRTimeCorrection;
-  addonTimer.iEpgUid                   = epgTag ? epgTag->UniqueBroadcastID() : PVR_TIMER_NO_EPG_UID;
-  strncpy(addonTimer.strSummary, xbmcTimer.m_strSummary.c_str(), sizeof(addonTimer.strSummary) - 1);
-  addonTimer.iMarginStart              = xbmcTimer.m_iMarginStart;
-  addonTimer.iMarginEnd                = xbmcTimer.m_iMarginEnd;
-  addonTimer.iGenreType                = epgTag ? epgTag->GenreType() : 0;
-  addonTimer.iGenreSubType             = epgTag ? epgTag->GenreSubType() : 0;
-}
-
-/*!
- * @brief Copy over channel info from xbmcChannel to addonClient.
- * @param xbmcChannel The channel on XBMC's side.
- * @param addonChannel The channel on the addon's side.
- */
-void CPVRClient::WriteClientChannelInfo(const CPVRChannelPtr &xbmcChannel, PVR_CHANNEL &addonChannel)
-{
-  assert(xbmcChannel.get());
-
-  memset(&addonChannel, 0, sizeof(addonChannel));
-
-  addonChannel.iUniqueId         = xbmcChannel->UniqueID();
-  addonChannel.iChannelNumber    = xbmcChannel->ClientChannelNumber();
-  addonChannel.iSubChannelNumber = xbmcChannel->ClientSubChannelNumber();
-  strncpy(addonChannel.strChannelName, xbmcChannel->ClientChannelName().c_str(), sizeof(addonChannel.strChannelName) - 1);
-  strncpy(addonChannel.strIconPath, xbmcChannel->IconPath().c_str(), sizeof(addonChannel.strIconPath) - 1);
-  addonChannel.iEncryptionSystem = xbmcChannel->EncryptionSystem();
-  addonChannel.bIsRadio          = xbmcChannel->IsRadio();
-  addonChannel.bIsHidden         = xbmcChannel->IsHidden();
-  strncpy(addonChannel.strInputFormat, xbmcChannel->InputFormat().c_str(), sizeof(addonChannel.strInputFormat) - 1);
-  strncpy(addonChannel.strStreamURL, xbmcChannel->StreamURL().c_str(), sizeof(addonChannel.strStreamURL) - 1);
-}
-
-bool CPVRClient::IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version)
-{
-  AddonVersion myMinVersion = AddonVersion(XBMC_PVR_MIN_API_VERSION);
-  AddonVersion myVersion = AddonVersion(XBMC_PVR_API_VERSION);
-  return (version >= myMinVersion && minVersion <= myVersion);
-}
-
-bool CPVRClient::IsCompatibleGUIAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version)
-{
-  AddonVersion myMinVersion = AddonVersion(KODI_GUILIB_MIN_API_VERSION);
-  AddonVersion myVersion = AddonVersion(KODI_GUILIB_API_VERSION);
-  return (version >= myMinVersion && minVersion <= myVersion);
-}
-
-bool CPVRClient::CheckAPIVersion(void)
-{
-  /* check the API version */
-  AddonVersion minVersion = AddonVersion(XBMC_PVR_MIN_API_VERSION);
-  try { m_apiVersion = AddonVersion(m_pStruct->GetPVRAPIVersion()); }
-  catch (std::exception &e) { LogException(e, "GetPVRAPIVersion()"); return false;  }
-
-  if (!IsCompatibleAPIVersion(minVersion, m_apiVersion))
-  {
-    CLog::Log(LOGERROR, "PVR - Add-on '%s' is using an incompatible API version. XBMC minimum API version = '%s', add-on API version '%s'", Name().c_str(), minVersion.asString().c_str(), m_apiVersion.asString().c_str());
-    return false;
-  }
-
-  /* check the GUI API version */
-  AddonVersion guiVersion = AddonVersion("0.0.0");
-  minVersion = AddonVersion(KODI_GUILIB_MIN_API_VERSION);
-  try { guiVersion = AddonVersion(m_pStruct->GetGUIAPIVersion()); }
-  catch (std::exception &e) { LogException(e, "GetGUIAPIVersion()"); return false;  }
-
-  /* Only do the check, if add-on depends on GUI API. */
-  if (!guiVersion.empty() && !IsCompatibleGUIAPIVersion(minVersion, guiVersion))
-  {
-    CLog::Log(LOGERROR, "PVR - Add-on '%s' is using an incompatible GUI API version. XBMC minimum GUI API version = '%s', add-on GUI API version '%s'", Name().c_str(), minVersion.asString().c_str(), guiVersion.asString().c_str());
-    return false;
-  }
-
-  return true;
-}
-
-bool CPVRClient::GetAddonProperties(void)
-{
-  std::string strBackendName, strConnectionString, strFriendlyName, strBackendVersion, strBackendHostname;
-  PVR_ADDON_CAPABILITIES addonCapabilities;
-  CPVRTimerTypes timerTypes;
-
-  /* get the capabilities */
-  try
-  {
-    memset(&addonCapabilities, 0, sizeof(addonCapabilities));
-    PVR_ERROR retVal = m_pStruct->GetAddonCapabilities(&addonCapabilities);
-    if (retVal != PVR_ERROR_NO_ERROR)
-    {
-      CLog::Log(LOGERROR, "PVR - couldn't get the capabilities for add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
-      return false;
-    }
-  }
-  catch (std::exception &e) { LogException(e, "GetAddonCapabilities()"); return false; }
-
-  /* get the name of the backend */
-  try { strBackendName = m_pStruct->GetBackendName(); }
-  catch (std::exception &e) { LogException(e, "GetBackendName()"); return false;  }
-
-  /* get the connection string */
-  try { strConnectionString = m_pStruct->GetConnectionString(); }
-  catch (std::exception &e) { LogException(e, "GetConnectionString()"); return false;  }
-
-  /* display name = backend name:connection string */
-  strFriendlyName = StringUtils::Format("%s:%s", strBackendName.c_str(), strConnectionString.c_str());
-
-  /* backend version number */
-  try { strBackendVersion = m_pStruct->GetBackendVersion(); }
-  catch (std::exception &e) { LogException(e, "GetBackendVersion()"); return false;  }
-
-  /* backend hostname */
-  try { strBackendHostname = m_pStruct->GetBackendHostname(); }
-  catch (std::exception &e) { LogException(e, "GetBackendHostname()"); return false; }
-
-  /* timer types */
-  if (addonCapabilities.bSupportsTimers)
-  {
-    try
-    {
-      std::unique_ptr<PVR_TIMER_TYPE[]> types_array(new PVR_TIMER_TYPE[PVR_ADDON_TIMERTYPE_ARRAY_SIZE]);
-      int size = PVR_ADDON_TIMERTYPE_ARRAY_SIZE;
-
-      PVR_ERROR retval = m_pStruct->GetTimerTypes(types_array.get(), &size);
-
-      if (retval == PVR_ERROR_NOT_IMPLEMENTED)
-      {
-        // begin compat section
-        CLog::Log(LOGWARNING, "%s - Addon %s does not support timer types. It will work, but not benefit from the timer features introduced with PVR Addon API 2.0.0", __FUNCTION__, strFriendlyName.c_str());
-
-        // Create standard timer types (mostly) matching the timer functionality available in Isengard.
-        // This is for migration only and does not make changes to the addons obsolete. Addons should
-        // work and benefit from some UI changes (e.g. some of the timer settings dialog enhancements),
-        // but all old problems/bugs due to static attributes and values will remain the same as in
-        // Isengard. Also, new features (like epg search) are not available to addons automatically.
-        // This code can be removed once all addons actually support the respective PVR Addon API version.
-
-        size = 0;
-        // One-shot manual
-        memset(&types_array[size], 0, sizeof(types_array[size]));
-        types_array[size].iId         = size + 1;
-        types_array[size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
-                                        PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
-                                        PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
-                                        PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
-                                        PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
-                                        PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
-                                        PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
-                                        PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
-        size++;
-
-        // Repeating manual
-        memset(&types_array[size], 0, sizeof(types_array[size]));
-        types_array[size].iId         = size + 1;
-        types_array[size].iAttributes = PVR_TIMER_TYPE_IS_MANUAL               |
-                                        PVR_TIMER_TYPE_IS_REPEATING            |
-                                        PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
-                                        PVR_TIMER_TYPE_SUPPORTS_CHANNELS       |
-                                        PVR_TIMER_TYPE_SUPPORTS_START_TIME     |
-                                        PVR_TIMER_TYPE_SUPPORTS_END_TIME       |
-                                        PVR_TIMER_TYPE_SUPPORTS_PRIORITY       |
-                                        PVR_TIMER_TYPE_SUPPORTS_LIFETIME       |
-                                        PVR_TIMER_TYPE_SUPPORTS_FIRST_DAY      |
-                                        PVR_TIMER_TYPE_SUPPORTS_WEEKDAYS       |
-                                        PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
-        size++;
-
-        if (addonCapabilities.bSupportsEPG)
-        {
-          // One-shot epg-based
-          memset(&types_array[size], 0, sizeof(types_array[size]));
-          types_array[size].iId         = size + 1;
-          types_array[size].iAttributes = PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE    |
-                                          PVR_TIMER_TYPE_REQUIRES_EPG_TAG_ON_CREATE |
-                                          PVR_TIMER_TYPE_SUPPORTS_CHANNELS          |
-                                          PVR_TIMER_TYPE_SUPPORTS_START_TIME        |
-                                          PVR_TIMER_TYPE_SUPPORTS_END_TIME          |
-                                          PVR_TIMER_TYPE_SUPPORTS_PRIORITY          |
-                                          PVR_TIMER_TYPE_SUPPORTS_LIFETIME          |
-                                          PVR_TIMER_TYPE_SUPPORTS_RECORDING_FOLDERS;
-          size++;
-        }
-
-        retval = PVR_ERROR_NO_ERROR;
-        // end compat section
-      }
-
-      if (retval == PVR_ERROR_NO_ERROR)
-      {
-        timerTypes.reserve(size);
-        for (int i = 0; i < size; ++i)
-        {
-          if (types_array[i].iId == PVR_TIMER_TYPE_NONE)
-          {
-            CLog::Log(LOGERROR, "PVR - invalid timer type supplied by add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
-            continue;
-          }
-
-          if (strlen(types_array[i].strDescription) == 0)
-          {
-            int id;
-            if (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_REPEATING)
-            {
-              id = (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_MANUAL)
-                 ? 822  // "Repeating"
-                 : 823; // "Repeating (Guide-based)"
-            }
-            else
-            {
-              id = (types_array[i].iAttributes & PVR_TIMER_TYPE_IS_MANUAL)
-                 ? 820  // "One Time"
-                 : 821; // "One Time (Guide-based)
-            }
-            std::string descr(g_localizeStrings.Get(id));
-            strncpy(types_array[i].strDescription, descr.c_str(), descr.size());
-          }
-          timerTypes.push_back(CPVRTimerTypePtr(new CPVRTimerType(types_array[i], m_iClientId)));
-        }
-      }
-      else
-      {
-        CLog::Log(LOGERROR, "PVR - couldn't get the timer types for add-on '%s'. Please contact the developer of this add-on: %s", GetFriendlyName().c_str(), Author().c_str());
-        return false;
-      }
-    }
-    catch (std::exception &e) { LogException(e, "GetTimerTypes()"); return false; }
-  }
-
-  /* update the members */
-  m_strBackendName      = strBackendName;
-  m_strConnectionString = strConnectionString;
-  m_strFriendlyName     = strFriendlyName;
-  m_strBackendVersion   = strBackendVersion;
-  m_addonCapabilities   = addonCapabilities;
-  m_strBackendHostname  = strBackendHostname;
-  m_timertypes          = timerTypes;
-
-  return true;
-}
-
-PVR_ADDON_CAPABILITIES CPVRClient::GetAddonCapabilities(void) const
-{
-  PVR_ADDON_CAPABILITIES addonCapabilities(m_addonCapabilities);
-  return addonCapabilities;
-}
-
-const std::string& CPVRClient::GetBackendName(void) const
-{
-  return m_strBackendName;
-}
-
-const std::string& CPVRClient::GetBackendVersion(void) const
-{
-  return m_strBackendVersion;
-}
-
-const std::string& CPVRClient::GetBackendHostname(void) const
-{
-  return m_strBackendHostname;
-}
-
-const std::string& CPVRClient::GetConnectionString(void) const
-{
-  return m_strConnectionString;
-}
-
-const std::string& CPVRClient::GetFriendlyName(void) const
-{
-  return m_strFriendlyName;
-}
-
-PVR_ERROR CPVRClient::GetDriveSpace(long long *iTotal, long long *iUsed)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  try { return m_pStruct->GetDriveSpace(iTotal, iUsed); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  /* default to 0 on error */
-  *iTotal = 0;
-  *iUsed  = 0;
-
-  return PVR_ERROR_UNKNOWN;
-}
-
-PVR_ERROR CPVRClient::StartChannelScan(void)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelScan)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  try { return m_pStruct->OpenDialogChannelScan(); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  return PVR_ERROR_UNKNOWN;
-}
-
-PVR_ERROR CPVRClient::OpenDialogChannelAdd(const CPVRChannelPtr &channel)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelSettings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_CHANNEL addonChannel;
-    WriteClientChannelInfo(channel, addonChannel);
-
-    retVal = m_pStruct->OpenDialogChannelAdd(addonChannel);
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::OpenDialogChannelSettings(const CPVRChannelPtr &channel)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelSettings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_CHANNEL addonChannel;
-    WriteClientChannelInfo(channel, addonChannel);
-
-    retVal = m_pStruct->OpenDialogChannelSettings(addonChannel);
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::DeleteChannel(const CPVRChannelPtr &channel)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelSettings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_CHANNEL addonChannel;
-    WriteClientChannelInfo(channel, addonChannel);
-
-    retVal = m_pStruct->DeleteChannel(addonChannel);
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::RenameChannel(const CPVRChannelPtr &channel)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelSettings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_CHANNEL addonChannel;
-    WriteClientChannelInfo(channel, addonChannel);
-
-    retVal = m_pStruct->RenameChannel(addonChannel);
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-void CPVRClient::CallMenuHook(const PVR_MENUHOOK &hook, const CFileItem *item)
-{
-  if (!m_bReadyToUse)
-    return;
-
-  try {
-    PVR_MENUHOOK_DATA hookData;
-    hookData.cat = PVR_MENUHOOK_UNKNOWN;
-
-    if (item)
-    {
-      if (item->IsEPG())
-      {
-        hookData.cat = PVR_MENUHOOK_EPG;
-        hookData.data.iEpgUid = item->GetEPGInfoTag()->UniqueBroadcastID();
-      }
-      else if (item->IsPVRChannel())
-      {
-        hookData.cat = PVR_MENUHOOK_CHANNEL;
-        WriteClientChannelInfo(item->GetPVRChannelInfoTag(), hookData.data.channel);
-      }
-      else if (item->IsUsablePVRRecording())
-      {
-        hookData.cat = PVR_MENUHOOK_RECORDING;
-        WriteClientRecordingInfo(*item->GetPVRRecordingInfoTag(), hookData.data.recording);
-      }
-      else if (item->IsDeletedPVRRecording())
-      {
-        hookData.cat = PVR_MENUHOOK_DELETED_RECORDING;
-        WriteClientRecordingInfo(*item->GetPVRRecordingInfoTag(), hookData.data.recording);
-      }
-      else if (item->IsPVRTimer())
-      {
-        hookData.cat = PVR_MENUHOOK_TIMER;
-        WriteClientTimerInfo(*item->GetPVRTimerInfoTag(), hookData.data.timer);
-      }
-    }
-
-    m_pStruct->MenuHook(hook, hookData);
-  }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-}
-
-PVR_ERROR CPVRClient::GetEPGForChannel(const CPVRChannelPtr &channel, CEpg *epg, time_t start /* = 0 */, time_t end /* = 0 */, bool bSaveInDb /* = false*/)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsEPG)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_CHANNEL addonChannel;
-    WriteClientChannelInfo(channel, addonChannel);
-
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress  = this;
-    handle.dataAddress    = epg;
-    handle.dataIdentifier = bSaveInDb ? 1 : 0; // used by the callback method CAddonCallbacksPVR::PVRTransferEpgEntry()
-    retVal = m_pStruct->GetEpg(&handle,
-        addonChannel,
-        start ? start - g_advancedSettings.m_iPVRTimeCorrection : 0,
-        end ? end - g_advancedSettings.m_iPVRTimeCorrection : 0);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::SetEPGTimeFrame(int iDays)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsEPG)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    retVal = m_pStruct->SetEPGTimeFrame(iDays);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-int CPVRClient::GetChannelGroupsAmount(void)
-{
-  int iReturn(-EINVAL);
-
-  if (!m_bReadyToUse)
-    return iReturn;
-
-  if (!m_addonCapabilities.bSupportsChannelGroups)
-    return iReturn;
-
-  try { iReturn = m_pStruct->GetChannelGroupsAmount(); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  return iReturn;
-}
-
-PVR_ERROR CPVRClient::GetChannelGroups(CPVRChannelGroups *groups)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelGroups)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress = this;
-    handle.dataAddress = groups;
-    retVal = m_pStruct->GetChannelGroups(&handle, groups->IsRadio());
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::GetChannelGroupMembers(CPVRChannelGroup *group)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsChannelGroups)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress = this;
-    handle.dataAddress = group;
-
-    PVR_CHANNEL_GROUP tag;
-    WriteClientGroupInfo(*group, tag);
-
-    CLog::Log(LOGDEBUG, "PVR - %s - get group members for group '%s' from add-on '%s'",
-        __FUNCTION__, tag.strGroupName, GetFriendlyName().c_str());
-    retVal = m_pStruct->GetChannelGroupMembers(&handle, tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-int CPVRClient::GetChannelsAmount(void)
-{
-  int iReturn(-EINVAL);
-  if (m_bReadyToUse && (m_addonCapabilities.bSupportsTV || m_addonCapabilities.bSupportsRadio))
-  {
-    try { iReturn = m_pStruct->GetChannelsAmount(); }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-
-  return iReturn;
-}
-
-PVR_ERROR CPVRClient::GetChannels(CPVRChannelGroup &channels, bool radio)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if ((!m_addonCapabilities.bSupportsRadio && radio) ||
-      (!m_addonCapabilities.bSupportsTV && !radio))
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-
-  try
-  {
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress = this;
-    handle.dataAddress = (CPVRChannelGroup*) &channels;
-    retVal = m_pStruct->GetChannels(&handle, radio);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-int CPVRClient::GetRecordingsAmount(bool deleted)
-{
-  int iReturn(-EINVAL);
-
-  if (!m_addonCapabilities.bSupportsRecordings || (deleted && !m_addonCapabilities.bSupportsRecordingsUndelete))
-    return iReturn;
-
-  try
-  {
-    iReturn = m_pStruct->GetRecordingsAmount(deleted);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return iReturn;
-}
-
-PVR_ERROR CPVRClient::GetRecordings(CPVRRecordings *results, bool deleted)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordings || (deleted && !m_addonCapabilities.bSupportsRecordingsUndelete))
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress = this;
-    handle.dataAddress = (CPVRRecordings*) results;
-    retVal = m_pStruct->GetRecordings(&handle, deleted);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::DeleteRecording(const CPVRRecording &recording)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    retVal = m_pStruct->DeleteRecording(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::UndeleteRecording(const CPVRRecording &recording)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordingsUndelete)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    retVal = m_pStruct->UndeleteRecording(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::DeleteAllRecordingsFromTrash()
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordingsUndelete)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    retVal = m_pStruct->DeleteAllRecordingsFromTrash();
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::RenameRecording(const CPVRRecording &recording)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordings)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    retVal = m_pStruct->RenameRecording(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::SetRecordingPlayCount(const CPVRRecording &recording, int count)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsRecordingPlayCount)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    retVal = m_pStruct->SetRecordingPlayCount(tag, count);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::SetRecordingLastPlayedPosition(const CPVRRecording &recording, int lastplayedposition)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsLastPlayedPosition)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    retVal = m_pStruct->SetRecordingLastPlayedPosition(tag, lastplayedposition);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-int CPVRClient::GetRecordingLastPlayedPosition(const CPVRRecording &recording)
-{
-  int iReturn(-EINVAL);
-  if (!m_bReadyToUse)
-    return iReturn;
-
-  if (!m_addonCapabilities.bSupportsLastPlayedPosition)
-    return iReturn;
-
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    iReturn = m_pStruct->GetRecordingLastPlayedPosition(tag);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return iReturn;
-}
-
-std::vector<PVR_EDL_ENTRY> CPVRClient::GetRecordingEdl(const CPVRRecording &recording)
-{
-  std::vector<PVR_EDL_ENTRY> edl;
-  if (!m_bReadyToUse)
-    return edl;
-
-  if (!m_addonCapabilities.bSupportsRecordingEdl)
-    return edl;
-
-  try
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(recording, tag);
-
-    PVR_EDL_ENTRY edl_array[PVR_ADDON_EDL_LENGTH];
-    int size = PVR_ADDON_EDL_LENGTH;
-    PVR_ERROR retval = m_pStruct->GetRecordingEdl(tag, edl_array, &size);
-    if (retval == PVR_ERROR_NO_ERROR)
-    {
-      edl.reserve(size);
-      for (int i = 0; i < size; ++i)
-      {
-        edl.push_back(edl_array[i]);
-      }
-    }
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return edl;
-}
-
-int CPVRClient::GetTimersAmount(void)
-{
-  int iReturn(-EINVAL);
-  if (!m_bReadyToUse)
-    return iReturn;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return iReturn;
-
-  try { iReturn = m_pStruct->GetTimersAmount(); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  return iReturn;
-}
-
-PVR_ERROR CPVRClient::GetTimers(CPVRTimers *results)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    ADDON_HANDLE_STRUCT handle;
-    handle.callerAddress = this;
-    handle.dataAddress = (CPVRTimers*) results;
-    retVal = m_pStruct->GetTimers(&handle);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::AddTimer(const CPVRTimerInfoTag &timer)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_TIMER tag;
-    WriteClientTimerInfo(timer, tag);
-
-    retVal = m_pStruct->AddTimer(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::DeleteTimer(const CPVRTimerInfoTag &timer, bool bForce /* = false */)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_TIMER tag;
-    WriteClientTimerInfo(timer, tag);
-
-    retVal = m_pStruct->DeleteTimer(tag, bForce);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::RenameTimer(const CPVRTimerInfoTag &timer, const std::string &strNewName)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_TIMER tag;
-    WriteClientTimerInfo(timer, tag);
-
-    retVal = m_pStruct->UpdateTimer(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::UpdateTimer(const CPVRTimerInfoTag &timer)
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  if (!m_addonCapabilities.bSupportsTimers)
-    return PVR_ERROR_NOT_IMPLEMENTED;
-
-  PVR_ERROR retVal(PVR_ERROR_UNKNOWN);
-  try
-  {
-    PVR_TIMER tag;
-    WriteClientTimerInfo(timer, tag);
-
-    retVal = m_pStruct->UpdateTimer(tag);
-
-    LogError(retVal, __FUNCTION__);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return retVal;
-}
-
-PVR_ERROR CPVRClient::GetTimerTypes(CPVRTimerTypes& results) const
-{
-  if (!m_bReadyToUse)
-    return PVR_ERROR_SERVER_ERROR;
-
-  results = m_timertypes;
-  return PVR_ERROR_NO_ERROR;
-}
-
-int CPVRClient::ReadStream(void* lpBuf, int64_t uiBufSize)
-{
-  if (IsPlayingLiveStream())
-  {
-    try { return m_pStruct->ReadLiveStream((unsigned char *)lpBuf, (int)uiBufSize); }
-    catch (std::exception &e) { LogException(e, "ReadLiveStream()"); }
-  }
-  else if (IsPlayingRecording())
-  {
-    try { return m_pStruct->ReadRecordedStream((unsigned char *)lpBuf, (int)uiBufSize); }
-    catch (std::exception &e) { LogException(e, "ReadRecordedStream()"); }
-  }
-  return -EINVAL;
-}
-
-int64_t CPVRClient::SeekStream(int64_t iFilePosition, int iWhence/* = SEEK_SET*/)
-{
-  if (IsPlayingLiveStream())
-  {
-    try { return m_pStruct->SeekLiveStream(iFilePosition, iWhence); }
-    catch (std::exception &e) { LogException(e, "SeekLiveStream()"); }
-  }
-  else if (IsPlayingRecording())
-  {
-    try { return m_pStruct->SeekRecordedStream(iFilePosition, iWhence); }
-    catch (std::exception &e) { LogException(e, "SeekRecordedStream()"); }
-  }
-  return -EINVAL;
-}
-
-bool CPVRClient::SeekTime(int time, bool backwards, double *startpts)
-{
-  if (IsPlaying())
-  {
-    try { return m_pStruct->SeekTime(time, backwards, startpts); }
-    catch (std::exception &e) { LogException(e, "SeekTime()"); }
-  }
-  return false;
-}
-
-int64_t CPVRClient::GetStreamPosition(void)
-{
-  if (IsPlayingLiveStream())
-  {
-    try { return m_pStruct->PositionLiveStream(); }
-    catch (std::exception &e) { LogException(e, "PositionLiveStream()"); }
-  }
-  else if (IsPlayingRecording())
-  {
-    try { return m_pStruct->PositionRecordedStream(); }
-    catch (std::exception &e) { LogException(e, "PositionRecordedStream()"); }
-  }
-  return -EINVAL;
-}
-
-int64_t CPVRClient::GetStreamLength(void)
-{
-  if (IsPlayingLiveStream())
-  {
-    try { return m_pStruct->LengthLiveStream(); }
-    catch (std::exception &e) { LogException(e, "LengthLiveStream()"); }
-  }
-  else if (IsPlayingRecording())
-  {
-    try { return m_pStruct->LengthRecordedStream(); }
-    catch (std::exception &e) { LogException(e, "LengthRecordedStream()"); }
-  }
-  return -EINVAL;
-}
-
-bool CPVRClient::SwitchChannel(const CPVRChannelPtr &channel)
-{
-  bool bSwitched(false);
-
-  if (IsPlayingLiveStream() && CanPlayChannel(channel))
-  {
-    PVR_CHANNEL tag;
-    WriteClientChannelInfo(channel, tag);
-    try
-    {
-      bSwitched = m_pStruct->SwitchChannel(tag);
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-
-  if (bSwitched)
-  {
-    CPVRChannelPtr currentChannel(g_PVRChannelGroups->GetByUniqueID(channel->UniqueID(), channel->ClientID()));
-    CSingleLock lock(m_critSection);
-    m_playingChannel = currentChannel;
-  }
-
-  return bSwitched;
-}
-
-bool CPVRClient::SignalQuality(PVR_SIGNAL_STATUS &qualityinfo)
-{
-  if (IsPlayingLiveStream())
-  {
-    try
-    {
-      return m_pStruct->SignalStatus(qualityinfo) == PVR_ERROR_NO_ERROR;
-    }
-    catch (std::exception &e)
-    {
-      LogException(e, __FUNCTION__);
-    }
-  }
-  return false;
-}
-
-std::string CPVRClient::GetLiveStreamURL(const CPVRChannelPtr &channel)
-{
-  std::string strReturn;
-
-  if (!m_bReadyToUse || !CanPlayChannel(channel))
-    return strReturn;
-
-  try
-  {
-    PVR_CHANNEL tag;
-    WriteClientChannelInfo(channel, tag);
-    strReturn = m_pStruct->GetLiveStreamURL(tag);
-  }
-  catch (std::exception &e)
-  {
-    LogException(e, __FUNCTION__);
-  }
-
-  return strReturn;
-}
-
-PVR_ERROR CPVRClient::GetStreamProperties(PVR_STREAM_PROPERTIES *props)
-{
-  if (!IsPlaying())
-    return PVR_ERROR_REJECTED;
-
-  try { return m_pStruct->GetStreamProperties(props); }
-  catch (std::exception &e) { LogException(e, __FUNCTION__); }
-
-  return PVR_ERROR_UNKNOWN;
-}
-
-void CPVRClient::DemuxReset(void)
-{
-  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
-  {
-    try { m_pStruct->DemuxReset(); }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-}
-
-void CPVRClient::DemuxAbort(void)
-{
-  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
-  {
-    try { m_pStruct->DemuxAbort(); }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-}
-
-void CPVRClient::DemuxFlush(void)
-{
-  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
-  {
-    try { m_pStruct->DemuxFlush(); }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-}
-
-DemuxPacket* CPVRClient::DemuxRead(void)
-{
-  if (m_bReadyToUse && m_addonCapabilities.bHandlesDemuxing)
-  {
-    try { return m_pStruct->DemuxRead(); }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return NULL;
-}
-
-bool CPVRClient::HaveMenuHooks(PVR_MENUHOOK_CAT cat) const
-{
-  bool bReturn(false);
-  if (m_bReadyToUse && !m_menuhooks.empty())
-  {
-    for (unsigned int i = 0; i < m_menuhooks.size(); i++)
-    {
-      if (m_menuhooks[i].category == cat || m_menuhooks[i].category == PVR_MENUHOOK_ALL)
-      {
-        bReturn = true;
-        break;
-      }
-    }
-  }
-  return bReturn;
-}
-
-PVR_MENUHOOKS *CPVRClient::GetMenuHooks(void)
-{
-  return &m_menuhooks;
-}
-
-const char *CPVRClient::ToString(const PVR_ERROR error)
-{
-  switch (error)
-  {
-  case PVR_ERROR_NO_ERROR:
-    return "no error";
-  case PVR_ERROR_NOT_IMPLEMENTED:
-    return "not implemented";
-  case PVR_ERROR_SERVER_ERROR:
-    return "server error";
-  case PVR_ERROR_SERVER_TIMEOUT:
-    return "server timeout";
-  case PVR_ERROR_RECORDING_RUNNING:
-    return "recording already running";
-  case PVR_ERROR_ALREADY_PRESENT:
-    return "already present";
-  case PVR_ERROR_REJECTED:
-    return "rejected by the backend";
-  case PVR_ERROR_INVALID_PARAMETERS:
-    return "invalid parameters for this method";
-  case PVR_ERROR_FAILED:
-    return "the command failed";
-  case PVR_ERROR_UNKNOWN:
-  default:
-    return "unknown error";
-  }
-}
-
-bool CPVRClient::LogError(const PVR_ERROR error, const char *strMethod) const
-{
-  if (error != PVR_ERROR_NO_ERROR)
-  {
-    CLog::Log(LOGERROR, "PVR - %s - addon '%s' returned an error: %s",
-        strMethod, GetFriendlyName().c_str(), ToString(error));
-    return false;
-  }
-  return true;
-}
-
-void CPVRClient::LogException(const std::exception &e, const char *strFunctionName) const
-{
-  CLog::Log(LOGERROR, "PVR - exception '%s' caught while trying to call '%s' on add-on '%s'. Please contact the developer of this add-on: %s", e.what(), strFunctionName, GetFriendlyName().c_str(), Author().c_str());
-}
-
-bool CPVRClient::CanPlayChannel(const CPVRChannelPtr &channel) const
-{
-  assert(channel.get());
-
-  return (m_bReadyToUse &&
-           ((m_addonCapabilities.bSupportsTV && !channel->IsRadio()) ||
-            (m_addonCapabilities.bSupportsRadio && channel->IsRadio())));
-}
-
-bool CPVRClient::SupportsChannelGroups(void) const
-{
-  return m_addonCapabilities.bSupportsChannelGroups;
-}
-
-bool CPVRClient::SupportsChannelScan(void) const
-{
-  return m_addonCapabilities.bSupportsChannelScan;
-}
-
-bool CPVRClient::SupportsChannelSettings(void) const
-{
-  return m_addonCapabilities.bSupportsChannelSettings;
-}
-
-bool CPVRClient::SupportsEPG(void) const
-{
-  return m_addonCapabilities.bSupportsEPG;
-}
-
-bool CPVRClient::SupportsLastPlayedPosition(void) const
-{
-  return m_addonCapabilities.bSupportsLastPlayedPosition;
-}
-
-bool CPVRClient::SupportsRadio(void) const
-{
-  return m_addonCapabilities.bSupportsRadio;
-}
-
-bool CPVRClient::SupportsRecordings(void) const
-{
-  return m_addonCapabilities.bSupportsRecordings;
-}
-
-bool CPVRClient::SupportsRecordingsUndelete(void) const
-{
-  return m_addonCapabilities.bSupportsRecordingsUndelete;
-}
-
-bool CPVRClient::SupportsRecordingPlayCount(void) const
-{
-  return m_addonCapabilities.bSupportsRecordingPlayCount;
-}
-
-bool CPVRClient::SupportsRecordingEdl(void) const
-{
-  return m_addonCapabilities.bSupportsRecordingEdl;
-}
-
-bool CPVRClient::SupportsTimers(void) const
-{
-  return m_addonCapabilities.bSupportsTimers;
-}
-
-bool CPVRClient::SupportsTV(void) const
-{
-  return m_addonCapabilities.bSupportsTV;
-}
-
-bool CPVRClient::HandlesDemuxing(void) const
-{
-  return m_addonCapabilities.bHandlesDemuxing;
-}
-
-bool CPVRClient::HandlesInputStream(void) const
-{
-  return m_addonCapabilities.bHandlesInputStream;
-}
-
-bool CPVRClient::IsPlayingLiveStream(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bReadyToUse && m_bIsPlayingTV;
-}
-
-bool CPVRClient::IsPlayingLiveTV(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bReadyToUse && m_bIsPlayingTV && !m_playingChannel->IsRadio();
-}
-
-bool CPVRClient::IsPlayingLiveRadio(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bReadyToUse && m_bIsPlayingTV && m_playingChannel->IsRadio();
-}
-
-bool CPVRClient::IsPlayingEncryptedChannel(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bReadyToUse && m_bIsPlayingTV && m_playingChannel->IsEncrypted();
-}
-
-bool CPVRClient::IsPlayingRecording(void) const
-{
-  CSingleLock lock(m_critSection);
-  return m_bReadyToUse && m_bIsPlayingRecording;
-}
-
-bool CPVRClient::IsPlaying(void) const
-{
-  return IsPlayingLiveStream() ||
-         IsPlayingRecording();
-}
-
-CPVRChannelPtr CPVRClient::GetPlayingChannel() const
-{
-  CSingleLock lock(m_critSection);
-  if (m_bReadyToUse && m_bIsPlayingTV)
-    return m_playingChannel;
-
-  return CPVRChannelPtr();
-}
-
-CPVRRecordingPtr CPVRClient::GetPlayingRecording(void) const
-{
-  CSingleLock lock(m_critSection);
-  if (m_bReadyToUse && m_bIsPlayingRecording)
-    return m_playingRecording;
-
-  return CPVRRecordingPtr();
-}
-
-bool CPVRClient::OpenStream(const CPVRChannelPtr &channel, bool bIsSwitchingChannel)
-{
-  bool bReturn(false);
-  CloseStream();
-
-  if(!CanPlayChannel(channel))
-  {
-    CLog::Log(LOGDEBUG, "add-on '%s' can not play channel '%s'", GetFriendlyName().c_str(), channel->ChannelName().c_str());
-  }
-  else if (!channel->StreamURL().empty())
-  {
-    CLog::Log(LOGDEBUG, "opening live stream on url '%s'", channel->StreamURL().c_str());
-    bReturn = true;
-
-    // the Njoy N7 sometimes doesn't switch channels, but opens a stream to the previous channel
-    // when not waiting for a short period.
-    // added in 1.1.0
-    AddonVersion checkVersion("1.1.0");
-    if (m_apiVersion >= checkVersion)
-    {
-      unsigned int iWaitTimeMs = m_pStruct->GetChannelSwitchDelay();
-      if (iWaitTimeMs > 0)
-        XbmcThreads::ThreadSleep(iWaitTimeMs);
-    }
-  }
-  else
-  {
-    CLog::Log(LOGDEBUG, "opening live stream for channel '%s'", channel->ChannelName().c_str());
-    PVR_CHANNEL tag;
-    WriteClientChannelInfo(channel, tag);
-
-    try
-    {
-      bReturn = m_pStruct->OpenLiveStream(tag);
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-
-  if (bReturn)
-  {
-    CPVRChannelPtr currentChannel(g_PVRChannelGroups->GetByUniqueID(channel->UniqueID(), channel->ClientID()));
-    CSingleLock lock(m_critSection);
-    m_playingChannel      = currentChannel;
-    m_bIsPlayingTV        = true;
-    m_bIsPlayingRecording = false;
-  }
-
-  return bReturn;
-}
-
-bool CPVRClient::OpenStream(const CPVRRecordingPtr &recording)
-{
-  bool bReturn(false);
-  CloseStream();
-
-  if (m_bReadyToUse && m_addonCapabilities.bSupportsRecordings)
-  {
-    PVR_RECORDING tag;
-    WriteClientRecordingInfo(*recording, tag);
-
-    try
-    {
-      bReturn = m_pStruct->OpenRecordedStream(tag);
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-
-  if (bReturn)
-  {
-    CSingleLock lock(m_critSection);
-    m_playingRecording    = recording;
-    m_bIsPlayingTV        = false;
-    m_bIsPlayingRecording = true;
-  }
-
-  return bReturn;
-}
-
-void CPVRClient::CloseStream(void)
-{
-  if (IsPlayingLiveStream())
-  {
-    try { m_pStruct->CloseLiveStream(); }
-    catch (std::exception &e) { LogException(e, "CloseLiveStream()"); }
-
-    CSingleLock lock(m_critSection);
-    m_bIsPlayingTV = false;
-  }
-  else if (IsPlayingRecording())
-  {
-    try { m_pStruct->CloseRecordedStream(); }
-    catch (std::exception &e) { LogException(e, "CloseRecordedStream()"); }
-
-    CSingleLock lock(m_critSection);
-    m_bIsPlayingRecording = false;
-  }
-}
-
-void CPVRClient::PauseStream(bool bPaused)
-{
-  if (IsPlaying())
-  {
-    try { m_pStruct->PauseStream(bPaused); }
-    catch (std::exception &e) { LogException(e, "PauseStream()"); }
-  }
-}
-
-void CPVRClient::SetSpeed(int speed)
-{
-  if (IsPlaying())
-  {
-    try { m_pStruct->SetSpeed(speed); }
-    catch (std::exception &e) { LogException(e, "SetSpeed()"); }
-  }
-}
-
-bool CPVRClient::CanPauseStream(void) const
-{
-  bool bReturn(false);
-  if (IsPlaying())
-  {
-    try
-    {
-      bReturn = m_pStruct->CanPauseStream();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-
-  return bReturn;
-}
-
-bool CPVRClient::CanSeekStream(void) const
-{
-  bool bReturn(false);
-  if (IsPlaying())
-  {
-    try
-    {
-      bReturn = m_pStruct->CanSeekStream();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return bReturn;
-}
-
-bool CPVRClient::IsTimeshifting(void) const
-{
-  bool bReturn(false);
-  if (IsPlaying())
-  {
-    try
-    {
-      if (m_pStruct->IsTimeshifting)
-        bReturn = m_pStruct->IsTimeshifting();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return bReturn;
-}
-
-time_t CPVRClient::GetPlayingTime(void) const
-{
-  time_t time = 0;
-  if (IsPlaying())
-  {
-    try
-    {
-      time = m_pStruct->GetPlayingTime();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  // fallback if not implemented by addon
-  if (time == 0)
-  {
-    CDateTime::GetUTCDateTime().GetAsTime(time);
-  }
-  return time;
-}
-
-time_t CPVRClient::GetBufferTimeStart(void) const
-{
-  time_t time = 0;
-  if (IsPlaying())
-  {
-    try
-    {
-      time = m_pStruct->GetBufferTimeStart();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return time;
-}
-
-time_t CPVRClient::GetBufferTimeEnd(void) const
-{
-  time_t time = 0;
-  if (IsPlaying())
-  {
-    try
-    {
-      time = m_pStruct->GetBufferTimeEnd();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return time;
-}
-
-bool CPVRClient::CanAutoconfigure(void) const
-{
-  /** can only auto-configure when avahi details are provided in addon.xml */
-  return !m_strAvahiType.empty() &&
-      !m_strAvahiIpSetting.empty() &&
-      !m_strAvahiPortSetting.empty();
-}
-
-bool CPVRClient::AutoconfigureRegisterType(void)
-{
-  if (!m_strAvahiType.empty())
-  {
-    // AddServiceType() returns false when already registered
-    m_bAvahiServiceAdded |= CZeroconfBrowser::GetInstance()->AddServiceType(m_strAvahiType);
-    return true;
-  }
-
-  return false;
-}
-
-bool CPVRClient::Autoconfigure(void)
-{
-  bool bReturn(false);
-
-  if (!CanAutoconfigure())
-    return bReturn;
-
-  std::string strHostPort;
-  std::vector<CZeroconfBrowser::ZeroconfService> found_services = CZeroconfBrowser::GetInstance()->GetFoundServices();
-  for(std::vector<CZeroconfBrowser::ZeroconfService>::iterator it = found_services.begin(); !bReturn && it != found_services.end(); ++it)
-  {
-    /** found the type that we are looking for */
-    if ((*it).GetType() == m_strAvahiType && std::find(m_rejectedAvahiHosts.begin(), m_rejectedAvahiHosts.end(), *it) == m_rejectedAvahiHosts.end())
-    {
-      /** try to resolve */
-      if(!CZeroconfBrowser::GetInstance()->ResolveService((*it)))
-      {
-        CLog::Log(LOGWARNING, "%s - %s service found but the host name couldn't be resolved", __FUNCTION__, (*it).GetName().c_str());
-      }
-      else
-      {
-        // %s service found at %s
-        std::string strLogLine(StringUtils::Format(g_localizeStrings.Get(19689).c_str(), (*it).GetName().c_str(), (*it).GetIP().c_str()));
-        CLog::Log(LOGDEBUG, "%s - %s", __FUNCTION__, strLogLine.c_str());
-
-        if (DialogResponse::YES != 
-          HELPERS::ShowYesNoDialogLines(CVariant{19688}, // Scanning for PVR services
-                                        CVariant{strLogLine},
-                                        CVariant{19690})) // Do you want to use this service?
-        {
-          CLog::Log(LOGDEBUG, "%s - %s service found but not enabled by the user", __FUNCTION__, (*it).GetName().c_str());
-          m_rejectedAvahiHosts.push_back(*it);
-        }
-        else
-        {
-          /** update the settings and return */
-          std::string strPort(StringUtils::Format("%d", (*it).GetPort()));
-          UpdateSetting(m_strAvahiIpSetting, (*it).GetIP());
-          UpdateSetting(m_strAvahiPortSetting, strPort);
-          SaveSettings();
-          CLog::Log(LOGNOTICE, "%s - auto-configured %s using host '%s' and port '%d'", __FUNCTION__, (*it).GetName().c_str(), (*it).GetIP().c_str(), (*it).GetPort());
-
-          bReturn = true;
-        }
-      }
-    }
-  }
-
-  return bReturn;
-}
-
-bool CPVRClient::IsRealTimeStream(void) const
-{
-  bool bReturn(false);
-  if (IsPlaying())
-  {
-    try
-    {
-      bReturn = m_pStruct->IsRealTimeStream();
-    }
-    catch (std::exception &e) { LogException(e, __FUNCTION__); }
-  }
-  return bReturn;
-}

_service:download_url:master.tar.gz/xbmc/pvr/addons/PVRClient.h Deleted

@@ -1,721 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "addons/Addon.h"
-#include "addons/AddonDll.h"
-#include "addons/DllPVRClient.h"
-#include "network/ZeroconfBrowser.h"
-
-#include "pvr/channels/PVRChannel.h"
-#include "pvr/recordings/PVRRecordings.h"
-
-namespace EPG
-{
-  class CEpg;
-}
-
-namespace PVR
-{
-  class CPVRChannelGroup;
-  class CPVRChannelGroupInternal;
-  class CPVRChannelGroups;
-  class CPVRTimers;
-  class CPVRTimerInfoTag;
-  class CPVRRecordings;
-  class CPVREpgContainer;
-  class CPVRClient;
-  class CPVRTimerType;
-
-  typedef std::vector<PVR_MENUHOOK> PVR_MENUHOOKS;
-  typedef std::shared_ptr<CPVRClient> PVR_CLIENT;
-  #define PVR_INVALID_CLIENT_ID (-2)
-
-  typedef std::shared_ptr<CPVRTimerType> CPVRTimerTypePtr;
-  typedef std::vector<CPVRTimerTypePtr>  CPVRTimerTypes;
-
-  /*!
-   * Interface from XBMC to a PVR add-on.
-   *
-   * Also translates XBMC's C++ structures to the addon's C structures.
-   */
-  class CPVRClient : public ADDON::CAddonDll<DllPVRClient, PVRClient, PVR_PROPERTIES>
-  {
-  public:
-    static std::unique_ptr<CPVRClient> FromExtension(ADDON::AddonProps props, const cp_extension_t* ext);
-
-    explicit CPVRClient(ADDON::AddonProps props);
-    CPVRClient(ADDON::AddonProps props, const std::string& strAvahiType,
-        const std::string& strAvahiIpSetting, const std::string& strAvahiPortSetting, bool bNeedsConfiguration);
-
-    ~CPVRClient(void);
-
-    virtual void OnDisabled();
-    virtual void OnEnabled();
-    virtual ADDON::AddonPtr GetRunningInstance() const;
-    virtual void OnPreInstall();
-    virtual void OnPostInstall(bool update, bool modal);
-    virtual void OnPreUnInstall();
-    virtual void OnPostUnInstall();
-    virtual bool CanInstall();
-    bool NeedsConfiguration(void) const { return m_bNeedsConfiguration; }
-
-    /** @name PVR add-on methods */
-    //@{
-
-    /*!
-     * @brief Initialise the instance of this add-on.
-     * @param iClientId The ID of this add-on.
-     */
-    ADDON_STATUS Create(int iClientId);
-
-    /*!
-     * @return True when the dll for this add-on was loaded, false otherwise (e.g. unresolved symbols)
-     */
-    bool DllLoaded(void) const;
-
-    /*!
-     * @brief Destroy the instance of this add-on.
-     */
-    void Destroy(void);
-
-    /*!
-     * @brief Destroy and recreate this add-on.
-     */
-    void ReCreate(void);
-
-    /*!
-     * @return True if this instance is initialised (ADDON_Create returned true), false otherwise.
-     */
-    bool ReadyToUse(void) const;
-
-    /*!
-     * @brief Gets the backend connection state.
-     * @return the backend connection state.
-     */
-    PVR_CONNECTION_STATE GetConnectionState(void) const { return m_connectionState; }
-
-    /*!
-     * @brief Sets the backend connection state.
-     * @param state the new backend connection state.
-     */
-    void SetConnectionState(PVR_CONNECTION_STATE state);
-
-    /*!
-     * @return The ID of this instance.
-     */
-    int GetID(void) const;
-
-    //@}
-    /** @name PVR server methods */
-    //@{
-
-    /*!
-     * @brief Query this add-on's capabilities.
-     * @return pCapabilities The add-on's capabilities.
-     */
-    PVR_ADDON_CAPABILITIES GetAddonCapabilities(void) const;
-
-    /*!
-     * @brief Get the stream properties of the stream that's currently being read.
-     * @param pProperties The properties.
-     * @return PVR_ERROR_NO_ERROR if the properties have been fetched successfully.
-     */
-    PVR_ERROR GetStreamProperties(PVR_STREAM_PROPERTIES *pProperties);
-
-    /*!
-     * @return The name reported by the backend.
-     */
-    const std::string& GetBackendName(void) const;
-
-    /*!
-     * @return The version string reported by the backend.
-     */
-    const std::string& GetBackendVersion(void) const;
-
-    /*!
-     * @brief the ip address or alias of the pvr backend server
-     */
-    const std::string& GetBackendHostname(void) const;
-
-    /*!
-     * @return The connection string reported by the backend.
-     */
-    const std::string& GetConnectionString(void) const;
-
-    /*!
-     * @return A friendly name for this add-on that can be used in log messages.
-     */
-    const std::string& GetFriendlyName(void) const;
-
-    /*!
-     * @brief Get the disk space reported by the server.
-     * @param iTotal The total disk space.
-     * @param iUsed The used disk space.
-     * @return PVR_ERROR_NO_ERROR if the drive space has been fetched successfully.
-     */
-    PVR_ERROR GetDriveSpace(long long *iTotal, long long *iUsed);
-
-    /*!
-     * @brief Start a channel scan on the server.
-     * @return PVR_ERROR_NO_ERROR if the channel scan has been started successfully.
-     */
-    PVR_ERROR StartChannelScan(void);
-
-    /*!
-     * @brief Request the client to open dialog about given channel to add
-     * @param channel The channel to add
-     * @return PVR_ERROR_NO_ERROR if the add has been fetched successfully.
-     */
-    PVR_ERROR OpenDialogChannelAdd(const CPVRChannelPtr &channel);
-
-    /*!
-     * @brief Request the client to open dialog about given channel settings
-     * @param channel The channel to edit
-     * @return PVR_ERROR_NO_ERROR if the edit has been fetched successfully.
-     */
-    PVR_ERROR OpenDialogChannelSettings(const CPVRChannelPtr &channel);
-
-    /*!
-     * @brief Request the client to delete given channel
-     * @param channel The channel to delete
-     * @return PVR_ERROR_NO_ERROR if the delete has been fetched successfully.
-     */
-    PVR_ERROR DeleteChannel(const CPVRChannelPtr &channel);
-
-    /*!
-     * @brief Request the client to rename given channel
-     * @param channel The channel to rename
-     * @return PVR_ERROR_NO_ERROR if the rename has been fetched successfully.
-     */
-    PVR_ERROR RenameChannel(const CPVRChannelPtr &channel);
-
-    /*!
-     * @return True if this add-on has menu hooks, false otherwise.
-     */
-    bool HaveMenuHooks(PVR_MENUHOOK_CAT cat) const;
-
-    /*!
-     * @return The menu hooks for this add-on.
-     */
-    PVR_MENUHOOKS *GetMenuHooks(void);
-
-    /*!
-     * @brief Call one of the menu hooks of this client.
-     * @param hook The hook to call.
-     * @param item The selected file item for which the hook was called.
-     */
-    void CallMenuHook(const PVR_MENUHOOK &hook, const CFileItem *item);
-
-    //@}
-    /** @name PVR EPG methods */
-    //@{
-
-    /*!
-     * @brief Request an EPG table for a channel from the client.
-     * @param channel The channel to get the EPG table for.
-     * @param epg The table to write the data to.
-     * @param start The start time to use.
-     * @param end The end time to use.
-     * @param bSaveInDb If true, tell the callback method to save any new entry in the database or not. see CAddonCallbacksPVR::PVRTransferEpgEntry()
-     * @return PVR_ERROR_NO_ERROR if the table has been fetched successfully.
-     */
-    PVR_ERROR GetEPGForChannel(const CPVRChannelPtr &channel, EPG::CEpg *epg, time_t start = 0, time_t end = 0, bool bSaveInDb = false);
-
-    /*!
-     * Tell the client the time frame to use when notifying epg events back to Kodi. The client might push epg events asynchronously
-     * to Kodi using the callback function EpgEventStateChange. To be able to only push events that are actually of interest for Kodi,
-     * client needs to know about the epg time frame Kodi uses.
-     * @param iDays number of days from "now". EPG_TIMEFRAME_UNLIMITED means that Kodi is interested in all epg events, regardless of event times.
-     * @return PVR_ERROR_NO_ERROR if new value was successfully set.
-     */
-    PVR_ERROR SetEPGTimeFrame(int iDays);
-
-    //@}
-    /** @name PVR channel group methods */
-    //@{
-
-    /*!
-      * @return The total amount of channel groups on the server or -1 on error.
-      */
-    int GetChannelGroupsAmount(void);
-
-    /*!
-     * @brief Request the list of all channel groups from the backend.
-     * @param groups The groups container to get the groups for.
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetChannelGroups(CPVRChannelGroups *groups);
-
-    /*!
-     * @brief Request the list of all group members from the backend.
-     * @param groups The group to get the members for.
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetChannelGroupMembers(CPVRChannelGroup *group);
-
-    //@}
-    /** @name PVR channel methods */
-    //@{
-
-    /*!
-     * @return The total amount of channels on the server or -1 on error.
-     */
-    int GetChannelsAmount(void);
-
-    /*!
-     * @brief Request the list of all channels from the backend.
-     * @param channels The channel group to add the channels to.
-     * @param bRadio True to get the radio channels, false to get the TV channels.
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetChannels(CPVRChannelGroup &channels, bool bRadio);
-
-    //@}
-    /** @name PVR recording methods */
-    //@{
-
-    /*!
-     * @param deleted if set return deleted recording
-     * @return The total amount of recordingd on the server or -1 on error.
-     */
-    int GetRecordingsAmount(bool deleted);
-
-    /*!
-     * @brief Request the list of all recordings from the backend.
-     * @param results The container to add the recordings to.
-     * @param deleted if set return deleted recording
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetRecordings(CPVRRecordings *results, bool deleted);
-
-    /*!
-     * @brief Delete a recording on the backend.
-     * @param recording The recording to delete.
-     * @return PVR_ERROR_NO_ERROR if the recording has been deleted successfully.
-     */
-    PVR_ERROR DeleteRecording(const CPVRRecording &recording);
-
-    /*!
-     * @brief Undelete a recording on the backend.
-     * @param recording The recording to undelete.
-     * @return PVR_ERROR_NO_ERROR if the recording has been undeleted successfully.
-     */
-    PVR_ERROR UndeleteRecording(const CPVRRecording &recording);
-
-    /*!
-     * @brief Delete all recordings permanent which in the deleted folder on the backend.
-     * @return PVR_ERROR_NO_ERROR if the recordings has been deleted successfully.
-     */
-    PVR_ERROR DeleteAllRecordingsFromTrash();
-
-    /*!
-     * @brief Rename a recording on the backend.
-     * @param recording The recording to rename.
-     * @return PVR_ERROR_NO_ERROR if the recording has been renamed successfully.
-     */
-    PVR_ERROR RenameRecording(const CPVRRecording &recording);
-
-    /*!
-     * @brief Set the play count of a recording on the backend.
-     * @param recording The recording to set the play count.
-     * @param count Play count.
-     * @return PVR_ERROR_NO_ERROR if the recording's play count has been set successfully.
-     */
-    PVR_ERROR SetRecordingPlayCount(const CPVRRecording &recording, int count);
-
-    /*!
-    * @brief Set the last watched position of a recording on the backend.
-    * @param recording The recording.
-    * @param position The last watched position in seconds
-    * @return PVR_ERROR_NO_ERROR if the position has been stored successfully.
-    */
-    PVR_ERROR SetRecordingLastPlayedPosition(const CPVRRecording &recording, int lastplayedposition);
-
-    /*!
-    * @brief Retrieve the last watched position of a recording on the backend.
-    * @param recording The recording.
-    * @return The last watched position in seconds or -1 on error
-    */
-    int GetRecordingLastPlayedPosition(const CPVRRecording &recording);
-
-    /*!
-    * @brief Retrieve the edit decision list (EDL) from the backend.
-    * @param recording The recording.
-    * @return The edit decision list (empty on error).
-    */
-    std::vector<PVR_EDL_ENTRY> GetRecordingEdl(const CPVRRecording &recording);
-
-    //@}
-    /** @name PVR timer methods */
-    //@{
-
-    /*!
-     * @return The total amount of timers on the backend or -1 on error.
-     */
-    int GetTimersAmount(void);
-
-    /*!
-     * @brief Request the list of all timers from the backend.
-     * @param results The container to store the result in.
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetTimers(CPVRTimers *results);
-
-    /*!
-     * @brief Add a timer on the backend.
-     * @param timer The timer to add.
-     * @return PVR_ERROR_NO_ERROR if the timer has been added successfully.
-     */
-    PVR_ERROR AddTimer(const CPVRTimerInfoTag &timer);
-
-    /*!
-     * @brief Delete a timer on the backend.
-     * @param timer The timer to delete.
-     * @param bForce Set to true to delete a timer that is currently recording a program.
-     * @return PVR_ERROR_NO_ERROR if the timer has been deleted successfully.
-     */
-    PVR_ERROR DeleteTimer(const CPVRTimerInfoTag &timer, bool bForce = false);
-
-    /*!
-     * @brief Rename a timer on the server.
-     * @param timer The timer to rename.
-     * @param strNewName The new name of the timer.
-     * @return PVR_ERROR_NO_ERROR if the timer has been renamed successfully.
-     */
-    PVR_ERROR RenameTimer(const CPVRTimerInfoTag &timer, const std::string &strNewName);
-
-    /*!
-     * @brief Update the timer information on the server.
-     * @param timer The timer to update.
-     * @return PVR_ERROR_NO_ERROR if the timer has been updated successfully.
-     */
-    PVR_ERROR UpdateTimer(const CPVRTimerInfoTag &timer);
-
-    /*!
-     * @brief Get all timer types supported by the backend.
-     * @param results The container to store the result in.
-     * @return PVR_ERROR_NO_ERROR if the list has been fetched successfully.
-     */
-    PVR_ERROR GetTimerTypes(CPVRTimerTypes& results) const;
-
-    //@}
-    /** @name PVR live stream methods */
-    //@{
-
-    /*!
-     * @brief Open a live stream on the server.
-     * @param channel The channel to stream.
-     * @param bIsSwitchingChannel True when switching channels, false otherwise.
-     * @return True if the stream opened successfully, false otherwise.
-     */
-    bool OpenStream(const CPVRChannelPtr &channel, bool bIsSwitchingChannel);
-
-    /*!
-     * @brief Close an open live stream.
-     */
-    void CloseStream(void);
-
-    /*!
-     * @brief Read from an open live stream.
-     * @param lpBuf The buffer to store the data in.
-     * @param uiBufSize The amount of bytes to read.
-     * @return The amount of bytes that were actually read from the stream.
-     */
-    int ReadStream(void* lpBuf, int64_t uiBufSize);
-
-    /*!
-     * @brief Seek in a live stream on a backend that supports timeshifting.
-     * @param iFilePosition The position to seek to.
-     * @param iWhence ?
-     * @return The new position.
-     */
-    int64_t SeekStream(int64_t iFilePosition, int iWhence = SEEK_SET);
-
-    /*!
-     * @return The position in the stream that's currently being read.
-     */
-    int64_t GetStreamPosition(void);
-
-    /*!
-     * @return The total length of the stream that's currently being read.
-     */
-    int64_t GetStreamLength(void);
-
-    /*!
-     * @brief (Un)Pause a stream
-     */
-    void PauseStream(bool bPaused);
-
-    /*!
-     * @brief Switch to another channel. Only to be called when a live stream has already been opened.
-     * @param channel The channel to switch to.
-     * @return True if the switch was successful, false otherwise.
-     */
-    bool SwitchChannel(const CPVRChannelPtr &channel);
-
-    /*!
-     * @brief Get the signal quality of the stream that's currently open.
-     * @param qualityinfo The signal quality.
-     * @return True if the signal quality has been read successfully, false otherwise.
-     */
-    bool SignalQuality(PVR_SIGNAL_STATUS &qualityinfo);
-
-    /*!
-     * @brief Get the stream URL for a channel from the server. Used by the MediaPortal add-on.
-     * @param channel The channel to get the stream URL for.
-     * @return The requested URL.
-     */
-    std::string GetLiveStreamURL(const CPVRChannelPtr &channel);
-
-    /*!
-     * @brief Check whether PVR backend supports pausing the currently playing stream
-     */
-    bool CanPauseStream(void) const;
-
-    /*!
-     * @brief Check whether PVR backend supports seeking for the currently playing stream
-     */
-    bool CanSeekStream(void) const;
-
-    /*!
-     * Notify the pvr addon/demuxer that XBMC wishes to seek the stream by time
-     * @param time The absolute time since stream start
-     * @param backwards True to seek to keyframe BEFORE time, else AFTER
-     * @param startpts can be updated to point to where display should start
-     * @return True if the seek operation was possible
-     * @remarks Optional, and only used if addon has its own demuxer. Return False if this add-on won't provide this function.
-     */
-    bool SeekTime(int time, bool backwards, double *startpts);
-
-    /*!
-     * Notify the pvr addon/demuxer that XBMC wishes to change playback speed
-     * @param speed The requested playback speed
-     * @remarks Optional, and only used if addon has its own demuxer.
-     */
-    void SetSpeed(int speed);
-
-    //@}
-    /** @name PVR recording stream methods */
-    //@{
-
-    /*!
-     * @brief Open a recording on the server.
-     * @param recording The recording to open.
-     * @return True if the stream has been opened succesfully, false otherwise.
-     */
-    bool OpenStream(const CPVRRecordingPtr &recording);
-
-    //@}
-    /** @name PVR demultiplexer methods */
-    //@{
-
-    /*!
-     * @brief Reset the demultiplexer in the add-on.
-     */
-    void DemuxReset(void);
-
-    /*!
-     * @brief Abort the demultiplexer thread in the add-on.
-     */
-    void DemuxAbort(void);
-
-    /*!
-     * @brief Flush all data that's currently in the demultiplexer buffer in the add-on.
-     */
-    void DemuxFlush(void);
-
-    /*!
-     * @brief Read a packet from the demultiplexer.
-     * @return The packet.
-     */
-    DemuxPacket *DemuxRead(void);
-
-    //@}
-
-    bool SupportsChannelGroups(void) const;
-    bool SupportsChannelScan(void) const;
-    bool SupportsChannelSettings(void) const;
-    bool SupportsEPG(void) const;
-    bool SupportsLastPlayedPosition(void) const;
-    bool SupportsRadio(void) const;
-    bool SupportsRecordings(void) const;
-    bool SupportsRecordingsUndelete(void) const;
-    bool SupportsRecordingPlayCount(void) const;
-    bool SupportsRecordingEdl(void) const;
-    bool SupportsTimers(void) const;
-    bool SupportsTV(void) const;
-    bool HandlesDemuxing(void) const;
-    bool HandlesInputStream(void) const;
-
-    bool IsPlayingLiveStream(void) const;
-    bool IsPlayingLiveTV(void) const;
-    bool IsPlayingLiveRadio(void) const;
-    bool IsPlayingEncryptedChannel(void) const;
-    bool IsPlayingRecording(void) const;
-    bool IsPlaying(void) const;
-    CPVRRecordingPtr GetPlayingRecording(void) const;
-    CPVRChannelPtr GetPlayingChannel() const;
-
-    static const char *ToString(const PVR_ERROR error);
-
-    /*!
-     * @brief is timeshift active?
-     */
-    bool IsTimeshifting() const;
-
-    /*!
-     * @brief actual playing time
-     */
-    time_t GetPlayingTime() const;
-
-    /*!
-     * @brief time of oldest packet in timeshift buffer
-     */
-    time_t GetBufferTimeStart() const;
-
-    /*!
-     * @brief time of latest packet in timeshift buffer
-     */
-    time_t GetBufferTimeEnd() const;
-
-    /*!
-     * @return True if this add-on can be auto-configured via avahi, false otherwise
-     */
-    bool CanAutoconfigure(void) const;
-
-    /*!
-     * Registers the avahi type for this add-on
-     * @return True if registered, false if not.
-     */
-    bool AutoconfigureRegisterType(void);
-
-    /*!
-     * Try to auto-configure this add-on via avahi
-     * @return True if auto-configured and the configured was accepted by the user, false otherwise
-     */
-    bool Autoconfigure(void);
-
-    /*!
-     * @brief is real-time stream?
-     */
-    bool IsRealTimeStream() const;
-
-  private:
-    /*!
-     * @brief Checks whether the provided API version is compatible with XBMC
-     * @param minVersion The add-on's XBMC_PVR_MIN_API_VERSION version
-     * @param version The add-on's XBMC_PVR_API_VERSION version
-     * @return True when compatible, false otherwise
-     */
-    static bool IsCompatibleAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version);
-
-    /*!
-     * @brief Checks whether the provided GUI API version is compatible with XBMC
-     * @param minVersion The add-on's XBMC_GUI_MIN_API_VERSION version
-     * @param version The add-on's XBMC_GUI_API_VERSION version
-     * @return True when compatible, false otherwise
-     */
-    static bool IsCompatibleGUIAPIVersion(const ADDON::AddonVersion &minVersion, const ADDON::AddonVersion &version);
-
-    /*!
-     * @brief Request the API version from the add-on, and check if it's compatible
-     * @return True when compatible, false otherwise.
-     */
-    bool CheckAPIVersion(void);
-
-    /*!
-     * @brief Resets all class members to their defaults. Called by the constructors.
-     */
-    void ResetProperties(int iClientId = PVR_INVALID_CLIENT_ID);
-
-    bool GetAddonProperties(void);
-
-    /*!
-     * @brief Copy over group info from xbmcGroup to addonGroup.
-     * @param xbmcGroup The group on XBMC's side.
-     * @param addonGroup The group on the addon's side.
-     */
-    static void WriteClientGroupInfo(const CPVRChannelGroup &xbmcGroup, PVR_CHANNEL_GROUP &addonGroup);
-
-    /*!
-     * @brief Copy over recording info from xbmcRecording to addonRecording.
-     * @param xbmcRecording The recording on XBMC's side.
-     * @param addonRecording The recording on the addon's side.
-     */
-    static void WriteClientRecordingInfo(const CPVRRecording &xbmcRecording, PVR_RECORDING &addonRecording);
-
-    /*!
-     * @brief Copy over timer info from xbmcTimer to addonTimer.
-     * @param xbmcTimer The timer on XBMC's side.
-     * @param addonTimer The timer on the addon's side.
-     */
-    static void WriteClientTimerInfo(const CPVRTimerInfoTag &xbmcTimer, PVR_TIMER &addonTimer);
-
-    /*!
-     * @brief Copy over channel info from xbmcChannel to addonClient.
-     * @param xbmcChannel The channel on XBMC's side.
-     * @param addonChannel The channel on the addon's side.
-     */
-    static void WriteClientChannelInfo(const CPVRChannelPtr &xbmcChannel, PVR_CHANNEL &addonChannel);
-
-    /*!
-     * @brief Whether a channel can be played by this add-on
-     * @param channel The channel to check.
-     * @return True when it can be played, false otherwise.
-     */
-    bool CanPlayChannel(const CPVRChannelPtr &channel) const;
-
-    bool LogError(const PVR_ERROR error, const char *strMethod) const;
-    void LogException(const std::exception &e, const char *strFunctionName) const;
-
-    bool                   m_bReadyToUse;          /*!< true if this add-on is initialised (ADDON_Create returned true), false otherwise */
-    PVR_CONNECTION_STATE   m_connectionState;      /*!< the backend connection state */
-    PVR_MENUHOOKS          m_menuhooks;            /*!< the menu hooks for this add-on */
-    CPVRTimerTypes         m_timertypes;           /*!< timer types supported by this backend */
-    int                    m_iClientId;            /*!< database ID of the client */
-
-    /* cached data */
-    std::string            m_strBackendName;       /*!< the cached backend version */
-    std::string            m_strBackendVersion;    /*!< the cached backend version */
-    std::string            m_strConnectionString;  /*!< the cached connection string */
-    std::string            m_strFriendlyName;      /*!< the cached friendly name */
-    PVR_ADDON_CAPABILITIES m_addonCapabilities;     /*!< the cached add-on capabilities */
-    std::string            m_strBackendHostname;    /*!< the cached backend hostname */
-
-    /* stored strings to make sure const char* members in PVR_PROPERTIES stay valid */
-    std::string                                    m_strUserPath;         /*!< @brief translated path to the user profile */
-    std::string                                    m_strClientPath;       /*!< @brief translated path to this add-on */
-    std::string                                    m_strAvahiType;        /*!< avahi service type */
-    std::string                                    m_strAvahiIpSetting;   /*!< add-on setting name to change to the found ip address */
-    std::string                                    m_strAvahiPortSetting; /*!< add-on setting name to change to the found port number */
-    bool                                           m_bNeedsConfiguration; /*!< add-on needs a user set configuration */
-    std::vector<CZeroconfBrowser::ZeroconfService> m_rejectedAvahiHosts;  /*!< hosts that were rejected by the user */
-
-    CCriticalSection m_critSection;
-
-    bool                m_bIsPlayingTV;
-    CPVRChannelPtr      m_playingChannel;
-    bool                m_bIsPlayingRecording;
-    CPVRRecordingPtr    m_playingRecording;
-    ADDON::AddonVersion m_apiVersion;
-    bool                m_bAvahiServiceAdded;
-  };
-}

_service:download_url:master.tar.gz/xbmc/pvr/addons/PVRClients.cpp Changed

@@ -22,12 +22,16 @@
 
 #include <cassert>
 #include <utility>
+#include <functional>
 
 #include "Application.h"
 #include "cores/IPlayer.h"
 #include "dialogs/GUIDialogExtendedProgressBar.h"
 #include "dialogs/GUIDialogOK.h"
 #include "dialogs/GUIDialogSelect.h"
+#include "dialogs/GUIDialogKaiToast.h"
+#include "events/EventLog.h"
+#include "events/NotificationEvent.h"
 #include "guilib/GUIWindowManager.h"
 #include "GUIUserMessages.h"
 #include "messaging/ApplicationMessenger.h"
@@ -50,19 +54,17 @@
 #define PVR_CLIENT_AVAHI_SLEEP_TIME_MS     (250)
 
 CPVRClients::CPVRClients(void) :
-    CThread("PVRClient"),
     m_bChannelScanRunning(false),
     m_bIsSwitchingChannels(false),
     m_playingClientId(-EINVAL),
     m_bIsPlayingLiveTV(false),
-    m_bIsPlayingRecording(false),
-    m_bNoAddonWarningDisplayed(false),
-    m_bRestartManagerOnAddonDisabled(false)
+    m_bIsPlayingRecording(false)
 {
 }
 
 CPVRClients::~CPVRClients(void)
 {
+  CAddonMgr::GetInstance().UnregisterAddonMgrCallback(ADDON_PVRDLL);
   Unload();
 }
 
@@ -78,24 +80,18 @@
 
 void CPVRClients::Start(void)
 {
-  Stop();
-
-  Create();
-  SetPriority(-1);
-}
+  CAddonMgr::GetInstance().RegisterAddonMgrCallback(ADDON_PVRDLL, this);
 
-void CPVRClients::Stop(void)
-{
-  StopThread();
+  UpdateAddons();
 }
 
-bool CPVRClients::IsConnectedClient(int iClientId) const
+bool CPVRClients::IsCreatedClient(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client);
+  return GetCreatedClient(iClientId, client);
 }
 
-bool CPVRClients::IsConnectedClient(const AddonPtr addon)
+bool CPVRClients::IsCreatedClient(const AddonPtr addon)
 {
   CSingleLock lock(m_critSection);
 
@@ -109,9 +105,13 @@
 {
   CSingleLock lock(m_critSection);
 
-  for (PVR_CLIENTMAP_CITR itr = m_clientMap.begin(); itr != m_clientMap.end(); itr++)
-    if (itr->second->ID() == client->ID())
-      return itr->first;
+  for (auto &entry : m_clientMap)
+  {
+    if (entry.second->ID() == client->ID())
+    {
+      return entry.first;
+    }
+  }
 
   return -1;
 }
@@ -120,9 +120,7 @@
 {
   CSingleLock lock(m_critSection);
   std::map<std::string, int>::const_iterator it = m_addonNameIds.find(strId);
-  return it != m_addonNameIds.end() ?
-      it->second :
-      -1;
+  return it != m_addonNameIds.end() ? it->second : -1;
 }
 
 bool CPVRClients::GetClient(int iClientId, PVR_CLIENT &addon) const
@@ -143,7 +141,7 @@
   return bReturn;
 }
 
-bool CPVRClients::GetConnectedClient(int iClientId, PVR_CLIENT &addon) const
+bool CPVRClients::GetCreatedClient(int iClientId, PVR_CLIENT &addon) const
 {
   if (GetClient(iClientId, addon))
     return addon->ReadyToUse();
@@ -162,14 +160,8 @@
 
 void CPVRClients::Unload(void)
 {
-  Stop();
-
   CSingleLock lock(m_critSection);
 
-  /* destroy all clients */
-  for (PVR_CLIENTMAP_ITR itr = m_clientMap.begin(); itr != m_clientMap.end(); itr++)
-    itr->second->Destroy();
-
   /* reset class properties */
   m_bChannelScanRunning  = false;
   m_bIsPlayingLiveTV     = false;
@@ -228,7 +220,7 @@
   return false;
 }
 
-int CPVRClients::ConnectedClientAmount(void) const
+int CPVRClients::CreatedClientAmount(void) const
 {
   int iReturn(0);
   CSingleLock lock(m_critSection);
@@ -240,13 +232,17 @@
   return iReturn;
 }
 
-bool CPVRClients::HasConnectedClients(void) const
+bool CPVRClients::HasCreatedClients(void) const
 {
   CSingleLock lock(m_critSection);
 
-  for (PVR_CLIENTMAP_CITR itr = m_clientMap.begin(); itr != m_clientMap.end(); itr++)
-    if (itr->second->ReadyToUse())
+  for (auto &client : m_clientMap)
+  {
+    if (client.second->ReadyToUse() && !client.second->IgnoreClient())
+    {
       return true;
+    }
+  }
 
   return false;
 }
@@ -255,7 +251,7 @@
 {
   bool bReturn(false);
   PVR_CLIENT client;
-  if ((bReturn = GetConnectedClient(iClientId, client)) == true)
+  if ((bReturn = GetCreatedClient(iClientId, client)) == true)
     strName = client->GetFriendlyName();
 
   return bReturn;
@@ -265,7 +261,7 @@
 {
   bool bReturn(false);
   PVR_CLIENT client;
-  if ((bReturn = GetConnectedClient(iClientId, client)) == true)
+  if ((bReturn = GetCreatedClient(iClientId, client)) == true)
     strName = client->Name();
 
   return bReturn;
@@ -275,7 +271,7 @@
 {
   bool bReturn(false);
   PVR_CLIENT client;
-  if ((bReturn = GetConnectedClient(iClientId, client)) == true)
+  if ((bReturn = GetCreatedClient(iClientId, client)) == true)
     strIcon = client->Icon();
 
   return bReturn;
@@ -332,7 +328,7 @@
       "";
 }
 
-int CPVRClients::GetConnectedClients(PVR_CLIENTMAP &clients) const
+int CPVRClients::GetCreatedClients(PVR_CLIENTMAP &clients) const
 {
   int iReturn(0);
   CSingleLock lock(m_critSection);
@@ -341,6 +337,9 @@
   {
     if (itr->second->ReadyToUse())
     {
+      if (itr->second->IgnoreClient())
+        continue;
+      
       clients.insert(std::make_pair(itr->second->GetID(), itr->second));
       ++iReturn;
     }
@@ -370,7 +369,7 @@
 
   std::string strReturn;
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     strReturn = client->GetLiveStreamURL(channel);
   else
     CLog::Log(LOGERROR, "PVR - %s - cannot find client %d",__FUNCTION__, channel->ClientID());
@@ -420,7 +419,7 @@
   else
   {
     PVR_CLIENT client;
-    if (GetConnectedClient(channel->ClientID(), client))
+    if (GetCreatedClient(channel->ClientID(), client))
       bSwitchSuccessful = client->SwitchChannel(channel);
   }
 
@@ -453,7 +452,7 @@
 bool CPVRClients::HasTimerSupport(int iClientId)
 {
   PVR_CLIENT client;
-  if (GetConnectedClient(iClientId, client))
+  if (GetCreatedClient(iClientId, client))
     return client->SupportsTimers();
 
   return false;
@@ -463,7 +462,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   /* get the timer list from each client */
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); itrClients++)
@@ -485,7 +484,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(timer.m_iClientId, client))
+  if (GetCreatedClient(timer.m_iClientId, client))
     error = client->AddTimer(timer);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -499,7 +498,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(timer.m_iClientId, client))
+  if (GetCreatedClient(timer.m_iClientId, client))
     error = client->UpdateTimer(timer);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -513,7 +512,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
   PVR_CLIENT client;
 
-  if (GetConnectedClient(timer.m_iClientId, client))
+  if (GetCreatedClient(timer.m_iClientId, client))
     error = client->DeleteTimer(timer, bForce);
 
   return error;
@@ -524,7 +523,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(timer.m_iClientId, client))
+  if (GetCreatedClient(timer.m_iClientId, client))
     error = client->RenameTimer(timer, strNewName);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -538,7 +537,7 @@
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
 
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   for (const auto &clientEntry : clients)
   {
@@ -565,7 +564,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(iClientId, client))
+  if (GetCreatedClient(iClientId, client))
     error = client->GetTimerTypes(results);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -578,7 +577,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); itrClients++)
   {
@@ -599,7 +598,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client))
+  if (GetCreatedClient(recording.m_iClientId, client))
     error = client->RenameRecording(recording);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -613,7 +612,7 @@
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
 
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client))
+  if (GetCreatedClient(recording.m_iClientId, client))
     error = client->DeleteRecording(recording);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -630,7 +629,7 @@
     return error;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client))
+  if (GetCreatedClient(recording.m_iClientId, client))
     error = client->UndeleteRecording(recording);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -643,7 +642,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   std::vector<PVR_CLIENT> suppClients;
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); ++itrClients)
@@ -701,7 +700,7 @@
 {
   *error = PVR_ERROR_UNKNOWN;
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client) && client->SupportsRecordings())
+  if (GetCreatedClient(recording.m_iClientId, client) && client->SupportsRecordings())
     *error = client->SetRecordingLastPlayedPosition(recording, lastplayedposition);
   else
     CLog::Log(LOGERROR, "PVR - %s - client %d does not support recordings",__FUNCTION__, recording.m_iClientId);
@@ -714,7 +713,7 @@
   int rc = 0;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client) && client->SupportsRecordings())
+  if (GetCreatedClient(recording.m_iClientId, client) && client->SupportsRecordings())
     rc = client->GetRecordingLastPlayedPosition(recording);
   else
     CLog::Log(LOGERROR, "PVR - %s - client %d does not support recordings",__FUNCTION__, recording.m_iClientId);
@@ -726,7 +725,7 @@
 {
   *error = PVR_ERROR_UNKNOWN;
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client) && client->SupportsRecordingPlayCount())
+  if (GetCreatedClient(recording.m_iClientId, client) && client->SupportsRecordingPlayCount())
     *error = client->SetRecordingPlayCount(recording, count);
   else
     CLog::Log(LOGERROR, "PVR - %s - client %d does not support setting recording's play count",__FUNCTION__, recording.m_iClientId);
@@ -737,7 +736,7 @@
 std::vector<PVR_EDL_ENTRY> CPVRClients::GetRecordingEdl(const CPVRRecording &recording)
 {
   PVR_CLIENT client;
-  if (GetConnectedClient(recording.m_iClientId, client) && client->SupportsRecordingEdl())
+  if (GetCreatedClient(recording.m_iClientId, client) && client->SupportsRecordingEdl())
     return client->GetRecordingEdl(recording);
   else
     CLog::Log(LOGERROR, "PVR - %s - client %d does not support getting Edl", __FUNCTION__, recording.m_iClientId);
@@ -787,7 +786,7 @@
 
   PVR_ERROR error(PVR_ERROR_UNKNOWN);
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     error = client->GetEPGForChannel(channel, epg, start, end);
 
   if (error != PVR_ERROR_NO_ERROR)
@@ -799,7 +798,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   for (const auto &client : clients)
   {
@@ -819,7 +818,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   /* get the channel list from each client */
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); itrClients++)
@@ -840,7 +839,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); itrClients++)
   {
@@ -860,7 +859,7 @@
 {
   PVR_ERROR error(PVR_ERROR_NO_ERROR);
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   /* get the member list from each client */
   for (PVR_CLIENTMAP_CITR itrClients = clients.begin(); itrClients != clients.end(); itrClients++)
@@ -883,7 +882,7 @@
     iClientID = GetPlayingClientID();
 
   PVR_CLIENT client;
-  return (GetConnectedClient(iClientID, client) &&
+  return (GetCreatedClient(iClientID, client) &&
       client->HaveMenuHooks(cat));
 }
 
@@ -895,7 +894,7 @@
     iClientID = GetPlayingClientID();
 
   PVR_CLIENT client;
-  if (GetConnectedClient(iClientID, client) && client->HaveMenuHooks(cat))
+  if (GetCreatedClient(iClientID, client) && client->HaveMenuHooks(cat))
   {
     *hooks = *(client->GetMenuHooks());
     bReturn = true;
@@ -910,7 +909,7 @@
   if (iClientID < 0 && cat == PVR_MENUHOOK_SETTING)
   {
     PVR_CLIENTMAP clients;
-    GetConnectedClients(clients);
+    GetCreatedClients(clients);
 
     if (clients.size() == 1)
     {
@@ -945,7 +944,7 @@
     iClientID = GetPlayingClientID();
 
   PVR_CLIENT client;
-  if (GetConnectedClient(iClientID, client) && client->HaveMenuHooks(cat))
+  if (GetCreatedClient(iClientID, client) && client->HaveMenuHooks(cat))
   {
     PVR_MENUHOOKS *hooks = client->GetMenuHooks();
     std::vector<int> hookIDs;
@@ -1032,17 +1031,11 @@
       __FUNCTION__, scanClient->GetFriendlyName().c_str());
   long perfCnt = XbmcThreads::SystemClockMillis();
 
-  /* stop the supervisor thread */
-  g_PVRManager.StopUpdateThreads();
-
   /* do the scan */
   if (scanClient->StartChannelScan() != PVR_ERROR_NO_ERROR)
     /* an error occured */
     CGUIDialogOK::ShowAndGetInput(CVariant{19111}, CVariant{19193});
 
-  /* restart the supervisor thread */
-  g_PVRManager.StartUpdateThreads();
-
   CLog::Log(LOGNOTICE, "PVRManager - %s - channel scan finished after %li.%li seconds",
       __FUNCTION__, (XbmcThreads::SystemClockMillis()-perfCnt)/1000, (XbmcThreads::SystemClockMillis()-perfCnt)%1000);
   m_bChannelScanRunning = false;
@@ -1070,7 +1063,7 @@
   PVR_ERROR error = PVR_ERROR_UNKNOWN;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     error = client->OpenDialogChannelAdd(channel);
   else
     CLog::Log(LOGERROR, "PVR - %s - cannot find client %d",__FUNCTION__, channel->ClientID());
@@ -1089,7 +1082,7 @@
   PVR_ERROR error = PVR_ERROR_UNKNOWN;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     error = client->OpenDialogChannelSettings(channel);
   else
     CLog::Log(LOGERROR, "PVR - %s - cannot find client %d",__FUNCTION__, channel->ClientID());
@@ -1108,7 +1101,7 @@
   PVR_ERROR error = PVR_ERROR_UNKNOWN;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     error = client->DeleteChannel(channel);
   else
     CLog::Log(LOGERROR, "PVR - %s - cannot find client %d",__FUNCTION__, channel->ClientID());
@@ -1127,7 +1120,7 @@
   PVR_ERROR error = PVR_ERROR_UNKNOWN;
 
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client))
+  if (GetCreatedClient(channel->ClientID(), client))
     error = client->RenameChannel(channel);
   else
     CLog::Log(LOGERROR, "PVR - %s - cannot find client %d",__FUNCTION__, channel->ClientID());
@@ -1141,326 +1134,68 @@
   return GetClientId(client) > 0;
 }
 
-int CPVRClients::RegisterClient(AddonPtr client)
+void CPVRClients::UpdateAddons(void)
 {
-  int iClientId(-1);
-  CAddonDatabase database;
+  VECADDONS addons;
   PVR_CLIENT addon;
 
-  if (CAddonMgr::GetInstance().IsAddonDisabled(client->ID()) || !database.Open())
-    return -1;
-
-  CLog::Log(LOGDEBUG, "%s - registering add-on '%s'", __FUNCTION__, client->Name().c_str());
-
-  // check whether we already know this client
-  iClientId = database.GetAddonId(client); //database->GetClientId(client->ID());
-
-  // try to register the new client in the db
-  if (iClientId <= 0)
-    iClientId = database.AddAddon(client, 0);
-
-  if (iClientId > 0)
-  // load and initialise the client libraries
-  {
-    CSingleLock lock(m_critSection);
-    PVR_CLIENTMAP_CITR existingClient = m_clientMap.find(iClientId);
-    if (existingClient != m_clientMap.end())
-    {
-      // return existing client
-      addon = existingClient->second;
-    }
-    else
-    {
-      // create a new client instance
-      addon = std::dynamic_pointer_cast<CPVRClient>(client);
-      m_clientMap.insert(std::make_pair(iClientId, addon));
-      m_addonNameIds.insert(make_pair(addon->ID(), iClientId));
-    }
-  }
-
-  if (iClientId <= 0)
-    CLog::Log(LOGERROR, "PVR - %s - can't register add-on '%s'", __FUNCTION__, client->Name().c_str());
-
-  return iClientId;
-}
+  CAddonMgr::GetInstance().GetAddons(addons, ADDON_PVRDLL);
 
-bool CPVRClients::UpdateAndInitialiseClients(bool bInitialiseAllClients /* = false */)
-{
-  bool bReturn(true);
-  VECADDONS map;
-  VECADDONS disableAddons;
-  {
-    CSingleLock lock(m_critSection);
-    map = m_addons;
-  }
-
-  if (map.empty())
-    return false;
+  if (addons.empty())
+    return;
 
-  for (VECADDONS::iterator it = map.begin(); it != map.end(); ++it)
+  for (auto &addon : addons)
   {
-    bool bEnabled = !CAddonMgr::GetInstance().IsAddonDisabled((*it)->ID());
+    bool bEnabled = !CAddonMgr::GetInstance().IsAddonDisabled(addon->ID());
 
-    if (!bEnabled && IsKnownClient(*it))
-    {
-      CSingleLock lock(m_critSection);
-      /* stop the client and remove it from the db */
-      StopClient(*it, false);
-      disableAddons.push_back(*it);
-
-    }
-    else if (bEnabled && (bInitialiseAllClients || !IsKnownClient(*it) || !IsConnectedClient(*it)))
+    if (bEnabled && (!IsKnownClient(addon) || !IsCreatedClient(addon)))
     {
-      bool bDisabled(false);
+      std::hash<std::string> hasher;
+      int iClientId = static_cast<int>(hasher(addon->ID()));
+      if (iClientId < 0)
+        iClientId = -iClientId;
 
-      // register the add-on in the pvr db, and create the CPVRClient instance
-      int iClientId = RegisterClient(*it);
-      if (iClientId <= 0)
+      ADDON_STATUS status;
+      if (IsKnownClient(addon))
       {
-        // failed to register or create the add-on, disable it
-        CLog::Log(LOGWARNING, "%s - failed to register add-on %s, disabling it", __FUNCTION__, (*it)->Name().c_str());
-        disableAddons.push_back(*it);
-        bDisabled = true;
+        PVR_CLIENT client;
+        GetClient(iClientId, client);
+        status = client->Create(iClientId);
       }
       else
       {
-        ADDON_STATUS status(ADDON_STATUS_UNKNOWN);
-        PVR_CLIENT addon;
+        PVR_CLIENT pvrclient = std::dynamic_pointer_cast<CPVRClient>(addon);
+        if (!pvrclient)
         {
-          CSingleLock lock(m_critSection);
-          if (!GetClient(iClientId, addon))
-          {
-            CLog::Log(LOGWARNING, "%s - failed to find add-on %s, disabling it", __FUNCTION__, (*it)->Name().c_str());
-            disableAddons.push_back(*it);
-            bDisabled = true;
-          }
+          CLog::Log(LOGERROR, "CPVRClients::UpdateAndInitialiseClients - severe error, incorrect add type");
+          continue;
         }
-
-        // throttle connection attempts, no more than 1 attempt per 5 seconds
-        if (!bDisabled && !CAddonMgr::GetInstance().IsAddonDisabled(addon->ID()))
+        status = pvrclient.get()->Create(iClientId);
+        // register the add-on
+        if (m_clientMap.find(iClientId) == m_clientMap.end())
         {
-          time_t now;
-          CDateTime::GetCurrentDateTime().GetAsTime(now);
-          std::map<int, time_t>::iterator it = m_connectionAttempts.find(iClientId);
-          if (it != m_connectionAttempts.end() && now < it->second)
-            continue;
-          m_connectionAttempts[iClientId] = now + 5;
-        }
-
-        // re-check the enabled status. newly installed clients get disabled when they're added to the db
-        if (!bDisabled && !CAddonMgr::GetInstance().IsAddonDisabled(addon->ID()) && (status = addon->Create(iClientId)) != ADDON_STATUS_OK)
-        {
-          CLog::Log(LOGWARNING, "%s - failed to create add-on %s, status = %d", __FUNCTION__, (*it)->Name().c_str(), status);
-          if (!addon.get() || !addon->DllLoaded() || status == ADDON_STATUS_PERMANENT_FAILURE)
-          {
-            // failed to load the dll of this add-on, disable it
-            CLog::Log(LOGWARNING, "%s - failed to load the dll for add-on %s, disabling it", __FUNCTION__, (*it)->Name().c_str());
-            disableAddons.push_back(*it);
-            bDisabled = true;
-          }
+          m_clientMap.insert(std::make_pair(iClientId, pvrclient));
+          m_addonNameIds.insert(make_pair(addon->ID(), iClientId));
         }
       }
 
-      if (bDisabled && (g_PVRManager.IsStarted() || g_PVRManager.IsInitialising()))
-        CGUIDialogOK::ShowAndGetInput(CVariant{24070}, CVariant{16029});
-    }
-  }
-
-  // disable add-ons that failed to initialise
-  if (!disableAddons.empty())
-  {
-    CSingleLock lock(m_critSection);
-    for (VECADDONS::iterator it = disableAddons.begin(); it != disableAddons.end(); ++it)
-    {
-      // disable in the add-on db
-      CAddonMgr::GetInstance().DisableAddon((*it)->ID());
-
-      // remove from the pvr add-on list
-      VECADDONS::iterator addonPtr = std::find(m_addons.begin(), m_addons.end(), *it);
-      if (addonPtr != m_addons.end())
-        m_addons.erase(addonPtr);
-    }
-  }
-
-  return bReturn;
-}
-
-void CPVRClients::Process(void)
-{
-  bool bCheckedEnabledClientsOnStartup(false);
-
-  CAddonMgr::GetInstance().RegisterAddonMgrCallback(ADDON_PVRDLL, this);
-  CAddonMgr::GetInstance().RegisterObserver(this);
-
-  UpdateAddons();
-
-  while (!g_application.m_bStop && !m_bStop)
-  {
-    UpdateAndInitialiseClients();
-
-    if (!bCheckedEnabledClientsOnStartup)
-    {
-      bCheckedEnabledClientsOnStartup = true;
-      if (!HasEnabledClients() && !m_bNoAddonWarningDisplayed)
+      if (status != ADDON_STATUS_OK)
       {
-        if (AutoconfigureClients())
-          m_bNoAddonWarningDisplayed = true;
-        else
-          ShowDialogNoClientsEnabled();
-      }
-      m_bRestartManagerOnAddonDisabled = true;
-    }
-    else
-    {
-      Sleep(1000);
-    }
-  }
-}
-
-bool CPVRClients::AutoconfigureClients(void)
-{
-  bool bReturn(false);
-  std::vector<PVR_CLIENT> autoConfigAddons;
-  PVR_CLIENT addon;
-
-  {
-    VECADDONS map;
-    CAddonMgr::GetInstance().GetDisabledAddons(map, ADDON_PVRDLL);
-
-    /** get the auto-configurable add-ons */
-    for (VECADDONS::iterator it = map.begin(); it != map.end(); ++it)
-    {
-      addon = std::dynamic_pointer_cast<CPVRClient>(*it);
-      if (addon->CanAutoconfigure())
-        autoConfigAddons.push_back(addon);
-    }
-  }
-
-  /** no configurable add-ons found */
-  if (autoConfigAddons.empty())
-    return bReturn;
-
-  /** display a progress bar while trying to auto-configure add-ons */
-  CGUIDialogExtendedProgressBar *loadingProgressDialog = (CGUIDialogExtendedProgressBar *)g_windowManager.GetWindow(WINDOW_DIALOG_EXT_PROGRESS);
-  CGUIDialogProgressBarHandle* progressHandle = loadingProgressDialog->GetHandle(g_localizeStrings.Get(19688)); // Scanning for PVR services
-  progressHandle->SetPercentage(0);
-  progressHandle->SetText(g_localizeStrings.Get(19688)); //Scanning for PVR services
-
-  /** start zeroconf and wait a second to get some responses */
-  CZeroconfBrowser::GetInstance()->Start();
-  for (std::vector<PVR_CLIENT>::iterator it = autoConfigAddons.begin(); !bReturn && it != autoConfigAddons.end(); ++it)
-    (*it)->AutoconfigureRegisterType();
-
-  unsigned iIterations(0);
-  float percentage(0.0f);
-  float percentageStep(100.0f / PVR_CLIENT_AVAHI_SCAN_ITERATIONS);
-  progressHandle->SetPercentage(percentage);
-
-  /** while no add-ons were configured within 20 iterations */
-  while (!bReturn && iIterations++ < PVR_CLIENT_AVAHI_SCAN_ITERATIONS)
-  {
-    /** check each disabled add-on */
-    for (std::vector<PVR_CLIENT>::iterator it = autoConfigAddons.begin(); !bReturn && it != autoConfigAddons.end(); ++it)
-    {
-      if (addon->Autoconfigure())
-      {
-        progressHandle->SetPercentage(100.0f);
-        progressHandle->MarkFinished();
-
-        /** enable the add-on */
-        CAddonMgr::GetInstance().EnableAddon((*it)->ID());
-        CSingleLock lock(m_critSection);
-        m_addons.push_back(*it);
-        bReturn = true;
+        CLog::Log(LOGERROR, "%s - failed to create add-on %s, status = %d", __FUNCTION__, addon->Name().c_str(), status);
+        if (status == ADDON_STATUS_PERMANENT_FAILURE)
+        {
+          CGUIDialogOK::ShowAndGetInput(CVariant{24070}, CVariant{16029});
+          CAddonMgr::GetInstance().DisableAddon(addon->ID());
+        }
       }
     }
-
-    /** wait a while and try again */
-    if (!bReturn)
-    {
-      percentage += percentageStep;
-      progressHandle->SetPercentage(percentage);
-      Sleep(PVR_CLIENT_AVAHI_SLEEP_TIME_MS);
-    }
-  }
-
-  progressHandle->SetPercentage(100.0f);
-  progressHandle->MarkFinished();
-  return bReturn;
-}
-
-void CPVRClients::ShowDialogNoClientsEnabled(void)
-{
-  if (!g_PVRManager.IsStarted() && !g_PVRManager.IsInitialising())
-    return;
-
-  CGUIDialogOK::ShowAndGetInput(CVariant{19240}, CVariant{19241});
-
-  std::vector<std::string> params;
-  params.push_back("addons://disabled/xbmc.pvrclient");
-  params.push_back("return");
-  g_windowManager.ActivateWindow(WINDOW_ADDON_BROWSER, params);
-}
-
-bool CPVRClients::UpdateAddons(void)
-{
-  VECADDONS addons;
-  PVR_CLIENT addon;
-  bool bReturn(CAddonMgr::GetInstance().GetAddons(addons, ADDON_PVRDLL));
-  size_t usableClients;
-  bool bDisable(false);
-
-  if (bReturn)
-  {
-    CSingleLock lock(m_critSection);
-    m_addons = addons;
-  }
-
-  usableClients = m_addons.size();
-
-  // handle "new" addons which aren't yet in the db - these have to be added first
-  for (VECADDONS::const_iterator it = addons.begin(); it != addons.end(); ++it)
-  {
-    if (RegisterClient(*it) < 0)
-      bDisable = true;
-    else
-    {
-      addon = std::dynamic_pointer_cast<CPVRClient>(*it);
-      bDisable = addon &&
-          addon->NeedsConfiguration() &&
-          addon->HasSettings() &&
-          !addon->HasUserSettings();
-    }
-
-    if (bDisable)
+    else if (!bEnabled && IsCreatedClient(addon))
     {
-      CLog::Log(LOGDEBUG, "%s - disabling add-on '%s'", __FUNCTION__, (*it)->Name().c_str());
-      CAddonMgr::GetInstance().DisableAddon((*it)->ID());
-      usableClients--;
+      StopClient(addon, false);
     }
   }
 
-  if ((!bReturn || usableClients == 0) && !m_bNoAddonWarningDisplayed &&
-      !CAddonMgr::GetInstance().HasInstalledAddons(ADDON_PVRDLL) &&
-      (g_PVRManager.IsStarted() || g_PVRManager.IsInitialising()))
-  {
-    // No PVR add-ons could be found
-    // You need a tuner, backend software, and an add-on for the backend to be able to use PVR.
-    // Please visit http://kodi.wiki/view/PVR to learn more.
-    m_bNoAddonWarningDisplayed = true;
-    CGUIDialogOK::ShowAndGetInput(CVariant{19271}, CVariant{19272});
-    CSettings::GetInstance().SetBool(CSettings::SETTING_PVRMANAGER_ENABLED, false);
-    CGUIMessage msg(GUI_MSG_UPDATE, WINDOW_SETTINGS_MYPVR, 0);
-    g_windowManager.SendThreadMessage(msg, WINDOW_SETTINGS_MYPVR);
-  }
-
-  return bReturn;
-}
-
-void CPVRClients::Notify(const Observable &obs, const ObservableMessage msg)
-{
-  if (msg == ObservableMessageAddons)
-    UpdateAddons();
+  g_PVRManager.Start();
 }
 
 bool CPVRClients::GetClient(const std::string &strId, AddonPtr &addon) const
@@ -1480,7 +1215,7 @@
 bool CPVRClients::SupportsTimers() const
 {
   PVR_CLIENTMAP clients;
-  GetConnectedClients(clients);
+  GetCreatedClients(clients);
 
   for (const auto &entry : clients)
   {
@@ -1493,90 +1228,90 @@
 bool CPVRClients::SupportsChannelGroups(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsChannelGroups();
+  return GetCreatedClient(iClientId, client) && client->SupportsChannelGroups();
 }
 
 bool CPVRClients::SupportsChannelScan(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsChannelScan();
+  return GetCreatedClient(iClientId, client) && client->SupportsChannelScan();
 }
 
 bool CPVRClients::SupportsChannelSettings(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsChannelSettings();
+  return GetCreatedClient(iClientId, client) && client->SupportsChannelSettings();
 }
 
 bool CPVRClients::SupportsEPG(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsEPG();
+  return GetCreatedClient(iClientId, client) && client->SupportsEPG();
 }
 
 bool CPVRClients::SupportsLastPlayedPosition(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsLastPlayedPosition();
+  return GetCreatedClient(iClientId, client) && client->SupportsLastPlayedPosition();
 }
 
 bool CPVRClients::SupportsRadio(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsRadio();
+  return GetCreatedClient(iClientId, client) && client->SupportsRadio();
 }
 
 bool CPVRClients::SupportsRecordings(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsRecordings();
+  return GetCreatedClient(iClientId, client) && client->SupportsRecordings();
 }
 
 bool CPVRClients::SupportsRecordingsUndelete(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsRecordingsUndelete();
+  return GetCreatedClient(iClientId, client) && client->SupportsRecordingsUndelete();
 }
 
 bool CPVRClients::SupportsRecordingPlayCount(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsRecordingPlayCount();
+  return GetCreatedClient(iClientId, client) && client->SupportsRecordingPlayCount();
 }
 
 bool CPVRClients::SupportsRecordingEdl(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsRecordingEdl();
+  return GetCreatedClient(iClientId, client) && client->SupportsRecordingEdl();
 }
 
 bool CPVRClients::SupportsTimers(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsTimers();
+  return GetCreatedClient(iClientId, client) && client->SupportsTimers();
 }
 
 bool CPVRClients::SupportsTV(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->SupportsTV();
+  return GetCreatedClient(iClientId, client) && client->SupportsTV();
 }
 
 bool CPVRClients::HandlesDemuxing(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->HandlesDemuxing();
+  return GetCreatedClient(iClientId, client) && client->HandlesDemuxing();
 }
 
 bool CPVRClients::HandlesInputStream(int iClientId) const
 {
   PVR_CLIENT client;
-  return GetConnectedClient(iClientId, client) && client->HandlesInputStream();
+  return GetCreatedClient(iClientId, client) && client->HandlesInputStream();
 }
 
 bool CPVRClients::GetPlayingClient(PVR_CLIENT &client) const
 {
-  return GetConnectedClient(GetPlayingClientID(), client);
+  return GetCreatedClient(GetPlayingClientID(), client);
 }
 
 bool CPVRClients::OpenStream(const CPVRChannelPtr &channel, bool bIsSwitchingChannel)
@@ -1588,7 +1323,7 @@
 
   /* try to open the stream on the client */
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->ClientID(), client) &&
+  if (GetCreatedClient(channel->ClientID(), client) &&
       client->OpenStream(channel, bIsSwitchingChannel))
   {
     CSingleLock lock(m_critSection);
@@ -1615,7 +1350,7 @@
 
   /* try to open the recording stream on the client */
   PVR_CLIENT client;
-  if (GetConnectedClient(channel->m_iClientId, client) &&
+  if (GetCreatedClient(channel->m_iClientId, client) &&
       client->OpenStream(channel))
   {
     CSingleLock lock(m_critSection);
@@ -1737,7 +1472,7 @@
   PVR_CLIENT client;
   std::string name;
 
-  if (GetConnectedClient(iClientId, client))
+  if (GetCreatedClient(iClientId, client))
   {
     name = client->GetBackendHostname();
   }
@@ -1800,3 +1535,83 @@
   return false;
 }
 
+void CPVRClients::ConnectionStateChange(int clientId, std::string &strConnectionString, PVR_CONNECTION_STATE newState,
+                                        std::string &strMessage)
+{
+  PVR_CLIENT client;
+  if (!GetClient(clientId, client))
+  {
+    CLog::Log(LOGDEBUG, "PVR - %s - invalid client id", __FUNCTION__);
+    return;
+  }
+
+  if (strConnectionString.empty())
+  {
+    CLog::Log(LOGERROR, "PVR - %s - invalid handler data", __FUNCTION__);
+    return;
+  }
+
+  int iMsg(-1);
+  bool bError(true);
+  bool bNotify(true);
+
+  switch (newState)
+  {
+    case PVR_CONNECTION_STATE_SERVER_UNREACHABLE:
+      iMsg = 35505; // Server is unreachable
+      break;
+    case PVR_CONNECTION_STATE_SERVER_MISMATCH:
+      iMsg = 35506; // Server does not respond properly
+      break;
+    case PVR_CONNECTION_STATE_VERSION_MISMATCH:
+      iMsg = 35507; // Server version is not compatible
+      break;
+    case PVR_CONNECTION_STATE_ACCESS_DENIED:
+      iMsg = 35508; // Access denied
+      break;
+    case PVR_CONNECTION_STATE_CONNECTED:
+      bError = false;
+      iMsg = 36034; // Connection established
+      if (client->GetPreviousConnectionState() == PVR_CONNECTION_STATE_UNKNOWN ||
+          client->GetPreviousConnectionState() == PVR_CONNECTION_STATE_CONNECTING)
+        bNotify = false;
+      break;
+    case PVR_CONNECTION_STATE_DISCONNECTED:
+      iMsg = 36030; // Connection lost
+      break;
+    case PVR_CONNECTION_STATE_CONNECTING:
+      bError = false;
+      iMsg = 35509; // Connecting
+      bNotify = false;
+      break;
+    default:
+      CLog::Log(LOGERROR, "PVR - %s - unknown connection state", __FUNCTION__);
+      return;
+  }
+
+  // Use addon-supplied message, if present
+  std::string strMsg;
+  if (!strMessage.empty())
+    strMsg = strMessage;
+  else
+    strMsg = g_localizeStrings.Get(iMsg);
+
+  // Notify user.
+  if (bNotify && !CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_HIDECONNECTIONLOSTWARNING))
+    CGUIDialogKaiToast::QueueNotification(bError ? CGUIDialogKaiToast::Error : CGUIDialogKaiToast::Info, client->Name().c_str(),
+                                          strMsg, 5000, true);
+
+  // Write event log entry.
+  CEventLog::GetInstance().Add(EventPtr(new CNotificationEvent(client->Name(), strMsg, client->Icon(),
+                                                               bError ? EventLevel::Error : EventLevel::Information)));
+
+  if (newState == PVR_CONNECTION_STATE_CONNECTED)
+  {
+    // update properties on connect
+    if (!client->GetAddonProperties())
+    {
+      CLog::Log(LOGERROR, "PVR - %s - error reading properties", __FUNCTION__);
+    }
+    g_PVRManager.Start();
+  }
+}

_service:download_url:master.tar.gz/xbmc/pvr/addons/PVRClients.h Changed

@@ -19,7 +19,6 @@
  *
  */
 
-#include "addons/AddonDatabase.h"
 #include "threads/CriticalSection.h"
 #include "threads/Thread.h"
 #include "utils/Observer.h"
@@ -27,7 +26,7 @@
 #include "pvr/channels/PVRChannel.h"
 #include "pvr/recordings/PVRRecording.h"
 
-#include "PVRClient.h"
+#include "addons/PVRClient.h"
 
 #include <deque>
 #include <vector>
@@ -63,10 +62,9 @@
     long long   diskTotal = 0;
   };
 
-  class CPVRClients : public ADDON::IAddonMgrCallback,
-                      public Observer,
-                      private CThread
+  class CPVRClients : public ADDON::IAddonMgrCallback
   {
+  friend class CPVRClient;
   public:
     CPVRClients(void);
     virtual ~CPVRClients(void);
@@ -79,14 +77,10 @@
     bool IsInUse(const std::string& strAddonId) const;
 
     /*!
-     * @brief Start the backend info updater thread.
+     * @brief Start the backend.
      */
     void Start(void);
 
-    /*!
-     * @brief Stop the backend info updater thread.
-     */
-    void Stop(void);
 
     /*! @name Backend methods */
     //@{
@@ -96,9 +90,9 @@
      * @param iClientId The client ID.
      * @return True when the client ID is valid and connected, false otherwise.
      */
-    bool IsConnectedClient(int iClientId) const;
+    bool IsCreatedClient(int iClientId) const;
 
-    bool IsConnectedClient(const ADDON::AddonPtr addon);
+    bool IsCreatedClient(const ADDON::AddonPtr addon);
 
     /*!
      * @brief Restart a single client add-on.
@@ -146,13 +140,13 @@
     /*!
      * @return The amount of connected clients.
      */
-    int ConnectedClientAmount(void) const;
+    int CreatedClientAmount(void) const;
 
     /*!
      * @brief Check whether there are any connected clients.
      * @return True if at least one client is connected.
      */
-    bool HasConnectedClients(void) const;
+    bool HasCreatedClients(void) const;
 
     /*!
      * @brief Get the friendly name for the client with the given id.
@@ -655,8 +649,6 @@
 
     //@}
 
-    void Notify(const Observable &obs, const ObservableMessage msg);
-
     bool GetClient(const std::string &strId, ADDON::AddonPtr &addon) const;
 
     bool SupportsChannelScan(int iClientId) const;
@@ -679,22 +671,19 @@
     time_t GetBufferTimeStart() const;
     time_t GetBufferTimeEnd() const;
 
-    /**
-     * Called by OnEnable() and OnDisable() to check if the manager should be restarted
-     * @return True if it should be restarted, false otherwise
-     */
-    bool RestartManagerOnAddonDisabled(void) const { return m_bRestartManagerOnAddonDisabled; }
 
     int GetClientId(const std::string& strId) const;
 
     bool IsRealTimeStream() const;
 
+    void ConnectionStateChange(int clientId, std::string &strConnectionString, PVR_CONNECTION_STATE newState,
+                               std::string &strMessage);
+
   private:
     /*!
      * @brief Update add-ons from the AddonManager
-     * @return True when updated, false otherwise
      */
-    bool UpdateAddons(void);
+    void UpdateAddons(void);
 
     /*!
      * @brief Get the menu hooks for a client.
@@ -705,16 +694,6 @@
     bool GetMenuHooks(int iClientID, PVR_MENUHOOK_CAT cat, PVR_MENUHOOKS *hooks);
 
     /*!
-     * @brief Updates the backend information
-     */
-    void Process(void);
-
-    /*!
-     * @brief Show a dialog to guide new users who have no clients enabled.
-     */
-    void ShowDialogNoClientsEnabled(void);
-
-    /*!
      * @brief Get the instance of the client.
      * @param iClientId The id of the client to get.
      * @param addon The client.
@@ -723,19 +702,19 @@
     bool GetClient(int iClientId, PVR_CLIENT &addon) const;
 
     /*!
-     * @brief Get the instance of the client, if it's connected.
+     * @brief Get the instance of the client, if it's created.
      * @param iClientId The id of the client to get.
      * @param addon The client.
      * @return True if the client is connected, false otherwise.
      */
-    bool GetConnectedClient(int iClientId, PVR_CLIENT &addon) const;
+    bool GetCreatedClient(int iClientId, PVR_CLIENT &addon) const;
 
     /*!
-     * @bried Get all connected clients.
+     * @bried Get all created clients.
      * @param clients Store the active clients in this map.
      * @return The amount of added clients.
      */
-    int GetConnectedClients(PVR_CLIENTMAP &clients) const;
+    int GetCreatedClients(PVR_CLIENTMAP &clients) const;
 
     /*!
      * @brief Check whether a client is registered.
@@ -744,27 +723,9 @@
      */
     bool IsKnownClient(const ADDON::AddonPtr client) const;
 
-    /*!
-     * @brief Check whether there are any new pvr add-ons enabled or whether any of the known clients has been disabled.
-     * @param bInitialiseAllClients True to initialise all clients, false to only initialise new clients.
-     * @return True if all clients were updated successfully, false otherwise.
-     */
-    bool UpdateAndInitialiseClients(bool bInitialiseAllClients = false);
-
-    /*!
-     * @brief Initialise and connect a client.
-     * @param client The client to initialise.
-     * @return The id of the client if it was created or found in the existing client map, -1 otherwise.
-     */
-    int RegisterClient(ADDON::AddonPtr client);
 
     int GetClientId(const ADDON::AddonPtr client) const;
 
-    /*!
-     * Try to automatically configure clients
-     * @return True when at least one was configured
-     */
-    bool AutoconfigureClients(void);
 
     bool                  m_bChannelScanRunning;      /*!< true when a channel scan is currently running, false otherwise */
     bool                  m_bIsSwitchingChannels;        /*!< true while switching channels */
@@ -772,12 +733,8 @@
     bool                  m_bIsPlayingLiveTV;
     bool                  m_bIsPlayingRecording;
     std::string           m_strPlayingClientName;     /*!< the name client that is currenty playing a stream or an empty string if nothing is playing */
-    ADDON::VECADDONS      m_addons;
     PVR_CLIENTMAP         m_clientMap;                /*!< a map of all known clients */
-    bool                  m_bNoAddonWarningDisplayed; /*!< true when a warning was displayed that no add-ons were found, false otherwise */
     CCriticalSection      m_critSection;
-    std::map<int, time_t> m_connectionAttempts;       /*!< last connection attempt per add-on */
-    bool                  m_bRestartManagerOnAddonDisabled; /*!< true to restart the manager when an add-on is enabled/disabled */
     std::map<std::string, int> m_addonNameIds; /*!< map add-on names to IDs */
   };
 }

_service:download_url:master.tar.gz/xbmc/pvr/channels/PVRChannelGroup.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp Changed

@@ -30,7 +30,6 @@
 
 #include "pvr/PVRManager.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
-#include "pvr/timers/PVRTimers.h"
 #include "pvr/timers/PVRTimerInfoTag.h"
 #include "pvr/windows/GUIWindowPVRBase.h"
 
@@ -50,7 +49,6 @@
 
 CGUIDialogPVRGuideInfo::CGUIDialogPVRGuideInfo(void)
     : CGUIDialog(WINDOW_DIALOG_PVR_GUIDE_INFO, "DialogPVRInfo.xml")
-    , m_progItem(new CFileItem)
 {
 }
 
@@ -63,7 +61,7 @@
   bool bReturn = false;
 
   CFileItemPtr item(new CFileItem(tag));
-  bReturn = CGUIWindowPVRBase::AddTimer(item.get(), false);
+  bReturn = CGUIWindowPVRBase::AddTimer(item.get());
 
   if (bReturn)
     Close();
@@ -107,8 +105,7 @@
   {
     bReturn = true;
 
-    const CEpgInfoTagPtr tag(m_progItem->GetEPGInfoTag());
-    if (!tag || !tag->HasPVRChannel())
+    if (!m_progItem || !m_progItem->HasPVRChannel())
     {
       /* invalid channel */
       CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19067});
@@ -116,13 +113,11 @@
       return bReturn;
     }
 
-    CFileItemPtr timerTag = g_PVRTimers->GetTimerForEpgTag(m_progItem.get());
-    bool bHasTimer = timerTag != NULL && timerTag->HasPVRTimerInfoTag();
-
-    if (!bHasTimer)
-      ActionStartTimer(tag);
+    CPVRTimerInfoTagPtr timerTag = m_progItem->Timer();
+    if (timerTag)
+      ActionCancelTimer(CFileItemPtr(new CFileItem(timerTag)));
     else
-      ActionCancelTimer(timerTag);
+      ActionStartTimer(m_progItem);
   }
 
   return bReturn;
@@ -136,15 +131,14 @@
   {
     Close();
     PlayBackRet ret = PLAYBACK_CANCELED;
-    CEpgInfoTagPtr epgTag(m_progItem->GetEPGInfoTag());
 
-    if (epgTag)
+    if (m_progItem)
     {
-      if (message.GetSenderId() == CONTROL_BTN_PLAY_RECORDING && epgTag->HasRecording())
-        ret = g_application.PlayFile(CFileItem(epgTag->Recording()), "videoplayer");
-      else if (epgTag->HasPVRChannel())
+      if (message.GetSenderId() == CONTROL_BTN_PLAY_RECORDING && m_progItem->HasRecording())
+        ret = g_application.PlayFile(CFileItem(m_progItem->Recording()), "videoplayer");
+      else if (m_progItem->HasPVRChannel())
       {
-        CPVRChannelPtr channel = epgTag->ChannelTag();
+        CPVRChannelPtr channel = m_progItem->ChannelTag();
         // try a fast switch
         bool bSwitchSuccessful = false;
         if ((g_PVRManager.IsPlayingTV() || g_PVRManager.IsPlayingRadio()) &&
@@ -172,16 +166,15 @@
 
   if (message.GetSenderId() == CONTROL_BTN_FIND)
   {
-    const CEpgInfoTagPtr tag(m_progItem->GetEPGInfoTag());
-    if (tag && tag->HasPVRChannel())
+    if (m_progItem && m_progItem->HasPVRChannel())
     {
-      int windowSearchId = tag->ChannelTag()->IsRadio() ? WINDOW_RADIO_SEARCH : WINDOW_TV_SEARCH;
+      int windowSearchId = m_progItem->ChannelTag()->IsRadio() ? WINDOW_RADIO_SEARCH : WINDOW_TV_SEARCH;
       CGUIWindowPVRBase *windowSearch = (CGUIWindowPVRBase*) g_windowManager.GetWindow(windowSearchId);
       if (windowSearch)
       {
         Close();
         g_windowManager.ActivateWindow(windowSearchId);
-        bReturn = windowSearch->OnContextButton(*m_progItem.get(), CONTEXT_BUTTON_FIND);
+        bReturn = windowSearch->OnContextButton(CFileItem(m_progItem), CONTEXT_BUTTON_FIND);
       }
     }
   }
@@ -203,48 +196,53 @@
   return CGUIDialog::OnMessage(message);
 }
 
-void CGUIDialogPVRGuideInfo::SetProgInfo(const CFileItem *item)
+bool CGUIDialogPVRGuideInfo::OnInfo(int actionID)
+{
+  Close();
+  return true;
+}
+
+void CGUIDialogPVRGuideInfo::SetProgInfo(const EPG::CEpgInfoTagPtr &tag)
 {
-  *m_progItem = *item;
+  m_progItem = tag;
 }
 
 CFileItemPtr CGUIDialogPVRGuideInfo::GetCurrentListItem(int offset)
 {
-  return m_progItem;
+  return CFileItemPtr(new CFileItem(m_progItem));
 }
 
 void CGUIDialogPVRGuideInfo::OnInitWindow()
 {
   CGUIDialog::OnInitWindow();
 
-  const CEpgInfoTagPtr tag(m_progItem->GetEPGInfoTag());
-  if (!tag)
+  if (!m_progItem)
   {
     /* no epg event selected */
     return;
   }
 
-  if (!tag->HasRecording())
+  if (!m_progItem->HasRecording())
   {
     /* not recording. hide the play recording button */
     SET_CONTROL_HIDDEN(CONTROL_BTN_PLAY_RECORDING);
   }
 
   bool bHideRecord(true);
-  if (tag->HasTimer())
+  if (m_progItem->HasTimer())
   {
-    if (tag->Timer()->IsRecording())
+    if (m_progItem->Timer()->IsRecording())
     {
       SET_CONTROL_LABEL(CONTROL_BTN_RECORD, 19059); /* Stop recording */
       bHideRecord = false;
     }
-    else if (tag->Timer()->HasTimerType() && !tag->Timer()->GetTimerType()->IsReadOnly())
+    else if (m_progItem->Timer()->HasTimerType() && !m_progItem->Timer()->GetTimerType()->IsReadOnly())
     {
       SET_CONTROL_LABEL(CONTROL_BTN_RECORD, 19060); /* Delete timer */
       bHideRecord = false;
     }
   }
-  else if (tag->EndAsLocalTime() > CDateTime::GetCurrentDateTime())
+  else if (m_progItem->EndAsLocalTime() > CDateTime::GetCurrentDateTime())
   {
     SET_CONTROL_LABEL(CONTROL_BTN_RECORD, 264);     /* Record */
     bHideRecord = false;

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp Changed

_service:download_url:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecording.cpp Changed

@@ -114,6 +114,34 @@
   m_bIsDeleted                     = recording.bIsDeleted;
   m_iEpgEventId                    = recording.iEpgEventId;
   m_iChannelUid                    = recording.iChannelUid;
+
+  //  As the channel a recording was done on (probably long time ago) might no longer be
+  //  available today prefer addon-supplied channel type (tv/radio) over channel attribute.
+  if (recording.channelType != PVR_RECORDING_CHANNEL_TYPE_UNKNOWN)
+  {
+    m_bRadio = recording.channelType == PVR_RECORDING_CHANNEL_TYPE_RADIO;
+  }
+  else
+  {
+    const CPVRChannelPtr channel(Channel());
+    if (channel)
+    {
+      m_bRadio = channel->IsRadio();
+    }
+    else
+    {
+      bool bSupportsRadio(g_PVRClients->SupportsRadio(m_iClientId));
+      if (bSupportsRadio && g_PVRClients->SupportsTV(m_iClientId))
+      {
+        CLog::Log(LOGWARNING,"CPVRRecording::CPVRRecording - unable to determine channel type. Defaulting to TV.");
+        m_bRadio = false; // Assume TV.
+      }
+      else
+      {
+        m_bRadio = bSupportsRadio;
+      }
+    }
+  }
 }
 
 bool CPVRRecording::operator ==(const CPVRRecording& right) const
@@ -142,7 +170,8 @@
        m_iRecordingId       == right.m_iRecordingId &&
        m_bIsDeleted         == right.m_bIsDeleted &&
        m_iEpgEventId        == right.m_iEpgEventId &&
-       m_iChannelUid        == right.m_iChannelUid);
+       m_iChannelUid        == right.m_iChannelUid &&
+       m_bRadio             == right.m_bRadio);
 }
 
 bool CPVRRecording::operator !=(const CPVRRecording& right) const
@@ -166,6 +195,7 @@
   value["deleted"] = m_bIsDeleted;
   value["epgevent"] = m_iEpgEventId;
   value["channeluid"] = m_iChannelUid;
+  value["radio"] = m_bRadio;
 
   if (!value.isMember("art"))
     value["art"] = CVariant(CVariant::VariantTypeObject);
@@ -195,6 +225,7 @@
   m_iSeason            = -1;
   m_iEpisode           = -1;
   m_iChannelUid        = PVR_CHANNEL_INVALID_UID;
+  m_bRadio             = false;
 
   m_recordingTime.Reset();
   CVideoInfoTag::Reset();
@@ -374,6 +405,7 @@
   m_bIsDeleted        = tag.m_bIsDeleted;
   m_iEpgEventId       = tag.m_iEpgEventId;
   m_iChannelUid       = tag.m_iChannelUid;
+  m_bRadio            = tag.m_bRadio;
 
   if (g_PVRClients->SupportsRecordingPlayCount(m_iClientId))
     m_playCount       = tag.m_playCount;
@@ -416,7 +448,7 @@
   else
   {
     m_strFileNameAndPath = CPVRRecordingsPath(
-      m_bIsDeleted, m_strDirectory, m_strTitle, m_iSeason, m_iEpisode, m_iYear, m_strShowTitle, m_strChannelName, m_recordingTime);
+      m_bIsDeleted, m_bRadio, m_strDirectory, m_strTitle, m_iSeason, m_iEpisode, m_iYear, m_strShowTitle, m_strChannelName, m_recordingTime);
   }
 }

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecording.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecordings.cpp Changed

@@ -39,7 +39,10 @@
     m_bIsUpdating(false),
     m_iLastId(0),
     m_bGroupItems(true),
-    m_bHasDeleted(false)
+    m_bDeletedTVRecordings(false),
+    m_bDeletedRadioRecordings(false),
+    m_iTVRecordings(0),
+    m_iRadioRecordings(0)
 {
   m_database.Open();
 }
@@ -86,6 +89,7 @@
   // Only active recordings are fetched to provide sub directories.
   // Not applicable for deleted view which is supposed to be flattened.
   std::set<CFileItemPtr> unwatchedFolders;
+  bool bRadio = recParentPath.IsRadio();
 
   for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
   {
@@ -93,6 +97,9 @@
     if (current->IsDeleted())
       continue;
 
+    if (current->IsRadio() != bRadio)
+      continue;
+
     const std::string strCurrent = recParentPath.GetSubDirectoryPath(current->m_strDirectory);
     if (strCurrent.empty())
       continue;
@@ -119,9 +126,9 @@
     }
     else
     {
-      pFileItem=results->Get(strFilePath);
+      pFileItem = results->Get(strFilePath);
       if (pFileItem->m_dateTime<current->RecordingTimeAsLocalTime())
-        pFileItem->m_dateTime  = current->RecordingTimeAsLocalTime();
+        pFileItem->m_dateTime = current->RecordingTimeAsLocalTime();
     }
 
     if (current->m_playCount == 0)
@@ -164,34 +171,28 @@
   NotifyObservers(ObservableMessageRecordings);
 }
 
-int CPVRRecordings::GetNumRecordings()
+int CPVRRecordings::GetNumTVRecordings() const
 {
   CSingleLock lock(m_critSection);
-  return m_recordings.size();
+  return m_iTVRecordings;
 }
 
-bool CPVRRecordings::HasDeletedRecordings()
+bool CPVRRecordings::HasDeletedTVRecordings() const
 {
   CSingleLock lock(m_critSection);
-  return m_bHasDeleted;
+  return m_bDeletedTVRecordings;
 }
 
-int CPVRRecordings::GetRecordings(CFileItemList* results, bool bDeleted)
+int CPVRRecordings::GetNumRadioRecordings() const
 {
   CSingleLock lock(m_critSection);
+  return m_iRadioRecordings;
+}
 
-  int iRecCount = 0;
-  for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
-  {
-    if (it->second->IsDeleted() != bDeleted)
-      continue;
-
-    CFileItemPtr pFileItem(new CFileItem(it->second));
-    results->Add(pFileItem);
-    iRecCount++;
-  }
-
-  return iRecCount;
+bool CPVRRecordings::HasDeletedRadioRecordings() const
+{
+  CSingleLock lock(m_critSection);
+  return m_bDeletedRadioRecordings;
 }
 
 bool CPVRRecordings::Delete(const CFileItem& item)
@@ -330,8 +331,10 @@
     {
       CPVRRecordingPtr current = it->second;
 
-      // skip items that are not members of the target directory
-      if (!IsDirectoryMember(strDirectory, current->m_strDirectory) || current->IsDeleted() != recPath.IsDeleted())
+      // Omit recordings not matching criteria
+      if (!IsDirectoryMember(strDirectory, current->m_strDirectory) ||
+          current->IsDeleted() != recPath.IsDeleted() ||
+          current->IsRadio() != recPath.IsRadio())
         continue;
 
       if (m_database.IsOpen())
@@ -410,13 +413,15 @@
   CPVRRecordingsPath recPath(path);
   if (recPath.IsValid())
   {
-    // Check directory name is for deleted recordings
     bool bDeleted = recPath.IsDeleted();
+    bool bRadio   = recPath.IsRadio();
 
     for (PVR_RECORDINGMAP_CITR it = m_recordings.begin(); it != m_recordings.end(); it++)
     {
       CPVRRecordingPtr current = it->second;
-      if (!URIUtils::PathEquals(path, current->m_strFileNameAndPath) || bDeleted != current->IsDeleted())
+      // Omit recordings not matching criteria
+      if (!URIUtils::PathEquals(path, current->m_strFileNameAndPath) ||
+          bDeleted != current->IsDeleted() || bRadio != current->IsRadio())
         continue;
 
       CFileItemPtr fileItem(new CFileItem(current));
@@ -442,7 +447,10 @@
 void CPVRRecordings::Clear()
 {
   CSingleLock lock(m_critSection);
-  m_bHasDeleted = false;
+  m_bDeletedTVRecordings = false;
+  m_bDeletedRadioRecordings = false;
+  m_iTVRecordings = 0;
+  m_iRadioRecordings = 0;
   m_recordings.clear();
 }
 
@@ -451,7 +459,12 @@
   CSingleLock lock(m_critSection);
 
   if (tag->IsDeleted())
-    m_bHasDeleted = true;
+  {
+    if (tag->IsRadio())
+      m_bDeletedRadioRecordings = true;
+    else
+      m_bDeletedTVRecordings = true;
+  }
 
   CPVRRecordingPtr newTag = GetById(tag->m_iClientId, tag->m_strRecordingId);
   if (newTag)
@@ -474,6 +487,10 @@
     }
     newTag->m_iRecordingId = ++m_iLastId;
     m_recordings.insert(std::make_pair(CPVRRecordingUid(newTag->m_iClientId, newTag->m_strRecordingId), newTag));
+    if (newTag->IsRadio())
+      m_iRadioRecordings++;
+    else
+      m_iTVRecordings++;
   }
 }

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecordings.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecordingsPath.cpp Changed

@@ -27,21 +27,25 @@
 
 using namespace PVR;
 
-const std::string CPVRRecordingsPath::PATH_RECORDINGS         = "pvr://recordings/";
-const std::string CPVRRecordingsPath::PATH_ACTIVE_RECORDINGS  = "pvr://recordings/active/";
-const std::string CPVRRecordingsPath::PATH_DELETED_RECORDINGS = "pvr://recordings/deleted/";
+const std::string CPVRRecordingsPath::PATH_RECORDINGS               = "pvr://recordings/";
+const std::string CPVRRecordingsPath::PATH_ACTIVE_TV_RECORDINGS     = "pvr://recordings/tv/active/";
+const std::string CPVRRecordingsPath::PATH_ACTIVE_RADIO_RECORDINGS  = "pvr://recordings/radio/active/";
+const std::string CPVRRecordingsPath::PATH_DELETED_TV_RECORDINGS    = "pvr://recordings/tv/deleted/";
+const std::string CPVRRecordingsPath::PATH_DELETED_RADIO_RECORDINGS = "pvr://recordings/radio/deleted/";
 
 CPVRRecordingsPath::CPVRRecordingsPath(const std::string &strPath)
 {
   std::string strVarPath(TrimSlashes(strPath));
   const std::vector<std::string> segments = URIUtils::SplitPath(strVarPath);
 
-  m_bValid  = ((segments.size() >= 3) && // at least pvr://recordings/[active|deleted]
+  m_bValid  = ((segments.size() >= 4) && // at least pvr://recordings/[tv|radio]/[active|deleted]
                StringUtils::StartsWith(strVarPath, "pvr://") &&
                (segments.at(1) == "recordings") &&
-               ((segments.at(2) == "active") || (segments.at(2) == "deleted")));
-  m_bRoot   = (m_bValid && (segments.size() == 3));
-  m_bActive = (m_bValid && (segments.at(2) == "active"));
+               ((segments.at(2) == "tv") || (segments.at(2) == "radio")) &&
+               ((segments.at(3) == "active") || (segments.at(3) == "deleted")));
+  m_bRoot   = (m_bValid && (segments.size() == 4));
+  m_bRadio  = (m_bValid && (segments.at(2) == "radio"));
+  m_bActive = (m_bValid && (segments.at(3) == "active"));
 
   if (m_bRoot)
     strVarPath.append("/");
@@ -49,10 +53,10 @@
   {
     size_t paramStart = m_path.find(", TV");
     if (paramStart == std::string::npos)
-      m_directoryPath = strVarPath.substr(m_bActive ? PATH_ACTIVE_RECORDINGS.size() : PATH_DELETED_RECORDINGS.size());
+      m_directoryPath = strVarPath.substr(GetDirectoryPathPosition());
     else
     {
-      size_t dirStart = m_bActive ? PATH_ACTIVE_RECORDINGS.size() : PATH_DELETED_RECORDINGS.size();
+      size_t dirStart = GetDirectoryPathPosition();
       m_directoryPath = strVarPath.substr(dirStart, paramStart - dirStart);
       m_params = strVarPath.substr(paramStart);
     }
@@ -61,22 +65,24 @@
   m_path = strVarPath;
 }
 
-CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted)
+CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted, bool bRadio)
 : m_bValid(true),
   m_bRoot(true),
   m_bActive(!bDeleted),
-  m_path(StringUtils::Format("pvr://recordings/%s/", bDeleted ? "deleted" : "active"))
+  m_bRadio(bRadio),
+  m_path(StringUtils::Format("pvr://recordings/%s/%s/", bRadio ? "radio" : "tv", bDeleted ? "deleted" : "active"))
 {
 }
 
-CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted,
+CPVRRecordingsPath::CPVRRecordingsPath(bool bDeleted, bool bRadio,
                        const std::string &strDirectory, const std::string &strTitle,
                        int iSeason, int iEpisode, int iYear,
                        const std::string &strSubtitle, const std::string &strChannelName,
                        const CDateTime &recordingTime)
 : m_bValid(true),
   m_bRoot(false),
-  m_bActive(!bDeleted)
+  m_bActive(!bDeleted),
+  m_bRadio(bRadio)
 {
   std::string strDirectoryN(TrimSlashes(strDirectory));
   if (!strDirectoryN.empty())
@@ -111,7 +117,7 @@
                                         strDirectoryN.c_str(), strTitleN.c_str(), strSeasonEpisodeN.c_str(),
                                         strYearN.c_str(), strSubtitleN.c_str());
   m_params = StringUtils::Format(", TV%s, %s.pvr", strChannelNameN.c_str(), recordingTime.GetAsSaveString().c_str());
-  m_path   = StringUtils::Format("pvr://recordings/%s/%s%s", bDeleted ? "deleted" : "active", m_directoryPath.c_str(), m_params.c_str());
+  m_path   = StringUtils::Format("pvr://recordings/%s/%s/%s%s", bRadio ? "radio" : "tv", bDeleted ? "deleted" : "active", m_directoryPath.c_str(), m_params.c_str());
 }
 
 std::string CPVRRecordingsPath::GetSubDirectoryPath(const std::string &strPath) const
@@ -196,3 +202,22 @@
 
   return strTrimmed;
 }
+
+size_t CPVRRecordingsPath::GetDirectoryPathPosition() const
+{
+  if (m_bActive)
+  {
+    if (m_bRadio)
+      return PATH_ACTIVE_RADIO_RECORDINGS.size();
+    else
+      return PATH_ACTIVE_TV_RECORDINGS.size();
+  }
+  else
+  {
+    if (m_bRadio)
+      return PATH_DELETED_RADIO_RECORDINGS.size();
+    else
+      return PATH_DELETED_TV_RECORDINGS.size();
+  }
+  // unreachable
+}
\ No newline at end of file

_service:download_url:master.tar.gz/xbmc/pvr/recordings/PVRRecordingsPath.h Changed

@@ -29,12 +29,14 @@
   {
   public:
     static const std::string PATH_RECORDINGS;
-    static const std::string PATH_ACTIVE_RECORDINGS;
-    static const std::string PATH_DELETED_RECORDINGS;
+    static const std::string PATH_ACTIVE_TV_RECORDINGS;
+    static const std::string PATH_ACTIVE_RADIO_RECORDINGS;
+    static const std::string PATH_DELETED_TV_RECORDINGS;
+    static const std::string PATH_DELETED_RADIO_RECORDINGS;
 
     CPVRRecordingsPath(const std::string &strPath);
-    CPVRRecordingsPath(bool bDeleted);
-    CPVRRecordingsPath(bool bDeleted,
+    CPVRRecordingsPath(bool bDeleted, bool bRadio);
+    CPVRRecordingsPath(bool bDeleted, bool bRadio,
                        const std::string &strDirectory, const std::string &strTitle,
                        int iSeason, int iEpisode, int iYear,
                        const std::string &strSubtitle, const std::string &strChannelName,
@@ -48,6 +50,8 @@
     bool IsRecordingsRoot() const { return m_bRoot; }
     bool IsActive() const { return m_bActive; }
     bool IsDeleted() const { return !IsActive(); }
+    bool IsRadio() const { return m_bRadio; }
+    bool IsTV() const { return !IsRadio(); }
     std::string GetDirectoryPath() const { return m_directoryPath; }
     std::string GetSubDirectoryPath(const std::string &strPath) const;
 
@@ -56,10 +60,12 @@
 
   private:
     static std::string TrimSlashes(const std::string &strString);
+    size_t GetDirectoryPathPosition() const;
 
     bool m_bValid;
     bool m_bRoot;
     bool m_bActive;
+    bool m_bRadio;
     std::string m_directoryPath;
     std::string m_params;
     std::string m_path;

_service:download_url:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.cpp Changed

@@ -171,6 +171,7 @@
   }
 
   UpdateSummary();
+  UpdateEpgInfoTag();
 }
 
 bool CPVRTimerInfoTag::operator ==(const CPVRTimerInfoTag& right) const
@@ -346,6 +347,13 @@
     iTimerDelta;
 }
 
+void CPVRTimerInfoTag::UpdateEpgInfoTag(void)
+{
+  CSingleLock lock(m_critSection);
+  m_epgTag.reset();
+  GetEpgInfoTag();
+}
+
 void CPVRTimerInfoTag::UpdateSummary(void)
 {
   CSingleLock lock(m_critSection);
@@ -633,6 +641,8 @@
   if (m_strSummary.empty())
     UpdateSummary();
 
+  UpdateEpgInfoTag();
+
   return true;
 }
 
@@ -739,7 +749,66 @@
   return false;
 }
 
-CPVRTimerInfoTagPtr CPVRTimerInfoTag::CreateFromEpg(const CEpgInfoTagPtr &tag, bool bRepeating /* = false */)
+CPVRTimerInfoTagPtr CPVRTimerInfoTag::CreateInstantTimerTag(const CPVRChannelPtr &channel)
+{
+  if (!channel)
+  {
+    CLog::Log(LOGERROR, "%s - no channel set", __FUNCTION__);
+    return CPVRTimerInfoTagPtr();
+  }
+
+  CEpgInfoTagPtr epgTag(channel->GetEPGNow());
+  CPVRTimerInfoTagPtr newTimer;
+  if (epgTag)
+    newTimer = CreateFromEpg(epgTag);
+
+  if (!newTimer)
+  {
+    newTimer.reset(new CPVRTimerInfoTag);
+
+    newTimer->m_iClientIndex       = PVR_TIMER_NO_CLIENT_INDEX;
+    newTimer->m_iParentClientIndex = PVR_TIMER_NO_PARENT;
+    newTimer->m_channel            = channel;
+    newTimer->m_strTitle           = channel->ChannelName();
+    newTimer->m_iChannelNumber     = channel->ChannelNumber();
+    newTimer->m_iClientChannelUid  = channel->UniqueID();
+    newTimer->m_iClientId          = channel->ClientID();
+    newTimer->m_bIsRadio           = channel->IsRadio();
+
+    // timertype: manual one-shot timer for given client
+    CPVRTimerTypePtr timerType(CPVRTimerType::CreateFromAttributes(
+      PVR_TIMER_TYPE_IS_MANUAL, PVR_TIMER_TYPE_IS_REPEATING | PVR_TIMER_TYPE_FORBIDS_NEW_INSTANCES, channel->ClientID()));
+    if (!timerType)
+    {
+      CLog::Log(LOGERROR, "%s - unable to create one shot manual timer type", __FUNCTION__);
+      return CPVRTimerInfoTagPtr();
+    }
+
+    newTimer->SetTimerType(timerType);
+  }
+
+  // no matter the timer was created from an epg tag, set special instant timer start and end times.
+  CDateTime startTime(0);
+  newTimer->SetStartFromUTC(startTime);
+  newTimer->m_iMarginStart = 0; /* set the start margin to 0 for instant timers */
+
+  int iDuration = CSettings::GetInstance().GetInt(CSettings::SETTING_PVRRECORD_INSTANTRECORDTIME);
+  CDateTime endTime = CDateTime::GetUTCDateTime() + CDateTimeSpan(0, 0, iDuration ? iDuration : 120, 0);
+  newTimer->SetEndFromUTC(endTime);
+
+  /* update summary string according to changed start/end time */
+  newTimer->UpdateSummary();
+
+  /* set epg tag at timer & timer at epg tag */
+  newTimer->UpdateEpgInfoTag();
+
+  /* unused only for reference */
+  newTimer->m_strFileNameAndPath = CPVRTimersPath::PATH_NEW;
+
+  return newTimer;
+}
+
+CPVRTimerInfoTagPtr CPVRTimerInfoTag::CreateFromEpg(const CEpgInfoTagPtr &tag, bool bCreateRule /* = false */)
 {
   /* create a new timer */
   CPVRTimerInfoTagPtr newTag(new CPVRTimerInfoTag());
@@ -753,7 +822,7 @@
   }
 
   /* check if the epg end date is in the future */
-  if (tag->EndAsLocalTime() < CDateTime::GetCurrentDateTime() && !bRepeating)
+  if (tag->EndAsLocalTime() < CDateTime::GetCurrentDateTime() && !bCreateRule)
   {
     CLog::Log(LOGERROR, "%s - end time is in the past", __FUNCTION__);
     return CPVRTimerInfoTagPtr();
@@ -775,7 +844,7 @@
   newTag->SetEndFromUTC(newEnd);
 
   CPVRTimerTypePtr timerType;
-  if (bRepeating)
+  if (bCreateRule)
   {
     // create repeating epg-based timer
     timerType = CPVRTimerType::CreateFromAttributes(
@@ -797,6 +866,7 @@
 
   newTag->SetTimerType(timerType);
   newTag->UpdateSummary();
+  newTag->UpdateEpgInfoTag();
 
   /* unused only for reference */
   newTag->m_strFileNameAndPath = CPVRTimersPath::PATH_NEW;
@@ -898,7 +968,7 @@
   case PVR_TIMER_STATE_SCHEDULED:
   default:
     if (IsRepeating())
-      stringID = 828; // Repeating timer deleted
+      stringID = 828; // Timer rule deleted
     else
       stringID = 19228; // Timer deleted
   }
@@ -908,16 +978,14 @@
 
 CEpgInfoTagPtr CPVRTimerInfoTag::GetEpgInfoTag(void) const
 {
-  return GetEpgInfoTag(true);
-}
-
-CEpgInfoTagPtr CPVRTimerInfoTag::GetEpgInfoTag(bool bSetTimer) const
-{
-  CSingleLock lock(m_critSection);
+  CPVRChannelPtr channel;
   if (!m_epgTag)
+    channel = g_PVRChannelGroups->GetByUniqueID(m_iClientChannelUid, m_iClientId);
+
+  if (channel)
   {
-    const CPVRChannelPtr channel(g_PVRChannelGroups->GetByUniqueID(m_iClientChannelUid, m_iClientId));
-    if (channel)
+    CSingleLock lock(m_critSection);
+    if (!m_epgTag)
     {
       const CEpgPtr epg(channel->GetEPG());
       if (epg)
@@ -932,8 +1000,8 @@
           m_epgTag = epg->GetTagBetween(StartAsUTC() - CDateTimeSpan(0, 0, 2, 0), EndAsUTC() + CDateTimeSpan(0, 0, 2, 0));
         }
 
-        if (m_epgTag && bSetTimer)
-          m_epgTag->SetTimer(m_iTimerId);
+        if (m_epgTag)
+          m_epgTag->SetTimer(g_PVRTimers->GetById(m_iTimerId));
       }
     }
   }
@@ -944,15 +1012,12 @@
 bool CPVRTimerInfoTag::HasEpgInfoTag(void) const
 {
   CSingleLock lock(m_critSection);
-  GetEpgInfoTag();
-  return m_epgTag.get() != NULL;
+  return m_epgTag != nullptr;
 }
 
 bool CPVRTimerInfoTag::HasSeriesEpgInfoTag(void) const
 {
   CSingleLock lock(m_critSection);
-  GetEpgInfoTag();
-
   if (m_epgTag &&
       (m_epgTag->IsSeries() ||
        m_epgTag->SeriesNumber() > 0 ||
@@ -966,15 +1031,9 @@
 void CPVRTimerInfoTag::ClearEpgTag(void)
 {
   CEpgInfoTagPtr deletedTag;
-
   {
-    // important: do not just check for m_epgtag here, but do actually obtain it.
-    // epg tag may have 'this' set as timer. we need to clear the timer explicitely.
-    // otherwise epg tags with dangling timers will float around until kodi restart.
-
     CSingleLock lock(m_critSection);
-    deletedTag = GetEpgInfoTag(false); // get the tag, but do not set 'this' as timer at the tag, otherwise stack overflow ;-)
-
+    deletedTag = m_epgTag;
     m_epgTag.reset();
   }

_service:download_url:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.h Changed

@@ -97,14 +97,29 @@
 
     bool SetDuration(int iDuration);
 
-    static CPVRTimerInfoTagPtr CreateFromEpg(const EPG::CEpgInfoTagPtr &tag, bool bRepeating = false);
+    /*!
+     * @brief create a tag for an instant timer for a given channel
+     * @parame the channel the instant timer is be created for
+     * @return the timer or null if timer could not be created
+     */
+    static CPVRTimerInfoTagPtr CreateInstantTimerTag(const CPVRChannelPtr &channel);
+
+    /*!
+     * @brief create a timer or timer rule for the given epg info tag.
+     * @param tag the epg info tag
+     * @param bCreateRule if true, create a timer rule, create a one shot timer otherwise
+     * @return the timer or null if timer could not be created
+     */
+    static CPVRTimerInfoTagPtr CreateFromEpg(const EPG::CEpgInfoTagPtr &tag, bool bCreateRule = false);
 
     /*!
-     * @return Return corresponding epg info tag, NULL otherwise
+     * @brief get the epg info tag associated with this timer, if any
+     * @return the epg info tag associated with this timer or null if there is no tag
      */
     EPG::CEpgInfoTagPtr GetEpgInfoTag(void) const;
 
     /*!
+     * @brief check whether there is an epg info tag associated with this timer
      * @return True if this timer has a corresponding epg info tag, false otherwise
      */
     bool HasEpgInfoTag() const;
@@ -283,7 +298,7 @@
 
   private:
     std::string GetWeekdaysString() const;
-    EPG::CEpgInfoTagPtr GetEpgInfoTag(bool bSetTimer) const;
+    void UpdateEpgInfoTag(void);
 
     CCriticalSection      m_critSection;
     unsigned int          m_iEpgUid;   /*!< id of epg event associated with this timer, EPG_TAG_INVALID_UID if none. */

_service:download_url:master.tar.gz/xbmc/pvr/timers/PVRTimers.cpp Changed

@@ -538,44 +538,12 @@
   if (!g_PVRManager.CheckParentalLock(channel))
     return false;
 
-  CEpgInfoTagPtr epgTag(channel->GetEPGNow());
-  CPVRTimerInfoTagPtr newTimer;
-  if (epgTag)
-    newTimer = CPVRTimerInfoTag::CreateFromEpg(epgTag);
-
-  if (!newTimer)
-  {
-    newTimer.reset(new CPVRTimerInfoTag);
-    /* set the timer data */
-    newTimer->m_iClientIndex      = PVR_TIMER_NO_CLIENT_INDEX;
-    newTimer->m_strTitle          = channel->ChannelName();
-    newTimer->m_strSummary        = g_localizeStrings.Get(19056);
-    newTimer->m_iChannelNumber    = channel->ChannelNumber();
-    newTimer->m_iClientChannelUid = channel->UniqueID();
-    newTimer->m_iClientId         = channel->ClientID();
-    newTimer->m_bIsRadio          = channel->IsRadio();
-
-    /* generate summary string */
-    newTimer->m_strSummary = StringUtils::Format("%s %s %s %s %s",
-                                                 newTimer->StartAsLocalTime().GetAsLocalizedDate().c_str(),
-                                                 g_localizeStrings.Get(19159).c_str(),
-                                                 newTimer->StartAsLocalTime().GetAsLocalizedTime("", false).c_str(),
-                                                 g_localizeStrings.Get(19160).c_str(),
-                                                 newTimer->EndAsLocalTime().GetAsLocalizedTime("", false).c_str());
-  }
+  CPVRTimerInfoTagPtr newTimer(CPVRTimerInfoTag::CreateInstantTimerTag(channel));
 
-  CDateTime startTime(0);
-  newTimer->SetStartFromUTC(startTime);
-  newTimer->m_iMarginStart = 0; /* set the start margin to 0 for instant timers */
+  bool bReturn(false);
+  if (newTimer)
+    bReturn = newTimer->AddToClient();
 
-  int iDuration = CSettings::GetInstance().GetInt(CSettings::SETTING_PVRRECORD_INSTANTRECORDTIME);
-  CDateTime endTime = CDateTime::GetUTCDateTime() + CDateTimeSpan(0, 0, iDuration ? iDuration : 120, 0);
-  newTimer->SetEndFromUTC(endTime);
-
-  /* unused only for reference */
-  newTimer->m_strFileNameAndPath = CPVRTimersPath::PATH_NEW;
-
-  bool bReturn = newTimer->AddToClient();
   if (!bReturn)
     CLog::Log(LOGERROR, "PVRTimers - %s - unable to add an instant timer on the client", __FUNCTION__);
 
@@ -605,28 +573,21 @@
   return item->AddToClient();
 }
 
-bool CPVRTimers::DeleteTimer(const CFileItem &item, bool bForce /* = false */, bool bDeleteRule /* = false */)
+bool CPVRTimers::DeleteTimer(const CPVRTimerInfoTagPtr &tag, bool bForce /* = false */, bool bDeleteRule /* = false */)
 {
-  /* Check if a CPVRTimerInfoTag is inside file item */
-  if (!item.IsPVRTimer())
-  {
-    CLog::Log(LOGERROR, "PVRTimers - %s - no TimerInfoTag given", __FUNCTION__);
-    return false;
-  }
-
-  CPVRTimerInfoTagPtr tag = item.GetPVRTimerInfoTag();
   if (!tag)
     return false;
 
   if (bDeleteRule)
   {
     /* delete the timer rule that scheduled this timer. */
-    tag = g_PVRTimers->GetByClient(tag->m_iClientId, tag->GetTimerRuleId());
-    if (!tag)
+    CPVRTimerInfoTagPtr ruleTag = g_PVRTimers->GetByClient(tag->m_iClientId, tag->GetTimerRuleId());
+    if (!ruleTag)
     {
-      CLog::Log(LOGERROR, "PVRTimers - %s - unable to obtain parent timer for given timer", __FUNCTION__);
+      CLog::Log(LOGERROR, "PVRTimers - %s - unable to obtain timer rule for given timer", __FUNCTION__);
       return false;
     }
+    return ruleTag->DeleteFromClient(bForce);
   }
 
   return tag->DeleteFromClient(bForce);
@@ -648,20 +609,9 @@
   return tag->RenameOnClient(strNewName);
 }
 
-bool CPVRTimers::UpdateTimer(CFileItem &item)
+bool CPVRTimers::UpdateTimer(const CPVRTimerInfoTagPtr &item)
 {
-  /* Check if a CPVRTimerInfoTag is inside file item */
-  if (!item.IsPVRTimer())
-  {
-    CLog::Log(LOGERROR, "PVRTimers - %s - no TimerInfoTag given", __FUNCTION__);
-    return false;
-  }
-
-  CPVRTimerInfoTagPtr tag = item.GetPVRTimerInfoTag();
-  if (!tag)
-    return false;
-
-  return tag->UpdateOnClient();
+  return item->UpdateOnClient();
 }
 
 CPVRTimerInfoTagPtr CPVRTimers::GetByClient(int iClientId, unsigned int iClientTimerId) const
@@ -700,46 +650,46 @@
   return false;
 }
 
-CFileItemPtr CPVRTimers::GetTimerForEpgTag(const CFileItem *item) const
+CPVRTimerInfoTagPtr CPVRTimers::GetTimerForEpgTag(const CEpgInfoTagPtr &epgTag) const
 {
-  if (item && item->HasEPGInfoTag() && item->GetEPGInfoTag()->ChannelTag())
+  if (epgTag)
   {
-    const CEpgInfoTagPtr epgTag(item->GetEPGInfoTag());
-    const CPVRChannelPtr channel(epgTag->ChannelTag());
-    CSingleLock lock(m_critSection);
+    // already a timer assigned to tag?
+    CPVRTimerInfoTagPtr timer(epgTag->Timer());
+    if (timer)
+      return timer;
 
-    for (MapTags::const_iterator it = m_tags.begin(); it != m_tags.end(); ++it)
+    // try to find a matching timer for the tag.
+    if (epgTag->ChannelTag())
     {
-      for (VecTimerInfoTag::const_iterator timerIt = it->second->begin(); timerIt != it->second->end(); ++timerIt)
+      const CPVRChannelPtr channel(epgTag->ChannelTag());
+      CSingleLock lock(m_critSection);
+
+      for (MapTags::const_iterator it = m_tags.begin(); it != m_tags.end(); ++it)
       {
-        CPVRTimerInfoTagPtr timer = *timerIt;
-
-        if (!timer->IsRepeating() &&
-            (timer->GetEpgInfoTag() == epgTag ||
-             (timer->m_iClientChannelUid == channel->UniqueID() &&
-             timer->m_bIsRadio == channel->IsRadio() &&
-             timer->StartAsUTC() <= epgTag->StartAsUTC() &&
-             timer->EndAsUTC() >= epgTag->EndAsUTC())))
+        for (VecTimerInfoTag::const_iterator timerIt = it->second->begin(); timerIt != it->second->end(); ++timerIt)
         {
-          CFileItemPtr fileItem(new CFileItem(timer));
-          return fileItem;
+          timer = *timerIt;
+
+          if (!timer->IsRepeating() &&
+              (timer->GetEpgInfoTag() == epgTag ||
+               (timer->m_iClientChannelUid == channel->UniqueID() &&
+                timer->m_bIsRadio == channel->IsRadio() &&
+                timer->StartAsUTC() <= epgTag->StartAsUTC() &&
+                timer->EndAsUTC() >= epgTag->EndAsUTC())))
+          {
+            return timer;
+          }
         }
       }
     }
   }
 
-  CFileItemPtr fileItem;
-  return fileItem;
+  return CPVRTimerInfoTagPtr();
 }
 
-CFileItemPtr CPVRTimers::GetTimerRule(const CFileItem *item) const
+CPVRTimerInfoTagPtr CPVRTimers::GetTimerRule(const CPVRTimerInfoTagPtr &timer) const
 {
-  CPVRTimerInfoTagPtr timer;
-  if (item && item->HasEPGInfoTag())
-    timer = item->GetEPGInfoTag()->Timer();
-  else if (item && item->HasPVRTimerInfoTag())
-    timer = item->GetPVRTimerInfoTag();
-
   if (timer)
   {
     unsigned int iRuleId = timer->GetTimerRuleId();
@@ -753,11 +703,25 @@
         for (const auto &timersEntry : *tagsEntry.second)
         {
           if (timersEntry->m_iClientId == iClientId && timersEntry->m_iClientIndex == iRuleId)
-            return CFileItemPtr(new CFileItem(timersEntry));
+            return timersEntry;
         }
       }
     }
   }
+  return CPVRTimerInfoTagPtr();
+}
+
+CFileItemPtr CPVRTimers::GetTimerRule(const CFileItem *item) const
+{
+  CPVRTimerInfoTagPtr timer;
+  if (item && item->HasEPGInfoTag())
+    timer = item->GetEPGInfoTag()->Timer();
+  else if (item && item->HasPVRTimerInfoTag())
+    timer = item->GetPVRTimerInfoTag();
+
+  if (timer)
+    return CFileItemPtr(new CFileItem(GetTimerRule(timer)));
+
   return CFileItemPtr();
 }

_service:download_url:master.tar.gz/xbmc/pvr/timers/PVRTimers.h Changed

@@ -151,7 +151,7 @@
      * @param bDeleteRule Also delete the timer rule that scheduled the timer instead of single timer only.
      * @return True if it was sent correctly, false if not.
      */
-    static bool DeleteTimer(const CFileItem &item, bool bForce = false, bool bDeleteRule = false);
+    static bool DeleteTimer(const CPVRTimerInfoTagPtr &tag, bool bForce = false, bool bDeleteRule = false);
 
     /*!
      * @brief Rename a timer on the client. Doesn't update the timer in the container. The backend will do this.
@@ -159,22 +159,29 @@
      */
     static bool RenameTimer(CFileItem &item, const std::string &strNewName);
 
-    /**
+    /*!
      * @brief Update the timer on the client. Doesn't update the timer in the container. The backend will do this.
      * @return True if it was sent correctly, false if not.
      */
-    static bool UpdateTimer(CFileItem &item);
+    static bool UpdateTimer(const CPVRTimerInfoTagPtr &item);
 
     /*!
      * @brief Get the timer tag that matches the given epg tag.
-     * @param item The epg tag.
+     * @param epgTag The epg tag.
      * @return The requested timer tag, or an empty fileitemptr if none was found.
      */
-    CFileItemPtr GetTimerForEpgTag(const CFileItem *item) const;
+    CPVRTimerInfoTagPtr GetTimerForEpgTag(const EPG::CEpgInfoTagPtr &epgTag) const;
 
     /*!
      * Get the timer rule for a given timer tag
      * @param timer The timer to query the timer rule for
+     * @return The timer rule, or null if none was found.
+     */
+    CPVRTimerInfoTagPtr GetTimerRule(const CPVRTimerInfoTagPtr &timer) const;
+
+    /*!
+     * Get the timer rule for a given timer tag
+     * @param item The timer to query the timer rule for
      * @return The timer rule, or an empty fileitemptr if none was found.
      */
     CFileItemPtr GetTimerRule(const CFileItem *item) const;

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRBase.cpp Changed

@@ -85,6 +85,13 @@
   return m_selectedItemPaths[bRadio];
 }
 
+void CGUIWindowPVRBase::ResetObservers(void)
+{
+  UnregisterObservers();
+  if (IsActive())
+    RegisterObservers();
+}
+
 void CGUIWindowPVRBase::Notify(const Observable &obs, const ObservableMessage msg)
 {
   if (IsActive())
@@ -130,7 +137,7 @@
 
 void CGUIWindowPVRBase::OnInitWindow(void)
 {
-  if (!g_PVRManager.IsStarted() || !g_PVRClients->HasConnectedClients())
+  if (!g_PVRManager.IsStarted() || !g_PVRClients->HasCreatedClients())
   {
     // wait until the PVR manager has been started
     CGUIDialogProgress* dialog = static_cast<CGUIDialogProgress*>(g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS));
@@ -147,7 +154,7 @@
       CEvent event(true);
       while(!event.WaitMSec(1))
       {
-        if (g_PVRManager.IsStarted() && g_PVRClients->HasConnectedClients())
+        if (g_PVRManager.IsStarted() && g_PVRClients->HasCreatedClients())
           event.Set();
 
         if (dialog->IsCanceled())
@@ -181,11 +188,15 @@
 
   // mark item as selected by channel path
   m_viewControl.SetSelectedItem(GetSelectedItemPath(m_bRadio));
+
+  RegisterObservers();
 }
 
 void CGUIWindowPVRBase::OnDeinitWindow(int nextWindowID)
 {
+  UnregisterObservers();
   UpdateSelectedItemPath();
+  CGUIMediaWindow::OnDeinitWindow(nextWindowID);
 }
 
 bool CGUIWindowPVRBase::OnMessage(CGUIMessage& message)
@@ -310,9 +321,22 @@
 
   if (button == CONTEXT_BUTTON_EDIT_TIMER_RULE)
   {
+    EditTimerRule(item);
+    bReturn = true;
+  }
+
+  return bReturn;
+}
+
+bool CGUIWindowPVRBase::OnContextButtonDeleteTimerRule(CFileItem *item, CONTEXT_BUTTON button)
+{
+  bool bReturn = false;
+
+  if (button == CONTEXT_BUTTON_DELETE_TIMER_RULE)
+  {
     CFileItemPtr parentTimer(g_PVRTimers->GetTimerRule(item));
     if (parentTimer)
-      EditTimer(parentTimer.get());
+      DeleteTimerRule(parentTimer.get());
 
     bReturn = true;
   }
@@ -335,7 +359,7 @@
 bool CGUIWindowPVRBase::CanBeActivated() const
 {
   // No activation if PVR is not enabled.
-  return CSettings::GetInstance().GetBool(CSettings::SETTING_PVRMANAGER_ENABLED);
+  return g_PVRManager.IsStarted();
 }
 
 bool CGUIWindowPVRBase::OpenGroupSelectionDialog(void)
@@ -471,154 +495,178 @@
   return true;
 }
 
-bool CGUIWindowPVRBase::ShowTimerSettings(CFileItem *item)
+bool CGUIWindowPVRBase::ShowTimerSettings(const CPVRTimerInfoTagPtr &timer)
 {
-  if (!item->IsPVRTimer())
-    return false;
-
   CGUIDialogPVRTimerSettings* pDlgInfo = (CGUIDialogPVRTimerSettings*)g_windowManager.GetWindow(WINDOW_DIALOG_PVR_TIMER_SETTING);
 
   if (!pDlgInfo)
+  {
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - unable to get WINDOW_DIALOG_PVR_TIMER_SETTING!", __FUNCTION__);
     return false;
+  }
 
-  pDlgInfo->SetTimer(item);
+  pDlgInfo->SetTimer(timer);
   pDlgInfo->Open();
 
   return pDlgInfo->IsConfirmed();
 }
 
-bool CGUIWindowPVRBase::AddTimer(CFileItem *item, bool bAdvanced)
+bool CGUIWindowPVRBase::AddTimer(CFileItem *item, bool bShowTimerSettings)
+{
+  return AddTimer(item, false, bShowTimerSettings);
+}
+
+bool CGUIWindowPVRBase::AddTimerRule(CFileItem *item, bool bShowTimerSettings)
+{
+  return AddTimer(item, true, bShowTimerSettings);
+}
+
+bool CGUIWindowPVRBase::AddTimer(CFileItem *item, bool bCreateRule, bool bShowTimerSettings)
 {
-  CFileItemPtr epgTag;
+  CEpgInfoTagPtr epgTag;
+  CPVRChannelPtr channel;
+
   if (item->IsEPG())
   {
-    epgTag.reset(new CFileItem(*item));
-    if (!epgTag->GetEPGInfoTag()->HasPVRChannel())
-      return false;
+    epgTag  = item->GetEPGInfoTag();
+    channel = epgTag->ChannelTag();
   }
   else if (item->IsPVRChannel())
   {
-    CPVRChannelPtr channel(item->GetPVRChannelInfoTag());
-    if (!channel)
-      return false;
-
-    CEpgInfoTagPtr epgNow(channel->GetEPGNow());
-    if (!epgNow)
-      return false;
-
-    epgTag.reset(new CFileItem(epgNow));
+    channel = item->GetPVRChannelInfoTag();
+    epgTag  = channel->GetEPGNow();
   }
 
-  const CEpgInfoTagPtr tag = epgTag->GetEPGInfoTag();
-  CPVRChannelPtr channel = tag->ChannelTag();
+  if (!channel)
+  {
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no channel!", __FUNCTION__);
+    return false;
+  }
 
-  if (!channel || !g_PVRManager.CheckParentalLock(channel))
+  if (!g_PVRManager.CheckParentalLock(channel))
     return false;
 
-  CFileItemPtr timer = g_PVRTimers->GetTimerForEpgTag(item);
-  if (timer && timer->HasPVRTimerInfoTag())
+  if (!epgTag && bCreateRule)
   {
-    CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19034});
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no epg tag!", __FUNCTION__);
     return false;
   }
 
-  bool bReturn(false);
-
-  if (bAdvanced)
+  CPVRTimerInfoTagPtr timer(bCreateRule || !epgTag ? nullptr : epgTag->Timer());
+  CPVRTimerInfoTagPtr rule (bCreateRule ? g_PVRTimers->GetTimerRule(timer) : nullptr);
+  if (timer || rule)
   {
-    CPVRTimerInfoTagPtr newTimer = CPVRTimerInfoTag::CreateFromEpg(tag, true);
-    if (newTimer)
-    {
-      CFileItem *newItem = new CFileItem(newTimer);
-
-      if (ShowTimerSettings(newItem))
-        bReturn = g_PVRTimers->AddTimer(newItem->GetPVRTimerInfoTag());
-
-      delete newItem;
-    }
+    CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19034}); // "Information", "There is already a timer set for this event"
+    return false;
   }
-  else
+
+  CPVRTimerInfoTagPtr newTimer(epgTag ? CPVRTimerInfoTag::CreateFromEpg(epgTag, bCreateRule) : CPVRTimerInfoTag::CreateInstantTimerTag(channel));
+  if (!newTimer)
   {
-    CPVRTimerInfoTagPtr newTimer = CPVRTimerInfoTag::CreateFromEpg(tag);
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - unable to create timer for epg tag!", __FUNCTION__);
+    return false;
+  }
 
-    if (newTimer)
-      bReturn = g_PVRTimers->AddTimer(newTimer);
+  if (bShowTimerSettings)
+  {
+    if (!ShowTimerSettings(newTimer))
+      return false;
   }
-  return bReturn;
+
+  return g_PVRTimers->AddTimer(newTimer);
 }
 
 bool CGUIWindowPVRBase::EditTimer(CFileItem *item)
 {
-  CFileItemPtr timer;
+  CPVRTimerInfoTagPtr timer;
 
   if (item->IsPVRTimer())
   {
-    timer.reset(new CFileItem(*item));
+    timer = item->GetPVRTimerInfoTag();
   }
   else if (item->IsEPG())
   {
-    timer = g_PVRTimers->GetTimerForEpgTag(item);
+    timer = item->GetEPGInfoTag()->Timer();
   }
 
-  if (!timer || !timer->HasPVRTimerInfoTag())
+  if (!timer)
+  {
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no timer!", __FUNCTION__);
     return false;
+  }
 
-  if (ShowTimerSettings(timer.get()) && !timer->GetPVRTimerInfoTag()->GetTimerType()->IsReadOnly())
-    return g_PVRTimers->UpdateTimer(*timer);
+  if (ShowTimerSettings(timer) && !timer->GetTimerType()->IsReadOnly())
+    return g_PVRTimers->UpdateTimer(timer);
+
+  return false;
+}
+
+bool CGUIWindowPVRBase::EditTimerRule(CFileItem *item)
+{
+  CFileItemPtr parentTimer(g_PVRTimers->GetTimerRule(item));
+  if (parentTimer)
+    return EditTimer(parentTimer.get());
 
   return false;
 }
 
 bool CGUIWindowPVRBase::DeleteTimer(CFileItem *item)
 {
-  return DeleteTimer(item, false);
+  return DeleteTimer(item, false, false);
 }
 
 bool CGUIWindowPVRBase::StopRecordFile(CFileItem *item)
 {
-  return DeleteTimer(item, true);
+  return DeleteTimer(item, true, false);
+}
+
+bool CGUIWindowPVRBase::DeleteTimerRule(CFileItem *item)
+{
+  return DeleteTimer(item, false, true);
 }
 
-bool CGUIWindowPVRBase::DeleteTimer(CFileItem *item, bool bIsRecording)
+bool CGUIWindowPVRBase::DeleteTimer(CFileItem *item, bool bIsRecording, bool bDeleteRule)
 {
-  CFileItemPtr timer;
+  CPVRTimerInfoTagPtr timer;
 
   if (item->IsPVRTimer())
   {
-    timer.reset(new CFileItem(*item));
+    timer = item->GetPVRTimerInfoTag();
   }
   else if (item->IsEPG())
   {
-    timer = g_PVRTimers->GetTimerForEpgTag(item);
+    timer = item->GetEPGInfoTag()->Timer();
   }
-  else if (item->IsPVRChannel())
-  {
-    CPVRChannelPtr channel(item->GetPVRChannelInfoTag());
-    if (!channel)
-      return false;
 
-    CFileItemPtr epgNow(new CFileItem(channel->GetEPGNow()));
-    timer = g_PVRTimers->GetTimerForEpgTag(epgNow.get());
+  if (!timer)
+  {
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no timer!", __FUNCTION__);
+    return false;
   }
 
-  if (!timer || !timer->HasPVRTimerInfoTag())
+  if (bDeleteRule && !timer->IsRepeating())
+    timer = g_PVRTimers->GetTimerRule(timer);
+
+  if (!timer)
+  {
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no timer rule!", __FUNCTION__);
     return false;
+  }
 
   if (bIsRecording)
   {
-    if (ConfirmStopRecording(timer.get()))
-      return CPVRTimers::DeleteTimer(*timer, true, false);
+    if (ConfirmStopRecording(timer))
+      return g_PVRTimers->DeleteTimer(timer, true, false);
   }
-  else if (timer->GetPVRTimerInfoTag()->HasTimerType() &&
-           timer->GetPVRTimerInfoTag()->GetTimerType()->IsReadOnly())
+  else if (timer->HasTimerType() && timer->GetTimerType()->IsReadOnly())
   {
     return false;
   }
   else
   {
-    bool bDeleteRule(false);
-    if (ConfirmDeleteTimer(timer.get(), bDeleteRule))
-      return CPVRTimers::DeleteTimer(*timer, false, bDeleteRule);
+    bool bAlsoDeleteRule(false);
+    if (ConfirmDeleteTimer(timer, bAlsoDeleteRule))
+      return g_PVRTimers->DeleteTimer(timer, false, bAlsoDeleteRule);
   }
   return false;
 }
@@ -692,7 +740,7 @@
   }
   else
   {
-    CLog::Log(LOGERROR, "CGUIWindowPVRCommon - %s - can't open recording: no valid filename", __FUNCTION__);
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - can't open recording: no valid filename", __FUNCTION__);
     CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19036});
     return false;
   }
@@ -716,49 +764,44 @@
 
 void CGUIWindowPVRBase::ShowEPGInfo(CFileItem *item)
 {
-  CFileItem *tag = NULL;
-  bool bHasChannel(false);
+  CEpgInfoTagPtr epgTag;
   CPVRChannelPtr channel;
+
   if (item->IsEPG())
   {
-    tag = new CFileItem(*item);
-    if (item->GetEPGInfoTag()->HasPVRChannel())
-    {
-      channel = item->GetEPGInfoTag()->ChannelTag();
-      bHasChannel = true;
-    }
+    epgTag  = item->GetEPGInfoTag();
+    channel = epgTag->ChannelTag();
+  }
+  else if (item->IsPVRChannel())
+  {
+    channel = item->GetPVRChannelInfoTag();
+    epgTag  = channel->GetEPGNow();
   }
   else if (item->IsPVRTimer())
   {
-    CEpgInfoTagPtr epg(item->GetPVRTimerInfoTag()->GetEpgInfoTag());
-    if (epg && epg->HasPVRChannel())
-    {
-      channel = epg->ChannelTag();
-      bHasChannel = true;
-    }
-    tag = new CFileItem(epg);
+    epgTag = item->GetPVRTimerInfoTag()->GetEpgInfoTag();
+    if (epgTag && epgTag->HasPVRChannel())
+      channel = epgTag->ChannelTag();
   }
-  else if (item->IsPVRChannel())
+
+  if (channel && !g_PVRManager.CheckParentalLock(channel))
+    return;
+
+  if (!epgTag)
   {
-    CEpgInfoTagPtr epgnow(item->GetPVRChannelInfoTag()->GetEPGNow());
-    channel = item->GetPVRChannelInfoTag();
-    bHasChannel = true;
-    if (!epgnow)
-    {
-      CGUIDialogOK::ShowAndGetInput(CVariant{19033}, CVariant{19055});
-      return;
-    }
-    tag = new CFileItem(epgnow);
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - no epg tag!", __FUNCTION__);
+    return;
   }
 
   CGUIDialogPVRGuideInfo* pDlgInfo = (CGUIDialogPVRGuideInfo*)g_windowManager.GetWindow(WINDOW_DIALOG_PVR_GUIDE_INFO);
-  if (tag && (!bHasChannel || g_PVRManager.CheckParentalLock(channel)) && pDlgInfo)
+  if (!pDlgInfo)
   {
-    pDlgInfo->SetProgInfo(tag);
-    pDlgInfo->Open();
+    CLog::Log(LOGERROR, "CGUIWindowPVRBase - %s - unable to get WINDOW_DIALOG_PVR_GUIDE_INFO!", __FUNCTION__);
+    return;
   }
 
-  delete tag;
+  pDlgInfo->SetProgInfo(epgTag);
+  pDlgInfo->Open();
 }
 
 bool CGUIWindowPVRBase::ActionInputChannelNumber(int input)
@@ -798,6 +841,14 @@
   return false;
 }
 
+bool CGUIWindowPVRBase::ActionShowTimerRule(CFileItem *item)
+{
+  if (!g_PVRTimers->GetTimerRule(item))
+    return AddTimerRule(item, true);
+  else
+    return EditTimerRule(item);
+}
+
 bool CGUIWindowPVRBase::ActionToggleTimer(CFileItem *item)
 {
   if (!item->HasEPGInfoTag())
@@ -805,9 +856,9 @@
 
   CPVRTimerInfoTagPtr timer(item->GetEPGInfoTag()->Timer());
   if (timer)
-    return DeleteTimer(item, timer->IsRecording());
+    return DeleteTimer(item, timer->IsRecording(), false);
   else
-    return AddTimer(item, false);
+    return AddTimer(item, false, false);
 }
 
 bool CGUIWindowPVRBase::ActionPlayChannel(CFileItem *item)
@@ -894,17 +945,18 @@
 
 void CGUIWindowPVRBase::UpdateSelectedItemPath()
 {
-  if (!m_viewControl.GetSelectedItemPath().empty()) {
+  if (!m_viewControl.GetSelectedItemPath().empty())
+  {
     CSingleLock lock(m_selectedItemPathsLock);
     m_selectedItemPaths[m_bRadio] = m_viewControl.GetSelectedItemPath();
   }
 }
 
-bool CGUIWindowPVRBase::ConfirmDeleteTimer(CFileItem *item, bool &bDeleteRule)
+bool CGUIWindowPVRBase::ConfirmDeleteTimer(const CPVRTimerInfoTagPtr &timer, bool &bDeleteRule)
 {
   bool bConfirmed(false);
 
-  if (item->GetPVRTimerInfoTag()->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
+  if (timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
   {
     // timer was scheduled by a timer rule. prompt user for confirmation for deleting the timer rule, including scheduled timers.
     bool bCancel(false);
@@ -912,7 +964,7 @@
                         CVariant{122}, // "Confirm delete"
                         CVariant{840}, // "Do you want to delete only this timer or also the timer rule that has scheduled it?"
                         CVariant{""},
-                        CVariant{item->GetPVRTimerInfoTag()->Title()},
+                        CVariant{timer->Title()},
                         bCancel,
                         CVariant{841}, // "Only this"
                         CVariant{593}, // "All"
@@ -926,21 +978,21 @@
     // prompt user for confirmation for deleting the timer
     bConfirmed = CGUIDialogYesNo::ShowAndGetInput(
                         CVariant{122}, // "Confirm delete"
-                        item->GetPVRTimerInfoTag()->IsRepeating()
+                        timer->IsRepeating()
                           ? CVariant{845}  // "Are you sure you want to delete this timer rule and all timers it has scheduled?"
                           : CVariant{846}, // "Are you sure you want to delete this timer?"
                         CVariant{""},
-                        CVariant{item->GetPVRTimerInfoTag()->Title()});
+                        CVariant{timer->Title()});
   }
 
   return bConfirmed;
 }
 
-bool CGUIWindowPVRBase::ConfirmStopRecording(CFileItem *item)
+bool CGUIWindowPVRBase::ConfirmStopRecording(const CPVRTimerInfoTagPtr &timer)
 {
   return CGUIDialogYesNo::ShowAndGetInput(
                          CVariant{847}, // "Confirm stop recording"
                          CVariant{848}, // "Are you sure you want to stop this recording?"
                          CVariant{""},
-                         CVariant{item->GetPVRTimerInfoTag()->Title()});
+                         CVariant{timer->Title()});
 }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRBase.h Changed

@@ -68,18 +68,22 @@
     virtual bool OnAction(const CAction &action) override;
     virtual bool OnBack(int actionID) override;
     virtual bool OpenGroupSelectionDialog(void);
-    virtual void ResetObservers(void) {};
     virtual void Notify(const Observable &obs, const ObservableMessage msg) override;
     virtual void SetInvalid() override;
     virtual bool CanBeActivated() const override;
 
+    void ResetObservers(void);
+
     static std::string GetSelectedItemPath(bool bRadio);
     static void SetSelectedItemPath(bool bRadio, const std::string &path);
 
-    static bool ShowTimerSettings(CFileItem *item);
-    static bool AddTimer(CFileItem *item, bool bAdvanced);
+    static bool ShowTimerSettings(const CPVRTimerInfoTagPtr &timer);
+    static bool AddTimer(CFileItem *item, bool bShowTimerSettings = false);
+    static bool AddTimerRule(CFileItem *item, bool bShowTimerSettings = true);
     static bool EditTimer(CFileItem *item);
+    static bool EditTimerRule(CFileItem *item);
     static bool DeleteTimer(CFileItem *item);
+    static bool DeleteTimerRule(CFileItem *item);
     static bool StopRecordFile(CFileItem *item);
 
   protected:
@@ -89,6 +93,7 @@
     virtual CPVRChannelGroupPtr GetGroup(void);
     virtual void SetGroup(CPVRChannelGroupPtr group);
 
+    virtual bool ActionShowTimerRule(CFileItem *item);
     virtual bool ActionToggleTimer(CFileItem *item);
     virtual bool ActionPlayChannel(CFileItem *item);
     virtual bool ActionPlayEpg(CFileItem *item, bool bPlayRecording);
@@ -106,6 +111,10 @@
 
     bool OnContextButtonEditTimer(CFileItem *item, CONTEXT_BUTTON button);
     bool OnContextButtonEditTimerRule(CFileItem *item, CONTEXT_BUTTON button);
+    bool OnContextButtonDeleteTimerRule(CFileItem *item, CONTEXT_BUTTON button);
+
+    virtual void RegisterObservers(void) {};
+    virtual void UnregisterObservers(void) {};
 
     static CCriticalSection m_selectedItemPathsLock;
     static std::string m_selectedItemPaths[2];
@@ -116,23 +125,24 @@
   private:
     /*!
      * @brief Open a dialog to confirm timer delete.
-     * @param item the timer to delete.
+     * @param timer the timer to delete.
      * @param bDeleteRule in: ignored
      *                    out, for one shot timer scheduled by a timer rule: true to also delete the timer
      *                    rule that has scheduled this timer, false to only delete the one shot timer.
      *                    out, for one shot timer not scheduled by a timer rule: ignored
      * @return true, to proceed with delete, false otherwise.
      */
-    static bool ConfirmDeleteTimer(CFileItem *item, bool &bDeleteRule);
+    static bool ConfirmDeleteTimer(const CPVRTimerInfoTagPtr &timer, bool &bDeleteRule);
 
     /*!
      * @brief Open a dialog to confirm stop recording.
-     * @param item the recording to stop (actually the timer to delete).
+     * @param timer the recording to stop (actually the timer to delete).
      * @return true, to proceed with delete, false otherwise.
      */
-    static bool ConfirmStopRecording(CFileItem *item);
+    static bool ConfirmStopRecording(const CPVRTimerInfoTagPtr &timer);
 
-    static bool DeleteTimer(CFileItem *item, bool bIsRecording);
+    static bool DeleteTimer(CFileItem *item, bool bIsRecording, bool bDeleteRule);
+    static bool AddTimer(CFileItem *item, bool bCreateRule, bool bShowTimerSettings);
 
     CPVRChannelGroupPtr m_group;
     XbmcThreads::EndTime m_refreshTimeout;

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRChannels.cpp Changed

@@ -52,10 +52,9 @@
 {
 }
 
-void CGUIWindowPVRChannels::ResetObservers(void)
+void CGUIWindowPVRChannels::RegisterObservers(void)
 {
   CSingleLock lock(m_critSection);
-  UnregisterObservers();
   g_EpgContainer.RegisterObserver(this);
   g_PVRTimers->RegisterObserver(this);
   g_infoManager.RegisterObserver(this);
@@ -98,8 +97,6 @@
   CGUIWindowPVRBase::GetContextButtons(itemNumber, buttons);
 
   buttons.Add(CONTEXT_BUTTON_EDIT, 16106);                                          /* Manage... */
-
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
 }
 
 std::string CGUIWindowPVRChannels::GetDirectoryPath(void)
@@ -245,15 +242,13 @@
         case ObservableMessageEpgActiveItem:
         case ObservableMessageCurrentItem:
         {
-          if (IsActive())
-            SetInvalid();
+          SetInvalid();
           bReturn = true;
           break;
         }
         case ObservableMessageChannelGroupReset:
         {
-          if (IsActive())
-            Refresh(true);
+          Refresh(true);
           bReturn = true;
           break;
         }
@@ -348,10 +343,14 @@
 {
   bool bReturn = false;
 
-  if ((button == CONTEXT_BUTTON_START_RECORD) ||
-      (button == CONTEXT_BUTTON_ADD_TIMER))
+  if (button == CONTEXT_BUTTON_START_RECORD)
+  {
+    AddTimer(item);
+    bReturn = true;
+  }
+  else if (button == CONTEXT_BUTTON_ADD_TIMER)
   {
-    AddTimer(item, button == CONTEXT_BUTTON_ADD_TIMER);
+    AddTimerRule(item);
     bReturn = true;
   }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRChannels.h Changed

@@ -34,12 +34,12 @@
     virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button) override;
     virtual bool Update(const std::string &strDirectory, bool updateFilterPath = true) override;
     virtual void UpdateButtons(void) override;
-    virtual void ResetObservers(void) override;
-    void UnregisterObservers(void);
     virtual bool OnAction(const CAction &action) override;
 
   protected:
     virtual std::string GetDirectoryPath(void) override;
+    virtual void RegisterObservers(void) override;
+    virtual void UnregisterObservers(void) override;
 
   private:
     bool OnContextButtonAdd(CFileItem *item, CONTEXT_BUTTON button);
@@ -47,6 +47,7 @@
     bool OnContextButtonInfo(CFileItem *item, CONTEXT_BUTTON button);
     bool OnContextButtonManage(CFileItem *item, CONTEXT_BUTTON button);
     bool OnContextButtonUpdateEpg(CFileItem *item, CONTEXT_BUTTON button);
+    bool OnContextButtonAddTimer(CFileItem *item, CONTEXT_BUTTON button);
     bool OnContextButtonStartRecord(CFileItem *item, CONTEXT_BUTTON button);
     bool OnContextButtonStopRecord(CFileItem *item, CONTEXT_BUTTON button);

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.cpp Changed

@@ -19,9 +19,11 @@
  */
 
 #include "ContextMenuManager.h"
+#include "epg/GUIEPGGridContainer.h"
 #include "GUIUserMessages.h"
 #include "epg/EpgContainer.h"
 #include "input/Key.h"
+#include "messaging/ApplicationMessenger.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
@@ -40,16 +42,17 @@
 using namespace EPG;
 
 CGUIWindowPVRGuide::CGUIWindowPVRGuide(bool bRadio) :
-  CGUIWindowPVRBase(bRadio, bRadio ? WINDOW_RADIO_GUIDE : WINDOW_TV_GUIDE, "MyPVRGuide.xml")
+  CGUIWindowPVRBase(bRadio, bRadio ? WINDOW_RADIO_GUIDE : WINDOW_TV_GUIDE, "MyPVRGuide.xml"),
+  m_refreshTimelineItemsThread(new CPVRRefreshTimelineItemsThread(this))
 {
-  m_bUpdateRequired = false;
-  m_cachedTimeline = new CFileItemList;
+  m_cachedTimeline = std::make_shared<CFileItemList>();
   m_cachedChannelGroup = CPVRChannelGroupPtr(new CPVRChannelGroup);
+  m_bRefreshTimelineItems = false;
 }
 
 CGUIWindowPVRGuide::~CGUIWindowPVRGuide(void)
 {
-  delete m_cachedTimeline;
+  StopRefreshTimelineItemsThread();
 }
 
 void CGUIWindowPVRGuide::OnInitWindow()
@@ -62,12 +65,33 @@
   if (epgGridContainer)
     epgGridContainer->GoToNow();
 
+  m_bRefreshTimelineItems = true;
+  StartRefreshTimelineItemsThread();
+
   CGUIWindowPVRBase::OnInitWindow();
 }
 
-void CGUIWindowPVRGuide::ResetObservers(void)
+void CGUIWindowPVRGuide::OnDeinitWindow(int nextWindowID)
+{
+  StopRefreshTimelineItemsThread();
+  m_bRefreshTimelineItems = false;
+
+  CGUIWindowPVRBase::OnDeinitWindow(nextWindowID);
+}
+
+void CGUIWindowPVRGuide::StartRefreshTimelineItemsThread()
+{
+  StopRefreshTimelineItemsThread();
+  m_refreshTimelineItemsThread->Create();
+}
+
+void CGUIWindowPVRGuide::StopRefreshTimelineItemsThread()
+{
+  m_refreshTimelineItemsThread->StopThread();
+}
+
+void CGUIWindowPVRGuide::RegisterObservers(void)
 {
-  UnregisterObservers();
   g_EpgContainer.RegisterObserver(this);
 }
 
@@ -76,6 +100,29 @@
   g_EpgContainer.UnregisterObserver(this);
 }
 
+void CGUIWindowPVRGuide::Notify(const Observable &obs, const ObservableMessage msg)
+{
+  if (m_viewControl.GetCurrentControl() == GUIDE_VIEW_TIMELINE &&
+      (msg == ObservableMessageEpg ||
+       msg == ObservableMessageEpgContainer ||
+       msg == ObservableMessageChannelGroup))
+  {
+    if (IsActive())
+    {
+      // Only the active window must set the selected item path which is shared
+      // between all PVR windows, not the last notified window (observer).
+      UpdateSelectedItemPath();
+    }
+
+    CSingleLock lock(m_critSection);
+    m_bRefreshTimelineItems = true;
+  }
+  else
+  {
+    CGUIWindowPVRBase::Notify(obs, msg);
+  }
+}
+
 void CGUIWindowPVRGuide::GetContextButtons(int itemNumber, CContextButtons &buttons)
 {
   if (itemNumber < 0 || itemNumber >= m_vecItems->Size())
@@ -93,7 +140,10 @@
     if (timer)
     {
       if (timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
+      {
         buttons.Add(CONTEXT_BUTTON_EDIT_TIMER_RULE, 19243); /* Edit timer rule */
+        buttons.Add(CONTEXT_BUTTON_DELETE_TIMER_RULE, 19295); /* Delete timer rule */
+      }
 
       const CPVRTimerTypePtr timerType(timer->GetTimerType());
       if (timerType && !timerType->IsReadOnly())
@@ -133,7 +183,6 @@
   }
 
   CGUIWindowPVRBase::GetContextButtons(itemNumber, buttons);
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
 }
 
 void CGUIWindowPVRGuide::UpdateSelectedItemPath()
@@ -222,7 +271,6 @@
       break;
   }
 
-  m_bUpdateRequired = false;
   return true;
 }
 
@@ -304,6 +352,10 @@
               ActionToggleTimer(pItem.get());
               bReturn = true;
               break;
+            case ACTION_PVR_SHOW_TIMER_RULE:
+              ActionShowTimerRule(pItem.get());
+              bReturn = true;
+              break;
             case ACTION_CONTEXT_MENU:
             case ACTION_MOUSE_RIGHT_CLICK:
               OnPopupMenu(iItem);
@@ -350,7 +402,6 @@
     {
       // let's set the view mode first before update
       CGUIWindowPVRBase::OnMessage(message);
-      m_nextUpdateTimeout.SetExpired();
       Refresh(true);
       bReturn = true;
       break;
@@ -362,22 +413,15 @@
         case ObservableMessageEpg:
         case ObservableMessageEpgContainer:
         {
-          m_bUpdateRequired = true;
-          // do not allow more than MAX_UPDATE_FREQUENCY updates
-          if (IsActive() && m_nextUpdateTimeout.IsTimePast())
-          {
-            Refresh(true);
-            m_nextUpdateTimeout.Set(MAX_UPDATE_FREQUENCY);
-          }
+          Refresh(true);
           bReturn = true;
           break;
         }
         case ObservableMessageEpgActiveItem:
         {
-          if (IsActive() && m_viewControl.GetCurrentControl() != GUIDE_VIEW_TIMELINE)
+          if (m_viewControl.GetCurrentControl() != GUIDE_VIEW_TIMELINE)
             SetInvalid();
-          else
-            m_bUpdateRequired = true;
+
           bReturn = true;
           break;
         }
@@ -401,6 +445,7 @@
       OnContextButtonEditTimer(pItem.get(), button) ||
       OnContextButtonEditTimerRule(pItem.get(), button) ||
       OnContextButtonDeleteTimer(pItem.get(), button) ||
+      OnContextButtonDeleteTimerRule(pItem.get(), button) ||
       OnContextButtonBegin(pItem.get(), button) ||
       OnContextButtonEnd(pItem.get(), button) ||
       OnContextButtonNow(pItem.get(), button) ||
@@ -451,33 +496,64 @@
   }
 }
 
+bool CGUIWindowPVRGuide::RefreshTimelineItems()
+{
+  if (m_bRefreshTimelineItems)
+  {
+    m_bRefreshTimelineItems = false;
+
+    CPVRChannelGroupPtr group = GetGroup();
+
+    std::shared_ptr<CFileItemList> timeline = std::make_shared<CFileItemList>();
+
+    // can be very expensive. never call with lock aquired.
+    group->GetEPGAll(*timeline, true);
+
+    {
+      CSingleLock lock(m_critSection);
+
+      m_newTimeline = timeline;
+      m_cachedChannelGroup = group;
+    }
+
+    return true;
+  }
+  return false;
+}
+
 void CGUIWindowPVRGuide::GetViewTimelineItems(CFileItemList &items)
 {
-  CGUIEPGGridContainer* epgGridContainer = (CGUIEPGGridContainer*) GetControl(m_viewControl.GetCurrentControl());
+  CGUIEPGGridContainer* epgGridContainer = dynamic_cast<CGUIEPGGridContainer*>(GetControl(m_viewControl.GetCurrentControl()));
   if (!epgGridContainer)
     return;
 
-  CPVRChannelGroupPtr group = GetGroup();
+  CPVRChannelGroupPtr group;
+  {
+    CSingleLock lock(m_critSection);
 
-  // group change detected reset grid coordinate
-  if (*m_cachedChannelGroup != *group)
-    epgGridContainer->ResetCoordinates();
+    // group change detected reset grid coordinates and refresh grid items
+    if (!m_bRefreshTimelineItems && *m_cachedChannelGroup != *GetGroup())
+    {
+      epgGridContainer->ResetCoordinates();
+      m_bRefreshTimelineItems = true;
+      RefreshTimelineItems();
+    }
 
-  if (m_bUpdateRequired || m_cachedTimeline->IsEmpty() || *m_cachedChannelGroup != *group)
-  {
-    m_bUpdateRequired = false;
+    if (m_newTimeline != nullptr)
+    {
+      m_cachedTimeline = m_newTimeline;
+      m_newTimeline.reset();
+    }
 
-    m_cachedTimeline->Clear();
-    m_cachedChannelGroup = group;
-    m_cachedChannelGroup->GetEPGAll(*m_cachedTimeline, true);
-  }
+    items.Clear();
+    items.RemoveDiscCache(GetID());
+    items.Assign(*m_cachedTimeline, false);
 
-  items.Clear();
-  items.RemoveDiscCache(GetID());
-  items.Assign(*m_cachedTimeline, false);
+    group = m_cachedChannelGroup;
+  }
 
-  CDateTime startDate(m_cachedChannelGroup->GetFirstEPGDate());
-  CDateTime endDate(m_cachedChannelGroup->GetLastEPGDate());
+  CDateTime startDate(group->GetFirstEPGDate());
+  CDateTime endDate(group->GetLastEPGDate());
   CDateTime currentDate = CDateTime::GetCurrentDateTime().GetAsUTCDateTime();
 
   if (!startDate.IsValid())
@@ -566,10 +642,14 @@
 {
   bool bReturn = false;
 
-  if ((button == CONTEXT_BUTTON_START_RECORD) ||
-      (button == CONTEXT_BUTTON_ADD_TIMER))
+  if (button == CONTEXT_BUTTON_START_RECORD)
+  {
+    AddTimer(item);
+    bReturn = true;
+  }
+  else if (button == CONTEXT_BUTTON_ADD_TIMER)
   {
-    AddTimer(item, button == CONTEXT_BUTTON_ADD_TIMER);
+    AddTimerRule(item);
     bReturn = true;
   }
 
@@ -601,3 +681,22 @@
 
   return bReturn;
 }
+
+CPVRRefreshTimelineItemsThread::CPVRRefreshTimelineItemsThread(CGUIWindowPVRGuide *pGuideWindow)
+: CThread("epg-grid-refresh-timeline-items"),
+  m_pGuideWindow(pGuideWindow)
+{
+}
+
+void CPVRRefreshTimelineItemsThread::Process()
+{
+  while (!m_bStop)
+  {
+    if (m_pGuideWindow->RefreshTimelineItems() && !m_bStop)
+    {
+      CGUIMessage m(GUI_MSG_REFRESH_LIST, m_pGuideWindow->GetID(), 0, ObservableMessageEpg);
+      KODI::MESSAGING::CApplicationMessenger::GetInstance().SendGUIMessage(m);
+    }
+    Sleep(5000);
+  }
+}

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.h Changed

@@ -19,14 +19,17 @@
  *
  */
 
-#include "epg/GUIEPGGridContainer.h"
-#include "threads/SystemClock.h"
+#include <atomic>
+#include <memory>
+#include "threads/Thread.h"
 #include "GUIWindowPVRBase.h"
 
 class CSetting;
 
 namespace PVR
 {
+  class CPVRRefreshTimelineItemsThread;
+
   class CGUIWindowPVRGuide : public CGUIWindowPVRBase
   {
   public:
@@ -34,19 +37,23 @@
     virtual ~CGUIWindowPVRGuide(void);
 
     virtual void OnInitWindow() override;
+    virtual void OnDeinitWindow(int nextWindowID) override;
     virtual bool OnMessage(CGUIMessage& message) override;
     virtual bool OnAction(const CAction &action) override;
     virtual void GetContextButtons(int itemNumber, CContextButtons &buttons) override;
     virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button) override;
-    virtual void ResetObservers(void) override;
-    void UnregisterObservers(void);
     virtual bool Update(const std::string &strDirectory, bool updateFilterPath = true) override;
     virtual void UpdateButtons(void) override;
+    virtual void Notify(const Observable &obs, const ObservableMessage msg) override;
+
+    bool RefreshTimelineItems();
 
   protected:
     virtual void UpdateSelectedItemPath() override;
     virtual std::string GetDirectoryPath(void) override { return ""; }
     virtual bool GetDirectory(const std::string &strDirectory, CFileItemList &items) override;
+    virtual void RegisterObservers(void) override;
+    virtual void UnregisterObservers(void) override;
 
   private:
     bool SelectPlayingFile(void);
@@ -65,11 +72,26 @@
     void GetViewNextItems(CFileItemList &items);
     void GetViewTimelineItems(CFileItemList &items);
 
-    CFileItemList      *m_cachedTimeline;
+    void StartRefreshTimelineItemsThread();
+    void StopRefreshTimelineItemsThread();
+
+    std::unique_ptr<CPVRRefreshTimelineItemsThread> m_refreshTimelineItemsThread;
+    std::atomic_bool m_bRefreshTimelineItems;
+
+    std::shared_ptr<CFileItemList> m_cachedTimeline;
     CPVRChannelGroupPtr m_cachedChannelGroup;
+    std::shared_ptr<CFileItemList> m_newTimeline;
+  };
 
-    bool m_bUpdateRequired;
+  class CPVRRefreshTimelineItemsThread : public CThread
+  {
+  public:
+    CPVRRefreshTimelineItemsThread(CGUIWindowPVRGuide *pGuideWindow);
+    virtual ~CPVRRefreshTimelineItemsThread() {}
 
-    XbmcThreads::EndTime m_nextUpdateTimeout;
+    virtual void Process();
+
+  private:
+    CGUIWindowPVRGuide *m_pGuideWindow;
   };
 }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp Changed

@@ -48,6 +48,14 @@
 {
 }
 
+void CGUIWindowPVRRecordings::RegisterObservers(void)
+{
+  CSingleLock lock(m_critSection);
+  g_PVRRecordings->RegisterObserver(this);
+  g_PVRTimers->RegisterObserver(this);
+  g_infoManager.RegisterObserver(this);
+}
+
 void CGUIWindowPVRRecordings::UnregisterObservers(void)
 {
   CSingleLock lock(m_critSection);
@@ -58,15 +66,6 @@
   g_infoManager.UnregisterObserver(this);
 }
 
-void CGUIWindowPVRRecordings::ResetObservers(void)
-{
-  CSingleLock lock(m_critSection);
-  UnregisterObservers();
-  g_PVRRecordings->RegisterObserver(this);
-  g_PVRTimers->RegisterObserver(this);
-  g_infoManager.RegisterObserver(this);
-}
-
 void CGUIWindowPVRRecordings::OnWindowLoaded()
 {
   CONTROL_SELECT(CONTROL_BTNGROUPITEMS);
@@ -74,7 +73,7 @@
 
 std::string CGUIWindowPVRRecordings::GetDirectoryPath(void)
 {
-  const std::string basePath = CPVRRecordingsPath(m_bShowDeletedRecordings);
+  const std::string basePath = CPVRRecordingsPath(m_bShowDeletedRecordings, m_bRadio);
   return StringUtils::StartsWith(m_vecItems->GetPath(), basePath) ? m_vecItems->GetPath() : basePath;
 }
 
@@ -170,8 +169,6 @@
 
   if (!isDeletedRecording)
     CGUIWindowPVRBase::GetContextButtons(itemNumber, buttons);
-
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
 }
 
 bool CGUIWindowPVRRecordings::OnAction(const CAction &action)
@@ -228,7 +225,7 @@
   CGUIRadioButtonControl *btnShowDeleted = (CGUIRadioButtonControl*) GetControl(CONTROL_BTNSHOWDELETED);
   if (btnShowDeleted)
   {
-    btnShowDeleted->SetVisible(g_PVRRecordings->HasDeletedRecordings());
+    btnShowDeleted->SetVisible(m_bRadio ? g_PVRRecordings->HasDeletedRadioRecordings() : g_PVRRecordings->HasDeletedTVRecordings());
     btnShowDeleted->SetSelected(m_bShowDeletedRecordings);
   }
 
@@ -304,16 +301,14 @@
         case ObservableMessageEpgActiveItem:
         case ObservableMessageCurrentItem:
         {
-          if (IsActive())
-            SetInvalid();
+          SetInvalid();
           bReturn = true;
           break;
         }
         case ObservableMessageRecordings:
         case ObservableMessageTimersReset:
         {
-          if (IsActive())
-            Refresh(true);
+          Refresh(true);
           bReturn = true;
           break;
         }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRRecordings.h Changed

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRSearch.cpp Changed

@@ -59,7 +59,10 @@
     if (timer)
     {
       if (timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
+      {
         buttons.Add(CONTEXT_BUTTON_EDIT_TIMER_RULE, 19243); /* Edit timer rule */
+        buttons.Add(CONTEXT_BUTTON_DELETE_TIMER_RULE, 19295); /* Delete timer rule */
+      }
 
       const CPVRTimerTypePtr timerType(timer->GetTimerType());
       if (timerType && !timerType->IsReadOnly())
@@ -90,7 +93,6 @@
   }
 
   CGUIWindowPVRBase::GetContextButtons(itemNumber, buttons);
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
 }
 
 void CGUIWindowPVRSearch::OnWindowLoaded()
@@ -112,6 +114,7 @@
       OnContextButtonEditTimer(pItem.get(), button) ||
       OnContextButtonEditTimerRule(pItem.get(), button) ||
       OnContextButtonDeleteTimer(pItem.get(), button) ||
+      OnContextButtonDeleteTimerRule(pItem.get(), button) ||
       OnContextButtonPlay(pItem.get(), button) ||
       CGUIWindowPVRBase::OnContextButton(itemNumber, button);
 }
@@ -290,10 +293,14 @@
 {
   bool bReturn = false;
 
-  if ((button == CONTEXT_BUTTON_START_RECORD) ||
-      (button == CONTEXT_BUTTON_ADD_TIMER))
+  if (button == CONTEXT_BUTTON_START_RECORD)
+  {
+    AddTimer(item);
+    bReturn = true;
+  }
+  else if (button == CONTEXT_BUTTON_ADD_TIMER)
   {
-    AddTimer(item, button == CONTEXT_BUTTON_ADD_TIMER);
+    AddTimerRule(item);
     bReturn = true;
   }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp Changed

@@ -44,20 +44,19 @@
 {
 }
 
-void CGUIWindowPVRTimersBase::UnregisterObservers(void)
+void CGUIWindowPVRTimersBase::RegisterObservers(void)
 {
   CSingleLock lock(m_critSection);
-  if (g_PVRTimers)
-    g_PVRTimers->UnregisterObserver(this);
-  g_infoManager.UnregisterObserver(this);
+  g_PVRTimers->RegisterObserver(this);
+  g_infoManager.RegisterObserver(this);
 }
 
-void CGUIWindowPVRTimersBase::ResetObservers(void)
+void CGUIWindowPVRTimersBase::UnregisterObservers(void)
 {
   CSingleLock lock(m_critSection);
-  UnregisterObservers();
-  g_PVRTimers->RegisterObserver(this);
-  g_infoManager.RegisterObserver(this);
+  if (g_PVRTimers)
+    g_PVRTimers->UnregisterObserver(this);
+  g_infoManager.UnregisterObserver(this);
 }
 
 void CGUIWindowPVRTimersBase::GetContextButtons(int itemNumber, CContextButtons &buttons)
@@ -85,26 +84,24 @@
             buttons.Add(CONTEXT_BUTTON_ACTIVATE, 844);    /* Deactivate */
         }
 
-        if (!timerType->IsReadOnly())
+        if (timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
         {
-          if (timer->GetTimerRuleId() == PVR_TIMER_NO_PARENT)
-            buttons.Add(CONTEXT_BUTTON_EDIT_TIMER, 21450);  /* Edit */
-          else
-            buttons.Add(CONTEXT_BUTTON_EDIT_TIMER, 19242);  /* Edit timer */
+          buttons.Add(CONTEXT_BUTTON_EDIT_TIMER_RULE, 19243); /* Edit timer rule */
+          buttons.Add(CONTEXT_BUTTON_DELETE_TIMER_RULE, 19295); /* Delete timer rule */
+        }
 
-          // As epg-based timers will get it's title from the epg tag, they should not be renamable.
-          if (timer->IsManual())
-            buttons.Add(CONTEXT_BUTTON_RENAME, 118);        /* Rename */
+        if (timerType && !timerType->IsReadOnly() && timer->GetTimerRuleId() == PVR_TIMER_NO_PARENT)
+          buttons.Add(CONTEXT_BUTTON_EDIT_TIMER, 21450);  /* Edit */
 
-          if (timer->IsRecording())
-            buttons.Add(CONTEXT_BUTTON_STOP_RECORD, 19059); /* Stop recording */
-          else
-            buttons.Add(CONTEXT_BUTTON_DELETE, 117);        /* Delete */
-        }
-      }
+        // As epg-based timers will get it's title from the epg tag, they should not be renamable.
+        if (timer->IsManual() && !timerType->IsReadOnly())
+          buttons.Add(CONTEXT_BUTTON_RENAME, 118);        /* Rename */
 
-      if (timer->GetTimerRuleId() != PVR_TIMER_NO_PARENT)
-        buttons.Add(CONTEXT_BUTTON_EDIT_TIMER_RULE, 19243); /* Edit timer rule */
+        if (timer->IsRecording())
+          buttons.Add(CONTEXT_BUTTON_STOP_RECORD, 19059); /* Stop recording */
+        else if (timerType && !timerType->IsReadOnly())
+            buttons.Add(CONTEXT_BUTTON_DELETE, 117);      /* Delete */
+      }
 
       if (g_PVRClients->HasMenuHooks(timer->m_iClientId, PVR_MENUHOOK_TIMER))
         buttons.Add(CONTEXT_BUTTON_MENU_HOOKS, 19195);    /* PVR client specific action */
@@ -112,7 +109,6 @@
   }
 
   CGUIWindowPVRBase::GetContextButtons(itemNumber, buttons);
-  CContextMenuManager::GetInstance().AddVisibleItems(pItem, buttons);
 }
 
 bool CGUIWindowPVRTimersBase::OnAction(const CAction &action)
@@ -143,6 +139,7 @@
       OnContextButtonStopRecord(pItem.get(), button) ||
       OnContextButtonEditTimer(pItem.get(), button) ||
       OnContextButtonEditTimerRule(pItem.get(), button) ||
+      OnContextButtonDeleteTimerRule(pItem.get(), button) ||
       OnContextButtonRename(pItem.get(), button) ||
       OnContextButtonInfo(pItem.get(), button) ||
       CGUIWindowPVRBase::OnContextButton(itemNumber, button);
@@ -233,15 +230,13 @@
         case ObservableMessageEpgActiveItem:
         case ObservableMessageCurrentItem:
         {
-          if (IsActive())
-            SetInvalid();
+          SetInvalid();
           bReturn = true;
           break;
         }
         case ObservableMessageTimersReset:
         {
-          if (IsActive())
-            Refresh(true);
+          Refresh(true);
           bReturn = true;
           break;
         }
@@ -267,7 +262,7 @@
     else
       timer->m_state = PVR_TIMER_STATE_DISABLED;
 
-    g_PVRTimers->UpdateTimer(*item);
+    g_PVRTimers->UpdateTimer(timer);
   }
 
   return bReturn;
@@ -377,10 +372,11 @@
   }
   else
   {
-    if (ShowTimerSettings(item) && !item->GetPVRTimerInfoTag()->GetTimerType()->IsReadOnly())
+    const CPVRTimerInfoTagPtr tag(item->GetPVRTimerInfoTag());
+    if (ShowTimerSettings(tag) && !tag->GetTimerType()->IsReadOnly())
     {
       /* Update timer on pvr backend */
-      bReturn = g_PVRTimers->UpdateTimer(*item);
+      bReturn = g_PVRTimers->UpdateTimer(tag);
     }
   }
 
@@ -392,15 +388,12 @@
   bool bReturn(false);
 
   CPVRTimerInfoTagPtr newTimer(new CPVRTimerInfoTag(m_bRadio));
-  CFileItem *newItem = new CFileItem(newTimer);
 
-  if (ShowTimerSettings(newItem))
+  if (ShowTimerSettings(newTimer))
   {
     /* Add timer to backend */
-    bReturn = g_PVRTimers->AddTimer(newItem->GetPVRTimerInfoTag());
+    bReturn = g_PVRTimers->AddTimer(newTimer);
   }
 
-  delete newItem;
-
   return bReturn;
 }

_service:download_url:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimersBase.h Changed

_service:download_url:master.tar.gz/xbmc/rendering/RenderSystem.h Changed

_service:download_url:master.tar.gz/xbmc/rendering/dx/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/rendering/dx/RenderSystemDX.cpp Changed

@@ -49,52 +49,50 @@
 {
   m_enumRenderingSystem = RENDERING_SYSTEM_DIRECTX;
 
-  m_hFocusWnd   = NULL;
-  m_hDeviceWnd  = NULL;
+  m_hFocusWnd = nullptr;
+  m_hDeviceWnd = nullptr;
   m_nBackBufferWidth  = 0;
   m_nBackBufferHeight = 0;
   m_bFullScreenDevice = false;
-  m_bVSync          = true;
-  m_nDeviceStatus   = S_OK;
-  m_inScene         = false;
-  m_needNewDevice   = false;
+  m_bVSync = true;
+  m_nDeviceStatus = S_OK;
+  m_inScene = false;
+  m_needNewDevice = false;
   m_resizeInProgress = false;
-  m_screenHeight    = 0;
-  m_systemFreq      = CurrentHostFrequency();
-
+  m_screenHeight = 0;
+  m_systemFreq = CurrentHostFrequency();
   m_defaultD3DUsage = D3D11_USAGE_DEFAULT;
-
   m_featureLevel = D3D_FEATURE_LEVEL_11_1;
   m_driverType = D3D_DRIVER_TYPE_HARDWARE;
-  m_adapter = NULL;
-  m_adapterIndex = -1;
-  m_pOutput = NULL;
-  m_dxgiFactory = NULL;
-  m_pD3DDev = NULL;
-  m_pImdContext = NULL;
-  m_pContext = NULL;
-
-  m_pSwapChain = NULL;
-  m_pSwapChain1 = NULL;
-  m_pRenderTargetView = NULL;
-  m_depthStencilState = NULL;
-  m_depthStencilView = NULL;
-  m_BlendEnableState = NULL;
-  m_BlendDisableState = NULL;
+  m_adapter = nullptr;
+  m_pOutput = nullptr;
+  m_dxgiFactory = nullptr;
+  m_pD3DDev = nullptr;
+  m_pImdContext = nullptr;
+  m_pContext = nullptr;
+
+  m_pSwapChain = nullptr;
+  m_pSwapChain1 = nullptr;
+  m_pRenderTargetView = nullptr;
+  m_depthStencilState = nullptr;
+  m_depthStencilView = nullptr;
+  m_BlendEnableState = nullptr;
+  m_BlendDisableState = nullptr;
   m_BlendEnabled = false;
-  m_RSScissorDisable = NULL;
-  m_RSScissorEnable = NULL;
+  m_RSScissorDisable = nullptr;
+  m_RSScissorEnable = nullptr;
   m_ScissorsEnabled = false;
 
-  m_pTextureRight = NULL;
-  m_pRenderTargetViewRight = NULL;
-  m_pShaderResourceViewRight = NULL;
-  m_pGUIShader = NULL;
+  m_pTextureRight = nullptr;
+  m_pRenderTargetViewRight = nullptr;
+  m_pShaderResourceViewRight = nullptr;
+  m_pGUIShader = nullptr;
   m_bResizeRequred = false;
   m_bHWStereoEnabled = false;
   ZeroMemory(&m_cachedMode, sizeof(m_cachedMode));
   ZeroMemory(&m_viewPort, sizeof(m_viewPort));
   ZeroMemory(&m_scissor, sizeof(CRect));
+  ZeroMemory(&m_adapterDesc, sizeof(DXGI_ADAPTER_DESC));
 }
 
 CRenderSystemDX::~CRenderSystemDX()
@@ -139,33 +137,31 @@
   IDXGIAdapter1*  pAdapter;
   for (unsigned i = 0; m_dxgiFactory->EnumAdapters1(i, &pAdapter) != DXGI_ERROR_NOT_FOUND; ++i)
   {
+    DXGI_ADAPTER_DESC1 adaperDesc;
+    pAdapter->GetDesc1(&adaperDesc);
+
     IDXGIOutput* pOutput;
     for (unsigned j = 0; pAdapter->EnumOutputs(j, &pOutput) != DXGI_ERROR_NOT_FOUND; ++j)
     {
-      if (FAILED(pOutput->GetDesc(&outputDesc)))
-        break;
-
+      pOutput->GetDesc(&outputDesc);
       if (outputDesc.Monitor == monitor)
       {
+        CLog::Log(LOGDEBUG, __FUNCTION__" - Selected %S output. ", outputDesc.DeviceName);
+
         // update monitor info
         SAFE_RELEASE(m_pOutput);
         m_pOutput = pOutput;
 
-        CLog::Log(LOGDEBUG, __FUNCTION__" - Selected %S output. ", outputDesc.DeviceName);
-
         // check if adapter is changed
-        if (m_adapterIndex != i)
+        if ( m_adapterDesc.AdapterLuid.HighPart != adaperDesc.AdapterLuid.HighPart 
+          || m_adapterDesc.AdapterLuid.LowPart != adaperDesc.AdapterLuid.LowPart)
         {
-          pAdapter->GetDesc(&m_adapterDesc);
-
           CLog::Log(LOGDEBUG, __FUNCTION__" - Selected %S adapter. ", m_adapterDesc.Description);
 
+          pAdapter->GetDesc(&m_adapterDesc);
           SAFE_RELEASE(m_adapter);
           m_adapter = pAdapter;
-
           m_needNewDevice = true;
-          m_adapterIndex = i;
-
           return;
         }
 
@@ -182,7 +178,7 @@
   if (!m_pD3DDev)
     return false;
 
-  if (m_hDeviceWnd != NULL)
+  if (m_hDeviceWnd != nullptr)
   {
     HMONITOR hMonitor = MonitorFromWindow(m_hDeviceWnd, MONITOR_DEFAULTTONULL);
     if (hMonitor)
@@ -196,10 +192,8 @@
 
   if (!m_needNewDevice)
   {
-    CreateWindowSizeDependentResources();
     SetFullScreenInternal();
-    if (m_bResizeRequred)
-      CreateWindowSizeDependentResources();
+    CreateWindowSizeDependentResources();
   }
   else 
   {
@@ -316,6 +310,7 @@
   {
     CLog::Log(LOGDEBUG, "%s - Switching swap chain to windowed mode.", __FUNCTION__);
 
+    OnDisplayLost();
     hr = m_pSwapChain->SetFullscreenState(false, NULL);
     if (SUCCEEDED(hr))
       m_bResizeRequred = true;
@@ -337,6 +332,7 @@
       // swap chain requires to change FS mode after resize or transition from windowed to full-screen.
       CLog::Log(LOGDEBUG, "%s - Switching swap chain to fullscreen state.", __FUNCTION__);
 
+      OnDisplayLost();
       hr = m_pSwapChain->SetFullscreenState(true, m_pOutput);
       if (SUCCEEDED(hr))
         m_bResizeRequred = true;
@@ -345,9 +341,9 @@
     }
     SAFE_RELEASE(pOutput);
 
-    // do not change modes if hw stereo
-    if (g_graphicsContext.GetStereoMode() == RENDER_STEREO_MODE_HARDWAREBASED)
-      return;
+    // do not change modes if hw stereo enabled
+    if (m_bHWStereoEnabled)
+      goto end;
 
     DXGI_SWAP_CHAIN_DESC scDesc;
     m_pSwapChain->GetDesc(&scDesc);
@@ -371,6 +367,14 @@
     toMatchMode.Format = scDesc.BufferDesc.Format;
     toMatchMode.Scaling = scDesc.BufferDesc.Scaling;
     toMatchMode.ScanlineOrdering = scDesc.BufferDesc.ScanlineOrdering;
+    // force switch to 1080p23 before hardware stereo
+    if (RENDER_STEREO_MODE_HARDWAREBASED == g_graphicsContext.GetStereoMode())
+    {
+      toMatchMode.RefreshRate.Numerator = 24000;
+      toMatchMode.RefreshRate.Denominator = 1001;
+      toMatchMode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
+      m_refreshRate = RATIONAL_TO_FLOAT(toMatchMode.RefreshRate);
+    }
 
     // find closest mode
     m_pOutput->FindClosestMatchingMode(&toMatchMode, &matchedMode, m_pD3DDev);
@@ -386,6 +390,9 @@
       // change monitor resolution (in fullscreen mode) to required mode
       CLog::Log(LOGDEBUG, "%s - Switching mode to %dx%d@%0.3f.", __FUNCTION__, matchedMode.Width, matchedMode.Height, matchedRefreshRate);
 
+      if (!m_bResizeRequred)
+        OnDisplayLost();
+
       hr = m_pSwapChain->ResizeTarget(&matchedMode);
       if (SUCCEEDED(hr))
         m_bResizeRequred = true;
@@ -393,14 +400,10 @@
         CLog::Log(LOGERROR, "%s - Failed to switch output mode: %s", __FUNCTION__, GetErrorDescription(hr).c_str());
     }
   }
-
-  // wait until switching screen state is done
-  if (m_bResizeRequred)
-  {
-    OnDisplayLost();
-    DXWait(m_pD3DDev, m_pImdContext);
-    OnDisplayReset();
-  }
+end:
+  // in windowed mode DWM uses triple buffering in any case. 
+  // for FSEM we use double buffering
+  SetMaximumFrameLatency(2 - m_useWindowedDX);
 }
 
 bool CRenderSystemDX::IsFormatSupport(DXGI_FORMAT format, unsigned int usage)
@@ -513,7 +516,6 @@
   CSingleLock lock(m_resourceSection);
 
   HRESULT hr;
-
   SAFE_RELEASE(m_pD3DDev);
 
   D3D_FEATURE_LEVEL featureLevels[] =
@@ -532,9 +534,9 @@
 #ifdef _DEBUG
   createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
 #endif
-
+  D3D_DRIVER_TYPE driverType = m_adapter == nullptr ? D3D_DRIVER_TYPE_HARDWARE : D3D_DRIVER_TYPE_UNKNOWN;
   // we should specify D3D_DRIVER_TYPE_UNKNOWN if create device with specified adapter.
-  hr = D3D11CreateDevice(m_adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, createDeviceFlags, featureLevels, ARRAYSIZE(featureLevels), 
+  hr = D3D11CreateDevice(m_adapter, driverType, nullptr, createDeviceFlags, featureLevels, ARRAYSIZE(featureLevels),
                          D3D11_SDK_VERSION, &m_pD3DDev, &m_featureLevel, &m_pImdContext);
 
   if (FAILED(hr))
@@ -543,7 +545,7 @@
     CLog::Log(LOGDEBUG, "%s - First try to create device failed with error: %s.", __FUNCTION__, GetErrorDescription(hr).c_str());
     CLog::Log(LOGDEBUG, "%s - Trying to create device with lowest feature level: %#x.", __FUNCTION__, featureLevels[1]);
 
-    hr = D3D11CreateDevice(m_adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, createDeviceFlags, &featureLevels[1], ARRAYSIZE(featureLevels) - 1,
+    hr = D3D11CreateDevice(m_adapter, driverType, nullptr, createDeviceFlags, &featureLevels[1], ARRAYSIZE(featureLevels) - 1,
                            D3D11_SDK_VERSION, &m_pD3DDev, &m_featureLevel, &m_pImdContext);
     if (FAILED(hr))
     {
@@ -552,7 +554,7 @@
       CLog::Log(LOGDEBUG, "%s - Trying to create device without video API support.", __FUNCTION__);
 
       createDeviceFlags &= ~D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
-      hr = D3D11CreateDevice(m_adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, createDeviceFlags, &featureLevels[1], ARRAYSIZE(featureLevels) - 1,
+      hr = D3D11CreateDevice(m_adapter, driverType, nullptr, createDeviceFlags, &featureLevels[1], ARRAYSIZE(featureLevels) - 1,
                              D3D11_SDK_VERSION, &m_pD3DDev, &m_featureLevel, &m_pImdContext);
       if (SUCCEEDED(hr))
         CLog::Log(LOGNOTICE, "%s - Your video driver doesn't support DirectX 11 Video Acceleration API. Application is not be able to use hardware video processing and decoding", __FUNCTION__);
@@ -565,6 +567,42 @@
     return false;
   }
 
+  if (!m_adapter)
+  {
+    // get adapter from device if it was not detected previously
+    IDXGIDevice1* pDXGIDevice = nullptr;
+    if (SUCCEEDED(m_pD3DDev->QueryInterface(__uuidof(IDXGIDevice1), reinterpret_cast<void**>(&pDXGIDevice))))
+    {
+      IDXGIAdapter *pAdapter = nullptr;
+      if (SUCCEEDED(pDXGIDevice->GetAdapter(&pAdapter)))
+      {
+        hr = pAdapter->QueryInterface(__uuidof(IDXGIAdapter1), reinterpret_cast<void**>(&m_adapter));
+        SAFE_RELEASE(pAdapter);
+        if (FAILED(hr))
+          return false;
+
+        m_adapter->GetDesc(&m_adapterDesc);
+        CLog::Log(LOGDEBUG, __FUNCTION__" - Selected %S adapter. ", m_adapterDesc.Description);
+      }
+      SAFE_RELEASE(pDXGIDevice);
+    }
+  }
+
+  if (!m_adapter)
+  {
+    CLog::Log(LOGERROR, "%s - Failed to find adapter.", __FUNCTION__);
+    return false;
+  }
+
+  SAFE_RELEASE(m_dxgiFactory);
+  m_adapter->GetParent(__uuidof(IDXGIFactory1), reinterpret_cast<void**>(&m_dxgiFactory));
+
+  if (!m_pOutput)
+  {
+    HMONITOR hMonitor = MonitorFromWindow(m_hDeviceWnd, MONITOR_DEFAULTTONULL);
+    SetMonitor(hMonitor);
+  }
+
   if ( g_advancedSettings.m_bAllowDeferredRendering 
     && FAILED(m_pD3DDev->CreateDeferredContext(0, &m_pContext)))
   {
@@ -594,16 +632,9 @@
     pMultiThreading->Release();
   }
 
-  IDXGIDevice1* pDXGIDevice = NULL;
-  if (SUCCEEDED(m_pD3DDev->QueryInterface(__uuidof(IDXGIDevice1), reinterpret_cast<void**>(&pDXGIDevice))))
-  {
-    // Not sure the following actually does something but this exists in dx9 implementation
-    pDXGIDevice->SetGPUThreadPriority(7);
-    // Ensure that DXGI does not queue more than one frame at a time. This both reduces
-    // latency and ensures that the application will only render after each VSync
-    pDXGIDevice->SetMaximumFrameLatency(1);
-    SAFE_RELEASE(pDXGIDevice);
-  }
+  // in windowed mode DWM uses triple buffering in any case. 
+  // for FSEM we use double buffering
+  SetMaximumFrameLatency(2 - m_useWindowedDX);
 
 #ifdef _DEBUG
   if (SUCCEEDED(m_pD3DDev->QueryInterface(__uuidof(ID3D11Debug), reinterpret_cast<void**>(&m_d3dDebug))))
@@ -785,6 +816,7 @@
     DXWait(m_pD3DDev, m_pImdContext);
   }
 
+  uint32_t scFlags = m_useWindowedDX ? 0 : DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
   if (!m_pSwapChain)
   {
     CLog::Log(LOGDEBUG, "%s - Creating swapchain in %s mode.", __FUNCTION__, bHWStereoEnabled ? "Stereoscopic 3D" : "Mono");
@@ -804,7 +836,7 @@
       scDesc1.AlphaMode   = DXGI_ALPHA_MODE_UNSPECIFIED;
       scDesc1.Stereo      = bHWStereoEnabled;
       scDesc1.SwapEffect  = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
-      scDesc1.Flags       = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
+      scDesc1.Flags       = scFlags;
 
       scDesc1.SampleDesc.Count = 1;
       scDesc1.SampleDesc.Quality = 0;
@@ -834,6 +866,17 @@
         }
         m_bHWStereoEnabled = bHWStereoEnabled;
       }
+      else if (bHWStereoEnabled)
+      {
+        // switch to stereo mode failed, create mono swapchain
+        CLog::Log(LOGERROR, "%s - Creating swap chain failed with error: %s.", __FUNCTION__, GetErrorDescription(hr).c_str());
+
+        scDesc1.Stereo = false;
+        hr = dxgiFactory2->CreateSwapChainForHwnd(m_pD3DDev, m_hFocusWnd, &scDesc1, &scFSDesc, NULL, &m_pSwapChain1);
+
+        // fallback to split_horisontal mode.
+        g_graphicsContext.SetStereoMode(RENDER_STEREO_MODE_SPLIT_HORIZONTAL);
+      }
       dxgiFactory2->Release();
     }
     else
@@ -844,7 +887,7 @@
       scDesc.OutputWindow = m_hFocusWnd;
       scDesc.Windowed     = m_useWindowedDX;
       scDesc.SwapEffect   = DXGI_SWAP_EFFECT_SEQUENTIAL;
-      scDesc.Flags        = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
+      scDesc.Flags        = scFlags;
 
       scDesc.BufferDesc.Width   = m_nBackBufferWidth;
       scDesc.BufferDesc.Height  = m_nBackBufferHeight;
@@ -870,7 +913,7 @@
   else
   {
     // resize swap chain buffers with preserving the existing buffer count and format.
-    hr = m_pSwapChain->ResizeBuffers(scDesc.BufferCount, m_nBackBufferWidth, m_nBackBufferHeight, scDesc.BufferDesc.Format, scDesc.Flags);
+    hr = m_pSwapChain->ResizeBuffers(scDesc.BufferCount, m_nBackBufferWidth, m_nBackBufferHeight, scDesc.BufferDesc.Format, scFlags);
     if (FAILED(hr))
     {
       CLog::Log(LOGERROR, "%s - Failed to resize buffers (%s).", __FUNCTION__, GetErrorDescription(hr).c_str());
@@ -956,12 +999,8 @@
   if (bRestoreRTView)
     m_pContext->OMSetRenderTargets(1, &m_pRenderTargetView, m_depthStencilView);
 
-  // trigger display reset event when transition from/to stereo mode occured
-  if (bNeedRecreate)
-  {
-    OnDisplayLost();
-    OnDeviceReset();
-  }
+  if (m_bResizeRequred)
+    OnDisplayBack();
 
   m_resizeInProgress = false;
   m_bResizeRequred = false;
@@ -1161,9 +1200,9 @@
 
   if (DXGI_ERROR_INVALID_CALL == hr)
   {
-    m_bResizeRequred = true;
-    if (CreateWindowSizeDependentResources())
-      hr = S_OK;
+    SetFullScreenInternal();
+    CreateWindowSizeDependentResources();
+    hr = S_OK;
   }
 
   if (FAILED(hr))
@@ -1210,9 +1249,9 @@
     break;
   case DXGI_ERROR_INVALID_CALL: // application provided invalid parameter data. Try to return after resize buffers
     CLog::Log(LOGERROR, "DXGI_ERROR_INVALID_CALL");
-    m_bResizeRequred = true;
-    if (CreateWindowSizeDependentResources())
-      m_nDeviceStatus = S_OK;
+    SetFullScreenInternal();
+    CreateWindowSizeDependentResources();
+    m_nDeviceStatus = S_OK;
     break;
   case DXGI_STATUS_OCCLUDED: // decide what we should do when windows content is not visible
     // do not spam to log file
@@ -1702,4 +1741,17 @@
   SAFE_RELEASE(pCommandList);
 }
 
+void CRenderSystemDX::SetMaximumFrameLatency(uint32_t latency)
+{
+  if (!m_pD3DDev)
+    return;
+
+  IDXGIDevice1* pDXGIDevice = nullptr;
+  if (SUCCEEDED(m_pD3DDev->QueryInterface(__uuidof(IDXGIDevice1), reinterpret_cast<void**>(&pDXGIDevice))))
+  {
+    pDXGIDevice->SetMaximumFrameLatency(latency);
+    SAFE_RELEASE(pDXGIDevice);
+  }
+}
+
 #endif

_service:download_url:master.tar.gz/xbmc/rendering/dx/RenderSystemDX.h Changed

@@ -110,12 +110,14 @@
   void SetFullScreenInternal();
   void GetClosestDisplayModeToCurrent(IDXGIOutput* output, DXGI_MODE_DESC* outCurrentDisplayMode, bool useCached = false);
   void CheckInterlasedStereoView(void);
-  void Register(ID3DResource *resource);
-  void Unregister(ID3DResource *resource);
+  void SetMaximumFrameLatency(uint32_t latency);
 
+  virtual void Register(ID3DResource *resource);
+  virtual void Unregister(ID3DResource *resource);
   virtual void UpdateMonitor() {};
   virtual void OnDisplayLost() {};
   virtual void OnDisplayReset() {};
+  virtual void OnDisplayBack() {};
 
   // our adapter could change as we go
   bool                        m_needNewDevice;
@@ -141,7 +143,6 @@
   IDXGIFactory1*              m_dxgiFactory;
   ID3D11Device*               m_pD3DDev;
   IDXGIAdapter1*              m_adapter;
-  int                         m_adapterIndex;
   IDXGIOutput*                m_pOutput;
   ID3D11DeviceContext*        m_pContext;
   ID3D11DeviceContext*        m_pImdContext;

_service:download_url:master.tar.gz/xbmc/rendering/gl/RenderSystemGL.cpp Changed

_service:download_url:master.tar.gz/xbmc/rendering/gl/RenderSystemGL.h Changed

@@ -23,8 +23,6 @@
 
 #pragma once
 
-#if defined(HAVE_LIBGL)
-
 #include "system.h"
 #include "system_gl.h"
 #include "rendering/RenderSystem.h"
@@ -34,44 +32,44 @@
 public:
   CRenderSystemGL();
   virtual ~CRenderSystemGL();
-  virtual void CheckOpenGLQuirks();
-  virtual bool InitRenderSystem();
-  virtual bool DestroyRenderSystem();
-  virtual bool ResetRenderSystem(int width, int height, bool fullScreen, float refreshRate);
+  void CheckOpenGLQuirks();
+  bool InitRenderSystem() override;
+  bool DestroyRenderSystem() override;
+  bool ResetRenderSystem(int width, int height, bool fullScreen, float refreshRate) override;
 
-  virtual bool BeginRender();
-  virtual bool EndRender();
-  virtual void PresentRender(bool rendered);
-  virtual bool ClearBuffers(color_t color);
-  virtual bool IsExtSupported(const char* extension);
+  bool BeginRender() override;
+  bool EndRender() override;
+  void PresentRender(bool rendered) override;
+  bool ClearBuffers(color_t color) override;
+  bool IsExtSupported(const char* extension) override;
 
-  virtual void SetVSync(bool vsync);
-  virtual void ResetVSync() { m_bVsyncInit = false; }
-  virtual void FinishPipeline();
+  void SetVSync(bool vsync) override;
+  void ResetVSync() { m_bVsyncInit = false; }
+  void FinishPipeline() override;
 
-  virtual void SetViewPort(CRect& viewPort);
-  virtual void GetViewPort(CRect& viewPort);
+  void SetViewPort(CRect& viewPort) override;
+  void GetViewPort(CRect& viewPort) override;
 
-  virtual void SetScissors(const CRect &rect);
-  virtual void ResetScissors();
+  void SetScissors(const CRect &rect) override;
+  void ResetScissors() override;
 
-  virtual void CaptureStateBlock();
-  virtual void ApplyStateBlock();
+  void CaptureStateBlock() override;
+  void ApplyStateBlock() override;
 
-  virtual void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f);
+  void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f) override;
 
-  virtual void ApplyHardwareTransform(const TransformMatrix &matrix);
-  virtual void RestoreHardwareTransform();
-  virtual void SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view);
-  virtual bool SupportsStereo(RENDER_STEREO_MODE mode);
+  void ApplyHardwareTransform(const TransformMatrix &matrix) override;
+  void RestoreHardwareTransform() override;
+  void SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view) override;
+  bool SupportsStereo(RENDER_STEREO_MODE mode) const override;
 
-  virtual bool TestRender();
+  bool TestRender() override;
 
-  virtual void Project(float &x, float &y, float &z);
+  void Project(float &x, float &y, float &z) override;
 
-  virtual void GetGLSLVersion(int& major, int& minor);
+  void GetGLSLVersion(int& major, int& minor);
 
-  virtual void ResetGLErrors();
+  void ResetGLErrors();
 
 protected:
   virtual void SetVSyncImpl(bool enable) = 0;
@@ -86,14 +84,12 @@
 
   std::string m_RenderExtensions;
 
-  int        m_glslMajor;
-  int        m_glslMinor;
+  int        m_glslMajor = 0;
+  int        m_glslMinor = 0;
   
   GLint      m_viewPort[4];
 
-  uint8_t m_latencyCounter;
+  uint8_t m_latencyCounter = 0;
 };
 
-#endif // HAVE_LIBGL
-
 #endif // RENDER_SYSTEM_H

_service:download_url:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.cpp Changed

_service:download_url:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.h Changed

@@ -50,39 +50,39 @@
   CRenderSystemGLES();
   virtual ~CRenderSystemGLES();
 
-  virtual bool InitRenderSystem();
-  virtual bool DestroyRenderSystem();
-  virtual bool ResetRenderSystem(int width, int height, bool fullScreen, float refreshRate);
+  bool InitRenderSystem() override;
+  bool DestroyRenderSystem() override;
+  bool ResetRenderSystem(int width, int height, bool fullScreen, float refreshRate) override;
 
-  virtual bool BeginRender();
-  virtual bool EndRender();
-  virtual void PresentRender(bool rendered);
-  virtual bool ClearBuffers(color_t color);
-  virtual bool IsExtSupported(const char* extension);
+  bool BeginRender() override;
+  bool EndRender() override;
+  void PresentRender(bool rendered) override;
+  bool ClearBuffers(color_t color) override;
+  bool IsExtSupported(const char* extension) override;
 
-  virtual void SetVSync(bool vsync);
-  virtual void ResetVSync() { m_bVsyncInit = false; }
+  void SetVSync(bool vsync) override;
+  void ResetVSync() { m_bVsyncInit = false; }
 
-  virtual void SetViewPort(CRect& viewPort);
-  virtual void GetViewPort(CRect& viewPort);
+  void SetViewPort(CRect& viewPort) override;
+  void GetViewPort(CRect& viewPort) override;
 
-  virtual bool ScissorsCanEffectClipping();
-  virtual CRect ClipRectToScissorRect(const CRect &rect);
-  virtual void SetScissors(const CRect& rect);
-  virtual void ResetScissors();
+  bool ScissorsCanEffectClipping() override;
+  CRect ClipRectToScissorRect(const CRect &rect) override;
+  void SetScissors(const CRect& rect) override;
+  void ResetScissors() override;
 
-  virtual void CaptureStateBlock();
-  virtual void ApplyStateBlock();
+  void CaptureStateBlock() override;
+  void ApplyStateBlock() override;
 
-  virtual void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f);
+  void SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor = 0.0f) override;
 
-  virtual void ApplyHardwareTransform(const TransformMatrix &matrix);
-  virtual void RestoreHardwareTransform();
-  virtual bool SupportsStereo(RENDER_STEREO_MODE mode);
+  void ApplyHardwareTransform(const TransformMatrix &matrix) override;
+  void RestoreHardwareTransform() override;
+  bool SupportsStereo(RENDER_STEREO_MODE mode) const override;
 
-  virtual bool TestRender();
+  bool TestRender() override;
 
-  virtual void Project(float &x, float &y, float &z);
+  void Project(float &x, float &y, float &z) override;
 
   void InitialiseGUIShader();
   void EnableGUIShader(ESHADERMETHOD method);
@@ -113,8 +113,8 @@
 
   std::string m_RenderExtensions;
 
-  CGUIShader  **m_pGUIshader;  // One GUI shader for each method
-  ESHADERMETHOD m_method;      // Current GUI Shader method
+  CGUIShader  **m_pGUIshader = nullptr; // One GUI shader for each method
+  ESHADERMETHOD m_method = SM_DEFAULT; // Current GUI Shader method
 
   GLint      m_viewPort[4];
 };

_service:download_url:master.tar.gz/xbmc/settings/AdvancedSettings.cpp Changed

_service:download_url:master.tar.gz/xbmc/settings/SettingConditions.cpp Changed

@@ -32,12 +32,14 @@
 #include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.h"
 #include "guilib/LocalizeStrings.h"
 #include "peripherals/Peripherals.h"
+#include "peripherals/bus/virtual/PeripheralBusAddon.h"
 #include "profiles/ProfilesManager.h"
 #include "pvr/PVRManager.h"
 #include "settings/SettingAddon.h"
 #if defined(HAS_LIBAMCODEC)
 #include "utils/AMLUtils.h"
 #endif // defined(HAS_LIBAMCODEC)
+#include "utils/StringUtils.h"
 #include "utils/SystemInfo.h"
 #include "windowing/WindowingFactory.h"
 #if defined(TARGET_DARWIN_OSX)
@@ -78,6 +80,14 @@
   return PERIPHERALS::g_peripherals.GetNumberOfPeripherals() > 0;
 }
 
+bool SupportsPeripheralControllers(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
+{
+  using namespace PERIPHERALS;
+
+  PeripheralBusAddonPtr bus = std::static_pointer_cast<CPeripheralBusAddon>(g_peripherals.GetBusByType(PERIPHERAL_BUS_ADDON));
+  return bus != nullptr && bus->HasFeature(FEATURE_JOYSTICK);
+}
+
 bool IsFullscreen(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
 {
   return g_Windowing.IsFullScreen();
@@ -172,6 +182,74 @@
   return CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() == lock;
 }
 
+bool GreaterThan(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
+{
+  if (setting == NULL)
+    return false;
+
+  const CSettingInt *settingInt = dynamic_cast<const CSettingInt*>(setting);
+  if (settingInt == NULL)
+    return false;
+
+  char *tmp = NULL;
+
+  int lhs = settingInt->GetValue();
+  int rhs = StringUtils::IsInteger(value) ? (int)strtol(value.c_str(), &tmp, 0) : 0;
+
+  return lhs > rhs;
+}
+
+bool GreaterThanOrEqual(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
+{
+  if (setting == NULL)
+    return false;
+
+  const CSettingInt *settingInt = dynamic_cast<const CSettingInt*>(setting);
+  if (settingInt == NULL)
+    return false;
+
+  char *tmp = NULL;
+
+  int lhs = settingInt->GetValue();
+  int rhs = StringUtils::IsInteger(value) ? (int)strtol(value.c_str(), &tmp, 0) : 0;
+
+  return lhs >= rhs;
+}
+
+bool LessThan(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
+{
+  if (setting == NULL)
+    return false;
+
+  const CSettingInt *settingInt = dynamic_cast<const CSettingInt*>(setting);
+  if (settingInt == NULL)
+    return false;
+
+  char *tmp = NULL;
+
+  int lhs = settingInt->GetValue();
+  int rhs = StringUtils::IsInteger(value) ? (int)strtol(value.c_str(), &tmp, 0) : 0;
+
+  return lhs < rhs;
+}
+
+bool LessThanOrEqual(const std::string &condition, const std::string &value, const CSetting *setting, void *data)
+{
+  if (setting == NULL)
+    return false;
+
+  const CSettingInt *settingInt = dynamic_cast<const CSettingInt*>(setting);
+  if (settingInt == NULL)
+    return false;
+
+  char *tmp = NULL;
+
+  int lhs = settingInt->GetValue();
+  int rhs = StringUtils::IsInteger(value) ? (int)strtol(value.c_str(), &tmp, 0) : 0;
+
+  return lhs <= rhs;
+}
+
 std::set<std::string> CSettingConditions::m_simpleConditions;
 std::map<std::string, SettingConditionCheck> CSettingConditions::m_complexConditions;
 
@@ -206,9 +284,6 @@
 #if HAS_GLES == 2
   m_simpleConditions.insert("has_glesv2");
 #endif
-#ifdef HAS_SDL_JOYSTICK
-  m_simpleConditions.insert("has_sdl_joystick");
-#endif
 #ifdef HAS_TIME_SERVER
   m_simpleConditions.insert("has_time_server");
 #endif
@@ -268,6 +343,7 @@
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("checkmasterlock",               CheckMasterLock));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("checkpvrparentalpin",           CheckPVRParentalPin));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("hasperipherals",                HasPeripherals));
+  m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("supportsperipheralcontrollers", SupportsPeripheralControllers));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("isfullscreen",                  IsFullscreen));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("ismasteruser",                  IsMasterUser));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("isusingttfsubtitles",           IsUsingTTFSubtitles));
@@ -286,6 +362,10 @@
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("profilelockmode",               ProfileLockMode));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("aesettingvisible",              CAEFactory::IsSettingVisible));
   m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("codecoptionvisible",            CDVDVideoCodec::IsSettingVisible));
+  m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("gt",                            GreaterThan));
+  m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("gte",                           GreaterThanOrEqual));
+  m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("lt",                            LessThan));
+  m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("lte",                           LessThanOrEqual));
 }
 
 bool CSettingConditions::Check(const std::string &condition, const std::string &value /* = "" */, const CSetting *setting /* = NULL */)

_service:download_url:master.tar.gz/xbmc/settings/Settings.cpp Changed

@@ -63,7 +63,6 @@
 #include "peripherals/Peripherals.h"
 #include "powermanagement/PowerManager.h"
 #include "profiles/ProfilesManager.h"
-#include "pvr/PVRManager.h"
 #include "pvr/PVRSettings.h"
 #include "pvr/windows/GUIWindowPVRGuide.h"
 #include "settings/AdvancedSettings.h"
@@ -216,7 +215,6 @@
 const std::string CSettings::SETTING_SCRAPERS_MOVIESDEFAULT = "scrapers.moviesdefault";
 const std::string CSettings::SETTING_SCRAPERS_TVSHOWSDEFAULT = "scrapers.tvshowsdefault";
 const std::string CSettings::SETTING_SCRAPERS_MUSICVIDEOSDEFAULT = "scrapers.musicvideosdefault";
-const std::string CSettings::SETTING_PVRMANAGER_ENABLED = "pvrmanager.enabled";
 const std::string CSettings::SETTING_PVRMANAGER_HIDECONNECTIONLOSTWARNING = "pvrmanager.hideconnectionlostwarning";
 const std::string CSettings::SETTING_PVRMANAGER_SYNCCHANNELGROUPS = "pvrmanager.syncchannelgroups";
 const std::string CSettings::SETTING_PVRMANAGER_BACKENDCHANNELORDER = "pvrmanager.backendchannelorder";
@@ -369,7 +367,7 @@
 const std::string CSettings::SETTING_AUDIOOUTPUT_DTSHDPASSTHROUGH = "audiooutput.dtshdpassthrough";
 const std::string CSettings::SETTING_INPUT_PERIPHERALS = "input.peripherals";
 const std::string CSettings::SETTING_INPUT_ENABLEMOUSE = "input.enablemouse";
-const std::string CSettings::SETTING_INPUT_ENABLEJOYSTICK = "input.enablejoystick";
+const std::string CSettings::SETTING_INPUT_CONTROLLERCONFIG = "input.controllerconfig";
 const std::string CSettings::SETTING_INPUT_APPLEREMOTEMODE = "input.appleremotemode";
 const std::string CSettings::SETTING_INPUT_APPLEREMOTEALWAYSON = "input.appleremotealwayson";
 const std::string CSettings::SETTING_INPUT_APPLEREMOTESEQUENCETIME = "input.appleremotesequencetime";
@@ -608,7 +606,6 @@
   m_settingsManager->UnregisterCallback(&CInputManager::GetInstance());
   m_settingsManager->UnregisterCallback(&CNetworkServices::GetInstance());
   m_settingsManager->UnregisterCallback(&g_passwordManager);
-  m_settingsManager->UnregisterCallback(&PVR::g_PVRManager);
   m_settingsManager->UnregisterCallback(&CRssManager::GetInstance());
   m_settingsManager->UnregisterCallback(&ADDON::CRepositoryUpdater::GetInstance());
 #if defined(TARGET_LINUX)
@@ -1115,7 +1112,6 @@
   m_settingsManager->RegisterCallback(&g_langInfo, settingSet);
 
   settingSet.clear();
-  settingSet.insert(CSettings::SETTING_INPUT_ENABLEJOYSTICK);
   settingSet.insert(CSettings::SETTING_INPUT_ENABLEMOUSE);
   m_settingsManager->RegisterCallback(&CInputManager::GetInstance(), settingSet);
 
@@ -1147,19 +1143,6 @@
   m_settingsManager->RegisterCallback(&g_passwordManager, settingSet);
 
   settingSet.clear();
-  settingSet.insert(CSettings::SETTING_PVRMANAGER_ENABLED);
-  settingSet.insert(CSettings::SETTING_PVRMANAGER_CHANNELMANAGER);
-  settingSet.insert(CSettings::SETTING_PVRMANAGER_GROUPMANAGER);
-  settingSet.insert(CSettings::SETTING_PVRMANAGER_CHANNELSCAN);
-  settingSet.insert(CSettings::SETTING_PVRMANAGER_RESETDB);
-  settingSet.insert(CSettings::SETTING_PVRCLIENT_MENUHOOK);
-  settingSet.insert(CSettings::SETTING_PVRMENU_SEARCHICONS);
-  settingSet.insert(CSettings::SETTING_EPG_RESETEPG);
-  settingSet.insert(CSettings::SETTING_EPG_DAYSTODISPLAY);
-  settingSet.insert(CSettings::SETTING_PVRPARENTAL_ENABLED);
-  m_settingsManager->RegisterCallback(&PVR::g_PVRManager, settingSet);
-
-  settingSet.clear();
   settingSet.insert(CSettings::SETTING_LOOKANDFEEL_RSSEDIT);
   m_settingsManager->RegisterCallback(&CRssManager::GetInstance(), settingSet);
 
@@ -1177,6 +1160,7 @@
 
   settingSet.clear();
   settingSet.insert(CSettings::SETTING_INPUT_PERIPHERALS);
+  settingSet.insert(CSettings::SETTING_INPUT_CONTROLLERCONFIG);
   settingSet.insert(CSettings::SETTING_LOCALE_LANGUAGE);
   m_settingsManager->RegisterCallback(&PERIPHERALS::CPeripherals::GetInstance(), settingSet);

_service:download_url:master.tar.gz/xbmc/settings/Settings.h Changed

_service:download_url:master.tar.gz/xbmc/settings/dialogs/GUIDialogContentSettings.cpp Changed

@@ -334,8 +334,8 @@
   if (subsetting != NULL)
     subsetting->SetParent(SETTING_SCRAPER_LIST);
 
-  group = AddGroup(category, 20322);
-  if (category == NULL)
+  CSettingGroup *groupDetails = AddGroup(category, 20322);
+  if (groupDetails == NULL)
   {
     CLog::Log(LOGERROR, "CGUIDialogContentSettings: unable to setup scanning settings");
     return;
@@ -344,18 +344,18 @@
   {
     case CONTENT_TVSHOWS:
     {
-      AddToggle(group, SETTING_CONTAINS_SINGLE_ITEM, 20379, 0, m_containsSingleItem, false, m_showScanSettings);
-      AddToggle(group, SETTING_NO_UPDATING, 20432, 0, m_noUpdating, false, m_showScanSettings);
+      AddToggle(groupDetails, SETTING_CONTAINS_SINGLE_ITEM, 20379, 0, m_containsSingleItem, false, m_showScanSettings);
+      AddToggle(groupDetails, SETTING_NO_UPDATING, 20432, 0, m_noUpdating, false, m_showScanSettings);
       break;
     }
 
     case CONTENT_MOVIES:
     case CONTENT_MUSICVIDEOS:
     {
-      AddToggle(group, SETTING_USE_DIRECTORY_NAMES, m_content == CONTENT_MOVIES ? 20329 : 20330, 0, m_useDirectoryNames, false, m_showScanSettings);
-      CSettingBool *settingScanRecursive = AddToggle(group, SETTING_SCAN_RECURSIVE, 20346, 0, m_scanRecursive, false, m_showScanSettings);
-      CSettingBool *settingContainsSingleItem = AddToggle(group, SETTING_CONTAINS_SINGLE_ITEM, 20383, 0, m_containsSingleItem, false, m_showScanSettings);
-      AddToggle(group, SETTING_NO_UPDATING, 20432, 0, m_noUpdating, false, m_showScanSettings);
+      AddToggle(groupDetails, SETTING_USE_DIRECTORY_NAMES, m_content == CONTENT_MOVIES ? 20329 : 20330, 0, m_useDirectoryNames, false, m_showScanSettings);
+      CSettingBool *settingScanRecursive = AddToggle(groupDetails, SETTING_SCAN_RECURSIVE, 20346, 0, m_scanRecursive, false, m_showScanSettings);
+      CSettingBool *settingContainsSingleItem = AddToggle(groupDetails, SETTING_CONTAINS_SINGLE_ITEM, 20383, 0, m_containsSingleItem, false, m_showScanSettings);
+      AddToggle(groupDetails, SETTING_NO_UPDATING, 20432, 0, m_noUpdating, false, m_showScanSettings);
       
       // define an enable dependency with (m_useDirectoryNames && !m_containsSingleItem) || !m_useDirectoryNames
       CSettingDependency dependencyScanRecursive(SettingDependencyTypeEnable, m_settingsManager);
@@ -387,7 +387,7 @@
 
     case CONTENT_NONE:
     default:
-      AddToggle(group, SETTING_EXCLUDE, 20380, 0, m_exclude, false, !m_showScanSettings);
+      AddToggle(groupDetails, SETTING_EXCLUDE, 20380, 0, m_exclude, false, !m_showScanSettings);
       break;
   }
 }

_service:download_url:master.tar.gz/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp Changed

_service:download_url:master.tar.gz/xbmc/system.h Changed

_service:download_url:master.tar.gz/xbmc/test/TestBasicEnvironment.cpp Changed

@@ -28,6 +28,7 @@
 #include "settings/Settings.h"
 #include "Util.h"
 #include "Application.h"
+#include "interfaces/AnnouncementManager.h"
 
 #include <cstdio>
 #include <cstdlib>
@@ -37,6 +38,10 @@
 {
   XFILE::CFile *f;
 
+  g_application.m_ServiceManager.reset(new CServiceManager());
+  if (!g_application.m_ServiceManager->Init1())
+    exit(1);
+
   /* NOTE: The below is done to fix memleak warning about unitialized variable
    * in xbmcutil::GlobalsSingleton<CAdvancedSettings>::getInstance().
    */
@@ -63,6 +68,9 @@
   g_powerManager.Initialize();
   CSettings::GetInstance().Initialize();
 
+  if (!g_application.m_ServiceManager->Init2())
+    exit(1);
+
   /* Create a temporary directory and set it to be used throughout the
    * test suite run.
    */
@@ -107,6 +115,7 @@
   std::string xbmcTempPath = CSpecialProtocol::TranslatePath("special://temp/");
   XFILE::CDirectory::Remove(xbmcTempPath);
   CSettings::GetInstance().Uninitialize();
+  g_application.m_ServiceManager->Deinit();
 }
 
 void TestBasicEnvironment::SetUpError()

_service:download_url:master.tar.gz/xbmc/utils/StringUtils.cpp Changed

_service:download_url:master.tar.gz/xbmc/utils/URIUtils.cpp Changed

@@ -784,12 +784,10 @@
 
 bool URIUtils::IsSpecial(const std::string& strFile)
 {
-  std::string strFile2(strFile);
-
   if (IsStack(strFile))
-    strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+    return IsSpecial(CStackDirectory::GetFirstStackedFile(strFile));
 
-  return IsProtocol(strFile2, "special");
+  return IsProtocol(strFile, "special");
 }
 
 bool URIUtils::IsPlugin(const std::string& strFile)
@@ -880,32 +878,34 @@
 
 bool URIUtils::IsUDP(const std::string& strFile)
 {
-  std::string strFile2(strFile);
-
   if (IsStack(strFile))
-    strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+    return IsUDP(CStackDirectory::GetFirstStackedFile(strFile));
 
-  return IsProtocol(strFile2, "udp");
+  return IsProtocol(strFile, "udp");
 }
 
 bool URIUtils::IsTCP(const std::string& strFile)
 {
-  std::string strFile2(strFile);
-
   if (IsStack(strFile))
-    strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+    return IsTCP(CStackDirectory::GetFirstStackedFile(strFile));
 
-  return IsProtocol(strFile2, "tcp");
+  return IsProtocol(strFile, "tcp");
 }
 
 bool URIUtils::IsPVRChannel(const std::string& strFile)
 {
-  std::string strFile2(strFile);
+  if (IsStack(strFile))
+    return IsPVRChannel(CStackDirectory::GetFirstStackedFile(strFile));
 
+  return StringUtils::StartsWithNoCase(strFile, "pvr://channels");
+}
+
+bool URIUtils::IsPVRGuideItem(const std::string& strFile)
+{
   if (IsStack(strFile))
-    strFile2 = CStackDirectory::GetFirstStackedFile(strFile);
+    return IsPVRGuideItem(CStackDirectory::GetFirstStackedFile(strFile));
 
-  return StringUtils::StartsWithNoCase(strFile2, "pvr://channels");
+  return StringUtils::StartsWithNoCase(strFile, "pvr://guide");
 }
 
 bool URIUtils::IsDAV(const std::string& strFile)

_service:download_url:master.tar.gz/xbmc/utils/URIUtils.h Changed

_service:download_url:master.tar.gz/xbmc/video/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/video/ContextMenus.cpp Added

@@ -0,0 +1,131 @@
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenus.h"
+#include "Application.h"
+#include "Autorun.h"
+#include "video/dialogs/GUIDialogVideoInfo.h"
+
+
+namespace CONTEXTMENU
+{
+
+CVideoInfo::CVideoInfo(MediaType mediaType)
+    : CStaticContextMenuAction(19033), m_mediaType(mediaType) {}
+
+bool CVideoInfo::IsVisible(const CFileItem& item) const
+{
+  return item.HasVideoInfoTag() && item.GetVideoInfoTag()->m_type == m_mediaType;
+}
+
+bool CVideoInfo::Execute(const CFileItemPtr& item) const
+{
+  CGUIDialogVideoInfo::ShowFor(*item);
+  return true;
+}
+
+bool CMarkWatched::IsVisible(const CFileItem& item) const
+{
+  if (!item.HasVideoInfoTag())
+    return false;
+  if (item.m_bIsFolder) //Only allow db content to be updated recursively
+    return item.IsVideoDb();
+  return item.GetVideoInfoTag()->m_playCount == 0;
+}
+
+bool CMarkWatched::Execute(const CFileItemPtr& item) const
+{
+  CVideoLibraryQueue::GetInstance().MarkAsWatched(item, true);
+  return true;
+}
+
+bool CMarkUnWatched::IsVisible(const CFileItem& item) const
+{
+  if (!item.HasVideoInfoTag())
+    return false;
+  if (item.m_bIsFolder) //Only allow db content to be updated recursively
+    return item.IsVideoDb();
+  return item.GetVideoInfoTag()->m_playCount > 0;
+}
+
+bool CMarkUnWatched::Execute(const CFileItemPtr& item) const
+{
+  CVideoLibraryQueue::GetInstance().MarkAsWatched(item, false);
+  return true;
+}
+
+std::string CResume::GetLabel(const CFileItem& item) const
+{
+  return CGUIWindowVideoBase::GetResumeString(item);
+}
+
+bool CResume::IsVisible(const CFileItem& item) const
+{
+  return CGUIWindowVideoBase::HasResumeItemOffset(&item);
+}
+
+static void SetPathAndPlay(CFileItem&& item)
+{
+  if (item.IsVideoDb())
+  {
+    item.SetProperty("original_listitem_url", item.GetPath());
+    item.SetPath(item.GetVideoInfoTag()->m_strFileNameAndPath);
+  }
+  g_application.PlayFile(item, "");
+}
+
+bool CResume::Execute(const CFileItemPtr& item) const
+{
+#ifdef HAS_DVD_DRIVE
+  if (item->IsDVD() || item->IsCDDA())
+    return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, false);
+#endif
+
+  CFileItem cpy(*item);
+  cpy.m_lStartOffset = STARTOFFSET_RESUME;
+  SetPathAndPlay(std::move(cpy));
+  return true;
+};
+
+std::string CPlay::GetLabel(const CFileItem& item) const
+{
+  if (CGUIWindowVideoBase::HasResumeItemOffset(&item))
+    return g_localizeStrings.Get(12023);
+  return g_localizeStrings.Get(208);
+}
+
+bool CPlay::IsVisible(const CFileItem& item) const
+{
+  if (item.m_bIsFolder)
+    return false; //TODO: implement
+  return item.IsVideo() || item.IsDVD() || item.IsCDDA();
+}
+
+bool CPlay::Execute(const CFileItemPtr& item) const
+{
+#ifdef HAS_DVD_DRIVE
+  if (item->IsDVD() || item->IsCDDA())
+    return MEDIA_DETECT::CAutorun::PlayDisc(item->GetPath(), true, true);
+#endif
+  SetPathAndPlay(CFileItem(*item));
+  return true;
+};
+
+}

_service:download_url:master.tar.gz/xbmc/video/ContextMenus.h Added

@@ -0,0 +1,87 @@
+#pragma once
+/*
+ *      Copyright (C) 2016 Team Kodi
+ *      http://kodi.tv
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "ContextMenuItem.h"
+#include "guilib/GUIWindowManager.h"
+#include "video/windows/GUIWindowVideoNav.h"
+#include "VideoLibraryQueue.h"
+
+namespace CONTEXTMENU
+{
+
+class CVideoInfo : public CStaticContextMenuAction
+{
+public:
+  explicit CVideoInfo(MediaType mediaType);
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+private:
+  const MediaType m_mediaType;
+};
+
+struct CTVShowInfo : CVideoInfo
+{
+  CTVShowInfo() : CVideoInfo(MediaTypeTvShow) {}
+};
+
+struct CEpisodeInfo : CVideoInfo
+{
+  CEpisodeInfo() : CVideoInfo(MediaTypeEpisode) {}
+};
+
+struct CMusicVideoInfo : CVideoInfo
+{
+  CMusicVideoInfo() : CVideoInfo(MediaTypeMusicVideo) {}
+};
+
+struct CMovieInfo : CVideoInfo
+{
+  CMovieInfo() : CVideoInfo(MediaTypeMovie) {}
+};
+
+struct CMarkWatched : CStaticContextMenuAction
+{
+  CMarkWatched() : CStaticContextMenuAction(16103) {}
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+};
+
+struct CMarkUnWatched : CStaticContextMenuAction
+{
+  CMarkUnWatched() : CStaticContextMenuAction(16104) {}
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+};
+
+struct CResume : IContextMenuItem
+{
+  std::string GetLabel(const CFileItem& item) const override;
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& _item) const override;
+};
+
+struct CPlay : IContextMenuItem
+{
+  std::string GetLabel(const CFileItem& item) const override;
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& _item) const override;
+};
+}

_service:download_url:master.tar.gz/xbmc/video/FFmpegVideoDecoder.cpp Deleted

@@ -1,302 +0,0 @@
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "system.h"
-#include "guilib/Texture.h"
-
-#include "FFmpegVideoDecoder.h"
-
-extern "C" {
-#include "libavformat/avformat.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/avutil.h"
-#include "libswscale/swscale.h"
-}
-
-FFmpegVideoDecoder::FFmpegVideoDecoder()
-{
-  m_pFormatCtx = 0;
-  m_pCodecCtx = 0;
-  m_pCodec = 0;
-  m_pFrame = 0;
-  m_pFrameRGB = 0;
-}
-
-FFmpegVideoDecoder::~FFmpegVideoDecoder()
-{
-  close();
-}
-
-void FFmpegVideoDecoder::close()
-{
-  // Free the YUV frame
-  if ( m_pFrame )
-	av_free( m_pFrame );
-
-  // Free the RGB frame
-  if ( m_pFrameRGB )
-  {
-	avpicture_free( m_pFrameRGB );
-	av_free( m_pFrameRGB );
-  }
-
-  // Close the codec
-  if ( m_pCodecCtx )
-	avcodec_close( m_pCodecCtx );
-
-  // Close the video file
-  if ( m_pFormatCtx )
-	avformat_close_input( &m_pFormatCtx );
-
-  m_pFormatCtx = 0;
-  m_pCodecCtx = 0;
-  m_pCodec = 0;
-  m_pFrame = 0;
-  m_pFrameRGB = 0;
-}
-
-bool FFmpegVideoDecoder::isOpened() const
-{
-  return m_pFrame ? true : false;
-}
-
-double FFmpegVideoDecoder::getDuration() const
-{
-  if (m_pFormatCtx)
-  {
-    double duration = static_cast<double>(m_pFormatCtx->duration) / AV_TIME_BASE;
-    if (duration > 0.0)
-      return duration;
-  }
-
-  return 0.0;
-}
-  
-double FFmpegVideoDecoder::getFramesPerSecond() const
-{
-#if defined(AVFORMAT_HAS_STREAM_GET_R_FRAME_RATE)
-  return m_pFormatCtx ? av_q2d( av_stream_get_r_frame_rate( m_pFormatCtx->streams[ m_videoStream ] ) ) : 0.0;
-#else
-  return m_pFormatCtx ? av_q2d( m_pFormatCtx->streams[ m_videoStream ]->r_frame_rate ) : 0.0;
-#endif
-}
-  
-unsigned int FFmpegVideoDecoder::getWidth() const
-{
-  if ( !m_pCodecCtx )
-    return 0;
-
-  return m_pCodecCtx->width;
-}
-
-unsigned int FFmpegVideoDecoder::getHeight() const
-{
-  if ( !m_pCodecCtx )
-    return 0;
-
-  return m_pCodecCtx->height;
-}
-
-const AVFormatContext * FFmpegVideoDecoder::getAVFormatContext() const
-{
-  return m_pFormatCtx;
-}
-
-const AVCodecContext * FFmpegVideoDecoder::getAVCodecContext() const
-{
-  return m_pCodecCtx;
-}
-
-const AVCodec * FFmpegVideoDecoder::getAVCodec() const
-{
-  return m_pCodec;
-}
-
-std::string FFmpegVideoDecoder::getErrorMsg() const
-{
-  return m_errorMsg;
-}
-
-double FFmpegVideoDecoder::getLastFrameTime() const
-{
-  return m_lastFrameTime;
-}
-
-
-bool FFmpegVideoDecoder::open( const std::string& filename )
-{
-  // See http://dranger.com/ffmpeg/tutorial01.html
-  close();
-  
-  // Open the video file
-  if ( avformat_open_input( &m_pFormatCtx, filename.c_str(), NULL, NULL ) < 0 )
-  {
-    m_errorMsg = "Could not open the video file";
-   close();
-    return false;
-  }
-
-  // Retrieve the stream information
-  if ( avformat_find_stream_info( m_pFormatCtx, 0 ) < 0 )
-  {
-    m_errorMsg = "Could not find the stream information";
-    close();
-    return false;
-  }
-
-  // Find the first video stream
-  m_videoStream = -1;
-
-  for ( unsigned i = 0; i < m_pFormatCtx->nb_streams; i++ )
-  {
-    if ( m_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
-    {
-      m_videoStream = i;
-      break;
-    }
-  }
-
-  if ( m_videoStream == -1 )
-  {
-    m_errorMsg = "Could not find a playable video stream";
-    close();
-    return false;
-  }
-
-  // Get a pointer to the codec context for the video stream
-  m_pCodecCtx = m_pFormatCtx->streams[ m_videoStream ]->codec;
-
-  // Find the decoder for the video stream
-  m_pCodec = avcodec_find_decoder( m_pCodecCtx->codec_id );
-
-  if ( m_pCodec == NULL )
-  {
-    m_errorMsg = "Could not find a video decoder";
-    close();
-    return false;
-  }
-    
-  // Open the codec
-  if ( avcodec_open2( m_pCodecCtx, m_pCodec, 0 ) < 0 )
-  {
-    m_errorMsg = "Could not open the video decoder";
-    close();
-    return false;
-  }
-  
-  // Allocate video frames
-  m_pFrame = av_frame_alloc();
-
-  if ( !m_pFrame )
-  {
-    m_errorMsg = "Could not allocate memory for a frame";
-    close();
-    return false;
-  }
-  
-  return true;
-}
-
-
-bool FFmpegVideoDecoder::seek( double time )
-{
-  // Convert the frame number into time stamp
-  int64_t timestamp = (int64_t) (time * AV_TIME_BASE * av_q2d( m_pFormatCtx->streams[ m_videoStream ]->time_base ));
-
-  if ( av_seek_frame( m_pFormatCtx, m_videoStream, timestamp, AVSEEK_FLAG_ANY ) < 0 )
-	return false;
-
-  avcodec_flush_buffers( m_pCodecCtx );
-  return true;
-}
-
-bool FFmpegVideoDecoder::nextFrame( CBaseTexture * texture )
-{
-  // Just in case
-  if ( !m_pCodecCtx )
-	return false;
-
-  // If we did not preallocate the picture or the texture size changed, (re)allocate it
-  if ( !m_pFrameRGB || texture->GetWidth() != m_frameRGBwidth || texture->GetHeight() != m_frameRGBheight )
-  {
-    if ( m_pFrameRGB )
-    {
-      avpicture_free( m_pFrameRGB );
-      av_free( m_pFrameRGB );
-    }
-
-    m_frameRGBwidth = texture->GetWidth();
-    m_frameRGBheight = texture->GetHeight();
-
-    // Allocate the conversion frame and relevant picture
-    m_pFrameRGB = (AVPicture*)av_mallocz(sizeof(AVPicture));
-
-    if ( !m_pFrameRGB )
-      return false;
-
-    // Due to a bug in swsscale we need to allocate one extra line of data
-    if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
-      return false;
-  }
-
-  AVPacket packet;
-  int frameFinished;
-
-  while ( true )
-  {
-    // Read a frame
-    if ( av_read_frame( m_pFormatCtx, &packet ) < 0 )
-      return false;  // Frame read failed (e.g. end of stream)
-
-    if ( packet.stream_index == m_videoStream )
-    {
-      // Is this a packet from the video stream -> decode video frame
-      avcodec_decode_video2( m_pCodecCtx, m_pFrame, &frameFinished, &packet );
-
-      // Did we get a video frame?
-      if ( frameFinished )
-      {
-        if ( packet.dts != (int64_t)AV_NOPTS_VALUE )
-	  m_lastFrameTime = packet.dts * av_q2d( m_pFormatCtx->streams[ m_videoStream ]->time_base );
-        else
-	   m_lastFrameTime = 0.0;
-
-	break;
-      }
-    }
-
-    av_free_packet( &packet );
-  }
-
-  // We got the video frame, render it into the picture buffer
-  struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
-                           m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
-
-  sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
-                                                                     m_pFrameRGB->data, m_pFrameRGB->linesize );
-  sws_freeContext( context );
-  av_free_packet( &packet );
-
-  // And into the texture
-  texture->Update( m_frameRGBwidth, m_frameRGBheight, m_frameRGBwidth * 4, XB_FMT_A8R8G8B8, m_pFrameRGB->data[0], false );
-
-  return true;
-}
-

_service:download_url:master.tar.gz/xbmc/video/FFmpegVideoDecoder.h Deleted

@@ -1,158 +0,0 @@
-#ifndef FFMPEGVIDEODECODER_H
-#define FFMPEGVIDEODECODER_H
-
-/*
- *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, see
- *  <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <string>
-
-class CBaseTexture;
-
-extern "C" {
-struct AVFormatContext;
-struct AVCodecContext;
-struct AVCodec;
-struct AVFrame;
-struct AVPicture;
-}
-
-/**
- * A simple FFMpeg-based background video decoder.
- * 
- * This class only decodes the video using the standard FFmpeg calls, so likely no hardware acceleration.
- * No audio decoding, and no rendering.
- * 
- */
-class FFmpegVideoDecoder
-{
-public:
-  FFmpegVideoDecoder();
-  ~FFmpegVideoDecoder();
-
-  /**
-   * Opens the video file for decoding. Supports all the formats supported by the used FFmpeg.
-   * The file must have at least one video track. If it has more than one, the first video track
-   * would be decoded.
-   * 
-   * If an existing stream was opened, it is automatically closed and the new stream is opened.
-   * 
-   * Returns true if the file was opened successfully, and false otherwise, in which case
-   * the getErrorMsg() function could be used to retrieve the reason.
-   * 
-   * @param filename The video file name, which must be translated through CSpecialProtocol::TranslatePath()
-   */
-  bool open( const std::string& filename );
-
-  /**
-   * Returns true if the decoder has the video file opened.
-   */
-  bool isOpened() const;
-
-  /**
-   * Returns the movie duration in seconds or 0.0 if the duration is not available. For some formats
-   * is calculated through the heuristics, and the video might not really be that long (for example if it is incomplete).
-   * The total number of frames is calculated by multiplying the duration by getFramesPerSecond()
-   */
-  double getDuration() const;
-  
-  /**
-   * Returns the frames per second for this video
-   */
-  double getFramesPerSecond() const;
-  
-  /**
-   * Returns the original video width or 0 if the video wasn't opened.
-   */  
-  unsigned int getWidth() const;
-
-  /**
-   * Returns the original video height or 0 if the video wasn't opened.
-   */  
-  unsigned int getHeight() const;
-
-  /**
-   * Returns the last rendered frame number.
-   */
-  double getLastFrameTime() const;
-
-  /**
-   * Returns the AVFormatContext structure associated with this video format
-   */  
-  const AVFormatContext * getAVFormatContext() const;
-
-  /**
-   * Returns the AVCodecContext structure associated with this video codec
-   */  
-  const AVCodecContext * getAVCodecContext() const;
-  
-  /**
-   * Returns the AVCodec structure associated with this video codec
-   */  
-  const AVCodec * getAVCodec() const;
-
-  /**
-   * Returns the error message text if opening the video failed
-   */  
-  std::string getErrorMsg() const;
-
-  /**
-   * Decodes and renders the next video frame into the provided texture which
-   * must be in a XB_FMT_A8R8G8B8 format.
-   * The frame will be rescaled to fit the whole texture (i.e. texture width/height)
-   * so make sure the texture aspect ratio is the same as in the original movie.
-   * 
-   * @param texture The texture to render the frame into. Must be preallocated, 
-   * have the appropriate width/height and in XB_FMT_A8R8G8B8 format.
-   * 
-   * @return true if the frame rendered, false if there are no more frames
-   */  
-  bool nextFrame( CBaseTexture * texture );
-
-  /**
-	* Seeks to a specific time position in the video file. Note that the seek is limited to the keyframes only.
-	* @param time The time to seek to, in seconds
-	* @return true if the seek succeed, false if failed
-	*/
-  bool seek( double time );
-
-  /**
-   * Closes the video stream.
-   */  
-  void close();
-
-private:
-  bool readFrame( int frame );
-  
-  AVFormatContext *m_pFormatCtx;
-  AVCodecContext  *m_pCodecCtx;
-  AVCodec         *m_pCodec;
-  AVFrame         *m_pFrame;
-  AVPicture       *m_pFrameRGB;
-  int              m_videoStream;
-  double           m_lastFrameTime;
-  
-  // The dimensions of the allocated pFrameRGB
-  unsigned int     m_frameRGBwidth;
-  unsigned int     m_frameRGBheight;
-  
-  std::string       m_errorMsg;
-};
-
-#endif

_service:download_url:master.tar.gz/xbmc/video/Makefile Changed

_service:download_url:master.tar.gz/xbmc/video/VideoDatabase.cpp Changed

@@ -50,7 +50,6 @@
 #include "guilib/LocalizeStrings.h"
 #include "GUIPassword.h"
 #include "interfaces/AnnouncementManager.h"
-#include "messaging/ApplicationMessenger.h"
 #include "playlists/SmartPlayList.h"
 #include "profiles/ProfilesManager.h"
 #include "settings/AdvancedSettings.h"
@@ -147,7 +146,7 @@
   for (int i = 0; i < VIDEODB_MAX_COLUMNS; i++)
     columns += StringUtils::Format(",c%02d text", i);
 
-  columns += ", userrating integer)";
+  columns += ", userrating integer, duration INTEGER)";
   m_pDS->exec(columns);
 
   CLog::Log(LOGINFO, "create episode table");
@@ -2484,6 +2483,10 @@
     sql += PrepareSQL(", userrating = %i", details.m_iUserRating);
   else
     sql += ", userrating = NULL";  
+  if (details.m_duration > 0)
+    sql += PrepareSQL(", duration = %i", details.m_duration);
+  else
+    sql += ", duration = NULL";
   sql += PrepareSQL(" WHERE idShow=%i", idTvShow);
   if (ExecuteQuery(sql))
   {
@@ -3734,6 +3737,7 @@
   details.AddRating(record->at(VIDEODB_DETAILS_TVSHOW_RATING).get_asFloat(),
     record->at(VIDEODB_DETAILS_TVSHOW_VOTES).get_asInt(),
     record->at(VIDEODB_DETAILS_TVSHOW_RATING_TYPE).get_asString());
+  details.m_duration = record->at(VIDEODB_DETAILS_TVSHOW_DURATION).get_asInt();
 
   movieTime += XbmcThreads::SystemClockMillis() - time; time = XbmcThreads::SystemClockMillis();
 
@@ -4905,11 +4909,35 @@
     m_pDS->exec("ALTER TABLE settings ADD VideoStream integer");
     m_pDS->exec("ALTER TABLE streamdetails ADD strVideoLanguage text");
   }
+
+  if (iVersion < 104)
+  {
+    m_pDS->exec("ALTER TABLE tvshow ADD duration INTEGER");
+
+    std::string sql = PrepareSQL( "SELECT episode.idShow, MAX(episode.c%02d) "
+                                  "FROM episode "
+
+                                  "LEFT JOIN streamdetails "
+                                  "ON streamdetails.idFile = episode.idFile "
+                                  "AND streamdetails.iStreamType = 0 " // only grab video streams
+
+                                  "WHERE episode.c%02d <> streamdetails.iVideoDuration "
+                                  "OR streamdetails.iVideoDuration IS NULL "
+                                  "GROUP BY episode.idShow", VIDEODB_ID_EPISODE_RUNTIME, VIDEODB_ID_EPISODE_RUNTIME);
+
+    m_pDS->query(sql);
+    while (!m_pDS->eof())
+    {
+      m_pDS2->exec(PrepareSQL("UPDATE tvshow SET duration=%i WHERE idShow=%i", m_pDS->fv(1).get_asInt(), m_pDS->fv(0).get_asInt()));
+      m_pDS->next();
+    }
+    m_pDS->close();
+  }
 }
 
 int CVideoDatabase::GetSchemaVersion() const
 {
-  return 103;
+  return 104;
 }
 
 bool CVideoDatabase::LookupByFolders(const std::string &path, bool shows)

_service:download_url:master.tar.gz/xbmc/video/VideoDatabase.h Changed

@@ -119,16 +119,17 @@
 #define VIDEODB_DETAILS_EPISODE_RATING_TYPE     VIDEODB_MAX_COLUMNS + 19
 
 #define VIDEODB_DETAILS_TVSHOW_USER_RATING      VIDEODB_MAX_COLUMNS + 1
-#define VIDEODB_DETAILS_TVSHOW_PARENTPATHID     VIDEODB_MAX_COLUMNS + 2
-#define VIDEODB_DETAILS_TVSHOW_PATH             VIDEODB_MAX_COLUMNS + 3
-#define VIDEODB_DETAILS_TVSHOW_DATEADDED        VIDEODB_MAX_COLUMNS + 4
-#define VIDEODB_DETAILS_TVSHOW_LASTPLAYED       VIDEODB_MAX_COLUMNS + 5
-#define VIDEODB_DETAILS_TVSHOW_NUM_EPISODES     VIDEODB_MAX_COLUMNS + 6
-#define VIDEODB_DETAILS_TVSHOW_NUM_WATCHED      VIDEODB_MAX_COLUMNS + 7
-#define VIDEODB_DETAILS_TVSHOW_NUM_SEASONS      VIDEODB_MAX_COLUMNS + 8
-#define VIDEODB_DETAILS_TVSHOW_RATING           VIDEODB_MAX_COLUMNS + 9
-#define VIDEODB_DETAILS_TVSHOW_VOTES            VIDEODB_MAX_COLUMNS + 10
-#define VIDEODB_DETAILS_TVSHOW_RATING_TYPE      VIDEODB_MAX_COLUMNS + 11
+#define VIDEODB_DETAILS_TVSHOW_DURATION         VIDEODB_MAX_COLUMNS + 2
+#define VIDEODB_DETAILS_TVSHOW_PARENTPATHID     VIDEODB_MAX_COLUMNS + 3
+#define VIDEODB_DETAILS_TVSHOW_PATH             VIDEODB_MAX_COLUMNS + 4
+#define VIDEODB_DETAILS_TVSHOW_DATEADDED        VIDEODB_MAX_COLUMNS + 5
+#define VIDEODB_DETAILS_TVSHOW_LASTPLAYED       VIDEODB_MAX_COLUMNS + 6
+#define VIDEODB_DETAILS_TVSHOW_NUM_EPISODES     VIDEODB_MAX_COLUMNS + 7
+#define VIDEODB_DETAILS_TVSHOW_NUM_WATCHED      VIDEODB_MAX_COLUMNS + 8
+#define VIDEODB_DETAILS_TVSHOW_NUM_SEASONS      VIDEODB_MAX_COLUMNS + 9
+#define VIDEODB_DETAILS_TVSHOW_RATING           VIDEODB_MAX_COLUMNS + 10
+#define VIDEODB_DETAILS_TVSHOW_VOTES            VIDEODB_MAX_COLUMNS + 11
+#define VIDEODB_DETAILS_TVSHOW_RATING_TYPE      VIDEODB_MAX_COLUMNS + 12
 
 #define VIDEODB_DETAILS_MUSICVIDEO_USER_RATING  VIDEODB_MAX_COLUMNS + 2
 #define VIDEODB_DETAILS_MUSICVIDEO_FILE         VIDEODB_MAX_COLUMNS + 3

_service:download_url:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoInfo.cpp Changed

@@ -990,20 +990,6 @@
   if (type == MediaTypeMovie || type == MediaTypeTvShow)
     buttons.Add(CONTEXT_BUTTON_EDIT_SORTTITLE, 16107);
 
-  if (item->m_bIsFolder)
-  {
-    // Have both options for folders since we don't know whether all childs are watched/unwatched
-    buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched
-    buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
-  }
-  else
-  {
-    if (item->GetOverlayImage() == "OverlayWatched.png")
-      buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched
-    else
-      buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
-  }
-
   if (type == MediaTypeMovie)
   {
     // only show link/unlink if there are tvshows available
@@ -1049,7 +1035,11 @@
   if (type != MediaTypeSeason)
     buttons.Add(CONTEXT_BUTTON_DELETE, 646);
 
-  CContextMenuManager::GetInstance().AddVisibleItems(item, buttons, CContextMenuManager::MANAGE);
+  //temporary workaround until the context menu ids are removed
+  const int addonItemOffset = 10000;
+  auto addonItems = CContextMenuManager::GetInstance().GetAddonItems(*item, CContextMenuManager::MANAGE);
+  for (int i = 0; i < addonItems.size(); ++i)
+    buttons.Add(addonItemOffset + i, addonItems[i]->GetLabel(*item));
 
   bool result = false;
   int button = CGUIDialogContextMenu::ShowAndGetChoice(buttons);
@@ -1107,14 +1097,9 @@
         result = RemoveItemsFromTag(item);
         break;
 
-      case CONTEXT_BUTTON_MARK_WATCHED:
-      case CONTEXT_BUTTON_MARK_UNWATCHED:
-        CVideoLibraryQueue::GetInstance().MarkAsWatched(item, (button == (CONTEXT_BUTTON)CONTEXT_BUTTON_MARK_WATCHED));
-        result = true;
-        break;
-
       default:
-        result = CContextMenuManager::GetInstance().OnClick(button, item);
+        if (button >= addonItemOffset)
+          result = CONTEXTMENU::LoopFrom(*addonItems[button - addonItemOffset], item);
         break;
     }
   }
@@ -2047,3 +2032,13 @@
 
   return true;
 }
+
+void CGUIDialogVideoInfo::ShowFor(const CFileItem& item)
+{
+  auto window = static_cast<CGUIWindowVideoNav*>(g_windowManager.GetWindow(WINDOW_VIDEO_NAV));
+  if (window)
+  {
+    ADDON::ScraperPtr info;
+    window->OnItemInfo(item, info);
+  }
+}
\ No newline at end of file

_service:download_url:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoInfo.h Changed

_service:download_url:master.tar.gz/xbmc/video/videosync/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/video/windows/GUIWindowVideoBase.cpp Changed

@@ -202,18 +202,13 @@
   return CGUIMediaWindow::OnMessage(message);
 }
 
-void CGUIWindowVideoBase::OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper)
+void CGUIWindowVideoBase::OnItemInfo(const CFileItem& fileItem, ADDON::ScraperPtr& scraper)
 {
-  if (!pItem)
+  if (fileItem.IsParentFolder() || fileItem.m_bIsShareOrDrive || fileItem.IsPath("add") ||
+     (fileItem.IsPlayList() && !URIUtils::HasExtension(fileItem.GetPath(), ".strm")))
     return;
 
-  if (pItem->IsParentFolder() || pItem->m_bIsShareOrDrive || pItem->IsPath("add") ||
-     (pItem->IsPlayList() && !URIUtils::HasExtension(pItem->GetPath(), ".strm")))
-    return;
-
-  // ShowIMDB can kill the item as this window can be closed while we do it,
-  // so take a copy of the item now
-  CFileItem item(*pItem);
+  CFileItem item(fileItem);
   bool fromDB = false;
   if ((item.IsVideoDb() && item.HasVideoInfoTag()) ||
       (item.HasVideoInfoTag() && item.GetVideoInfoTag()->m_iDbId != -1))
@@ -260,8 +255,8 @@
   }
 
   // we need to also request any thumbs be applied to the folder item
-  if (pItem->m_bIsFolder)
-    item.SetProperty("set_folder_thumb", pItem->GetPath());
+  if (fileItem.m_bIsFolder)
+    item.SetProperty("set_folder_thumb", fileItem.GetPath());
 
   bool modified = ShowIMDB(CFileItemPtr(new CFileItem(item)), scraper, fromDB);
   if (modified &&
@@ -738,7 +733,7 @@
       return true;
   }
 
-  OnItemInfo(item.get(), scraper);
+  OnItemInfo(*item, scraper);
 
   // Return whether or not we have information to display.
   // Note: This will cause the default select action to start
@@ -758,7 +753,8 @@
   GetResumeItemOffset(&item, startOffset, startPart);
   if (startOffset > 0)
   {
-    resumeString = StringUtils::Format(g_localizeStrings.Get(12022).c_str(), StringUtils::SecondsToTimeString(startOffset/75).c_str());
+    resumeString = StringUtils::Format(g_localizeStrings.Get(12022).c_str(),
+        StringUtils::SecondsToTimeString(startOffset/75, TIME_FORMAT_HH_MM_SS).c_str());
     if (startPart > 0)
     {
       std::string partString = StringUtils::Format(g_localizeStrings.Get(23051).c_str(), startPart);
@@ -855,9 +851,6 @@
         }
       }
 
-      if (!m_vecItems->IsPlugin() && (item->IsPlugin() || item->IsScript()))
-        buttons.Add(CONTEXT_BUTTON_INFO,24003); // Add-on info
-
       if (!item->m_bIsFolder && !(item->IsPlayList() && !g_advancedSettings.m_playlistAsFolders))
       { // get players
         std::vector<std::string> players;
@@ -876,13 +869,6 @@
         buttons.Add(CONTEXT_BUTTON_PLAY_PARTYMODE, 15216); // Play in Partymode
       }
 
-      // if autoresume is enabled then add restart video button
-      // check to see if the Resume Video button is applicable
-      // only if the video is NOT a DVD (in that case the resume button will be added by CGUIDialogContextMenu::GetContextButtons)
-      if (!item->IsDVD() && HasResumeItemOffset(item.get()))
-      {
-        buttons.Add(CONTEXT_BUTTON_RESUME_ITEM, GetResumeString(*(item.get())));     // Resume Video
-      }
       //if the item isn't a folder or script, is a member of a list rather than a single item
       //and we're not on the last element of the list, 
       //then add add either 'play from here' or 'play only this' depending on default behaviour
@@ -1031,17 +1017,6 @@
     g_partyModeManager.Enable(PARTYMODECONTEXT_VIDEO, m_vecItems->Get(itemNumber)->GetPath());
     return true;
 
-  case CONTEXT_BUTTON_RESTART_ITEM:
-    OnRestartItem(itemNumber);
-    return true;
-
-  case CONTEXT_BUTTON_RESUME_ITEM:
-    return OnFileAction(itemNumber, SELECT_ACTION_RESUME, "");
-
-  case CONTEXT_BUTTON_INFO:
-    OnItemInfo(itemNumber);
-    return true;
-
   case CONTEXT_BUTTON_STOP_SCANNING:
     {
       g_application.StopVideoScan();
@@ -1070,7 +1045,7 @@
         OnScan(strPath, true);
       }
       else
-        OnItemInfo(item.get(),info);
+        OnItemInfo(*item, info);
 
       return true;
     }

_service:download_url:master.tar.gz/xbmc/video/windows/GUIWindowVideoBase.h Changed

_service:download_url:master.tar.gz/xbmc/video/windows/GUIWindowVideoNav.cpp Changed

@@ -48,9 +48,9 @@
 #include "utils/Variant.h"
 #include "guilib/GUIKeyboardFactory.h"
 #include "video/VideoInfoScanner.h"
+#include "video/VideoLibraryQueue.h"
 #include "video/dialogs/GUIDialogVideoInfo.h"
 #include "pvr/recordings/PVRRecording.h"
-#include "ContextMenuManager.h"
 
 #include <utility>
 
@@ -92,10 +92,12 @@
     CFileItemPtr pItem = m_vecItems->Get(m_viewControl.GetSelectedItem());
     if (pItem->IsParentFolder())
       return false;
-    if (pItem && pItem->GetVideoInfoTag()->m_playCount == 0)
-      return OnContextButton(m_viewControl.GetSelectedItem(),CONTEXT_BUTTON_MARK_WATCHED);
-    if (pItem && pItem->GetVideoInfoTag()->m_playCount > 0)
-      return OnContextButton(m_viewControl.GetSelectedItem(),CONTEXT_BUTTON_MARK_UNWATCHED);
+
+    if (pItem && pItem->HasVideoInfoTag())
+    {
+      CVideoLibraryQueue::GetInstance().MarkAsWatched(pItem, pItem->GetVideoInfoTag()->m_playCount == 0);
+      return true;
+    }
   }
   return CGUIWindowVideoBase::OnAction(action);
 }
@@ -389,6 +391,7 @@
 
         // save the show description (showplot)
         items.SetProperty("showplot", details.m_strPlot);
+        items.SetProperty("showtitle", details.m_strShowTitle);
 
         // the container folder thumb is the parent (i.e. season or show)
         if (itemsSize && (node == NODE_TYPE_EPISODES || node == NODE_TYPE_RECENTLY_ADDED_EPISODES))
@@ -736,22 +739,22 @@
   CGUIWindowVideoBase::PlayItem(iItem);
 }
 
-void CGUIWindowVideoNav::OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper)
+void CGUIWindowVideoNav::OnItemInfo(const CFileItem& fileItem, ADDON::ScraperPtr& scraper)
 {
   if (!scraper || scraper->Content() == CONTENT_NONE)
   {
     m_database.Open(); // since we can be called from the music library without being inited
-    if (pItem->IsVideoDb())
-      scraper = m_database.GetScraperForPath(pItem->GetVideoInfoTag()->m_strPath);
+    if (fileItem.IsVideoDb())
+      scraper = m_database.GetScraperForPath(fileItem.GetVideoInfoTag()->m_strPath);
     else
     {
       std::string strPath,strFile;
-      URIUtils::Split(pItem->GetPath(),strPath,strFile);
+      URIUtils::Split(fileItem.GetPath(),strPath,strFile);
       scraper = m_database.GetScraperForPath(strPath);
     }
     m_database.Close();
   }
-  CGUIWindowVideoBase::OnItemInfo(pItem,scraper);
+  CGUIWindowVideoBase::OnItemInfo(fileItem, scraper);
 }
 
 void CGUIWindowVideoNav::OnDeleteItem(CFileItemPtr pItem)
@@ -905,37 +908,9 @@
       VIDEO::SScanSettings settings;
       GetScraperForItem(item.get(), info, settings);
 
-      if (info && info->Content() == CONTENT_TVSHOWS)
-        buttons.Add(CONTEXT_BUTTON_INFO, item->m_bIsFolder ? 20351 : 20352);
-      else if (info && info->Content() == CONTENT_MUSICVIDEOS)
-        buttons.Add(CONTEXT_BUTTON_INFO,20393);
-      else if (info && info->Content() == CONTENT_MOVIES)
-        buttons.Add(CONTEXT_BUTTON_INFO, 13346);
-
       // can we update the database?
       if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)
       {
-        if (!item->IsPlugin() && !item->IsScript() && !item->IsLiveTV() && !item->IsAddonsPath() &&
-            item->GetPath() != "sources://video/" &&
-            item->GetPath() != "special://videoplaylists/" &&
-            !StringUtils::StartsWith(item->GetPath(), "newsmartplaylist://") &&
-            !StringUtils::StartsWith(item->GetPath(), "newplaylist://") &&
-            !StringUtils::StartsWith(item->GetPath(), "newtag://"))
-        {
-          if (item->m_bIsFolder)
-          {
-            // Have both options for folders since we don't know whether all childs are watched/unwatched
-            buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched
-            buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
-          }
-          else
-          {
-            if (item->GetOverlayImage() == "OverlayWatched.png")
-              buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched
-            else
-              buttons.Add(CONTEXT_BUTTON_MARK_WATCHED, 16103);   //Mark as Watched
-          }
-        }
         if (!g_application.IsVideoScanning() && item->IsVideoDb() && item->HasVideoInfoTag() &&
            (item->GetVideoInfoTag()->m_type == MediaTypeMovie ||          // movies
             item->GetVideoInfoTag()->m_type == MediaTypeTvShow ||         // tvshows
@@ -986,10 +961,7 @@
             buttons.Add(CONTEXT_BUTTON_SCAN, 13349);
         }
       }
-      if (item->IsPlugin() || item->IsScript() || m_vecItems->IsPlugin())
-        buttons.Add(CONTEXT_BUTTON_PLUGIN_SETTINGS, 1045);
     }
-    CContextMenuManager::GetInstance().AddVisibleItems(item, buttons);
   }
 }
 
@@ -1018,9 +990,6 @@
       CONTEXT_BUTTON ret = (CONTEXT_BUTTON)CGUIDialogVideoInfo::ManageVideoItem(item);
       if (ret >= 0)
       {
-        if (ret == CONTEXT_BUTTON_MARK_WATCHED)
-          m_viewControl.SetSelectedItem(itemNumber + 1);
-
         Refresh(true);
         if (ret == CONTEXT_BUTTON_DELETE)
         {

_service:download_url:master.tar.gz/xbmc/video/windows/GUIWindowVideoNav.h Changed

_service:download_url:master.tar.gz/xbmc/video/windows/GUIWindowVideoPlaylist.cpp Changed

_service:download_url:master.tar.gz/xbmc/view/GUIViewControl.cpp Changed

_service:download_url:master.tar.gz/xbmc/view/GUIViewControl.h Changed

_service:download_url:master.tar.gz/xbmc/win32/Win32DelayedDllLoad.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/WinEventsLinux.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/WinEventsLinux.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/WinEventsSDL.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/WinEventsX11.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/CMakeLists.txt Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContext.cpp Added

@@ -0,0 +1,37 @@
+/*
+ *      Copyright (C) 2005-2014 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ */
+#include "system.h"
+
+#if defined(HAVE_X11)
+
+#include "GLContext.h"
+
+bool CGLContext::IsExtSupported(const char* extension) const
+{
+  std::string name;
+
+  name  = " ";
+  name += extension;
+  name += " ";
+
+  return m_extensions.find(name) != std::string::npos;
+}
+
+#endif

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContext.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContextEGL.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContextEGL.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContextGLX.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/GLContextGLX.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/Makefile Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/WinSystemX11.h Changed

@@ -37,30 +37,30 @@
   virtual ~CWinSystemX11();
 
   // CWinSystemBase
-  virtual bool InitWindowSystem();
-  virtual bool DestroyWindowSystem();
-  virtual bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction);
-  virtual bool DestroyWindow();
-  virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop);
-  virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays);
-  virtual void UpdateResolutions();
-  virtual int  GetNumScreens() { return 1; }
-  virtual int  GetCurrentScreen() { return m_nScreen; }
-  virtual void ShowOSMouse(bool show);
-  virtual void ResetOSScreensaver();
-  virtual bool EnableFrameLimiter();
-  virtual void EnableSystemScreenSaver(bool bEnable);
+  bool InitWindowSystem() override;
+  bool DestroyWindowSystem() override;
+  bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) override;
+  bool DestroyWindow() override;
+  bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) override;
+  bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
+  void UpdateResolutions() override;
+  int  GetNumScreens() override { return 1; }
+  int  GetCurrentScreen() override { return m_nScreen; }
+  void ShowOSMouse(bool show) override;
+  void ResetOSScreensaver() override;
+  bool EnableFrameLimiter() override;
+  void EnableSystemScreenSaver(bool bEnable) override;
 
-  virtual void NotifyAppActiveChange(bool bActivated);
-  virtual void NotifyAppFocusChange(bool bGaining);
+  void NotifyAppActiveChange(bool bActivated) override;
+  void NotifyAppFocusChange(bool bGaining) override;
 
-  virtual bool Minimize();
-  virtual bool Restore() ;
-  virtual bool Hide();
-  virtual bool Show(bool raise = true);
+  bool Minimize() override;
+  bool Restore() override;
+  bool Hide() override;
+  bool Show(bool raise = true) override;
   virtual void Register(IDispResource *resource);
   virtual void Unregister(IDispResource *resource);
-  virtual bool HasCalibration(const RESOLUTION_INFO &resInfo);
+  bool HasCalibration(const RESOLUTION_INFO &resInfo) override;
 
   // Local to WinSystemX11 only
   Display*  GetDisplay() { return m_dpy; }

_service:download_url:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLContext.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLContext.h Changed

@@ -35,13 +35,13 @@
 public:
   CWinSystemX11GLContext();
   virtual ~CWinSystemX11GLContext();
-  virtual bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction);
-  virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop);
-  virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays);
-  virtual bool DestroyWindowSystem();
-  virtual bool DestroyWindow();
+  bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) override;
+  bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) override;
+  bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
+  bool DestroyWindowSystem() override;
+  bool DestroyWindow() override;
 
-  virtual bool IsExtSupported(const char* extension);
+  bool IsExtSupported(const char* extension) override;
 
   GLXWindow GetWindow() const;
   GLXContext GetGlxContext() const;
@@ -51,13 +51,13 @@
   EGLConfig GetEGLConfig() const;
 
 protected:
-  virtual bool SetWindow(int width, int height, bool fullscreen, const std::string &output, int *winstate = NULL);
-  virtual void PresentRenderImpl(bool rendered);
-  virtual void SetVSyncImpl(bool enable);
-  virtual bool RefreshGLContext(bool force);
-  virtual XVisualInfo* GetVisual();
+  bool SetWindow(int width, int height, bool fullscreen, const std::string &output, int *winstate = NULL) override;
+  void PresentRenderImpl(bool rendered) override;
+  void SetVSyncImpl(bool enable) override;
+  bool RefreshGLContext(bool force);
+  XVisualInfo* GetVisual() override;
 
-  CGLContext *m_pGLContext;
+  CGLContext *m_pGLContext = nullptr;
   bool m_newGlContext;
 };

_service:download_url:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLESContext.cpp Changed

@@ -11,7 +11,6 @@
 
 CWinSystemX11GLESContext::CWinSystemX11GLESContext()
 {
-  m_pGLContext = NULL;
 }
 
 CWinSystemX11GLESContext::~CWinSystemX11GLESContext()
@@ -53,11 +52,10 @@
   CWinSystemX11::SetWindow(width, height, fullscreen, output, &newwin);
   if (newwin)
   {
-    CDirtyRegionList dr;
     RefreshGLContext(m_currentOutput.compare(output) != 0);
     XSync(m_dpy, FALSE);
     g_graphicsContext.Clear(0);
-    g_graphicsContext.Flip(dr);
+    g_graphicsContext.Flip(true);
     ResetVSync();
 
     m_windowDirty = false;
@@ -110,18 +108,14 @@
 
 bool CWinSystemX11GLESContext::DestroyWindowSystem()
 {
-  bool ret;
   m_pGLContext->Destroy();
-  ret = CWinSystemX11::DestroyWindowSystem();
-  return ret;
+  return CWinSystemX11::DestroyWindowSystem();
 }
 
 bool CWinSystemX11GLESContext::DestroyWindow()
 {
-  bool ret;
   m_pGLContext->Detach();
-  ret = CWinSystemX11::DestroyWindow();
-  return ret;
+  return CWinSystemX11::DestroyWindow();
 }
 
 XVisualInfo* CWinSystemX11GLESContext::GetVisual()

_service:download_url:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLESContext.h Changed

@@ -33,13 +33,13 @@
   CWinSystemX11GLESContext();
   virtual ~CWinSystemX11GLESContext();
 
-  virtual bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction);
-  virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop);
-  virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays);
-  virtual bool DestroyWindowSystem();
-  virtual bool DestroyWindow();
+  bool CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res, PHANDLE_EVENT_FUNC userFunction) override;
+  bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop) override;
+  bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
+  bool DestroyWindowSystem() override;
+  bool DestroyWindow() override;
 
-  virtual bool IsExtSupported(const char* extension);
+  bool IsExtSupported(const char* extension) override;
 
   EGLDisplay GetEGLDisplay() const { return  m_pGLContext->m_eglDisplay; }
   EGLSurface GetEGLSurface() const { return  m_pGLContext->m_eglSurface; }
@@ -47,13 +47,13 @@
   EGLConfig GetEGLConfig() const { return  m_pGLContext->m_eglConfig; }
 
 protected:
-  virtual bool SetWindow(int width, int height, bool fullscreen, const std::string &output, int *winstate = NULL);
-  virtual void PresentRenderImpl(bool rendered);
-  virtual void SetVSyncImpl(bool enable);
+  bool SetWindow(int width, int height, bool fullscreen, const std::string &output, int *winstate = NULL) override;
+  void PresentRenderImpl(bool rendered) override;
+  void SetVSyncImpl(bool enable) override;
   virtual bool RefreshGLContext(bool force);
-  virtual XVisualInfo* GetVisual();
+  XVisualInfo* GetVisual() override;
 
-  CGLContextEGL *m_pGLContext;
+  CGLContextEGL *m_pGLContext = nullptr;
   bool m_newGlContext;
 };

_service:download_url:master.tar.gz/xbmc/windowing/XBMC_events.h Changed

@@ -34,17 +34,6 @@
 #define XBMC_RELEASED	0
 #define XBMC_PRESSED	1
 
-/* Hat definitions */
-#define XBMC_HAT_CENTERED    0
-#define XBMC_HAT_UP          0x01
-#define XBMC_HAT_RIGHT       0x02
-#define XBMC_HAT_DOWN        0x04
-#define XBMC_HAT_LEFT        0x08
-#define XBMC_HAT_LEFTUP      XBMC_HAT_UP   | XBMC_HAT_LEFT
-#define XBMC_HAT_RIGHTUP     XBMC_HAT_UP   | XBMC_HAT_RIGHT
-#define XBMC_HAT_LEFTDOWN    XBMC_HAT_DOWN | XBMC_HAT_LEFT
-#define XBMC_HAT_RIGHTDOWN   XBMC_HAT_DOWN | XBMC_HAT_RIGHT
-
 /* Event enumerations */
 typedef enum {
        XBMC_NOEVENT = 0,        /* Unused (do not remove) */
@@ -54,11 +43,6 @@
        XBMC_MOUSEMOTION,        /* Mouse moved */
        XBMC_MOUSEBUTTONDOWN,    /* Mouse button pressed */
        XBMC_MOUSEBUTTONUP,      /* Mouse button released */
-       XBMC_JOYAXISMOTION,      /* Joystick axis motion */
-       XBMC_JOYBALLMOTION,      /* Joystick trackball motion */
-       XBMC_JOYHATMOTION,       /* Joystick hat position change */
-       XBMC_JOYBUTTONDOWN,      /* Joystick button pressed */
-       XBMC_JOYBUTTONUP,        /* Joystick button released */
        XBMC_QUIT,               /* User-requested quit */
        XBMC_SYSWMEVENT,         /* System specific event */
        XBMC_VIDEORESIZE,        /* User resized video mode */
@@ -106,46 +90,6 @@
 	uint16_t x, y;	/* The X/Y coordinates of the mouse at press time */
 } XBMC_MouseButtonEvent;
 
-/* Joystick axis motion event structure */
-typedef struct XBMC_JoyAxisEvent {
-	unsigned char type;	/* XBMC_JOYAXISMOTION */
-	unsigned char which;	/* The joystick device index */
-	unsigned char axis;	/* The joystick axis index */
-	int16_t value;	/* The axis value (range: -32768 to 32767) */
-	float   fvalue; /* The axis value (range: -1.0 to 1.0) */
-} XBMC_JoyAxisEvent;
-
-/* Joystick trackball motion event structure */
-typedef struct XBMC_JoyBallEvent {
-	unsigned char type;	/* XBMC_JOYBALLMOTION */
-	unsigned char which;	/* The joystick device index */
-	unsigned char ball;	/* The joystick trackball index */
-	int16_t xrel;	/* The relative motion in the X direction */
-	int16_t yrel;	/* The relative motion in the Y direction */
-} XBMC_JoyBallEvent;
-
-/* Joystick hat position change event structure */
-typedef struct XBMC_JoyHatEvent {
-	unsigned char type;	/* XBMC_JOYHATMOTION */
-	unsigned char which;	/* The joystick device index */
-	unsigned char hat;	/* The joystick hat index */
-	unsigned char value;	/* The hat position value:
-			    XBMC_HAT_LEFTUP   XBMC_HAT_UP       XBMC_HAT_RIGHTUP
-			    XBMC_HAT_LEFT     XBMC_HAT_CENTERED XBMC_HAT_RIGHT
-			    XBMC_HAT_LEFTDOWN XBMC_HAT_DOWN     XBMC_HAT_RIGHTDOWN
-			   Note that zero means the POV is centered.
-			*/
-} XBMC_JoyHatEvent;
-
-/* Joystick button event structure */
-typedef struct XBMC_JoyButtonEvent {
-	unsigned char type;	/* XBMC_JOYBUTTONDOWN or XBMC_JOYBUTTONUP */
-	unsigned char which;	/* The joystick device index */
-	unsigned char button;	/* The joystick button index */
-	unsigned char state;	/* XBMC_PRESSED or XBMC_RELEASED */
-  uint32_t      holdTime; /*holdTime of the pressed button*/
-} XBMC_JoyButtonEvent;
-
 /* The "window resized" event
    When you get this event, you are responsible for setting a new video
    mode with the new width and height.
@@ -216,10 +160,6 @@
   XBMC_KeyboardEvent key;
   XBMC_MouseMotionEvent motion;
   XBMC_MouseButtonEvent button;
-  XBMC_JoyAxisEvent jaxis;
-  XBMC_JoyBallEvent jball;
-  XBMC_JoyHatEvent jhat;
-  XBMC_JoyButtonEvent jbutton;
   XBMC_ResizeEvent resize;
   XBMC_MoveEvent move;
   XBMC_ExposeEvent expose;

_service:download_url:master.tar.gz/xbmc/windowing/android/WinEventsAndroid.cpp Changed

@@ -26,14 +26,9 @@
 #include "guilib/GUIWindowManager.h"
 #include "input/InputManager.h"
 #include "input/XBMC_vkeys.h"
-#include "input/SDLJoystick.h"
 #include "utils/log.h"
 #include "windowing/WindowingFactory.h"
 
-#include "platform/android/jni/View.h"
-
-#define DEBUG_MESSAGEPUMP 0
-
 #define ALMOST_ZERO 0.125f
 enum {
   EVENT_STATE_TEST,
@@ -49,22 +44,6 @@
   if (curEvent.type != newEvent.type)
     return true;
 
-  // Hat
-  if(newEvent.type == XBMC_JOYHATMOTION)
-    return (curEvent.jhat.value != newEvent.jhat.value);
-
-  // different axis
-  if (curEvent.jaxis.axis != newEvent.jaxis.axis)
-    return true;
-
-  // different axis direction (handles -1 vs 1)
-  if (std::signbit(curEvent.jaxis.fvalue) != std::signbit(newEvent.jaxis.fvalue))
-    return true;
-
-  // different axis value (handles 0 vs 1 or -1)
-  if ((fabs(curEvent.jaxis.fvalue) < ALMOST_ZERO) != (fabs(newEvent.jaxis.fvalue) < ALMOST_ZERO))
-    return true;
-
   return false;
 }
 
@@ -88,10 +67,6 @@
   CSingleLock lock(m_eventsCond);
 
   m_events.push_back(*newEvent);
-  #if DEBUG_MESSAGEPUMP
-  CLog::Log(LOGDEBUG, "push     event, size(%d), fvalue(%f)",
-    m_events.size(), newEvent->jaxis.fvalue);
-  #endif
 }
 
 void CWinEventsAndroid::MessagePushRepeat(XBMC_Event *repeatEvent)
@@ -106,20 +81,11 @@
     // in back of a canceling non-active event.
     // do not repush if pending are different event.
     if (different_event(*itt, *repeatEvent))
-    {
-      #if DEBUG_MESSAGEPUMP
-      CLog::Log(LOGDEBUG, "repush    skip, size(%d), fvalue(%f)",
-        m_events.size(), repeatEvent->jaxis.fvalue);
-      #endif
       return;
-    }
   }
+
   // is a repeat, push it
   m_events.push_back(*repeatEvent);
-  #if DEBUG_MESSAGEPUMP
-  CLog::Log(LOGDEBUG, "repush   event, size(%d), fvalue(%f)",
-    m_events.size(), repeatEvent->jaxis.fvalue);
-  #endif
 }
 
 bool CWinEventsAndroid::MessagePump()
@@ -139,95 +105,9 @@
         return ret;
       pumpEvent = m_events.front();
       m_events.pop_front();
-      #if DEBUG_MESSAGEPUMP
-      CLog::Log(LOGDEBUG, "  pop    event, size(%d), fvalue(%f)",
-        m_events.size(), pumpEvent.jaxis.fvalue);
-      #endif
     }
 
-    if ((pumpEvent.type == XBMC_JOYBUTTONUP)   ||
-        (pumpEvent.type == XBMC_JOYBUTTONDOWN) ||
-        (pumpEvent.type == XBMC_JOYAXISMOTION) ||
-        (pumpEvent.type == XBMC_JOYHATMOTION))
-    {
-      int             item;
-      int             type;
-      uint32_t        holdTime;
-      APP_InputDevice input_device;
-      float           amount = 1.0f;
-      short           input_type;
-
-      type = pumpEvent.type;
-      switch (type)
-      {
-        case XBMC_JOYAXISMOTION:
-          // The typical joystick keymap xml has the following where 'id' is the axis
-          //  and 'limit' is which action to choose (ie. Up or Down).
-          //  <axis id="5" limit="-1">Up</axis>
-          //  <axis id="5" limit="+1">Down</axis>
-          // One would think that limits is in reference to fvalue but
-          // it is really in reference to id :) The sign of item passed
-          // into ProcessJoystickEvent indicates the action mapping.
-          item = pumpEvent.jaxis.axis;
-          if (fabs(pumpEvent.jaxis.fvalue) < ALMOST_ZERO)
-            amount = 0.0f;
-          else if (pumpEvent.jaxis.fvalue  < 0.0f)
-            item = -item;
-          holdTime = 0;
-          input_device.id = pumpEvent.jaxis.which;
-          input_type = JACTIVE_AXIS;
-          break;
-
-        case XBMC_JOYHATMOTION:
-          item = pumpEvent.jhat.hat | 0xFFF00000 | (pumpEvent.jhat.value<<16);
-          holdTime = 0;
-          input_device.id = pumpEvent.jhat.which;
-          input_type = JACTIVE_HAT;
-          break;
-
-        case XBMC_JOYBUTTONUP:
-        case XBMC_JOYBUTTONDOWN:
-          item = pumpEvent.jbutton.button;
-          holdTime = pumpEvent.jbutton.holdTime;
-          input_device.id = pumpEvent.jbutton.which;
-          input_type = JACTIVE_BUTTON;
-          break;
-      }
-
-      // look for device name in our inputdevice cache
-      // so we can lookup and match the right joystick.xxx.xml
-      for (size_t i = 0; i < m_input_devices.size(); i++)
-      {
-        if (m_input_devices[i].id == input_device.id)
-          input_device.name = m_input_devices[i].name;
-      }
-      if (input_device.name.empty())
-      {
-        // not in inputdevice cache, fetch and cache it.
-        CJNIViewInputDevice view_input_device = CJNIViewInputDevice::getDevice(input_device.id);
-        input_device.name = view_input_device.getName();
-        CLog::Log(LOGDEBUG, "CWinEventsAndroid::MessagePump:caching  id(%d), device(%s)",
-          input_device.id, input_device.name.c_str());
-        m_input_devices.push_back(input_device);
-      }
-
-      if (type == XBMC_JOYAXISMOTION || type == XBMC_JOYHATMOTION)
-      {
-        // Joystick autorepeat -> only handle axis
-        CSingleLock lock(m_lasteventCond);
-        m_lastevent.push(pumpEvent);
-      }
-
-      if (fabs(amount) >= ALMOST_ZERO)
-      {
-        ret |= CInputManager::GetInstance().ProcessJoystickEvent(g_windowManager.GetActiveWindowID(),
-            input_device.name, item, input_type, amount, holdTime);
-      }
-    }
-    else
-    {
-      ret |= g_application.OnEvent(pumpEvent);
-    }
+    ret |= g_application.OnEvent(pumpEvent);
 
     if (pumpEvent.type == XBMC_MOUSEBUTTONUP)
       g_windowManager.SendMessage(GUI_MSG_UNFOCUS_ALL, 0, 0, 0, 0);
@@ -262,30 +142,9 @@
     {
       default:
       case EVENT_STATE_TEST:
-        // check for axis action events
+        // non-active event, eat it
         if (!m_lastevent.empty())
-        {
-          if ((m_lastevent.front().type == XBMC_JOYAXISMOTION && fabs(m_lastevent.front().jaxis.fvalue) >= ALMOST_ZERO)
-              || (m_lastevent.front().type == XBMC_JOYHATMOTION && m_lastevent.front().jhat.value > XBMC_HAT_CENTERED))
-          {
-            // new active event
-            cur_event = m_lastevent.front();
-            #if DEBUG_MESSAGEPUMP
-            CLog::Log(LOGDEBUG, "test   -> hold, size(%d), fvalue(%f)",
-              m_lastevent.size(), m_lastevent.front().jaxis.fvalue);
-            #endif
-            m_lastevent.pop();
-            repeatDuration = 0;
-            state = EVENT_STATE_HOLD;
-            break;
-          }
-          #if DEBUG_MESSAGEPUMP
-          CLog::Log(LOGDEBUG, "munch     test, size(%d), fvalue(%f)",
-            m_lastevent.size(), m_lastevent.front().jaxis.fvalue);
-          #endif
-          // non-active event, eat it
           m_lastevent.pop();
-        }
         break;
 
       case EVENT_STATE_HOLD:
@@ -294,17 +153,15 @@
         {
           if (different_event(cur_event, m_lastevent.front()))
           {
-            // different axis event, cycle back to test
+            // different event, cycle back to test
             state = EVENT_STATE_TEST;
             break;
           }
-          #if DEBUG_MESSAGEPUMP
-          CLog::Log(LOGDEBUG, "munch     hold, size(%d), fvalue(%f)",
-            m_lastevent.size(), m_lastevent.front().jaxis.fvalue);
-          #endif
-          // same axis event, eat it
+
+          // same event, eat it
           m_lastevent.pop();
         }
+
         if (repeatDuration >= holdTimeout)
         {
           CLog::Log(LOGDEBUG, "hold  ->repeat, size(%d), repeatDuration(%d)", m_lastevent.size(), repeatDuration);
@@ -318,21 +175,15 @@
         {
           if (different_event(cur_event, m_lastevent.front()))
           {
-            // different axis event, cycle back to test
+            // different event, cycle back to test
             state = EVENT_STATE_TEST;
-            #if DEBUG_MESSAGEPUMP
-            CLog::Log(LOGDEBUG, "repeat->  test, size(%d), fvalue(%f)",
-              m_lastevent.size(), m_lastevent.front().jaxis.fvalue);
-            #endif
             break;
           }
-          #if DEBUG_MESSAGEPUMP
-          CLog::Log(LOGDEBUG, "munch   repeat, size(%d), fvalue(%f)",
-            m_lastevent.size(), m_lastevent.front().jaxis.fvalue);
-          #endif
-          // same axis event, eat it
+
+          // same event, eat it
           m_lastevent.pop();
         }
+
         if (repeatDuration >= holdTimeout)
         {
           // this is a repeat, push it

_service:download_url:master.tar.gz/xbmc/windowing/android/WinEventsAndroid.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/egl/EGLNativeTypeIMX.cpp Changed

@@ -265,14 +265,6 @@
 
   CLog::Log(LOGDEBUG, "%s: %s",__FUNCTION__, res.strId.c_str());
 
-/*** a hack around old broken kernel.
-     should be removed ***/
-
-  // Reset AE
-  CAEFactory::DeviceChange();
-
-/*************************/
-
   return true;
 }
 
@@ -336,17 +328,6 @@
 
   m_show = show;
 
-/*** a hack around old broken kernel.
-     should be removed ***/
-
-  // Force vsync by default
-  eglSwapInterval(g_Windowing.GetEGLDisplay(), 1);
-  EGLint result = eglGetError();
-  if(result != EGL_SUCCESS)
-    CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, result);
-
-/*************************/
-
   return true;
 }
 
@@ -367,6 +348,19 @@
   if(!f_edid)
     return 0;
 
+  // first check if EDID is in binary format by reading 512bytes, compare 1st 8bytes
+  // against EDID 1.4 identificator [0x0,0xff,0xff,0xff,0xff,0xff,0xff,0x0]
+  // if no match, seek to 0 input file and continue with previous method.
+  if (((done = fread(m_edid, 1, EDID_MAXSIZE, f_edid)) % 128) == 0 && done)
+    if (!memcmp(m_edid, EDID_HEADER, EDID_HEADERSIZE))
+    {
+      fclose(f_edid);
+      return true;
+    }
+
+  done = 0;
+  memset(m_edid, 0, EDID_MAXSIZE);
+  fseek(f_edid, 0L, SEEK_SET);
   // we need to convert mxc_hdmi output format to binary array
   // mxc_hdmi provides the EDID as space delimited 1bytes blocks
   // exported as text with format specifier %x eg:
@@ -383,7 +377,7 @@
   while(getline(&str, &n, f_edid) > 0)
   {
     char *c = str;
-    while(*c != '\n' && done < 512)
+    while(*c != '\n' && done < EDID_MAXSIZE)
     {
       c += 2;
       sscanf(c, "%hhx", &p);

_service:download_url:master.tar.gz/xbmc/windowing/egl/EGLNativeTypeIMX.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/osx/WinEventsIOS.mm Changed

_service:download_url:master.tar.gz/xbmc/windowing/windows/WinEventsWin32.cpp Changed

_service:download_url:master.tar.gz/xbmc/windowing/windows/WinSystemWin32.cpp Changed

@@ -803,7 +803,7 @@
 
 void CWinSystemWin32::OnDisplayLost()
 {
-  CLog::Log(LOGDEBUG, "%s - notify display change event", __FUNCTION__);
+  CLog::Log(LOGDEBUG, "%s - notify display lost event", __FUNCTION__);
 
   // make sure renderer has no invalid references
   KODI::MESSAGING::CApplicationMessenger::GetInstance().SendMsg(TMSG_RENDERER_FLUSH);
@@ -817,26 +817,30 @@
 
 void CWinSystemWin32::OnDisplayReset()
 {
-  CLog::Log(LOGDEBUG, "%s - notify display change event", __FUNCTION__);
   if (!m_delayDispReset)
   {
+    CLog::Log(LOGDEBUG, "%s - notify display reset event", __FUNCTION__);
     CSingleLock lock(m_resourceSection);
     for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
       (*i)->OnResetDisplay();
   }
 }
 
-void CWinSystemWin32::ResolutionChanged()
+void CWinSystemWin32::OnDisplayBack()
 {
-  OnDisplayLost();
   int delay = CSettings::GetInstance().GetInt("videoscreen.delayrefreshchange");
   if (delay > 0)
   {
     m_delayDispReset = true;
     m_dispResetTimer.Set(delay * 100);
   }
-  else
-    OnDisplayReset();
+  OnDisplayReset();
+}
+
+void CWinSystemWin32::ResolutionChanged()
+{
+  OnDisplayLost();
+  OnDisplayBack();
 }
 
 #endif

_service:download_url:master.tar.gz/xbmc/windowing/windows/WinSystemWin32.h Changed

_service:download_url:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.cpp Changed

@@ -181,42 +181,13 @@
   {
     CRenderSystemDX::m_useWindowedDX = !bGaining;
     CRenderSystemDX::SetFullScreenInternal();
-    CRenderSystemDX::CreateWindowSizeDependentResources();
+    if (bGaining)
+      CRenderSystemDX::CreateWindowSizeDependentResources();
 
     // minimize window on lost focus
     if (!bGaining)
-      ShowWindow(m_hWnd, SW_SHOWMINIMIZED);
+      ShowWindow(m_hWnd, SW_FORCEMINIMIZE);
   }
 }
 
-void CWinSystemWin32DX::Register(ID3DResource *resource)
-{
-  CRenderSystemDX::Register(resource);
-}
-
-void CWinSystemWin32DX::Unregister(ID3DResource *resource)
-{
-  CRenderSystemDX::Unregister(resource);
-}
-
-void CWinSystemWin32DX::Register(IDispResource *resource)
-{
-  CWinSystemWin32::Register(resource);
-}
-
-void CWinSystemWin32DX::Unregister(IDispResource *resource)
-{
-  CWinSystemWin32::Unregister(resource);
-}
-
-void CWinSystemWin32DX::OnDisplayLost()
-{
-  CWinSystemWin32::OnDisplayLost();
-}
-
-void CWinSystemWin32DX::OnDisplayReset()
-{
-  CWinSystemWin32::OnDisplayReset();
-}
-
 #endif

_service:download_url:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.h Changed

@@ -54,24 +54,23 @@
    where any resources dependent on the DirectX device should be destroyed and recreated.
    \sa Unregister, ID3DResource
   */
-  void Register(ID3DResource *resource);
-
+  void Register(ID3DResource *resource) override { CRenderSystemDX::Register(resource); };
   /*!
    \brief Unregister as a dependent of the DirectX Render System
    Resources should call this on destruction if they're a dependent on the Render System
    \sa Register, ID3DResource
   */
-  void Unregister(ID3DResource *resource);
+  void Unregister(ID3DResource *resource) override { CRenderSystemDX::Unregister(resource); };
 
-  virtual void Register(IDispResource *resource);
-  virtual void Unregister(IDispResource *resource);
+  void Register(IDispResource *resource) override { CWinSystemWin32::Register(resource); };
+  void Unregister(IDispResource *resource) override { CWinSystemWin32::Unregister(resource); };
 
 protected:
-  virtual void UpdateMonitor();
   bool UseWindowedDX(bool fullScreen);
-
-  void OnDisplayLost();
-  void OnDisplayReset();
+  void UpdateMonitor() override;
+  void OnDisplayLost() override { CWinSystemWin32::OnDisplayLost(); };
+  void OnDisplayReset() override { CWinSystemWin32::OnDisplayReset(); };
+  void OnDisplayBack() override { CWinSystemWin32::OnDisplayBack(); };
 };
 
 XBMC_GLOBAL_REF(CWinSystemWin32DX,g_Windowing);

_service:download_url:master.tar.gz/xbmc/windows/GUIMediaWindow.cpp Changed

@@ -213,11 +213,13 @@
 bool CGUIMediaWindow::OnBack(int actionID)
 {
   CURL filterUrl(m_strFilterPath);
-  if (actionID == ACTION_NAV_BACK && !m_vecItems->IsVirtualDirectoryRoot() &&
+  if (actionID == ACTION_NAV_BACK &&
+      !m_vecItems->IsVirtualDirectoryRoot() &&
+      !URIUtils::PathEquals(m_vecItems->GetPath(), GetRootPath(), true) &&
      (!URIUtils::PathEquals(m_vecItems->GetPath(), m_startDirectory, true) || (m_canFilterAdvanced && filterUrl.HasOption("filter"))))
   {
-    GoParentFolder();
-    return true;
+    if (GoParentFolder())
+      return true;
   }
   return CGUIWindow::OnBack(actionID);
 }
@@ -502,7 +504,7 @@
       }
       if (message.GetParam1() != WINDOW_INVALID)
       { // first time to this window - make sure we set the root path
-        m_startDirectory = returning ? dir : "";
+        m_startDirectory = returning ? dir : GetRootPath();
       }
     }
     break;
@@ -686,7 +688,7 @@
   // update the view state's reference to the current items
   m_guiState.reset(CGUIViewState::GetViewState(GetID(), items));
 
-  if (m_guiState.get() && !m_guiState->HideParentDirItems() && !items.GetPath().empty())
+  if (m_guiState.get() && !m_guiState->HideParentDirItems() && items.GetPath() != GetRootPath())
   {
     CFileItemPtr pItem(new CFileItem(".."));
     pItem->SetPath(strParentPath);
@@ -724,33 +726,37 @@
   return true;
 }
 
-// \brief Set window to a specific directory
-// \param strDirectory The directory to be displayed in list/thumb control
-// This function calls OnPrepareFileItems()
 bool CGUIMediaWindow::Update(const std::string &strDirectory, bool updateFilterPath /* = true */)
 {
   // TODO: OnInitWindow calls Update() before window path has been set properly.
   if (strDirectory == "?")
     return false;
 
+  // The path to load. Empty string is used in various places to denote root, so translate to the
+  // real root path first
+  const std::string path = strDirectory.empty() ? GetRootPath() : strDirectory;
+
   // stores the selected item in history
   SaveSelectedItemInHistory();
 
-  std::string strCurrentDirectory = m_vecItems->GetPath();
-  std::string directory = strDirectory;
+  const std::string previousPath = m_vecItems->GetPath();
+
   // check if the path contains a filter and temporarily remove it
   // so that the retrieved list of items is unfiltered
-  bool canfilter = CanContainFilter(directory);
-  CURL url(directory);
-  if (canfilter && url.HasOption("filter"))
-    directory = RemoveParameterFromPath(directory, "filter");
+  std::string pathNoFilter = path;
+  if (CanContainFilter(pathNoFilter) && CURL(pathNoFilter).HasOption("filter"))
+    pathNoFilter = RemoveParameterFromPath(pathNoFilter, "filter");
 
-  if (!GetDirectory(directory, *m_vecItems))
+  if (!GetDirectory(pathNoFilter, *m_vecItems))
   {
-    CLog::Log(LOGERROR,"CGUIMediaWindow::GetDirectory(%s) failed", url.GetRedacted().c_str());
+    CLog::Log(LOGERROR,"CGUIMediaWindow::GetDirectory(%s) failed", CURL(path).GetRedacted().c_str());
+
+    if (URIUtils::PathEquals(path, GetRootPath()))
+      return false; // Nothing to fallback to
+
     // Try to return to the previous directory, if not the same
     // else fallback to root
-    if (URIUtils::PathEquals(strDirectory, strCurrentDirectory) || !Update(m_history.RemoveParentPath()))
+    if (URIUtils::PathEquals(path, previousPath) || !Update(m_history.RemoveParentPath()))
       Update(""); // Fallback to root
 
     // Return false to be able to eg. show
@@ -762,16 +768,16 @@
     m_vecItems->SetLabel(CUtil::GetTitleFromPath(m_vecItems->GetPath(), true));
 
   // check the given path for filter data
-  UpdateFilterPath(strDirectory, *m_vecItems, updateFilterPath);
+  UpdateFilterPath(path, *m_vecItems, updateFilterPath);
     
   // if we're getting the root source listing
   // make sure the path history is clean
-  if (strDirectory.empty())
+  if (URIUtils::PathEquals(path, GetRootPath()))
     m_history.ClearPathHistory();
 
   int iWindow = GetID();
   int showLabel = 0;
-  if (strDirectory.empty())
+  if (URIUtils::PathEquals(path, GetRootPath()))
   {
     if (iWindow == WINDOW_PICTURES)
       showLabel = 997;
@@ -1082,27 +1088,25 @@
 }
 
 // \brief The functon goes up one level in the directory tree
-void CGUIMediaWindow::GoParentFolder()
+bool CGUIMediaWindow::GoParentFolder()
 {
+  if (m_vecItems->IsVirtualDirectoryRoot())
+    return false;
+
+  if (URIUtils::PathEquals(m_vecItems->GetPath(), GetRootPath()))
+    return false;
+
   //m_history.DumpPathHistory();
 
-  // remove current directory if its on the stack
-  // there were some issues due some folders having a trailing slash and some not
-  // so just add a trailing slash to all of them for comparison.
-  std::string strPath = m_vecItems->GetPath();
-  URIUtils::AddSlashAtEnd(strPath);
-  std::string strParent = m_history.GetParentPath();
+  const std::string currentPath = m_vecItems->GetPath();
+  std::string parentPath = m_history.GetParentPath();
   // in case the path history is messed up and the current folder is on
   // the stack more than once, keep going until there's nothing left or they
   // dont match anymore.
-  while (!strParent.empty())
+  while (!parentPath.empty() && URIUtils::PathEquals(parentPath, currentPath, true))
   {
-    URIUtils::AddSlashAtEnd(strParent);
-    if (URIUtils::PathEquals(strParent, strPath))
-      m_history.RemoveParentPath();
-    else
-      break;
-    strParent = m_history.GetParentPath();
+    m_history.RemoveParentPath();
+    parentPath = m_history.GetParentPath();
   }
 
   // remove the current filter but only if the parent
@@ -1117,23 +1121,24 @@
       // Refresh() will set updateFilterPath to false
       m_strFilterPath.clear();
       Refresh();
-      return;
+      return true;
     }
   }
 
-  // if vector is not empty, pop parent
-  // if vector is empty, parent is root source listing
+  // pop directory path from the stack
   m_strFilterPath = m_history.GetParentPath(true);
-  strParent = m_history.RemoveParentPath();
-  if (!Update(strParent, false))
-    return;
+  m_history.RemoveParentPath();
+
+  if (!Update(parentPath, false))
+    return false;
 
   // No items to show so go another level up
   if (!m_vecItems->GetPath().empty() && (m_filter.IsEmpty() ? m_vecItems->Size() : m_unfilteredItems->Size()) <= 0)
   {
     CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, g_localizeStrings.Get(2080), g_localizeStrings.Get(2081));
-    GoParentFolder();
+    return GoParentFolder();
   }
+  return true;
 }
 
 void CGUIMediaWindow::SaveSelectedItemInHistory()
@@ -1517,29 +1522,43 @@
   }
 }
 
-bool CGUIMediaWindow::OnPopupMenu(int iItem)
+bool CGUIMediaWindow::OnPopupMenu(int itemIdx)
 {
-  // popup the context menu
-  // grab our context menu
+  if (itemIdx < 0 || itemIdx >= m_vecItems->Size())
+    return false;
+
+  auto item = m_vecItems->Get(itemIdx);
+  if (!item)
+    return false;
+
+  //Construct the list with core menu on top, legacy menu in the middle and addons on bottom.
   CContextButtons buttons;
-  GetContextButtons(iItem, buttons);
+  auto menuItems = CContextMenuManager::GetInstance().GetItems(*item, CContextMenuManager::MAIN);
+  for (const auto& menu : menuItems)
+    buttons.emplace_back(-buttons.size(), menu->GetLabel(*item));
 
-  if (buttons.size())
-  {
-    // mark the item
-    if (iItem >= 0 && iItem < m_vecItems->Size())
-      m_vecItems->Get(iItem)->Select(true);
+  int legacyMenuStart = buttons.size();
+  GetContextButtons(itemIdx, buttons);
 
-    int choice = CGUIDialogContextMenu::ShowAndGetChoice(buttons);
+  int addonMenuStart = buttons.size();
+  auto addonItems = CContextMenuManager::GetInstance().GetAddonItems(*item, CContextMenuManager::MAIN);
+  for (const auto& menu : addonItems)
+    buttons.emplace_back(-buttons.size(), menu->GetLabel(*item));
 
-    // deselect our item
-    if (iItem >= 0 && iItem < m_vecItems->Size())
-      m_vecItems->Get(iItem)->Select(false);
+  if (buttons.empty())
+    return true;
 
-    if (choice >= 0)
-      return OnContextButton(iItem, (CONTEXT_BUTTON)choice);
-  }
-  return false;
+  int idx = CGUIDialogContextMenu::Show(buttons);
+  if (idx < 0 || idx >= buttons.size())
+    return false;
+
+  if (idx < legacyMenuStart)
+    return CONTEXTMENU::LoopFrom(*menuItems[idx], item);
+
+  if (idx >= addonMenuStart)
+    return CONTEXTMENU::LoopFrom(*addonItems[idx - addonMenuStart], item);
+
+  return OnContextButton(itemIdx, static_cast<CONTEXT_BUTTON>(buttons[idx].first));
 }
 
 void CGUIMediaWindow::GetContextButtons(int itemNumber, CContextButtons &buttons)
@@ -1593,33 +1612,12 @@
 {
   switch (button)
   {
-  case CONTEXT_BUTTON_MARK_WATCHED:
-  case CONTEXT_BUTTON_MARK_UNWATCHED:
-    {
-      CFileItemPtr item = m_vecItems->Get(itemNumber);
-      m_viewControl.SetSelectedItem(m_viewControl.GetSelectedItem() + 1);
-      CVideoLibraryQueue::GetInstance().MarkAsWatched(item, (button == CONTEXT_BUTTON_MARK_WATCHED));
-      return true;
-    }
   case CONTEXT_BUTTON_ADD_FAVOURITE:
     {
       CFileItemPtr item = m_vecItems->Get(itemNumber);
       XFILE::CFavouritesDirectory::AddOrRemove(item.get(), GetID());
       return true;
     }
-  case CONTEXT_BUTTON_PLUGIN_SETTINGS:
-    {
-      CFileItemPtr item = m_vecItems->Get(itemNumber);
-      // CONTEXT_BUTTON_PLUGIN_SETTINGS can be called for plugin item
-      // or script item; or for the plugin directory current listing.
-      bool isPluginOrScriptItem = (item && (item->IsPlugin() || item->IsScript()));
-      CURL plugin(isPluginOrScriptItem ? item->GetPath() : m_vecItems->GetPath());
-      ADDON::AddonPtr addon;
-      if (CAddonMgr::GetInstance().GetAddon(plugin.GetHostName(), addon))
-        if (CGUIDialogAddonSettings::ShowAndGetInput(addon))
-          Refresh();
-      return true;
-    }
   case CONTEXT_BUTTON_BROWSE_INTO:
     {
       CFileItemPtr item = m_vecItems->Get(itemNumber);
@@ -1644,8 +1642,6 @@
   default:
     break;
   }
-  if (button >= CONTEXT_BUTTON_FIRST_ADDON)
-    return CContextMenuManager::GetInstance().OnClick(button, m_vecItems->Get(itemNumber));
   return false;
 }

_service:download_url:master.tar.gz/xbmc/windows/GUIMediaWindow.h Changed

_service:download_url:master.tar.gz/xbmc/windows/GUIWindowLoginScreen.cpp Changed

libdvdcss-master.tar.gz Added

libdvdnav-master.tar.gz Added

libdvdread-master.tar.gz Added