Packman Build Service PMBS

kodi-next.spec Changed

kodi.spec Changed

@@ -68,12 +68,12 @@
 # DOWNLOAD from https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz
 Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
 %endif
-Patch0:         kodi.arm.patch
-#Patch1:         no-xbmc-symbolic-link.patch
-#Patch2:         kodi-texturepacker.patch
-#Patch3:         crossguid_build64.patch
-Patch4:         kodi.aarch64.patch
-Patch5:         kodi-tools-libdir.patch
+#Patch0:         kodi.arm.patch
+##Patch1:         no-xbmc-symbolic-link.patch
+##Patch2:         kodi-texturepacker.patch
+##Patch3:         crossguid_build64.patch
+#Patch4:         kodi.aarch64.patch
+#Patch5:         kodi-tools-libdir.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
@@ -310,9 +310,6 @@
 %ifarch i586
     -DCMAKE_C_FLAGS='-msse' \
 %endif
-%if %{dev_build}
-    -DUSE_CCACHE=1 \
-%endif
     -DENABLE_INTERNAL_FMT=1 \
     -DFMT_URL=%{SOURCE24} \
     -DENABLE_INTERNAL_RapidJSON=1 \
@@ -325,9 +322,9 @@
     -DBUILD_DIR=build \
     -DBUILD_SHARED_LIBS=1 \
     -DNEED_SUDO=FALSE \
-    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}/kodi/ \
-    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} 
+    -DCMAKE_INSTALL_PREFIX=%{buildroot}%{_prefix} \
+    -DCMAKE_INSTALL_LIBDIR=%{buildroot}%{_libdir}
+#    -DAPP_LIB_DIR=%{buildroot}%{_libdir}/kodi 
 
 cmake --build . -- VERBOSE=1 %{?_smp_mflags}
 #make -O %{?_smp_mflags} V=1

3.4-Leia-Alpha-1.tar.gz Renamed

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

_service:download_files:master.tar.gz/.mention-bot Deleted

_service:download_files:master.tar.gz/CMakeLists.txt Changed

@@ -114,6 +114,7 @@
 set(required_deps Cdio
                   Cpluff
                   CrossGUID
+                  Curl
                   FFMPEG
                   Fmt
                   FreeType
@@ -150,7 +151,6 @@
                   LCMS2
                   MDNS
                   MicroHttpd
-                  MySqlClient
                   PulseAudio
                   Python
                   SmbClient
@@ -161,8 +161,7 @@
                   ${PLATFORM_OPTIONAL_DEPS})
 
 # Required, dyloaded deps. Keep in alphabetical order please
-set(required_dyload ASS
-                    Curl)
+set(required_dyload ASS)
 
 # Optional, dyloaded deps. Keep in alphabetical order please
 set(dyload_optional Bluray
@@ -179,6 +178,17 @@
 core_require_dyload_dep(${required_dyload})
 core_optional_dyload_dep(${dyload_optional})
 
+if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO)
+  MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.")
+elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO)
+  set(ENABLE_MARIADBCLIENT OFF CACHE BOOL "")
+endif()
+
+core_optional_dep(MariaDBClient)
+if(NOT MARIADBCLIENT_FOUND)
+  core_optional_dep(MySqlClient)
+endif()
+
 if(NOT UDEV_FOUND)
   core_optional_dep(LibUSB)
 endif()

_service:download_files:master.tar.gz/addons/metadata.artists.universal/addon.xml Changed

_service:download_files:master.tar.gz/addons/metadata.artists.universal/artistuniversal.xml Changed

@@ -2,7 +2,7 @@
 <scraper framework="1.1" date="2013-05-29">
 	<NfoUrl dest="3">
 		<RegExp input="$$1" output="&lt;url&gt;$INFO[mbsite]/ws/2/artist/\1?inc=url-rels&lt;/url&gt;" dest="3">
-			<expression>http://musicbrainz.org/artist/(.+)</expression>
+			<expression>musicbrainz.org/artist/(.+)</expression>
 		</RegExp>
 	</NfoUrl>
 	<ResolveIDToUrl dest="3">
@@ -58,12 +58,24 @@
 			<RegExp input="$$1" output="\2" dest="9">
 				<expression noclean="1">&gt;http://(www.)?allmusic.com/artist/([^&lt;]*)</expression>
 			</RegExp>
-			<RegExp input="$$1" output="&lt;musicBrainzArtistID&gt;$$8&lt;/musicBrainzArtistID&gt;&lt;name&gt;\2&lt;/name&gt;" dest="5">
-				<expression noclean="1">&lt;artist(.*?)&lt;name&gt;([^&lt;]*)</expression>
+			<RegExp input="$$1" output="&lt;musicBrainzArtistID&gt;$$8&lt;/musicBrainzArtistID&gt;&lt;name&gt;\1&lt;/name&gt;" dest="5">
+				<expression noclean="1">&lt;artist.*?&lt;name&gt;([^&lt;]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;type&gt;\1&lt;/type&gt;" dest="5+">
+				<expression noclean="1">&lt;artist.*?type=&quot;([^&quot;]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;gender&gt;\1&lt;/gender&gt;" dest="5+">
+				<expression noclean="1">&lt;gender.*?&gt;([^&lt;]*)</expression>
+			</RegExp>
+			<RegExp input="$$1" output="&lt;disambiguation&gt;\1&lt;/disambiguation&gt;" dest="5+">
+				<expression noclean="1">&lt;disambiguation&gt;([^&lt;]*)</expression>
 			</RegExp>
 			<RegExp input="$$8" conditional="fanarttvthumbs" output="&lt;chain function=&quot;GetFanartTvArtistThumbsByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
 			</RegExp>
+			<RegExp input="$$8" conditional="fanarttvartistcl" output="&lt;chain function=&quot;GetFanartTvArtistClearlogoByMBID&quot;&gt;\1&lt;/chain&gt;" dest="5+">
+				<expression noclean="1">(.+)</expression>
+			</RegExp>
 			<RegExp input="$$8" conditional="tadbthumbs" output="&lt;chain function=&quot;GetTADBArtistThumbsByMBID&quot;&gt;$$8&lt;/chain&gt;" dest="5+">
 				<expression noclean="1">(.+)</expression>
 			</RegExp>

_service:download_files:master.tar.gz/addons/metadata.artists.universal/changelog.txt Changed

_service:download_files:master.tar.gz/addons/metadata.artists.universal/resources/language/English/strings.po Changed

_service:download_files:master.tar.gz/addons/metadata.artists.universal/resources/settings.xml Changed

_service:download_files:master.tar.gz/addons/metadata.themoviedb.org/addon.xml Changed

_service:download_files:master.tar.gz/addons/metadata.themoviedb.org/changelog.txt Changed

_service:download_files:master.tar.gz/addons/metadata.themoviedb.org/resources/settings.xml Changed

@@ -3,8 +3,8 @@
 <setting label="30005" type="bool" id="keeporiginaltitle" default="false"/>
 <setting label="30000" type="bool" id="fanart" default="true"/>
 <setting label="30004" type="bool" id="trailer" default="true"/>
- <setting label="30002" type="select" values="bg|cs|da|de|el|en|es|fa|fa-ir|fi|fr|he|hr|hu|it|ja|ko|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|th|tr|uk|zh-cn|zh-tw" id="language" default="en"/>
- <setting label="30006" type="select" values="au|bg|cs|da|de|el|es|fi|fr|gb|he|hr|hu|it|ja|ko|nl|no|pl|pt|ru|sl|sv|th|tr|us|zh" id="tmdbcertcountry" default="us"/>
+ <setting label="30002" type="select" values="ar-AE|ar-SA|bg|bn-BD|ca-ES|ch-GU|cs|da|de|el|en|eo-EO|es|es-MX|eu-ES|fa|fa-ir|fi|fr|fr-CA|he|hi-IN|hr|hu|id-ID|it|ja|ka-GE|ko|lt-LT|lv-LV|ml-IN|nb|nl|no|pl|pt|pt-br|ro|ru|sk|sl|sr|sv|ta-IN|th|tr|uk|vi-VN|zh-cn|zh-tw" id="language" default="en"/>
+ <setting label="30006" type="select" values="au|bg|br|ca|cz|ge|de|dk|ee|es|fi|fr|gb|gr|hr|hu|id|il|in|it|ir|jp|kr|lt|lv|mx|nl|no|pl|pt|ru|si|sv|th|tr|ua|us|vn|zh" id="tmdbcertcountry" default="us"/>
 <setting label="30003" type="labelenum" values="TMDb|IMDb" id="RatingS" default="TMDb"/>
 	<setting label="30007" type="bool" id="imdbanyway" visible="eq(-1,0)" default="false"/>
 <setting label="certprefix" type="text" id="certprefix" default="Rated " visible="false"/>

_service:download_files:master.tar.gz/addons/metadata.themoviedb.org/tmdb.xml Changed

@@ -44,13 +44,13 @@
 	</GetSearchResults>
 	<GetDetails dest="3">
 		<RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
-			<RegExp input="$$1" output="&lt;uniqueid type=&quot;tmdb&quot; default=&quot;true&quot;&gt;$$2&lt;/uniqueid&gt;" dest="5">
-				<expression/>
-			</RegExp>
 			<RegExp input="$$1" output="\1" dest="11">
 				<expression clear="yes" noclean="1">&quot;id&quot;:[0-9]*,&quot;imdb_id&quot;:&quot;([^&quot;]*)</expression>
 			</RegExp>
-			<RegExp input="$$11" output="&lt;uniqueid type=&quot;imdb&quot;&gt;\1&lt;/uniqueid&gt;" dest="5+">
+			<RegExp input="$$11|default=&quot;true&quot;" output="&lt;uniqueid type=&quot;tmdb&quot; \1&gt;$$2&lt;/uniqueid&gt;" dest="5">
+				<expression>^\|(default=&quot;true&quot;)|tt[0-9]+</expression>
+			</RegExp>
+			<RegExp input="$$11" output="&lt;uniqueid type=&quot;imdb&quot; default=&quot;true&quot;&gt;\1&lt;/uniqueid&gt;" dest="5+">
 				<expression>(.+)</expression>
 			</RegExp>
 			<RegExp input="$$1" output="\1" dest="9">
@@ -59,7 +59,7 @@
 			<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
 				<expression/>
 			</RegExp>
-			<RegExp conditional="!keeporiginaltitle" input="$$2" output="&lt;chain function=&quot;GetTMDBTitleByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp conditional="!keeporiginaltitle" input="$$2" output="&lt;chain function=&quot;GetTMDBTitleByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
 			<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
@@ -83,13 +83,13 @@
 			<RegExp input="$$11|$INFO[RatingS]|default|$INFO[imdbanyway]" output="&lt;chain function=&quot;GetIMDBRatingsById&quot;&gt;$$11\1&lt;/chain&gt;" dest="5+">
 				<expression>tt[0-9]+\|(?:IMDb(\|default)|.*true$)</expression>
 			</RegExp>
-			<RegExp input="$INFO[RatingS]|default" output="&lt;chain function=&quot;GetTMDBRatingsByIdChain&quot;&gt;$$2\1&lt;/chain&gt;" dest="5+">
+			<RegExp input="$INFO[RatingS]|default" output="&lt;chain function=&quot;GetTMDBRatingsByIdChain&quot;&gt;$$2::$INFO[language]\1&lt;/chain&gt;" dest="5+">
 				<expression>TMDb(\|default)|.*</expression>
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBStudioByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBStudioByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCountryByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCountryByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
 			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBDirectorsByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
@@ -98,31 +98,31 @@
 			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBWitersByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCertificationsByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCertificationsByIdChain&quot;&gt;$$2::$INFO[tmdbcertcountry]::$INFO[certprefix]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBSetByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBSetByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBPlotByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBPlotByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBTaglineByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBTaglineByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
 			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBCastByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBGenresByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBGenresByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBThumbsByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp input="$$2" output="&lt;chain function=&quot;GetTMDBThumbsByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp conditional="fanart" input="$$2" output="&lt;chain function=&quot;GetTMDBFanartByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp conditional="fanart" input="$$2" output="&lt;chain function=&quot;GetTMDBFanartByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
-			<RegExp conditional="trailer" input="$$2" output="&lt;chain function=&quot;GetTMDBTrailerByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
+			<RegExp conditional="trailer" input="$$2" output="&lt;chain function=&quot;GetTMDBTrailerByIdChain&quot;&gt;$$2::$INFO[language]&lt;/chain&gt;" dest="5+">
 				<expression />
 			</RegExp>
 			<expression noclean="1" />

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

@@ -6513,6 +6513,7 @@
 msgstr ""
 
 #: system/settings/settings.xml
+#: xbmc/addons/AddonInfo.cpp
 msgctxt "#13303"
 msgid "Fonts"
 msgstr ""
@@ -11074,16 +11075,16 @@
 msgid "No PVR add-on enabled"
 msgstr ""
 
-#. 'timeline' label used in pvr guide window
+#. 'Viewtype' label for vertical channel layout, used in pvr guide window
 #: addons/skin.estuary/xml/MyPVRGuide.xml
 msgctxt "#19297"
-msgid "Vertical"
+msgid "Vertical channels"
 msgstr ""
 
-#. 'timeline' label used in pvr guide window
+#. 'Viewtype' label for horizontal channel layout, used in pvr guide window
 #: addons/skin.estuary/xml/MyPVRGuide.xml
 msgctxt "#19298"
-msgid "Horizontal"
+msgid "Horizontal channels"
 msgstr ""
 
 #. generic "expiration" label used in different places
@@ -11093,7 +11094,19 @@
 msgid "Expires"
 msgstr ""
 
-#empty strings from id 19300 to 19498
+#. 'Viewtype' label for vertical channel layout without channel group selctor, used in pvr guide window
+#: addons/skin.estuary/xml/MyPVRGuide.xml
+msgctxt "#19300"
+msgid "Vertical channels, no group selector"
+msgstr ""
+
+#. 'Viewtype' label for horizontal channel layout without channel group selctor, used in pvr guide window
+#: addons/skin.estuary/xml/MyPVRGuide.xml
+msgctxt "#19301"
+msgid "Horizontal channels, no group selector"
+msgstr ""
+
+#empty strings from id 19302 to 19498
 
 #. label for epg genre value
 #: xbmc/epg/Epg.cpp
@@ -12709,10 +12722,15 @@
 
 #: xbmc/network/GUIDialogNetworkSetup.cpp
 msgctxt "#20304"
-msgid "RSS Feed"
+msgid "RSS Feed (HTTP)"
 msgstr ""
 
-#empty strings from id 20305 to 20306
+#: xbmc/network/GUIDialogNetworkSetup.cpp
+msgctxt "#20305"
+msgid "RSS Feed (HTTPS)"
+msgstr ""
+
+#empty string with id 20306
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
 msgctxt "#20307"
@@ -17380,7 +17398,28 @@
 msgid "Single keys"
 msgstr ""
 
-#empty strings from id 35168 to 35199
+#. Name of the button that prompts you to select a key on the keyboard. Used in the controller mapping dialog.
+msgctxt "#35168"
+msgid "Select key"
+msgstr ""
+
+#. Keyboard prompt without a timeout. Used in the controller mapping dialog.
+msgctxt "#35169"
+msgid "Press a key"
+msgstr ""
+
+#. Keyboard prompt with timeout. {1:d} - seconds left in prompt. Used in the controller mapping dialog.
+msgctxt "#35170"
+msgid "Press a key ({1:d})"
+msgstr ""
+
+#. Name of mouse connected to the computer
+#: xbmc/peripherals/bus/virtual/PeripheralBusApplication.cpp
+msgctxt "#35171"
+msgid "Mouse"
+msgstr ""
+
+#empty strings from id 35172 to 35199
 
 #. This string is an early meme from the late 1990's that made fun of the poor translation in the 16-bit game Zero Wing from the late 1980's. DO NOT TRANSLATE!
 #: system/settings/settings.xml
@@ -17847,7 +17886,22 @@
 msgid "Force AVR to wake up when Kodi is activated"
 msgstr ""
 
-#empty strings from id 36047 to 36098
+#: system/peripherals.xml
+msgctxt "#36047"
+msgid "Remote button press delay before repeating (ms)"
+msgstr ""
+
+#: system/peripherals.xml
+msgctxt "#36048"
+msgid "Remote button press repeat rate (ms)"
+msgstr ""
+
+#: system/peripherals.xml
+msgctxt "#36049"
+msgid "Remote button press release time (ms)"
+msgstr ""
+
+#empty strings from id 36050 to 36098
 
 #: system/settings/settings.xml
 msgctxt "#36099"

_service:download_files:master.tar.gz/addons/screensaver.xbmc.builtin.black/addon.xml Changed

_service:download_files:master.tar.gz/addons/screensaver.xbmc.builtin.dim/addon.xml Changed

_service:download_files:master.tar.gz/addons/service.xbmc.versioncheck/.gitignore Added

_service:download_files:master.tar.gz/addons/service.xbmc.versioncheck/addon.xml Changed

_service:download_files:master.tar.gz/addons/service.xbmc.versioncheck/changelog.txt Changed

_service:download_files:master.tar.gz/addons/service.xbmc.versioncheck/icon.png Changed

_service:download_files:master.tar.gz/addons/service.xbmc.versioncheck/resources/versions.txt Changed

_service:download_files:master.tar.gz/addons/skin.estouchy/media/DefaultAddonFont.png Added

_service:download_files:master.tar.gz/addons/skin.estuary/media/DefaultAddonFont.png Added

_service:download_files:master.tar.gz/addons/skin.estuary/media/DefaultAddonImageDecoder.png Added

_service:download_files:master.tar.gz/addons/skin.estuary/media/DefaultAddonVfs.png Added

_service:download_files:master.tar.gz/addons/skin.estuary/xml/GameOSD.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/Includes_PVR.xml Changed

@@ -234,7 +234,7 @@
 							<shadowcolor>text_shadow</shadowcolor>
 						</control>
 					</itemlayout>
-					<content sortby="date" sortorder=$PARAM[folder_sortorder]>$INFO[ListItem.FilenameAndPath]</content>
+					<content sortby="date" sortorder="$PARAM[folder_sortorder]">$INFO[ListItem.FilenameAndPath]</content>
 				</control>
 			</control>
 		</control>
@@ -257,7 +257,7 @@
 		<definition>
 			<control type="epggrid" id="$PARAM[control_id]">
 				<left>0</left>
-				<top>0</top>
+				<top>$PARAM[control_top]</top>
 				<right>20</right>
 				<bottom>340</bottom>
 				<orientation>$PARAM[control_orientation]</orientation>
@@ -267,8 +267,8 @@
 				<rulerunit>6</rulerunit>
 				<onleft>9000</onleft>
 				<onright>60</onright>
-				<onup>50</onup>
-				<ondown>50</ondown>
+				<onup>$PARAM[control_onup_id]</onup>
+				<ondown>$PARAM[control_id]</ondown>
 				<viewtype label="$PARAM[viewtype_label]">list</viewtype>
 				<progresstexture border="$PARAM[progress_texture_border]" colordiffuse="button_focus">$PARAM[progress_texture]</progresstexture>
 				<rulerdatelayout width="1700" height="45" condition="$PARAM[has_rulerdate_layout]">
@@ -307,7 +307,7 @@
 						<left>68</left>
 						<top>-2</top>
 						<height>60</height>
-						font12
+						font13
 						<label>$INFO[ListItem.ChannelName]</label>
 						<aligny>center</aligny>
 						<textoffsetx>10</textoffsetx>
@@ -329,7 +329,7 @@
 						<left>68</left>
 						<top>-2</top>
 						<height>60</height>
-						font12
+						font13
 						<label>$INFO[ListItem.ChannelName]</label>
 						<textcolor>button_focus</textcolor>
 						<aligny>center</aligny>
@@ -347,7 +347,7 @@
 						<top>0</top>
 						<height>36</height>
 						<aligny>center</aligny>
-						font12
+						font13
 						<label>$INFO[ListItem.Label]</label>
 					</control>
 					<control type="image">
@@ -384,7 +384,7 @@
 						<top>0</top>
 						<height>36</height>
 						<aligny>center</aligny>
-						font12
+						font13
 						<label>$INFO[ListItem.Label]</label>
 					</control>
 					<control type="image">

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MusicOSD.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MyPVRGuide.xml Changed

@@ -2,7 +2,7 @@
 <window>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<backgroundcolor>background</backgroundcolor>
-	<views>50,51</views>
+	<views>50,51,52,53</views>
 	<menucontrol>9000</menucontrol>
 	<controls>
 		<include>DefaultBackground</include>
@@ -10,7 +10,7 @@
 			<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(50) | Control.IsVisible(51)</visible>
+				<visible>Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | Control.IsVisible(53)</visible>
 				<include>OpenClose_Right</include>
 				<include>Visible_Right</include>
 				<control type="group">
@@ -23,61 +23,200 @@
 						<bottom>336</bottom>
 						<texture colordiffuse="E6FFFFFF">dialogs/dialog-bg-nobo.png</texture>
 					</control>
-					<include content="EpgGrid">
-						<param name="control_id" value="50"/>
-						<param name="control_orientation" value="vertical"/>
-						<param name="viewtype_label" value="19297"/>
-						<param name="progress_texture_border" value="0,60,18,14"/>
-						<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
-						<param name="has_rulerdate_layout" value="false"/>
-						<param name="ruler_width" value="1400"/>
-						<param name="ruler_label_width" value="365"/>
-						<param name="channel_width" value="350"/>
-						<param name="scrollbar_top" value="47"/>
-					</include>
-					<include content="EpgGrid">
-						<param name="control_id" value="51"/>
-						<param name="control_orientation" value="horizontal"/>
-						<param name="viewtype_label" value="19298"/>
-						<param name="progress_texture_border" value="5,10,5,10"/>
-						<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
-						<param name="has_rulerdate_layout" value="true"/>
-						<param name="ruler_width" value="150"/>
-						<param name="ruler_label_width" value="150"/>
-						<param name="channel_width" value="310"/>
-						<param name="scrollbar_top" value="105"/>
-					</include>
+					<control type="group">
+						<visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>100%</width>
+							<height>44</height>
+							<texture colordiffuse="border_alpha">colors/white50.png</texture>
+						</control>
+						<control type="image">
+							<left>42</left>
+							<top>0</top>
+							<width>364</width>
+							<height>44</height>
+							<texture colordiffuse="button_focus">colors/white.png</texture>
+							<visible>Control.HasFocus(11)</visible>
+						</control>
+						<control type="image">
+							<left>10</left>
+							<top>7</top>
+							<width>20</width>
+							<height>30</height>
+							<texture>icons/keyboard/arrowleft.png</texture>
+							<animation effect="fade" start="0" end="100" time="150">VisibleChange</animation>
+							<visible>Control.HasFocus(11) + Container(11).HasPrevious</visible>
+						</control>
+						<control type="image">
+							<right>10</right>
+							<top>7</top>
+							<width>20</width>
+							<height>30</height>
+							<texture>icons/keyboard/arrowright.png</texture>
+							<animation effect="fade" start="0" end="100" time="150">VisibleChange</animation>
+							<visible>Control.HasFocus(11) + !String.IsEqual(Container(11).CurrentItem, Container(11).NumItems)</visible>
+						</control>
+					</control>
+					<control type="fixedlist" id="11">
+						<top>0</top>
+						<left>40</left>
+						<right>40</right>
+						<onleft>noop</onleft>
+						<onright>noop</onright>
+						<onup>63</onup>
+						<ondown>63</ondown>
+						<orientation>horizontal</orientation>
+						<scrolltime>200</scrolltime>
+						<visible>Control.IsVisible(50) | Control.IsVisible(51)</visible>
+						<itemlayout height="44" width="368">
+							<control type="image">
+								<left>1</left>
+								<top>0</top>
+								<width>366</width>
+								<height>44</height>
+								<texture colordiffuse="60FFFFFF">colors/white50.png</texture>
+							</control>
+							<control type="label">
+								<left>5</left>
+								<width>358</width>
+								<height>42</height>
+								<align>center</align>
+								<aligny>center</aligny>
+								<label>$INFO[ListItem.Label]</label>
+								<textcolor>lightgrey</textcolor>
+							</control>
+						</itemlayout>
+						<focusedlayout height="44" width="368">
+							<control type="image">
+								<left>1</left>
+								<top>0</top>
+								<width>366</width>
+								<height>44</height>
+								<texture colordiffuse="button_focus">colors/white.png</texture>
+								<animation effect="fade" end="30" condition="true">Conditional</animation>
+								<visible>!Control.HasFocus(11)</visible>
+							</control>
+							<control type="label">
+								<left>5</left>
+								<width>358</width>
+								<height>42</height>
+								<align>center</align>
+								<aligny>center</aligny>
+								<scroll>true</scroll>
+								<label>$INFO[ListItem.Label]</label>
+							</control>
+						</focusedlayout>
+					</control>
+					<control type="group" id="63">
+						<include content="EpgGrid">
+							<param name="control_id" value="50"/>
+							<param name="control_orientation" value="vertical"/>
+							<param name="control_top" value="55"/>
+							<param name="control_onup_id" value="11"/>
+							<param name="viewtype_label" value="19298"/>
+							<param name="progress_texture_border" value="0,60,18,14"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
+							<param name="has_rulerdate_layout" value="false"/>
+							<param name="ruler_width" value="1400"/>
+							<param name="ruler_label_width" value="365"/>
+							<param name="channel_width" value="350"/>
+							<param name="scrollbar_top" value="47"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="51"/>
+							<param name="control_orientation" value="horizontal"/>
+							<param name="control_top" value="55"/>
+							<param name="control_onup_id" value="11"/>
+							<param name="viewtype_label" value="19297"/>
+							<param name="progress_texture_border" value="5,10,5,10"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
+							<param name="has_rulerdate_layout" value="true"/>
+							<param name="ruler_width" value="150"/>
+							<param name="ruler_label_width" value="150"/>
+							<param name="channel_width" value="310"/>
+							<param name="scrollbar_top" value="105"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="52"/>
+							<param name="control_orientation" value="vertical"/>
+							<param name="control_top" value="0"/>
+							<param name="control_onup_id" value="52"/>
+							<param name="viewtype_label" value="19301"/>
+							<param name="progress_texture_border" value="0,60,18,14"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_vertical.png"/>
+							<param name="has_rulerdate_layout" value="false"/>
+							<param name="ruler_width" value="1400"/>
+							<param name="ruler_label_width" value="365"/>
+							<param name="channel_width" value="350"/>
+							<param name="scrollbar_top" value="47"/>
+						</include>
+						<include content="EpgGrid">
+							<param name="control_id" value="53"/>
+							<param name="control_orientation" value="horizontal"/>
+							<param name="control_top" value="0"/>
+							<param name="control_onup_id" value="53"/>
+							<param name="viewtype_label" value="19300"/>
+							<param name="progress_texture_border" value="5,10,5,10"/>
+							<param name="progress_texture" value="windows/pvr/epg_progress_horizontal.png"/>
+							<param name="has_rulerdate_layout" value="true"/>
+							<param name="ruler_width" value="150"/>
+							<param name="ruler_label_width" value="150"/>
+							<param name="channel_width" value="310"/>
+							<param name="scrollbar_top" value="105"/>
+						</include>
+					</control>
 				</control>
 				<control type="group">
-					<bottom>0</bottom>
+					<bottom>30</bottom>
 					<height>300</height>
 					<control type="image">
-						<left>10</left>
-						<width>240</width>
-						<height>200</height>
-						<aspectratio align="right">keep</aspectratio>
+						<top>10</top>
+						<left>30</left>
+						<width>290</width>
+						<height>250</height>
+						<aspectratio align="center" aligny="center">keep</aspectratio>
 						<fadetime>400</fadetime>
 						<texture>$INFO[ListItem.Icon]</texture>
 					</control>
-					<control type="label">
-						<top>-9</top>
-						<left>300</left>
-						<right>60</right>
-						<height>30</height>
-						<label>[COLOR button_focus]$INFO[ListItem.StartTime][/COLOR]$INFO[ListItem.EndTime,[COLOR button_focus] - ,[/COLOR]] $INFO[ListItem.EpgEventTitle]$INFO[ListItem.Genre, [COLOR grey]$LOCALIZE[515]:[/COLOR] ]</label>
-					</control>
-					<control type="label">
-						<top>29</top>
-						<left>300</left>
-						<right>60</right>
-						<height>30</height>
-						<label>[COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white],[/COLOR]]</label>
+					<control type="group">
+						<top>0</top>
+						<left>350</left>
+						<control type="label">
+							<width>70%</width>
+							<height>30</height>
+							<label>[B]$INFO[ListItem.EpgEventTitle][/B]</label>
+						</control>
+						<control type="label">
+							<top>0</top>
+							<right>30</right>
+							<width>30%</width>
+							<height>30</height>
+							<align>right</align>
+							<label>[COLOR button_focus]$INFO[ListItem.StartTime,[COLOR grey]$LOCALIZE[555]:[/COLOR] ][/COLOR]$INFO[ListItem.EndTime,[COLOR button_focus] - ,[/COLOR]]</label>
+						</control>
+						<control type="label">
+							<top>35</top>
+							<width>60%</width>
+							<height>30</height>
+							<label>[I][COLOR grey]$VAR[SeasonEpisodeLabel][/COLOR]$INFO[ListItem.EpisodeName,[COLOR white],[/COLOR]][/I]</label>
+						</control>
+						<control type="label">
+							<top>35</top>
+							<right>30</right>
+							<width>40%</width>
+							<height>30</height>
+							<align>right</align>
+							<label>$INFO[ListItem.Genre,[COLOR grey]$LOCALIZE[515]:[/COLOR] ]</label>
+						</control>
 					</control>
 					<control type="textbox">
-						<left>300</left>
-						<top>67</top>
-						<right>60</right>
-						<height>173</height>
+						<left>350</left>
+						<top>85</top>
+						<right>30</right>
+						<height>170</height>
+						<align>justify</align>
 						<label>$INFO[ListItem.Plot]</label>
 						<autoscroll delay="10000" time="3000" repeat="10000">Skin.HasSetting(AutoScroll)</autoscroll>
 					</control>

_service:download_files:master.tar.gz/addons/skin.estuary/xml/MyVideoNav.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_502_FanArt.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_50_List.xml Changed

_service:download_files:master.tar.gz/addons/skin.estuary/xml/View_51_Poster.xml Changed

_service:download_files:master.tar.gz/addons/webinterface.default/lib/video-js/plugins/videojs-chromecast/videojs-chromecast.css Changed

@@ -1,1 +1,1 @@
-@font-face{font-family:chromecast;src:url("fonts/chromecast.eot?#iefix") format("eot")}@font-face{font-family:chromecast;src:url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg7RB+YAAAC8AAAAYGNtYXAXVdKJAAABHAAAAFRnYXNwAAAAEAAAAXAAAAAIZ2x5ZjwDrFcAAAF4AAAAzGhlYWQKebynAAACRAAAADZoaGVhCTwFQQAAAnwAAAAkaG10eAk7AAAAAAKgAAAAFGxvY2EAKAB6AAACtAAAAAxtYXhwAAoALwAAAsAAAAAgbmFtZccyBsQAAALgAAABqnBvc3QAAwAAAAAEjAAAACAAAwU7AZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADpAQQAAAAAAAQAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAOAAAAAoACAACAAIAAQAg6QH//f//AAAAAAAg6QH//f//AAH/4xcDAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAAEAAAAAAU7BAAADgATAB8ALAAAExEeARcRIREhHgEXIREhAxUzLgEnFR4DFzMuAycVHgMXMy4DJ08bNBoEGv1eCg8GAuz7FE+XD1E3LE09KQhqCDtZc0JSkG9HCWoKV4y2aAQA/k8GDwoBZ/0hGjQbA7H8l5c3UclqCCk9TSxCc1k7wmoJR2+QUmi2jFcKAAABAAAAAQAAsTF8aV8PPPUACwQAAAAAANMQO9UAAAAA0xA71QAAAAAFOwQAAAAACAACAAAAAAAAAAEAAAQAAAAAAAU7AAAAAAU7AAEAAAAAAAAAAAAAAAAAAAAFBAAAAAAAAAAAAAAAAAAAAAU7AAAAAAAAAAoAFAAeAGYAAQAAAAUALQAEAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAoAAAABAAAAAAACAAcAewABAAAAAAADAAoAPwABAAAAAAAEAAoAkAABAAAAAAAFAAsAHgABAAAAAAAGAAoAXQABAAAAAAAKABoArgADAAEECQABABQACgADAAEECQACAA4AggADAAEECQADABQASQADAAEECQAEABQAmgADAAEECQAFABYAKQADAAEECQAGABQAZwADAAEECQAKADQAyENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdFZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdFJlZ3VsYXIAUgBlAGcAdQBsAGEAckNocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdEZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=) format("truetype"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAT4AAsAAAAABKwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgDtEH5mNtYXAAAAFoAAAAVAAAAFQXVdKJZ2FzcAAAAbwAAAAIAAAACAAAABBnbHlmAAABxAAAAMwAAADMPAOsV2hlYWQAAAKQAAAANgAAADYKebynaGhlYQAAAsgAAAAkAAAAJAk8BUFobXR4AAAC7AAAABQAAAAUCTsAAGxvY2EAAAMAAAAADAAAAAwAKAB6bWF4cAAAAwwAAAAgAAAAIAAKAC9uYW1lAAADLAAAAaoAAAGqxzIGxHBvc3QAAATYAAAAIAAAACAAAwAAAAMFOwGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA6QEEAAAAAAAEAAAAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADgAAAAKAAgAAgACAAEAIOkB//3//wAAAAAAIOkB//3//wAB/+MXAwADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAABAAAAAAFOwQAAA4AEwAfACwAABMRHgEXESERIR4BFyERIQMVMy4BJxUeAxczLgMnFR4DFzMuAydPGzQaBBr9XgoPBgLs+xRPlw9RNyxNPSkIagg7WXNCUpBvRwlqCleMtmgEAP5PBg8KAWf9IRo0GwOx/JeXN1HJaggpPU0sQnNZO8JqCUdvkFJotoxXCgAAAQAAAAEAALExfGlfDzz1AAsEAAAAAADTEDvVAAAAANMQO9UAAAAABTsEAAAAAAgAAgAAAAAAAAABAAAEAAAAAAAFOwAAAAAFOwABAAAAAAAAAAAAAAAAAAAABQQAAAAAAAAAAAAAAAAAAAAFOwAAAAAAAAAKABQAHgBmAAEAAAAFAC0ABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAKAAAAAQAAAAAAAgAHAHsAAQAAAAAAAwAKAD8AAQAAAAAABAAKAJAAAQAAAAAABQALAB4AAQAAAAAABgAKAF0AAQAAAAAACgAaAK4AAwABBAkAAQAUAAoAAwABBAkAAgAOAIIAAwABBAkAAwAUAEkAAwABBAkABAAUAJoAAwABBAkABQAWACkAAwABBAkABgAUAGcAAwABBAkACgA0AMhDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRWZXJzaW9uIDEuMABWAGUAcgBzAGkAbwBuACAAMQAuADBDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRSZWd1bGFyAFIAZQBnAHUAbABhAHJDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRGb250IGdlbmVyYXRlZCBieSBJY29Nb29uLgBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format("woff"),url("fonts/chromecast.svg?chromecast") format("svg");font-weight:normal;font-style:normal}.vjs-icon-chromecast,.video-js .vjs-chromecast-button,.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon{font-family:chromecast;font-weight:normal;font-style:normal}.vjs-icon-chromecast:before,.video-js .vjs-chromecast-button:before,.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon:before{content:""}.video-js .vjs-chromecast-button{cursor:pointer}.video-js .vjs-chromecast-button{font-size:0.7em}.video-js .vjs-chromecast-button:before{line-height:2.3}.video-js .vjs-chromecast-button.connected{color:#66A8CC}.video-js .vjs-chromecast-button.error{color:#c70000}.vjs-tech-chromecast .casting-image{position:absolute;top:0;right:0;left:0;bottom:0;background-color:#000;background-repeat:no-repeat;background-size:contain;background-position:center}.vjs-tech-chromecast .casting-overlay{position:absolute;top:0;right:0;left:0;bottom:0;background-color:#000;background-color:rgba(0,0,0,0.3);cursor:default}.vjs-tech-chromecast .casting-overlay .casting-information{position:absolute;bottom:8em;right:8em;height:50px;color:#FFF}.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon{font-size:44px;line-height:50px;margin-right:10px;float:left;width:58px;height:50px}.vjs-tech-chromecast .casting-overlay .casting-information .casting-description{height:50px;font-size:20px;line-height:20px}.vjs-tech-chromecast .casting-overlay .casting-information .casting-description small{font-size:11px}
\ No newline at end of file
+@font-face{font-family:chromecast;src:url("fonts/chromecast.eot?#iefix") format("eot")}@font-face{font-family:chromecast;src:url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg7RB+YAAAC8AAAAYGNtYXAXVdKJAAABHAAAAFRnYXNwAAAAEAAAAXAAAAAIZ2x5ZjwDrFcAAAF4AAAAzGhlYWQKebynAAACRAAAADZoaGVhCTwFQQAAAnwAAAAkaG10eAk7AAAAAAKgAAAAFGxvY2EAKAB6AAACtAAAAAxtYXhwAAoALwAAAsAAAAAgbmFtZccyBsQAAALgAAABqnBvc3QAAwAAAAAEjAAAACAAAwU7AZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADpAQQAAAAAAAQAAAAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAOAAAAAoACAACAAIAAQAg6QH//f//AAAAAAAg6QH//f//AAH/4xcDAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAAEAAAAAAU7BAAADgATAB8ALAAAExEeARcRIREhHgEXIREhAxUzLgEnFR4DFzMuAycVHgMXMy4DJ08bNBoEGv1eCg8GAuz7FE+XD1E3LE09KQhqCDtZc0JSkG9HCWoKV4y2aAQA/k8GDwoBZ/0hGjQbA7H8l5c3UclqCCk9TSxCc1k7wmoJR2+QUmi2jFcKAAABAAAAAQAAsTF8aV8PPPUACwQAAAAAANMQO9UAAAAA0xA71QAAAAAFOwQAAAAACAACAAAAAAAAAAEAAAQAAAAAAAU7AAAAAAU7AAEAAAAAAAAAAAAAAAAAAAAFBAAAAAAAAAAAAAAAAAAAAAU7AAAAAAAAAAoAFAAeAGYAAQAAAAUALQAEAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAoAAAABAAAAAAACAAcAewABAAAAAAADAAoAPwABAAAAAAAEAAoAkAABAAAAAAAFAAsAHgABAAAAAAAGAAoAXQABAAAAAAAKABoArgADAAEECQABABQACgADAAEECQACAA4AggADAAEECQADABQASQADAAEECQAEABQAmgADAAEECQAFABYAKQADAAEECQAGABQAZwADAAEECQAKADQAyENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdFZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdENocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdFJlZ3VsYXIAUgBlAGcAdQBsAGEAckNocm9tZWNhc3QAQwBoAHIAbwBtAGUAYwBhAHMAdEZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=) format("truetype"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAT4AAsAAAAABKwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgDtEH5mNtYXAAAAFoAAAAVAAAAFQXVdKJZ2FzcAAAAbwAAAAIAAAACAAAABBnbHlmAAABxAAAAMwAAADMPAOsV2hlYWQAAAKQAAAANgAAADYKebynaGhlYQAAAsgAAAAkAAAAJAk8BUFobXR4AAAC7AAAABQAAAAUCTsAAGxvY2EAAAMAAAAADAAAAAwAKAB6bWF4cAAAAwwAAAAgAAAAIAAKAC9uYW1lAAADLAAAAaoAAAGqxzIGxHBvc3QAAATYAAAAIAAAACAAAwAAAAMFOwGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA6QEEAAAAAAAEAAAAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADgAAAAKAAgAAgACAAEAIOkB//3//wAAAAAAIOkB//3//wAB/+MXAwADAAEAAAAAAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAABAAAAAAFOwQAAA4AEwAfACwAABMRHgEXESERIR4BFyERIQMVMy4BJxUeAxczLgMnFR4DFzMuAydPGzQaBBr9XgoPBgLs+xRPlw9RNyxNPSkIagg7WXNCUpBvRwlqCleMtmgEAP5PBg8KAWf9IRo0GwOx/JeXN1HJaggpPU0sQnNZO8JqCUdvkFJotoxXCgAAAQAAAAEAALExfGlfDzz1AAsEAAAAAADTEDvVAAAAANMQO9UAAAAABTsEAAAAAAgAAgAAAAAAAAABAAAEAAAAAAAFOwAAAAAFOwABAAAAAAAAAAAAAAAAAAAABQQAAAAAAAAAAAAAAAAAAAAFOwAAAAAAAAAKABQAHgBmAAEAAAAFAC0ABAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAKAAAAAQAAAAAAAgAHAHsAAQAAAAAAAwAKAD8AAQAAAAAABAAKAJAAAQAAAAAABQALAB4AAQAAAAAABgAKAF0AAQAAAAAACgAaAK4AAwABBAkAAQAUAAoAAwABBAkAAgAOAIIAAwABBAkAAwAUAEkAAwABBAkABAAUAJoAAwABBAkABQAWACkAAwABBAkABgAUAGcAAwABBAkACgA0AMhDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRWZXJzaW9uIDEuMABWAGUAcgBzAGkAbwBuACAAMQAuADBDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRSZWd1bGFyAFIAZQBnAHUAbABhAHJDaHJvbWVjYXN0AEMAaAByAG8AbQBlAGMAYQBzAHRGb250IGdlbmVyYXRlZCBieSBJY29Nb29uLgBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format("woff"),url("fonts/chromecast.svg?chromecast") format("svg");font-weight:normal;font-style:normal}.vjs-icon-chromecast,.video-js .vjs-chromecast-button,.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon{font-family:chromecast;font-weight:normal;font-style:normal}.vjs-icon-chromecast:before,.video-js .vjs-chromecast-button:before,.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon:before{content:""}.video-js .vjs-chromecast-button{cursor:pointer}.video-js .vjs-chromecast-button{font-size:0.7em}.video-js .vjs-chromecast-button:before{line-height:2.3}.video-js .vjs-chromecast-button.connected{color:#66A8CC}.video-js .vjs-chromecast-button.error{color:#c70000}.vjs-tech-chromecast .casting-image{position:absolute;top:0;right:0;left:0;bottom:0;background-color:#000;background-repeat:no-repeat;background-size:contain;background-position:center}.vjs-tech-chromecast .casting-overlay{position:absolute;top:0;right:0;left:0;bottom:0;background-color:#000;background-color:rgba(0,0,0,0.3);cursor:default}.vjs-tech-chromecast .casting-overlay .casting-information{position:absolute;bottom:8em;right:8em;height:50px;color:#FFF}.vjs-tech-chromecast .casting-overlay .casting-information .casting-icon{font-size:44px;line-height:50px;margin-right:10px;float:left;width:58px;height:50px}.vjs-tech-chromecast .casting-overlay .casting-information .casting-description{height:50px;font-size:20px;line-height:20px}.vjs-tech-chromecast .casting-overlay .casting-information .casting-description small{font-size:11px}
\ No newline at end of file

_service:download_files:master.tar.gz/cmake/installdata/windowsstore/certificates.txt Added

_service:download_files:master.tar.gz/cmake/modules/FindCurl.cmake Changed

_service:download_files:master.tar.gz/cmake/modules/FindFFMPEG.cmake Changed

@@ -235,8 +235,6 @@
 -DCROSSCOMPILING=${CMAKE_CROSSCOMPILING}
 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
 -DOS=${OS}
- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
 -DCMAKE_AR=${CMAKE_AR})
 endif()
 
@@ -252,6 +250,9 @@
 -DCORE_PLATFORM_NAME=${CORE_PLATFORM_NAME_LC}
 -DCPU=${CPU}
 -DENABLE_NEON=${ENABLE_NEON}
+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ -DENABLE_CCACHE=${ENABLE_CCACHE}
 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
@@ -263,8 +264,12 @@
 ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake
 <SOURCE_DIR>)
 
+ find_program(BASH_COMMAND bash)
+ if(NOT BASH_COMMAND)
+ message(FATAL_ERROR "Internal FFmpeg requires bash.")
+ endif()
 file(WRITE ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/ffmpeg/ffmpeg-link-wrapper
-"#!/bin/bash
+"#!${BASH_COMMAND}
 if [[ $@ == *${APP_NAME_LC}.bin* || $@ == *${APP_NAME_LC}${APP_BINARY_SUFFIX}* || $@ == *${APP_NAME_LC}.so* || $@ == *${APP_NAME_LC}-test* ]]
 then
 avformat=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libavcodec`

_service:download_files:master.tar.gz/cmake/modules/FindMariaDBClient.cmake Added

@@ -0,0 +1,69 @@
+#.rst:
+# FindMariaDBClient
+# ---------------
+# Finds the MariaDBClient library
+#
+# This will will define the following variables::
+#
+# MARIADBCLIENT_FOUND - system has MariaDBClient
+# MARIADBCLIENT_INCLUDE_DIRS - the MariaDBClient include directory
+# MARIADBCLIENT_LIBRARIES - the MariaDBClient libraries
+# MARIADBCLIENT_DEFINITIONS - the MariaDBClient compile definitions
+#
+# and the following imported targets::
+#
+#   MariaDBClient::MariaDBClient   - The MariaDBClient library
+
+# Don't find system wide installed version on Windows
+if(WIN32)
+  set(EXTRA_FIND_ARGS NO_SYSTEM_ENVIRONMENT_PATH)
+else()
+  set(EXTRA_FIND_ARGS)
+endif()
+
+find_path(MARIADBCLIENT_INCLUDE_DIR NAMES mariadb/mysql.h mariadb/server/mysql.h)
+find_library(MARIADBCLIENT_LIBRARY_RELEASE NAMES mariadbclient libmariadb
+                                           PATH_SUFFIXES mariadb
+                                           ${EXTRA_FIND_ARGS})
+find_library(MARIADBCLIENT_LIBRARY_DEBUG NAMES mariadbclient libmariadb
+                                         PATH_SUFFIXES mariadb
+                                         ${EXTRA_FIND_ARGS})
+
+if(MARIADBCLIENT_INCLUDE_DIR AND EXISTS "${MARIADBCLIENT_INCLUDE_DIR}/mariadb/mariadb_version.h")
+  file(STRINGS "${MARIADBCLIENT_INCLUDE_DIR}/mariadb/mariadb_version.h" mariadb_version_str REGEX "^#define[\t ]+MARIADB_CLIENT_VERSION_STR[\t ]+\".*\".*")
+  string(REGEX REPLACE "^#define[\t ]+MARIADB_CLIENT_VERSION_STR[\t ]+\"([^\"]+)\".*" "\\1" MARIADBCLIENT_VERSION_STRING "${mariadb_version_str}")
+  unset(mariadb_version_str)
+endif()
+
+include(SelectLibraryConfigurations)
+select_library_configurations(MARIADBCLIENT)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MariaDBClient
+                                  REQUIRED_VARS MARIADBCLIENT_LIBRARY MARIADBCLIENT_INCLUDE_DIR
+                                  VERSION_VAR MARIADBCLIENT_VERSION_STRING)
+
+if(MARIADBCLIENT_FOUND)
+  set(MARIADBCLIENT_LIBRARIES ${MARIADBCLIENT_LIBRARY})
+  set(MARIADBCLIENT_INCLUDE_DIRS ${MARIADBCLIENT_INCLUDE_DIR})
+  set(MARIADBCLIENT_DEFINITIONS -DHAS_MARIADB=1)
+
+  if(NOT TARGET MariaDBClient::MariaDBClient)
+    add_library(MariaDBClient::MariaDBClient UNKNOWN IMPORTED)
+    if(MARIADBCLIENT_LIBRARY_RELEASE)
+      set_target_properties(MariaDBClient::MariaDBClient PROPERTIES
+                                                         IMPORTED_CONFIGURATIONS RELEASE
+                                                         IMPORTED_LOCATION "${MARIADBCLIENT_LIBRARY_RELEASE}")
+    endif()
+    if(MARIADBCLIENT_LIBRARY_DEBUG)
+      set_target_properties(MariaDBClient::MariaDBClient PROPERTIES
+                                                         IMPORTED_CONFIGURATIONS DEBUG
+                                                         IMPORTED_LOCATION "${MARIADBCLIENT_LIBRARY_DEBUG}")
+    endif()
+    set_target_properties(MariaDBClient::MariaDBClient PROPERTIES
+                                                       INTERFACE_INCLUDE_DIRECTORIES "${MARIADBCLIENT_INCLUDE_DIR}"
+                                                       INTERFACE_COMPILE_DEFINITIONS HAS_MARIADB=1)
+  endif()
+endif()
+
+mark_as_advanced(MARIADBCLIENT_INCLUDE_DIR MARIADBCLIENT_LIBRARY)

_service:download_files:master.tar.gz/cmake/modules/FindMir.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/linux/aml.cmake Changed

_service:download_files:master.tar.gz/cmake/platform/linux/wayland.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/android/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/android/Install.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/common/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/freebsd/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/ios/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/linux/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/linux/ExtraTargets.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/windows/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/scripts/windowsstore/ArchSetup.cmake Changed

_service:download_files:master.tar.gz/cmake/treedata/common/games.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/common/retroplayer.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/windows/subdirs.txt Changed

_service:download_files:master.tar.gz/cmake/treedata/windowsstore/subdirs.txt Changed

_service:download_files:master.tar.gz/docs/README.FreeBSD Changed

@@ -46,17 +46,17 @@
 that are used to build Kodi packages on Debian/Ubuntu (with all supported
 external libraries enabled).
 
-$ pkg install taglib gstreamer1-vaapi libdvdnav libdvdcss ffmpeg hal libcapn \
+$ pkg install taglib gstreamer1-vaapi hal libcapn \
 enca gawk gperf cmake zip nasm swig30 libssh openjdk8 libtool gettext-tools \
 gmake pkgconf rapidjson mesa-libs doxygen glproto dri2proto dri3proto libass \
-flac libcdio libcrossguid curl dbus libdcadec fontconfig freetype2 fribidi \
-libgcrypt gmp libgpg-error gnutls libidn libinotify lzo2 libmodplug libmpeg2 \
+flac libcdio curl dbus fontconfig freetype2 fribidi \
+libgcrypt gmp libgpg-error gnutls libidn libinotify lzo2 \
 libogg sqlite3 tiff tinyxml e2fsprogs-libuuid git libvorbis libxslt libplist \
 shairplay avahi-app libcec libbluray samba46 libnfs librtmp libva libvdpau \
-jpeg-turbo glew sdl_image  xrandr libedit  inputproto giflib m4 encodings \
-font-util mysql57-client xf86vidmodeproto cups python2 p8-platform libbdplus \
-libaacs sdl libudev-devd sndio ccache xorg-server gcc6 binutils libmicrohttpd
-xorg-server xf86-input-mouse xf86-input-keyboard lirc.
+jpeg-turbo glew xrandr libedit inputproto giflib m4 encodings \
+font-util mysql57-client xf86vidmodeproto python2 p8-platform libbdplus \
+libaacs libudev-devd sndio ccache xorg-server binutils libmicrohttpd \
+xorg-server xf86-input-mouse xf86-input-keyboard lirc libfmt autoconf automake
 
 -----------------------------------------------------------------------------
 4. How to compile

_service:download_files:master.tar.gz/docs/README.android Changed

@@ -76,7 +76,6 @@
 example the hdd image is mounted on /Volumes/android-dev.
 $ ./configure --with-tarballs=/Users/Shared/xbmc-depends/tarballs --host=arm-linux-androideabi \
 --with-sdk-path=/Volumes/android-dev/android/android-sdk-macosx \
- --with-sdk=android-21 \
 --with-ndk-path=/Volumes/android-dev/android/android-ndk-r16 \
 --with-toolchain=/Volumes/android-dev/android/android-toolchain-arm/android-21 \
 --prefix=/Volumes/android-dev/android/xbmc-depends
@@ -129,7 +128,7 @@
 As of newest SDKs the android tool is deprecated. Use sdkmanager instead:
 $ cd <android-sdk>/tools/bin
 $ ./sdkmanager platform-tools
- $ ./sdkmanager "platforms;android-24"
+ $ ./sdkmanager "platforms;android-26"
 $ ./sdkmanager "build-tools;25.0.3"
 
 --------------------------------------------------------------------
@@ -152,7 +151,7 @@
 $ ls platforms
 $ cd build/tools
 $ ./make-standalone-toolchain.sh \
- --install-dir=<android-toolchain-arm>/android-21 --platform=android-21 \
+ --install-dir=<android-toolchain-arm> --platform=android-21 \
 --toolchain=arm-linux-androideabi-4.9 --stl=libc++
 
 Building for aarch64 architecture:
@@ -161,7 +160,7 @@
 $ ls platforms
 $ cd build/tools
 $ ./make-standalone-toolchain.sh \
- --install-dir=<android-toolchain-aarch64>/android-21 --platform=android-21 \
+ --install-dir=<android-toolchain-aarch64> --platform=android-21 \
 --toolchain=aarch64-linux-android-4.9 --stl=libc++
 
 Building for x86 architecture:
@@ -170,7 +169,7 @@
 $ ls platforms
 $ cd build/tools
 $ ./make-standalone-toolchain.sh \
- --install-dir=<android-toolchain-x86>/android-21 --platform=android-21 \
+ --install-dir=<android-toolchain-x86> --platform=android-21 \
 --toolchain=x86-4.9 --arch=x86 --stl=libc++
 
 Make sure to pick a toolchain for your desired architecture. If an error about

_service:download_files:master.tar.gz/docs/README.ios.md Changed

@@ -31,11 +31,9 @@
 Kodi for iOS is composed of a main binary with numerous dynamic libraries and
 codecs that support a multitude of music and video formats.
 
-The minimum version of iOS you need to run(!) Kodi is 6.0 atm.
+The minimum version of iOS you need to run(!) Kodi is 9.0 atm.
 
-- On Mavericks (OSX 10.9.x) we recommend using Xcode 6.1.
-- On Yosemite (OSX 10.10.x) we recommend using Xcode 6.4.
-- On El Capitan (OSX 10.11.x) we recommend using Xcode 7.x or Xcode 8.x.
+- On El Capitan (OSX 10.11.x) we recommend using Xcode 8.x.
 - On Sierra (macOS 10.12.x) we recommend using Xcode 8.x.
 - On High Sierra (macOS 10.13.x) we recommend using Xcode 9.x.
 
@@ -54,13 +52,6 @@
 As far as we know the compilation for iOS should work with the following
 constellations of Xcode and macOS versions (to be updated once we know more):
 
-1. XCode 6.0.1 against iOS SDK 8.0 on 10.9 (Mavericks)
-2. XCode 6.1.0 against iOS SDK 8.1 on 10.10 (Yosemite)
-3. XCode 6.3.0 against iOS SDK 8.3 on 10.10 (Yosemite)
-4. Xcode 6.4.0 against iOS SDK 8.4 on 10.10 (Yosemite)
-5. Xcode 7.x against iOS SDK 9.x on 10.10 (Yosemite)
-6. Xcode 7.x against iOS SDK 9.x on 10.11 (El Capitan)
-7. Xcode 7.x against iOS SDK 9.x on 10.12 (Sierra)
 8. Xcode 8.x against iOS SDK 10.x on 10.11 (El Capitan)
 9. Xcode 8.x against iOS SDK 10.x on 10.12 (Sierra)
 10. Xcode 9.x against iOS SDK 11.x on 10.12 (Sierra)
@@ -104,9 +95,9 @@
 
 **ADVANCED developers only**: If you want to specify an iOS SDK version (if
 multiple versions are installed) - then append it to the configure line
-above. The example below would use the iOS SDK 8.0:
+above. The example below would use the iOS SDK 9.0:
 
- ./configure --host=arm-apple-darwin --with-sdk=8.0
+ ./configure --host=arm-apple-darwin --with-sdk=9.0
 
 ### 3.3 Compile Kodi binary addons
 
@@ -219,8 +210,7 @@
 non-jailbroken devices which you can deploy normal apps to. In that case (Kodi
 will be sandboxed like any other app) - all Kodi files are then located in the
 sandboxed *Documents* folder and can be easily accessed via iTunes file
-sharing. Keep in mind that no hardware acceleration will be possible without
-jailbreaking when using iOS < Version 8.
+sharing.
 
 From Xcode7 on this approach is also available for non paying app developers
 (apple allows self signing from now on).

_service:download_files:master.tar.gz/docs/README.osx.md Changed

@@ -29,17 +29,12 @@
 Kodi for Mac is composed of a main binary with numerous dynamic libraries and
 codecs that support a multitude of music and video formats.
 
-The minimum version of OSX you need to run(!) Kodi is 10.7 atm.
+The minimum version of OSX you need to run(!) Kodi is 10.8 atm.
 
-- On Mavericks (OSX 10.9.x) we recommend using Xcode 6.1.
-- On Yosemite (OSX 10.10.x) we recommend using Xcode 6.4.
-- On El Capitan (OSX 10.11.x) we recommend using Xcode 7.x or Xcode 8.x.
+- On El Capitan (OSX 10.11.x) we recommend using Xcode 8.x.
 - On Sierra (macOS 10.12.x) we recommend using Xcode 8.x.
 - On High Sierra (macOS 10.13.x) we recommend using Xcode 9.x.
 
-**ATTENTION**: You need to download and install XQuartz from <https://xquartz.macosforge.org/landing/>
-since its not part of macOS anymore since 10.8.
-
 ## 2 Getting the source code
 
 cd $HOME
@@ -55,12 +50,6 @@
 As far as we know the compilation for macOS should work with the following
 constellations of Xcode and macOS versions (to be updated once we know more):
 
-1 XCode 6.0.1 against OSX SDK 10.9 (M)
-2 XCode 6.1.0 against OSX SDK 10.10 (Y)
-3 XCode 6.2.0 against OSX SDK 10.10 (Y)
-4 XCode 6.3.0 against OSX SDK 10.10 (Y)
-5 Xcode 6.4.0 against OSX SDK 10.10 (Y)
-6 Xcode 7.x against OSX SDK 10.11 (EC)
 7 Xcode 8.0 against OSX SDK 10.12 (EC)
 8 Xcode 8.0 against OSX SDK 10.12 (S)
 9 Xcode 9.0 against OSX SDK 10.13 (HS)

_service:download_files:master.tar.gz/docs/README.raspberrypi Changed

_service:download_files:master.tar.gz/lib/DllLibbluray.h Changed

_service:download_files:master.tar.gz/lib/libUPnP/CMakeLists.txt Changed

_service:download_files:master.tar.gz/lib/libUPnP/patches/0002-platinum-add-custom-CMakeLists.txt.patch Changed

@@ -1,6 +1,6 @@
---- /dev/null
-+++ b/lib/libUPnP/CMakeLists.txt
-@@ -0,0 +1,120 @@
+--- /dev/null	2018-02-07 16:00:11.607220700 +0100
++++ b/lib/libUPnP/CMakeLists.txt	2018-02-12 11:03:15.002174234 +0100
+@@ -0,0 +1,129 @@
 +set(SOURCES Platinum/Source/Core/PltAction.cpp
 +            Platinum/Source/Core/PltArgument.cpp
 +            Platinum/Source/Core/PltConstants.cpp
@@ -99,9 +99,18 @@
 +                      Neptune/Source/System/Win32/NptWin32Time.cpp)
 +endif()
 +
++if(CORE_SYSTEM_NAME STREQUAL "freebsd")
++  list(APPEND SOURCES Neptune/Source/System/Bsd/NptBsdResolver.cpp
++                      Neptune/Source/System/Bsd/NptBsdSockets.cpp)
++endif()
++
 +
 +add_library(upnp STATIC ${SOURCES} ${HEADERS})
 +target_compile_definitions(upnp PUBLIC -DNPT_CONFIG_ENABLE_LOGGING)
++if(CORE_SYSTEM_NAME STREQUAL "freebsd")
++  target_compile_definitions(upnp PUBLIC -DNPT_CONFIG_HAVE_GETADDRINFO)
++endif()
++
 +target_include_directories(upnp PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 +                                       Platinum/Source/Core
 +                                       Platinum/Source/Platinum

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-arm.list Changed

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-win32.list Changed

_service:download_files:master.tar.gz/project/BuildDependencies/scripts/0_package.target-win10-x64.list Changed

_service:download_files:master.tar.gz/system/keyboardlayouts/german.xml Changed

_service:download_files:master.tar.gz/system/keymaps/joystick.xml Changed

_service:download_files:master.tar.gz/system/peripherals.xml Changed

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

@@ -414,7 +414,7 @@
 </setting>
 <setting id="musicplayer.visualisation" type="addon" label="250" help="36273">
 <level>0</level>
- <default>visualization.spectrum</default>
+ <default></default>
 <constraints>
 <addontype>xbmc.player.musicviz</addontype>
 <allowempty>true</allowempty>
@@ -2086,113 +2086,6 @@
 </setting>
 </group>
 </category>
- <category id="gameskeyboard" label="35150">
- <group id="1" label="128">
- <setting id="gameskeyboard.enablekeyboard" type="boolean" label="35152" help="35153">
- <level>0</level>
- <control type="toggle" />
- <default>true</default>
- </setting>
- </group>
- <group id="2" label="35151">
- <setting id="gameskeyboard.keyboardplayers" type="integer" label="35154" help="35155">
- <level>0</level>
- <default>1</default>
- <constraints>
- <minimum>1</minimum>
- <step>1</step>
- <maximum>8</maximum>
- </constraints>
- <dependencies>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- <control type="slider" format="integer">
- <popup>true</popup>
- <formatlabel>35156</formatlabel> 
- </control>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig1" type="action" label="35157" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">1</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig2" type="action" label="35158" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">2</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig3" type="action" label="35159" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">3</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig4" type="action" label="35160" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">4</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig5" type="action" label="35161" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">5</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig6" type="action" label="35162" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">6</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig7" type="action" label="35163" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">7</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- <setting id="gameskeyboard.keyboardplayerconfig8" type="action" label="35164" help="35155">
- <level>0</level>
- <control type="button" format="action" />
- <dependencies>
- <dependency type="visible">
- <condition on="property" name="gte" setting="gameskeyboard.keyboardplayers">8</condition>
- </dependency>
- <dependency type="enable" setting="gameskeyboard.enablekeyboard">true</dependency>
- </dependencies>
- </setting>
- </group>
- </category>
 </section>
 <section id="system" label="13000" help="36349">
 <category id="display" label="14220" help="36603">

_service:download_files:master.tar.gz/system/shaders/GL/1.2/gl_yuv2rgb_basic.glsl Changed

_service:download_files:master.tar.gz/system/shaders/GL/1.5/gl_tonemap.glsl Added

_service:download_files:master.tar.gz/system/shaders/GL/1.5/gl_yuv2rgb_basic.glsl Changed

@@ -12,6 +12,11 @@
 uniform mat4 m_yuvmat;
 uniform float m_stretch;
 uniform float m_alpha;
+uniform mat3 m_primMat;
+uniform float m_gammaDstInv;
+uniform float m_gammaSrc;
+uniform float m_toneP1;
+uniform vec3 m_coefsDst;
 in vec2 m_cordY;
 in vec2 m_cordU;
 in vec2 m_cordV;
@@ -38,25 +43,20 @@
 vec4 process()
 {
   vec4 rgb;
+  vec4 yuv;
+
 #if defined(XBMC_YV12)
 
-  vec4 yuv;
   yuv.rgba = vec4( texture(m_sampY, stretch(m_cordY)).r
                  , texture(m_sampU, stretch(m_cordU)).r
                  , texture(m_sampV, stretch(m_cordV)).r
                  , 1.0 );
 
-  rgb   = m_yuvmat * yuv;
-  rgb.a = m_alpha;
-
 #elif defined(XBMC_NV12)
 
-  vec4 yuv;
   yuv.rgba = vec4( texture(m_sampY, stretch(m_cordY)).r
                  , texture(m_sampU, stretch(m_cordU)).rg
                  , 1.0 );
-  rgb   = m_yuvmat * yuv;
-  rgb.a = m_alpha;
 
 #elif defined(XBMC_YUY2) || defined(XBMC_UYVY)
 
@@ -83,13 +83,29 @@
   vec2  outUV   = mix(c1.br, c2.br, f.x);
 #endif //XBMC_YUY2
 
-  float outY    = mix(leftY, rightY, step(0.5, f.x));
+  float outY = mix(leftY, rightY, step(0.5, f.x));
 
-  vec4  yuv     = vec4(outY, outUV, 1.0);
-  rgb           = m_yuvmat * yuv;
+  yuv = vec4(outY, outUV, 1.0);
 
+#endif
+
+#if defined(XBMC_TONE_MAPPING)
+  //float scale = tonemap(yuv.x) / yuv.x;
+#endif
+
+  rgb = m_yuvmat * yuv;
   rgb.a = m_alpha;
 
+#if defined(XBMC_COL_CONVERSION)
+  rgb.rgb = pow(rgb.rgb, vec3(m_gammaSrc));
+  rgb.rgb = m_primMat * rgb.rgb;
+  rgb.rgb = pow(rgb.rgb, vec3(m_gammaDstInv));
+
+#if defined(XBMC_TONE_MAPPING)
+  float luma = dot(rgb.rgb, m_coefsDst);
+  rgb.rgb *= tonemap(luma) / luma;
+#endif
+
 #endif
 
   return rgb;

_service:download_files:master.tar.gz/system/shaders/GL/4.0/gl_yuv2rgb_filter4.glsl Changed

@@ -13,6 +13,11 @@
 uniform float m_stretch;
 uniform float m_alpha;
 uniform sampler1D m_kernelTex;
+uniform mat3 m_primMat;
+uniform float m_gammaDstInv;
+uniform float m_gammaSrc;
+uniform float m_toneP1;
+uniform vec3 m_coefsDst;
 in vec2 m_cordY;
 in vec2 m_cordU;
 in vec2 m_cordV;
@@ -62,7 +67,7 @@
   vec4 linetaps = texture(m_kernelTex, 1.0 - f.x);
   vec4 coltaps = texture(m_kernelTex, 1.0 - f.y);
   linetaps /= linetaps.r + linetaps.g + linetaps.b + linetaps.a;
-  columntaps /= columntaps.r + columntaps.g + columntaps.b + columntaps.a;
+  coltaps /= coltaps.r + coltaps.g + coltaps.b + coltaps.a;
   mat4 conv;
   conv[0] = linetaps * coltaps.x;
   conv[1] = linetaps * coltaps.y;
@@ -85,23 +90,36 @@
 vec4 process()
 {
   vec4 rgb;
-#if defined(XBMC_YV12)
+  vec4 yuv;
 
-  vec4 yuv = vec4(filter_0(m_sampY, stretch(m_cordY)),
-                  texture(m_sampU, stretch(m_cordU)).r,
-                  texture(m_sampV, stretch(m_cordV)).r,
-                  1.0);
+#if defined(XBMC_YV12)
 
-  rgb = m_yuvmat * yuv;
-  rgb.a = m_alpha;
+  yuv = vec4(filter_0(m_sampY, stretch(m_cordY)),
+             texture(m_sampU, stretch(m_cordU)).r,
+             texture(m_sampV, stretch(m_cordV)).r,
+             1.0);
 
 #elif defined(XBMC_NV12)
 
-  vec4 yuv = vec4(filter_0(m_sampY, stretch(m_cordY)),
-                  texture(m_sampU, stretch(m_cordU)).rg,
-                  1.0);
+  yuv = vec4(filter_0(m_sampY, stretch(m_cordY)),
+             texture(m_sampU, stretch(m_cordU)).rg,
+             1.0);
+
+#endif
+
   rgb = m_yuvmat * yuv;
   rgb.a = m_alpha;
+
+#if defined(XBMC_COL_CONVERSION)
+  rgb.rgb = pow(rgb.rgb, vec3(m_gammaSrc));
+  rgb.rgb = m_primMat * rgb.rgb;
+  rgb.rgb = pow(rgb.rgb, vec3(m_gammaDstInv));
+
+#if defined(XBMC_TONE_MAPPING)
+  float luma = dot(rgb.rgb, m_coefsDst);
+  rgb.rgb *= tonemap(luma) / luma;
+#endif
+
 #endif
 
   return rgb;

_service:download_files:master.tar.gz/system/shaders/GLES Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0 Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_convolution-4x4.frag Added

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision highp float;
+
+uniform sampler2D img;
+uniform vec2 stepxy;
+varying vec2 cord;
+uniform float m_alpha;
+uniform sampler2D kernelTex;
+
+vec4 weight(float pos)
+{
+#if (HAS_FLOAT_TEXTURE)
+ return texture2D(kernelTex, vec2(pos - 0.5));
+#else
+ return texture2D(kernelTex, vec2(pos - 0.5)) * 2.0 - 1.0;
+#endif
+}
+
+vec3 pixel(float xpos, float ypos)
+{
+ return texture2D(img, vec2(xpos, ypos)).rgb;
+}
+
+vec3 line (float ypos, vec4 xpos, vec4 linetaps)
+{
+ return
+ pixel(xpos.r, ypos) * linetaps.r +
+ pixel(xpos.g, ypos) * linetaps.g +
+ pixel(xpos.b, ypos) * linetaps.b +
+ pixel(xpos.a, ypos) * linetaps.a;
+}
+
+void main()
+{
+ vec4 rgb;
+ vec2 pos = cord + stepxy * 0.5;
+ vec2 f = fract(pos / stepxy);
+
+ vec4 linetaps = weight(1.0 - f.x);
+ vec4 columntaps = weight(1.0 - f.y);
+
+ //make sure all taps added together is exactly 1.0, otherwise some (very small) distortion can occur
+ linetaps /= linetaps.r + linetaps.g + linetaps.b + linetaps.a;
+ columntaps /= columntaps.r + columntaps.g + columntaps.b + columntaps.a;
+
+ vec2 xystart = (-1.5 - f) * stepxy + pos;
+ vec4 xpos = vec4(xystart.x, xystart.x + stepxy.x, xystart.x + stepxy.x * 2.0, xystart.x + stepxy.x * 3.0);
+
+ rgb.rgb =
+ line(xystart.y , xpos, linetaps) * columntaps.r +
+ line(xystart.y + stepxy.y , xpos, linetaps) * columntaps.g +
+ line(xystart.y + stepxy.y * 2.0, xpos, linetaps) * columntaps.b +
+ line(xystart.y + stepxy.y * 3.0, xpos, linetaps) * columntaps.a;
+
+ rgb.a = m_alpha;
+
+ gl_FragColor = rgb;
+}
+

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_convolution-6x6.frag Added

@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision highp float;
+
+uniform sampler2D img;
+uniform vec2 stepxy;
+varying vec2 cord;
+uniform float m_alpha;
+uniform sampler2D kernelTex;
+
+vec3 weight(float pos)
+{
+#if (HAS_FLOAT_TEXTURE)
+ return texture2D(kernelTex, vec2(pos - 0.5)).rgb;
+#else
+ return texture2D(kernelTex, vec2(pos - 0.5)).rgb * 2.0 - 1.0;
+#endif
+}
+
+vec3 pixel(float xpos, float ypos)
+{
+ return texture2D(img, vec2(xpos, ypos)).rgb;
+}
+
+vec3 line (float ypos, vec3 xpos1, vec3 xpos2, vec3 linetaps1, vec3 linetaps2)
+{
+ return
+ pixel(xpos1.r, ypos) * linetaps1.r +
+ pixel(xpos1.g, ypos) * linetaps2.r +
+ pixel(xpos1.b, ypos) * linetaps1.g +
+ pixel(xpos2.r, ypos) * linetaps2.g +
+ pixel(xpos2.g, ypos) * linetaps1.b +
+ pixel(xpos2.b, ypos) * linetaps2.b;
+}
+
+void main()
+{
+ vec4 rgb;
+ vec2 pos = cord + stepxy * 0.5;
+ vec2 f = fract(pos / stepxy);
+
+ vec3 linetaps1 = weight((1.0 - f.x) / 2.0);
+ vec3 linetaps2 = weight((1.0 - f.x) / 2.0 + 0.5);
+ vec3 columntaps1 = weight((1.0 - f.y) / 2.0);
+ vec3 columntaps2 = weight((1.0 - f.y) / 2.0 + 0.5);
+
+ //make sure all taps added together is exactly 1.0, otherwise some (very small) distortion can occur
+ float sum = linetaps1.r + linetaps1.g + linetaps1.b + linetaps2.r + linetaps2.g + linetaps2.b;
+ linetaps1 /= sum;
+ linetaps2 /= sum;
+ sum = columntaps1.r + columntaps1.g + columntaps1.b + columntaps2.r + columntaps2.g + columntaps2.b;
+ columntaps1 /= sum;
+ columntaps2 /= sum;
+
+ vec2 xystart = (-2.5 - f) * stepxy + pos;
+ vec3 xpos1 = vec3(xystart.x, xystart.x + stepxy.x, xystart.x + stepxy.x * 2.0);
+ vec3 xpos2 = vec3(xystart.x + stepxy.x * 3.0, xystart.x + stepxy.x * 4.0, xystart.x + stepxy.x * 5.0);
+
+ rgb.rgb =
+ line(xystart.y , xpos1, xpos2, linetaps1, linetaps2) * columntaps1.r +
+ line(xystart.y + stepxy.y , xpos1, xpos2, linetaps1, linetaps2) * columntaps2.r +
+ line(xystart.y + stepxy.y * 2.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.g +
+ line(xystart.y + stepxy.y * 3.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.g +
+ line(xystart.y + stepxy.y * 4.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.b +
+ line(xystart.y + stepxy.y * 5.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.b;
+
+ rgb.a = m_alpha;
+
+ gl_FragColor = rgb;
+}
+

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader.vert Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+attribute vec4 m_attrpos;
+attribute vec4 m_attrcol;
+attribute vec4 m_attrcord0;
+attribute vec4 m_attrcord1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying lowp vec4 m_colour;
+uniform mat4 m_proj;
+uniform mat4 m_model;
+uniform mat4 m_coord0Matrix;
+
+void main ()
+{
+ mat4 mvp = m_proj * m_model;
+ gl_Position = mvp * m_attrpos;
+ m_colour = m_attrcol;
+ m_cord0 = m_coord0Matrix * m_attrcord0;
+ m_cord1 = m_attrcord1;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_default.frag Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_fonts.frag Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+varying vec4 m_cord0;
+varying lowp vec4 m_colour;
+
+// SM_FONTS shader
+void main ()
+{
+ gl_FragColor.r = m_colour.r;
+ gl_FragColor.g = m_colour.g;
+ gl_FragColor.b = m_colour.b;
+ gl_FragColor.a = m_colour.a * texture2D(m_samp0, m_cord0.xy).a;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_multi.frag Added

@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+
+// SM_MULTI shader
+void main ()
+{
+ gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).rgba;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_multi_blendcolor.frag Added

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+uniform lowp vec4 m_unicol;
+
+// SM_MULTI shader
+void main ()
+{
+ gl_FragColor.rgba = m_unicol * texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy);
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_rgba.frag Added

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying lowp vec4 m_colour;
+uniform int m_method;
+
+uniform float m_brightness;
+uniform float m_contrast;
+
+void main ()
+{
+ vec4 color = texture2D(m_samp0, m_cord0.xy).rgba;
+ color = color * m_contrast;
+ color = color + m_brightness;
+
+ gl_FragColor.rgba = color;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_rgba_blendcolor.frag Added

@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying lowp vec4 m_colour;
+uniform int m_method;
+
+// SM_TEXTURE
+void main ()
+{
+ gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba * m_colour);
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_rgba_bob.frag Added

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision highp float;
+uniform sampler2D m_samp0;
+uniform sampler2D m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying lowp vec4 m_colour;
+uniform int m_method;
+uniform int m_field;
+uniform float m_step;
+
+uniform float m_brightness;
+uniform float m_contrast;
+
+void main ()
+{
+ vec2 source;
+ source = m_cord0.xy;
+
+ float temp1 = mod(source.y, 2.0*m_step);
+ float temp2 = source.y - temp1;
+ source.y = temp2 + m_step/2.0 - float(m_field)*m_step;
+
+ // Blend missing line
+ vec2 below;
+ float bstep = step(m_step, temp1);
+ below.x = source.x;
+ below.y = source.y + (2.0*m_step*bstep);
+
+ vec4 color = mix(texture2D(m_samp0, source), texture2D(m_samp0, below), 0.5);
+ color = color * m_contrast;
+ color = color + m_brightness;
+
+ gl_FragColor.rgba = color;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_rgba_bob_oes.frag Added

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+#extension GL_OES_EGL_image_external : require
+
+precision highp float;
+uniform samplerExternalOES m_samp0;
+uniform samplerExternalOES m_samp1;
+varying vec4 m_cord0;
+varying vec4 m_cord1;
+varying lowp vec4 m_colour;
+uniform int m_method;
+uniform int m_field;
+uniform float m_step;
+
+uniform float m_brightness;
+uniform float m_contrast;
+
+void main ()
+{
+ vec2 source;
+ source = m_cord0.xy;
+
+ float temp1 = mod(source.y, 2.0*m_step);
+ float temp2 = source.y - temp1;
+ source.y = temp2 + m_step/2.0 - float(m_field)*m_step;
+
+ // Blend missing line
+ vec2 below;
+ float bstep = step(m_step, temp1);
+ below.x = source.x;
+ below.y = source.y + (2.0*m_step*bstep);
+
+ vec4 color = mix(texture2D(m_samp0, source), texture2D(m_samp0, below), 0.5);
+ color = color * m_contrast;
+ color = color + m_brightness;
+
+ gl_FragColor.rgba = color;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_rgba_oes.frag Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+#extension GL_OES_EGL_image_external : require
+
+precision mediump float;
+uniform samplerExternalOES m_samp0;
+varying vec4 m_cord0;
+
+uniform float m_brightness;
+uniform float m_contrast;
+
+void main ()
+{
+ vec4 color = texture2D(m_samp0, m_cord0.xy).rgba;
+ color = color * m_contrast;
+ color = color + m_brightness;
+
+ gl_FragColor.rgba = color;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_texture.frag Added

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+uniform sampler2D m_samp0;
+uniform lowp vec4 m_unicol;
+varying vec4 m_cord0;
+
+// SM_TEXTURE shader
+void main ()
+{
+ gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba * m_unicol);
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_shader_texture_noblend.frag Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_videofilter.frag Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_videofilter.vert Added

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_yuv2rgb.vert Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+attribute vec4 m_attrpos;
+attribute vec2 m_attrcordY;
+attribute vec2 m_attrcordU;
+attribute vec2 m_attrcordV;
+varying vec2 m_cordY;
+varying vec2 m_cordU;
+varying vec2 m_cordV;
+uniform mat4 m_proj;
+uniform mat4 m_model;
+
+void main ()
+{
+ mat4 mvp = m_proj * m_model;
+ gl_Position = mvp * m_attrpos;
+ m_cordY = m_attrcordY;
+ m_cordU = m_attrcordU;
+ m_cordV = m_attrcordV;
+}

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_yuv2rgb_basic.frag Added

@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision mediump float;
+
+uniform sampler2D m_sampY;
+uniform sampler2D m_sampU;
+uniform sampler2D m_sampV;
+varying vec2 m_cordY;
+varying vec2 m_cordU;
+varying vec2 m_cordV;
+uniform vec2 m_step;
+uniform mat4 m_yuvmat;
+uniform float m_alpha;
+
+void main()
+{
+ vec4 rgb;
+#if defined(XBMC_YV12) || defined(XBMC_NV12)
+
+ vec4 yuv;
+ yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
+ , texture2D(m_sampU, m_cordU).g
+ , texture2D(m_sampV, m_cordV).a
+ , 1.0 );
+
+ rgb = m_yuvmat * yuv;
+
+ rgb.a = m_alpha;
+
+#elif defined(XBMC_NV12_RRG)
+
+ vec4 yuv;
+ yuv.rgba = vec4( texture2D(m_sampY, m_cordY).r
+ , texture2D(m_sampU, m_cordU).r
+ , texture2D(m_sampV, m_cordV).g
+ , 1.0 );
+
+ rgb = m_yuvmat * yuv;
+
+ rgb.a = m_alpha;
+
+#elif defined(XBMC_YUY2) || defined(XBMC_UYVY)
+
+ vec2 stepxy = m_step;
+ vec2 pos = m_cordY;
+ pos = vec2(pos.x - stepxy.x * 0.25, pos.y);
+ vec2 f = fract(pos / stepxy);
+
+ //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
+ vec4 c1 = texture2D(m_sampY, vec2(pos.x + (0.5 - f.x) * stepxy.x, pos.y));
+ vec4 c2 = texture2D(m_sampY, vec2(pos.x + (1.5 - f.x) * stepxy.x, pos.y));
+
+ /* each pixel has two Y subpixels and one UV subpixel
+ YUV Y YUV
+ check if we're left or right of the middle Y subpixel and interpolate accordingly*/
+#ifdef XBMC_YUY2 //BGRA = YUYV
+ float leftY = mix(c1.b, c1.r, f.x * 2.0);
+ float rightY = mix(c1.r, c2.b, f.x * 2.0 - 1.0);
+ vec2 outUV = mix(c1.ga, c2.ga, f.x);
+#else //BGRA = UYVY
+ float leftY = mix(c1.g, c1.a, f.x * 2.0);
+ float rightY = mix(c1.a, c2.g, f.x * 2.0 - 1.0);
+ vec2 outUV = mix(c1.br, c2.br, f.x);
+#endif //XBMC_YUY2
+
+ float outY = mix(leftY, rightY, step(0.5, f.x));
+
+ vec4 yuv = vec4(outY, outUV, 1.0);
+ rgb = m_yuvmat * yuv;
+
+ rgb.a = m_alpha;
+#endif
+
+ gl_FragColor = rgb;
+}
+

_service:download_files:master.tar.gz/system/shaders/GLES/2.0/gles_yuv2rgb_bob.frag Added

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2010-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/>.
+ *
+ */
+
+#version 100
+
+precision highp float;
+uniform sampler2D m_sampY;
+uniform sampler2D m_sampU;
+uniform sampler2D m_sampV;
+varying vec2 m_cordY;
+varying vec2 m_cordU;
+varying vec2 m_cordV;
+uniform float m_alpha;
+uniform mat4 m_yuvmat;
+uniform float m_stepX;
+uniform float m_stepY;
+uniform int m_field;
+
+void main()
+{
+ vec4 yuv, rgb;
+
+ vec2 offsetY;
+ vec2 offsetU;
+ vec2 offsetV;
+ float temp1 = mod(m_cordY.y, 2.0*m_stepY);
+
+ offsetY = m_cordY;
+ offsetU = m_cordU;
+ offsetV = m_cordV;
+
+ offsetY.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY);
+ offsetU.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY)/2.0;
+ offsetV.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY)/2.0;
+
+ float bstep = step(m_stepY, temp1);
+
+ // Blend missing line
+ vec2 belowY, belowU, belowV;
+
+ belowY.x = offsetY.x;
+ belowY.y = offsetY.y + (2.0*m_stepY*bstep);
+ belowU.x = offsetU.x;
+ belowU.y = offsetU.y + (m_stepY*bstep);
+ belowV.x = offsetV.x;
+ belowV.y = offsetV.y + (m_stepY*bstep);
+
+ vec4 yuvBelow, rgbBelow;
+
+ yuv.rgba = vec4(texture2D(m_sampY, offsetY).r, texture2D(m_sampU, offsetU).g, texture2D(m_sampV, offsetV).a, 1.0);
+ rgb = m_yuvmat * yuv;
+ rgb.a = m_alpha;
+
+ yuvBelow.rgba = vec4(texture2D(m_sampY, belowY).r, texture2D(m_sampU, belowU).g, texture2D(m_sampV, belowV).a, 1.0);
+ rgbBelow = m_yuvmat * yuvBelow;
+ rgbBelow.a = m_alpha;
+
+ gl_FragColor.rgba = mix(rgb, rgbBelow, 0.5);
+}

_service:download_files:master.tar.gz/system/shaders/convolution-4x4.glsl Deleted

@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#ifdef GL_ES
- precision highp float;
-#endif
-
-uniform sampler2D img;
-uniform vec2 stepxy;
-uniform float m_stretch;
-varying vec2 cord;
-
-#ifdef GL_ES
- uniform float m_alpha;
-#endif
-
-#if (USE1DTEXTURE)
- uniform sampler1D kernelTex;
-#else
- uniform sampler2D kernelTex;
-#endif
-
-//nvidia's half is a 16 bit float and can bring some speed improvements
-//without affecting quality
-#ifndef __GLSL_CG_DATA_TYPES
- #define half float
- #define half3 vec3
- #define half4 vec4
-#endif
-
-half4 weight(float pos)
-{
-#if (HAS_FLOAT_TEXTURE)
- #if (USE1DTEXTURE)
- return texture1D(kernelTex, pos);
- #else
- return texture2D(kernelTex, vec2(pos, 0.5));
- #endif
-#else
- #if (USE1DTEXTURE)
- return texture1D(kernelTex, pos) * 2.0 - 1.0;
- #else
- return texture2D(kernelTex, vec2(pos, 0.5)) * 2.0 - 1.0;
- #endif
-#endif
-}
-
-vec2 stretch(vec2 pos)
-{
-#if (XBMC_STRETCH)
- // our transform should map [0..1] to itself, with f(0) = 0, f(1) = 1, f(0.5) = 0.5, and f'(0.5) = b.
- // a simple curve to do this is g(x) = b(x-0.5) + (1-b)2^(n-1)(x-0.5)^n + 0.5
- // where the power preserves sign. n = 2 is the simplest non-linear case (required when b != 1)
- float x = pos.x - 0.5;
- return vec2(mix(x * abs(x) * 2.0, x, m_stretch) + 0.5, pos.y);
-#else
- return pos;
-#endif
-}
-
-half3 pixel(float xpos, float ypos)
-{
- return texture2D(img, vec2(xpos, ypos)).rgb;
-}
-
-half3 line (float ypos, vec4 xpos, half4 linetaps)
-{
- return
- pixel(xpos.r, ypos) * linetaps.r +
- pixel(xpos.g, ypos) * linetaps.g +
- pixel(xpos.b, ypos) * linetaps.b +
- pixel(xpos.a, ypos) * linetaps.a;
-}
-
-vec4 process()
-{
- vec4 rgb;
- vec2 pos = stretch(cord) + stepxy * 0.5;
- vec2 f = fract(pos / stepxy);
-
- half4 linetaps = weight(1.0 - f.x);
- half4 columntaps = weight(1.0 - f.y);
-
- //make sure all taps added together is exactly 1.0, otherwise some (very small) distortion can occur
- linetaps /= linetaps.r + linetaps.g + linetaps.b + linetaps.a;
- columntaps /= columntaps.r + columntaps.g + columntaps.b + columntaps.a;
-
- vec2 xystart = (-1.5 - f) * stepxy + pos;
- vec4 xpos = vec4(xystart.x, xystart.x + stepxy.x, xystart.x + stepxy.x * 2.0, xystart.x + stepxy.x * 3.0);
-
- rgb.rgb =
- line(xystart.y , xpos, linetaps) * columntaps.r +
- line(xystart.y + stepxy.y , xpos, linetaps) * columntaps.g +
- line(xystart.y + stepxy.y * 2.0, xpos, linetaps) * columntaps.b +
- line(xystart.y + stepxy.y * 3.0, xpos, linetaps) * columntaps.a;
-
-#ifdef GL_ES
- rgb.a = m_alpha;
-#else
- rgb.a = gl_Color.a;
-#endif
-
- return rgb;
-}
-

_service:download_files:master.tar.gz/system/shaders/convolution-6x6.glsl Deleted

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#ifdef GL_ES
- precision highp float;
-#endif
-
-uniform sampler2D img;
-uniform vec2 stepxy;
-uniform float m_stretch;
-varying vec2 cord;
-
-#ifdef GL_ES
- uniform float m_alpha;
-#endif
-
-#if (USE1DTEXTURE)
- uniform sampler1D kernelTex;
-#else
- uniform sampler2D kernelTex;
-#endif
-
-//nvidia's half is a 16 bit float and can bring some speed improvements
-//without affecting quality
-#ifndef __GLSL_CG_DATA_TYPES
- #define half float
- #define half3 vec3
- #define half4 vec4
-#endif
-
-half3 weight(float pos)
-{
-#if (HAS_FLOAT_TEXTURE)
- #if (USE1DTEXTURE)
- return texture1D(kernelTex, pos).rgb;
- #else
- return texture2D(kernelTex, vec2(pos, 0.5)).rgb;
- #endif
-#else
- #if (USE1DTEXTURE)
- return texture1D(kernelTex, pos).rgb * 2.0 - 1.0;
- #else
- return texture2D(kernelTex, vec2(pos, 0.5)).rgb * 2.0 - 1.0;
- #endif
-#endif
-}
-
-vec2 stretch(vec2 pos)
-{
-#if (XBMC_STRETCH)
- // our transform should map [0..1] to itself, with f(0) = 0, f(1) = 1, f(0.5) = 0.5, and f'(0.5) = b.
- // a simple curve to do this is g(x) = b(x-0.5) + (1-b)2^(n-1)(x-0.5)^n + 0.5
- // where the power preserves sign. n = 2 is the simplest non-linear case (required when b != 1)
- float x = pos.x - 0.5;
- return vec2(mix(x * abs(x) * 2.0, x, m_stretch) + 0.5, pos.y);
-#else
- return pos;
-#endif
-}
-
-half3 pixel(float xpos, float ypos)
-{
- return texture2D(img, vec2(xpos, ypos)).rgb;
-}
-
-half3 line (float ypos, vec3 xpos1, vec3 xpos2, half3 linetaps1, half3 linetaps2)
-{
- return
- pixel(xpos1.r, ypos) * linetaps1.r +
- pixel(xpos1.g, ypos) * linetaps2.r +
- pixel(xpos1.b, ypos) * linetaps1.g +
- pixel(xpos2.r, ypos) * linetaps2.g +
- pixel(xpos2.g, ypos) * linetaps1.b +
- pixel(xpos2.b, ypos) * linetaps2.b;
-}
-
-vec4 process()
-{
- vec4 rgb;
- vec2 pos = stretch(cord) + stepxy * 0.5;
- vec2 f = fract(pos / stepxy);
-
- half3 linetaps1 = weight((1.0 - f.x) / 2.0);
- half3 linetaps2 = weight((1.0 - f.x) / 2.0 + 0.5);
- half3 columntaps1 = weight((1.0 - f.y) / 2.0);
- half3 columntaps2 = weight((1.0 - f.y) / 2.0 + 0.5);
-
- //make sure all taps added together is exactly 1.0, otherwise some (very small) distortion can occur
- half sum = linetaps1.r + linetaps1.g + linetaps1.b + linetaps2.r + linetaps2.g + linetaps2.b;
- linetaps1 /= sum;
- linetaps2 /= sum;
- sum = columntaps1.r + columntaps1.g + columntaps1.b + columntaps2.r + columntaps2.g + columntaps2.b;
- columntaps1 /= sum;
- columntaps2 /= sum;
-
- vec2 xystart = (-2.5 - f) * stepxy + pos;
- vec3 xpos1 = vec3(xystart.x, xystart.x + stepxy.x, xystart.x + stepxy.x * 2.0);
- vec3 xpos2 = vec3(xystart.x + stepxy.x * 3.0, xystart.x + stepxy.x * 4.0, xystart.x + stepxy.x * 5.0);
-
- rgb.rgb =
- line(xystart.y , xpos1, xpos2, linetaps1, linetaps2) * columntaps1.r +
- line(xystart.y + stepxy.y , xpos1, xpos2, linetaps1, linetaps2) * columntaps2.r +
- line(xystart.y + stepxy.y * 2.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.g +
- line(xystart.y + stepxy.y * 3.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.g +
- line(xystart.y + stepxy.y * 4.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps1.b +
- line(xystart.y + stepxy.y * 5.0, xpos1, xpos2, linetaps1, linetaps2) * columntaps2.b;
-
-#ifdef GL_ES
- rgb.a = m_alpha;
-#else
- rgb.a = gl_Color.a;
-#endif
-
- return rgb;
-}
-

_service:download_files:master.tar.gz/system/shaders/guishader_frag_default.glsl Deleted

_service:download_files:master.tar.gz/system/shaders/guishader_frag_fonts.glsl Deleted

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-varying vec4 m_cord0;
-varying lowp vec4 m_colour;
-
-// SM_FONTS shader
-void main ()
-{
- gl_FragColor.r = m_colour.r;
- gl_FragColor.g = m_colour.g;
- gl_FragColor.b = m_colour.b;
- gl_FragColor.a = m_colour.a * texture2D(m_samp0, m_cord0.xy).a;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_multi.glsl Deleted

@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-uniform sampler2D m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-
-// SM_MULTI shader
-void main ()
-{
- gl_FragColor.rgba = (texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy)).rgba;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_multi_blendcolor.glsl Deleted

@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-uniform sampler2D m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-uniform lowp vec4 m_unicol;
-
-// SM_MULTI shader
-void main ()
-{
- gl_FragColor.rgba = m_unicol * texture2D(m_samp0, m_cord0.xy) * texture2D(m_samp1, m_cord1.xy);
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_rgba.glsl Deleted

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-uniform sampler2D m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-varying lowp vec4 m_colour;
-uniform int m_method;
-
-uniform float m_brightness;
-uniform float m_contrast;
-
-void main ()
-{
- vec4 color = texture2D(m_samp0, m_cord0.xy).rgba;
- color = color * m_contrast;
- color = color + m_brightness;
-
- gl_FragColor.rgba = color;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_rgba_blendcolor.glsl Deleted

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-uniform sampler2D m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-varying lowp vec4 m_colour;
-uniform int m_method;
-
-// SM_TEXTURE
-void main ()
-{
- gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba * m_colour);
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_rgba_bob.glsl Deleted

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision highp float;
-uniform sampler2D m_samp0;
-uniform sampler2D m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-varying lowp vec4 m_colour;
-uniform int m_method;
-uniform int m_field;
-uniform float m_step;
-
-uniform float m_brightness;
-uniform float m_contrast;
-
-void main ()
-{
- vec2 source;
- source = m_cord0.xy;
- 
- float temp1 = mod(source.y, 2.0*m_step);
- float temp2 = source.y - temp1;
- source.y = temp2 + m_step/2.0 - float(m_field)*m_step;
-
- // Blend missing line
- vec2 below;
- float bstep = step(m_step, temp1);
- below.x = source.x;
- below.y = source.y + (2.0*m_step*bstep);
-
- vec4 color = mix(texture2D(m_samp0, source), texture2D(m_samp0, below), 0.5);
- color = color * m_contrast;
- color = color + m_brightness;
-
- gl_FragColor.rgba = color;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_rgba_bob_oes.glsl Deleted

@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#extension GL_OES_EGL_image_external : require
-
-precision highp float;
-uniform samplerExternalOES m_samp0;
-uniform samplerExternalOES m_samp1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-varying lowp vec4 m_colour;
-uniform int m_method;
-uniform int m_field;
-uniform float m_step;
-
-uniform float m_brightness;
-uniform float m_contrast;
-
-void main ()
-{
- vec2 source;
- source = m_cord0.xy;
- 
- float temp1 = mod(source.y, 2.0*m_step);
- float temp2 = source.y - temp1;
- source.y = temp2 + m_step/2.0 - float(m_field)*m_step;
- 
- // Blend missing line
- vec2 below;
- float bstep = step(m_step, temp1);
- below.x = source.x;
- below.y = source.y + (2.0*m_step*bstep);
-
- vec4 color = mix(texture2D(m_samp0, source), texture2D(m_samp0, below), 0.5);
- color = color * m_contrast;
- color = color + m_brightness;
-
- gl_FragColor.rgba = color;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_rgba_oes.glsl Deleted

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#extension GL_OES_EGL_image_external : require
-
-precision mediump float;
-uniform samplerExternalOES m_samp0;
-varying vec4 m_cord0;
-
-uniform float m_brightness;
-uniform float m_contrast;
-
-void main ()
-{
- vec4 color = texture2D(m_samp0, m_cord0.xy).rgba;
- color = color * m_contrast;
- color = color + m_brightness;
-
- gl_FragColor.rgba = color;
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_texture.glsl Deleted

@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision mediump float;
-uniform sampler2D m_samp0;
-uniform lowp vec4 m_unicol;
-varying vec4 m_cord0;
-
-// SM_TEXTURE shader
-void main ()
-{
- gl_FragColor.rgba = vec4(texture2D(m_samp0, m_cord0.xy).rgba * m_unicol);
-}

_service:download_files:master.tar.gz/system/shaders/guishader_frag_texture_noblend.glsl Deleted

_service:download_files:master.tar.gz/system/shaders/guishader_vert.glsl Deleted

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-attribute vec4 m_attrpos;
-attribute vec4 m_attrcol;
-attribute vec4 m_attrcord0;
-attribute vec4 m_attrcord1;
-varying vec4 m_cord0;
-varying vec4 m_cord1;
-varying lowp vec4 m_colour;
-uniform mat4 m_proj;
-uniform mat4 m_model;
-uniform mat4 m_coord0Matrix;
-
-void main ()
-{
- mat4 mvp = m_proj * m_model;
- gl_Position = mvp * m_attrpos;
- m_colour = m_attrcol;
- m_cord0 = m_coord0Matrix * m_attrcord0;
- m_cord1 = m_attrcord1;
-}

_service:download_files:master.tar.gz/system/shaders/output.glsl Deleted

@@ -1,37 +0,0 @@
-#if defined(XBMC_DITHER)
-uniform sampler2D m_dither;
-uniform float m_ditherquant;
-uniform vec2 m_dithersize;
-#endif
-#if defined(KODI_3DLUT)
-uniform float m_CLUTsize;
-uniform sampler3D m_CLUT;
-#endif
-
-void main()
-{
- vec4 rgb = process();
-
-#if defined(KODI_3DLUT)
- // FIXME: can this be optimized?
- rgb = texture3D(m_CLUT, (rgb.rgb*(m_CLUTsize-1.0) + 0.5) / m_CLUTsize);
-#endif
-
-#if defined(XBMC_FULLRANGE)
-#if __VERSION__ <= 120
- rgb = (rgb-(16.0/255.0)) * 255.0/219.0;
-#else
- rgb = clamp((rgb-(16.0/255.0)) * 255.0/219.0, 0, 1);
-#endif
-#endif
-
-#if defined(XBMC_DITHER)
- vec2 ditherpos = gl_FragCoord.xy / m_dithersize;
- // ditherval is multiplied by 65536/(dither_size^2) to make it [0,1[
- // FIXME: scale dither values before uploading?
- float ditherval = texture2D(m_dither, ditherpos).r * 16.0;
- rgb = floor(rgb * m_ditherquant + ditherval) / m_ditherquant;
-#endif
-
- gl_FragColor = rgb;
-}

_service:download_files:master.tar.gz/system/shaders/output_d3d.fx Changed

_service:download_files:master.tar.gz/system/shaders/stretch.glsl Deleted

@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-uniform sampler2D img;
-uniform float m_stretch;
-varying vec2 cord;
-
-vec2 stretch(vec2 pos)
-{
- // our transform should map [0..1] to itself, with f(0) = 0, f(1) = 1, f(0.5) = 0.5, and f'(0.5) = b.
- // a simple curve to do this is g(x) = b(x-0.5) + (1-b)2^(n-1)(x-0.5)^n + 0.5
- // where the power preserves sign. n = 2 is the simplest non-linear case (required when b != 1)
- float x = pos.x - 0.5;
- return vec2(mix(x * abs(x) * 2.0, x, m_stretch) + 0.5, pos.y);
-}
-
-void main()
-{
- gl_FragColor.rgb = texture2D(img, stretch(cord)).rgb;
- gl_FragColor.a = gl_Color.a;
-}
-

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic.glsl Deleted

@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#if(XBMC_texture_rectangle)
-# extension GL_ARB_texture_rectangle : enable
-# define texture2D texture2DRect
-# define sampler2D sampler2DRect
-#endif
-
-#ifdef GL_ES
- precision mediump float;
-#endif
-
-uniform sampler2D m_sampY;
-uniform sampler2D m_sampU;
-uniform sampler2D m_sampV;
-varying vec2 m_cordY;
-varying vec2 m_cordU;
-varying vec2 m_cordV;
-uniform vec2 m_step;
-uniform mat4 m_yuvmat;
-uniform float m_stretch;
-
-#ifdef GL_ES
- uniform float m_alpha;
-#endif
-
-vec2 stretch(vec2 pos)
-{
-#if (XBMC_STRETCH)
- // our transform should map [0..1] to itself, with f(0) = 0, f(1) = 1, f(0.5) = 0.5, and f'(0.5) = b.
- // a simple curve to do this is g(x) = b(x-0.5) + (1-b)2^(n-1)(x-0.5)^n + 0.5
- // where the power preserves sign. n = 2 is the simplest non-linear case (required when b != 1)
- #if(XBMC_texture_rectangle)
- float x = (pos.x * m_step.x) - 0.5;
- return vec2((mix(2.0 * x * abs(x), x, m_stretch) + 0.5) / m_step.x, pos.y);
- #else
- float x = pos.x - 0.5;
- return vec2(mix(2.0 * x * abs(x), x, m_stretch) + 0.5, pos.y);
- #endif
-#else
- return pos;
-#endif
-}
-
-vec4 process()
-{
- vec4 rgb;
-#if defined(XBMC_YV12) || defined(XBMC_NV12)
-
- vec4 yuv;
- yuv.rgba = vec4( texture2D(m_sampY, stretch(m_cordY)).r
- , texture2D(m_sampU, stretch(m_cordU)).g
- , texture2D(m_sampV, stretch(m_cordV)).a
- , 1.0 );
-
- rgb = m_yuvmat * yuv;
-
-#ifdef GL_ES
- rgb.a = m_alpha;
-#else
- rgb.a = gl_Color.a;
-#endif
-
-#elif defined(XBMC_NV12_RRG)
-
- vec4 yuv;
- yuv.rgba = vec4( texture2D(m_sampY, stretch(m_cordY)).r
- , texture2D(m_sampU, stretch(m_cordU)).r
- , texture2D(m_sampV, stretch(m_cordV)).g
- , 1.0 );
-
- rgb = m_yuvmat * yuv;
-
-#ifdef GL_ES
- rgb.a = m_alpha;
-#else
- rgb.a = gl_Color.a;
-#endif
-
-#elif defined(XBMC_YUY2) || defined(XBMC_UYVY)
-
-#if(XBMC_texture_rectangle)
- vec2 stepxy = vec2(1.0, 1.0);
- vec2 pos = stretch(m_cordY);
- pos = vec2(pos.x - 0.25, pos.y);
- vec2 f = fract(pos);
-#else
- vec2 stepxy = m_step;
- vec2 pos = stretch(m_cordY);
- pos = vec2(pos.x - stepxy.x * 0.25, pos.y);
- vec2 f = fract(pos / stepxy);
-#endif
-
- //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
- vec4 c1 = texture2D(m_sampY, vec2(pos.x + (0.5 - f.x) * stepxy.x, pos.y));
- vec4 c2 = texture2D(m_sampY, vec2(pos.x + (1.5 - f.x) * stepxy.x, pos.y));
-
- /* each pixel has two Y subpixels and one UV subpixel
- YUV Y YUV
- check if we're left or right of the middle Y subpixel and interpolate accordingly*/
-#ifdef XBMC_YUY2 //BGRA = YUYV
- float leftY = mix(c1.b, c1.r, f.x * 2.0);
- float rightY = mix(c1.r, c2.b, f.x * 2.0 - 1.0);
- vec2 outUV = mix(c1.ga, c2.ga, f.x);
-#else //BGRA = UYVY
- float leftY = mix(c1.g, c1.a, f.x * 2.0);
- float rightY = mix(c1.a, c2.g, f.x * 2.0 - 1.0);
- vec2 outUV = mix(c1.br, c2.br, f.x);
-#endif //XBMC_YUY2
-
- float outY = mix(leftY, rightY, step(0.5, f.x));
-
- vec4 yuv = vec4(outY, outUV, 1.0);
- rgb = m_yuvmat * yuv;
-
-#ifdef GL_ES
- rgb.a = m_alpha;
-#else
- rgb.a = gl_Color.a;
-#endif
-
-#endif
-
- return rgb;
-}
-

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_2d.arb Deleted

@@ -1,35 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-TEMP R0;
-TEMP R1;
-TEX R0.x, fragment.texcoord[0], texture[0], 2D;
-TEX R0.y, fragment.texcoord[1], texture[1], 2D;
-TEX R0.w, fragment.texcoord[2], texture[2], 2D;
-MOV R0.z, R0.w;
-DPH R1.r, R0, yuvmat[0];
-DPH R1.g, R0, yuvmat[1];
-DPH R1.b, R0, yuvmat[2];
-MOV R1.a, fragment.color.a;
-MOV result.color, R1;
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_2d_UYVY.arb Deleted

@@ -1,68 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-#stepx, stepy, width, height
-PARAM dims[1] = { program.local[4] };
-TEMP f;
-TEMP pos;
-MAD pos.x , dims[0].x, -0.25, fragment.texcoord[0].x;
-MOV pos.y , fragment.texcoord[0].y;
-MUL f.x , dims[0].z, pos.x;
-MUL f.y , dims[0].w, pos.y;
-FRC f , f;
-
-TEMP c1pos;
-TEMP c2pos;
-SUB c1pos.x, 0.5, f.x;
-SUB c2pos.x, 1.5, f.x;
-MAD c1pos.x, c1pos.x, dims[0].x, pos.x;
-MAD c2pos.x, c2pos.x, dims[0].x, pos.x;
-MOV c1pos.y, pos.y;
-MOV c2pos.y, pos.y;
-
-TEMP c1;
-TEMP c2;
-TEX c1, c1pos, texture[0], 2D;
-TEX c2, c2pos, texture[0], 2D;
-
-TEMP cint;
-MUL cint.x, f.x, 2.0;
-MAD cint.y, f.x, 2.0, -1.0;
-SGE cint.z, f.x, 0.5;
-
-TEMP yuv;
-LRP yuv.g, cint.x, c1.a , c1.g;
-LRP yuv.b, cint.y, c2.g , c1.a;
-LRP yuv.r, cint.z, yuv.b, yuv.g;
-
-LRP yuv.g, f.x , c2.b , c1.b;
-LRP yuv.b, f.x , c2.r , c1.r;
-
-TEMP rgb;
-DPH rgb.r, yuv, yuvmat[0];
-DPH rgb.g, yuv, yuvmat[1];
-DPH rgb.b, yuv, yuvmat[2];
-MOV rgb.a, fragment.color.a;
-MOV result.color, rgb;
-
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_2d_YUY2.arb Deleted

@@ -1,68 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-#stepx, stepy, width, height
-PARAM dims[1] = { program.local[4] };
-TEMP f;
-TEMP pos;
-MAD pos.x , dims[0].x, -0.25, fragment.texcoord[0].x;
-MOV pos.y , fragment.texcoord[0].y;
-MUL f.x , dims[0].z, pos.x;
-MUL f.y , dims[0].w, pos.y;
-FRC f , f;
-
-TEMP c1pos;
-TEMP c2pos;
-SUB c1pos.x, 0.5, f.x;
-SUB c2pos.x, 1.5, f.x;
-MAD c1pos.x, c1pos.x, dims[0].x, pos.x;
-MAD c2pos.x, c2pos.x, dims[0].x, pos.x;
-MOV c1pos.y, pos.y;
-MOV c2pos.y, pos.y;
-
-TEMP c1;
-TEMP c2;
-TEX c1, c1pos, texture[0], 2D;
-TEX c2, c2pos, texture[0], 2D;
-
-TEMP cint;
-MUL cint.x, f.x, 2.0;
-MAD cint.y, f.x, 2.0, -1.0;
-SGE cint.z, f.x, 0.5;
-
-TEMP yuv;
-LRP yuv.g, cint.x, c1.r , c1.b;
-LRP yuv.b, cint.y, c2.b , c1.r;
-LRP yuv.r, cint.z, yuv.b, yuv.g;
-
-LRP yuv.g, f.x , c2.g , c1.g;
-LRP yuv.b, f.x , c2.a , c1.a;
-
-TEMP rgb;
-DPH rgb.r, yuv, yuvmat[0];
-DPH rgb.g, yuv, yuvmat[1];
-DPH rgb.b, yuv, yuvmat[2];
-MOV rgb.a, fragment.color.a;
-MOV result.color, rgb;
-
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_rect.arb Deleted

@@ -1,35 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-TEMP R0;
-TEMP R1;
-TEX R0.x, fragment.texcoord[0], texture[0], RECT;
-TEX R0.y, fragment.texcoord[1], texture[1], RECT;
-TEX R0.w, fragment.texcoord[2], texture[2], RECT;
-MOV R0.z, R0.w;
-DPH R1.r, R0, yuvmat[0];
-DPH R1.g, R0, yuvmat[1];
-DPH R1.b, R0, yuvmat[2];
-MOV R1.a, fragment.color.a;
-MOV result.color, R1;
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_rect_UYVY.arb Deleted

@@ -1,64 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-TEMP f;
-TEMP pos;
-ADD pos.x , fragment.texcoord[0].x, -0.25;
-MOV pos.y , fragment.texcoord[0].y;
-FRC f , pos;
-
-TEMP c1pos;
-TEMP c2pos;
-SUB c1pos.x, 0.5, f.x;
-SUB c2pos.x, 1.5, f.x;
-ADD c1pos.x, c1pos.x, pos.x;
-ADD c2pos.x, c2pos.x, pos.x;
-MOV c1pos.y, pos.y;
-MOV c2pos.y, pos.y;
-
-TEMP c1;
-TEMP c2;
-TEX c1, c1pos, texture[0], RECT;
-TEX c2, c2pos, texture[0], RECT;
-
-TEMP cint;
-MUL cint.x, f.x, 2.0;
-MAD cint.y, f.x, 2.0, -1.0;
-SGE cint.z, f.x, 0.5;
-
-TEMP yuv;
-LRP yuv.g, cint.x, c1.a , c1.g;
-LRP yuv.b, cint.y, c2.g , c1.a;
-LRP yuv.r, cint.z, yuv.b, yuv.g;
-
-LRP yuv.g, f.x , c2.b , c1.b;
-LRP yuv.b, f.x , c2.r , c1.r;
-
-TEMP rgb;
-DPH rgb.r, yuv, yuvmat[0];
-DPH rgb.g, yuv, yuvmat[1];
-DPH rgb.b, yuv, yuvmat[2];
-MOV rgb.a, fragment.color.a;
-MOV result.color, rgb;
-
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_basic_rect_YUY2.arb Deleted

@@ -1,64 +0,0 @@
-!!ARBfp1.0
-
-#
-# Copyright (C) 2010-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/>.
-#
-#
-
-PARAM yuvmat[4] = { program.local[0..3] };
-TEMP f;
-TEMP pos;
-ADD pos.x , fragment.texcoord[0].x, -0.25;
-MOV pos.y , fragment.texcoord[0].y;
-FRC f , pos;
-
-TEMP c1pos;
-TEMP c2pos;
-SUB c1pos.x, 0.5, f.x;
-SUB c2pos.x, 1.5, f.x;
-ADD c1pos.x, c1pos.x, pos.x;
-ADD c2pos.x, c2pos.x, pos.x;
-MOV c1pos.y, pos.y;
-MOV c2pos.y, pos.y;
-
-TEMP c1;
-TEMP c2;
-TEX c1, c1pos, texture[0], RECT;
-TEX c2, c2pos, texture[0], RECT;
-
-TEMP cint;
-MUL cint.x, f.x, 2.0;
-MAD cint.y, f.x, 2.0, -1.0;
-SGE cint.z, f.x, 0.5;
-
-TEMP yuv;
-LRP yuv.g, cint.x, c1.r , c1.b;
-LRP yuv.b, cint.y, c2.b , c1.r;
-LRP yuv.r, cint.z, yuv.b, yuv.g;
-
-LRP yuv.g, f.x , c2.g , c1.g;
-LRP yuv.b, f.x , c2.a , c1.a;
-
-TEMP rgb;
-DPH rgb.r, yuv, yuvmat[0];
-DPH rgb.g, yuv, yuvmat[1];
-DPH rgb.b, yuv, yuvmat[2];
-MOV rgb.a, fragment.color.a;
-MOV result.color, rgb;
-
-END

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_bob.glsl Deleted

@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-#if(XBMC_texture_rectangle)
-# extension GL_ARB_texture_rectangle : enable
-# define texture2D texture2DRect
-# define sampler2D sampler2DRect
-#endif
-
-uniform sampler2D m_sampY;
-uniform sampler2D m_sampU;
-uniform sampler2D m_sampV;
-varying vec2 m_cordY;
-varying vec2 m_cordU;
-varying vec2 m_cordV;
-
-uniform mat4 m_yuvmat;
-
-uniform float m_stepX;
-uniform float m_stepY;
-uniform int m_field;
-
-void main()
-{
- vec4 yuv, rgb;
-
- vec2 offsetY;
- vec2 offsetU;
- vec2 offsetV;
- float temp1 = mod(m_cordY.y, 2*m_stepY);
-
- offsetY = m_cordY;
- offsetU = m_cordU;
- offsetV = m_cordV;
-
- offsetY.y -= (temp1 - m_stepY/2 + float(m_field)*m_stepY);
- offsetU.y -= (temp1 - m_stepY/2 + float(m_field)*m_stepY)/2;
- offsetV.y -= (temp1 - m_stepY/2 + float(m_field)*m_stepY)/2;
-
- yuv.rgba = vec4( texture2D(m_sampY, offsetY).r
- , texture2D(m_sampU, offsetU).r
- , texture2D(m_sampV, offsetV).a
- , 1.0);
- rgb = m_yuvmat * yuv;
- rgb.a = gl_Color.a;
- gl_FragColor = rgb;
-}

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_bob_gles.glsl Deleted

@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-precision highp float;
-uniform sampler2D m_sampY;
-uniform sampler2D m_sampU;
-uniform sampler2D m_sampV;
-varying vec2 m_cordY;
-varying vec2 m_cordU;
-varying vec2 m_cordV;
-uniform float m_alpha;
-uniform mat4 m_yuvmat;
-uniform float m_stepX;
-uniform float m_stepY;
-uniform int m_field;
-
-void main()
-{
- vec4 yuv, rgb;
-
- vec2 offsetY;
- vec2 offsetU;
- vec2 offsetV;
- float temp1 = mod(m_cordY.y, 2.0*m_stepY);
-
- offsetY = m_cordY;
- offsetU = m_cordU;
- offsetV = m_cordV;
-
- offsetY.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY);
- offsetU.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY)/2.0;
- offsetV.y -= (temp1 - m_stepY/2.0 + float(m_field)*m_stepY)/2.0;
-
- float bstep = step(m_stepY, temp1);
-
- // Blend missing line
- vec2 belowY, belowU, belowV;
-
- belowY.x = offsetY.x;
- belowY.y = offsetY.y + (2.0*m_stepY*bstep);
- belowU.x = offsetU.x;
- belowU.y = offsetU.y + (m_stepY*bstep);
- belowV.x = offsetV.x;
- belowV.y = offsetV.y + (m_stepY*bstep);
-
- vec4 yuvBelow, rgbBelow;
-
- yuv.rgba = vec4(texture2D(m_sampY, offsetY).r, texture2D(m_sampU, offsetU).g, texture2D(m_sampV, offsetV).a, 1.0);
- rgb = m_yuvmat * yuv;
- rgb.a = m_alpha;
-
- yuvBelow.rgba = vec4(texture2D(m_sampY, belowY).r, texture2D(m_sampU, belowU).g, texture2D(m_sampV, belowV).a, 1.0);
- rgbBelow = m_yuvmat * yuvBelow;
- rgbBelow.a = m_alpha;
-
- gl_FragColor.rgba = mix(rgb, rgbBelow, 0.5);
-}

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

_service:download_files:master.tar.gz/system/shaders/yuv2rgb_vertex_gles.glsl Deleted

@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010-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/>.
- *
- */
-
-attribute vec4 m_attrpos;
-attribute vec2 m_attrcordY;
-attribute vec2 m_attrcordU;
-attribute vec2 m_attrcordV;
-varying vec2 m_cordY;
-varying vec2 m_cordU;
-varying vec2 m_cordV;
-uniform mat4 m_proj;
-uniform mat4 m_model;
-
-void main ()
-{
- mat4 mvp = m_proj * m_model;
- gl_Position = mvp * m_attrpos;
- m_cordY = m_attrcordY;
- m_cordU = m_attrcordU;
- m_cordV = m_attrcordV;
-}

_service:download_files:master.tar.gz/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.cpp Changed

_service:download_files:master.tar.gz/tools/EventClients/Clients/WiiRemote/CWIID_WiiRemote.h Changed

_service:download_files:master.tar.gz/tools/EventClients/examples/c#/XBMCDemoClient1.cs Changed

_service:download_files:master.tar.gz/tools/EventClients/lib/c#/EventClient.cs Changed

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

_service:download_files:master.tar.gz/tools/android/packaging/xbmc/AndroidManifest.xml.in Changed

_service:download_files:master.tar.gz/tools/android/packaging/xbmc/build.gradle.in Changed

_service:download_files:master.tar.gz/tools/android/packaging/xbmc/res/layout/activity_main.xml Changed

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

@@ -17,6 +17,7 @@
 import android.graphics.Color;
 import android.graphics.PixelFormat;
 import android.os.Handler;
+import android.widget.RelativeLayout;
 
 import @APP_PACKAGE@.channels.util.TvUtil;
 
@@ -25,11 +26,13 @@
   private static final String TAG = "@APP_NAME@";
 
   public static Main MainActivity = null;
+  public XBMCMainView mMainView = null;
 
   private XBMCSettingsContentObserver mSettingsContentObserver;
   private XBMCInputDeviceListener mInputDeviceListener;
   private XBMCJsonRPC mJsonRPC = null;
-  private View thisView = null;
+  private View mDecorView = null;
+  private RelativeLayout mVideoLayout = null;
   private Handler handler = new Handler();
   private Intent mNewIntent = null;
   private int mNewIntentDelay = 0;
@@ -75,8 +78,8 @@
 
     try
     {
-      ret.right = thisView.getRootView().getWidth();
-      ret.bottom = thisView.getRootView().getHeight();
+      ret.right = mDecorView.getRootView().getWidth();
+      ret.bottom = mDecorView.getRootView().getHeight();
     }
     catch (Exception e)
     {
@@ -103,7 +106,6 @@
     System.loadLibrary("@APP_NAME_LC@");
 
     super.onCreate(savedInstanceState);
-    getWindow().setFormat(PixelFormat.TRANSPARENT);
 
     setContentView(R.layout.activity_main);
     setVolumeControlStream(AudioManager.STREAM_MUSIC);
@@ -137,8 +139,18 @@
     InputManager manager = (InputManager) getSystemService(INPUT_SERVICE);
     manager.registerInputDeviceListener(mInputDeviceListener, handler);
 
-    thisView = getWindow().getDecorView();
-    thisView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener()
+    mDecorView = getWindow().getDecorView();
+    mDecorView.setBackground(null);
+    getWindow().takeSurface(null);
+    setContentView(R.layout.activity_main);
+    mVideoLayout = (RelativeLayout) findViewById(R.id.VideoLayout);
+
+    mMainView = new XBMCMainView(this);
+    RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
+    mMainView.setElevation(1);  // Always on Top
+    mVideoLayout.addView(mMainView, layoutParams);
+
+    mDecorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener()
     {
       @Override
       public void onSystemUiVisibilityChange(int visibility)
@@ -156,7 +168,7 @@
                 // Constants from API > 17
                 final int API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 0x00001000;
 
-                thisView.setSystemUiVisibility(
+                mDecorView.setSystemUiVisibility(
                         View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                                 | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                                 | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -184,7 +196,6 @@
   public void onStart()
   {
     super.onStart();
-    getWindow().setFormat(PixelFormat.TRANSPARENT);
 
     Choreographer.getInstance().removeFrameCallback(this);
     Choreographer.getInstance().postFrameCallback(this);
@@ -202,7 +213,7 @@
       // Constants from API > 17
       final int API_SYSTEM_UI_FLAG_IMMERSIVE_STICKY = 0x00001000;
 
-      thisView.setSystemUiVisibility(
+      mDecorView.setSystemUiVisibility(
               View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                       | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                       | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN

_service:download_files:master.tar.gz/tools/android/packaging/xbmc/src/XBMCMainView.java.in Added

@@ -0,0 +1,77 @@
+package @APP_PACKAGE@;
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.SurfaceView;
+import android.view.SurfaceHolder;
+
+/**
+ * Created by cbro on 5/13/17.
+ */
+
+public class XBMCMainView extends SurfaceView implements SurfaceHolder.Callback
+{
+  native void _attach();
+  native void _surfaceChanged(SurfaceHolder holder, int format, int width, int height);
+  native void _surfaceCreated(SurfaceHolder holder);
+  native void _surfaceDestroyed(SurfaceHolder holder);
+
+  private static final String TAG = "XBMCMainView";
+
+  public boolean mIsCreated = false;
+
+  public XBMCMainView(Context context)
+  {
+    super(context);
+    setZOrderOnTop(true);
+    getHolder().addCallback(this);
+    getHolder().setFormat(PixelFormat.TRANSLUCENT);
+
+    Log.d(TAG, "Created");
+}
+
+  public XBMCMainView(Context context, AttributeSet attrs, int defStyle)
+  {
+    super(context, attrs, defStyle);
+    setZOrderOnTop(true);
+    getHolder().addCallback(this);
+    getHolder().setFormat(PixelFormat.TRANSLUCENT);
+
+    Log.d(TAG, "Created");
+  }
+
+  public XBMCMainView(Context context, AttributeSet attrs)
+  {
+    this(context, attrs, 0);
+  }
+
+  @Override
+  public void surfaceCreated(SurfaceHolder holder)
+  {
+    Log.d(TAG, "Surface Created");
+    mIsCreated = true;
+    _attach();
+    _surfaceCreated(holder);
+  }
+
+  @Override
+  public void surfaceChanged(SurfaceHolder holder, int format, int width,
+                             int height)
+  {
+    if (holder != getHolder())
+      return;
+
+    Log.d(TAG, "Surface Changed, format:" + format + ", width:" + width + ", height:" + height);
+    _surfaceChanged(holder, format, width, height);
+  }
+
+  @Override
+  public void surfaceDestroyed(SurfaceHolder holder)
+  {
+    Log.d(TAG, "Surface Destroyed");
+    mIsCreated = false;
+    _surfaceDestroyed(holder);
+  }
+}

_service:download_files:master.tar.gz/tools/android/packaging/xbmc/src/XBMCVideoView.java.in Changed

_service:download_files:master.tar.gz/tools/buildsteps/android-arm64-v8a/configure-depends Changed

_service:download_files:master.tar.gz/tools/buildsteps/android/configure-depends Changed

_service:download_files:master.tar.gz/tools/buildsteps/androidx86/configure-depends Changed

_service:download_files:master.tar.gz/tools/buildsteps/defaultenv Changed

@@ -19,22 +19,21 @@
 #$XBMC_PLATFORM_DIR matches the platform subdirs!
 case $XBMC_PLATFORM_DIR in
   ios)
-    DEFAULT_SDK_VERSION=9.2
+    DEFAULT_SDK_VERSION=11.0
     DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
     DEFAULT_CONFIGURATION="Debug"
     DEFAULT_DARWIN_ARM_CPU="armv7"
-    DEFAULT_XCODE_APP="Xcode.app"
+    DEFAULT_XCODE_APP="Xcode9.0.app"
     ;;
 
   osx64)
-    DEFAULT_SDK_VERSION=10.10
+    DEFAULT_SDK_VERSION=10.13
     DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
     DEFAULT_CONFIGURATION="Debug"
-    DEFAULT_XCODE_APP="Xcode6.1.1.app"
+    DEFAULT_XCODE_APP="Xcode9.0.app"
     ;;
 
   android)
-    DEFAULT_SDK_VERSION="24"
     DEFAULT_NDK_VERSION="16"
     DEFAULT_NDK_API="21"
     DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
@@ -51,6 +50,10 @@
     DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends
     DEFAULT_CONFIGURATION="Debug"
   ;;
+
+  freebsd)
+    DEFAULT_CONFIGURATION="Debug"
+  ;;
 esac
 
 if [ "$SDK_VERSION" == "Default" ]

_service:download_files:master.tar.gz/tools/buildsteps/freebsd Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/configure-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/make-binary-addons Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/make-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/make-native-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/package Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/prepare-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/prepare-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/freebsd/run-tests Added

_service:download_files:master.tar.gz/tools/buildsteps/jenkins_docs/README.mac Changed

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/configure-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/make-binary-addons Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/make-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/make-native-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/package Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/prepare-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux-aml/prepare-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/configure-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/configure-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/make-binary-addons Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/make-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/make-native-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/make-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/package Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/prepare-depends Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/prepare-xbmc Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-gbm/run-tests Added

_service:download_files:master.tar.gz/tools/buildsteps/linux64-wayland/configure-depends Changed

_service:download_files:master.tar.gz/tools/buildsteps/windows/win32-uwp/make-addons.bat Changed

_service:download_files:master.tar.gz/tools/depends/.gitignore Changed

_service:download_files:master.tar.gz/tools/depends/Makefile.include.in Changed

_service:download_files:master.tar.gz/tools/depends/README Changed

@@ -25,10 +25,10 @@
 #----------------------------------------------------------------------------
 
   arm:
-    ./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/arm-linux-androideabi-4.8-vanilla/android-21 --prefix=/opt/xbmc-depends
+    ./configure --with-tarballs=/opt/xbmc-tarballs --host=arm-linux-androideabi --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/arm-linux-androideabi-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends
 
   x86:
-    ./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/x86-linux-4.8-vanilla/android-21 --prefix=/opt/xbmc-depends
+    ./configure --with-tarballs=/opt/xbmc-tarballs --host=i686-linux-android --with-sdk-path=/opt/android-sdk-linux --with-ndk-path=/opt/android-ndk-r16 --with-toolchain=/opt/x86-linux-4.9-vanilla/android-21 --prefix=/opt/xbmc-depends
 
 #- Linux
 #----------------------------------------------------------------------------

_service:download_files:master.tar.gz/tools/depends/configure.ac Changed

@@ -6,12 +6,6 @@
 target/config-binaddons.site target/Toolchain_binaddons.cmake])
 AC_CANONICAL_HOST
 
-# save flags before autotools checks the compiler, since
-# it will automatically include -g in c/cxxflags
-passed_cflags="$CFLAGS"
-passed_ldflags="$LDFLAGS"
-passed_cxxflags="$CXXFLAGS"
-
 m4_include([m4/xbmc_arch.m4])
 m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
 
@@ -48,7 +42,8 @@
 AC_ARG_WITH([platform],
 [AS_HELP_STRING([--with-platform],
 [target platform [auto]])],
- [use_platform=$withval])
+ [use_platform=$withval],
+ [use_platform=auto])
 
 AC_ARG_WITH([firmware],
 [AS_HELP_STRING([--with-firmware],
@@ -63,7 +58,8 @@
 AC_ARG_WITH([cpu],
 [AS_HELP_STRING([--with-cpu],
 [optional. specify target cpu. guessed if not specified])],
- [use_cpu=$withval],use_cpu=auto)
+ [use_cpu=$withval],
+ [use_cpu=auto])
 
 AC_ARG_WITH([ndk-path],
 [AS_HELP_STRING([--with-ndk-path],
@@ -77,13 +73,14 @@
 
 AC_ARG_WITH([sdk],
 [AS_HELP_STRING([--with-sdk],
- [specify sdk platform version (optional for android). default is android-24])],
+ [specify sdk platform version.])],
 [use_sdk=$withval])
 
 AC_ARG_WITH([ndk-api],
 [AS_HELP_STRING([--with-ndk-api],
- [spcify ndk level (optional for android). default is 21])],
- [use_ndk_api=$withval])
+ [specify ndk level (optional for android), default is 21.])],
+ [use_ndk_api=$withval],
+ [use_ndk_api=21])
 
 AC_ARG_ENABLE([gplv3],
 [AS_HELP_STRING([--enable-gplv3],
@@ -91,17 +88,34 @@
 [use_gplv3=$enableval],
 [use_gplv3=yes])
 
-AC_ARG_ENABLE([wayland],
- [AS_HELP_STRING([--enable-wayland],
- [build libraries needed for Wayland. default is no])],
- [enable_wayland=$enableval],
- [enable_wayland=no])
-
 AC_ARG_WITH([rendersystem],
 [AS_HELP_STRING([--with-rendersystem],
 [render system to use])],
 [app_rendersystem=$withval])
 
+AC_ARG_WITH([target-cflags],
+ [AS_HELP_STRING([--with-target-cflags],
+ [C compiler flags (target)])],
+ [target_cflags=$withval])
+
+AC_ARG_WITH([target-cxxflags],
+ [AS_HELP_STRING([--with-target-cxxflags],
+ [C++ compiler flags (target)])],
+ [target_cxxflags=$withval],
+ [target_cxxflags=$target_cflags])
+
+AC_ARG_WITH([target-ldflags],
+ [AS_HELP_STRING([--with-target-ldflags],
+ [linker flags. Use e.g. for -l<lib> (target)])],
+ [target_ldflags=$withval])
+
+AC_ARG_WITH([ffmpeg-options],
+ [AS_HELP_STRING([--with-ffmpeg-options],
+ [FFmpeg configure options, e.g. --enable-vaapi (target)])],
+ [ffmpeg_options=$withval],
+ [ffmpeg_options=default])
+
+
 OLD_PATH="${PATH}"
 if test -n "$use_toolchain"; then
 PATH="${use_toolchain}/bin:${use_toolchain}/usr/bin:$PATH"
@@ -177,107 +191,66 @@
 
 
 case $host in
- arm*-*linux-android*)
- if test "x$use_cpu" = "xauto"; then
- use_cpu="armeabi-v7a"
- fi
+ *-*linux-android*)
 platform_cc=clang
 platform_cxx=clang++
- use_sdk="${use_sdk:-android-24}"
- use_ndk_api="${use_ndk_api:-21}"
 deps_dir="$use_host-$use_ndk_api-$build_type"
 platform_cflags="-DANDROID -D__ANDROID_API__=$use_ndk_api -fexceptions -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fPIC -DPIC -D_GLIBCXX_USE_C99_MATH_TR1"
 optimize_flags="-Os"
- if test "x$use_cpu" = "xarmeabi-v7a"; then
- platform_cflags+=" -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon"
- fi
- platform_ldflags="-Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -Wl,--exclude-libs,libunwind.a -L$prefix/$deps_dir/lib/android-$use_ndk_api"
- platform_cxxflags="$platform_cflags -frtti"
- platform_includes="-I$prefix/$deps_dir/include/android-$use_ndk_api"
- platform_os="android"
- #android builds are always cross
- cross_compiling="yes"
- ;;
- aarch64*-*linux-android*)
- if test "x$use_cpu" = "xauto"; then
- use_cpu="arm64-v8a"
- fi
- platform_cc=clang
- platform_cxx=clang++
- use_sdk="${use_sdk:-android-24}"
- use_ndk_api="${use_ndk_api:-21}"
- deps_dir="$use_host-$use_ndk_api-$build_type"
- platform_cflags="-DANDROID -D__ANDROID_API__=$use_ndk_api -fexceptions -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fPIC -DPIC -D_GLIBCXX_USE_C99_MATH_TR1"
- optimize_flags="-Os"
- if test "x$use_cpu" = "xarm64-v8a"; then
- platform_cflags+=" -march=armv8-a -mtune=cortex-a53"
- fi
 platform_ldflags="-Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -L$prefix/$deps_dir/lib/android-$use_ndk_api"
+
+ case $host in
+ arm*-*linux-android*)
+ if test "x$use_cpu" = "xauto"; then
+ use_cpu="armeabi-v7a"
+ fi
+ if test "x$use_cpu" = "xarmeabi-v7a"; then
+ platform_cflags+=" -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon"
+ fi
+ platform_ldflags+=" -Wl,--exclude-libs,libunwind.a"
+ ;;
+ aarch64*-*linux-android*)
+ if test "x$use_cpu" = "xauto"; then
+ use_cpu="arm64-v8a"
+ fi
+ if test "x$use_cpu" = "xarm64-v8a"; then
+ platform_cflags+=" -march=armv8-a -mtune=cortex-a53"
+ fi
+ ;;
+ i*86*-linux-android*)
+ if test "x$use_cpu" = "xauto"; then
+ use_cpu=$host_cpu
+ fi
+ ;;
+ *)
+ AC_MSG_ERROR(unsupported host ($use_host))
+ esac
+
 platform_cxxflags="$platform_cflags -frtti"
 platform_includes="-I$prefix/$deps_dir/include/android-$use_ndk_api"
 platform_os="android"
 #android builds are always cross
 cross_compiling="yes"
 ;;
- i*86*-linux-android*)
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch*-*-linux-be*)
 if test "x$use_cpu" = "xauto"; then
 use_cpu=$host_cpu
 fi
- platform_cc=clang
- platform_cxx=clang++
- use_sdk="${use_sdk:-android-24}"
- use_ndk_api="${use_ndk_api:-21}"
- deps_dir="$use_host-$use_ndk_api-$build_type"
- platform_cflags="-DANDROID -D__ANDROID_API__=$use_ndk_api -fexceptions -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fPIC -DPIC -D_GLIBCXX_USE_C99_MATH_TR1"
- optimize_flags="-Os"
- platform_ldflags="-Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -L$prefix/$deps_dir/lib/android-$use_ndk_api"
- platform_cxxflags="$platform_cflags -frtti"
- platform_includes="-I$prefix/$deps_dir/include/android-$use_ndk_api"
- platform_os="android"
- #android builds are always cross
- cross_compiling="yes"
- ;;
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
- if test "$use_platform" = "auto"; then
- if test "x$use_cpu" = "xauto"; then
- use_cpu=$host_cpu
- fi
- use_toolchain="${use_toolchain:-/usr}"
- platform_cflags="-fPIC -DPIC"
- optimize_flags="-Os"
- platform_ldflags="-Wl,-rpath-link=$prefix/$deps_dir/lib"
- platform_cxxflags="$platform_cflags"
- platform_os="linux"
- fi
- ;;
- aarch64*-*-linux-gnu*|aarch*-*-linux-be*)
- if test "$use_platform" = "auto"; then
- if test "x$use_cpu" = "xauto"; then
- use_cpu=$host_cpu
- fi
- use_toolchain="${use_toolchain:-/usr}"
- platform_cflags="-fPIC -DPIC"
- optimize_flags="-Os"
- platform_ldflags="-Wl,-rpath-link=$prefix/$deps_dir/lib"
- platform_cxxflags="$platform_cflags"
- platform_os="linux"
- fi
- ;;
- *i686*-linux-gnu*|i*86*-*-linux-uclibc*)
- use_cpu=$host_cpu
 use_toolchain="${use_toolchain:-/usr}"
 platform_cflags="-fPIC -DPIC"
- optimize_flags="-O2"
+ optimize_flags="-Os"
+ platform_ldflags="-Wl,-rpath-link=$prefix/$deps_dir/lib"
 platform_cxxflags="$platform_cflags"
 platform_os="linux"
 ;;
- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*)
+ *i686*-linux-gnu*|i*86*-*-linux-uclibc*|x86_64*-linux-gnu*|x86_64-*-linux-uclibc*)
 use_cpu=$host_cpu
 use_toolchain="${use_toolchain:-/usr}"
 platform_cflags="-fPIC -DPIC"
 optimize_flags="-O2"
 platform_cxxflags="$platform_cflags"
 platform_os="linux"
+ ffmpeg_options_default="--enable-vaapi --enable-vdpau --cpu=$use_cpu"
 ;;
 *darwin*)
 if test "x$prefix" = "xNONE"; then
@@ -299,10 +272,6 @@
 platform_cxxflags="-no_compact_linkedit -no-cpp-precomp"
 
 case $use_xcode in
- 3.*.*)
- platform_cc=gcc-4.2
- platform_cxx=g++-4.2
- ;;
 4.* | 4.*.*)
 platform_cc=llvm-gcc-4.2
 platform_cxx=llvm-g++-4.2
@@ -342,9 +311,6 @@
 
 # now that we know which sdk, error check sdk_name
 case $use_sdk in
- 10.5);;
- 10.6);;
- 10.7);;
 10.8);;
 10.9);;
 10.10);;
@@ -385,8 +351,8 @@
 
 found_sdk_version=[`$use_xcodebuild -showsdks | grep $target_platform | sort | tail -n 1 | awk '{ print $2}'`]
 use_sdk="${use_sdk:-$found_sdk_version}"
-	 platform_cflags+=" -fembed-bitcode"
-	 platform_cxxflags+=" -fembed-bitcode"
+ platform_cflags+=" -fembed-bitcode"
+ platform_cxxflags+=" -fembed-bitcode"
 sdk_name=$target_platform$use_sdk
 platform_min_version="$target_platform-version-min=9.0"
 else
@@ -400,14 +366,9 @@
 found_sdk_version=[`$use_xcodebuild -showsdks | grep $target_platform | sort | tail -n 1 | awk '{ print $2}'`]
 use_sdk="${use_sdk:-$found_sdk_version}"
 sdk_name=$target_platform$use_sdk
- platform_min_version="$target_platform-version-min=6.0"
+ platform_min_version="$target_platform-version-min=9.0"
 fi
-	case $use_sdk in
- 4.*);;
- 5.*);;
- 6.*);;
- 7.*);;
- 8.*);;
+ case $use_sdk in
 9.*);;
 10.*);;
 11.*);;
@@ -416,15 +377,7 @@
 ;;
 esac
 
- # find the matching toolchain
- case $use_xcode in
- 3.*.* | 4.* | 4.*.*)
- use_toolchain="${use_toolchain:-`$use_xcodebuild -version -sdk $sdk_name PlatformPath`/Developer}"
- ;;
- *)
- use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain"
- ;;
- esac
+ use_toolchain="${use_xcodepath}/Toolchains/XcodeDefault.xctoolchain"
 
 platform_os="ios"
 
@@ -453,24 +406,37 @@
 esac
 
 case $use_platform in
+ aml|gbm|mir|wayland)
+ if test "$platform_os" != "linux"; then
+ AC_MSG_ERROR([$use_platform is only supported on the Linux platform])
+ fi
+ if test "$use_platform" = "aml"; then
+ if test "$host_cpu" != "arm" && test "$host_cpu" != "aarch64"; then
+ AC_MSG_ERROR([$use_platform is only supported for arm and aarch64 architecture])
+ fi
+ fi
+ target_platform=$use_platform
+ ;;
 raspberry-pi)
 target_platform=raspberry-pi
- use_neon=no
 use_cpu=arm1176jzf-s
+ ffmpeg_options_default="--cpu=arm1176jzf-s"
 platform_cflags="-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp"
 platform_cxxflags="-mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp"
- optimize_flags="-Os"
 platform_ldflags=""
 ;;
 raspberry-pi2)
 target_platform=raspberry-pi
- use_neon=yes
 use_cpu=cortex-a7
+ ffmpeg_options_default="--cpu=cortex-a7"
 platform_cflags="-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4"
 platform_cxxflags="-fPIC -mcpu=cortex-a7 -mfloat-abi=hard -mfpu=neon-vfpv4"
- optimize_flags="-Os"
 platform_ldflags="-lpthread"
 ;;
+ auto)
+ ;;
+ *)
+ AC_MSG_ERROR(unsupported platform ($use_platform))
 esac
 
 if test "$target_platform" = "raspberry-pi" ; then
@@ -482,7 +448,6 @@
 use_arch="arm"
 use_hardcoded_tables="yes"
 ARCH="arm"
- platform_os="linux"
 cross_compiling="yes"
 use_host="arm-linux-gnueabihf"
 deps_dir="$use_platform-$build_type"
@@ -539,7 +504,6 @@
 
 AC_SEARCH_LIBS([iconv_open],iconv, link_iconv=$ac_cv_search_iconv_open, link_iconv=-liconv; AC_MSG_WARN("No iconv support in toolchain. Will build libiconv."); need_libiconv=1)
 AC_TRY_LINK([#include <locale.h>],[struct lconv* test=localeconv();], has_localeconv=yes, AC_MSG_WARN("No localeconv support in toolchain. Using replacement."); has_localeconv=no)
-AC_CHECK_LIB([crystax], [main], has_libcrystax=1, has_libcrystax=0)
 
 if test "$link_iconv" = "none required"; then
 link_iconv=
@@ -557,12 +521,6 @@
 use_tarballs=$prefix/xbmc-tarballs
 fi
 
-if test "$platform_os" != "linux"; then
- if test "x$enable_wayland" != "xno"; then
- AC_MSG_ERROR([Wayland is only supported on the Linux platform])
- fi
-fi
-
 if test -n "$app_rendersystem"; then
 if test "$app_rendersystem" != "gl" && test "$app_rendersystem" != "gles"; then
 AC_MSG_ERROR(Rendersystem must be gl or gles)
@@ -658,19 +616,6 @@
 AC_MSG_ERROR(unable to create tarballs dir. verify that the path and permissions are correct.)
 fi
 
-if test "$platform_os" == "android"; then
- echo
-
- if [ ! `mkdir -p $prefix/$deps_dir/include/$use_sdk` ]; then
- AC_MSG_ERROR(unable to create $prefix/$deps_dir/include/$use_sdk. verify that the path and permissions are correct.)
- fi
-
- if [ ! `mkdir -p $prefix/$deps_dir/lib/$use_sdk` ]; then
- AC_MSG_ERROR(unable to create $prefix/$deps_dir/lib/$use_sdk. verify that the path and permissions are correct.)
- fi
-fi
-
-
 # remove unwanted optimization flags
 tmp_cflags=$(echo $c11_flags $platform_cflags | sed 's/-O@<:@123@:>@//g;s/-g //g;s/ \{2,\}//g')
 tmp_cxxflags=$(echo $cxx11_flags $platform_cxxflags | sed 's/-O@<:@123@:>@//g;s/-g //g;s/ \{2,\}//g')
@@ -689,11 +634,11 @@
 fi
 
 # add user supplied flags to the end, so they override our defaults
-platform_cflags_release="$tmp_cflags $relase_cflags $optimize_flags $passed_cflags"
-platform_cxxflags_release="$tmp_cxxflags $relase_cflags $optimize_flags $passed_cxxflags"
-platform_cflags_debug="$tmp_cflags $debug_cflags $passed_cflags"
-platform_cxxflags_debug="$tmp_cxxflags $debug_cflags $passed_cxxflags"
-platform_ldflags+=" $passed_ldflags $LIBS"
+platform_cflags_release="$tmp_cflags $relase_cflags $optimize_flags $target_cflags"
+platform_cxxflags_release="$tmp_cxxflags $relase_cflags $optimize_flags $target_cxxflags"
+platform_cflags_debug="$tmp_cflags $debug_cflags $target_cflags"
+platform_cxxflags_debug="$tmp_cxxflags $debug_cflags $target_cxxflags"
+platform_ldflags+=" $target_ldflags $LIBS"
 
 if test "$use_debug" = "yes"; then
 platform_cflags="$platform_cflags_debug"
@@ -703,11 +648,14 @@
 platform_cxxflags="$platform_cxxflags_release"
 fi
 
+if test "$ffmpeg_options" == "default"; then
+ ffmpeg_options="$ffmpeg_options_default"
+fi
+
 if test "$platform_os" == "android"; then
 echo -e
 AC_SUBST(use_sdk_path)
 AC_SUBST(use_ndk_path)
- AC_SUBST(use_sdk)
 AC_SUBST(use_ndk_api)
 AC_SUBST(build_tools_path)
 fi
@@ -737,22 +685,13 @@
 AC_SUBST(link_iconv)
 AC_SUBST(need_libiconv)
 AC_SUBST(use_gplv3)
-AC_SUBST(enable_wayland)
-AC_SUBST(has_libcrystax)
 AC_SUBST(use_xcode)
 AC_SUBST(use_ccache)
 AC_SUBST(native_platform_min_version)
 AC_SUBST(app_rendersystem)
+AC_SUBST(ffmpeg_options)
 
 AC_OUTPUT
-echo -e "ccache:\t $use_ccache"
-echo -e "toolchain:\t $use_toolchain"
-echo -e "cpu:\t\t $use_cpu"
-echo -e "host:\t\t $use_host"
-if test "$platform_os" == "android"; then
- echo -e "sdk-platform:\t $use_sdk"
- echo -e "build-tools:\t $build_tools_path"
-fi
 
 if test "$platform_os" == "ios"; then
 if test "$use_platform" = "tvos"; then
@@ -776,6 +715,7 @@
 
 
 echo -e "\n\n#------- configuration -------#"
+echo -e "ccache:\t\t $use_ccache"
 echo -e "build type:\t $build_type"
 echo -e "toolchain:\t $use_toolchain"
 echo -e "cpu:\t\t $use_cpu"
@@ -783,10 +723,11 @@
 echo -e "cflags:\t\t $platform_cflags"
 echo -e "cxxflags:\t $platform_cxxflags"
 echo -e "ldflags:\t $platform_ldflags"
-echo -e "prefix:\t\t $prefix"
+echo -e "ffmpeg options:\t $ffmpeg_options"
+echo -e "prefix:\t\t $prefix"
 echo -e "depends:\t $prefix/$deps_dir"
 if test "$platform_os" == "android"; then
- echo -e "sdk-platform:\t $use_sdk"
+ echo -e "ndk-api-level:\t $use_ndk_api"
 echo -e "build-tools:\t $build_tools_path"
 fi

_service:download_files:master.tar.gz/tools/depends/native/JsonSchemaBuilder/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/SimpleFS.h Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/TexturePacker.cpp Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/XBTFWriter.cpp Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/XBTFWriter.h Changed

_service:download_files:master.tar.gz/tools/depends/native/TexturePacker/src/cmdlineargs.h Changed

_service:download_files:master.tar.gz/tools/depends/native/autoconf-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/automake-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/cmake-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/distribute-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/distutilscross-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/dpkg-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/expat-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/fakeroot-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/gettext-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/giflib-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/ldid-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/libjpeg-turbo-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/liblzo2-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/libpng-native/Makefile Changed

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

_service:download_files:master.tar.gz/tools/depends/native/m4-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/pcre-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/pkg-config-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/python27-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/swig-native/Makefile Changed

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

_service:download_files:master.tar.gz/tools/depends/native/wayland-scanner-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/waylandpp-scanner-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/xz-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/yasm-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/native/zlib-native/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/pre-depends/autoconf-pre-depends/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/pre-depends/m4-pre-depends/Makefile Changed

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

_service:download_files:master.tar.gz/tools/depends/target/Toolchain.cmake.in Changed

_service:download_files:master.tar.gz/tools/depends/target/Toolchain_binaddons.cmake.in Changed

_service:download_files:master.tar.gz/tools/depends/target/alsa-lib/Makefile Changed

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/config-binaddons.site.in Changed

_service:download_files:master.tar.gz/tools/depends/target/config.site.in Changed

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

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

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

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

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

@@ -4,13 +4,28 @@
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
-set(ffmpeg_conf "")
+# ENABLE_CCACHE can have the following values ON|OFF|AUTO
+# During initial kodi project generation the forwarded ENABLE_CCACHE is empty, if ENABLE_CCACHE wasn't explicitly set.
+# This happens as FindFFmpeg is called before core_optional_dep(CCache) which sets ENABLE_CCACHE to AUTO in that case.
+# Therefore treat empty ENABLE_CCACHE like ON and AUTO.
+if(ENABLE_CCACHE STREQUAL "" OR ENABLE_CCACHE)
+  find_program(CCACHE_PROGRAM ccache)
+  if(CCACHE_PROGRAM)
+    set(USE_CCACHE ON)
+  endif()
+endif()
+
+if(USE_CCACHE)
+  set(ffmpeg_conf "--cc=${CCACHE_PROGRAM} ${CMAKE_C_COMPILER}" "--cxx=${CCACHE_PROGRAM} ${CMAKE_CXX_COMPILER}")
+else()
+  set(ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER})
+endif()
 
 if(CROSSCOMPILING)
   set(pkgconf "PKG_CONFIG_LIBDIR=${DEPENDS_PATH}/lib/pkgconfig")
   list(APPEND ffmpeg_conf --pkg-config=${PKG_CONFIG_EXECUTABLE} --pkg-config-flags=--static)
   list(APPEND ffmpeg_conf --enable-cross-compile --cpu=${CPU} --arch=${CPU} --target-os=${OS})
-  list(APPEND ffmpeg_conf --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER} --ar=${CMAKE_AR})
+  list(APPEND ffmpeg_conf --ar=${CMAKE_AR} --strip=${CMAKE_STRIP})
   message(STATUS "CROSS: ${ffmpeg_conf}")
 endif()

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

@@ -8,7 +8,7 @@
 
 # configuration settings
 ffmpg_config = --prefix=$(PREFIX) --extra-version="kodi-$(VERSION)"
-ffmpg_config += --cc="$(CC)" --cxx="$(CXX)" --ar=$(AR) --ranlib=$(RANLIB)
+ffmpg_config += --cc="$(CC)" --cxx="$(CXX)" --ar=$(AR) --ranlib=$(RANLIB) --strip=$(STRIP)
 ffmpg_config += --disable-devices --disable-doc
 ffmpg_config += --disable-ffplay --disable-ffmpeg
 ffmpg_config += --disable-ffprobe --disable-ffserver
@@ -20,15 +20,13 @@
 ffmpg_config += --enable-encoder=wmav2 --enable-protocol=http
 ffmpg_config += --enable-gnutls
 ffmpg_config += --enable-encoder=png --enable-encoder=mjpeg
+ffmpg_config += $(FFMPEG_CONFIGURE_OPTIONS)
 
 ifeq ($(CROSS_COMPILING), yes)
   ffmpg_config += --arch=$(CPU) --enable-cross-compile
 endif
 ifeq ($(OS), linux)
-  ffmpg_config += --target-os=$(OS) --cpu=$(CPU)
-  ifneq ($(TARGET_PLATFORM),raspberry-pi)
-    ffmpg_config += --enable-vdpau --enable-vaapi
-  endif
+  ffmpg_config += --target-os=$(OS)
   ffmpg_config += --enable-pic
 endif
 ifeq ($(OS), android)
@@ -68,9 +66,6 @@
   ffmpg_config += --disable-debug
 endif
 
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
 all: .installed-$(PLATFORM)
 
 $(TARBALLS_LOCATION)/$(ARCHIVE):
@@ -87,10 +82,11 @@
 	cd $(PLATFORM); sed -i -- 's/HAVE_CLOCK_GETTIME 1/HAVE_CLOCK_GETTIME 0/g' config.h
 endif
 
-build: $(PLATFORM)
+.build-$(PLATFORM): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM)
+	touch $@
 
-.installed-$(PLATFORM): build
+.installed-$(PLATFORM): .build-$(PLATFORM)
 	$(MAKE) -C $(PLATFORM) install
 	touch $@

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

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

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/gnutls/02-darwin-getentropy.patch Added

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

_service:download_files:master.tar.gz/tools/depends/target/libamcodec Added

_service:download_files:master.tar.gz/tools/depends/target/libamcodec/01-flags.patch Added

_service:download_files:master.tar.gz/tools/depends/target/libamcodec/02-no-amadec.patch Added

_service:download_files:master.tar.gz/tools/depends/target/libamcodec/Makefile Added

@@ -0,0 +1,38 @@
+include ../../Makefile.include
+DEPS= ../../Makefile.include Makefile 01-flags.patch 02-no-amadec.patch
+
+# lib name, version
+LIBNAME=libamcodec
+VERSION=20170630
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared
+
+LIBDYLIB=$(PLATFORM)/amcodec/libamcodec.so.0.0
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); patch -p1 -i ../01-flags.patch
+	cd $(PLATFORM); patch -p1 -i ../02-no-amadec.patch
+
+$(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/amcodec CC="$(CC)" EXT_CFLAGS="$(CFLAGS)" LD="$(LD)" EXT_LDFLAGS="$(LDFLAGS)"
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+	$(MAKE) -C $(PLATFORM)/amcodec install CC="$(CC)" LD="$(LD)" PREFIX="$(PREFIX)" HEADERS_DIR="$(PREFIX)/include/amcodec"
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+	rm -f .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/libcdio-gplv3/Makefile Changed

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

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

_service:download_files:master.tar.gz/tools/depends/target/libdvdcss/DVDCSS-VERSION Changed

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

_service:download_files:master.tar.gz/tools/depends/target/libdvdnav/DVDNAV-VERSION Changed

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

_service:download_files:master.tar.gz/tools/depends/target/libdvdread/DVDREAD-VERSION Changed

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/libgpg-error/Makefile Changed

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

_service:download_files:master.tar.gz/tools/depends/target/libjpeg-turbo/Makefile Changed

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

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

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

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

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

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

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

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/mariadb Added

_service:download_files:master.tar.gz/tools/depends/target/mariadb/01-android.patch Added

@@ -0,0 +1,60 @@
+--- a/cmake/CheckIncludeFiles.cmake
++++ b/cmake/CheckIncludeFiles.cmake
+@@ -74,3 +74,12 @@
+ CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
+ CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
+ CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H)
++IF(HAVE_UCONTEXT_H)
++  CHECK_FUNCTION_EXISTS (getcontext HAVE_GETCONTEXT)
++  CHECK_FUNCTION_EXISTS (makecontext HAVE_MAKECONTEXT)
++  CHECK_FUNCTION_EXISTS (setcontext HAVE_SETCONTEXT)
++  CHECK_FUNCTION_EXISTS (swapcontext HAVE_SWAPCONTEXT)
++  IF(NOT HAVE_GETCONTEXT OR NOT HAVE_MAKECONTEXT OR NOT HAVE_SETCONTEXT OR NOT HAVE_SWAPCONTEXT)
++    SET(HAVE_UCONTEXT_H 0 CACHE INTERNAL "")
++  ENDIF()
++ENDIF(HAVE_UCONTEXT_H)
+--- a/cmake/CheckTypes.cmake
++++ b/cmake/CheckTypes.cmake
+@@ -25,6 +25,7 @@
+ CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
+ CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)
+ CHECK_TYPE_SIZE(uint SIZEOF_UINT)
++CHECK_TYPE_SIZE(ushort SIZEOF_USHORT)
+ CHECK_TYPE_SIZE(ulong SIZEOF_ULONG)
+ CHECK_TYPE_SIZE(int8 SIZEOF_INT8)
+ CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8)
+--- a/include/ma_config.h.in
++++ b/include/ma_config.h.in
+@@ -217,6 +217,11 @@
+ # define HAVE_UINT 1
+ #endif
+ 
++#cmakedefine SIZEOF_USHORT @SIZEOF_USHORT@
++#if SIZEOF_USHORT
++# define HAVE_USHORT 1
++#endif
++
+ #cmakedefine SIZEOF_ULONG @SIZEOF_ULONG@
+ #if SIZEOF_ULONG
+ # define HAVE_ULONG 1
+--- a/include/ma_global.h
++++ b/include/ma_global.h
+@@ -272,6 +272,8 @@
+ 
+ #if defined(__EMX__) || !defined(HAVE_UINT)
+ typedef unsigned int uint;
++#endif
++#if defined(__EMX__) || !defined(HAVE_USHORT)
+ typedef unsigned short ushort;
+ #endif
+ 
+--- a/libmariadb/CMakeLists.txt
++++ b/libmariadb/CMakeLists.txt
+@@ -291,7 +291,6 @@ ELSE()
+   IF(ICONV_INCLUDE_DIR)
+      INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
+   ENDIF()
+-  ADD_DEFINITIONS(-DLIBICONV_PLUG)
+ ENDIF()
+ 
+ IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)

_service:download_files:master.tar.gz/tools/depends/target/mariadb/Makefile Added

@@ -0,0 +1,35 @@
+include ../../Makefile.include
+DEPS= ../../Makefile.include Makefile 01-android.patch
+
+LIBNAME=mariadb
+VERSION=3.0.3
+ARCHIVE=$(LIBNAME)-connector-c-$(VERSION)-src.tar.gz
+
+LIBDYLIB=$(PLATFORM)/build/lib$(LIBNAME)/lib$(LIBNAME)client.a
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)/build
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); patch -p1 -i ../01-android.patch
+	sed -ie 's| "DYNAMIC" | "STATIC" |' $(PLATFORM)/cmake/plugins.cmake
+	cd $(PLATFORM)/build; $(CMAKE) -DAUTH_GSSAPI=OFF -DWITH_UNITTEST:BOOL=OFF -DWITH_EXTERNAL_ZLIB:BOOL=ON -DWITH_CURL:BOOL=OFF ..
+
+$(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/build
+
+.installed-$(PLATFORM): $(LIBDYLIB)
+	$(MAKE) -C $(PLATFORM)/build install
+	rm -f $(PREFIX)/lib/mariadb/*.so $(PREFIX)/lib/mariadb/*.dylib
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM) clean
+	rm -f .installed-$(PLATFORM)
+
+distclean::
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)

_service:download_files:master.tar.gz/tools/depends/target/mysql Deleted

_service:download_files:master.tar.gz/tools/depends/target/mysql/01-mysqlclient-cross-compile.patch Deleted

@@ -1,170 +0,0 @@
-diff -ruN mysql-5.1.55.org/configure.in mysql-5.1.55/configure.in
---- mysql-5.1.55.org/configure.in	2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/configure.in	2011-05-19 20:14:38.000000000 +0200
-@@ -1571,13 +1571,6 @@
- esac
- 
- 
--# System characteristics
--case $SYSTEM_TYPE in
-- *netware*) ;;
-- *)
--AC_SYS_RESTARTABLE_SYSCALLS
-- ;;
--esac
- 
- # Build optimized or debug version ?
- # First check for gcc and g++
-diff -ruN mysql-5.1.55.org/storage/innodb_plugin/plug.in mysql-5.1.55/storage/innodb_plugin/plug.in
---- mysql-5.1.55.org/storage/innodb_plugin/plug.in	2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/storage/innodb_plugin/plug.in	2011-05-19 21:59:28.000000000 +0200
-@@ -56,149 +56,6 @@
- esac
- AC_SUBST(INNODB_DYNAMIC_CFLAGS)
- 
-- AC_MSG_CHECKING(whether GCC atomic builtins are available)
-- # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
-- AC_TRY_RUN(
-- [
-- int main()
-- {
--	long	x;
--	long	y;
--	long	res;
--	char	c;
--
--	x = 10;
--	y = 123;
--	res = __sync_bool_compare_and_swap(&x, x, y);
--	if (!res || x != y) {
-- return(1);
-- }
--
--	x = 10;
--	y = 123;
--	res = __sync_bool_compare_and_swap(&x, x + 1, y);
--	if (res || x != 10) {
-- return(1);
-- }
--
--	x = 10;
--	y = 123;
--	res = __sync_add_and_fetch(&x, y);
--	if (res != 123 + 10 || x != 123 + 10) {
--	 return(1);
--	}
--
--	c = 10;
--	res = __sync_lock_test_and_set(&c, 123);
--	if (res != 10 || c != 123) {
--	 return(1);
--	}
--
--	return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
-- [GCC atomic builtins are available])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
--
-- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
-- # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
-- AC_TRY_RUN(
-- [
-- #include <pthread.h>
-- #include <string.h>
--
-- int main(int argc, char** argv) {
-- pthread_t x1;
-- pthread_t x2;
-- pthread_t x3;
--
--	memset(&x1, 0x0, sizeof(x1));
--	memset(&x2, 0x0, sizeof(x2));
--	memset(&x3, 0x0, sizeof(x3));
--
-- __sync_bool_compare_and_swap(&x1, x2, x3);
--
-- return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
-- [pthread_t can be used by GCC atomic builtins])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
--
-- AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
-- # Define HAVE_IB_SOLARIS_ATOMICS if _all_ of the following
-- # functions are present.
-- AC_CHECK_FUNCS(atomic_add_long_nv \
--		 atomic_cas_32 \
--		 atomic_cas_64 \
--		 atomic_cas_ulong \
--		 atomic_swap_uchar)
--
-- if test "${ac_cv_func_atomic_add_long_nv}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_32}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_64}" = "yes" -a \
-- "${ac_cv_func_atomic_cas_ulong}" = "yes" -a \
-- "${ac_cv_func_atomic_swap_uchar}" = "yes" ; then
--
-- AC_DEFINE([HAVE_IB_SOLARIS_ATOMICS], [1],
-- [Define to 1 if Solaris libc atomic functions are available]
-- )
-- fi
--
-- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
-- # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
-- AC_TRY_RUN(
-- [
-- #include <pthread.h>
-- #include <string.h>
--
-- int main(int argc, char** argv) {
-- pthread_t x1;
-- pthread_t x2;
-- pthread_t x3;
--
-- memset(&x1, 0x0, sizeof(x1));
-- memset(&x2, 0x0, sizeof(x2));
-- memset(&x3, 0x0, sizeof(x3));
--
-- if (sizeof(pthread_t) == 4) {
-- 
-- atomic_cas_32(&x1, x2, x3);
-- 
-- } else if (sizeof(pthread_t) == 8) {
-- 
-- atomic_cas_64(&x1, x2, x3);
-- 
-- } else {
-- 
-- return(1);
-- }
--
--	return(0);
-- }
-- ],
-- [
-- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1],
-- [pthread_t can be used by solaris atomics])
-- AC_MSG_RESULT(yes)
-- ],
-- [
-- AC_MSG_RESULT(no)
-- ]
-- )
- 
- # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
- # to use in the source

_service:download_files:master.tar.gz/tools/depends/target/mysql/02-mysqlclient-ios.patch Deleted

@@ -1,27 +0,0 @@
-diff -ruN mysql-5.1.55.org/include/my_global.h mysql-5.1.55/include/my_global.h
---- mysql-5.1.55.org/include/my_global.h	2011-01-25 16:04:37.000000000 +0100
-+++ mysql-5.1.55/include/my_global.h	2011-05-19 22:12:13.000000000 +0200
-@@ -132,7 +132,7 @@
- # define SIZEOF_INT 4
- # define SIZEOF_LONG_LONG 8
- # define SIZEOF_OFF_T 8
--# if defined(__i386__) || defined(__ppc__)
-+# if defined(__i386__) || defined(__ppc__) || defined(__arm__)
- # define SIZEOF_CHARP 4
- # define SIZEOF_LONG 4
- # elif defined(__x86_64__) || defined(__ppc64__)
-diff -ruN mysql-5.1.55.org/include/my_net.h mysql-5.1.55/include/my_net.h
---- mysql-5.1.55.org/include/my_net.h	2011-01-25 16:04:48.000000000 +0100
-+++ mysql-5.1.55/include/my_net.h	2011-05-19 22:13:39.000000000 +0200
-@@ -44,9 +44,9 @@
- #endif
- 
- #if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__)
--#include <netinet/in_systm.h>
-+/* #include <netinet/in_systm.h> */
- #include <netinet/in.h>
--#include <netinet/ip.h>
-+/* #include <netinet/ip.h> */
- #if !defined(alpha_linux_port)
- #include <netinet/tcp.h>
- #endif

_service:download_files:master.tar.gz/tools/depends/target/mysql/03-mysqlclient-android.patch Deleted

@@ -1,48 +0,0 @@
-diff -ru mysql-5.1.55.org/include/my_dir.h mysql-5.1.55/include/my_dir.h
---- mysql-5.1.55.org/include/my_dir.h	2011-01-25 16:04:48.000000000 +0100
-+++ mysql-5.1.55/include/my_dir.h	2011-11-15 20:15:46.000000000 +0100
-@@ -35,9 +35,15 @@
- #define MY_S_ISUID	S_ISUID /* set user id on execution */
- #define MY_S_ISGID	S_ISGID /* set group id on execution */
- #define MY_S_ISVTX	S_ISVTX /* save swapped text even after use */
-+#if defined(__ANDROID__)
-+#define MY_S_IREAD S_IRUSR /* read permission, owner */
-+#define MY_S_IWRITE S_IWUSR /* write permission, owner */
-+#define MY_S_IEXEC S_IEXEC /* execute/search permission, owner */
-+#else
- #define MY_S_IREAD	S_IREAD /* read permission, owner */
- #define MY_S_IWRITE	S_IWRITE	/* write permission, owner */
- #define MY_S_IEXEC	S_IEXEC /* execute/search permission, owner */
-+#endif
- 
- #define MY_S_ISDIR(m)	(((m) & MY_S_IFMT) == MY_S_IFDIR)
- #define MY_S_ISCHR(m)	(((m) & MY_S_IFMT) == MY_S_IFCHR)
-diff -ru mysql-5.1.55.org/include/my_global.h mysql-5.1.55/include/my_global.h
---- mysql-5.1.55.org/include/my_global.h	2011-11-15 20:14:37.000000000 +0100
-+++ mysql-5.1.55/include/my_global.h	2011-11-15 20:15:13.000000000 +0100
-@@ -979,6 +979,10 @@
- typedef unsigned char	uchar;	/* Short for unsigned char */
- #endif
- 
-+#ifndef HAVE_USHORT
-+typedef unsigned short ushort;
-+#endif
-+
- #ifndef HAVE_INT8
- typedef signed char int8; /* Signed integer >= 8 bits */
- #endif
-diff -ru mysql-5.1.55.org/mysys/my_gethwaddr.c mysql-5.1.55/mysys/my_gethwaddr.c
---- mysql-5.1.55.org/mysys/my_gethwaddr.c	2011-01-25 16:04:35.000000000 +0100
-+++ mysql-5.1.55/mysys/my_gethwaddr.c	2011-11-15 20:19:11.000000000 +0100
-@@ -66,7 +66,11 @@
- 
- #include <net/if.h>
- #include <sys/ioctl.h>
-+#ifdef __ANDROID__
-+#include <net/if_ether.h>
-+#else
- #include <net/ethernet.h>
-+#endif
- 
- my_bool my_gethwaddr(uchar *to)
- {

_service:download_files:master.tar.gz/tools/depends/target/mysql/04-strnlen.patch Deleted

@@ -1,43 +0,0 @@
---- strings/strnlen.c	2011-01-25 10:04:52.000000000 -0500
-+++ strings/strnlen.c	2013-01-20 22:37:24.000000000 -0500
-@@ -23,12 +23,15 @@
- #include <my_global.h>
- #include "m_string.h"
- 
--#ifndef HAVE_STRNLEN
- 
--size_t strnlen(register const char *s, register size_t maxlen)
-+size_t strnlen_int(register const char *s, register size_t maxlen)
- {
-+#ifndef HAVE_STRNLEN
- const char *end= (const char *)memchr(s, '\0', maxlen);
- return end ? (size_t) (end - s) : maxlen;
-+#else
-+ return strnlen(s,maxlen);
-+#endif
-+
- }
- 
--#endif
---- include/m_string.h	2011-01-25 10:04:38.000000000 -0500
-+++ include/m_string.h	2013-01-20 22:35:23.000000000 -0500
-@@ -160,7 +160,7 @@
- #endif
- #endif
- #ifndef HAVE_STRNLEN
--extern size_t strnlen(const char *s, size_t n);
-+extern size_t strnlen_int(const char *s, size_t n);
- #endif
- 
- #if !defined(__cplusplus)
---- strings/my_vsnprintf.c	2011-01-25 10:04:48.000000000 -0500
-+++ strings/my_vsnprintf.c	2013-01-20 22:34:21.000000000 -0500
-@@ -97,7 +97,7 @@
- reg2 char	*par = va_arg(ap, char *);
- size_t plen,left_len = (size_t) (end - to) + 1;
- if (!par) par = (char*)"(null)";
-- plen= (uint) strnlen(par, width);
-+ plen= (uint) strnlen_int(par, width);
- if (left_len <= plen)
- 	plen = left_len - 1;
- to=strnmov(to,par,plen);

_service:download_files:master.tar.gz/tools/depends/target/mysql/05-mysqlclient-ios64.patch Deleted

_service:download_files:master.tar.gz/tools/depends/target/mysql/06-fixsslcheck.patch Deleted

_service:download_files:master.tar.gz/tools/depends/target/mysql/07-no-endpwent.patch Deleted

_service:download_files:master.tar.gz/tools/depends/target/mysql/Makefile Deleted

@@ -1,57 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include 01-mysqlclient-cross-compile.patch 02-mysqlclient-ios.patch 03-mysqlclient-android.patch 04-strnlen.patch 05-mysqlclient-ios64.patch Makefile
-
-# lib name, version
-LIBNAME=mysql
-VERSION=5.1.55
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX) --build=$(BUILD) \
-	--enable-thread-safe-client --with-extra-charsets=complex \
-	--with-named-thread-libs=-lc --with-named-curses-libs=-lncurses \
-	--with-libedit \
-	--without-server --without-bench --without-docs --without-man --disable-shared \
-	--with-ssl=$(PREFIX) LIBS="-ldl -lz"
-
-LIBDYLIB=$(PLATFORM)/lib$(LIBNAME)/.libs/lib$(LIBNAME)client.a
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -Np1 -i ../01-mysqlclient-cross-compile.patch
-	cd $(PLATFORM); patch -Np1 -i ../02-mysqlclient-ios.patch
-	cd $(PLATFORM); patch -Np1 -i ../03-mysqlclient-android.patch
-	cd $(PLATFORM); patch -p0 < ../04-strnlen.patch
-	cd $(PLATFORM); patch -p1 < ../05-mysqlclient-ios64.patch
-	cd $(PLATFORM); patch -p0 < ../06-fixsslcheck.patch
-	cd $(PLATFORM); patch -p0 < ../07-no-endpwent.patch
-	cd $(PLATFORM); $(AUTORECONF) -vif
-	cd $(PLATFORM); $(CONFIGURE)
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)/include
-	$(MAKE) -C $(PLATFORM)/libmysql
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM)/libmysql install
-	$(MAKE) -C $(PLATFORM)/scripts/ install-binSCRIPTS
-	$(MAKE) -C $(PLATFORM)/include/ install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM) clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
-

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

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

_service:download_files:master.tar.gz/tools/depends/target/p8-platform/Makefile Changed

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/pythonmodule-pycryptodome/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/pythonmodule-setuptools/Makefile Changed

_service:download_files:master.tar.gz/tools/depends/target/samba-gplv3/Makefile Changed

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

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

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

_service:download_files:master.tar.gz/tools/depends/target/wayland-protocols/Makefile Changed

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

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

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

_service:download_files:master.tar.gz/tools/windows/packaging/uwp/package.appxmanifest.in Changed

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Package 
 	xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
 	xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" 
 	xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
-	IgnorableNamespaces="uap mp">
+	xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" 
+	IgnorableNamespaces="mp uap uap3">
 
 <Identity Name="@APP_PACKAGE_IDENTITY@" ProcessorArchitecture="@SDK_TARGET_ARCH@" Publisher="CN=@APP_PACKAGE_PUBLISHER@" Version="@APP_VERSION_CODE@.0" />
 <mp:PhoneIdentity PhoneProductId="0175E9D8-B885-4F34-BE46-F3BA2C70C00C" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
@@ -234,5 +235,6 @@
 <uap:Capability Name="removableStorage" />
 <uap:Capability Name="userAccountInformation" />
 <uap:Capability Name="videosLibrary" />
+ <uap3:Capability Name="backgroundMediaPlayback" />
 </Capabilities>
 </Package>
\ No newline at end of file

_service:download_files:master.tar.gz/xbmc/AppParamParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/AppParamParser.h Changed

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

@@ -196,7 +196,7 @@
 #endif
 
 #ifdef TARGET_WINDOWS
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #endif
 
 #if defined(HAS_LIBAMCODEC)
@@ -322,9 +322,6 @@
 case XBMC_USEREVENT:
 CApplicationMessenger::GetInstance().PostMsg(static_cast<uint32_t>(newEvent.user.code));
 break;
- case XBMC_APPCOMMAND:
- g_application.OnAppCommand(newEvent.appcommand.action);
- break;
 case XBMC_SETFOCUS:
 // Reset the screensaver
 g_application.ResetScreenSaver();
@@ -461,7 +458,10 @@
 // Init our DllLoaders emu env
 init_emu_environ();
 
- CProfilesManager::GetInstance().Load();
+ if (!m_ServiceManager->InitStageOnePointFive())
+ return false;
+
+ CSpecialProtocol::RegisterProfileManager(m_ServiceManager->GetProfileManager());
 
 CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
 CLog::Log(LOGNOTICE, "Starting %s (%s). Platform: %s %s %d-bit", CSysInfo::GetAppName().c_str(), CSysInfo::GetVersion().c_str(),
@@ -580,12 +580,12 @@
 m_ServiceManager->GetSettings().SetLoaded();
 
 CLog::Log(LOGINFO, "creating subdirectories");
- CLog::Log(LOGINFO, "userdata folder: %s", CURL::GetRedacted(CProfilesManager::GetInstance().GetProfileUserDataFolder()).c_str());
+ CLog::Log(LOGINFO, "userdata folder: %s", CURL::GetRedacted(m_ServiceManager->GetProfileManager().GetProfileUserDataFolder()).c_str());
 CLog::Log(LOGINFO, "recording folder: %s", CURL::GetRedacted(m_ServiceManager->GetSettings().GetString(CSettings::SETTING_AUDIOCDS_RECORDINGPATH)).c_str());
 CLog::Log(LOGINFO, "screenshots folder: %s", CURL::GetRedacted(m_ServiceManager->GetSettings().GetString(CSettings::SETTING_DEBUG_SCREENSHOTPATH)).c_str());
- CDirectory::Create(CProfilesManager::GetInstance().GetUserDataFolder());
- CDirectory::Create(CProfilesManager::GetInstance().GetProfileUserDataFolder());
- CProfilesManager::GetInstance().CreateProfileFolders();
+ CDirectory::Create(m_ServiceManager->GetProfileManager().GetUserDataFolder());
+ CDirectory::Create(m_ServiceManager->GetProfileManager().GetProfileUserDataFolder());
+ m_ServiceManager->GetProfileManager().CreateProfileFolders();
 
 update_emu_environ();//apply the GUI settings
 
@@ -594,9 +594,6 @@
 CWIN32Util::SetThreadLocalLocale(true); // enable independent locale for each thread, see https://connect.microsoft.com/VisualStudio/feedback/details/794122
 #endif // TARGET_WINDOWS
 
- // initialize the addon database (must be before the addon manager is init'd)
- CDatabaseManager::GetInstance().Initialize(true);
-
 if (!m_ServiceManager->InitStageTwo(params))
 {
 return false;
@@ -1037,37 +1034,29 @@
 if (!LoadLanguage(false))
 return false;
 
- CEventLog::GetInstance().Add(EventPtr(new CNotificationEvent(
+ m_ServiceManager->GetEventLog().Add(EventPtr(new CNotificationEvent(
 StringUtils::Format(g_localizeStrings.Get(177).c_str(), g_sysinfo.GetAppName().c_str()),
 StringUtils::Format(g_localizeStrings.Get(178).c_str(), g_sysinfo.GetAppName().c_str()),
 "special://xbmc/media/icon256x256.png", EventLevel::Basic)));
 
 m_ServiceManager->GetNetwork().WaitForNet();
 
- // Load curl so curl_global_init gets called before any service threads
- // are started. Unloading will have no effect as curl is never fully unloaded.
- // To quote man curl_global_init:
- // "This function is not thread safe. You must not call it when any other
- // thread in the program (i.e. a thread sharing the same memory) is running.
- // This doesn't just mean no other thread that is using libcurl. Because
- // curl_global_init() calls functions of other libraries that are similarly
- // thread unsafe, it could conflict with any other thread that
- // uses these other libraries."
- g_curlInterface.Load();
- g_curlInterface.Unload();
-
 // initialize (and update as needed) our databases
+ CDatabaseManager &databaseManager = m_ServiceManager->GetDatabaseManager();
+
 CEvent event(true);
- CJobManager::GetInstance().Submit([&event]() {
- CDatabaseManager::GetInstance().Initialize();
+ CJobManager::GetInstance().Submit([&databaseManager, &event]() {
+ databaseManager.Initialize();
 event.Set();
 });
+
 std::string localizedStr = g_localizeStrings.Get(24150);
 int iDots = 1;
 while (!event.WaitMSec(1000))
 {
- if (CDatabaseManager::GetInstance().m_bIsUpgrading)
+ if (databaseManager.IsUpgrading())
 CServiceBroker::GetRenderSystem().ShowSplash(std::string(iDots, ' ') + localizedStr + std::string(iDots, '.'));
+
 if (iDots == 3)
 iDots = 1;
 else
@@ -1129,14 +1118,14 @@
 g_windowManager.ActivateWindow(WINDOW_SPLASH);
 
 if (m_ServiceManager->GetSettings().GetBool(CSettings::SETTING_MASTERLOCK_STARTUPLOCK) &&
- CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
- !CProfilesManager::GetInstance().GetMasterProfile().getLockCode().empty())
+ m_ServiceManager->GetProfileManager().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
+ !m_ServiceManager->GetProfileManager().GetMasterProfile().getLockCode().empty())
 {
 g_passwordManager.CheckStartUpLock();
 }
 
 // check if we should use the login screen
- if (CProfilesManager::GetInstance().UsingLoginScreen())
+ if (m_ServiceManager->GetProfileManager().UsingLoginScreen())
 {
 // the login screen still needs to perform additional initialization
 uiInitializationFinished = false;
@@ -1152,7 +1141,7 @@
 int firstWindow = g_SkinInfo->GetFirstWindow();
 g_windowManager.ActivateWindow(firstWindow);
 
- if (g_windowManager.GetActiveWindowID() == WINDOW_STARTUP_ANIM)
+ if (g_windowManager.IsWindowActive(WINDOW_STARTUP_ANIM))
 {
 CLog::Log(LOGWARNING, "CApplication::Initialize - startup.xml taints init process");
 }
@@ -1180,7 +1169,7 @@
 CLog::Log(LOGINFO, "removing tempfiles");
 CUtil::RemoveTempFiles();
 
- if (!CProfilesManager::GetInstance().UsingLoginScreen())
+ if (!m_ServiceManager->GetProfileManager().UsingLoginScreen())
 {
 UpdateLibraries();
 SetLoggingIn(false);
@@ -1900,42 +1889,6 @@
 g_advancedSettings.m_handleMounting = m_bStandalone = value;
 }
 
-
-// OnAppCommand is called in response to a XBMC_APPCOMMAND event.
-// This needs to return true if it processed the appcommand or false if it didn't
-bool CApplication::OnAppCommand(const CAction &action)
-{
- // Reset the screen saver
- ResetScreenSaver();
-
- // If we were currently in the screen saver wake up and don't process the appcommand
- if (WakeUpScreenSaverAndDPMS())
- return true;
-
- // The action ID is the APPCOMMAND code. We need to retrieve the action
- // associated with this appcommand from the mapping table.
- uint32_t appcmd = action.GetID();
- CKey key(appcmd | KEY_APPCOMMAND, (unsigned int) 0);
- int iWin = g_windowManager.GetActiveWindow() & WINDOW_ID_MASK;
- CAction appcmdaction = CServiceBroker::GetInputManager().GetAction(iWin, key);
-
- // If we couldn't find an action return false to indicate we have not
- // handled this appcommand
- if (!appcmdaction.GetID())
- {
- CLog::LogF(LOGDEBUG, "unknown appcommand %d", appcmd);
- return false;
- }
-
- // Process the appcommand
- CLog::LogF(LOGDEBUG, "appcommand %d, trying action %s", appcmd, appcmdaction.GetName().c_str());
- OnAction(appcmdaction);
-
- // Always return true regardless of whether the action succeeded or not.
- // This stops Windows handling the appcommand itself.
- return true;
-}
-
 bool CApplication::OnAction(const CAction &action)
 {
 // special case for switching between GUI & fullscreen mode.
@@ -2227,12 +2180,14 @@
 
 if (action.GetID() == ACTION_SWITCH_PLAYER)
 {
+ const CPlayerCoreFactory &playerCoreFactory = m_ServiceManager->GetPlayerCoreFactory();
+
 if(m_appPlayer.IsPlaying())
 {
 std::vector<std::string> players;
 CFileItem item(*m_itemCurrentFile.get());
- CPlayerCoreFactory::GetInstance().GetPlayers(item, players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(item, players);
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 {
 item.m_lStartOffset = CUtil::ConvertSecsToMilliSecs(GetTime());
@@ -2242,8 +2197,8 @@
 else
 {
 std::vector<std::string> players;
- CPlayerCoreFactory::GetInstance().GetRemotePlayers(players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetRemotePlayers(players);
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 {
 PlayFile(CFileItem(), player, false);
@@ -2656,7 +2611,7 @@
 }
 
 HandleWinEvents();
- CServiceBroker::GetInputManager().Process(g_windowManager.GetActiveWindowID(), frameTime);
+ CServiceBroker::GetInputManager().Process(g_windowManager.GetActiveWindowOrDialog(), frameTime);
 
 if (processGUI && m_renderGUI)
 {
@@ -2699,6 +2654,12 @@
 m_skipGuiRender = true;
 #endif
 
+ if (g_advancedSettings.m_guiSmartRedraw && m_guiRefreshTimer.IsTimePast())
+ {
+ g_windowManager.SendMessage(GUI_MSG_REFRESH_TIMER, 0, 0);
+ m_guiRefreshTimer.Set(500);
+ }
+
 if (!m_bStop)
 {
 if (!m_skipGuiRender)
@@ -2764,6 +2725,9 @@
 m_ServiceManager->GetSettings().Uninitialize();
 g_advancedSettings.Clear();
 
+ CSpecialProtocol::UnregisterProfileManager();
+ m_ServiceManager->DeinitStageOnePointFive();
+
 #ifdef TARGET_POSIX
 CXHandle::DumpObjectTracker();
 
@@ -2811,7 +2775,7 @@
 g_sysinfo.SetTotalUptime(g_sysinfo.GetTotalUptime() + (int)(CTimeUtils::GetFrameTime() / 60000));
 
 // Update the settings information (volume, uptime etc. need saving)
- if (CFile::Exists(CProfilesManager::GetInstance().GetSettingsFile()))
+ if (CFile::Exists(m_ServiceManager->GetProfileManager().GetSettingsFile()))
 {
 CLog::Log(LOGNOTICE, "Saving settings");
 m_ServiceManager->GetSettings().Save();
@@ -2992,7 +2956,7 @@
 // A faster calculation of video time would improve this
 // substantially.
 // return value: same with PlayFile()
-bool CApplication::PlayStack(const CFileItem& item, bool bRestart)
+bool CApplication::PlayStack(CFileItem& item, bool bRestart)
 {
 if (!m_stackHelper.InitializeStack(item))
 return false;
@@ -3002,6 +2966,12 @@
 CFileItem selectedStackPart = m_stackHelper.GetCurrentStackPartFileItem();
 selectedStackPart.m_lStartOffset = startoffset;
 
+ if (item.HasProperty("savedplayerstate"))
+ {
+ selectedStackPart.SetProperty("savedplayerstate", item.GetProperty("savedplayerstate")); // pass on to part
+ item.ClearProperty("savedplayerstate");
+ }
+
 return PlayFile(selectedStackPart, "", true);
 }
 
@@ -3097,7 +3067,13 @@
 CVideoDatabase dbs;
 dbs.Open();
 
- if( item.m_lStartOffset == STARTOFFSET_RESUME )
+ if (item.HasProperty("savedplayerstate"))
+ {
+ options.starttime = CUtil::ConvertMilliSecsToSecs(item.m_lStartOffset);
+ options.state = item.GetProperty("savedplayerstate").asString();
+ item.ClearProperty("savedplayerstate");
+ }
+ else if (item.m_lStartOffset == STARTOFFSET_RESUME)
 {
 options.starttime = 0.0f;
 if (item.IsResumePointSet())
@@ -3203,7 +3179,7 @@
 CLog::LogF(LOGDEBUG,"Ignored %d playback thread messages", dMsgCount);
 }
 
- m_appPlayer.OpenFile(item, options, player, *this);
+ m_appPlayer.OpenFile(item, options, m_ServiceManager->GetPlayerCoreFactory(), player, *this);
 m_appPlayer.SetVolume(m_volumeLevel);
 m_appPlayer.SetMute(m_muted);
 
@@ -3319,7 +3295,7 @@
 resumeBookmark.timeInSeconds = 0.0f;
 }
 
- if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases())
+ if (m_ServiceManager->GetProfileManager().GetCurrentProfile().canWriteDatabases())
 {
 CSaveFileState::DoWork(fileItem, resumeBookmark, playCountUpdate);
 }
@@ -3437,6 +3413,7 @@
 
 void CApplication::OnAVChange()
 {
+ CStereoscopicsManager::GetInstance().OnStreamChange();
 }
 
 void CApplication::RequestVideoSettings(const CFileItem &fileItem)
@@ -3599,9 +3576,9 @@
 if (m_screensaverActive && !m_screensaverIdInUse.empty())
 {
 if (m_iScreenSaveLock == 0)
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
- (CProfilesManager::GetInstance().UsingLoginScreen() || m_ServiceManager->GetSettings().GetBool(CSettings::SETTING_MASTERLOCK_STARTUPLOCK)) &&
- CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE &&
+ if (m_ServiceManager->GetProfileManager().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
+ (m_ServiceManager->GetProfileManager().UsingLoginScreen() || m_ServiceManager->GetSettings().GetBool(CSettings::SETTING_MASTERLOCK_STARTUPLOCK)) &&
+ m_ServiceManager->GetProfileManager().GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE &&
 m_screensaverIdInUse != "screensaver.xbmc.builtin.dim" && m_screensaverIdInUse != "screensaver.xbmc.builtin.black" && m_screensaverIdInUse != "visualization")
 {
 m_iScreenSaveLock = 2;
@@ -3995,7 +3972,7 @@
 if (!m_appPlayer.IsPlaying())
 {
 g_audioManager.Enable(true);
- m_appPlayer.OpenNext();
+ m_appPlayer.OpenNext(m_ServiceManager->GetPlayerCoreFactory());
 }
 
 if (!m_appPlayer.IsPlayingVideo())
@@ -4274,8 +4251,6 @@
 
 m_ServiceManager->GetActiveAE().GarbageCollect();
 
- g_windowManager.SendMessage(GUI_MSG_REFRESH_TIMER,0,0);
-
 // if we don't render the gui there's no reason to start the screensaver.
 // that way the screensaver won't kick in if we maximize the XBMC window
 // after the screensaver start time.
@@ -4631,7 +4606,7 @@
 bool CApplication::SwitchToFullScreen(bool force /* = false */)
 {
 // don't switch if the slideshow is active
- if (g_windowManager.GetFocusedWindow() == WINDOW_SLIDESHOW)
+ if (g_windowManager.IsWindowActive(WINDOW_SLIDESHOW))
 return false;
 
 // if playing from the video info window, close it first!

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

@@ -2,7 +2,7 @@
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -74,6 +74,7 @@
 #include "utils/Stopwatch.h"
 #include "windowing/OSScreenSaver.h"
 #include "windowing/XBMC_events.h"
+#include "threads/SystemClock.h"
 #include "threads/Thread.h"
 
 #include "ApplicationPlayer.h"
@@ -193,7 +194,6 @@
   void CheckDelayedPlayerRestart();
   bool IsPlayingFullScreenVideo() const;
   bool IsFullScreen();
-  bool OnAppCommand(const CAction &action);
   bool OnAction(const CAction &action);
   void CheckShutdown();
   void InhibitIdleShutdown(bool inhibit);
@@ -437,6 +437,7 @@
   CStopWatch m_navigationTimer;
   CStopWatch m_slowTimer;
   CStopWatch m_shutdownTimer;
+  XbmcThreads::EndTime m_guiRefreshTimer;
 
   bool m_bInhibitIdleShutdown;
 
@@ -473,7 +474,7 @@
 
   void VolumeChanged();
 
-  bool PlayStack(const CFileItem& item, bool bRestart);
+  bool PlayStack(CFileItem& item, bool bRestart);
 
   float NavigationIdleTime();
   bool InitDirectoriesLinux();

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

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -62,13 +62,13 @@
   }
 }
 
-void CApplicationPlayer::CreatePlayer(const std::string &player, IPlayerCallback& callback)
+void CApplicationPlayer::CreatePlayer(const CPlayerCoreFactory &factory, const std::string &player, IPlayerCallback& callback)
 {
   CSingleLock lock(m_playerLock);
   if (!m_pPlayer)
   {
     CDataCacheCore::GetInstance().Reset();
-    m_pPlayer.reset(CPlayerCoreFactory::GetInstance().CreatePlayer(player, callback));
+    m_pPlayer.reset(factory.CreatePlayer(player, callback));
   }
 }
 
@@ -83,14 +83,15 @@
 }
 
 bool CApplicationPlayer::OpenFile(const CFileItem& item, const CPlayerOptions& options,
-                                         const std::string &playerName, IPlayerCallback& callback)
+                                  const CPlayerCoreFactory &factory,
+                                  const std::string &playerName, IPlayerCallback& callback)
 {
   // get player type
   std::string newPlayer;
   if (!playerName.empty())
     newPlayer = playerName;
   else
-    newPlayer = CPlayerCoreFactory::GetInstance().GetDefaultPlayer(item);
+    newPlayer = factory.GetDefaultPlayer(item);
 
   // check if we need to close current player
   // VideoPlayer can open a new file while playing
@@ -127,7 +128,7 @@
 
   if (!player)
   {
-    CreatePlayer(newPlayer, callback);
+    CreatePlayer(factory, newPlayer, callback);
     player = GetInternal();
     if (!player)
       return false;
@@ -145,11 +146,12 @@
   return ret;
 }
 
-void CApplicationPlayer::OpenNext()
+void CApplicationPlayer::OpenNext(const CPlayerCoreFactory &factory)
 {
   if (m_nextItem.pItem)
   {
     OpenFile(*m_nextItem.pItem, m_nextItem.options,
+             factory,
              m_nextItem.playerName, *m_nextItem.callback);
     m_nextItem.pItem.reset();
   }

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

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -31,6 +31,7 @@
 #include "SeekHandler.h"
 
 class CAction;
+class CPlayerCoreFactory;
 class CPlayerOptions;
 class CStreamDetails;
 
@@ -51,8 +52,9 @@
 float GetPlayTempo();
 bool HasPlayer() const;
 bool OpenFile(const CFileItem& item, const CPlayerOptions& options,
+ const CPlayerCoreFactory &factory,
 const std::string &playerName, IPlayerCallback& callback);
- void OpenNext();
+ void OpenNext(const CPlayerCoreFactory &factory);
 void SetPlaySpeed(float speed);
 void SetTempo(float tempo);
 void FrameAdvance(int frames);
@@ -158,9 +160,9 @@
 
 CSeekHandler& GetSeekHandler();
 
-protected:
+private:
 std::shared_ptr<IPlayer> GetInternal() const;
- void CreatePlayer(const std::string &player, IPlayerCallback& callback);
+ void CreatePlayer(const CPlayerCoreFactory &factory, const std::string &player, IPlayerCallback& callback);
 void CloseFile(bool reopen = false);
 
 std::shared_ptr<IPlayer> m_pPlayer;

_service:download_files:master.tar.gz/xbmc/AutoSwitch.cpp Changed

_service:download_files:master.tar.gz/xbmc/AutoSwitch.h Changed

_service:download_files:master.tar.gz/xbmc/Autorun.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -78,14 +78,18 @@
 
   g_application.ResetScreenSaver();
   g_application.WakeUpScreenSaverAndDPMS();  // turn off the screensaver if it's active
+
 #ifdef HAS_CDDA_RIPPER
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
   if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_AUDIOCDS_AUTOACTION) == AUTOCD_RIP && 
-      pInfo->IsAudio(1) && !CProfilesManager::GetInstance().GetCurrentProfile().musicLocked())
+      pInfo->IsAudio(1) && !profileManager.GetCurrentProfile().musicLocked())
   {
     CCDDARipper::GetInstance().RipCD();
   }
   else
 #endif
+
   PlayDisc(path, bypassSettings, startFromBeginning);
 }
 
@@ -153,9 +157,11 @@
   bool bAllowMusic = true;
   if (!g_passwordManager.IsMasterLockUnlocked(false))
   {
-    bAllowVideo = !CProfilesManager::GetInstance().GetCurrentProfile().videoLocked();
-//    bAllowPictures = !CProfilesManager::GetInstance().GetCurrentProfile().picturesLocked();
-    bAllowMusic = !CProfilesManager::GetInstance().GetCurrentProfile().musicLocked();
+    const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+    bAllowVideo = !profileManager.GetCurrentProfile().videoLocked();
+//    bAllowPictures = !profileManager.GetCurrentProfile().picturesLocked();
+    bAllowMusic = !profileManager.GetCurrentProfile().musicLocked();
   }
 
   // is this a root folder we have to check the content to determine a disc type
@@ -304,7 +310,7 @@
             item.m_lStartOffset = STARTOFFSET_RESUME;
 
             // get playername
-            std::string hdVideoPlayer = CPlayerCoreFactory::GetInstance().GetDefaultPlayer(item);
+            std::string hdVideoPlayer = CServiceBroker::GetPlayerCoreFactory().GetDefaultPlayer(item);
             
             // Single *.xpl or *.ifo files require an external player to handle playback.
             // If no matching rule was found, VideoPlayer will be default player.

_service:download_files:master.tar.gz/xbmc/Autorun.h Changed

_service:download_files:master.tar.gz/xbmc/BackgroundInfoLoader.h Changed

_service:download_files:master.tar.gz/xbmc/CompileInfo.h Changed

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

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

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

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

_service:download_files:master.tar.gz/xbmc/CueDocument.cpp Changed

_service:download_files:master.tar.gz/xbmc/CueDocument.h Changed

_service:download_files:master.tar.gz/xbmc/DatabaseManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -34,28 +34,27 @@
 using namespace PVR;
 using namespace ActiveAE;
 
-CDatabaseManager &CDatabaseManager::GetInstance()
-{
-  static CDatabaseManager s_manager;
-  return s_manager;
-}
-
-CDatabaseManager::CDatabaseManager(): m_bIsUpgrading(false)
+CDatabaseManager::CDatabaseManager() :
+  m_bIsUpgrading(false)
 {
+  // Initialize the addon database (must be before the addon manager is init'd)
+  CAddonDatabase db;
+  UpdateDatabase(db);
 }
 
 CDatabaseManager::~CDatabaseManager() = default;
 
-void CDatabaseManager::Initialize(bool addonsOnly)
+void CDatabaseManager::Initialize()
 {
-  Deinitialize();
-  { CAddonDatabase db; UpdateDatabase(db); }
-  if (addonsOnly)
-    return;
+  CSingleLock lock(m_section);
+
+  m_dbStatus.clear();
+
   CLog::Log(LOGDEBUG, "%s, updating databases...", __FUNCTION__);
 
   // NOTE: Order here is important. In particular, CTextureDatabase has to be updated
   //       before CVideoDatabase.
+  { CAddonDatabase db; UpdateDatabase(db); }
   { CViewDatabase db; UpdateDatabase(db); }
   { CTextureDatabase db; UpdateDatabase(db); }
   { CMusicDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseMusic); }
@@ -63,14 +62,10 @@
   { CPVRDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseTV); }
   { CPVREpgDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseEpg); }
   { CActiveAEDSPDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseADSP); }
+
   CLog::Log(LOGDEBUG, "%s, updating databases... DONE", __FUNCTION__);
-  m_bIsUpgrading = false;
-}
 
-void CDatabaseManager::Deinitialize()
-{
-  CSingleLock lock(m_section);
-  m_dbStatus.clear();
+  m_bIsUpgrading = false;
 }
 
 bool CDatabaseManager::CanOpen(const std::string &name)

_service:download_files:master.tar.gz/xbmc/DatabaseManager.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -39,20 +39,15 @@
 class CDatabaseManager
 {
 public:
- /*!
- \brief The only way through which the global instance of the CDatabaseManager should be accessed.
- \return the global instance.
- */
- static CDatabaseManager &GetInstance();
+ CDatabaseManager();
+ CDatabaseManager(const CDatabaseManager&) = delete;
+ CDatabaseManager const& operator=(CDatabaseManager const&) = delete;
+ ~CDatabaseManager();
 
 /*! \brief Initialize the database manager
 Checks that all databases are up to date, otherwise updates them.
 */
- void Initialize(bool addonsOnly = false);
-
- /*! \brief Deinitialize the database manager
- */
- void Deinitialize();
+ void Initialize();
 
 /*! \brief Check whether we can open a database.
 
@@ -64,14 +59,11 @@
 \return true if the database can be opened, false otherwise.
 */ 
 bool CanOpen(const std::string &name);
- std::atomic<bool> m_bIsUpgrading;
+
+ bool IsUpgrading() const { return m_bIsUpgrading; }
 
 private:
- // private construction, and no assignments; use the provided singleton methods
- CDatabaseManager();
- CDatabaseManager(const CDatabaseManager&) = delete;
- CDatabaseManager const& operator=(CDatabaseManager const&) = delete;
- virtual ~CDatabaseManager();
+ std::atomic<bool> m_bIsUpgrading;
 
 enum DB_STATUS { DB_CLOSED, DB_UPDATING, DB_READY, DB_FAILED };
 void UpdateStatus(const std::string &name, DB_STATUS status);

_service:download_files:master.tar.gz/xbmc/DbUrl.cpp Changed

_service:download_files:master.tar.gz/xbmc/DbUrl.h Changed

_service:download_files:master.tar.gz/xbmc/DllPaths.h Changed

_service:download_files:master.tar.gz/xbmc/DllPaths_win32.h Changed

_service:download_files:master.tar.gz/xbmc/DynamicDll.cpp Changed

_service:download_files:master.tar.gz/xbmc/DynamicDll.h Changed

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

_service:download_files:master.tar.gz/xbmc/FileItem.h Changed

_service:download_files:master.tar.gz/xbmc/FileItemListModification.cpp Changed

_service:download_files:master.tar.gz/xbmc/FileItemListModification.h Changed

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -398,8 +398,8 @@
 /// }
 /// \table_row3{ `Player.ProgressCache`,
 /// \anchor Player_ProgressCache
-/// _boolean_,
-/// Shows how much of the file is cached above current play percentage
+/// _integer_,
+/// Returns how much of the file is cached above current play percentage
 /// }
 /// \table_row3{ `Player.Volume`,
 /// \anchor Player_Volume
@@ -433,17 +433,17 @@
 /// }
 /// \table_row3{ `Player.Folderpath`,
 /// \anchor Player_Folderpath
-/// _path_,
-/// Shows the full path of the currently playing song or movie
+/// _string_,
+/// Returns the full path of the currently playing song or movie
 /// }
 /// \table_row3{ `Player.FilenameAndPath`,
-/// \anchor FilenameAndPath
-/// _boolean_,
-/// Shows the full path with filename of the currently playing song or movie
+/// \anchor Player_FilenameAndPath
+/// _string_,
+/// Returns the full path with filename of the currently playing song or movie
 /// }
 /// \table_row3{ `Player.Filename`,
 /// \anchor Player_Filename
-/// _path_,
+/// _string_,
 /// Returns the filename of the currently playing media.
 /// }
 /// \table_row3{ `Player.IsInternetStream`,
@@ -568,7 +568,7 @@
 /// \table_row3{ `Player.SeekOffset(format)`,
 /// \anchor Player_SeekOffset_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). Also supported: (hh:mm)\,
+/// Returns hours (hh)\, minutes (mm) or seconds (ss). Also supported: (hh:mm)\,
 /// (mm:ss)\, (hh:mm:ss)\, (hh:mm:ss).
 /// }
 /// \table_row3{ `Player.SeekStepSize`,
@@ -584,7 +584,7 @@
 /// \table_row3{ `Player.TimeRemaining(format)`,
 /// \anchor Player_TimeRemaining_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+/// Returns 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).
 /// }
@@ -601,7 +601,7 @@
 /// \table_row3{ `Player.Time(format)`,
 /// \anchor Player_Time_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+/// Returns 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).
 /// }
@@ -613,7 +613,7 @@
 /// \table_row3{ `Player.Duration(format)`,
 /// \anchor Player_Duration_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is used
+/// Returns 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).
 /// }
@@ -625,7 +625,7 @@
 /// \table_row3{ `Player.FinishTime(format)`,
 /// \anchor Player_FinishTime_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+/// Returns 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).
 /// }
@@ -637,7 +637,7 @@
 /// \table_row3{ `Player.StartTime(format)`,
 /// \anchor Player_StartTime_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+/// Returns 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).
 /// }
@@ -649,7 +649,7 @@
 /// \table_row3{ `Player.SeekNumeric(format)`,
 /// \anchor Player_SeekNumeric_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is used
+/// Returns 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).
 /// }
@@ -750,22 +750,22 @@
 /// \table_row3{ `System.HasLocks`,
 /// \anchor System_HasLocks
 /// _boolean_,
-/// Todo
+/// Returns true if system has an active lock mode.
 /// }
 /// \table_row3{ `System.IsMaster`,
 /// \anchor System_IsMaster
 /// _boolean_,
-/// Todo
+/// Returns true if system is in master mode.
 /// }
 /// \table_row3{ `System.ShowExitButton`,
 /// \anchor System_ShowExitButton
 /// _boolean_,
-/// Todo
+/// Returns true if the exit button should be shown (configurable via advanced settings).
 /// }
 /// \table_row3{ `System.DPMSActive`,
 /// \anchor System_DPMSActive
 /// _boolean_,
-/// Todo
+/// Returns true if DPMS (VESA Display Power Management Signaling) mode is active.
 /// }
 /// \table_row3{ `System.IdleTime(time)`,
 /// \anchor System_IdleTime
@@ -927,7 +927,7 @@
 /// \table_row3{ `System.Time(format)`,
 /// \anchor System_Time_format
 /// _string_,
-/// Shows hours (hh)\, minutes (mm) or seconds (ss). When 12 hour clock is
+/// Returns 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
 /// }
@@ -1064,7 +1064,7 @@
 /// \table_row3{ `System.CurrentControlId`,
 /// \anchor System_CurrentControlId
 /// _string_,
-/// Todo
+/// ID of the currently focused control.
 /// }
 /// \table_row3{ `System.DVDLabel`,
 /// \anchor System_DVDLabel
@@ -1079,7 +1079,7 @@
 /// \table_row3{ `System.OSVersionInfo`,
 /// \anchor System_OSVersionInfo
 /// _string_,
-/// Todo
+/// System name + kernel version
 /// }
 /// \table_row3{ `System.Uptime`,
 /// \anchor System_Uptime
@@ -1116,22 +1116,22 @@
 /// \table_row3{ `System.Language`,
 /// \anchor System_Language
 /// _string_,
-/// Shows the current language
+/// Returns the current language
 /// }
 /// \table_row3{ `System.ProfileName`,
 /// \anchor System_ProfileName
 /// _string_,
-/// Shows the User name of the currently logged in Kodi user
+/// Returns the user name of the currently logged in Kodi user
 /// }
 /// \table_row3{ `System.ProfileThumb`,
 /// \anchor System_ProfileThumb
 /// _string_,
-/// Todo
+/// Returns the thumbnail image of the currently logged in Kodi user
 /// }
 /// \table_row3{ `System.ProfileCount`,
 /// \anchor System_ProfileCount
 /// _string_,
-/// Shows the number of defined profiles
+/// Returns the number of defined profiles
 /// }
 /// \table_row3{ `System.ProfileAutoLogin`,
 /// \anchor System_ProfileAutoLogin
@@ -1146,12 +1146,12 @@
 /// \table_row3{ `System.TemperatureUnits`,
 /// \anchor System_TemperatureUnits
 /// _string_,
-/// Shows Celsius or Fahrenheit symbol
+/// Returns Celsius or Fahrenheit symbol
 /// }
 /// \table_row3{ `System.Progressbar`,
 /// \anchor System_Progressbar
 /// _string_,
-/// Todo
+/// Returns the percentage of the currently active progress.
 /// }
 /// \table_row3{ `System.GetBool(boolean)`,
 /// \anchor System_GetBool
@@ -1256,7 +1256,7 @@
 /// \table_row3{ `System.HasCoreId(id)`,
 /// \anchor System_HasCoreId
 /// _boolean_,
-/// Todo
+/// Returns true if the cpu core with the given 'id' exists.
 /// }
 /// \table_row3{ `System.HasAlarm(alarm)`,
 /// \anchor System_HasAlarm
@@ -1429,33 +1429,33 @@
 /// \table_row3{ `MusicPlayer.Property(Album_Mood)`,
 /// \anchor MusicPlayer_Property_Album_Mood
 /// _string_,
-/// Shows the moods of the currently playing Album
+/// Returns the moods of the currently playing Album
 /// }
 /// \table_row3{ `MusicPlayer.Property(Album_Style)`,
 /// \anchor MusicPlayer_Property_Album_Style
 /// _string_,
-/// Shows the styles of the currently playing Album
+/// Returns the styles of the currently playing Album
 /// }
 /// \table_row3{ `MusicPlayer.Property(Album_Theme)`,
 /// \anchor MusicPlayer_Property_Album_Theme
 /// _string_,
-/// Shows the themes of the currently playing Album
+/// Returns the themes of the currently playing Album
 /// }
 /// \table_row3{ `MusicPlayer.Property(Album_Type)`,
 /// \anchor MusicPlayer_Property_Album_Type
 /// _string_,
-/// Shows the Album Type (e.g. compilation\, enhanced\, explicit lyrics) of the
-/// currently playing Album
+/// Returns the album type (e.g. compilation\, enhanced\, explicit lyrics) of the
+/// currently playing album
 /// }
 /// \table_row3{ `MusicPlayer.Property(Album_Label)`,
 /// \anchor MusicPlayer_Property_Album_Label
 /// _string_,
-/// Shows the record label of the currently playing Album
+/// Returns the record label of the currently playing album
 /// }
 /// \table_row3{ `MusicPlayer.Property(Album_Description)`,
 /// \anchor MusicPlayer_Property_Album_Description
 /// _string_,
-/// Shows a review of the currently playing Album
+/// Returns a review of the currently playing album
 /// }
 /// \table_row3{ `MusicPlayer.Artist`,
 /// \anchor MusicPlayer_Artist
@@ -1468,12 +1468,12 @@
 /// \table_row3{ `MusicPlayer.AlbumArtist`,
 /// \anchor MusicPlayer_AlbumArtist
 /// _string_,
-/// Todo
+/// Album artist of the currently playing song
 /// }
 /// \table_row3{ `MusicPlayer.Cover`,
 /// \anchor MusicPlayer_Cover
 /// _string_,
-/// Todo
+/// Album cover of currently playing song
 /// }
 /// \table_row3{ `MusicPlayer.Property(Artist_Sortname)`,
 /// \anchor MusicPlayer_Property_Artist_Sortname
@@ -1529,22 +1529,22 @@
 /// \table_row3{ `MusicPlayer.Property(Artist_Description)`,
 /// \anchor MusicPlayer_Property_Artist_Description
 /// _string_,
-/// Shows a biography of the currently playing artist
+/// Returns a biography of the currently playing artist
 /// }
 /// \table_row3{ `MusicPlayer.Property(Artist_Mood)`,
 /// \anchor MusicPlayer_Property_Artist_Mood
 /// _string_,
-/// Shows the moods of the currently playing artist
+/// Returns the moods of the currently playing artist
 /// }
 /// \table_row3{ `MusicPlayer.Property(Artist_Style)`,
 /// \anchor MusicPlayer_Property_Artist_Style
 /// _string_,
-/// Shows the styles of the currently playing artist
+/// Returns the styles of the currently playing artist
 /// }
 /// \table_row3{ `MusicPlayer.Property(Artist_Genre)`,
 /// \anchor MusicPlayer_Property_Artist_Genre
 /// _string_,
-/// Shows the genre of the currently playing artist
+/// Returns the genre of the currently playing artist
 /// }
 /// \table_row3{ `MusicPlayer.Genre`,
 /// \anchor MusicPlayer_Genre
@@ -1578,17 +1578,17 @@
 /// \table_row3{ `MusicPlayer.RatingAndVotes`,
 /// \anchor MusicPlayer_RatingAndVotes
 /// _string_,
-/// Todo
+/// Returns the scraped rating and votes of currently playing song\, if it's in the database
 /// }
 /// \table_row3{ `MusicPlayer.UserRating`,
 /// \anchor MusicPlayer_UserRating
 /// _string_,
-/// Todo
+/// Returns the scraped rating of the currently playing song
 /// }
 /// \table_row3{ `MusicPlayer.Votes`,
 /// \anchor MusicPlayer_Votes
 /// _string_,
-/// Todo
+/// Returns the scraped votes of currently playing song\, if it's in the database
 /// }
 /// \table_row3{ `MusicPlayer.DiscNumber`,
 /// \anchor MusicPlayer_DiscNumber
@@ -1609,17 +1609,18 @@
 /// \table_row3{ `MusicPlayer.Mood`,
 /// \anchor MusicPlayer_Mood
 /// _string_,
-/// Todo
+/// Mood of the currently playing song
 /// }
 /// \table_row3{ `MusicPlayer.PlaylistPlaying`,
 /// \anchor MusicPlayer_PlaylistPlaying
 /// _boolean_,
-/// Todo
+/// Returns true if a playlist is currently playing
 /// }
-/// \table_row3{ `MusicPlayer.Exists`,
+/// \table_row3{ `MusicPlayer.Exists(relative,position)`,
 /// \anchor MusicPlayer_Exists
 /// _boolean_,
-/// Todo
+/// Returns true if the currently playing playlist has a song queued at the given position.
+/// It is possible to define whether the position is relative or not, default is false.
 /// }
 /// \table_row3{ `MusicPlayer.HasPrevious`,
 /// \anchor MusicPlayer_HasPrevious
@@ -1634,12 +1635,12 @@
 /// \table_row3{ `MusicPlayer.PlayCount`,
 /// \anchor MusicPlayer_PlayCount
 /// _integer_,
-/// Todo
+/// Returns the play count of currently playing song\, if it's in the database
 /// }
 /// \table_row3{ `MusicPlayer.LastPlayed`,
 /// \anchor MusicPlayer_LastPlayed
 /// _string_,
-/// Todo
+/// Returns the last play date of currently playing song\, if it's in the database
 /// }
 /// \table_row3{ `MusicPlayer.TrackNumber`,
 /// \anchor MusicPlayer_TrackNumber
@@ -1829,7 +1830,7 @@
 /// \table_row3{ `VideoPlayer.OriginalTitle`,
 /// \anchor VideoPlayer_OriginalTitle
 /// _string_,
-/// Todo
+/// Original title of currently playing video. If it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.TVShowTitle`,
 /// \anchor VideoPlayer_TVShowTitle
@@ -1869,27 +1870,27 @@
 /// \table_row3{ `VideoPlayer.Cover`,
 /// \anchor VideoPlayer_Cover
 /// _string_,
-/// Todo
+/// Cover of currently playing movie
 /// }
 /// \table_row3{ `VideoPlayer.Rating`,
 /// \anchor VideoPlayer_Rating
 /// _string_,
-/// IMDb user rating of current movie\, if it's in the database
+/// Returns the scraped rating of current movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.UserRating`,
 /// \anchor VideoPlayer_UserRating
 /// _string_,
-/// Shows the user rating of the currently playing item
+/// Returns the user rating of the currently playing item
 /// }
 /// \table_row3{ `VideoPlayer.Votes`,
 /// \anchor VideoPlayer_Votes
 /// _string_,
-/// IMDb votes of current movie\, if it's in the database
+/// Returns the scraped votes of current movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.RatingAndVotes`,
 /// \anchor VideoPlayer_RatingAndVotes
 /// _string_,
-/// IMDb user rating and votes of current movie\, if it's in the database
+/// Returns the scraped rating and votes of current movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.mpaa`,
 /// \anchor VideoPlayer_mpaa
@@ -1899,12 +1900,12 @@
 /// \table_row3{ `VideoPlayer.IMDBNumber`,
 /// \anchor VideoPlayer_IMDBNumber
 /// _string_,
-/// The IMDB iD of the current video\, if it's in the database
+/// The IMDb ID of the current movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.Top250`,
 /// \anchor VideoPlayer_Top250
 /// _string_,
-/// Todo
+/// IMDb Top250 position of the currently playing movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.EpisodeName`,
 /// \anchor VideoPlayer_EpisodeName
@@ -1972,12 +1973,12 @@
 /// \table_row3{ `VideoPlayer.Premiered`,
 /// \anchor VideoPlayer_Premiered
 /// _string_,
-/// Todo
+/// Release or aired date of the currently playing episode, show, movie or EPG item\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.Trailer`,
 /// \anchor VideoPlayer_Trailer
 /// _string_,
-/// Todo
+/// The path to the trailer of the currently playing movie\, if it's in the database
 /// }
 /// \table_row3{ `VideoPlayer.LastPlayed`,
 /// \anchor VideoPlayer_LastPlayed
@@ -1992,50 +1993,50 @@
 /// \table_row3{ `VideoPlayer.VideoCodec`,
 /// \anchor VideoPlayer_VideoCodec
 /// _string_,
-/// Shows the video codec of the currently playing video (common values: see
+/// Returns the video codec of the currently playing video (common values: see
 /// \ref ListItem_VideoCodec "ListItem.VideoCodec")
 /// }
 /// \table_row3{ `VideoPlayer.VideoResolution`,
 /// \anchor VideoPlayer_VideoResolution
 /// _string_,
-/// Shows the video resolution of the currently playing video (possible
+/// Returns the video resolution of the currently playing video (possible
 /// values: see \ref ListItem_VideoResolution "ListItem.VideoResolution")
 /// }
 /// \table_row3{ `VideoPlayer.VideoAspect`,
 /// \anchor VideoPlayer_VideoAspect
 /// _string_,
-/// Shows the aspect ratio of the currently playing video (possible values:
+/// Returns the aspect ratio of the currently playing video (possible values:
 /// see \ref ListItem_VideoAspect "ListItem.VideoAspect")
 /// }
 /// \table_row3{ `VideoPlayer.AudioCodec`,
 /// \anchor VideoPlayer_AudioCodec
 /// _string_,
-/// Shows the audio codec of the currently playing video\, optionally 'n'
+/// Returns 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{ `VideoPlayer.AudioChannels`,
 /// \anchor VideoPlayer_AudioChannels
 /// _string_,
-/// Shows the number of audio channels of the currently playing video
+/// Returns the number of audio channels of the currently playing video
 /// (possible values: see \ref ListItem_AudioChannels "ListItem.AudioChannels")
 /// }
 /// \table_row3{ `VideoPlayer.AudioLanguage`,
 /// \anchor VideoPlayer_AudioLanguage
 /// _string_,
-/// Shows the language of the audio of the currently playing video(possible
+/// Returns the language of the audio of the currently playing video(possible
 /// values: see \ref ListItem_AudioLanguage "ListItem.AudioLanguage")
 /// }
 /// \table_row3{ `VideoPlayer.SubtitlesLanguage`,
 /// \anchor VideoPlayer_SubtitlesLanguage
 /// _string_,
-/// Shows the language of the subtitle of the currently playing video
+/// Returns the language of the subtitle of the currently playing video
 /// (possible values: see \ref ListItem_SubtitleLanguage "ListItem.SubtitleLanguage")
 /// }
 /// \table_row3{ `VideoPlayer.StereoscopicMode`,
 /// \anchor VideoPlayer_StereoscopicMode
 /// _string_,
-/// Shows the stereoscopic mode of the currently playing video (possible
+/// Returns the stereoscopic mode of the currently playing video (possible
 /// values: see \ref ListItem_StereoscopicMode "ListItem.StereoscopicMode")
 /// }
 /// \table_row3{ `VideoPlayer.EndTime`,
@@ -2235,12 +2236,12 @@
 /// \table_row3{ `Container.FolderPath`,
 /// \anchor Container_FolderPath
 /// _string_,
-/// Shows complete path of currently displayed folder
+/// Returns complete path of currently displayed folder
 /// }
 /// \table_row3{ `Container.FolderName`,
 /// \anchor Container_FolderName
 /// _string_,
-/// Shows top most folder in currently displayed folder
+/// Returns top most folder in currently displayed folder
 /// }
 /// \table_row3{ `Container.PluginName`,
 /// \anchor Container_PluginName
@@ -2255,7 +2256,7 @@
 /// \table_row3{ `Container.ViewCount`,
 /// \anchor Container_ViewCount
 /// _integer_,
-/// Todo
+/// Returns the number of available skin view modes for the current container listing
 /// }
 /// \table_row3{ `Container(id).Totaltime`,
 /// \anchor Container_Totaltime
@@ -2474,7 +2475,8 @@
 /// \table_row3{ `Container(id).SubItem`,
 /// \anchor Container_SubItem
 /// _integer_,
-/// Todo
+/// Sub item in the container or grouplist with given id. If no id is
+/// specified it grabs the current container.
 /// }
 /// \table_row3{ `Container(id).HasFocus(item_number)`,
 /// \anchor Container_HasFocus
@@ -2517,10 +2519,11 @@
 /// Addons true when a list of add-ons is shown LiveTV true when a
 /// htsp (tvheadend) directory is shown
 /// }
-/// \table_row3{ `Container.Art`,
+/// \table_row3{ `Container.Art(type)`,
 /// \anchor Container_Art
 /// _string_,
-/// Todo
+/// Returns the path to the art image file for the given type of the current container
+/// Todo: list of all art types
 /// }
 /// \table_end
 ///
@@ -2538,22 +2541,28 @@
 /// \table_row3{ `ListItem.Thumb`,
 /// \anchor ListItem_Thumb
 /// _string_,
-/// Todo
+/// Returns the thumbnail (if it exists) of the currently selected item in a list or thumb control.
+///
+/// \deprecated but still available, returns the same as ListItem.Art(thumb).
 /// }
 /// \table_row3{ `ListItem.Icon`,
 /// \anchor ListItem_Icon
 /// _string_,
-/// Todo
+/// Returns the thumbnail (if it exists) of the currently selected item in a list or thumb control. If no thumbnail image exists, it will show the icon.
 /// }
 /// \table_row3{ `ListItem.ActualIcon`,
 /// \anchor ListItem_ActualIcon
 /// _string_,
-/// Todo
+/// Returns the icon of the currently selected item in a list or thumb control.
 /// }
 /// \table_row3{ `ListItem.Overlay`,
 /// \anchor ListItem_Overlay
 /// _string_,
-/// Todo
+/// Returns the overlay icon status of the currently selected item in a list or thumb control.
+/// - compressed file -- OverlayRAR.png
+/// - watched -- OverlayWatched.png
+/// - unwatched -- OverlayUnwatched.png
+/// - locked -- OverlayLocked.png
 /// }
 /// \table_row3{ `ListItem.IsFolder`,
 /// \anchor ListItem_IsFolder
@@ -2639,42 +2648,42 @@
 /// \table_row3{ `ListItem.Label`,
 /// \anchor ListItem_Label
 /// _string_,
-/// Shows the left label of the currently selected item in a container
+/// Returns the left label of the currently selected item in a container
 /// }
 /// \table_row3{ `ListItem.Label2`,
 /// \anchor ListItem_Label2
 /// _string_,
-/// Shows the right label of the currently selected item in a container
+/// Returns the right label of the currently selected item in a container
 /// }
 /// \table_row3{ `ListItem.Title`,
 /// \anchor ListItem_Title
 /// _string_,
-/// Shows the title of the currently selected song or movie in a container
+/// Returns the title of the currently selected song or movie in a container
 /// }
 /// \table_row3{ `ListItem.OriginalTitle`,
 /// \anchor ListItem_OriginalTitle
 /// _string_,
-/// Shows the original title of the currently selected movie in a container
+/// Returns the original title of the currently selected movie in a container
 /// }
 /// \table_row3{ `ListItem.SortLetter`,
 /// \anchor ListItem_SortLetter
 /// _string_,
-/// Shows the first letter of the current file in a container
+/// Returns the first letter of the current file in a container
 /// }
 /// \table_row3{ `ListItem.TrackNumber`,
 /// \anchor ListItem_TrackNumber
 /// _string_,
-/// Shows the track number of the currently selected song in a container
+/// Returns the track number of the currently selected song in a container
 /// }
 /// \table_row3{ `ListItem.Artist`,
 /// \anchor ListItem_Artist
 /// _string_,
-/// Shows the artist of the currently selected song in a container
+/// Returns the artist of the currently selected song in a container
 /// }
 /// \table_row3{ `ListItem.AlbumArtist`,
 /// \anchor ListItem_AlbumArtist
 /// _string_,
-/// Shows the artist of the currently selected album in a list
+/// Returns the artist of the currently selected album in a list
 /// }
 /// \table_row3{ `ListItem.Property(Artist_Sortname)`,
 /// \anchor ListItem_Property_Artist_Sortname
@@ -2730,253 +2739,253 @@
 /// \table_row3{ `ListItem.Property(Artist_Description)`,
 /// \anchor ListItem_Property_Artist_Description
 /// _string_,
-/// Shows a biography of the currently selected artist
+/// Returns a biography of the currently selected artist
 /// }
 /// \table_row3{ `ListItem.Property(Artist_Mood)`,
 /// \anchor ListItem_Property_Artist_Mood
 /// _string_,
-/// Shows the moods of the currently selected artist
+/// Returns the moods of the currently selected artist
 /// }
 /// \table_row3{ `ListItem.Property(Artist_Style)`,
 /// \anchor ListItem_Property_Artist_Style
 /// _string_,
-/// Shows the styles of the currently selected artist
+/// Returns the styles of the currently selected artist
 /// }
 /// \table_row3{ `ListItem.Property(Artist_Genre)`,
 /// \anchor ListItem_Property_Artist_Genre
 /// _string_,
-/// Shows the genre of the currently selected artist
+/// Returns the genre of the currently selected artist
 /// }
 /// \table_row3{ `ListItem.Album`,
 /// \anchor ListItem_Album
 /// _string_,
-/// Shows the album of the currently selected song in a container
+/// Returns the album of the currently selected song in a container
 /// }
 /// \table_row3{ `ListItem.Property(Album_Mood)`,
 /// \anchor ListItem_Property_Album_Mood
 /// _string_,
-/// Shows the moods of the currently selected Album
+/// Returns the moods of the currently selected Album
 /// }
 /// \table_row3{ `ListItem.Property(Album_Style)`,
 /// \anchor ListItem_Property_Album_Style
 /// _string_,
-/// Shows the styles of the currently selected Album
+/// Returns the styles of the currently selected Album
 /// }
 /// \table_row3{ `ListItem.Property(Album_Theme)`,
 /// \anchor ListItem_Property_Album_Theme
 /// _string_,
-/// Shows the themes of the currently selected Album
+/// Returns the themes of the currently selected Album
 /// }
 /// \table_row3{ `ListItem.Property(Album_Type)`,
 /// \anchor ListItem_Property_Album_Type
 /// _string_,
-/// Shows the Album Type (e.g. compilation\, enhanced\, explicit lyrics) of
+/// Returns the Album Type (e.g. compilation\, enhanced\, explicit lyrics) of
 /// the currently selected Album
 /// }
 /// \table_row3{ `ListItem.Property(Album_Label)`,
 /// \anchor ListItem_Property_Album_Label
 /// _string_,
-/// Shows the record label of the currently selected Album
+/// Returns the record label of the currently selected Album
 /// }
 /// \table_row3{ `ListItem.Property(Album_Description)`,
 /// \anchor ListItem_Property_Album_Description
 /// _string_,
-/// Shows a review of the currently selected Album
+/// Returns a review of the currently selected Album
 /// }
 /// \table_row3{ `ListItem.DiscNumber`,
 /// \anchor ListItem_DiscNumber
 /// _string_,
-/// Shows the disc number of the currently selected song in a container
+/// Returns the disc number of the currently selected song in a container
 /// }
 /// \table_row3{ `ListItem.Year`,
 /// \anchor ListItem_Year
 /// _string_,
-/// Shows the year of the currently selected song\, album or movie in a
+/// Returns the year of the currently selected song\, album or movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.Premiered`,
 /// \anchor ListItem_Premiered
 /// _string_,
-/// Shows the release/aired date of the currently selected episode\, show\,
+/// Returns the release/aired date of the currently selected episode\, show\,
 /// movie or EPG item in a container
 /// }
 /// \table_row3{ `ListItem.Genre`,
 /// \anchor ListItem_Genre
 /// _string_,
-/// Shows the genre of the currently selected song\, album or movie in a
+/// Returns the genre of the currently selected song\, album or movie in a
 /// container
 /// }
-/// \table_row3{ `ListItem.Contributor`,
-/// \anchor ListItem_Contributor
+/// \table_row3{ `ListItem.Contributors`,
+/// \anchor ListItem_Contributors
 /// _string_,
-/// Todo
+/// List of all people who've contributed to the selected song
 /// }
 /// \table_row3{ `ListItem.ContributorAndRole`,
 /// \anchor ListItem_ContributorAndRole
 /// _string_,
-/// Todo
+/// List of all people and their role who've contributed to the selected song
 /// }
 /// \table_row3{ `ListItem.Director`,
 /// \anchor ListItem_Director
 /// _string_,
-/// Shows the director of the currently selected movie in a container
+/// Returns the director of the currently selected movie in a container
 /// }
 /// \table_row3{ `ListItem.Country`,
 /// \anchor ListItem_Country
 /// _string_,
-/// Shows the production country of the currently selected movie in a
+/// Returns the production country of the currently selected movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.Episode`,
 /// \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
+/// Returns the episode number value for the currently selected episode. It
+/// also returns the number of total\, watched or unwatched episodes for the
 /// currently selected tvshow or season\, based on the the current watched
 /// filter.
 /// }
 /// \table_row3{ `ListItem.Season`,
 /// \anchor ListItem_Season
 /// _string_,
-/// Shows the season value for the currently selected tvshow
+/// Returns the season value for the currently selected tvshow
 /// }
 /// \table_row3{ `ListItem.TVShowTitle`,
 /// \anchor ListItem_TVShowTitle
 /// _string_,
-/// Shows the name value for the currently selected tvshow in the season and
+/// Returns the name value for the currently selected tvshow in the season and
 /// episode depth of the video library
 /// }
 /// \table_row3{ `ListItem.Property(TotalSeasons)`,
 /// \anchor ListItem_Property_TotalSeasons
 /// _string_,
-/// Shows the total number of seasons for the currently selected tvshow
+/// Returns the total number of seasons for the currently selected tvshow
 /// }
 /// \table_row3{ `ListItem.Property(TotalEpisodes)`,
 /// \anchor ListItem_Property_TotalEpisodes
 /// _string_,
-/// Shows the total number of episodes for the currently selected tvshow or
+/// Returns the total number of episodes for the currently selected tvshow or
 /// season
 /// }
 /// \table_row3{ `ListItem.Property(WatchedEpisodes)`,
 /// \anchor ListItem_Property_WatchedEpisodes
 /// _string_,
-/// Shows the number of watched episodes for the currently selected tvshow
+/// Returns the number of watched episodes for the currently selected tvshow
 /// or season
 /// }
 /// \table_row3{ `ListItem.Property(UnWatchedEpisodes)`,
 /// \anchor ListItem_Property_UnWatchedEpisodes
 /// _string_,
-/// Shows the number of unwatched episodes for the currently selected tvshow
+/// Returns the number of unwatched episodes for the currently selected tvshow
 /// or season
 /// }
 /// \table_row3{ `ListItem.Property(NumEpisodes)`,
 /// \anchor ListItem_Property_NumEpisodes
 /// _string_,
-/// Shows the number of total\, watched or unwatched episodes for the
+/// Returns the number of total\, watched or unwatched episodes for the
 /// currently selected tvshow or season\, based on the the current watched filter.
 /// }
 /// \table_row3{ `ListItem.PictureAperture`,
 /// \anchor ListItem_PictureAperture
 /// _string_,
-/// Shows the F-stop used to take the selected picture. This is the value of the
+/// Returns the F-stop used to take the selected picture. This is the value of the
 /// EXIF FNumber tag (hex code 0x829D).
 /// }
 /// \table_row3{ `ListItem.PictureAuthor`,
 /// \anchor ListItem_PictureAuthor
 /// _string_,
-/// Shows the name of the person involved in writing about the selected picture.
+/// Returns 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{ `ListItem.PictureByline`,
 /// \anchor ListItem_PictureByline
 /// _string_,
-/// Shows the name of the person who created the selected picture. This is
+/// Returns the name of the person who created the selected picture. This is
 /// the value of the IPTC Byline tag (hex code 0x50).
 /// }
 /// \table_row3{ `ListItem.PictureBylineTitle`,
 /// \anchor ListItem_PictureBylineTitle
 /// _string_,
-/// Shows the title of the person who created the selected picture. This is
+/// Returns the title of the person who created the selected picture. This is
 /// the value of the IPTC BylineTitle tag (hex code 0x55).
 /// }
 /// \table_row3{ `ListItem.PictureCamMake`,
 /// \anchor ListItem_PictureCamMake
 /// _string_,
-/// Shows the manufacturer of the camera used to take the selected picture.
+/// Returns 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{ `ListItem.PictureCamModel`,
 /// \anchor ListItem_PictureCamModel
 /// _string_,
-/// Shows the manufacturer's model name or number of the camera used to take
+/// Returns 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{ `ListItem.PictureCaption`,
 /// \anchor ListItem_PictureCaption
 /// _string_,
-/// Shows a description of the selected picture. This is the value of the IPTC
+/// Returns a description of the selected picture. This is the value of the IPTC
 /// Caption tag (hex code 0x78).
 /// }
 /// \table_row3{ `ListItem.PictureCategory`,
 /// \anchor ListItem_PictureCategory
 /// _string_,
-/// Shows the subject of the selected picture as a category code. This is the
+/// Returns the subject of the selected picture as a category code. This is the
 /// value of the IPTC Category tag (hex code 0x0F).
 /// }
 /// \table_row3{ `ListItem.PictureCCDWidth`,
 /// \anchor ListItem_PictureCCDWidth
 /// _string_,
-/// Shows the width of the CCD in the camera used to take the selected
+/// Returns 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{ `ListItem.PictureCity`,
 /// \anchor ListItem_PictureCity
 /// _string_,
-/// Shows the city where the selected picture was taken. This is the value of
+/// Returns the city where the selected picture was taken. This is the value of
 /// the IPTC City tag (hex code 0x5A).
 /// }
 /// \table_row3{ `ListItem.PictureColour`,
 /// \anchor ListItem_PictureColour
 /// _string_,
-/// Shows whether the selected picture is "Colour" or "Black and White".
+/// Returns whether the selected picture is "Colour" or "Black and White".
 /// }
 /// \table_row3{ `ListItem.PictureComment`,
 /// \anchor ListItem_PictureComment
 /// _string_,
-/// Shows a description of the selected picture. This is the value of the
+/// Returns 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{ `ListItem.PictureCopyrightNotice`,
 /// \anchor ListItem_PictureCopyrightNotice
 /// _string_,
-/// Shows the copyright notice of the selected picture. This is the value of
+/// Returns the copyright notice of the selected picture. This is the value of
 /// the IPTC Copyright tag (hex code 0x74).
 /// }
 /// \table_row3{ `ListItem.PictureCountry`,
 /// \anchor ListItem_PictureCountry
 /// _string_,
-/// Shows the full name of the country where the selected picture was taken.
+/// Returns 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{ `ListItem.PictureCountryCode`,
 /// \anchor ListItem_PictureCountryCode
 /// _string_,
-/// Shows the country code of the country where the selected picture was
+/// Returns 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{ `ListItem.PictureCredit`,
 /// \anchor ListItem_PictureCredit
 /// _string_,
-/// Shows who provided the selected picture. This is the value of the IPTC
+/// Returns who provided the selected picture. This is the value of the IPTC
 /// Credit tag (hex code 0x6E).
 /// }
 /// \table_row3{ `ListItem.PictureDate`,
 /// \anchor ListItem_PictureDate
 /// _string_,
-/// Shows the localized date of the selected picture. The short form of the
+/// Returns 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
@@ -2985,7 +2994,7 @@
 /// \table_row3{ `ListItem.PictureDatetime`,
 /// \anchor ListItem_PictureDatetime
 /// _string_,
-/// Shows the date/timestamp of the selected picture. The localized short form
+/// Returns 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
@@ -2994,27 +3003,27 @@
 /// \table_row3{ `ListItem.PictureDesc`,
 /// \anchor ListItem_PictureDesc
 /// _string_,
-/// Shows a short description of the selected picture. The SlideComment\,
+/// Returns 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{ `ListItem.PictureDigitalZoom`,
 /// \anchor ListItem_PictureDigitalZoom
 /// _string_,
-/// Shows the digital zoom ratio when the selected picture was taken. This
+/// Returns the digital zoom ratio when the selected picture was taken. This
 /// is the value of the EXIF DigitalZoomRatio tag (hex code 0xA404).
 /// }
 /// \table_row3{ `ListItem.PictureExpMode`,
 /// \anchor ListItem_PictureExpMode
 /// _string_,
-/// Shows the exposure mode of the selected picture. The possible values are
+/// Returns 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{ `ListItem.PictureExposure`,
 /// \anchor ListItem_PictureExposure
 /// _string_,
-/// Shows the class of the program used by the camera to set exposure when
+/// Returns 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).
@@ -3022,14 +3031,14 @@
 /// \table_row3{ `ListItem.PictureExposureBias`,
 /// \anchor ListItem_PictureExposureBias
 /// _string_,
-/// Shows the exposure bias of the selected picture. Typically this is a
+/// Returns 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{ `ListItem.PictureExpTime`,
 /// \anchor ListItem_PictureExpTime
 /// _string_,
-/// Shows the exposure time of the selected picture\, in seconds. This is the
+/// Returns 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.
@@ -3037,90 +3046,90 @@
 /// \table_row3{ `ListItem.PictureFlashUsed`,
 /// \anchor ListItem_PictureFlashUsed
 /// _string_,
-/// Shows the status of flash when the selected picture was taken. The value
+/// Returns 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{ `ListItem.PictureFocalLen`,
 /// \anchor ListItem_PictureFocalLen
 /// _string_,
-/// Shows the lens focal length of the selected picture
+/// Returns the lens focal length of the selected picture
 /// }
 /// \table_row3{ `ListItem.PictureFocusDist`,
 /// \anchor ListItem_PictureFocusDist
 /// _string_,
-/// Shows the focal length of the lens\, in mm. This is the value of the EXIF
+/// Returns the focal length of the lens\, in mm. This is the value of the EXIF
 /// FocalLength tag (hex code 0x920A).
 /// }
 /// \table_row3{ `ListItem.PictureGPSLat`,
 /// \anchor ListItem_PictureGPSLat
 /// _string_,
-/// Shows the latitude where the selected picture was taken (degrees\,
+/// Returns 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{ `ListItem.PictureGPSLon`,
 /// \anchor ListItem_PictureGPSLon
 /// _string_,
-/// Shows the longitude where the selected picture was taken (degrees\,
+/// Returns 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{ `ListItem.PictureGPSAlt`,
 /// \anchor ListItem_PictureGPSAlt
 /// _string_,
-/// Shows the altitude in meters where the selected picture was taken. This
+/// Returns the altitude in meters where the selected picture was taken. This
 /// is the value of the EXIF GPSInfo.GPSAltitude tag.
 /// }
 /// \table_row3{ `ListItem.PictureHeadline`,
 /// \anchor ListItem_PictureHeadline
 /// _string_,
-/// Shows a synopsis of the contents of the selected picture. This is the
+/// Returns a synopsis of the contents of the selected picture. This is the
 /// value of the IPTC Headline tag (hex code 0x69).
 /// }
 /// \table_row3{ `ListItem.PictureImageType`,
 /// \anchor ListItem_PictureImageType
 /// _string_,
-/// Shows the color components of the selected picture. This is the value of
+/// Returns the color components of the selected picture. This is the value of
 /// the IPTC ImageType tag (hex code 0x82).
 /// }
 /// \table_row3{ `ListItem.PictureIPTCDate`,
 /// \anchor ListItem_PictureIPTCDate
 /// _string_,
-/// Shows the date when the intellectual content of the selected picture was
+/// Returns 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{ `ListItem.PictureIPTCTime`,
 /// \anchor ListItem_PictureIPTCTime
 /// _string_,
-/// Shows the time when the intellectual content of the selected picture was
+/// Returns 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{ `ListItem.PictureISO`,
 /// \anchor ListItem_PictureISO
 /// _string_,
-/// Shows the ISO speed of the camera when the selected picture was taken.
+/// Returns 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{ `ListItem.PictureKeywords`,
 /// \anchor ListItem_PictureKeywords
 /// _string_,
-/// Shows keywords assigned to the selected picture. This is the value of
+/// Returns keywords assigned to the selected picture. This is the value of
 /// the IPTC Keywords tag (hex code 0x19).
 /// }
 /// \table_row3{ `ListItem.PictureLightSource`,
 /// \anchor ListItem_PictureLightSource
 /// _string_,
-/// Shows the kind of light source when the picture was taken. Possible
+/// Returns 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{ `ListItem.PictureLongDate`,
 /// \anchor ListItem_PictureLongDate
 /// _string_,
-/// Shows only the localized date of the selected picture. The long form of
+/// Returns 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
@@ -3129,7 +3138,7 @@
 /// \table_row3{ `ListItem.PictureLongDatetime`,
 /// \anchor ListItem_PictureLongDatetime
 /// _string_,
-/// Shows the date/timestamp of the selected picture. The localized long
+/// Returns 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
@@ -3138,89 +3147,89 @@
 /// \table_row3{ `ListItem.PictureMeteringMode`,
 /// \anchor ListItem_PictureMeteringMode
 /// _string_,
-/// Shows the metering mode used when the selected picture was taken. The
+/// Returns 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{ `ListItem.PictureObjectName`,
 /// \anchor ListItem_PictureObjectName
 /// _string_,
-/// Shows a shorthand reference for the selected picture. This is the value
+/// Returns a shorthand reference for the selected picture. This is the value
 /// of the IPTC ObjectName tag (hex code 0x05).
 /// }
 /// \table_row3{ `ListItem.PictureOrientation`,
 /// \anchor ListItem_PictureOrientation
 /// _string_,
-/// Shows the orientation of the selected picture. Possible values are "Top
+/// Returns 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{ `ListItem.PicturePath`,
 /// \anchor ListItem_PicturePath
 /// _string_,
-/// Shows the filename and path of the selected picture
+/// Returns the filename and path of the selected picture
 /// }
 /// \table_row3{ `ListItem.PictureProcess`,
 /// \anchor ListItem_PictureProcess
 /// _string_,
-/// Shows the process used to compress the selected picture
+/// Returns the process used to compress the selected picture
 /// }
 /// \table_row3{ `ListItem.PictureReferenceService`,
 /// \anchor ListItem_PictureReferenceService
 /// _string_,
-/// Shows the Service Identifier of a prior envelope to which the selected
+/// Returns 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{ `ListItem.PictureResolution`,
 /// \anchor ListItem_PictureResolution
 /// _string_,
-/// Shows the dimensions of the selected picture
+/// Returns the dimensions of the selected picture
 /// }
 /// \table_row3{ `ListItem.PictureSource`,
 /// \anchor ListItem_PictureSource
 /// _string_,
-/// Shows the original owner of the selected picture. This is the value of
+/// Returns the original owner of the selected picture. This is the value of
 /// the IPTC Source tag (hex code 0x73).
 /// }
 /// \table_row3{ `ListItem.PictureSpecialInstructions`,
 /// \anchor ListItem_PictureSpecialInstructions
 /// _string_,
-/// Shows other editorial instructions concerning the use of the selected
+/// Returns other editorial instructions concerning the use of the selected
 /// picture. This is the value of the IPTC SpecialInstructions tag (hex
 /// code 0x28).
 /// }
 /// \table_row3{ `ListItem.PictureState`,
 /// \anchor ListItem_PictureState
 /// _string_,
-/// Shows the State/Province where the selected picture was taken. This is
+/// Returns the State/Province where the selected picture was taken. This is
 /// the value of the IPTC ProvinceState tag (hex code 0x5F).
 /// }
 /// \table_row3{ `ListItem.PictureSublocation`,
 /// \anchor ListItem_PictureSublocation
 /// _string_,
-/// Shows the location within a city where the selected picture was taken -
+/// Returns 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{ `ListItem.PictureSupplementalCategories`,
 /// \anchor ListItem_PictureSupplementalCategories
 /// _string_,
-/// Shows supplemental category codes to further refine the subject of the
+/// Returns 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{ `ListItem.PictureTransmissionReference`,
 /// \anchor ListItem_PictureTransmissionReference
 /// _string_,
-/// Shows a code representing the location of original transmission of the
+/// Returns 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{ `ListItem.PictureUrgency`,
 /// \anchor ListItem_PictureUrgency
 /// _string_,
-/// Shows the urgency of the selected picture. Values are 1-9. The "1" is
+/// Returns 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
@@ -3229,99 +3238,99 @@
 /// \table_row3{ `ListItem.PictureWhiteBalance`,
 /// \anchor ListItem_PictureWhiteBalance
 /// _string_,
-/// Shows the white balance mode set when the selected picture was taken.
+/// Returns 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{ `ListItem.FileName`,
 /// \anchor ListItem_FileName
 /// _string_,
-/// Shows the filename of the currently selected song or movie in a container
+/// Returns the filename of the currently selected song or movie in a container
 /// }
 /// \table_row3{ `ListItem.Path`,
 /// \anchor ListItem_Path
 /// _string_,
-/// Shows the complete path of the currently selected song or movie in a
+/// Returns the complete path of the currently selected song or movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.FolderName`,
 /// \anchor ListItem_FolderName
 /// _string_,
-/// Shows top most folder of the path of the currently selected song or
+/// Returns top most folder of the path of the currently selected song or
 /// movie in a container
 /// }
 /// \table_row3{ `ListItem.FolderPath`,
 /// \anchor ListItem_FolderPath
 /// _string_,
-/// Shows the complete path of the currently selected song or movie in a
+/// Returns the complete path of the currently selected song or movie in a
 /// container (without user details).
 /// }
 /// \table_row3{ `ListItem.FileNameAndPath`,
 /// \anchor ListItem_FileNameAndPath
 /// _string_,
-/// Shows the full path with filename of the currently selected song or
+/// Returns the full path with filename of the currently selected song or
 /// movie in a container
 /// }
 /// \table_row3{ `ListItem.FileExtension`,
 /// \anchor ListItem_FileExtension
 /// _string_,
-/// Shows the file extension (without leading dot) of the currently selected
+/// Returns the file extension (without leading dot) of the currently selected
 /// item in a container
 /// }
 /// \table_row3{ `ListItem.Date`,
 /// \anchor ListItem_Date
 /// _string_,
-/// Shows the file date of the currently selected song or movie in a
+/// Returns 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{ `ListItem.DateAdded`,
 /// \anchor ListItem_DateAdded
 /// _string_,
-/// Shows the date the currently selected item was added to the
+/// Returns the date the currently selected item was added to the
 /// library / Date and time of an event in the EventLog window.
 /// }
 /// \table_row3{ `ListItem.Size`,
 /// \anchor ListItem_Size
 /// _string_,
-/// Shows the file size of the currently selected song or movie in a
+/// Returns the file size of the currently selected song or movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.Rating`,
 /// \anchor ListItem_Rating
 /// _string_,
-/// Shows the IMDB rating of the currently selected movie in a container
+/// Returns the scraped rating of the currently selected movie in a container
 /// }
 /// \table_row3{ `ListItem.Set`,
 /// \anchor ListItem_Set
 /// _string_,
-/// Shows the name of the set the movie is part of
+/// Returns the name of the set the movie is part of
 /// }
 /// \table_row3{ `ListItem.SetId`,
 /// \anchor ListItem_SetId
 /// _string_,
-/// Shows the id of the set the movie is part of
+/// Returns the id of the set the movie is part of
 /// }
 /// \table_row3{ `ListItem.UserRating`,
 /// \anchor ListItem_UserRating
 /// _string_,
-/// Shows the user rating of the currently selected item in a container
+/// Returns the user rating of the currently selected item in a container
 /// }
 /// \table_row3{ `ListItem.Votes`,
 /// \anchor ListItem_Votes
 /// _string_,
-/// Shows the IMDB votes of the currently selected movie in a container
+/// Returns the scraped votes of the currently selected movie in a container
 /// }
 /// \table_row3{ `ListItem.RatingAndVotes`,
 /// \anchor ListItem_RatingAndVotes
 /// _string_,
-/// Shows the IMDB rating and votes of the currently selected movie in a
+/// Returns the scraped rating and votes of the currently selected movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.Mood`,
 /// \anchor ListItem_Mood
 /// _string_,
-/// Todo
+/// Mood of the selected song
 /// }
 /// \table_row3{ `ListItem.Mpaa`,
 /// \anchor ListItem_Mpaa
@@ -3331,18 +3340,18 @@
 /// \table_row3{ `ListItem.ProgramCount`,
 /// \anchor ListItem_ProgramCount
 /// _string_,
-/// Shows the number of times an xbe has been run from "my programs"
+/// Returns the number of times an xbe has been run from "my programs"
 /// }
 /// \table_row3{ `ListItem.Duration`,
 /// \anchor ListItem_Duration
 /// _string_,
-/// Shows the song or movie duration of the currently selected movie in a
+/// Returns the song or movie duration of the currently selected movie in a
 /// container
 /// }
 /// \table_row3{ `ListItem.DBTYPE`,
 /// \anchor ListItem_DBTYPE
 /// _string_,
-/// Shows the database type of the ListItem.DBID for videos (movie\, set\,
+/// Returns 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
@@ -3351,18 +3360,18 @@
 /// \table_row3{ `ListItem.DBID`,
 /// \anchor ListItem_DBID
 /// _string_,
-/// Shows the database id of the currently selected listitem in a container
+/// Returns the database id of the currently selected listitem in a container
 /// }
 /// \table_row3{ `ListItem.Cast`,
 /// \anchor ListItem_Cast
 /// _string_,
-/// Shows a concatenated string of cast members of the currently selected
+/// Returns a concatenated string of cast members of the currently selected
 /// movie\, for use in dialogvideoinfo.xml
 /// }
 /// \table_row3{ `ListItem.CastAndRole`,
 /// \anchor ListItem_CastAndRole
 /// _string_,
-/// Shows a concatenated string of cast members and roles of the currently
+/// Returns a concatenated string of cast members and roles of the currently
 /// selected movie\, for use in dialogvideoinfo.xml
 /// }
 /// \table_row3{ `ListItem.Studio`,
@@ -3373,13 +3382,13 @@
 /// \table_row3{ `ListItem.Top250`,
 /// \anchor ListItem_Top250
 /// _string_,
-/// Shows the IMDb top250 position of the currently selected listitem in a
+/// Returns the IMDb top250 position of the currently selected listitem in a
 /// container.
 /// }
 /// \table_row3{ `ListItem.Trailer`,
 /// \anchor ListItem_Trailer
 /// _string_,
-/// Shows the full trailer path with filename of the currently selected
+/// Returns the full trailer path with filename of the currently selected
 /// movie in a container
 /// }
 /// \table_row3{ `ListItem.Writer`,
@@ -3410,7 +3419,7 @@
 /// \table_row3{ `ListItem.IMDBNumber`,
 /// \anchor ListItem_IMDBNumber
 /// _string_,
-/// The IMDB iD of the selected Video in a container
+/// The IMDb ID of the selected Video in a container
 /// }
 /// \table_row3{ `ListItem.EpisodeName`,
 /// \anchor ListItem_EpisodeName
@@ -3441,7 +3450,7 @@
 /// \table_row3{ `ListItem.VideoCodec`,
 /// \anchor ListItem_VideoCodec
 /// _string_,
-/// Shows the video codec of the currently selected video (common values:
+/// Returns 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)
@@ -3449,7 +3458,7 @@
 /// \table_row3{ `ListItem.VideoResolution`,
 /// \anchor ListItem_VideoResolution
 /// _string_,
-/// Shows the resolution of the currently selected video (possible values:
+/// Returns 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.
@@ -3457,118 +3466,118 @@
 /// \table_row3{ `ListItem.VideoAspect`,
 /// \anchor ListItem_VideoAspect
 /// _string_,
-/// Shows the aspect ratio of the currently selected video (possible values:
+/// Returns 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{ `ListItem.AudioCodec`,
 /// \anchor ListItem_AudioCodec
 /// _string_,
-/// Shows the audio codec of the currently selected video (common values:
+/// Returns 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{ `ListItem.AudioChannels`,
 /// \anchor ListItem_AudioChannels
 /// _string_,
-/// Shows the number of audio channels of the currently selected video
+/// Returns the number of audio channels of the currently selected video
 /// (possible values: 1\, 2\, 4\, 5\, 6\, 8\, 10)
 /// }
 /// \table_row3{ `ListItem.AudioLanguage`,
 /// \anchor ListItem_AudioLanguage
 /// _string_,
-/// Shows the audio language of the currently selected video (returns an
+/// Returns the audio language of the currently selected video (returns an
 /// ISO 639-2 three character code\, e.g. eng\, epo\, deu)
 /// }
 /// \table_row3{ `ListItem.SubtitleLanguage`,
 /// \anchor ListItem_SubtitleLanguage
 /// _string_,
-/// Shows the subtitle language of the currently selected video (returns an
+/// Returns the subtitle language of the currently selected video (returns an
 /// ISO 639-2 three character code\, e.g. eng\, epo\, deu)
 /// }
 /// \table_row3{ `ListItem.Property(AudioCodec.[n])`,
 /// \anchor ListItem_Property_AudioCodec
 /// _string_,
-/// Shows the audio codec of the currently selected video\, 'n' defines the
+/// Returns the audio codec of the currently selected video\, 'n' defines the
 /// number of the audiostream (values: see \ref ListItem_AudioCodec "ListItem.AudioCodec")
 /// }
 /// \table_row3{ `ListItem.Property(AudioChannels.[n])`,
 /// \anchor ListItem_Property_AudioChannels
 /// _string_,
-/// Shows the number of audio channels of the currently selected video\, 'n'
+/// Returns 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{ `ListItem.Property(AudioLanguage.[n])`,
 /// \anchor ListItem_Property_AudioLanguage
 /// _string_,
-/// Shows the audio language of the currently selected video\, 'n' defines
+/// Returns the audio language of the currently selected video\, 'n' defines
 /// the number of the audiostream (values: see \ref ListItem_AudioLanguage "ListItem.AudioLanguage")
 /// }
 /// \table_row3{ `ListItem.Property(SubtitleLanguage.[n])`,
 /// \anchor ListItem_Property_SubtitleLanguage
 /// _string_,
-/// Shows the subtitle language of the currently selected video\, 'n' defines
+/// Returns the subtitle language of the currently selected video\, 'n' defines
 /// the number of the subtitle (values: see \ref ListItem_SubtitleLanguage "ListItem.SubtitleLanguage")
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Name)`,
 /// \anchor ListItem_Property_AddonName
 /// _string_,
-/// Shows the name of the currently selected addon
+/// Returns the name of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Version)`,
 /// \anchor ListItem_Property_AddonVersion
 /// _string_,
-/// Shows the version of the currently selected addon
+/// Returns the version of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Summary)`,
 /// \anchor ListItem_Property_AddonSummary
 /// _string_,
-/// Shows a short description of the currently selected addon
+/// Returns a short description of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Description)`,
 /// \anchor ListItem_Property_AddonDescription
 /// _string_,
-/// Shows the full description of the currently selected addon
+/// Returns the full description of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Type)`,
 /// \anchor ListItem_Property_AddonType
 /// _string_,
-/// Shows the type (screensaver\, script\, skin\, etc...) of the currently
+/// Returns the type (screensaver\, script\, skin\, etc...) of the currently
 /// selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Creator)`,
 /// \anchor ListItem_Property_AddonCreator
 /// _string_,
-/// Shows the name of the author the currently selected addon
+/// Returns the name of the author the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Disclaimer)`,
 /// \anchor ListItem_Property_AddonDisclaimer
 /// _string_,
-/// Shows the disclaimer of the currently selected addon
+/// Returns the disclaimer of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Changelog)`,
 /// \anchor ListItem_Property_AddonChangelog
 /// _string_,
-/// Shows the changelog of the currently selected addon
+/// Returns the changelog of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.ID)`,
 /// \anchor ListItem_Property_AddonID
 /// _string_,
-/// Shows the identifier of the currently selected addon
+/// Returns the identifier of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Status)`,
 /// \anchor ListItem_Property_AddonStatus
 /// _string_,
-/// Shows the status of the currently selected addon
+/// Returns the status of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Broken)`,
 /// \anchor ListItem_Property_AddonBroken
 /// _string_,
-/// Shows a message when the addon is marked as broken in the repo
+/// Returns a message when the addon is marked as broken in the repo
 /// }
 /// \table_row3{ `ListItem.Property(Addon.Path)`,
 /// \anchor ListItem_Property_AddonPath
 /// _string_,
-/// Shows the path of the currently selected addon
+/// Returns the path of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.StartTime`,
 /// \anchor ListItem_StartTime
@@ -3701,62 +3710,62 @@
 /// \table_row3{ `ListItem.IsParentFolder`,
 /// \anchor ListItem_IsParentFolder
 /// _boolean_,
-/// Todo
+/// Returns true if the current list item is the goto parent folder '..'
 /// }
 /// \table_row3{ `ListItem.AddonName`,
 /// \anchor ListItem_AddonName
 /// _string_,
-/// Todo
+/// Returns the name of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonVersion`,
 /// \anchor ListItem_AddonVersion
 /// _string_,
-/// Todo
+/// Returns the version of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonCreator`,
 /// \anchor ListItem_AddonCreator
 /// _string_,
-/// Todo
+/// Returns the name of the author the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonSummary`,
 /// \anchor ListItem_AddonSummary
 /// _string_,
-/// Todo
+/// Returns a short description of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonDescription`,
 /// \anchor ListItem_AddonDescription
 /// _string_,
-/// Todo
+/// Returns the full description of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonDisclaimer`,
 /// \anchor ListItem_AddonDisclaimer
 /// _string_,
-/// Todo
+/// Returns the disclaimer of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonBroken`,
 /// \anchor ListItem_AddonBroken
-/// _boolean_,
-/// Todo
+/// _string_,
+/// Returns a message when the addon is marked as broken in the repo
 /// }
 /// \table_row3{ `ListItem.AddonType`,
 /// \anchor ListItem_AddonType
 /// _string_,
-/// Todo
+/// Returns the type (screensaver, script, skin, etc...) of the currently selected addon
 /// }
 /// \table_row3{ `ListItem.AddonInstallDate`,
 /// \anchor ListItem_AddonInstallDate
 /// _string_,
-/// Todo
+/// Returns the date the addon was installed
 /// }
 /// \table_row3{ `ListItem.AddonLastUpdated`,
 /// \anchor ListItem_AddonLastUpdated
 /// _string_,
-/// Todo
+/// Returns the date the addon was last updated
 /// }
 /// \table_row3{ `ListItem.AddonLastUsed`,
 /// \anchor ListItem_AddonLastUsed
 /// _string_,
-/// Todo
+/// Returns the date the addon was used last
 /// }
 // \table_row3{ `ListItem.AddonOrigin`,
 /// \anchor ListItem_AddonOrigin
@@ -3980,12 +3989,12 @@
 /// \table_row3{ `Visualisation.Preset`,
 /// \anchor Visualisation_Preset
 /// _string_,
-/// Shows the current preset of the visualisation.
+/// Returns the current preset of the visualisation.
 /// }
 /// \table_row3{ `Visualisation.Name`,
 /// \anchor Visualisation_Name
 /// _string_,
-/// Shows the name of the visualisation.
+/// Returns the name of the visualisation.
 /// }
 /// \table_end
 ///
@@ -4026,7 +4035,7 @@
 /// \table_row3{ `Fanart.Image`,
 /// \anchor Fanart_Image
 /// _string_,
-/// todo
+/// Returns the fanart image\, if any
 /// }
 /// \table_end
 ///
@@ -4044,23 +4053,23 @@
 /// \table_h3{ Labels, Type, Description }
 /// \table_row3{ `Skin.CurrentTheme`,
 /// \anchor Skin_CurrentTheme
-/// _boolean_,
-/// todo
+/// _string_,
+/// Returns the current selected skin theme.
 /// }
 /// \table_row3{ `Skin.CurrentColourTheme`,
 /// \anchor Skin_CurrentColourTheme
-/// _boolean_,
-/// todo
+/// _string_,
+/// Returns the current selected colour theme of the skin.
 /// }
 /// \table_row3{ `Skin.AspectRatio`,
 /// \anchor Skin_AspectRatio
-/// _boolean_,
-/// todo
+/// _string_,
+/// Returns the closest aspect ratio match using the resolution info from the skin's addon.xml file.
 /// }
 /// \table_row3{ `Skin.Font`,
 /// \anchor Skin_Font
 /// _string_,
-/// todo
+/// Returns the current fontset from Font.xml.
 /// }
 /// \table_end
 ///
@@ -4085,13 +4094,14 @@
 /// \table_row3{ `Window.Is(window)`,
 /// \anchor Window_Is
 /// _boolean_,
-/// todo
+/// Returns true if the window with the given name is the window which is currently rendered.
+/// Useful in xml files that are shared between multiple windows or dialogs.
 /// }
 /// \table_row3{ `Window.IsActive(window)`,
 /// \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"
+/// Returns true if the window with id or title _window_ is active
+/// (excludes fade out time on dialogs)
 /// }
 /// \table_row3{ `Window.IsVisible(window)`,
 /// \anchor Window_IsVisible
@@ -4103,7 +4113,7 @@
 /// _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"
+///
 /// \deprecated use `Window.IsDialogTopmost(dialog)` instead
 /// }
 /// \table_row3{ `Window.IsDialogTopmost(dialog)`,
@@ -4111,28 +4121,24 @@
 /// _boolean_,
 /// Returns true if the dialog with id or title _dialog_ is on top of the
 /// dialog stack (excludes fade out time on dialogs)
-/// \ref modules__General__Window_IDs "See here for a list of windows"
 /// }
 /// \table_row3{ `Window.IsModalDialogTopmost(dialog)`,
 /// \anchor Window_IsModalDialogTopmost
 /// _boolean_,
 /// Returns true if the dialog with id or title _dialog_ is on top of the
 /// modal dialog stack (excludes fade out time on dialogs)
-/// \ref modules__General__Window_IDs "See here for a list of windows"
 /// }
 /// \table_row3{ `Window.Previous(window)`,
 /// \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.
+/// Only valid while windows are changing.
 /// }
 /// \table_row3{ `Window.Next(window)`,
 /// \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.
+/// Only valid while windows are changing.
 /// }
 /// \table_end
 ///
@@ -4243,393 +4249,393 @@
 /// @{
 /// \table_start
 /// \table_h3{ Labels, Type, Description }
-/// \table_row3{ `Pvr.IsRecording`,
-/// \anchor Pvr_IsRecording
+/// \table_row3{ `PVR.IsRecording`,
+/// \anchor PVR_IsRecording
 /// _boolean_,
 /// Returns true when the system is recording a tv or radio programme.
 /// }
-/// \table_row3{ `Pvr.HasTimer`,
-/// \anchor Pvr_HasTimer
+/// \table_row3{ `PVR.HasTimer`,
+/// \anchor PVR_HasTimer
 /// _boolean_,
 /// Returns true when a recording timer is active.
 /// }
-/// \table_row3{ `Pvr.HasTVChannels`,
-/// \anchor Pvr_HasTVChannels
+/// \table_row3{ `PVR.HasTVChannels`,
+/// \anchor PVR_HasTVChannels
 /// _boolean_,
 /// Returns true if there are TV channels available
 /// }
-/// \table_row3{ `Pvr.HasRadioChannels`,
-/// \anchor Pvr_HasRadioChannels
+/// \table_row3{ `PVR.HasRadioChannels`,
+/// \anchor PVR_HasRadioChannels
 /// _boolean_,
 /// Returns true if there are radio channels available
 /// }
-/// \table_row3{ `Pvr.HasNonRecordingTimer`,
-/// \anchor Pvr_HasNonRecordingTimer
+/// \table_row3{ `PVR.HasNonRecordingTimer`,
+/// \anchor PVR_HasNonRecordingTimer
 /// _boolean_,
 /// Returns true if there are timers present who currently not do recording
 /// }
-/// \table_row3{ `Pvr.NowRecordingTitle`,
-/// \anchor Pvr_NowRecordingTitle
+/// \table_row3{ `PVR.NowRecordingTitle`,
+/// \anchor PVR_NowRecordingTitle
 /// _string_,
 /// Title of the programme being recorded
 /// }
-/// \table_row3{ `Pvr.NowRecordingDateTime`,
-/// \anchor Pvr_NowRecordingDateTime
+/// \table_row3{ `PVR.NowRecordingDateTime`,
+/// \anchor PVR_NowRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the current recording
 /// }
-/// \table_row3{ `Pvr.NowRecordingChannel`,
-/// \anchor Pvr_NowRecordingChannel
+/// \table_row3{ `PVR.NowRecordingChannel`,
+/// \anchor PVR_NowRecordingChannel
 /// _string_,
 /// Channel name of the current recording
 /// }
-/// \table_row3{ `Pvr.NowRecordingChannelIcon`,
-/// \anchor Pvr_NowRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.NowRecordingChannelIcon`,
+/// \anchor PVR_NowRecordingChannelIcon
+/// _string_,
 /// Icon of the current recording channel
 /// }
-/// \table_row3{ `Pvr.NextRecordingTitle`,
-/// \anchor Pvr_NextRecordingTitle
+/// \table_row3{ `PVR.NextRecordingTitle`,
+/// \anchor PVR_NextRecordingTitle
 /// _string_,
 /// Title of the next programme that will be recorded
 /// }
-/// \table_row3{ `Pvr.NextRecordingDateTime`,
-/// \anchor Pvr_NextRecordingDateTime
+/// \table_row3{ `PVR.NextRecordingDateTime`,
+/// \anchor PVR_NextRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the next recording
 /// }
-/// \table_row3{ `Pvr.NextRecordingChannel`,
-/// \anchor Pvr_NextRecordingChannel
+/// \table_row3{ `PVR.NextRecordingChannel`,
+/// \anchor PVR_NextRecordingChannel
 /// _string_,
 /// Channel name of the next recording
 /// }
-/// \table_row3{ `Pvr.NextRecordingChannelIcon`,
-/// \anchor Pvr_NextRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.NextRecordingChannelIcon`,
+/// \anchor PVR_NextRecordingChannelIcon
+/// _string_,
 /// Icon of the next recording channel
 /// }
-/// \table_row3{ `Pvr.BackendName`,
-/// \anchor Pvr_BackendName
+/// \table_row3{ `PVR.BackendName`,
+/// \anchor PVR_BackendName
 /// _string_,
 /// Name of the backend being used
 /// }
-/// \table_row3{ `Pvr.BackendVersion`,
-/// \anchor Pvr_BackendVersion
+/// \table_row3{ `PVR.BackendVersion`,
+/// \anchor PVR_BackendVersion
 /// _string_,
 /// Version of the backend that's being used
 /// }
-/// \table_row3{ `Pvr.BackendHost`,
-/// \anchor Pvr_BackendHost
+/// \table_row3{ `PVR.BackendHost`,
+/// \anchor PVR_BackendHost
 /// _string_,
 /// Backend hostname
 /// }
-/// \table_row3{ `Pvr.BackendDiskSpace`,
-/// \anchor Pvr_BackendDiskSpace
+/// \table_row3{ `PVR.BackendDiskSpace`,
+/// \anchor PVR_BackendDiskSpace
 /// _string_,
 /// Available diskspace on the backend as string with size
 /// }
-/// \table_row3{ `Pvr.BackendDiskSpaceProgr`,
-/// \anchor Pvr_BackendDiskSpaceProgr
+/// \table_row3{ `PVR.BackendDiskSpaceProgr`,
+/// \anchor PVR_BackendDiskSpaceProgr
 /// _integer_,
 /// Available diskspace on the backend as percent value
 /// }
-/// \table_row3{ `Pvr.BackendChannels`,
-/// \anchor Pvr_BackendChannels
+/// \table_row3{ `PVR.BackendChannels`,
+/// \anchor PVR_BackendChannels
 /// _string (integer)_,
 /// Number of available channels the backend provides
 /// }
-/// \table_row3{ `Pvr.BackendTimers`,
-/// \anchor Pvr_BackendTimers
+/// \table_row3{ `PVR.BackendTimers`,
+/// \anchor PVR_BackendTimers
 /// _string (integer)_,
 /// Number of timers set for the backend
 /// }
-/// \table_row3{ `Pvr.BackendRecordings`,
-/// \anchor Pvr_BackendRecordings
+/// \table_row3{ `PVR.BackendRecordings`,
+/// \anchor PVR_BackendRecordings
 /// _string (integer)_,
 /// Number of recording available on the backend
 /// }
-/// \table_row3{ `Pvr.BackendDeletedRecordings`,
-/// \anchor Pvr_BackendDeletedRecordings
+/// \table_row3{ `PVR.BackendDeletedRecordings`,
+/// \anchor PVR_BackendDeletedRecordings
 /// _string (integer)_,
 /// Number of deleted recording present on the backend
 /// }
-/// \table_row3{ `Pvr.BackendNumber`,
-/// \anchor Pvr_BackendNumber
+/// \table_row3{ `PVR.BackendNumber`,
+/// \anchor PVR_BackendNumber
 /// _string_,
 /// Backend number
 /// }
-/// \table_row3{ `Pvr.TotalDiscSpace`,
-/// \anchor Pvr_TotalDiscSpace
+/// \table_row3{ `PVR.TotalDiscSpace`,
+/// \anchor PVR_TotalDiscSpace
 /// _string_,
 /// Total diskspace available for recordings
 /// }
-/// \table_row3{ `Pvr.NextTimer`,
-/// \anchor Pvr_NextTimer
+/// \table_row3{ `PVR.NextTimer`,
+/// \anchor PVR_NextTimer
 /// _boolean_,
 /// Next timer date
 /// }
-/// \table_row3{ `Pvr.IsPlayingTv`,
-/// \anchor Pvr_IsPlayingTv
+/// \table_row3{ `PVR.IsPlayingTV`,
+/// \anchor PVR_IsPlayingTV
 /// _boolean_,
 /// Returns true when live tv is being watched.
 /// }
-/// \table_row3{ `Pvr.IsPlayingRadio`,
-/// \anchor Pvr_IsPlayingRadio
+/// \table_row3{ `PVR.IsPlayingRadio`,
+/// \anchor PVR_IsPlayingRadio
 /// _boolean_,
 /// Returns true when live radio is being listened to.
 /// }
-/// \table_row3{ `Pvr.IsPlayingRecording`,
-/// \anchor Pvr_IsPlayingRecording
+/// \table_row3{ `PVR.IsPlayingRecording`,
+/// \anchor PVR_IsPlayingRecording
 /// _boolean_,
 /// Returns true when a recording is being watched.
 /// }
-/// \table_row3{ `Pvr.IsPlayingEpgTag`,
-/// \anchor Pvr_IsPlayingEpgTag
+/// \table_row3{ `PVR.IsPlayingEpgTag`,
+/// \anchor PVR_IsPlayingEpgTag
 /// _boolean_,
 /// Returns true when an epg tag is being watched.
 /// }
-/// \table_row3{ `Pvr.EpgEventDuration`,
-/// \anchor Pvr_EpgEventDuration
+/// \table_row3{ `PVR.EpgEventDuration`,
+/// \anchor PVR_EpgEventDuration
 /// _string_,
 /// Returns the duration of the currently playing epg event
 /// }
-/// \table_row3{ `Pvr.EpgEventElapsedTime`,
-/// \anchor Pvr_EpgEventElapsedTime
+/// \table_row3{ `PVR.EpgEventElapsedTime`,
+/// \anchor PVR_EpgEventElapsedTime
 /// _string_,
 /// Returns the time of the current position of the currently playing epg event
 /// }
-/// \table_row3{ `Pvr.EpgEventRemainingTime`,
-/// \anchor Pvr_EpgEventRemainingTime
+/// \table_row3{ `PVR.EpgEventRemainingTime`,
+/// \anchor PVR_EpgEventRemainingTime
 /// _string_,
 /// Returns the remaining time for currently playing epg event
 /// }
-/// \table_row3{ `Pvr.EpgEventFinishTime`,
-/// \anchor Pvr_EpgEventFinishTime
+/// \table_row3{ `PVR.EpgEventFinishTime`,
+/// \anchor PVR_EpgEventFinishTime
 /// _string_,
 /// Returns the time the currently playing epg event will end
 /// }
-/// \table_row3{ `Pvr.EpgEventProgress`,
-/// \anchor Pvr_EpgEventProgress
+/// \table_row3{ `PVR.EpgEventProgress`,
+/// \anchor PVR_EpgEventProgress
 /// _integer_,
 /// Returns the percentage complete of the currently playing epg event
 /// }
-/// \table_row3{ `Pvr.ActStreamClient`,
-/// \anchor Pvr_ActStreamClient
+/// \table_row3{ `PVR.ActStreamClient`,
+/// \anchor PVR_ActStreamClient
 /// _string_,
 /// Stream client name
 /// }
-/// \table_row3{ `Pvr.ActStreamDevice`,
-/// \anchor Pvr_ActStreamDevice
+/// \table_row3{ `PVR.ActStreamDevice`,
+/// \anchor PVR_ActStreamDevice
 /// _string_,
 /// Stream device name
 /// }
-/// \table_row3{ `Pvr.ActStreamStatus`,
-/// \anchor Pvr_ActStreamStatus
+/// \table_row3{ `PVR.ActStreamStatus`,
+/// \anchor PVR_ActStreamStatus
 /// _string_,
 /// Status of the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamSignal`,
-/// \anchor Pvr_ActStreamSignal
+/// \table_row3{ `PVR.ActStreamSignal`,
+/// \anchor PVR_ActStreamSignal
 /// _string_,
 /// Signal quality of the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamSnr`,
-/// \anchor Pvr_ActStreamSnr
+/// \table_row3{ `PVR.ActStreamSnr`,
+/// \anchor PVR_ActStreamSnr
 /// _string_,
 /// Signal to noise ratio of the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamBer`,
-/// \anchor Pvr_ActStreamBer
+/// \table_row3{ `PVR.ActStreamBer`,
+/// \anchor PVR_ActStreamBer
 /// _string_,
 /// Bit error rate of the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamUnc`,
-/// \anchor Pvr_ActStreamUnc
+/// \table_row3{ `PVR.ActStreamUnc`,
+/// \anchor PVR_ActStreamUnc
 /// _string_,
 /// UNC value of the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamProgrSignal`,
-/// \anchor Pvr_ActStreamProgrSignal
+/// \table_row3{ `PVR.ActStreamProgrSignal`,
+/// \anchor PVR_ActStreamProgrSignal
 /// _integer_,
 /// Signal quality of the programme
 /// }
-/// \table_row3{ `Pvr.ActStreamProgrSnr`,
-/// \anchor Pvr_ActStreamProgrSnr
+/// \table_row3{ `PVR.ActStreamProgrSnr`,
+/// \anchor PVR_ActStreamProgrSnr
 /// _integer_,
 /// Signal to noise ratio of the programme
 /// }
-/// \table_row3{ `Pvr.ActStreamIsEncrypted`,
-/// \anchor Pvr_ActStreamIsEncrypted
+/// \table_row3{ `PVR.ActStreamIsEncrypted`,
+/// \anchor PVR_ActStreamIsEncrypted
 /// _boolean_,
 /// Returns true when channel is encrypted on source
 /// }
-/// \table_row3{ `Pvr.ActStreamEncryptionName`,
-/// \anchor Pvr_ActStreamEncryptionName
+/// \table_row3{ `PVR.ActStreamEncryptionName`,
+/// \anchor PVR_ActStreamEncryptionName
 /// _string_,
 /// Encryption used on the stream
 /// }
-/// \table_row3{ `Pvr.ActStreamServiceName`,
-/// \anchor Pvr_ActStreamServiceName
+/// \table_row3{ `PVR.ActStreamServiceName`,
+/// \anchor PVR_ActStreamServiceName
 /// _string_,
 /// Returns the service name of played channel if available
 /// }
-/// \table_row3{ `Pvr.ActStreamMux`,
-/// \anchor Pvr_ActStreamMux
+/// \table_row3{ `PVR.ActStreamMux`,
+/// \anchor PVR_ActStreamMux
 /// _string_,
 /// Returns the multiplex type of played channel if available
 /// }
-/// \table_row3{ `Pvr.ActStreamProviderName`,
-/// \anchor Pvr_ActStreamProviderName
+/// \table_row3{ `PVR.ActStreamProviderName`,
+/// \anchor PVR_ActStreamProviderName
 /// _string_,
 /// Returns the provider name of the played channel if available
 /// }
-/// \table_row3{ `Pvr.IsTimeShift`,
-/// \anchor Pvr_IsTimeShift
+/// \table_row3{ `PVR.IsTimeShift`,
+/// \anchor PVR_IsTimeShift
 /// _boolean_,
 /// Returns true when for channel is timeshift available
 /// }
-/// \table_row3{ `Pvr.TimeShiftStart`,
-/// \anchor Pvr_TimeShiftStart
+/// \table_row3{ `PVR.TimeShiftStart`,
+/// \anchor PVR_TimeShiftStart
 /// _time string_,
 /// Start position of the timeshift
 /// }
-/// \table_row3{ `Pvr.TimeShiftEnd`,
-/// \anchor Pvr_TimeShiftEnd
+/// \table_row3{ `PVR.TimeShiftEnd`,
+/// \anchor PVR_TimeShiftEnd
 /// _time string_,
 /// End position of the timeshift
 /// }
-/// \table_row3{ `Pvr.TimeShiftCur`,
-/// \anchor Pvr_TimeShiftCur
+/// \table_row3{ `PVR.TimeShiftCur`,
+/// \anchor PVR_TimeShiftCur
 /// _time string_,
 /// Current position of the timeshift
 /// }
-/// \table_row3{ `Pvr.TimeShiftProgress`,
-/// \anchor Pvr_TimeShiftProgress
+/// \table_row3{ `PVR.TimeShiftProgress`,
+/// \anchor PVR_TimeShiftProgress
 /// _integer_,
 /// Returns the position of currently timeshifted title on TV as integer
 /// }
-/// \table_row3{ `Pvr.TVNowRecordingTitle`,
-/// \anchor Pvr_TVNowRecordingTitle
+/// \table_row3{ `PVR.TVNowRecordingTitle`,
+/// \anchor PVR_TVNowRecordingTitle
 /// _string_,
 /// Title of the tv programme being recorded
 /// }
-/// \table_row3{ `Pvr.TVNowRecordingDateTime`,
-/// \anchor Pvr_TVNowRecordingDateTime
+/// \table_row3{ `PVR.TVNowRecordingDateTime`,
+/// \anchor PVR_TVNowRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the current tv recording
 /// }
-/// \table_row3{ `Pvr.TVNowRecordingChannel`,
-/// \anchor Pvr_TVNowRecordingChannel
+/// \table_row3{ `PVR.TVNowRecordingChannel`,
+/// \anchor PVR_TVNowRecordingChannel
 /// _string_,
 /// Channel name of the current tv recording
 /// }
-/// \table_row3{ `Pvr.TVNowRecordingChannelIcon`,
-/// \anchor Pvr_TVNowRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.TVNowRecordingChannelIcon`,
+/// \anchor PVR_TVNowRecordingChannelIcon
+/// _string_,
 /// Icon of the current recording TV channel
 /// }
-/// \table_row3{ `Pvr.TVNextRecordingTitle`,
-/// \anchor Pvr_TVNextRecordingTitle
+/// \table_row3{ `PVR.TVNextRecordingTitle`,
+/// \anchor PVR_TVNextRecordingTitle
 /// _string_,
 /// Title of the next tv programme that will be recorded
 /// }
-/// \table_row3{ `Pvr.TVNextRecordingDateTime`,
-/// \anchor Pvr_TVNextRecordingDateTime
+/// \table_row3{ `PVR.TVNextRecordingDateTime`,
+/// \anchor PVR_TVNextRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the next tv recording
 /// }
-/// \table_row3{ `Pvr.TVNextRecordingChannel`,
-/// \anchor Pvr_TVNextRecordingChannel
+/// \table_row3{ `PVR.TVNextRecordingChannel`,
+/// \anchor PVR_TVNextRecordingChannel
 /// _string_,
 /// Channel name of the next tv recording
 /// }
-/// \table_row3{ `Pvr.TVNextRecordingChannelIcon`,
-/// \anchor Pvr_TVNextRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.TVNextRecordingChannelIcon`,
+/// \anchor PVR_TVNextRecordingChannelIcon
+/// ,
 /// Icon of the next recording tv channel
 /// }
-/// \table_row3{ `Pvr.RadioNowRecordingTitle`,
-/// \anchor Pvr_RadioNowRecordingTitle
+/// \table_row3{ `PVR.RadioNowRecordingTitle`,
+/// \anchor PVR_RadioNowRecordingTitle
 /// _string_,
 /// Title of the radio programme being recorded
 /// }
-/// \table_row3{ `Pvr.RadioNowRecordingDateTime`,
-/// \anchor Pvr_RadioNowRecordingDateTime
+/// \table_row3{ `PVR.RadioNowRecordingDateTime`,
+/// \anchor PVR_RadioNowRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the current radio recording
 /// }
-/// \table_row3{ `Pvr.RadioNowRecordingChannel`,
-/// \anchor Pvr_RadioNowRecordingChannel
+/// \table_row3{ `PVR.RadioNowRecordingChannel`,
+/// \anchor PVR_RadioNowRecordingChannel
 /// _string_,
 /// Channel name of the current radio recording
 /// }
-/// \table_row3{ `Pvr.RadioNowRecordingChannelIcon`,
-/// \anchor Pvr_RadioNowRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.RadioNowRecordingChannelIcon`,
+/// \anchor PVR_RadioNowRecordingChannelIcon
+/// _string_,
 /// Icon of the current recording radio channel
 /// }
-/// \table_row3{ `Pvr.RadioNextRecordingTitle`,
-/// \anchor Pvr_RadioNextRecordingTitle
+/// \table_row3{ `PVR.RadioNextRecordingTitle`,
+/// \anchor PVR_RadioNextRecordingTitle
 /// _string_,
 /// Title of the next radio programme that will be recorded
 /// }
-/// \table_row3{ `Pvr.RadioNextRecordingDateTime`,
-/// \anchor Pvr_RadioNextRecordingDateTime
+/// \table_row3{ `PVR.RadioNextRecordingDateTime`,
+/// \anchor PVR_RadioNextRecordingDateTime
 /// _Date/Time string_,
 /// Start date and time of the next radio recording
 /// }
-/// \table_row3{ `Pvr.RadioNextRecordingChannel`,
-/// \anchor Pvr_RadioNextRecordingChannel
+/// \table_row3{ `PVR.RadioNextRecordingChannel`,
+/// \anchor PVR_RadioNextRecordingChannel
 /// _string_,
 /// Channel name of the next radio recording
 /// }
-/// \table_row3{ `Pvr.RadioNextRecordingChannelIcon`,
-/// \anchor Pvr_RadioNextRecordingChannelIcon
-/// _path_,
+/// \table_row3{ `PVR.RadioNextRecordingChannelIcon`,
+/// \anchor PVR_RadioNextRecordingChannelIcon
+/// _string_,
 /// Icon of the next recording radio channel
 /// }
-/// \table_row3{ `Pvr.IsRecordingTV`,
-/// \anchor Pvr_IsRecordingTV
+/// \table_row3{ `PVR.IsRecordingTV`,
+/// \anchor PVR_IsRecordingTV
 /// _boolean_,
 /// Returns true when the system is recording a tv programme.
 /// }
-/// \table_row3{ `Pvr.HasTVTimer`,
-/// \anchor Pvr_HasTVTimer
+/// \table_row3{ `PVR.HasTVTimer`,
+/// \anchor PVR_HasTVTimer
 /// _boolean_,
 /// Returns true if at least one tv timer is active.
 /// }
-/// \table_row3{ `Pvr.HasNonRecordingTVTimer`,
-/// \anchor Pvr_HasNonRecordingTVTimer
+/// \table_row3{ `PVR.HasNonRecordingTVTimer`,
+/// \anchor PVR_HasNonRecordingTVTimer
 /// _boolean_,
 /// Returns true if there are tv timers present who currently not do recording
 /// }
-/// \table_row3{ `Pvr.IsRecordingRadio`,
-/// \anchor Pvr_IsRecordingRadio
+/// \table_row3{ `PVR.IsRecordingRadio`,
+/// \anchor PVR_IsRecordingRadio
 /// _boolean_,
 /// Returns true when the system is recording a radio programme.
 /// }
-/// \table_row3{ `Pvr.HasRadioTimer`,
-/// \anchor Pvr_HasRadioTimer
+/// \table_row3{ `PVR.HasRadioTimer`,
+/// \anchor PVR_HasRadioTimer
 /// _boolean_,
 /// Returns true if at least one radio timer is active.
 /// }
-/// \table_row3{ `Pvr.HasNonRecordingRadioTimer`,
-/// \anchor Pvr_HasNonRecordingRadioTimer
+/// \table_row3{ `PVR.HasNonRecordingRadioTimer`,
+/// \anchor PVR_HasNonRecordingRadioTimer
 /// _boolean_,
 /// Returns true if there are radio timers present who currently not do recording
 /// }
-/// \table_row3{ `Pvr.ChannelNumberInput`,
-/// \anchor Pvr_ChannelNumberInput
+/// \table_row3{ `PVR.ChannelNumberInput`,
+/// \anchor PVR_ChannelNumberInput
 /// _string_,
 /// Returns the currently entered channel number while in numeric channel input mode, an empty string otherwise
 /// }
-/// \table_row3{ `Pvr.CanRecordPlayingChannel`,
-/// \anchor Pvr_CanRecordPlayingChannel
+/// \table_row3{ `PVR.CanRecordPlayingChannel`,
+/// \anchor PVR_CanRecordPlayingChannel
 /// _boolean_,
 /// Returns true if PVR is currently playing a channel and if this channel can be recorded.
 /// }
-/// \table_row3{ `Pvr.IsRecordingPlayingChannel`,
-/// \anchor Pvr_IsRecordingPlayingChannel
+/// \table_row3{ `PVR.IsRecordingPlayingChannel`,
+/// \anchor PVR_IsRecordingPlayingChannel
 /// _boolean_,
 /// Returns true if PVR is currently playing a channel and if this channel is currently recorded.
 /// }
@@ -4791,12 +4797,12 @@
 /// }
 /// \table_row3{ `ADSP.MasterOwnIcon`,
 /// \anchor ADSP_MasterOwnIcon
-/// _path_,
+/// _string_,
 /// Icon to use for selected master mode
 /// }
 /// \table_row3{ `ADSP.MasterOverrideIcon`,
 /// \anchor ADSP_MasterOverrideIcon
-/// _path_,
+/// _string_,
 /// Icon to override Kodi's codec icon with one of add-on\, e.g. Dolby
 /// Digital EX on Dolby Digital
 /// }
@@ -5905,7 +5911,7 @@
 }
 if (info.name == "art")
 return AddListItemProp(info.param(), LISTITEM_ART_OFFSET);
- if (info.name == "ratings")
+ if (info.name == "rating")
 return AddListItemProp(info.param(), LISTITEM_RATING_OFFSET);
 if (info.name == "votes")
 return AddListItemProp(info.param(), LISTITEM_VOTES_OFFSET);
@@ -5987,6 +5993,8 @@
 return strLabel;
 }
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 switch (info)
 {
 case PVR_NEXT_RECORDING_CHANNEL:
@@ -6277,7 +6285,7 @@
 strLabel = m_audioInfo.language;
 break;
 case VIDEOPLAYER_STEREOSCOPIC_MODE:
- strLabel = m_videoInfo.stereoMode;
+ strLabel = CServiceBroker::GetDataCacheCore().GetVideoStereoMode();
 break;
 case VIDEOPLAYER_SUBTITLES_LANG:
 if (g_application.GetAppPlayer().GetSubtitleVisible())
@@ -6576,15 +6584,14 @@
 strLabel = StringUtils::Format("%i", g_graphicsContext.GetResInfo().iScreenHeight);
 break;
 case SYSTEM_CURRENT_WINDOW:
- return g_localizeStrings.Get(g_windowManager.GetFocusedWindow());
- break;
+ return g_localizeStrings.Get(g_windowManager.GetActiveWindowOrDialog());
 case SYSTEM_STARTUP_WINDOW:
 strLabel = StringUtils::Format("%i", CServiceBroker::GetSettings().GetInt(CSettings::SETTING_LOOKANDFEEL_STARTUPWINDOW));
 break;
 case SYSTEM_CURRENT_CONTROL:
 case SYSTEM_CURRENT_CONTROL_ID:
 {
- CGUIWindow *window = g_windowManager.GetWindow(g_windowManager.GetFocusedWindow());
+ CGUIWindow *window = g_windowManager.GetWindow(g_windowManager.GetActiveWindowOrDialog());
 if (window)
 {
 CGUIControl *control = window->GetFocusedControl();
@@ -6616,15 +6623,15 @@
 }
 break;
 case SYSTEM_PROFILENAME:
- strLabel = CProfilesManager::GetInstance().GetCurrentProfile().getName();
+ strLabel = profileManager.GetCurrentProfile().getName();
 break;
 case SYSTEM_PROFILECOUNT:
- strLabel = StringUtils::Format("{0}", CProfilesManager::GetInstance().GetNumberOfProfiles());
+ strLabel = StringUtils::Format("{0}", profileManager.GetNumberOfProfiles());
 break;
 case SYSTEM_PROFILEAUTOLOGIN:
 {
- int profileId = CProfilesManager::GetInstance().GetAutoLoginProfileId();
- if ((profileId < 0) || (!CProfilesManager::GetInstance().GetProfileName(profileId, strLabel)))
+ int profileId = profileManager.GetAutoLoginProfileId();
+ if ((profileId < 0) || (!profileManager.GetProfileName(profileId, strLabel)))
 strLabel = g_localizeStrings.Get(37014); // Last used profile
 }
 break;
@@ -6865,7 +6872,7 @@
 case PVR_ACTUAL_STREAM_SNR_PROGR:
 case PVR_BACKEND_DISKSPACE_PROGR:
 case PVR_TIMESHIFT_PROGRESS:
- value = CServiceBroker::GetPVRManager().TranslateIntInfo(info);
+ value = CServiceBroker::GetPVRManager().TranslateIntInfo(*m_currentFile, info);
 return true;
 case SYSTEM_BATTERY_LEVEL:
 value = CServiceBroker::GetPowerManager().BatteryLevel();
@@ -6955,7 +6962,10 @@
 }
 }
 }
- else {
+ else
+ {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 switch (condition)
 {
 // Ethernet Link state checking
@@ -7073,7 +7083,7 @@
 bReturn = IsPlayerChannelPreviewActive();
 break;
 case SYSTEM_HASLOCKS:
- bReturn = CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE;
+ bReturn = profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE;
 break;
 case SYSTEM_HAS_PVR:
 bReturn = true;
@@ -7097,7 +7107,7 @@
 #endif
 break;
 case SYSTEM_ISMASTER:
- bReturn = CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && g_passwordManager.bMasterUser;
+ bReturn = profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && g_passwordManager.bMasterUser;
 break;
 case SYSTEM_ISFULLSCREEN:
 bReturn = CServiceBroker::GetWinSystem().IsFullScreen();
@@ -7118,7 +7128,7 @@
 bReturn = g_advancedSettings.m_showExitButton;
 break;
 case SYSTEM_HAS_LOGINSCREEN:
- bReturn = CProfilesManager::GetInstance().UsingLoginScreen();
+ bReturn = profileManager.UsingLoginScreen();
 break;
 case SYSTEM_HAS_ACTIVE_MODAL_DIALOG:
 bReturn = g_windowManager.HasModalDialog();
@@ -7421,7 +7431,7 @@
 bReturn = (m_currentFile->GetPVRChannelInfoTag()->GetEPGNow().get() != NULL);
 break;
 case VIDEOPLAYER_IS_STEREOSCOPIC:
- bReturn = !m_videoInfo.stereoMode.empty();
+ bReturn = !CServiceBroker::GetDataCacheCore().GetVideoStereoMode().empty();
 break;
 case VIDEOPLAYER_CAN_RESUME_LIVE_TV:
 if (m_currentFile->HasPVRRecordingInfoTag())
@@ -8253,7 +8263,9 @@
 return CServiceBroker::GetWeatherManager().GetInfo(WEATHER_IMAGE_CURRENT_ICON);
 else if (info == SYSTEM_PROFILETHUMB)
 {
- std::string thumb = CProfilesManager::GetInstance().GetCurrentProfile().getThumb();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string thumb = profileManager.GetCurrentProfile().getThumb();
 if (thumb.empty())
 thumb = "DefaultUser.png";
 return thumb;

_service:download_files:master.tar.gz/xbmc/GUIInfoManager.h Changed

_service:download_files:master.tar.gz/xbmc/GUILargeTextureManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/GUILargeTextureManager.h Changed

_service:download_files:master.tar.gz/xbmc/GUIPassword.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -52,11 +52,13 @@
 
 bool CGUIPassword::IsItemUnlocked(CFileItem* pItem, const std::string &strType)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // \brief Tests if the user is allowed to access the share folder
 // \param pItem The share folder item to access
 // \param strType The type of share being accessed, e.g. "music", "video", etc. See CSettings::UpdateSources()
 // \return If access is granted, returns \e true
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
+ if (profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
 return true;
 
 while (pItem->m_iHasLock > 1)
@@ -128,18 +130,26 @@
 {
 // prompt user for mastercode if the mastercode was set b4 or by xml
 int iVerifyPasswordResult = -1;
+
 std::string strHeader = g_localizeStrings.Get(20075);
+
 if (iMasterLockRetriesLeft == -1)
 iMasterLockRetriesLeft = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES);
- if (g_passwordManager.iMasterLockRetriesLeft == 0) g_passwordManager.iMasterLockRetriesLeft = 1;
- std::string strPassword = CProfilesManager::GetInstance().GetMasterProfile().getLockCode();
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == 0)
+
+ if (g_passwordManager.iMasterLockRetriesLeft == 0)
+ g_passwordManager.iMasterLockRetriesLeft = 1;
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string strPassword = profileManager.GetMasterProfile().getLockCode();
+
+ if (profileManager.GetMasterProfile().getLockMode() == 0)
 iVerifyPasswordResult = 0;
 else
 {
 for (int i=1; i <= g_passwordManager.iMasterLockRetriesLeft; i++)
 {
- iVerifyPasswordResult = VerifyPassword(CProfilesManager::GetInstance().GetMasterProfile().getLockMode(), strPassword, strHeader);
+ iVerifyPasswordResult = VerifyPassword(profileManager.GetMasterProfile().getLockMode(), strPassword, strHeader);
 if (iVerifyPasswordResult != 0 )
 {
 std::string strLabel1;
@@ -169,7 +179,9 @@
 
 bool CGUIPassword::SetMasterLockMode(bool bDetails)
 {
- CProfile* profile = CProfilesManager::GetInstance().GetProfile(0);
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ CProfile* profile = profileManager.GetProfile(0);
 if (profile)
 {
 CProfile::CLock locks = profile->GetLocks();
@@ -192,14 +204,18 @@
 {
 if (g_passwordManager.bMasterUser)
 return true;
- int iProfileToCheck=iProfile;
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ int iProfileToCheck = iProfile;
 if (iProfile == -1)
- iProfileToCheck = CProfilesManager::GetInstance().GetCurrentProfileIndex();
+ iProfileToCheck = profileManager.GetCurrentProfileIndex();
+
 if (iProfileToCheck == 0)
 return IsMasterLockUnlocked(prompt,bCanceled);
 else
 {
- CProfile *profile = CProfilesManager::GetInstance().GetProfile(iProfileToCheck);
+ const CProfile *profile = profileManager.GetProfile(iProfileToCheck);
 if (!profile)
 return false;
 
@@ -207,7 +223,7 @@
 return (profile->getLockMode() == LOCK_MODE_EVERYONE);
 
 if (profile->getDate().empty() &&
- (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ (profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
 profile->getLockMode() == LOCK_MODE_EVERYONE))
 {
 // user hasn't set a password and this is the first time they've used this account
@@ -216,8 +232,10 @@
 return true;
 }
 else
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
+ {
+ if (profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
 return CheckLock(profile->getLockMode(),profile->getLockCode(),20095,bCanceled);
+ }
 }
 
 return true;
@@ -232,13 +250,19 @@
 bool CGUIPassword::IsMasterLockUnlocked(bool bPromptUser, bool& bCanceled)
 {
 bCanceled = false;
+
 if (iMasterLockRetriesLeft == -1)
 iMasterLockRetriesLeft = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES);
- if ((LOCK_MODE_EVERYONE < CProfilesManager::GetInstance().GetMasterProfile().getLockMode() && !bMasterUser) && !bPromptUser)
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if ((LOCK_MODE_EVERYONE < profileManager.GetMasterProfile().getLockMode() && !bMasterUser) && !bPromptUser)
+ {
 // not unlocked, but calling code doesn't want to prompt user
 return false;
+ }
 
- if (g_passwordManager.bMasterUser || CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
+ if (g_passwordManager.bMasterUser || profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
 return true;
 
 if (iMasterLockRetriesLeft == 0)
@@ -249,8 +273,9 @@
 
 // no, unlock since we are allowed to prompt
 std::string strHeading = g_localizeStrings.Get(20075);
- std::string strPassword = CProfilesManager::GetInstance().GetMasterProfile().getLockCode();
- int iVerifyPasswordResult = VerifyPassword(CProfilesManager::GetInstance().GetMasterProfile().getLockMode(), strPassword, strHeading);
+ std::string strPassword = profileManager.GetMasterProfile().getLockCode();
+
+ int iVerifyPasswordResult = VerifyPassword(profileManager.GetMasterProfile().getLockMode(), strPassword, strHeading);
 if (1 == iVerifyPasswordResult)
 UpdateMasterLockRetryCount(false);
 
@@ -309,9 +334,16 @@
 bool CGUIPassword::CheckLock(LockType btnType, const std::string& strPassword, int iHeading, bool& bCanceled)
 {
 bCanceled = false;
- if (btnType == LOCK_MODE_EVERYONE || strPassword == "-" ||
- CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser)
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (btnType == LOCK_MODE_EVERYONE ||
+ strPassword == "-" ||
+ profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ g_passwordManager.bMasterUser)
+ {
 return true;
+ }
 
 std::string strHeading = g_localizeStrings.Get(iHeading);
 int iVerifyPasswordResult = VerifyPassword(btnType, strPassword, strHeading);
@@ -324,7 +356,9 @@
 
 bool CGUIPassword::CheckSettingLevelLock(const SettingLevel& level, bool enforce /*=false*/)
 {
- LOCK_LEVEL::SETTINGS_LOCK lockLevel = CProfilesManager::GetInstance().GetCurrentProfile().settingsLockLevel();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ LOCK_LEVEL::SETTINGS_LOCK lockLevel = profileManager.GetCurrentProfile().settingsLockLevel();
 
 if (lockLevel == LOCK_LEVEL::NONE)
 return true;
@@ -362,7 +396,7 @@
 
 bool CGUIPassword::CheckMenuLock(int iWindowID)
 {
- bool bCheckPW = false;
+ bool bCheckPW = false;
 int iSwitch = iWindowID;
 
 // check if a settings subcategory was called from other than settings window
@@ -374,12 +408,18 @@
 }
 
 if (iWindowID == WINDOW_MUSIC_NAV)
+ {
 if (g_windowManager.GetActiveWindow() == WINDOW_HOME)
 iSwitch = WINDOW_MUSIC_NAV;
+ }
 
 if (iWindowID == WINDOW_VIDEO_NAV)
+ {
 if (g_windowManager.GetActiveWindow() == WINDOW_HOME)
 iSwitch = WINDOW_VIDEO_NAV;
+ }
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
 switch (iSwitch)
 {
@@ -387,25 +427,25 @@
 return CheckSettingLevelLock(CViewStateSettings::GetInstance().GetSettingLevel());
 break;
 case WINDOW_ADDON_BROWSER: // Addons
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().addonmanagerLocked();
+ bCheckPW = profileManager.GetCurrentProfile().addonmanagerLocked();
 break;
 case WINDOW_FILES: // Files
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().filesLocked();
+ bCheckPW = profileManager.GetCurrentProfile().filesLocked();
 break;
 case WINDOW_PROGRAMS: // Programs
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().programsLocked();
+ bCheckPW = profileManager.GetCurrentProfile().programsLocked();
 break;
 case WINDOW_MUSIC_NAV: // Music
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().musicLocked();
+ bCheckPW = profileManager.GetCurrentProfile().musicLocked();
 break;
 case WINDOW_VIDEO_NAV: // Video
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().videoLocked();
+ bCheckPW = profileManager.GetCurrentProfile().videoLocked();
 break;
 case WINDOW_PICTURES: // Pictures
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().picturesLocked();
+ bCheckPW = profileManager.GetCurrentProfile().picturesLocked();
 break;
 case WINDOW_GAMES: // Games
- bCheckPW = CProfilesManager::GetInstance().GetCurrentProfile().gamesLocked();
+ bCheckPW = profileManager.GetCurrentProfile().gamesLocked();
 break;
 case WINDOW_SETTINGS_PROFILES:
 bCheckPW = true;
@@ -479,7 +519,9 @@
 
 bool CGUIPassword::IsDatabasePathUnlocked(const std::string& strPath, VECSOURCES& vecSources)
 {
- if (g_passwordManager.bMasterUser || CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (g_passwordManager.bMasterUser || profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
 return true;
 
 // try to find the best matching source

_service:download_files:master.tar.gz/xbmc/GUIPassword.h Changed

_service:download_files:master.tar.gz/xbmc/GUIUserMessages.h Changed

_service:download_files:master.tar.gz/xbmc/IFileItemListModifier.h Changed

_service:download_files:master.tar.gz/xbmc/IProgressCallback.h Changed

_service:download_files:master.tar.gz/xbmc/LangInfo.h Changed

_service:download_files:master.tar.gz/xbmc/MediaSource.h Changed

_service:download_files:master.tar.gz/xbmc/NfoFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/NfoFile.h Changed

_service:download_files:master.tar.gz/xbmc/PartyModeManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -40,6 +40,7 @@
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
 #include "video/VideoDatabase.h"
+#include "ServiceBroker.h"
 
 using namespace KODI::MESSAGING;
 using namespace PLAYLIST;
@@ -65,12 +66,15 @@
   bool playlistLoaded;
 
   m_bIsVideo = context == PARTYMODECONTEXT_VIDEO;
+
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
   if (!strXspPath.empty()) //if a path to a smartplaylist is supplied use it
     partyModePath = strXspPath;
   else if (m_bIsVideo)
-    partyModePath = CProfilesManager::GetInstance().GetUserDataItem("PartyMode-Video.xsp");
+    partyModePath = profileManager.GetUserDataItem("PartyMode-Video.xsp");
   else
-    partyModePath = CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp");
+    partyModePath = profileManager.GetUserDataItem("PartyMode.xsp");
 
   playlistLoaded=playlist.Load(partyModePath);

_service:download_files:master.tar.gz/xbmc/PartyModeManager.h Changed

_service:download_files:master.tar.gz/xbmc/PasswordManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -26,6 +26,7 @@
 #include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "filesystem/File.h"
+#include "ServiceBroker.h"
 
 CPasswordManager &CPasswordManager::GetInstance()
 {
@@ -114,7 +115,10 @@
 void CPasswordManager::Load()
 {
   Clear();
-  std::string passwordsFile = CProfilesManager::GetInstance().GetUserDataItem("passwords.xml");
+
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+  std::string passwordsFile = profileManager.GetUserDataItem("passwords.xml");
   if (XFILE::CFile::Exists(passwordsFile))
   {
     CXBMCTinyXML doc;
@@ -163,7 +167,9 @@
     XMLUtils::SetPath(path, "to", i->second);
   }
 
-  doc.SaveFile(CProfilesManager::GetInstance().GetUserDataItem("passwords.xml"));
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+  doc.SaveFile(profileManager.GetUserDataItem("passwords.xml"));
 }
 
 std::string CPasswordManager::GetLookupPath(const CURL &url) const

_service:download_files:master.tar.gz/xbmc/PasswordManager.h Changed

_service:download_files:master.tar.gz/xbmc/PlayListPlayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/PlayListPlayer.h Changed

_service:download_files:master.tar.gz/xbmc/SectionLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/SectionLoader.h Changed

_service:download_files:master.tar.gz/xbmc/SeekHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/SeekHandler.h Changed

_service:download_files:master.tar.gz/xbmc/ServiceBroker.cpp Changed

_service:download_files:master.tar.gz/xbmc/ServiceBroker.h Changed

_service:download_files:master.tar.gz/xbmc/ServiceManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2016 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -25,7 +25,8 @@
 #include "ContextMenuManager.h"
 #include "cores/AudioEngine/Engines/ActiveAE/ActiveAE.h"
 #include "cores/DataCacheCore.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
+#include "cores/playercorefactory/PlayerCoreFactory.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "favourites/FavouritesService.h"
 #include "games/controllers/ControllerManager.h"
 #include "games/GameServices.h"
@@ -44,6 +45,7 @@
 #include "windowing/WinSystem.h"
 #include "powermanagement/PowerManager.h"
 #include "weather/WeatherManager.h"
+#include "DatabaseManager.h"
 
 using namespace KODI;
 
@@ -51,14 +53,26 @@
 {
 }
 
-CServiceManager::~CServiceManager() = default;
+CServiceManager::~CServiceManager()
+{
+  if (init_level > 2)
+    DeinitStageThree();
+  if (init_level > 1)
+    DeinitStageTwo();
+  if (init_level > 0)
+    DeinitStageOne();
+}
 
 bool CServiceManager::InitForTesting()
 {
   m_settings.reset(new CSettings());
   m_network.reset(SetupNetwork());
-  m_fileExtensionProvider.reset(new CFileExtensionProvider());
 
+  m_profileManager.reset(new CProfilesManager(*m_settings));
+
+  m_databaseManager.reset(new CDatabaseManager);
+
+  m_binaryAddonManager.reset(new ADDON::CBinaryAddonManager());
   m_addonMgr.reset(new ADDON::CAddonMgr());
   if (!m_addonMgr->Init())
   {
@@ -66,6 +80,15 @@
     return false;
   }
 
+  if (!m_binaryAddonManager->Init())
+  {
+    CLog::Log(LOGFATAL, "CServiceManager::%s: Unable to initialize CBinaryAddonManager", __FUNCTION__);
+    return false;
+  }
+
+  m_fileExtensionProvider.reset(new CFileExtensionProvider(*m_addonMgr,
+                                                           *m_binaryAddonManager));
+
   init_level = 1;
   return true;
 }
@@ -73,8 +96,11 @@
 void CServiceManager::DeinitTesting()
 {
   init_level = 0;
-  m_addonMgr.reset();
   m_fileExtensionProvider.reset();
+  m_binaryAddonManager.reset();
+  m_addonMgr.reset();
+  m_databaseManager.reset();
+  m_profileManager.reset();
   m_network.reset();
   m_settings.reset();
 }
@@ -98,8 +124,20 @@
   return true;
 }
 
+bool CServiceManager::InitStageOnePointFive()
+{
+  m_profileManager.reset(new CProfilesManager(*m_settings));
+  if (!m_profileManager->Load())
+    return false;
+
+  return true;
+}
+
 bool CServiceManager::InitStageTwo(const CAppParamParser &params)
 {
+  // Initialize the addon database (must be before the addon manager is init'd)
+  m_databaseManager.reset(new CDatabaseManager);
+
   m_Platform.reset(CPlatform::CreateInstance());
   m_Platform->Init();
 
@@ -129,14 +167,15 @@
   m_binaryAddonCache.reset( new ADDON::CBinaryAddonCache());
   m_binaryAddonCache->Init();
 
-  m_favouritesService.reset(new CFavouritesService(CProfilesManager::GetInstance().GetProfileUserDataFolder()));
+  m_favouritesService.reset(new CFavouritesService(m_profileManager->GetProfileUserDataFolder()));
 
   m_serviceAddons.reset(new ADDON::CServiceAddonManager(*m_addonMgr));
 
   m_contextMenuManager.reset(new CContextMenuManager(*m_addonMgr.get()));
 
   m_gameControllerManager.reset(new GAME::CControllerManager);
-  m_inputManager.reset(new CInputManager(params));
+  m_inputManager.reset(new CInputManager(params,
+                                         *m_profileManager));
   m_inputManager->InitializeInputs();
 
   m_peripherals.reset(new PERIPHERALS::CPeripherals(*m_announcementManager,
@@ -145,7 +184,8 @@
 
   m_gameRenderManager.reset(new RETRO::CGUIGameRenderManager);
 
-  m_fileExtensionProvider.reset(new CFileExtensionProvider());
+  m_fileExtensionProvider.reset(new CFileExtensionProvider(*m_addonMgr,
+                                                           *m_binaryAddonManager));
 
   m_powerManager.reset(new CPowerManager());
   m_powerManager->Initialize();
@@ -195,11 +235,15 @@
   m_gameServices.reset(new GAME::CGameServices(*m_gameControllerManager,
     *m_gameRenderManager,
     *m_settings,
-    *m_peripherals));
+    *m_peripherals,
+    *m_profileManager));
 
   m_contextMenuManager->Init();
   m_PVRManager->Init();
 
+  m_playerCoreFactory.reset(new CPlayerCoreFactory(*m_settings,
+                                                   *m_profileManager));
+
   init_level = 3;
   return true;
 }
@@ -208,6 +252,7 @@
 {
   init_level = 2;
 
+  m_playerCoreFactory.reset();
   m_PVRManager->Deinit();
   m_contextMenuManager->Deinit();
   m_gameServices.reset();
@@ -236,6 +281,12 @@
   m_binaryAddonManager.reset();
   m_addonMgr.reset();
   m_Platform.reset();
+  m_databaseManager.reset();
+}
+
+void CServiceManager::DeinitStageOnePointFive()
+{
+  m_profileManager.reset();
 }
 
 void CServiceManager::DeinitStageOne()
@@ -426,3 +477,22 @@
   return *m_weatherManager;
 }
 
+CPlayerCoreFactory &CServiceManager::GetPlayerCoreFactory()
+{
+  return *m_playerCoreFactory;
+}
+
+CDatabaseManager &CServiceManager::GetDatabaseManager()
+{
+  return *m_databaseManager;
+}
+
+CProfilesManager &CServiceManager::GetProfileManager()
+{
+  return *m_profileManager;
+}
+
+CEventLog &CServiceManager::GetEventLog()
+{
+  return m_profileManager->GetEventLog();
+}

_service:download_files:master.tar.gz/xbmc/ServiceManager.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2016 Team XBMC
- * http://xbmc.org
+ * 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
@@ -87,6 +87,10 @@
 
 class CInputManager;
 class CFileExtensionProvider;
+class CPlayerCoreFactory;
+class CDatabaseManager;
+class CProfilesManager;
+class CEventLog;
 
 class CServiceManager
 {
@@ -96,6 +100,7 @@
 
 bool InitForTesting();
 bool InitStageOne();
+ bool InitStageOnePointFive(); // Services that need our DllLoaders emu env
 bool InitStageTwo(const CAppParamParser &params);
 bool CreateAudioEngine();
 bool DestroyAudioEngine();
@@ -104,6 +109,7 @@
 void DeinitTesting();
 void DeinitStageThree();
 void DeinitStageTwo();
+ void DeinitStageOnePointFive();
 void DeinitStageOne();
 ADDON::CAddonMgr& GetAddonMgr();
 ADDON::CBinaryAddonManager& GetBinaryAddonManager();
@@ -143,6 +149,14 @@
 
 CWeatherManager &GetWeatherManager();
 
+ CPlayerCoreFactory &GetPlayerCoreFactory();
+
+ CDatabaseManager &GetDatabaseManager();
+
+ CProfilesManager &GetProfileManager();
+
+ CEventLog &GetEventLog();
+
 protected:
 struct delete_dataCacheCore
 {
@@ -195,4 +209,7 @@
 std::unique_ptr<CWinSystemBase> m_winSystem;
 std::unique_ptr<CPowerManager> m_powerManager;
 std::unique_ptr<CWeatherManager> m_weatherManager;
+ std::unique_ptr<CPlayerCoreFactory> m_playerCoreFactory;
+ std::unique_ptr<CDatabaseManager> m_databaseManager;
+ std::unique_ptr<CProfilesManager> m_profileManager;
 };

_service:download_files:master.tar.gz/xbmc/SortFileItem.h Changed

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

_service:download_files:master.tar.gz/xbmc/TextureCache.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -29,6 +29,7 @@
 #include "utils/URIUtils.h"
 #include "utils/StringUtils.h"
 #include "URL.h"
+#include "ServiceBroker.h"
 
 using namespace XFILE;
 
@@ -62,14 +63,19 @@
 {
   if (url.empty())
     return false;
+
   if (!CURL::IsFullPath(url))
     return true;
+
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
   if (URIUtils::PathHasParent(url, "special://skin", true) ||
       URIUtils::PathHasParent(url, "special://temp", true) ||
       URIUtils::PathHasParent(url, "resource://", true) ||
       URIUtils::PathHasParent(url, "androidapp://", true)   ||
-      URIUtils::PathHasParent(url, CProfilesManager::GetInstance().GetThumbnailsFolder(), true))
+      URIUtils::PathHasParent(url, profileManager.GetThumbnailsFolder(), true))
     return true;
+
   return false;
 }
 
@@ -261,7 +267,9 @@
 
 std::string CTextureCache::GetCachedPath(const std::string &file)
 {
-  return URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetThumbnailsFolder(), file);
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+  return URIUtils::AddFileToFolder(profileManager.GetThumbnailsFolder(), file);
 }
 
 void CTextureCache::OnCachingComplete(bool success, CTextureCacheJob *job)

_service:download_files:master.tar.gz/xbmc/TextureCache.h Changed

_service:download_files:master.tar.gz/xbmc/TextureCacheJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/TextureCacheJob.h Changed

_service:download_files:master.tar.gz/xbmc/TextureDatabase.cpp Changed

_service:download_files:master.tar.gz/xbmc/TextureDatabase.h Changed

_service:download_files:master.tar.gz/xbmc/ThumbLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/ThumbLoader.h Changed

_service:download_files:master.tar.gz/xbmc/URL.cpp Changed

_service:download_files:master.tar.gz/xbmc/URL.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/XBApplicationEx.cpp Changed

_service:download_files:master.tar.gz/xbmc/XBApplicationEx.h Changed

_service:download_files:master.tar.gz/xbmc/XBDateTime.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -174,10 +174,10 @@
 ULARGE_INTEGER time;
 ToULargeInt(time);
 
- time.QuadPart=(LONGLONG)day*SECONDS_PER_DAY*SECONDS_TO_FILETIME;
- time.QuadPart+=(LONGLONG)hour*SECONDS_PER_HOUR*SECONDS_TO_FILETIME;
- time.QuadPart+=(LONGLONG)minute*SECONDS_PER_MINUTE*SECONDS_TO_FILETIME;
- time.QuadPart+=(LONGLONG)second*SECONDS_TO_FILETIME;
+ time.QuadPart= static_cast<long long>(day) *SECONDS_PER_DAY*SECONDS_TO_FILETIME;
+ time.QuadPart+= static_cast<long long>(hour) *SECONDS_PER_HOUR*SECONDS_TO_FILETIME;
+ time.QuadPart+= static_cast<long long>(minute) *SECONDS_PER_MINUTE*SECONDS_TO_FILETIME;
+ time.QuadPart+= static_cast<long long>(second) *SECONDS_TO_FILETIME;
 
 FromULargeInt(time);
 }
@@ -648,13 +648,15 @@
 
 bool CDateTime::ToFileTime(const SYSTEMTIME& time, FILETIME& fileTime) const
 {
- return SystemTimeToFileTime(&time, &fileTime) == TRUE &&
+ return SystemTimeToFileTime(&time, &fileTime) == 1 &&
 (fileTime.dwLowDateTime > 0 || fileTime.dwHighDateTime > 0);
 }
 
 bool CDateTime::ToFileTime(const time_t& time, FILETIME& fileTime) const
 {
- LONGLONG ll = Int32x32To64(time, 10000000)+0x19DB1DED53E8000LL;
+ long long ll = time;
+ ll *= 10000000ll;
+ ll += 0x19DB1DED53E8000LL;
 
 fileTime.dwLowDateTime = (DWORD)(ll & 0xFFFFFFFF);
 fileTime.dwHighDateTime = (DWORD)(ll >> 32);
@@ -664,8 +666,7 @@
 
 bool CDateTime::ToFileTime(const tm& time, FILETIME& fileTime) const
 {
- SYSTEMTIME st;
- ZeroMemory(&st, sizeof(SYSTEMTIME));
+ SYSTEMTIME st = { 0 };
 
 st.wYear=time.tm_year+1900;
 st.wMonth=time.tm_mon+1;
@@ -675,7 +676,7 @@
 st.wMinute=time.tm_min;
 st.wSecond=time.tm_sec;
 
- return SystemTimeToFileTime(&st, &fileTime)==TRUE;
+ return SystemTimeToFileTime(&st, &fileTime) == 1;
 }
 
 void CDateTime::ToULargeInt(ULARGE_INTEGER& time) const
@@ -794,8 +795,7 @@
 
 bool CDateTime::SetDateTime(int year, int month, int day, int hour, int minute, int second)
 {
- SYSTEMTIME st;
- ZeroMemory(&st, sizeof(SYSTEMTIME));
+ SYSTEMTIME st = { 0 };
 
 st.wYear=year;
 st.wMonth=month;
@@ -827,8 +827,7 @@
 #define UNIX_BASE_TIME 116444736000000000LL /* nanoseconds since epoch */
 void CDateTime::GetAsTime(time_t& time) const
 {
- LONGLONG ll;
- ll = ((LONGLONG)m_time.dwHighDateTime << 32) + m_time.dwLowDateTime;
+ long long ll = (static_cast<long long>(m_time.dwHighDateTime) << 32) + m_time.dwLowDateTime;
 time=(time_t)((ll - UNIX_BASE_TIME) / 10000000);
 }

_service:download_files:master.tar.gz/xbmc/XBDateTime.h Changed

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

_service:download_files:master.tar.gz/xbmc/addons/Addon.h Changed

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

@@ -23,6 +23,7 @@
 #include "addons/ContextMenuAddon.h"
 #include "addons/GameResource.h"
 #include "addons/ImageDecoder.h"
+#include "addons/FontResource.h"
 #include "addons/ImageResource.h"
 #include "addons/LanguageResource.h"
 #include "addons/PluginSource.h"
@@ -136,6 +137,8 @@
       return GAME::CGameClient::FromExtension(std::move(m_addonInfo), m_extPoint);
     case ADDON_SKIN:
       return CSkinInfo::FromExtension(std::move(m_addonInfo), m_extPoint);
+    case ADDON_RESOURCE_FONT:
+      return CFontResource::FromExtension(std::move(m_addonInfo), m_extPoint);
     case ADDON_RESOURCE_IMAGES:
       return CImageResource::FromExtension(std::move(m_addonInfo), m_extPoint);
     case ADDON_RESOURCE_GAMES:
@@ -198,6 +201,8 @@
       return AddonPtr(new CAddonDll(std::move(addonInfo)));
     case ADDON_PVRDLL:
       return AddonPtr(new PVR::CPVRClient(std::move(addonInfo)));
+    case ADDON_RESOURCE_FONT:
+      return AddonPtr(new CFontResource(std::move(addonInfo)));
     case ADDON_RESOURCE_IMAGES:
       return AddonPtr(new CImageResource(std::move(addonInfo)));
     case ADDON_RESOURCE_GAMES:

_service:download_files:master.tar.gz/xbmc/addons/AddonBuilder.h Changed

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -61,13 +61,13 @@
 variant["extensions"].push_back(ADDON::CAddonInfo::TranslateType(addon.Type(), false));
 
 variant["dependencies"] = CVariant(CVariant::VariantTypeArray);
- for (const auto& kv : addon.GetDeps())
+ for (const auto& dep : addon.GetDependencies())
 {
- CVariant dep(CVariant::VariantTypeObject);
- dep["addonId"] = kv.first;
- dep["version"] = kv.second.first.asString();
- dep["optional"] = kv.second.second;
- variant["dependencies"].push_back(std::move(dep));
+ CVariant info(CVariant::VariantTypeObject);
+ info["addonId"] = dep.id;
+ info["version"] = dep.requiredVersion.asString();
+ info["optional"] = dep.optional;
+ variant["dependencies"].push_back(std::move(info));
 }
 
 variant["extrainfo"] = CVariant(CVariant::VariantTypeArray);
@@ -110,13 +110,17 @@
 
 builder.SetType(CAddonInfo::TranslateType(variant["extensions"][0].asString()));
 
- ADDONDEPS deps;
- for (auto it = variant["dependencies"].begin_array(); it != variant["dependencies"].end_array(); ++it)
 {
- AddonVersion version((*it)["version"].asString());
- deps.emplace((*it)["addonId"].asString(), std::make_pair(std::move(version), (*it)["optional"].asBoolean()));
+ std::vector<DependencyInfo> deps;
+ for (auto it = variant["dependencies"].begin_array(); it != variant["dependencies"].end_array(); ++it)
+ {
+ deps.emplace_back(
+ (*it)["addonId"].asString(),
+ AddonVersion((*it)["version"].asString()),
+ (*it)["optional"].asBoolean());
+ }
+ builder.SetDependencies(std::move(deps));
 }
- builder.SetDependencies(std::move(deps));
 
 InfoMap extraInfo;
 for (auto it = variant["extrainfo"].begin_array(); it != variant["extrainfo"].end_array(); ++it)

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

_service:download_files:master.tar.gz/xbmc/addons/AddonInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonInfo.h Changed

@@ -61,6 +61,7 @@
 ADDON_RESOURCE_LANGUAGE,
 ADDON_RESOURCE_UISOUNDS,
 ADDON_RESOURCE_GAMES,
+ ADDON_RESOURCE_FONT,
 ADDON_VFS,
 ADDON_IMAGEDECODER,
 ADDON_SCRAPER_LIBRARY,
@@ -83,7 +84,27 @@
 ADDON_MAX
 } TYPE;
 
- typedef std::map<std::string, std::pair<const AddonVersion, bool> > ADDONDEPS;
+ struct DependencyInfo
+ {
+ std::string id;
+ AddonVersion requiredVersion;
+ bool optional;
+ DependencyInfo(std::string id, AddonVersion requiredVersion, bool optional)
+ : id(id), requiredVersion(requiredVersion), optional(optional) {}
+
+ bool operator==(const DependencyInfo &rhs) const
+ {
+ return id == rhs.id &&
+ requiredVersion == rhs.requiredVersion &&
+ optional == rhs.optional;
+ }
+
+ bool operator!=(const DependencyInfo &rhs) const
+ {
+ return !(rhs == *this);
+ }
+ };
+
 typedef std::map<std::string, std::string> InfoMap;
 typedef std::map<std::string, std::string> ArtMap;
 
@@ -117,7 +138,7 @@
 const ArtMap& Art() const { return m_art; }
 const std::vector<std::string>& Screenshots() const { return m_screenshots; }
 const std::string& Disclaimer() const { return m_disclaimer; }
- const ADDONDEPS& GetDeps() const { return m_dependencies; }
+ const std::vector<DependencyInfo>& GetDependencies() const { return m_dependencies; }
 const std::string& Broken() const { return m_broken; }
 const CDateTime& InstallDate() const { return m_installDate; }
 const CDateTime& LastUpdated() const { return m_lastUpdated; }
@@ -158,7 +179,7 @@
 ArtMap m_art;
 std::vector<std::string> m_screenshots;
 std::string m_disclaimer;
- ADDONDEPS m_dependencies;
+ std::vector<DependencyInfo> m_dependencies;
 std::string m_broken;
 CDateTime m_installDate;
 CDateTime m_lastUpdated;

_service:download_files:master.tar.gz/xbmc/addons/AddonInstaller.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2011-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -280,7 +280,7 @@
 CURL zipDir = URIUtils::CreateArchivePath("zip", pathToUrl, "");
 if (!CDirectory::GetDirectory(zipDir, items) || items.Size() != 1 || !items[0]->m_bIsFolder)
 {
- CEventLog::GetInstance().AddWithNotification(EventPtr(new CNotificationEvent(24045,
+ CServiceBroker::GetEventLog().AddWithNotification(EventPtr(new CNotificationEvent(24045,
 StringUtils::Format(g_localizeStrings.Get(24143).c_str(), path.c_str()),
 "special://xbmc/media/icon256x256.png", EventLevel::Error)));
 return false;
@@ -290,7 +290,7 @@
 if (CServiceBroker::GetAddonMgr().LoadAddonDescription(items[0]->GetPath(), addon))
 return DoInstall(addon, RepositoryPtr());
 
- CEventLog::GetInstance().AddWithNotification(EventPtr(new CNotificationEvent(24045,
+ CServiceBroker::GetEventLog().AddWithNotification(EventPtr(new CNotificationEvent(24045,
 StringUtils::Format(g_localizeStrings.Get(24143).c_str(), path.c_str()),
 "special://xbmc/media/icon256x256.png", EventLevel::Error)));
 return false;
@@ -323,12 +323,11 @@
 if (!database.Open())
 return false;
 
- ADDONDEPS deps = addon->GetDeps();
- for (ADDONDEPS::const_iterator i = deps.begin(); i != deps.end(); ++i)
+ for (const auto& it : addon->GetDependencies())
 {
- const std::string &addonID = i->first;
- const AddonVersion &version = i->second.first;
- bool optional = i->second.second;
+ const std::string &addonID = it.id;
+ const AddonVersion &version = it.requiredVersion;
+ bool optional = it.optional;
 AddonPtr dep;
 bool haveAddon = CServiceBroker::GetAddonMgr().GetAddon(addonID, dep);
 if ((haveAddon && !dep->MeetsVersion(version)) || (!haveAddon && !optional))
@@ -637,14 +636,14 @@
 
 bool notify = (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_ADDONS_NOTIFICATIONS)
 || !m_isAutoUpdate) && !IsModal();
- CEventLog::GetInstance().Add(
+ CServiceBroker::GetEventLog().Add(
 EventPtr(new CAddonManagementEvent(m_addon, m_isUpdate ? 24065 : 24084)), notify, false);
 
 if (m_isAutoUpdate && !m_addon->Broken().empty())
 {
 CLog::Log(LOGDEBUG, "CAddonInstallJob[%s]: auto-disabling due to being marked as broken", m_addon->ID().c_str());
 CServiceBroker::GetAddonMgr().DisableAddon(m_addon->ID());
- CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(m_addon, 24094)), true, false);
+ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(m_addon, 24094)), true, false);
 }
 
 // and we're done!
@@ -705,20 +704,20 @@
 bool CAddonInstallJob::Install(const std::string &installFrom, const AddonPtr& repo)
 {
 SetText(g_localizeStrings.Get(24079));
- ADDONDEPS deps = m_addon->GetDeps();
+ auto deps = m_addon->GetDependencies();
 
 unsigned int totalSteps = static_cast<unsigned int>(deps.size());
 if (ShouldCancel(0, totalSteps))
 return false;
 
 // The first thing we do is install dependencies
- for (ADDONDEPS::iterator it = deps.begin(); it != deps.end(); ++it)
+ for (auto it = deps.begin(); it != deps.end(); ++it)
 {
- if (it->first != "xbmc.metadata")
+ if (it->id != "xbmc.metadata")
 {
- const std::string &addonID = it->first;
- const AddonVersion &version = it->second.first;
- bool optional = it->second.second;
+ const std::string &addonID = it->id;
+ const AddonVersion &version = it->requiredVersion;
+ bool optional = it->optional;
 AddonPtr dependency;
 bool haveAddon = CServiceBroker::GetAddonMgr().GetAddon(addonID, dependency, ADDON_UNKNOWN, false);
 if ((haveAddon && !dependency->MeetsVersion(version)) || (!haveAddon && !optional))
@@ -776,7 +775,7 @@
 }
 
 if (ShouldCancel(std::distance(deps.begin(), it), totalSteps))
- return false;
+ return false;
 }
 
 SetText(g_localizeStrings.Get(24086));
@@ -829,7 +828,7 @@
 HELPERS::ShowOKDialogText(CVariant{fileName}, CVariant{msg});
 }
 
- CEventLog::GetInstance().Add(activity, !IsModal(), false);
+ CServiceBroker::GetEventLog().Add(activity, !IsModal(), false);
 }
 
 CAddonUnInstallJob::CAddonUnInstallJob(const AddonPtr &addon, bool removeData)
@@ -865,7 +864,7 @@
 // if that doesn't work fall back to the local one
 if (!database.Open() || !database.GetAddon(m_addon->ID(), addon) || addon == NULL)
 addon = m_addon;
- CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(addon, 24144)));
+ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24144)));
 
 CServiceBroker::GetAddonMgr().OnPostUnInstall(m_addon->ID());
 database.OnPostUnInstall(m_addon->ID());

_service:download_files:master.tar.gz/xbmc/addons/AddonInstaller.h Changed

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -126,14 +126,14 @@
 builder.SetPath(plugin->plugin_path);
 
 {
- ADDONDEPS dependencies;
+ std::vector<DependencyInfo> dependencies;
 for (unsigned int i = 0; i < plugin->num_imports; ++i)
 {
 if (plugin->imports[i].plugin_id)
 {
 std::string id(plugin->imports[i].plugin_id);
 AddonVersion version(plugin->imports[i].version ? plugin->imports[i].version : "0.0.0");
- dependencies.emplace(std::move(id), std::make_pair(version, plugin->imports[i].optional != 0));
+ dependencies.emplace_back(id, version, plugin->imports[i].optional != 0);
 }
 }
 builder.SetDependencies(std::move(dependencies));
@@ -813,9 +813,9 @@
 else
 {
 needed.push_back(addonId);
- for (const auto& dep : addon->GetDeps())
- if (!dep.second.second) // ignore 'optional'
- ResolveDependencies(dep.first, needed, missing);
+ for (const auto& dep : addon->GetDependencies())
+ if (!dep.optional)
+ ResolveDependencies(dep.id, needed, missing);
 }
 }
 
@@ -836,7 +836,7 @@
 AddonPtr addon;
 if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
 {
- CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
+ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
 }
 
 m_events.Publish(AddonEvents::Disabled(id));
@@ -857,7 +857,7 @@
 if (!IsCompatible(*addon))
 {
 CLog::Log(LOGERROR, "Add-on '%s' is not compatible with Kodi", addon->ID().c_str());
- CEventLog::GetInstance().AddWithNotification(EventPtr(new CNotificationEvent(addon->Name(), 24152, EventLevel::Error)));
+ CServiceBroker::GetEventLog().AddWithNotification(EventPtr(new CNotificationEvent(addon->Name(), 24152, EventLevel::Error)));
 return false;
 }
 
@@ -865,7 +865,7 @@
 return false;
 m_disabled.erase(id);
 
- CEventLog::GetInstance().Add(EventPtr(new CAddonManagementEvent(addon, 24064)));
+ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24064)));
 
 CLog::Log(LOGDEBUG, "CAddonMgr: enabled %s", addon->ID().c_str());
 m_events.Publish(AddonEvents::Enabled(id));
@@ -1214,22 +1214,18 @@
 
 bool CAddonMgr::IsCompatible(const IAddon& addon)
 {
- for (const auto& dependencyInfo : addon.GetDeps())
+ for (const auto& dependency : addon.GetDependencies())
 {
- const auto& optional = dependencyInfo.second.second;
- if (!optional)
+ if (!dependency.optional)
 {
- const auto& dependencyId = dependencyInfo.first;
- const auto& version = dependencyInfo.second.first;
-
 // Intentionally only check the xbmc.* and kodi.* magic dependencies. Everything else will
 // not be missing anyway, unless addon was installed in an unsupported way.
- if (StringUtils::StartsWith(dependencyId, "xbmc.") ||
- StringUtils::StartsWith(dependencyId, "kodi."))
+ if (StringUtils::StartsWith(dependency.id, "xbmc.") ||
+ StringUtils::StartsWith(dependency.id, "kodi."))
 {
- AddonPtr dependency;
- bool haveAddon = GetAddon(dependencyId, dependency);
- if (!haveAddon || !dependency->MeetsVersion(version))
+ AddonPtr addon;
+ bool haveAddon = GetAddon(dependency.id, addon);
+ if (!haveAddon || !addon->MeetsVersion(dependency.requiredVersion))
 return false;
 }
 }
@@ -1237,42 +1233,45 @@
 return true;
 }
 
-ADDONDEPS CAddonMgr::GetDepsRecursive(const std::string& id)
+std::vector<DependencyInfo> CAddonMgr::GetDepsRecursive(const std::string& id)
 {
- ADDONDEPS added;
+ std::vector<DependencyInfo> added;
 AddonPtr root_addon;
 if (!FindInstallableById(id, root_addon) && !GetAddon(id, root_addon))
 return added;
 
- ADDONDEPS toProcess = root_addon->GetDeps();
+ std::vector<DependencyInfo> toProcess;
+ for (const auto& dep : root_addon->GetDependencies())
+ toProcess.push_back(dep);
+
 while (!toProcess.empty())
 {
 auto current_dep = *toProcess.begin();
 toProcess.erase(toProcess.begin());
- if (StringUtils::StartsWith(current_dep.first, "xbmc.") ||
- StringUtils::StartsWith(current_dep.first, "kodi."))
+ if (StringUtils::StartsWith(current_dep.id, "xbmc.") ||
+ StringUtils::StartsWith(current_dep.id, "kodi."))
 continue;
 
- auto added_it = added.find(current_dep.first);
+ auto added_it = std::find_if(added.begin(), added.end(), [&](const DependencyInfo& d){ return d.id == current_dep.id;});
 if (added_it != added.end())
 {
- if (current_dep.second.first < added_it->second.first)
+ if (current_dep.requiredVersion < added_it->requiredVersion)
 continue;
 
- bool aopt = added_it->second.second;
+ bool aopt = added_it->optional;
 added.erase(added_it);
- added.insert(current_dep);
- if (!current_dep.second.second && aopt)
+ added.push_back(current_dep);
+ if (!current_dep.optional && aopt)
 continue;
 }
 else
- added.insert(current_dep);
+ added.push_back(current_dep);
 
 AddonPtr current_addon;
- if (FindInstallableById(current_dep.first, current_addon))
+ if (FindInstallableById(current_dep.id, current_addon))
 {
- toProcess.insert(current_addon->GetDeps().begin(),
- current_addon->GetDeps().end());
+ for (const auto& item : current_addon->GetDependencies())
+ toProcess.push_back(item);
 }
 }

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

_service:download_files:master.tar.gz/xbmc/addons/AddonProvider.h Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonStatusHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonStatusHandler.h Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonVersion.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/AddonVersion.h Changed

_service:download_files:master.tar.gz/xbmc/addons/BinaryAddonCache.cpp Changed

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

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

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

_service:download_files:master.tar.gz/xbmc/addons/DllLibCPluff.h Changed

_service:download_files:master.tar.gz/xbmc/addons/FontResource.cpp Added

@@ -0,0 +1,66 @@
+/*
+* Copyright (C) 2005-2017 Team XBMC
+* 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 "FontResource.h"
+
+#include "AddonManager.h"
+#include "dialogs/GUIDialogKaiToast.h"
+#include "filesystem/File.h"
+#include "filesystem/SpecialProtocol.h"
+#include "guilib/GUIWindowManager.h"
+#include "messaging/ApplicationMessenger.h"
+#include "messaging/helpers/DialogHelper.h"
+#include "ServiceBroker.h"
+#include "settings/Settings.h"
+
+using namespace XFILE;
+using namespace KODI::MESSAGING;
+
+using KODI::MESSAGING::HELPERS::DialogResponse;
+
+namespace ADDON
+{
+
+std::unique_ptr<CFontResource> CFontResource::FromExtension(CAddonInfo addonInfo, const cp_extension_t* ext)
+{
+ return std::unique_ptr<CFontResource>(new CFontResource(std::move(addonInfo)));
+}
+
+void CFontResource::OnPostInstall(bool update, bool modal)
+{
+ std::string skin = CServiceBroker::GetSettings().GetString(CSettings::SETTING_LOOKANDFEEL_SKIN);
+ const auto& deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(skin);
+ for (const auto& it : deps)
+ if (it.id == ID())
+ CApplicationMessenger::GetInstance().PostMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, "ReloadSkin");
+}
+
+bool CFontResource::GetFont(const std::string& file, std::string& path) const
+{
+ std::string result = CSpecialProtocol::TranslatePathConvertCase(Path()+"/resources/"+file);
+ if (CFile::Exists(result))
+ {
+ path = result;
+ return true;
+ }
+
+ return false;
+}
+
+}

_service:download_files:master.tar.gz/xbmc/addons/FontResource.h Added

@@ -0,0 +1,48 @@
+#pragma once
+/*
+ * Copyright (C) 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 "addons/Resource.h"
+#include <memory>
+
+namespace ADDON
+{
+class CFontResource : public CResource
+{
+public:
+ static std::unique_ptr<CFontResource> FromExtension(CAddonInfo addonInfo,
+ const cp_extension_t* ext);
+
+ explicit CFontResource(CAddonInfo addonInfo) : CResource(std::move(addonInfo)) {}
+
+ //! \brief Check whether file is allowed or not (no filters here).
+ bool IsAllowed(const std::string& file) const override { return true; }
+
+ //! \brief Get the font path if given font file is served by the add-on.
+ //! \param[in] file File name of font.
+ //! \param[out] path Full path to font if found.
+ //! \return True if font was found, false otherwise.
+ bool GetFont(const std::string& file, std::string& path) const;
+
+ //! \brief Callback executed after installation
+ void OnPostInstall(bool update, bool modal) override;
+};
+
+}

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -121,7 +121,7 @@
 }
 else if (iControl == CONTROL_BTN_DEPENDENCIES)
 {
- ADDONDEPS deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
+ auto deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
 ShowDependencyList(deps, true);
 return true;
 }
@@ -205,7 +205,7 @@
 
 CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_SETTINGS, isInstalled && m_localAddon->HasSettings());
 
- ADDONDEPS deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
+ auto deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
 CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_DEPENDENCIES, !deps.empty());
 
 CFileItemList items;
@@ -349,7 +349,7 @@
 if (i != -1)
 {
 Close();
- ADDONDEPS deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
+ auto deps = CServiceBroker::GetAddonMgr().GetDepsRecursive(m_item->GetAddonInfo()->ID());
 if (!deps.empty() && !ShowDependencyList(deps, false))
 return;
 
@@ -411,8 +411,9 @@
 for (VECADDONS::const_iterator it = addons.begin();
 it != addons.end();++it)
 {
- ADDONDEPS::const_iterator i = (*it)->GetDeps().find(m_localAddon->ID());
- if (i != (*it)->GetDeps().end() && !i->second.second) // non-optional dependency
+ auto i = std::find_if((*it)->GetDependencies().begin(), (*it)->GetDependencies().end(),
+ [&](const DependencyInfo& other){return other.id == m_localAddon->ID();});
+ if (i != (*it)->GetDependencies().end() && !i->optional) // non-optional dependency
 deps.push_back((*it)->Name());
 }
 
@@ -477,37 +478,37 @@
 CGUIDialogAddonSettings::ShowForAddon(m_localAddon);
 }
 
-bool CGUIDialogAddonInfo::ShowDependencyList(const ADDONDEPS& deps, bool reactivate)
+bool CGUIDialogAddonInfo::ShowDependencyList(const std::vector<ADDON::DependencyInfo>& deps, bool reactivate)
 {
 auto pDialog = g_windowManager.GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
 CFileItemList items;
 for (auto& it : deps)
 {
 AddonPtr dep_addon, local_addon;
- CServiceBroker::GetAddonMgr().FindInstallableById(it.first, dep_addon);
- CServiceBroker::GetAddonMgr().GetAddon(it.first, local_addon);
+ CServiceBroker::GetAddonMgr().FindInstallableById(it.id, dep_addon);
+ CServiceBroker::GetAddonMgr().GetAddon(it.id, local_addon);
 if (dep_addon)
 {
 CFileItemPtr item(new CFileItem(dep_addon->Name()));
 std::stringstream str;
- str << it.first << " " << it.second.first.asString();
- if ((it.second.second && !local_addon) || (!it.second.second && local_addon))
+ str << it.id << " " << it.requiredVersion.asString();
+ if ((it.optional && !local_addon) || (!it.optional && local_addon))
 str << " " << StringUtils::Format(g_localizeStrings.Get(39022).c_str(),
 local_addon ? g_localizeStrings.Get(39019).c_str()
 : g_localizeStrings.Get(39018).c_str());
- else if (it.second.second && local_addon)
+ else if (it.optional && local_addon)
 str << " " << StringUtils::Format(g_localizeStrings.Get(39023).c_str(),
 g_localizeStrings.Get(39019).c_str(),
 g_localizeStrings.Get(39018).c_str());
 
 item->SetLabel2(str.str());
 item->SetIconImage(dep_addon->Icon());
- item->SetProperty("addon_id", it.first);
+ item->SetProperty("addon_id", it.id);
 items.Add(item);
 }
 else
 {
- CFileItemPtr item(new CFileItem(it.first));
+ CFileItemPtr item(new CFileItem(it.id));
 item->SetLabel2(g_localizeStrings.Get(161));
 items.Add(item);
 }

_service:download_files:master.tar.gz/xbmc/addons/GUIDialogAddonInfo.h Changed

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

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

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

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

_service:download_files:master.tar.gz/xbmc/addons/ImageResource.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/ImageResource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/LanguageResource.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/LanguageResource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/PVRClient.cpp Changed

@@ -416,7 +416,7 @@
 
 size = 0;
 // manual one time
- types_array[size] = {0};
+ 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 |
@@ -429,7 +429,7 @@
 ++size;
 
 // manual timer rule
- types_array[size] = {0};
+ 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 |
@@ -447,7 +447,7 @@
 if (addonCapabilities.bSupportsEPG)
 {
 // One-shot epg-based
- types_array[size] = {0};
+ 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 |
@@ -775,12 +775,13 @@
 return DoAddonCall(__FUNCTION__, [&fileItem](const AddonInstance* addon) {
 CAddonEpgTag addonTag(fileItem.GetEPGInfoTag());
 
- PVR_NAMED_VALUE properties[PVR_STREAM_MAX_PROPERTIES] = {{{0}}};
 unsigned int iPropertyCount = PVR_STREAM_MAX_PROPERTIES;
+ std::unique_ptr<PVR_NAMED_VALUE[]> properties(new PVR_NAMED_VALUE[iPropertyCount]);
+ memset(properties.get(), 0, iPropertyCount * sizeof(PVR_NAMED_VALUE));
 
- PVR_ERROR error = addon->GetEPGTagStreamProperties(&addonTag, properties, &iPropertyCount);
+ PVR_ERROR error = addon->GetEPGTagStreamProperties(&addonTag, properties.get(), &iPropertyCount);
 if (error == PVR_ERROR_NO_ERROR)
- WriteFileItemProperties(properties, iPropertyCount, fileItem);
+ WriteFileItemProperties(properties.get(), iPropertyCount, fileItem);
 
 return error;
 });
@@ -1085,12 +1086,13 @@
 PVR_CHANNEL tag = {0};
 WriteClientChannelInfo(channel, tag);
 
- PVR_NAMED_VALUE properties[PVR_STREAM_MAX_PROPERTIES] = {{{0}}};
 unsigned int iPropertyCount = PVR_STREAM_MAX_PROPERTIES;
+ std::unique_ptr<PVR_NAMED_VALUE[]> properties(new PVR_NAMED_VALUE[iPropertyCount]);
+ memset(properties.get(), 0, iPropertyCount * sizeof(PVR_NAMED_VALUE));
 
- PVR_ERROR error = addon->GetChannelStreamProperties(&tag, properties, &iPropertyCount);
+ PVR_ERROR error = addon->GetChannelStreamProperties(&tag, properties.get(), &iPropertyCount);
 if (error == PVR_ERROR_NO_ERROR)
- WriteFileItemProperties(properties, iPropertyCount, fileItem);
+ WriteFileItemProperties(properties.get(), iPropertyCount, fileItem);
 
 return error;
 });
@@ -1107,12 +1109,13 @@
 PVR_RECORDING tag = {{0}};
 WriteClientRecordingInfo(*recording, tag);
 
- PVR_NAMED_VALUE properties[PVR_STREAM_MAX_PROPERTIES] = {{{0}}};
 unsigned int iPropertyCount = PVR_STREAM_MAX_PROPERTIES;
+ std::unique_ptr<PVR_NAMED_VALUE[]> properties(new PVR_NAMED_VALUE[iPropertyCount]);
+ memset(properties.get(), 0, iPropertyCount * sizeof(PVR_NAMED_VALUE));
 
- PVR_ERROR error = addon->GetRecordingStreamProperties(&tag, properties, &iPropertyCount);
+ PVR_ERROR error = addon->GetRecordingStreamProperties(&tag, properties.get(), &iPropertyCount);
 if (error == PVR_ERROR_NO_ERROR)
- WriteFileItemProperties(properties, iPropertyCount, fileItem);
+ WriteFileItemProperties(properties.get(), iPropertyCount, fileItem);
 
 return error;
 });
@@ -1578,7 +1581,7 @@
 
 /* display a notification for 5 seconds */
 CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, strLine1, strLine2, 5000, false);
- CEventLog::GetInstance().Add(EventPtr(new CNotificationEvent(client->Name(), strLine1, client->Icon(), strLine2)));
+ CServiceBroker::GetEventLog().Add(EventPtr(new CNotificationEvent(client->Name(), strLine1, client->Icon(), strLine2)));
 
 CLog::Log(LOGDEBUG, "PVR - %s - recording %s on client '%s'. name='%s' filename='%s'",
 __FUNCTION__, bOnOff ? "started" : "finished", client->Name().c_str(), strName, strFileName);
@@ -1733,14 +1736,24 @@
 return CCodecIds::GetInstance().GetCodecByName(strCodecName);
 }
 
-CPVRClientCapabilities::CPVRClientCapabilities()
+CPVRClientCapabilities::CPVRClientCapabilities(const CPVRClientCapabilities& other)
 {
- m_addonCapabilities = {0};
+ if (other.m_addonCapabilities)
+ m_addonCapabilities.reset(new PVR_ADDON_CAPABILITIES(*other.m_addonCapabilities));
+ InitRecordingsLifetimeValues();
+}
+
+const CPVRClientCapabilities& CPVRClientCapabilities::operator =(const CPVRClientCapabilities& other)
+{
+ if (other.m_addonCapabilities)
+ m_addonCapabilities.reset(new PVR_ADDON_CAPABILITIES(*other.m_addonCapabilities));
+ InitRecordingsLifetimeValues();
+ return *this;
 }
 
 const CPVRClientCapabilities& CPVRClientCapabilities::operator =(const PVR_ADDON_CAPABILITIES& addonCapabilities)
 {
- m_addonCapabilities = addonCapabilities;
+ m_addonCapabilities.reset(new PVR_ADDON_CAPABILITIES(addonCapabilities));
 InitRecordingsLifetimeValues();
 return *this;
 }
@@ -1748,18 +1761,18 @@
 void CPVRClientCapabilities::clear()
 {
 m_recordingsLifetimeValues.clear();
- m_addonCapabilities = {0};
+ m_addonCapabilities.reset();
 }
 
 void CPVRClientCapabilities::InitRecordingsLifetimeValues()
 {
 m_recordingsLifetimeValues.clear();
- if (m_addonCapabilities.iRecordingsLifetimesSize > 0)
+ if (m_addonCapabilities && m_addonCapabilities->iRecordingsLifetimesSize > 0)
 {
- for (unsigned int i = 0; i < m_addonCapabilities.iRecordingsLifetimesSize; ++i)
+ for (unsigned int i = 0; i < m_addonCapabilities->iRecordingsLifetimesSize; ++i)
 {
- int iValue = m_addonCapabilities.recordingsLifetimeValues[i].iValue;
- std::string strDescr(m_addonCapabilities.recordingsLifetimeValues[i].strDescription);
+ int iValue = m_addonCapabilities->recordingsLifetimeValues[i].iValue;
+ std::string strDescr(m_addonCapabilities->recordingsLifetimeValues[i].strDescription);
 if (strDescr.empty())
 {
 // No description given by addon. Create one from value.

_service:download_files:master.tar.gz/xbmc/addons/PVRClient.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -49,9 +49,12 @@
 class CPVRClientCapabilities
 {
 public:
- CPVRClientCapabilities();
+ CPVRClientCapabilities() = default;
 virtual ~CPVRClientCapabilities() = default;
 
+ CPVRClientCapabilities(const CPVRClientCapabilities& other);
+ const CPVRClientCapabilities& operator =(const CPVRClientCapabilities& other);
+
 const CPVRClientCapabilities& operator =(const PVR_ADDON_CAPABILITIES& addonCapabilities);
 
 void clear();
@@ -66,37 +69,37 @@
 * @brief Check whether this add-on supports TV channels.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsTV() const { return m_addonCapabilities.bSupportsTV; }
+ bool SupportsTV() const { return m_addonCapabilities && m_addonCapabilities->bSupportsTV; }
 
 /*!
 * @brief Check whether this add-on supports radio channels.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsRadio() const { return m_addonCapabilities.bSupportsRadio; }
+ bool SupportsRadio() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRadio; }
 
 /*!
 * @brief Check whether this add-on supports channel groups.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsChannelGroups() const { return m_addonCapabilities.bSupportsChannelGroups; }
+ bool SupportsChannelGroups() const { return m_addonCapabilities && m_addonCapabilities->bSupportsChannelGroups; }
 
 /*!
 * @brief Check whether this add-on supports scanning for new channels on the backend.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsChannelScan() const { return m_addonCapabilities.bSupportsChannelScan; }
+ bool SupportsChannelScan() const { return m_addonCapabilities && m_addonCapabilities->bSupportsChannelScan; }
 
 /*!
 * @brief Check whether this add-on supports the following functions: DeleteChannel, RenameChannel, DialogChannelSettings and DialogAddChannel.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsChannelSettings() const { return m_addonCapabilities.bSupportsChannelSettings; }
+ bool SupportsChannelSettings() const { return m_addonCapabilities && m_addonCapabilities->bSupportsChannelSettings; }
 
 /*!
 * @brief Check whether this add-on supports descramble information for playing channels.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsDescrambleInfo() const { return m_addonCapabilities.bSupportsDescrambleInfo; }
+ bool SupportsDescrambleInfo() const { return m_addonCapabilities && m_addonCapabilities->bSupportsDescrambleInfo; }
 
 /////////////////////////////////////////////////////////////////////////////////
 //
@@ -108,7 +111,7 @@
 * @brief Check whether this add-on provides EPG information.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsEPG() const { return m_addonCapabilities.bSupportsEPG; }
+ bool SupportsEPG() const { return m_addonCapabilities && m_addonCapabilities->bSupportsEPG; }
 
 /////////////////////////////////////////////////////////////////////////////////
 //
@@ -120,7 +123,7 @@
 * @brief Check whether this add-on supports the creation and editing of timers.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsTimers() const { return m_addonCapabilities.bSupportsTimers; }
+ bool SupportsTimers() const { return m_addonCapabilities && m_addonCapabilities->bSupportsTimers; }
 
 /////////////////////////////////////////////////////////////////////////////////
 //
@@ -132,43 +135,43 @@
 * @brief Check whether this add-on supports recordings.
 * @return True if recordings are supported, false otherwise.
 */
- bool SupportsRecordings() const { return m_addonCapabilities.bSupportsRecordings; }
+ bool SupportsRecordings() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings; }
 
 /*!
 * @brief Check whether this add-on supports undelete of deleted recordings.
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsUndelete() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsRecordingsUndelete; }
+ bool SupportsRecordingsUndelete() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsRecordingsUndelete; }
 
 /*!
 * @brief Check whether this add-on supports play count for recordings.
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsPlayCount() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsRecordingPlayCount; }
+ bool SupportsRecordingsPlayCount() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsRecordingPlayCount; }
 
 /*!
 * @brief Check whether this add-on supports store/retrieve of last played position for recordings..
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsLastPlayedPosition() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsLastPlayedPosition; }
+ bool SupportsRecordingsLastPlayedPosition() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsLastPlayedPosition; }
 
 /*!
 * @brief Check whether this add-on supports retrieving an edit decision list for recordings.
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsEdl() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsRecordingEdl; }
+ bool SupportsRecordingsEdl() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsRecordingEdl; }
 
 /*!
 * @brief Check whether this add-on supports renaming recordings..
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsRename() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsRecordingsRename; }
+ bool SupportsRecordingsRename() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsRecordingsRename; }
 
 /*!
 * @brief Check whether this add-on supports changing lifetime of recording.
 * @return True if supported, false otherwise.
 */
- bool SupportsRecordingsLifetimeChange() const { return m_addonCapabilities.bSupportsRecordings && m_addonCapabilities.bSupportsRecordingsLifetimeChange; }
+ bool SupportsRecordingsLifetimeChange() const { return m_addonCapabilities && m_addonCapabilities->bSupportsRecordings && m_addonCapabilities->bSupportsRecordingsLifetimeChange; }
 
 /*!
 * @brief Obtain a list with all possible values for recordings lifetime.
@@ -186,18 +189,18 @@
 * @brief Check whether this add-on provides an input stream. false if Kodi handles the stream.
 * @return True if supported, false otherwise.
 */
- bool HandlesInputStream() const { return m_addonCapabilities.bHandlesInputStream; }
+ bool HandlesInputStream() const { return m_addonCapabilities && m_addonCapabilities->bHandlesInputStream; }
 
 /*!
 * @brief Check whether this add-on demultiplexes packets.
 * @return True if supported, false otherwise.
 */
- bool HandlesDemuxing() const { return m_addonCapabilities.bHandlesDemuxing; }
+ bool HandlesDemuxing() const { return m_addonCapabilities && m_addonCapabilities->bHandlesDemuxing; }
 
 private:
 void InitRecordingsLifetimeValues();
 
- PVR_ADDON_CAPABILITIES m_addonCapabilities;
+ std::unique_ptr<PVR_ADDON_CAPABILITIES> m_addonCapabilities;
 std::vector<std::pair<std::string, int>> m_recordingsLifetimeValues;
 };

_service:download_files:master.tar.gz/xbmc/addons/PluginSource.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/PluginSource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/Repository.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/Repository.h Changed

_service:download_files:master.tar.gz/xbmc/addons/RepositoryUpdater.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/Resource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/Scraper.cpp Changed

@@ -370,20 +370,20 @@
     //! @todo this routine assumes that deps are a single level, and assumes the dep is installed.
     //!       1. Does it make sense to have recursive dependencies?
     //!       2. Should we be checking the dep versions or do we assume it is ok?
-    ADDONDEPS deps = GetDeps();
-    ADDONDEPS::iterator itr = deps.begin();
+    auto deps = GetDependencies();
+    auto itr = deps.begin();
     while (itr != deps.end())
     {
-      if (itr->first == "xbmc.metadata")
+      if (itr->id == "xbmc.metadata")
       {
         ++itr;
         continue;
       }
       AddonPtr dep;
 
-      bool bOptional = itr->second.second;
+      bool bOptional = itr->optional;
 
-      if (CServiceBroker::GetAddonMgr().GetAddon((*itr).first, dep))
+      if (CServiceBroker::GetAddonMgr().GetAddon((*itr).id, dep))
       {
         CXBMCTinyXML doc;
         if (dep->Type() == ADDON_SCRAPER_LIBRARY && doc.LoadFile(dep->LibPath()))
@@ -1296,7 +1296,7 @@
           scurlEp.ParseElement(pxeLink);
 
         // date must be the format of yyyy-mm-dd
-        ep.cDate.SetValid(FALSE);
+        ep.cDate.SetValid(false);
         std::string sDate;
         if (XMLUtils::GetString(pxeMovie, "aired", sDate) && sDate.length() == 10)
         {

_service:download_files:master.tar.gz/xbmc/addons/Scraper.h Changed

_service:download_files:master.tar.gz/xbmc/addons/ScreenSaver.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/ScreenSaver.h Changed

_service:download_files:master.tar.gz/xbmc/addons/Service.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/Service.h Changed

_service:download_files:master.tar.gz/xbmc/addons/Skin.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/Skin.h Changed

_service:download_files:master.tar.gz/xbmc/addons/UISoundsResource.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/UISoundsResource.h Changed

_service:download_files:master.tar.gz/xbmc/addons/VFSEntry.cpp Changed

@@ -37,13 +37,11 @@
 void CVFSAddonCache::Init()
 {
   CServiceBroker::GetAddonMgr().Events().Subscribe(this, &CVFSAddonCache::OnEvent);
-  CServiceBroker::GetAddonMgr().UnloadEvents().Subscribe(this, &CVFSAddonCache::OnEvent);
   Update();
 }
 
 void CVFSAddonCache::Deinit()
 {
-  CServiceBroker::GetAddonMgr().UnloadEvents().Unsubscribe(this);
   CServiceBroker::GetAddonMgr().Events().Unsubscribe(this);
 }
 
@@ -81,15 +79,17 @@
         CZeroconfBrowser::GetInstance()->RemoveServiceType(vfs->GetZeroconfType());
     }
   }
-  if (typeid(event) == typeid(AddonEvents::Disabled) ||
-      typeid(event) == typeid(AddonEvents::Unload) ||
-      typeid(event) == typeid(AddonEvents::Enabled) ||
-      typeid(event) == typeid(AddonEvents::Load))
+
+  if (typeid(event) == typeid(AddonEvents::Enabled) ||
+      typeid(event) == typeid(AddonEvents::Disabled) ||
+      typeid(event) == typeid(AddonEvents::ReInstalled))
   {
     if (CServiceBroker::GetAddonMgr().HasType(event.id, ADDON_VFS))
-    {
       Update();
-    }
+  }
+  else if (typeid(event) == typeid(AddonEvents::UnInstalled))
+  {
+    Update();
   }
 }

_service:download_files:master.tar.gz/xbmc/addons/Webinterface.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/Webinterface.h Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/AddonDll.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -37,6 +37,7 @@
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/Variant.h"
+#include "ServiceBroker.h"
 #include "Util.h"
 
 // Global addon callback handle classes
@@ -458,7 +459,8 @@
 kodiMinVersion.asString().c_str(),
 addonVersion.asString().c_str());
 
- CEventLog::GetInstance().AddWithNotification(EventPtr(new CNotificationEvent(Name(), 24152, EventLevel::Error)));
+ CEventLog &eventLog = CServiceBroker::GetEventLog();
+ eventLog.AddWithNotification(EventPtr(new CNotificationEvent(Name(), 24152, EventLevel::Error)));
 
 return false;
 }
@@ -624,7 +626,7 @@
 if (addon == nullptr || id == nullptr || value == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
- __FUNCTION__, addon, id, value);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
 
 return false;
 }
@@ -658,7 +660,7 @@
 if (addon == nullptr || id == nullptr || value == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
- __FUNCTION__, addon, id, value);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
 
 return false;
 }
@@ -692,7 +694,7 @@
 if (addon == nullptr || id == nullptr || value == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
- __FUNCTION__, addon, id, value);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
 
 return false;
 }
@@ -726,7 +728,7 @@
 if (addon == nullptr || id == nullptr || value == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
- __FUNCTION__, addon, id, value);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<void*>(value));
 
 return false;
 }
@@ -760,7 +762,7 @@
 if (addon == nullptr || id == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
- __FUNCTION__, addon, id);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id));
 
 return false;
 }
@@ -785,7 +787,7 @@
 if (addon == nullptr || id == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
- __FUNCTION__, addon, id);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id));
 
 return false;
 }
@@ -810,7 +812,7 @@
 if (addon == nullptr || id == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p')",
- __FUNCTION__, addon, id);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id));
 
 return false;
 }
@@ -835,7 +837,7 @@
 if (addon == nullptr || id == nullptr || value == nullptr)
 {
 CLog::Log(LOGERROR, "kodi::General::%s - invalid data (addon='%p', id='%p', value='%p')",
- __FUNCTION__, addon, id, value);
+ __FUNCTION__, kodiBase, static_cast<const void*>(id), static_cast<const void*>(value));
 
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/AddonDll.h Changed

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/BinaryAddonManager.cpp Changed

@@ -43,7 +43,6 @@
 bool CBinaryAddonManager::Init()
 {
   CServiceBroker::GetAddonMgr().Events().Subscribe(this, &CBinaryAddonManager::OnEvent);
-  CServiceBroker::GetAddonMgr().UnloadEvents().Subscribe(this, &CBinaryAddonManager::OnEvent);
 
   BINARY_ADDON_LIST binaryAddonList;
   if (!CServiceBroker::GetAddonMgr().GetInstalledBinaryAddons(binaryAddonList))
@@ -66,7 +65,6 @@
   if (XFILE::CDirectory::Exists(m_tempAddonBasePath))
     XFILE::CDirectory::RemoveRecursive(CSpecialProtocol::TranslatePath(m_tempAddonBasePath));
 
-  CServiceBroker::GetAddonMgr().UnloadEvents().Unsubscribe(this);
   CServiceBroker::GetAddonMgr().Events().Unsubscribe(this);
 }
 
@@ -185,8 +183,8 @@
   {
     DisableEvent(event.id);
   }
-  else if (typeid(event) == typeid(AddonEvents::Load) ||
-           typeid(event) == typeid(AddonEvents::Unload))
+  else if (typeid(event) == typeid(AddonEvents::ReInstalled) ||
+           typeid(event) == typeid(AddonEvents::UnInstalled))
   {
     InstalledChangeEvent();
   }

_service:download_files:master.tar.gz/xbmc/addons/binary-addons/DllAddon.h Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/AudioEngine.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Filesystem.cpp Changed

@@ -97,7 +97,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || url == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, addon, url);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, kodiBase, url);
 return false;
 }
 
@@ -110,7 +110,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || path == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, addon, path);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
 return false;
 }
 
@@ -122,7 +122,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || path == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, addon, path);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
 return false;
 }
 
@@ -134,7 +134,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || path == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, addon, path);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p')", __FUNCTION__, kodiBase, path);
 return false;
 }
 
@@ -165,7 +165,10 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || path == nullptr || mask == nullptr|| items == nullptr || num_items == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p', mask='%p', items='%p', num_items='%p'", __FUNCTION__, addon, path, mask, items, num_items);
+ CLog::Log(LOGERROR,
+ "Interface_Filesystem::%s - invalid data (addon='%p', path='%p', mask='%p', "
+ "items='%p', num_items='%p'",
+ __FUNCTION__, kodiBase, path, mask, static_cast<void*>(items), static_cast<void*>(num_items));
 return false;
 }
 
@@ -193,7 +196,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || items == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', items='%p')", __FUNCTION__, addon, items);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', items='%p')", __FUNCTION__, kodiBase, static_cast<void*>(items));
 return;
 }
 
@@ -212,7 +215,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
 return false;
 }
 
@@ -224,7 +227,9 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr || buffer == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', buffer='%p')", __FUNCTION__, addon, filename, buffer);
+ CLog::Log(LOGERROR,
+ "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', buffer='%p')",
+ __FUNCTION__, kodiBase, filename, static_cast<void*>(buffer));
 return false;
 }
 
@@ -236,7 +241,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
 return false;
 }
 
@@ -248,7 +253,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr || newFileName == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', newFileName='%p')", __FUNCTION__, addon, filename, newFileName);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', newFileName='%p')", __FUNCTION__, kodiBase, filename, newFileName);
 return false;
 }
 
@@ -260,7 +265,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr || dest == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', dest='%p')", __FUNCTION__, addon, filename, dest);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p', dest='%p')", __FUNCTION__, kodiBase, filename, dest);
 return false;
 }
 
@@ -272,7 +277,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
 return nullptr;
 }
 
@@ -286,13 +291,13 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
 return nullptr;
 }
 
 Crc32 crc;
 crc.ComputeFromLowerCase(filename);
- std::string string = StringUtils::Format("%08x.tbn", (unsigned __int32)crc);
+ std::string string = StringUtils::Format("%08x.tbn", static_cast<unsigned int>(crc));
 char* buffer = strdup(string.c_str());
 return buffer;
 }
@@ -302,7 +307,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p)", __FUNCTION__, kodiBase, filename);
 return nullptr;
 }
 
@@ -316,7 +321,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || path == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p)", __FUNCTION__, addon, path);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', path='%p)", __FUNCTION__, kodiBase, path);
 return nullptr;
 }
 
@@ -330,7 +335,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || strSource == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', strSource='%p)", __FUNCTION__, addon, strSource);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', strSource='%p)", __FUNCTION__, kodiBase, strSource);
 return nullptr;
 }
 
@@ -344,7 +349,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
 return nullptr;
 }
 
@@ -361,7 +366,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || filename == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, addon, filename);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', filename='%p')", __FUNCTION__, kodiBase, filename);
 return nullptr;
 }
 
@@ -378,7 +383,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr || ptr == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, addon, file, ptr);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, kodiBase, file, ptr);
 return -1;
 }
 
@@ -390,7 +395,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return false;
 }
 
@@ -402,7 +407,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr || ptr == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, addon, file, ptr);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', ptr='%p')", __FUNCTION__, kodiBase, file, ptr);
 return -1;
 }
 
@@ -414,7 +419,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return;
 }
 
@@ -426,7 +431,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return -1;
 }
 
@@ -438,7 +443,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return -1;
 }
 
@@ -450,7 +455,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return -1;
 }
 
@@ -462,7 +467,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return -1;
 }
 
@@ -474,7 +479,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return 0.0f;
 }
 
@@ -486,7 +491,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return;
 }
 
@@ -499,7 +504,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_VFS::%s - invalid data (addon='%p', file='%p)", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_VFS::%s - invalid data (addon='%p', file='%p)", __FUNCTION__, kodiBase, file);
 return -1;
 }
 
@@ -511,7 +516,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr || name == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return nullptr;
 }
 
@@ -533,8 +538,11 @@
 case ADDON_FILE_PROPERTY_MIME_TYPE:
 internalType = XFILE::FILE_PROPERTY_MIME_TYPE;
 break;
+ case ADDON_FILE_PROPERTY_EFFECTIVE_URL:
+ internalType = XFILE::FILE_PROPERTY_EFFECTIVE_URL;
+ break;
 default:
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return nullptr;
 };
 std::vector<std::string> values = static_cast<CFile*>(file)->GetPropertyValues(internalType, name);
@@ -552,7 +560,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || url == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, addon, url);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, kodiBase, url);
 return nullptr;
 }
 
@@ -569,7 +577,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr || name == nullptr || value == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', name='%p', value='%p')", __FUNCTION__, addon, file, name, value);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p', name='%p', value='%p')", __FUNCTION__, kodiBase, file, name, value);
 return false;
 }
 
@@ -601,7 +609,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || file == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, addon, file);
+ CLog::Log(LOGERROR, "Interface_Filesystem::%s - invalid data (addon='%p', file='%p')", __FUNCTION__, kodiBase, file);
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/AddonGUIWindow.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/ListItem.cpp Changed

@@ -105,14 +105,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -129,14 +132,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, item, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -151,14 +157,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -175,14 +184,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, item, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -197,14 +209,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -221,14 +236,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !image)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', image='%p') on addon '%s'",
- __FUNCTION__, addon, item, image, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "image='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, image, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -243,14 +261,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !type)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', type='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, type, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', type='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, type, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -267,14 +288,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !type | !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', type= '%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, item, type, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', type= "
+ "'%p', label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, type, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -289,14 +313,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -314,14 +341,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !path)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', path='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, path, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', path='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, path, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -336,14 +366,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !key || !value)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p', value='%p') on addon '%s'",
- __FUNCTION__, addon, item, key, value, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p', value='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, value, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -361,14 +394,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, item, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return nullptr;
 }
 
@@ -388,14 +424,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -410,14 +449,17 @@
 CFileItemPtr* item = static_cast<CFileItemPtr*>(handle);
 if (!addon || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIListItem::%s - invalid handler data (kodiBase='%p', handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return false;
 }
 
 if (item->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIListItem::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/Window.cpp Changed

@@ -354,14 +354,17 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return false;
 }
 
 if (!pAddonWindow->GetControl(control_id))
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow - %s: %s - Control does not exist in window", __FUNCTION__, addon->Name().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIWindow - %s: %s - Control does not exist in window",
+ __FUNCTION__, addon->Name().c_str());
 return false;
 }
 
@@ -379,8 +382,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return -1;
 }
 
@@ -389,7 +394,8 @@
 Interface_GUIGeneral::unlock();
 
 if (control_id == -1)
- CLog::Log(LOGERROR, "Interface_GUIWindow - %s: %s - No control in this window has focus", __FUNCTION__, addon->Name().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIWindow - %s: %s - No control in this window has focus",
+ __FUNCTION__, addon->Name().c_str());
 
 return control_id;
 }
@@ -400,8 +406,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -423,8 +431,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key || !value)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p', value='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, value, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p', value='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, value, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -442,8 +452,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -461,8 +473,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -480,8 +494,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -499,8 +515,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
@@ -520,8 +538,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return -1;
 }
 
@@ -541,8 +561,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return false;
 }
 
@@ -562,8 +584,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return 0.0;
 }
 
@@ -583,8 +607,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -599,8 +625,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, key, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -623,8 +651,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -639,15 +669,18 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', item='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "item='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, item, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 CFileItemPtr* pItem(static_cast<CFileItemPtr*>(item));
 if (pItem->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIWindow::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -662,8 +695,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -678,15 +713,18 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !item)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', item='%p') on addon '%s'",
- __FUNCTION__, addon, pAddonWindow, item, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "item='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, item, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
 CFileItemPtr* pItem(static_cast<CFileItemPtr*>(item));
 if (pItem->get() == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - empty list item called on addon '%s'", __FUNCTION__, addon->ID().c_str());
+ CLog::Log(LOGERROR, "Interface_GUIWindow::%s - empty list item called on addon '%s'",
+ __FUNCTION__, addon->ID().c_str());
 return;
 }
 
@@ -702,7 +740,7 @@
 if (!addon || !pAddonWindow)
 {
 CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
@@ -729,8 +767,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -745,8 +785,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return -1;
 }
 
@@ -763,8 +805,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return -1;
 }
 
@@ -781,8 +825,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !key || !value)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', key='%p', value='%p') on addon '%s'",
- __FUNCTION__, addon, handle, key, value, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "key='%p', value='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, key, value, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -797,8 +843,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow || !value)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', value='%p') on addon '%s'",
- __FUNCTION__, addon, handle, value, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "value='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, value, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -813,8 +861,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return -1;
 }
 
@@ -836,8 +886,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -922,8 +974,10 @@
 CGUIAddonWindow* pAddonWindow = static_cast<CGUIAddonWindow*>(handle);
 if (!addon || !pAddonWindow)
 {
- CLog::Log(LOGERROR, "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- function, addon, handle, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIWindow::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
+ function, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Button.cpp Changed

@@ -56,8 +56,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -70,8 +72,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -84,8 +88,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -98,8 +104,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
@@ -112,8 +120,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -126,8 +136,10 @@
 CGUIButtonControl* control = static_cast<CGUIButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlButton::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Edit.cpp Changed

@@ -58,7 +58,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -72,7 +72,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -86,7 +86,7 @@
   if (!addon || !control || !heading)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p', heading='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, heading, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, heading, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -138,7 +138,7 @@
   if (!addon || !control || !label)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -152,7 +152,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -166,7 +166,7 @@
   if (!addon || !control || !text)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p', text='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, text, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, text, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -180,7 +180,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -194,7 +194,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -208,7 +208,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlEdit::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/FadeLabel.cpp Changed

@@ -54,7 +54,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlFadeLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -68,7 +68,7 @@
   if (!addon || !control | !label)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlFadeLabel::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -84,7 +84,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlFadeLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -101,7 +101,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlFadeLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -115,7 +115,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlFadeLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Image.cpp Changed

@@ -50,8 +50,10 @@
 CGUIImage* control = static_cast<CGUIImage*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -64,8 +66,10 @@
 CGUIImage* control = static_cast<CGUIImage*>(handle);
 if (!addon || !control || !filename)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p', filename='%p') on addon '%s'",
- __FUNCTION__, addon, control, filename, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p', "
+ "filename='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, filename, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -78,8 +82,10 @@
 CGUIImage* control = static_cast<CGUIImage*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlImage::%s - invalid handler data (kodiBase='%p', handle='%p') "
+ "on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Label.cpp Changed

@@ -52,7 +52,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -66,7 +66,7 @@
   if (!addon || !control || !label)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlLabel::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -82,7 +82,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlLabel::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Progress.cpp Changed

@@ -51,8 +51,10 @@
 CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -65,8 +67,10 @@
 CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -79,8 +83,10 @@
 CGUIProgressControl* control = static_cast<CGUIProgressControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlProgress::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return 0.0f;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/RadioButton.cpp Changed

@@ -55,8 +55,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -69,8 +71,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -83,8 +87,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control || !label)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
- __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p', label='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -97,8 +103,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return nullptr;
 }
 
@@ -111,8 +119,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -125,8 +135,10 @@
 CGUIRadioButtonControl* control = static_cast<CGUIRadioButtonControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlRadioButton::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Rendering.cpp Changed

@@ -53,8 +53,10 @@
 CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }
 
@@ -76,8 +78,10 @@
 CGUIAddonRenderingControl* control = static_cast<CGUIAddonRenderingControl*>(handle);
 if (!addon || !control)
 {
- CLog::Log(LOGERROR, "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
- __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+ CLog::Log(LOGERROR,
+ "Interface_GUIControlAddonRendering::%s - invalid handler data (kodiBase='%p', "
+ "handle='%p') on addon '%s'",
+ __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
 return;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/SettingsSlider.cpp Changed

@@ -67,7 +67,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -81,7 +81,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -95,7 +95,7 @@
   if (!addon || !control || !text)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p', text='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, text, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, text, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -111,7 +111,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -126,7 +126,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -141,7 +141,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -156,7 +156,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return -1;
   }
 
@@ -170,7 +170,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -184,7 +184,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -199,7 +199,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0.0f;
   }
 
@@ -213,7 +213,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -228,7 +228,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -243,7 +243,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0.0f;
   }
 
@@ -257,7 +257,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSettingsSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Slider.cpp Changed

@@ -67,7 +67,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -81,7 +81,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -95,7 +95,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -110,7 +110,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -124,7 +124,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -139,7 +139,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -154,7 +154,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return -1;
   }
 
@@ -168,7 +168,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -182,7 +182,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -197,7 +197,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0.0f;
   }
 
@@ -211,7 +211,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -226,7 +226,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -241,7 +241,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0.0f;
   }
 
@@ -255,7 +255,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSlider::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/Spin.cpp Changed

@@ -69,7 +69,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -83,7 +83,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -97,7 +97,7 @@
   if (!addon || !control || !text)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p', text='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, text, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, text, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -113,7 +113,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -128,7 +128,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -142,7 +142,7 @@
   if (!addon || !control || !label || !value)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p', value='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, label, value, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, label, value, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -156,7 +156,7 @@
   if (!addon || !control || !value)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p', value='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, value, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, value, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -170,7 +170,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -184,7 +184,7 @@
   if (!addon || !control || !label)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p', label='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, label, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, label, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -198,7 +198,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -212,7 +212,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -226,7 +226,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return -1;
   }
 
@@ -240,7 +240,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -254,7 +254,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -268,7 +268,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return 0.0f;
   }
 
@@ -282,7 +282,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlSpin::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/controls/TextBox.cpp Changed

@@ -55,7 +55,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -69,7 +69,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -84,7 +84,7 @@
   if (!addon || !control || !text)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p', text='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, text, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, text, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -100,7 +100,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return nullptr;
   }
 
@@ -114,7 +114,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }
 
@@ -128,7 +128,7 @@
   if (!addon || !control)
   {
     CLog::Log(LOGERROR, "Interface_GUIControlTextBox::%s - invalid handler data (kodiBase='%p', handle='%p') on addon '%s'",
-                          __FUNCTION__, addon, control, addon ? addon->ID().c_str() : "unknown");
+                          __FUNCTION__, kodiBase, handle, addon ? addon->ID().c_str() : "unknown");
     return;
   }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/ContextMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/ExtendedProgressBar.cpp Changed

@@ -66,7 +66,10 @@
 CGUIDialogExtendedProgressBar* dialog = g_windowManager.GetWindow<CGUIDialogExtendedProgressBar>(WINDOW_DIALOG_EXT_PROGRESS);
 if (!title || !dialog)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid handler data (title='%p', dialog='%p') on addon '%s'", __FUNCTION__, title, dialog, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid handler data (title='%p', "
+ "dialog='%p') on addon '%s'",
+ __FUNCTION__, title, static_cast<void*>(dialog), addon->ID().c_str());
 return nullptr;
 }
 
@@ -103,7 +106,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p') on "
+ "addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return nullptr;
 }
 
@@ -121,7 +127,10 @@
 
 if (!handle || !title)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p', title='%p') on addon '%s'", __FUNCTION__, handle, title, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p', "
+ "title='%p') on addon '%s'",
+ __FUNCTION__, handle, title, addon->ID().c_str());
 return;
 }
 
@@ -139,7 +148,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return nullptr;
 }
 
@@ -157,7 +169,10 @@
 
 if (!handle || !text)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p', text='%p') on addon '%s'", __FUNCTION__, handle, text, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid handler data (handle='%p', "
+ "text='%p') on addon '%s'",
+ __FUNCTION__, handle, text, addon->ID().c_str());
 return;
 }
 
@@ -175,7 +190,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return false;
 }
 
@@ -193,7 +211,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -211,7 +232,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return 0.0f;
 }
 
@@ -229,7 +253,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -247,7 +274,10 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogExtendedProgress::%s - invalid add-on data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/FileBrowser.cpp Changed

@@ -65,8 +65,11 @@
 
 if (!shares || !heading || !path_in || !path_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', heading='%p', path_in='%p', path_out='%p') on addon '%s'",
- __FUNCTION__, shares, heading, path_in, path_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', "
+ "heading='%p', path_in='%p', path_out='%p') on addon '%s'",
+ __FUNCTION__, shares, heading, path_in, static_cast<void*>(path_out),
+ addon->ID().c_str());
 return false;
 }
 
@@ -92,8 +95,11 @@
 
 if (!shares || !mask || !heading || !path_in || !path_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', mask='%p', heading='%p', path_in='%p', path_out='%p') on addon '%s'",
- __FUNCTION__, shares, mask, heading, path_in, path_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', mask='%p', "
+ "heading='%p', path_in='%p', path_out='%p') on addon '%s'",
+ __FUNCTION__, shares, mask, heading, path_in, static_cast<void*>(path_out),
+ addon->ID().c_str());
 return false;
 }
 
@@ -120,8 +126,11 @@
 
 if (!directory || !mask || !heading || !path_in || !path_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (directory='%p', mask='%p', heading='%p', path_in='%p', path_out='%p') on addon '%s'",
- __FUNCTION__, directory, mask, heading, path_in, path_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (directory='%p', "
+ "mask='%p', heading='%p', path_in='%p', path_out='%p') on addon '%s'",
+ __FUNCTION__, directory, mask, heading, path_in, static_cast<void*>(path_out),
+ addon->ID().c_str());
 return false;
 }
 
@@ -145,8 +154,11 @@
 
 if (!shares || !mask || !heading || !file_list || !entries)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', mask='%p', heading='%p', file_list='%p', entries='%p') on addon '%s'",
- __FUNCTION__, shares, mask, heading, file_list, entries, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', mask='%p', "
+ "heading='%p', file_list='%p', entries='%p') on addon '%s'",
+ __FUNCTION__, shares, mask, heading, static_cast<void*>(file_list),
+ static_cast<void*>(entries), addon->ID().c_str());
 return false;
 }
 
@@ -180,8 +192,11 @@
 
 if (!strType || !additionalShare || !path_in || !path_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (additionalShare='%p', strType='%p', path_in='%p', path_out='%p') on addon '%s'",
- __FUNCTION__, additionalShare, strType, path_in, path_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (additionalShare='%p', "
+ "strType='%p', path_in='%p', path_out='%p') on addon '%s'",
+ __FUNCTION__, additionalShare, strType, path_in, static_cast<void*>(path_out),
+ addon->ID().c_str());
 return false;
 }
 
@@ -208,7 +223,10 @@
 
 if (!shares || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', heading='%p') on addon '%s'", __FUNCTION__, shares, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', "
+ "heading='%p') on addon '%s'",
+ __FUNCTION__, shares, heading, addon->ID().c_str());
 return false;
 }
 
@@ -233,8 +251,12 @@
 
 if (!shares || !heading || !file_list || !entries)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', heading='%p', file_list='%p', entries='%p') on addon '%s'",
- __FUNCTION__, shares, heading, file_list, entries, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (shares='%p', "
+ "heading='%p', file_list='%p', entries='%p') on addon '%s'",
+ __FUNCTION__, shares, heading,
+ static_cast<void*>(file_list), static_cast<void*>(entries),
+ addon->ID().c_str());
 return false;
 }
 
@@ -272,7 +294,13 @@
 *file_list = nullptr;
 }
 else
- CLog::Log(LOGERROR, "Interface_GUIDialogFileBrowser::%s - invalid handler data (file_list='%p') on addon '%s'", __FUNCTION__, file_list, addon->ID().c_str());
+ {
+
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogFileBrowser::%s - invalid handler data (file_list='%p') on addon '%s'",
+ __FUNCTION__, static_cast<void*>(file_list), addon->ID().c_str());
+ }
 }
 
 void Interface_GUIDialogFileBrowser::GetVECShares(VECSOURCES& vecShares, const std::string& strShares, const std::string& strPath)

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/Keyboard.cpp Changed

@@ -65,8 +65,10 @@
 
 if (!text_in || !text_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', text_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, text_in, text_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', "
+ "text_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, text_in, static_cast<void*>(text_out), heading, addon->ID().c_str());
 return false;
 }
 
@@ -88,8 +90,10 @@
 
 if (!text_in || !text_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', text_out='%p') on addon '%s'",
- __FUNCTION__, text_in, text_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', "
+ "text_out='%p') on addon '%s'",
+ __FUNCTION__, text_in, static_cast<void*>(text_out), addon->ID().c_str());
 return false;
 }
 
@@ -112,8 +116,11 @@
 
 if (!password_in || !password_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', password_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, password_in, password_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', "
+ "password_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, password_in, static_cast<void*>(password_out), heading,
+ addon->ID().c_str());
 return false;
 }
 
@@ -135,8 +142,10 @@
 
 if (!password_in || !password_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', password_out='%p') on addon '%s'",
- __FUNCTION__, password_in, password_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', "
+ "password_out='%p') on addon '%s'",
+ __FUNCTION__, password_in, static_cast<void*>(password_out), addon->ID().c_str());
 return false;
 }
 
@@ -159,8 +168,10 @@
 
 if (!password_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (password_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, password_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (password_out='%p', "
+ "heading='%p') on addon '%s'",
+ __FUNCTION__, static_cast<void*>(password_out), heading, addon->ID().c_str());
 return false;
 }
 
@@ -182,8 +193,10 @@
 
 if (!password_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (password_out='%p') on addon '%s'",
- __FUNCTION__, password_out, addon->ID().c_str());
+ CLog::Log(
+ LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (password_out='%p') on addon '%s'",
+ __FUNCTION__, static_cast<void*>(password_out), addon->ID().c_str());
 return false;
 }
 
@@ -205,8 +218,11 @@
 
 if (!password_in || !password_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', password_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, password_in, password_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (password_in='%p', "
+ "password_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, password_in, static_cast<void*>(password_out), heading,
+ addon->ID().c_str());
 return false;
 }
 
@@ -228,8 +244,10 @@
 
 if (!text_in || !text_out)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', text_out='%p') on addon '%s'",
- __FUNCTION__, text_in, text_out, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogKeyboard::%s - invalid handler data (text_in='%p', "
+ "text_out='%p') on addon '%s'",
+ __FUNCTION__, text_in, static_cast<void*>(text_out), addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/Numeric.cpp Changed

@@ -77,8 +77,10 @@
 
 if (!password || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (password='%p', heading='%p') on addon '%s'",
- __FUNCTION__, password, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (password='%p', heading='%p') "
+ "on addon '%s'",
+ __FUNCTION__, password, heading, addon->ID().c_str());
 return -1;
 }
 
@@ -97,8 +99,11 @@
 
 if (!verify_in || !verify_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (verify_in='%p', verify_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, verify_in, verify_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (verify_in='%p', "
+ "verify_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, verify_in, static_cast<void*>(verify_out), heading,
+ addon->ID().c_str());
 return false;
 }
 
@@ -120,8 +125,10 @@
 
 if (!time || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (time='%p', heading='%p') on addon '%s'",
- __FUNCTION__, time, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (time='%p', heading='%p') on "
+ "addon '%s'",
+ __FUNCTION__, static_cast<void*>(time), heading, addon->ID().c_str());
 return false;
 }
 
@@ -148,8 +155,10 @@
 
 if (!date || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (date='%p', heading='%p') on addon '%s'",
- __FUNCTION__, date, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (date='%p', heading='%p') on "
+ "addon '%s'",
+ __FUNCTION__, static_cast<void*>(date), heading, addon->ID().c_str());
 return false;
 }
 
@@ -176,8 +185,11 @@
 
 if (!ip_address_in || !ip_address_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (ip_address_in='%p', ip_address_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, ip_address_in, ip_address_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (ip_address_in='%p', "
+ "ip_address_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, ip_address_in, static_cast<void*>(ip_address_out), heading,
+ addon->ID().c_str());
 return false;
 }
 
@@ -199,8 +211,11 @@
 
 if (!number_in || !number_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (number_in='%p', number_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, number_in, number_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (number_in='%p', "
+ "number_out='%p', heading='%p') on addon '%s'",
+ __FUNCTION__, number_in, static_cast<void*>(number_out), heading,
+ addon->ID().c_str());
 return false;
 }
 
@@ -222,8 +237,10 @@
 
 if (!time_in || !time_out || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogNumeric::%s - invalid handler data (time_in='%p', time_out='%p', heading='%p') on addon '%s'",
- __FUNCTION__, time_in, time_out, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogNumeric::%s - invalid handler data (time_in='%p', time_out='%p', "
+ "heading='%p') on addon '%s'",
+ __FUNCTION__, time_in, static_cast<void*>(time_out), heading, addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/OK.cpp Changed

@@ -50,8 +50,9 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (!addon || !heading || !text)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogOK:%s - invalid data (addon='%p', heading='%p', text='%p')",
- __FUNCTION__, addon, heading, text);
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogOK:%s - invalid data (addon='%p', heading='%p', text='%p')",
+ __FUNCTION__, kodiBase, heading, text);
 return;
 }
 
@@ -63,8 +64,10 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (!addon || !heading || !line0 || !line1 || !line2)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogOK::%s - invalid data (addon='%p', heading='%p', line0='%p', line1='%p', line2='%p')",
- __FUNCTION__, addon, heading, line0, line1, line2);
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogOK::%s - invalid data (addon='%p', heading='%p', line0='%p', "
+ "line1='%p', line2='%p')",
+ __FUNCTION__, kodiBase, heading, line0, line1, line2);
 return;
 }
 HELPERS::ShowOKDialogLines(CVariant{ heading }, CVariant{ line0 }, CVariant{ line1 }, CVariant{ line2 });

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/Progress.cpp Changed

@@ -68,7 +68,9 @@
 CGUIDialogProgress *dialog = g_windowManager.GetWindow<CGUIDialogProgress>(WINDOW_DIALOG_PROGRESS);
 if (!dialog)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (dialog='%p') on addon '%s'", __FUNCTION__, dialog, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (dialog='%p') on addon '%s'",
+ __FUNCTION__, static_cast<void*>(dialog), addon->ID().c_str());
 return nullptr;
 }
 
@@ -86,7 +88,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -104,7 +108,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -122,7 +128,10 @@
 
 if (!handle || !heading)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p', heading='%p') on addon '%s'", __FUNCTION__, handle, heading, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p', heading='%p') "
+ "on addon '%s'",
+ __FUNCTION__, handle, static_cast<const void*>(heading), addon->ID().c_str());
 return;
 }
 
@@ -140,7 +149,10 @@
 
 if (!handle || !text)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p', text='%p') on addon '%s'", __FUNCTION__, handle, text, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p', text='%p') on "
+ "addon '%s'",
+ __FUNCTION__, handle, static_cast<const void*>(text), addon->ID().c_str());
 return;
 }
 
@@ -158,7 +170,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -176,7 +190,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return false;
 }
 
@@ -194,7 +210,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -212,7 +230,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return 0;
 }
 
@@ -230,7 +250,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -248,7 +270,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -266,7 +290,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return;
 }
 
@@ -284,7 +310,9 @@
 
 if (!handle)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'", __FUNCTION__, handle, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogProgress::%s - invalid handler data (handle='%p') on addon '%s'",
+ __FUNCTION__, handle, addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/Select.cpp Changed

@@ -57,8 +57,11 @@
 CGUIDialogSelect* dialog = g_windowManager.GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
 if (!heading || !entries || !dialog)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogSelect::%s - invalid handler data (heading='%p', entries='%p', dialog='%p') on addon '%s'", __FUNCTION__, 
- heading, entries, dialog, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogSelect::%s - invalid handler data (heading='%p', entries='%p', "
+ "dialog='%p') on addon '%s'",
+ __FUNCTION__, heading, static_cast<const void*>(entries), static_cast<void*>(dialog),
+ addon->ID().c_str());
 return -1;
 }
 
@@ -91,8 +94,12 @@
 CGUIDialogSelect* dialog = g_windowManager.GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
 if (!heading || !entryIDs || !entryNames || !entriesSelected || !dialog)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogMultiSelect::%s - invalid handler data (heading='%p', entryIDs='%p', entryNames='%p', entriesSelected='%p', dialog='%p') on addon '%s'", __FUNCTION__,
- heading, entryIDs, entryNames, entriesSelected, dialog, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogMultiSelect::%s - invalid handler data (heading='%p', "
+ "entryIDs='%p', entryNames='%p', entriesSelected='%p', dialog='%p') on addon '%s'",
+ __FUNCTION__, heading, static_cast<const void*>(entryIDs),
+ static_cast<const void*>(entryNames), static_cast<void*>(entriesSelected),
+ static_cast<void*>(dialog), addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/TextViewer.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/interfaces/GUI/dialogs/YesNo.cpp Changed

@@ -64,9 +64,11 @@
 
 if (!heading || !text || !canceled || !noLabel || !yesLabel)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', text='%p', "
- "canceled='%p', noLabel='%p', yesLabel='%p') on addon '%s'", __FUNCTION__,
- heading, text, canceled, noLabel, yesLabel, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', text='%p', "
+ "canceled='%p', noLabel='%p', yesLabel='%p') on addon '%s'",
+ __FUNCTION__, heading, text, static_cast<void*>(canceled), noLabel, yesLabel,
+ addon->ID().c_str());
 return false;
 }
 
@@ -92,9 +94,11 @@
 
 if (!heading || !line0 || !line1 || !line2 || !noLabel || !yesLabel)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', line0='%p', line1='%p', line2='%p', "
- "noLabel='%p', yesLabel='%p') on addon '%s'", __FUNCTION__,
- heading, line0, line1, line2, noLabel, yesLabel, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', line0='%p', "
+ "line1='%p', line2='%p', "
+ "noLabel='%p', yesLabel='%p') on addon '%s'",
+ __FUNCTION__, heading, line0, line1, line2, noLabel, yesLabel, addon->ID().c_str());
 return false;
 }
 
@@ -120,9 +124,12 @@
 
 if (!heading || !line0 || !line1 || !line2 || !canceled || !noLabel || !yesLabel)
 {
- CLog::Log(LOGERROR, "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', line0='%p', line1='%p', line2='%p', "
- "canceled='%p', noLabel='%p', yesLabel='%p') on addon '%s'", __FUNCTION__,
- heading, line0, line1, line2, canceled, noLabel, yesLabel, addon->ID().c_str());
+ CLog::Log(LOGERROR,
+ "Interface_GUIDialogYesNo::%s - invalid handler data (heading='%p', line0='%p', "
+ "line1='%p', line2='%p', "
+ "canceled='%p', noLabel='%p', yesLabel='%p') on addon '%s'",
+ __FUNCTION__, heading, line0, line1, line2, static_cast<const void*>(canceled),
+ noLabel, yesLabel, addon->ID().c_str());
 return false;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/General.cpp Changed

@@ -84,7 +84,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || id == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__, addon, id);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__,
+ kodiBase, static_cast<const void*>(id));
 return nullptr;
 }
 
@@ -131,7 +132,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return false;
 }
 
@@ -151,7 +152,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (!addon)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return nullptr;
 }
 
@@ -170,7 +171,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (!addon || !source || !ret)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', source='%p', ret='%p')", __FUNCTION__, addon, source, ret);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', source='%p', ret='%p')",
+ __FUNCTION__, kodiBase, static_cast<const void*>(source), static_cast<void*>(ret));
 return nullptr;
 }
 
@@ -185,7 +187,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (!addon)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return nullptr;
 }
 
@@ -241,7 +243,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || message == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', message='%p')", __FUNCTION__, addon, message);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', message='%p')",
+ __FUNCTION__, kodiBase, static_cast<const void*>(message));
 return false;
 }
 
@@ -295,7 +298,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || text == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', text='%p')", __FUNCTION__, addon, text);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', text='%p')",
+ __FUNCTION__, kodiBase, static_cast<const void*>(text));
 return;
 }
 
@@ -324,7 +328,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || id == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__, addon, id);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', id='%p')", __FUNCTION__,
+ kodiBase, static_cast<const void*>(id));
 return nullptr;
 }
 
@@ -384,7 +389,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || free == nullptr || total == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', free='%p', total='%p')", __FUNCTION__, addon, free, total);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', free='%p', total='%p')",
+ __FUNCTION__, kodiBase, static_cast<void*>(free), static_cast<void*>(total));
 return;
 }
 
@@ -405,7 +411,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return -1;
 }
 
@@ -417,7 +423,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return nullptr;
 }
 
@@ -430,8 +436,12 @@
 if (addon == nullptr || compile_name == nullptr || major == nullptr || minor == nullptr ||
 revision == nullptr || tag == nullptr || tagversion == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_General::%s - invalid data (addon='%p', compile_name='%p', major='%p', minor='%p', revision='%p', tag='%p', tagversion='%p')",
- __FUNCTION__, addon, compile_name, major, minor, revision, tag, tagversion);
+ CLog::Log(LOGERROR,
+ "Interface_General::%s - invalid data (addon='%p', compile_name='%p', major='%p', "
+ "minor='%p', revision='%p', tag='%p', tagversion='%p')",
+ __FUNCTION__, kodiBase, static_cast<void*>(compile_name), static_cast<void*>(major),
+ static_cast<void*>(minor), static_cast<void*>(revision), static_cast<void*>(tag),
+ static_cast<void*>(tagversion));
 return;
 }

_service:download_files:master.tar.gz/xbmc/addons/interfaces/Network.cpp Changed

@@ -60,7 +60,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || mac == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', mac='%p')", __FUNCTION__, addon, mac);
+ CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', mac='%p')", __FUNCTION__, kodiBase, mac);
 return false;
 }
 
@@ -72,7 +72,7 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p')", __FUNCTION__, addon);
+ CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p')", __FUNCTION__, kodiBase);
 return nullptr;
 }
 
@@ -94,7 +94,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || url == nullptr || ret == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p', ret='%p')", __FUNCTION__, addon, url, ret);
+ CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p', ret='%p')",
+ __FUNCTION__, kodiBase, url, static_cast<void*>(ret));
 return nullptr;
 }
 
@@ -111,7 +112,8 @@
 CAddonDll* addon = static_cast<CAddonDll*>(kodiBase);
 if (addon == nullptr || url == nullptr)
 {
- CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p')", __FUNCTION__, addon, url);
+ CLog::Log(LOGERROR, "Interface_Network::%s - invalid data (addon='%p', url='%p')", __FUNCTION__,
+ kodiBase, url);
 return nullptr;
 }

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/AudioDSP.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Peripheral.h Changed

@@ -34,6 +34,10 @@
 
 /// @name Peripheral types
 ///{
+
+ /*!
+ * @brief API error codes
+ */
 typedef enum PERIPHERAL_ERROR
 {
 PERIPHERAL_NO_ERROR = 0, // no error occurred
@@ -45,6 +49,9 @@
 PERIPHERAL_ERROR_CONNECTION_FAILED = -6, // peripherals are connected, but command was interrupted
 } PERIPHERAL_ERROR;
 
+ /*!
+ * @brief Peripheral types
+ */
 typedef enum PERIPHERAL_TYPE
 {
 PERIPHERAL_TYPE_UNKNOWN,
@@ -52,6 +59,9 @@
 PERIPHERAL_TYPE_KEYBOARD,
 } PERIPHERAL_TYPE;
 
+ /*!
+ * @brief Information shared between peripherals
+ */
 typedef struct PERIPHERAL_INFO
 {
 PERIPHERAL_TYPE type; /*!< @brief type of peripheral */
@@ -63,8 +73,6 @@
 
 /*!
 * @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
 {
@@ -77,6 +85,10 @@
 
 /// @name Event types
 ///{
+
+ /*!
+ * @brief Types of events that can be sent and received
+ */
 typedef enum PERIPHERAL_EVENT_TYPE
 {
 PERIPHERAL_EVENT_TYPE_NONE, /*!< @brief unknown event */
@@ -86,12 +98,18 @@
 PERIPHERAL_EVENT_TYPE_SET_MOTOR, /*!< @brief set the state for joystick rumble motor */
 } PERIPHERAL_EVENT_TYPE;
 
+ /*!
+ * @brief States a button can have
+ */
 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;
 
+ /*!
+ * @brief States a D-pad (also called a hat) can have
+ */
 typedef enum JOYSTICK_STATE_HAT
 {
 JOYSTICK_STATE_HAT_UNPRESSED = 0x0, /*!< @brief no directions are pressed */
@@ -106,7 +124,7 @@
 } JOYSTICK_STATE_HAT;
 
 /*!
- * @brief value in the closed interval [-1.0, 1.0]
+ * @brief Axis 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
@@ -114,13 +132,25 @@
 */
 typedef float JOYSTICK_STATE_AXIS;
 
+ /*!
+ * @brief Motor value in the closed interval [0.0, 1.0]
+ */
 typedef float JOYSTICK_STATE_MOTOR;
 
+ /*!
+ * @brief Event information
+ */
 typedef struct PERIPHERAL_EVENT
 {
- unsigned int peripheral_index;
- PERIPHERAL_EVENT_TYPE type;
- unsigned int driver_index;
+ /*! @brief Index of the peripheral handling/receiving the event */
+ unsigned int peripheral_index;
+
+ /*! @brief Type of the event used to determine which enum field to access below */
+ PERIPHERAL_EVENT_TYPE type;
+
+ /*! @brief The index of the event source */
+ unsigned int driver_index;
+
 JOYSTICK_STATE_BUTTON driver_button_state;
 JOYSTICK_STATE_HAT driver_hat_state;
 JOYSTICK_STATE_AXIS driver_axis_state;
@@ -130,6 +160,10 @@
 
 /// @name Joystick types
 ///{
+
+ /*!
+ * @brief Info specific to joystick peripherals
+ */
 typedef struct JOYSTICK_INFO
 {
 PERIPHERAL_INFO peripheral; /*!< @brief peripheral info for this joystick */
@@ -142,6 +176,15 @@
 bool supports_poweroff; /*!< @brief whether the joystick supports being powered off */
 } ATTRIBUTE_PACKED JOYSTICK_INFO;
 
+ /*!
+ * @brief Driver input primitives
+ *
+ * Mapping lower-level driver values to higher-level controller features is
+ * non-injective; two triggers can share a single axis.
+ *
+ * To handle this, driver values are subdivided into "primitives" that map
+ * injectively to higher-level features.
+ */
 typedef enum JOYSTICK_DRIVER_PRIMITIVE_TYPE
 {
 JOYSTICK_DRIVER_PRIMITIVE_TYPE_UNKNOWN,
@@ -149,13 +192,22 @@
 JOYSTICK_DRIVER_PRIMITIVE_TYPE_HAT_DIRECTION,
 JOYSTICK_DRIVER_PRIMITIVE_TYPE_SEMIAXIS,
 JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR,
+ JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY,
+ JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON,
+ JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION,
 } JOYSTICK_DRIVER_PRIMITIVE_TYPE;
 
+ /*!
+ * @brief Button primitive
+ */
 typedef struct JOYSTICK_DRIVER_BUTTON
 {
 int index;
 } ATTRIBUTE_PACKED JOYSTICK_DRIVER_BUTTON;
 
+ /*!
+ * @brief Hat direction
+ */
 typedef enum JOYSTICK_DRIVER_HAT_DIRECTION
 {
 JOYSTICK_DRIVER_HAT_UNKNOWN,
@@ -165,12 +217,18 @@
 JOYSTICK_DRIVER_HAT_DOWN,
 } JOYSTICK_DRIVER_HAT_DIRECTION;
 
+ /*!
+ * @brief Hat direction primitive
+ */
 typedef struct JOYSTICK_DRIVER_HAT
 {
 int index;
 JOYSTICK_DRIVER_HAT_DIRECTION direction;
 } ATTRIBUTE_PACKED JOYSTICK_DRIVER_HAT;
 
+ /*!
+ * @brief Semiaxis direction
+ */
 typedef enum JOYSTICK_DRIVER_SEMIAXIS_DIRECTION
 {
 JOYSTICK_DRIVER_SEMIAXIS_NEGATIVE = -1, /*!< @brief negative half of the axis */
@@ -178,6 +236,9 @@
 JOYSTICK_DRIVER_SEMIAXIS_POSITIVE = 1, /*!< @brief positive half of the axis */
 } JOYSTICK_DRIVER_SEMIAXIS_DIRECTION;
 
+ /*!
+ * @brief Semiaxis primitive
+ */
 typedef struct JOYSTICK_DRIVER_SEMIAXIS
 {
 int index;
@@ -186,11 +247,70 @@
 unsigned int range;
 } ATTRIBUTE_PACKED JOYSTICK_DRIVER_SEMIAXIS;
 
+ /*!
+ * @brief Motor primitive
+ */
 typedef struct JOYSTICK_DRIVER_MOTOR
 {
 int index;
 } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOTOR;
 
+ /*!
+ * @brief Keyboard key primitive
+ */
+ typedef struct JOYSTICK_DRIVER_KEY
+ {
+ char keycode[16];
+ } ATTRIBUTE_PACKED JOYSTICK_DRIVER_KEY;
+
+ /*!
+ * @brief Mouse buttons
+ */
+ typedef enum JOYSTICK_DRIVER_MOUSE_INDEX
+ {
+ JOYSTICK_DRIVER_MOUSE_INDEX_UNKNOWN,
+ JOYSTICK_DRIVER_MOUSE_INDEX_LEFT,
+ JOYSTICK_DRIVER_MOUSE_INDEX_RIGHT,
+ JOYSTICK_DRIVER_MOUSE_INDEX_MIDDLE,
+ JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON4,
+ JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON5,
+ JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_UP,
+ JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_DOWN,
+ JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_LEFT,
+ JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_RIGHT,
+ } JOYSTICK_DRIVER_MOUSE_INDEX;
+
+ /*!
+ * @brief Mouse button primitive
+ */
+ typedef struct JOYSTICK_DRIVER_MOUSE_BUTTON
+ {
+ JOYSTICK_DRIVER_MOUSE_INDEX button;
+ } ATTRIBUTE_PACKED JOYSTICK_DRIVER_MOUSE_BUTTON;
+
+ /*!
+ * @brief Relative pointer direction
+ */
+ typedef enum JOYSTICK_DRIVER_RELPOINTER_DIRECTION
+ {
+ JOYSTICK_DRIVER_RELPOINTER_UNKNOWN,
+ JOYSTICK_DRIVER_RELPOINTER_LEFT,
+ JOYSTICK_DRIVER_RELPOINTER_RIGHT,
+ JOYSTICK_DRIVER_RELPOINTER_UP,
+ JOYSTICK_DRIVER_RELPOINTER_DOWN,
+ } JOYSTICK_DRIVER_RELPOINTER_DIRECTION;
+
+ /*!
+ * @brief Relative pointer direction primitive
+ */
+ typedef struct JOYSTICK_DRIVER_RELPOINTER
+ {
+ JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction;
+ } ATTRIBUTE_PACKED JOYSTICK_DRIVER_RELPOINTER;
+
+ /*!
+ * @brief Driver primitive struct
+ */
 typedef struct JOYSTICK_DRIVER_PRIMITIVE
 {
 JOYSTICK_DRIVER_PRIMITIVE_TYPE type;
@@ -200,9 +320,18 @@
 struct JOYSTICK_DRIVER_HAT hat;
 struct JOYSTICK_DRIVER_SEMIAXIS semiaxis;
 struct JOYSTICK_DRIVER_MOTOR motor;
+ struct JOYSTICK_DRIVER_KEY key;
+ struct JOYSTICK_DRIVER_MOUSE_BUTTON mouse;
+ struct JOYSTICK_DRIVER_RELPOINTER relpointer;
 };
 } ATTRIBUTE_PACKED JOYSTICK_DRIVER_PRIMITIVE;
 
+ /*!
+ * @brief Controller feature
+ *
+ * Controller features are an abstraction over driver values. Each feature
+ * maps to one or more driver primitives.
+ */
 typedef enum JOYSTICK_FEATURE_TYPE
 {
 JOYSTICK_FEATURE_TYPE_UNKNOWN,
@@ -214,11 +343,15 @@
 JOYSTICK_FEATURE_TYPE_ABSPOINTER,
 JOYSTICK_FEATURE_TYPE_WHEEL,
 JOYSTICK_FEATURE_TYPE_THROTTLE,
+ JOYSTICK_FEATURE_TYPE_KEY,
 } JOYSTICK_FEATURE_TYPE;
 
+ /*!
+ * @brief Indices used to access a feature's driver primitives
+ */
 typedef enum JOYSTICK_FEATURE_PRIMITIVE
 {
- // Scalar feature
+ // Scalar feature (a button, hat direction or semiaxis)
 JOYSTICK_SCALAR_PRIMITIVE = 0,
 
 // Analog stick
@@ -243,10 +376,25 @@
 JOYSTICK_THROTTLE_UP = 0,
 JOYSTICK_THROTTLE_DOWN = 1,
 
+ // Key
+ JOYSTICK_KEY_PRIMITIVE = 0,
+
+ // Mouse button
+ JOYSTICK_MOUSE_BUTTON = 0,
+
+ // Relative pointer direction
+ JOYSTICK_RELPOINTER_UP = 0,
+ JOYSTICK_RELPOINTER_DOWN = 1,
+ JOYSTICK_RELPOINTER_RIGHT = 2,
+ JOYSTICK_RELPOINTER_LEFT = 3,
+
 // Maximum number of primitives
 JOYSTICK_PRIMITIVE_MAX = 4,
 } JOYSTICK_FEATURE_PRIMITIVE;
 
+ /*!
+ * @brief Mapping between higher-level controller feature and its driver primitives
+ */
 typedef struct JOYSTICK_FEATURE
 {
 char* name;

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h Changed

@@ -23,8 +23,8 @@
 
 #include <array> // Requires c++11
 #include <cstring>
-#include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #define PERIPHERAL_SAFE_DELETE(x) do { delete (x); (x) = NULL; } while (0)
@@ -164,62 +164,70 @@
 class PeripheralEvent
 {
 public:
- PeripheralEvent(void) :
- m_event()
+ PeripheralEvent(void)
 {
 }
 
 PeripheralEvent(unsigned int peripheralIndex, unsigned int buttonIndex, JOYSTICK_STATE_BUTTON state) :
- m_event()
+ m_type(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON),
+ m_peripheralIndex(peripheralIndex),
+ m_driverIndex(buttonIndex),
+ m_buttonState(state)
 {
- 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()
+ m_type(PERIPHERAL_EVENT_TYPE_DRIVER_HAT),
+ m_peripheralIndex(peripheralIndex),
+ m_driverIndex(hatIndex),
+ m_hatState(state)
 {
- 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()
+ m_type(PERIPHERAL_EVENT_TYPE_DRIVER_AXIS),
+ m_peripheralIndex(peripheralIndex),
+ m_driverIndex(axisIndex),
+ m_axisState(state)
 {
- SetType(PERIPHERAL_EVENT_TYPE_DRIVER_AXIS);
- SetPeripheralIndex(peripheralIndex);
- SetDriverIndex(axisIndex);
- SetAxisState(state);
 }
 
 explicit 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; }
- JOYSTICK_STATE_MOTOR MotorState(void) const { return m_event.motor_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 SetMotorState(JOYSTICK_STATE_MOTOR state) { m_event.motor_state = state; }
+ m_type(event.type),
+ m_peripheralIndex(event.peripheral_index),
+ m_driverIndex(event.driver_index),
+ m_buttonState(event.driver_button_state),
+ m_hatState(event.driver_hat_state),
+ m_axisState(event.driver_axis_state),
+ m_motorState(event.motor_state)
+ {
+ }
+
+ PERIPHERAL_EVENT_TYPE Type(void) const { return m_type; }
+ unsigned int PeripheralIndex(void) const { return m_peripheralIndex; }
+ unsigned int DriverIndex(void) const { return m_driverIndex; }
+ JOYSTICK_STATE_BUTTON ButtonState(void) const { return m_buttonState; }
+ JOYSTICK_STATE_HAT HatState(void) const { return m_hatState; }
+ JOYSTICK_STATE_AXIS AxisState(void) const { return m_axisState; }
+ JOYSTICK_STATE_MOTOR MotorState(void) const { return m_motorState; }
+
+ void SetType(PERIPHERAL_EVENT_TYPE type) { m_type = type; }
+ void SetPeripheralIndex(unsigned int index) { m_peripheralIndex = index; }
+ void SetDriverIndex(unsigned int index) { m_driverIndex = index; }
+ void SetButtonState(JOYSTICK_STATE_BUTTON state) { m_buttonState = state; }
+ void SetHatState(JOYSTICK_STATE_HAT state) { m_hatState = state; }
+ void SetAxisState(JOYSTICK_STATE_AXIS state) { m_axisState = state; }
+ void SetMotorState(JOYSTICK_STATE_MOTOR state) { m_motorState = state; }
 
 void ToStruct(PERIPHERAL_EVENT& event) const
 {
- event = m_event;
+ event.type = m_type;
+ event.peripheral_index = m_peripheralIndex;
+ event.driver_index = m_driverIndex;
+ event.driver_button_state = m_buttonState;
+ event.driver_hat_state = m_hatState;
+ event.driver_axis_state = m_axisState;
+ event.motor_state = m_motorState;
 }
 
 static void FreeStruct(PERIPHERAL_EVENT& event)
@@ -228,7 +236,13 @@
 }
 
 private:
- PERIPHERAL_EVENT m_event;
+ PERIPHERAL_EVENT_TYPE m_type = PERIPHERAL_EVENT_TYPE_NONE;
+ unsigned int m_peripheralIndex = 0;
+ unsigned int m_driverIndex = 0;
+ JOYSTICK_STATE_BUTTON m_buttonState = JOYSTICK_STATE_BUTTON_UNPRESSED;
+ JOYSTICK_STATE_HAT m_hatState = JOYSTICK_STATE_HAT_UNPRESSED;
+ JOYSTICK_STATE_AXIS m_axisState = 0.0f;
+ JOYSTICK_STATE_MOTOR m_motorState = 0.0f;
 };
 
 typedef PeripheralVector<PeripheralEvent, PERIPHERAL_EVENT> PeripheralEvents;
@@ -298,9 +312,6 @@
 unsigned int MotorCount(void) const { return m_motorCount; }
 bool SupportsPowerOff(void) const { return m_supportsPowerOff; }
 
- // 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; }
@@ -352,6 +363,9 @@
 * 2) a hat direction
 * 3) a semiaxis (either the positive or negative half of an axis)
 * 4) a motor
+ * 5) a keyboard key
+ * 6) a mouse button
+ * 7) a relative pointer direction
 *
 * The type determines the fields in use:
 *
@@ -370,6 +384,15 @@
 *
 * Motor:
 * - driver index
+ *
+ * Key:
+ * - key code
+ *
+ * Mouse button:
+ * - driver index
+ *
+ * Relative pointer direction:
+ * - relative pointer direction
 */
 struct DriverPrimitive
 {
@@ -383,7 +406,8 @@
 m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
 m_center(0),
 m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
- m_range(1)
+ m_range(1),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
 {
 }
 
@@ -397,12 +421,13 @@
 m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
 m_center(0),
 m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
- m_range(1)
+ m_range(1),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
 {
 }
 
 /*!
- * \brief Construct a driver primitive representing a button
+ * \brief Construct a driver primitive representing a joystick button
 */
 static DriverPrimitive CreateButton(unsigned int buttonIndex)
 {
@@ -419,7 +444,8 @@
 m_hatDirection(direction),
 m_center(0),
 m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
- m_range(1)
+ m_range(1),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
 {
 }
 
@@ -433,7 +459,8 @@
 m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
 m_center(center),
 m_semiAxisDirection(direction),
- m_range(range)
+ m_range(range),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
 {
 }
 
@@ -445,13 +472,52 @@
 return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR, motorIndex);
 }
 
+ /*!
+ * \brief Construct a driver primitive representing a key on a keyboard
+ */
+ DriverPrimitive(std::string keycode) :
+ m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY),
+ m_driverIndex(0),
+ m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+ m_center(0),
+ m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+ m_range(1),
+ m_keycode(std::move(keycode)),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
+ {
+ }
+
+ /*!
+ * \brief Construct a driver primitive representing a mouse button
+ */
+ static DriverPrimitive CreateMouseButton(JOYSTICK_DRIVER_MOUSE_INDEX buttonIndex)
+ {
+ return DriverPrimitive(JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON, static_cast<unsigned int>(buttonIndex));
+ }
+
+ /*!
+ * \brief Construct a driver primitive representing one of the four
+ * direction in which a relative pointer can move
+ */
+ DriverPrimitive(JOYSTICK_DRIVER_RELPOINTER_DIRECTION direction) :
+ m_type(JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION),
+ m_driverIndex(0),
+ m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
+ m_center(0),
+ m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
+ m_range(1),
+ m_relPointerDirection(direction)
+ {
+ }
+
 explicit DriverPrimitive(const JOYSTICK_DRIVER_PRIMITIVE& primitive) :
 m_type(primitive.type),
 m_driverIndex(0),
 m_hatDirection(JOYSTICK_DRIVER_HAT_UNKNOWN),
 m_center(0),
 m_semiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN),
- m_range(1)
+ m_range(1),
+ m_relPointerDirection(JOYSTICK_DRIVER_RELPOINTER_UNKNOWN)
 {
 switch (m_type)
 {
@@ -479,6 +545,21 @@
 m_driverIndex = primitive.motor.index;
 break;
 }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+ {
+ m_keycode = primitive.key.keycode;
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+ {
+ m_driverIndex = primitive.mouse.button;
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+ {
+ m_relPointerDirection = primitive.relpointer.direction;
+ break;
+ }
 default:
 break;
 }
@@ -490,6 +571,9 @@
 int Center(void) const { return m_center; }
 JOYSTICK_DRIVER_SEMIAXIS_DIRECTION SemiAxisDirection(void) const { return m_semiAxisDirection; }
 unsigned int Range(void) const { return m_range; }
+ const std::string& Keycode(void) const { return m_keycode; }
+ JOYSTICK_DRIVER_MOUSE_INDEX MouseIndex(void) const { return static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex); }
+ JOYSTICK_DRIVER_RELPOINTER_DIRECTION RelPointerDirection(void) const { return m_relPointerDirection; }
 
 bool operator==(const DriverPrimitive& other) const
 {
@@ -498,7 +582,6 @@
 switch (m_type)
 {
 case JOYSTICK_DRIVER_PRIMITIVE_TYPE_BUTTON:
- case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
 {
 return m_driverIndex == other.m_driverIndex;
 }
@@ -514,6 +597,22 @@
 m_semiAxisDirection == other.m_semiAxisDirection &&
 m_range == other.m_range;
 }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+ {
+ return m_keycode == other.m_keycode;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOTOR:
+ {
+ return m_driverIndex == other.m_driverIndex;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+ {
+ return m_driverIndex == other.m_driverIndex;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+ {
+ return m_relPointerDirection == other.m_relPointerDirection;
+ }
 default:
 break;
 }
@@ -550,6 +649,23 @@
 driver_primitive.motor.index = m_driverIndex;
 break;
 }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+ {
+ const size_t size = sizeof(driver_primitive.key.keycode);
+ std::strncpy(driver_primitive.key.keycode, m_keycode.c_str(), size - 1);
+ driver_primitive.key.keycode[size - 1] = '\0';
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+ {
+ driver_primitive.mouse.button = static_cast<JOYSTICK_DRIVER_MOUSE_INDEX>(m_driverIndex);
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+ {
+ driver_primitive.relpointer.direction = m_relPointerDirection;
+ break;
+ }
 default:
 break;
 }
@@ -567,6 +683,8 @@
 int m_center;
 JOYSTICK_DRIVER_SEMIAXIS_DIRECTION m_semiAxisDirection;
 unsigned int m_range;
+ std::string m_keycode;
+ JOYSTICK_DRIVER_RELPOINTER_DIRECTION m_relPointerDirection;
 };
 
 typedef PeripheralVector<DriverPrimitive, JOYSTICK_DRIVER_PRIMITIVE> DriverPrimitives;
@@ -584,6 +702,7 @@
 * 6) absolute pointer
 * 7) wheel
 * 8) throttle
+ * 9) keyboard key
 *
 * [1] All three driver primitives (buttons, hats and axes) have a state that
 * can be represented using a single scalar value. For this reason,
@@ -598,7 +717,7 @@
 JoystickFeature(const std::string& name = "", JOYSTICK_FEATURE_TYPE type = JOYSTICK_FEATURE_TYPE_UNKNOWN) :
 m_name(name),
 m_type(type),
- m_primitives()
+ m_primitives{}
 {
 }
 
@@ -672,4 +791,3 @@
 
 } /* namespace addon */
 } /* namespace kodi */
-

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VFS.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/VideoCodec.h Changed

_service:download_files:master.tar.gz/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/Visualization.h Changed

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

@@ -131,17 +131,6 @@
 // --- Input operations --------------------------------------------------------
 
 /*!
- * \brief Notify the add-on of a status change on an open port
- *
- * Ports can be opened using the OpenPort() callback
- *
- * \param port Non-negative for a joystick port, or GAME_INPUT_PORT value otherwise
- * \param collected True if a controller was connected, false if disconnected
- * \param controller The connected controller
- */
-void UpdatePort(int port, bool connected, const game_controller* controller);
-
-/*!
 * \brief Check if input is accepted for a feature on the controller
 *
 * If only a subset of the controller profile is used, this can return false
@@ -156,6 +145,88 @@
 bool HasFeature(const char* controller_id, const char* feature_name);
 
 /*!
+ * \brief Get the input topolgy that specifies which controllers can be connected
+ *
+ * \return The input topology, or null to use the default
+ *
+ * If this returns non-null, topology must be freed using FreeTopology().
+ *
+ * If this returns null, the topology will default to a single port that can
+ * accept all controllers imported by addon.xml. The port ID is set to
+ * the DEFAULT_PORT_ID constant.
+ */
+game_input_topology* GetTopology();
+
+/*!
+ * \brief Free the topology's resources
+ *
+ * \param topology The topology returned by GetTopology()
+ */
+void FreeTopology(game_input_topology* topology);
+
+/*!
+ * \brief Enable/disable keyboard input using the specified controller
+ *
+ * \param enable True to enable input, false otherwise
+ * \param controller The controller info if enabling, or unused if disabling
+ *
+ * \return True if keyboard input was enabled, false otherwise
+ */
+bool EnableKeyboard(bool enable, const game_controller* controller);
+
+/*!
+ * \brief Enable/disable mouse input using the specified controller
+ *
+ * \param enable True to enable input, false otherwise
+ * \param controller The controller info if enabling, or unused if disabling
+ *
+ * \return True if mouse input was enabled, false otherwise
+ */
+bool EnableMouse(bool enable, const game_controller* controller);
+
+/*!
+ * \brief Connect/disconnect a controller to a port on the virtual game console
+ *
+ * \param connect True to connect a controller, false to disconnect
+ * \param address The address of the port
+ * \param controller The controller info if connecting, or unused if disconnecting
+ *
+ * The address is a string that allows traversal of the controller topology.
+ * It is formed by alternating port IDs and controller IDs separated by "/".
+ *
+ * For example, assume that the topology represented in XML for Snes9x is:
+ *
+ * <logicaltopology>
+ * <port type="controller" id="1">
+ * <accepts controller="game.controller.snes"/>
+ * <accepts controller="game.controller.snes.multitap">
+ * <port type="controller" id="1">
+ * <accepts controller="game.controller.snes"/>
+ * </port>
+ * <port type="controller" id="2">
+ * <accepts controller="game.controller.snes"/>
+ * </port>
+ * ...
+ * </accepts>
+ * </port>
+ * </logicaltopology>
+ *
+ * To connect a multitap to the console's first port, the multitap's controller
+ * info is set using the port address:
+ *
+ * 1
+ *
+ * To connect a SNES controller to the second port of the multitap, the
+ * controller info is next set using the address:
+ *
+ * 1/game.controller.multitap/2
+ *
+ * Any attempts to connect a controller to a port on a disconnected multitap
+ * will return false.
+ */
+bool ConnectController(bool connect, const char* port_address, const game_controller* controller);
+
+/*!
 * \brief Notify the add-on of an input event
 *
 * \param event The input event
@@ -247,8 +318,12 @@
 pClient->toAddon.Reset = Reset;
 pClient->toAddon.HwContextReset = HwContextReset;
 pClient->toAddon.HwContextDestroy = HwContextDestroy;
- pClient->toAddon.UpdatePort = UpdatePort;
 pClient->toAddon.HasFeature = HasFeature;
+ pClient->toAddon.GetTopology = GetTopology;
+ pClient->toAddon.FreeTopology = FreeTopology;
+ pClient->toAddon.EnableKeyboard = EnableKeyboard;
+ pClient->toAddon.EnableMouse = EnableMouse;
+ pClient->toAddon.ConnectController = ConnectController;
 pClient->toAddon.InputEvent = InputEvent;
 pClient->toAddon.SerializeSize = SerializeSize;
 pClient->toAddon.Serialize = Serialize;

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

@@ -57,6 +57,9 @@
 #include "input/XBMC_vkeys.h"
 #endif
 
+/*! Port ID used when topology is unknown */
+#define DEFAULT_PORT_ID  "1"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -159,13 +162,6 @@
   GAME_HW_CONTEXT_OPENGLES3,   // GLES 3.0
 } GAME_HW_CONTEXT_TYPE;
 
-typedef enum GAME_INPUT_PORT
-{
-  GAME_INPUT_PORT_JOYSTICK_START = 0, // Non-negative values are for joystick ports
-  GAME_INPUT_PORT_KEYBOARD = -1,
-  GAME_INPUT_PORT_MOUSE = -2,
-} GAME_INPUT_PORT;
-
 typedef enum GAME_INPUT_EVENT_SOURCE
 {
   GAME_INPUT_EVENT_DIGITAL_BUTTON,
@@ -181,17 +177,17 @@
 
 typedef enum GAME_KEY_MOD
 {
-  GAME_KEY_MOD_NONE = 0x00,
+  GAME_KEY_MOD_NONE = 0x0000,
 
-  GAME_KEY_MOD_SHIFT = 0x01,
-  GAME_KEY_MOD_CTRL = 0x02,
-  GAME_KEY_MOD_ALT = 0x04,
-  GAME_KEY_MOD_RALT = 0x08,
-  GAME_KEY_MOD_META = 0x10,
+  GAME_KEY_MOD_SHIFT = 0x0001,
+  GAME_KEY_MOD_CTRL = 0x0002,
+  GAME_KEY_MOD_ALT = 0x0004,
+  GAME_KEY_MOD_META = 0x0008,
+  GAME_KEY_MOD_SUPER = 0x0010,
 
-  GAME_KEY_MOD_NUMLOCK = 0x20,
-  GAME_KEY_MOD_CAPSLOCK = 0x40,
-  GAME_KEY_MOD_SCROLLOCK = 0x80,
+  GAME_KEY_MOD_NUMLOCK = 0x0100,
+  GAME_KEY_MOD_CAPSLOCK = 0x0200,
+  GAME_KEY_MOD_SCROLLOCK = 0x0400,
 } GAME_KEY_MOD;
 
 /*! Returned from game_get_region() */
@@ -277,9 +273,21 @@
   GAME_ROTATION_270_CW,
 } GAME_ROTATION;
 
+/*!
+ * \brief Type of port on the virtual game console
+ */
+typedef enum GAME_PORT_TYPE
+{
+  GAME_PORT_UNKNOWN,
+  GAME_PORT_KEYBOARD,
+  GAME_PORT_MOUSE,
+  GAME_PORT_CONTROLLER,
+} GAME_PORT_TYPE;
+
 typedef struct game_controller
 {
   const char*  controller_id;
+  bool         provides_input; // False for multitaps
   unsigned int digital_button_count;
   unsigned int analog_button_count;
   unsigned int analog_stick_count;
@@ -290,6 +298,48 @@
   unsigned int motor_count;
 } ATTRIBUTE_PACKED game_controller;
 
+struct game_input_port;
+
+/*!
+ * \brief Device that can provide input
+ */
+typedef struct game_input_device
+{
+  const char*      controller_id; // ID used in the Kodi controller API
+  const char*      port_address;
+  game_input_port* available_ports;
+  unsigned int     port_count;
+} ATTRIBUTE_PACKED game_input_device;
+
+/*!
+ * \brief Port that can provide input
+ *
+ * Ports can accept multiple devices and devices can have multiple ports, so
+ * the topology of possible configurations is a tree structure of alternating
+ * port and device nodes.
+ */
+typedef struct game_input_port
+{
+  GAME_PORT_TYPE     type;
+  const char*        port_id; // Required for GAME_PORT_CONTROLLER type
+  game_input_device* accepted_devices;
+  unsigned int       device_count;
+} ATTRIBUTE_PACKED game_input_port;
+
+/*!
+ * \brief The input topology is the possible ways to connect input devices
+ *
+ * This represents the logical topology, which is the possible connections that
+ * the game client's logic can handle. It is strictly a subset of the physical
+ * topology. Loops are not allowed.
+ */
+typedef struct game_input_topology
+{
+  game_input_port *ports; //! The list of ports on the virtual game console
+  unsigned int port_count; //! The number of ports
+  int player_limit; //! A limit on the number of input-providing devices, or -1 for no limit
+} ATTRIBUTE_PACKED game_input_topology;
+
 typedef struct game_digital_button_event
 {
   bool         pressed;
@@ -321,7 +371,14 @@
 typedef struct game_key_event
 {
   bool         pressed;
-  XBMCVKey     character;
+
+  /*!
+   * If the keypress generates a printing character, the unicode value
+   * contains the character generated. If the key is a non-printing character,
+   * e.g. a function or arrow key, the unicode value is zero.
+   */
+  uint32_t unicode;
+
   GAME_KEY_MOD modifiers;
 } ATTRIBUTE_PACKED game_key_event;
 
@@ -346,8 +403,9 @@
 typedef struct game_input_event
 {
   GAME_INPUT_EVENT_SOURCE type;
-  int                     port;
   const char*             controller_id;
+  GAME_PORT_TYPE          port_type;
+  const char*             port_address;
   const char*             feature_name;
   union
   {
@@ -474,8 +532,6 @@
   uintptr_t (*HwGetCurrentFramebuffer)(void* kodiInstance);
   game_proc_address_t (*HwGetProcAddress)(void* kodiInstance, const char* symbol);
   void (*RenderFrame)(void* kodiInstance);
-  bool (*OpenPort)(void* kodiInstance, unsigned int port);
-  void (*ClosePort)(void* kodiInstance, unsigned int port);
   bool (*InputEvent)(void* kodiInstance, const game_input_event* event);
 
 } AddonToKodiFuncTable_Game;
@@ -493,8 +549,12 @@
   GAME_ERROR  (__cdecl* Reset)(void);
   GAME_ERROR  (__cdecl* HwContextReset)(void);
   GAME_ERROR  (__cdecl* HwContextDestroy)(void);
-  void        (__cdecl* UpdatePort)(int, bool, const game_controller*);
-  bool        (__cdecl* HasFeature)(const char* controller_id, const char* feature_name);
+  bool        (__cdecl* HasFeature)(const char*, const char*);
+  game_input_topology* (__cdecl* GetTopology)();
+  void        (__cdecl* FreeTopology)(game_input_topology*);
+  bool        (__cdecl* EnableKeyboard)(bool, const game_controller*);
+  bool        (__cdecl* EnableMouse)(bool, const game_controller*);
+  bool        (__cdecl* ConnectController)(bool, const char*, const game_controller*);
   bool        (__cdecl* InputEvent)(const game_input_event*);
   size_t      (__cdecl* SerializeSize)(void);
   GAME_ERROR  (__cdecl* Serialize)(uint8_t*, size_t);

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

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

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

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

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

@@ -91,8 +91,8 @@
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_XML_ID    "kodi.binary.instance.audioencoder"
 #define ADDON_INSTANCE_VERSION_AUDIOENCODER_DEPENDS   "addon-instance/AudioEncoder.h"
 
-#define ADDON_INSTANCE_VERSION_GAME                   "1.0.33"
-#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.33"
+#define ADDON_INSTANCE_VERSION_GAME                   "1.0.36"
+#define ADDON_INSTANCE_VERSION_GAME_MIN               "1.0.36"
 #define ADDON_INSTANCE_VERSION_GAME_XML_ID            "kodi.binary.instance.game"
 #define ADDON_INSTANCE_VERSION_GAME_DEPENDS           "kodi_game_dll.h" \
                                                       "kodi_game_types.h" \
@@ -108,7 +108,7 @@
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_XML_ID     "kodi.binary.instance.inputstream"
 #define ADDON_INSTANCE_VERSION_INPUTSTREAM_DEPENDS    "addon-instance/Inputstream.h"
 
-#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.5"
+#define ADDON_INSTANCE_VERSION_PERIPHERAL             "1.3.7"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_MIN         "1.3.4"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_XML_ID      "kodi.binary.instance.peripheral"
 #define ADDON_INSTANCE_VERSION_PERIPHERAL_DEPENDS     "addon-instance/Peripheral.h" \

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

_service:download_files:master.tar.gz/xbmc/addons/settings/AddonSettings.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2017 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -313,7 +313,12 @@
     }
 
     // try to load the old setting value
-    if (!newSetting->FromString(setting.second))
+    if (!newSetting)
+    {
+      CLog::Log(LOGERROR, "CAddonSettings[%s]: had null newSetting for value \"%s\" for setting %s",
+        m_addonId.c_str(), setting.second.c_str(), setting.first.c_str());
+    }
+    else if (!newSetting->FromString(setting.second))
     {
       CLog::Log(LOGWARNING, "CAddonSettings[%s]: failed to load value \"%s\" for setting %s",
         m_addonId.c_str(), setting.second.c_str(), setting.first.c_str());
@@ -1462,7 +1467,6 @@
 
 bool CAddonSettings::ParseOldConditionExpression(std::string str, ConditionExpression& expression)
 {
-  StringUtils::ToLower(str);
   StringUtils::Trim(str);
 
   size_t posOpen = str.find('(');

_service:download_files:master.tar.gz/xbmc/addons/settings/AddonSettings.h Changed

_service:download_files:master.tar.gz/xbmc/addons/settings/GUIDialogAddonSettings.h Changed

_service:download_files:master.tar.gz/xbmc/addons/settings/SettingUrlEncodedString.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/settings/SettingUrlEncodedString.h Changed

_service:download_files:master.tar.gz/xbmc/addons/test/TestAddonBuilder.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/test/TestAddonFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/addons/test/TestAddonVersion.cpp Changed

_service:download_files:master.tar.gz/xbmc/cdrip/CDDARipJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/cdrip/CDDARipJob.h Changed

_service:download_files:master.tar.gz/xbmc/cdrip/CDDARipper.cpp Changed

_service:download_files:master.tar.gz/xbmc/cdrip/Encoder.cpp Changed

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

_service:download_files:master.tar.gz/xbmc/cdrip/IEncoder.h Changed

_service:download_files:master.tar.gz/xbmc/commons/Buffer.h Changed

_service:download_files:master.tar.gz/xbmc/commons/Exception.cpp Changed

_service:download_files:master.tar.gz/xbmc/commons/Exception.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -26,9 +26,9 @@
 // a header.
 #include "utils/StringUtils.h"
 //---------------------------------------------------------
-#include "ilog.h"
 #include <stdarg.h>
 
+
 #ifdef __GNUC__
 // The 'this' pointer counts as a parameter on member methods.
 #define XBMCCOMMONS_ATTRIB_EXCEPTION_FORMAT __attribute__((format(printf,2,3)))
@@ -61,7 +61,6 @@
 std::string message;
 
 protected:
- static ILogger* logger;
 
 inline explicit Exception(const char* classname_) : classname(classname_) { }
 inline Exception(const char* classname_, const char* message_) : classname(classname_), message(message_) { }
@@ -91,15 +90,9 @@
 public:
 virtual ~Exception();
 
- inline virtual void LogThrowMessage(const char* prefix = NULL) const
- {
- if (logger)
- logger->Log(LOGERROR,"EXCEPTION Thrown (%s) : %s", classname.c_str(), message.c_str());
- }
+ virtual void LogThrowMessage(const char* prefix = NULL) const;
 
 inline virtual const char* GetMessage() const { return message.c_str(); }
-
- inline static void SetLogger(ILogger* exceptionLogger) { logger = exceptionLogger; }
 };
 
 /**

_service:download_files:master.tar.gz/xbmc/commons/ilog.cpp Changed

_service:download_files:master.tar.gz/xbmc/commons/ilog.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/AEResampleFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/AEResampleFactory.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/AESinkFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/AESinkFactory.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEFilter.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -112,7 +112,12 @@
 {
 LOGTIMEINIT("x");
 
- CLog::Log(LOGINFO, "%s::%s remap:%p chan:%d->%d rate:%d->%d format:%d->%d bits:%d->%d dither:%d->%d norm:%d upmix:%d", CLASSNAME, __func__, remapLayout, src_channels, dst_channels, src_rate, dst_rate, src_fmt, dst_fmt, src_bits, dst_bits, src_dither, dst_dither, normalize, upmix);
+ CLog::Log(LOGINFO,
+ "%s::%s remap:%p chan:%d->%d rate:%d->%d format:%d->%d bits:%d->%d dither:%d->%d "
+ "norm:%d upmix:%d",
+ CLASSNAME, __func__, static_cast<void*>(remapLayout), src_channels, dst_channels,
+ src_rate, dst_rate, src_fmt, dst_fmt, src_bits, dst_bits, src_dither, dst_dither,
+ normalize, upmix);
 
 m_dst_chan_layout = dst_chan_layout;
 m_dst_channels = dst_channels;

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AE.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AEResample.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AESink.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AESound.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/AEStream.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/IAudioCallback.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Interfaces/ThreadedAE.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -48,12 +48,14 @@
 DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
 
 extern const char *WASAPIErrToStr(HRESULT err);
-#define EXIT_ON_FAILURE(hr, reason, ...) if(FAILED(hr)) {CLog::Log(LOGERROR, reason " - %s", __VA_ARGS__, WASAPIErrToStr(hr)); goto failed;}
+#define EXIT_ON_FAILURE(hr, reason) if(FAILED(hr)) {CLog::LogF(LOGERROR, reason " - HRESULT = %li ErrorMessage = %s", hr, WASAPIErrToStr(hr)); goto failed;}
 
 #define DS_SPEAKER_COUNT 8
 static const unsigned int DSChannelOrder[] = {SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT, SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT};
 static const enum AEChannel AEChannelNamesDS[] = {AE_CH_FL, AE_CH_FR, AE_CH_FC, AE_CH_LFE, AE_CH_BL, AE_CH_BR, AE_CH_SL, AE_CH_SR, AE_CH_NULL};
 
+using namespace Microsoft::WRL;
+
 struct DSDevice
 {
 std::string name;
@@ -76,8 +78,8 @@
 }
 
 CAESinkDirectSound::CAESinkDirectSound() :
- m_pBuffer (NULL ),
- m_pDSound (NULL ),
+ m_pBuffer (nullptr),
+ m_pDSound (nullptr),
 m_encodedFormat (AE_FMT_INVALID),
 m_AvgBytesPerSec(0 ),
 m_dwChunkSize (0 ),
@@ -99,24 +101,24 @@
 Deinitialize();
 }
 
-void CAESinkDirectSound::Register()
-{
- AE::AESinkRegEntry reg;
- reg.sinkName = "DIRECTSOUND";
- reg.createFunc = CAESinkDirectSound::Create;
- reg.enumerateFunc = CAESinkDirectSound::EnumerateDevicesEx;
- AE::CAESinkFactory::RegisterSink(reg);
-}
-
-IAESink* CAESinkDirectSound::Create(std::string &device, AEAudioFormat &desiredFormat)
-{
- IAESink *sink = new CAESinkDirectSound();
- if (sink->Initialize(desiredFormat, device))
- return sink;
-
- delete sink;
- return nullptr;
-}
+void CAESinkDirectSound::Register()
+{
+ AE::AESinkRegEntry reg;
+ reg.sinkName = "DIRECTSOUND";
+ reg.createFunc = CAESinkDirectSound::Create;
+ reg.enumerateFunc = CAESinkDirectSound::EnumerateDevicesEx;
+ AE::CAESinkFactory::RegisterSink(reg);
+}
+
+IAESink* CAESinkDirectSound::Create(std::string &device, AEAudioFormat &desiredFormat)
+{
+ IAESink *sink = new CAESinkDirectSound();
+ if (sink->Initialize(desiredFormat, device))
+ return sink;
+
+ delete sink;
+ return nullptr;
+}
 
 bool CAESinkDirectSound::Initialize(AEAudioFormat &format, std::string &device)
 {
@@ -151,36 +153,35 @@
 if (hr == RPC_S_OK) RpcStringFree(&wszUuid);
 }
 
- hr = DirectSoundCreate(deviceGUID, &m_pDSound, NULL);
+ hr = DirectSoundCreate(deviceGUID, m_pDSound.ReleaseAndGetAddressOf(), nullptr);
 
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create the DirectSound device %s with error %s, trying the default device.", deviceFriendlyName.c_str(), dserr2str(hr));
- hr = DirectSoundCreate(NULL, &m_pDSound, NULL);
+ CLog::LogF(
+ LOGERROR,
+ "Failed to create the DirectSound device %s with error %s, trying the default device.",
+ deviceFriendlyName, dserr2str(hr));
+
+ hr = DirectSoundCreate(nullptr, m_pDSound.ReleaseAndGetAddressOf(), nullptr);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create the default DirectSound device with error %s.", dserr2str(hr));
+ CLog::LogF(LOGERROR, "Failed to create the default DirectSound device with error %s.",
+ dserr2str(hr));
 return false;
 }
 }
 
- HWND tmp_hWnd;
-
 /* Dodge the null handle on first init by using desktop handle */
- if (g_hWnd == NULL)
- tmp_hWnd = GetDesktopWindow();
- else
- tmp_hWnd = g_hWnd;
-
- CLog::Log(LOGDEBUG, __FUNCTION__": Using Window handle: %p", tmp_hWnd);
+ HWND tmp_hWnd = g_hWnd == nullptr ? GetDesktopWindow() : g_hWnd;
+ CLog::LogF(LOGDEBUG, "Using Window handle: %p", static_cast<void*>(tmp_hWnd));
 
 hr = m_pDSound->SetCooperativeLevel(tmp_hWnd, DSSCL_PRIORITY);
 
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create the DirectSound device cooperative level.");
- CLog::Log(LOGERROR, __FUNCTION__": DSErr: %s", dserr2str(hr));
- m_pDSound->Release();
+ CLog::LogF(LOGERROR, "Failed to create the DirectSound device cooperative level.");
+ CLog::LogF(LOGERROR, "DSErr: %s", dserr2str(hr));
+ m_pDSound = nullptr;
 return false;
 }
 
@@ -237,25 +238,25 @@
 dsbdesc.lpwfxFormat = (WAVEFORMATEX *)&wfxex;
 
 // now create the stream buffer
- HRESULT res = IDirectSound_CreateSoundBuffer(m_pDSound, &dsbdesc, &m_pBuffer, NULL);
+ HRESULT res = m_pDSound->CreateSoundBuffer(&dsbdesc, m_pBuffer.ReleaseAndGetAddressOf(), nullptr);
 if (res != DS_OK)
 {
 if (dsbdesc.dwFlags & DSBCAPS_LOCHARDWARE)
 {
- SAFE_RELEASE(m_pBuffer);
- CLog::Log(LOGDEBUG, __FUNCTION__": Couldn't create secondary buffer (%s). Trying without LOCHARDWARE.", dserr2str(res));
+ CLog::LogF(LOGDEBUG, "Couldn't create secondary buffer (%s). Trying without LOCHARDWARE.",
+ dserr2str(res));
 // Try without DSBCAPS_LOCHARDWARE
 dsbdesc.dwFlags &= ~DSBCAPS_LOCHARDWARE;
- res = IDirectSound_CreateSoundBuffer(m_pDSound, &dsbdesc, &m_pBuffer, NULL);
+ res = m_pDSound->CreateSoundBuffer(&dsbdesc, m_pBuffer.ReleaseAndGetAddressOf(), nullptr);
 }
 if (res != DS_OK)
 {
- SAFE_RELEASE(m_pBuffer);
- CLog::Log(LOGERROR, __FUNCTION__": cannot create secondary buffer (%s)", dserr2str(res));
+ m_pBuffer = nullptr;
+ CLog::LogF(LOGERROR, "cannot create secondary buffer (%s)", dserr2str(res));
 return false;
 }
 }
- CLog::Log(LOGDEBUG, __FUNCTION__": secondary buffer created");
+ CLog::LogF(LOGDEBUG, "secondary buffer created");
 
 m_pBuffer->Stop();
 
@@ -275,8 +276,8 @@
 m_initialized = true;
 m_isDirtyDS = false;
 
- CLog::Log(LOGDEBUG, __FUNCTION__": Initializing DirectSound with the following parameters:");
- CLog::Log(LOGDEBUG, " Audio Device : %s", ((std::string)deviceFriendlyName).c_str());
+ CLog::LogF(LOGDEBUG, "Initializing DirectSound with the following parameters:");
+ CLog::Log(LOGDEBUG, " Audio Device : %s", ((std::string)deviceFriendlyName));
 CLog::Log(LOGDEBUG, " Sample Rate : %d", wfxex.Format.nSamplesPerSec);
 CLog::Log(LOGDEBUG, " Sample Format : %s", CAEUtil::DataFormatToStr(format.m_dataFormat));
 CLog::Log(LOGDEBUG, " Bits Per Sample : %d", wfxex.Format.wBitsPerSample);
@@ -286,7 +287,7 @@
 CLog::Log(LOGDEBUG, " Avg. Bytes Sec : %d", wfxex.Format.nAvgBytesPerSec);
 CLog::Log(LOGDEBUG, " Samples/Block : %d", wfxex.Samples.wSamplesPerBlock);
 CLog::Log(LOGDEBUG, " Format cBSize : %d", wfxex.Format.cbSize);
- CLog::Log(LOGDEBUG, " Channel Layout : %s", ((std::string)format.m_channelLayout).c_str());
+ CLog::Log(LOGDEBUG, " Channel Layout : %s", ((std::string)format.m_channelLayout));
 CLog::Log(LOGDEBUG, " Channel Mask : %d", wfxex.dwChannelMask);
 CLog::Log(LOGDEBUG, " Frames : %d", format.m_frames);
 CLog::Log(LOGDEBUG, " Frame Size : %d", format.m_frameSize);
@@ -299,22 +300,16 @@
 if (!m_initialized)
 return;
 
- CLog::Log(LOGDEBUG, __FUNCTION__": Cleaning up");
+ CLog::LogF(LOGDEBUG, "Cleaning up");
 
 if (m_pBuffer)
 {
 m_pBuffer->Stop();
- SAFE_RELEASE(m_pBuffer);
- }
-
- if (m_pDSound)
- {
- m_pDSound->Release();
 }
 
 m_initialized = false;
- m_pBuffer = NULL;
- m_pDSound = NULL;
+ m_pBuffer = nullptr;
+ m_pDSound = nullptr;
 m_BufferOffset = 0;
 m_CacheLen = 0;
 m_dwChunkSize = 0;
@@ -333,12 +328,12 @@
 DWORD bufferStatus = 0;
 if (m_pBuffer->GetStatus(&bufferStatus) != DS_OK)
 {
- CLog::Log(LOGERROR, "%s: GetStatus() failed", __FUNCTION__);
+ CLog::LogF(LOGERROR, "GetStatus() failed");
 return 0;
 }
 if (bufferStatus & DSBSTATUS_BUFFERLOST)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__ ": Buffer allocation was lost. Restoring buffer.");
+ CLog::LogF(LOGDEBUG, "Buffer allocation was lost. Restoring buffer.");
 m_pBuffer->Restore();
 }
 
@@ -354,7 +349,7 @@
 
 while (len)
 {
- LPVOID start = NULL, startWrap = NULL;
+ void* start = nullptr, *startWrap = nullptr;
 DWORD size = 0, sizeWrap = 0;
 if (m_BufferOffset >= m_dwBufferLen) // Wrap-around manually
 m_BufferOffset = 0;
@@ -362,7 +357,7 @@
 HRESULT res = m_pBuffer->Lock(m_BufferOffset, dwWriteBytes, &start, &size, &startWrap, &sizeWrap, 0);
 if (DS_OK != res)
 {
- CLog::Log(LOGERROR, __FUNCTION__ ": Unable to lock buffer at offset %u. HRESULT: 0x%08x", m_BufferOffset, res);
+ CLog::LogF(LOGERROR, "Unable to lock buffer at offset %u. HRESULT: 0x%08x", m_BufferOffset, res);
 m_isDirtyDS = true;
 return INT_MAX;
 }
@@ -406,7 +401,9 @@
 HRESULT res = m_pBuffer->SetCurrentPosition(0);
 if (DS_OK != res)
 {
- CLog::Log(LOGERROR,__FUNCTION__ ": SetCurrentPosition failed. Unable to determine buffer status. HRESULT = 0x%08x", res);
+ CLog::LogF(LOGERROR,
+ "SetCurrentPosition failed. Unable to determine buffer status. HRESULT = 0x%08x",
+ res);
 m_isDirtyDS = true;
 return;
 }
@@ -440,29 +437,29 @@
 {
 CAEDeviceInfo deviceInfo;
 
- IMMDeviceEnumerator* pEnumerator = NULL;
- IMMDeviceCollection* pEnumDevices = NULL;
+ ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
+ ComPtr<IMMDeviceCollection> pEnumDevices = nullptr;
 
 HRESULT hr;
 
 std::string strDD = GetDefaultDevice();
 
 /* Windows Vista or later - supporting WASAPI device probing */
- hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not allocate WASAPI device enumerator. CoCreateInstance error code: %li", hr)
+ hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator.")
 
 UINT uiCount = 0;
 
- hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEnumDevices);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint enumeration failed.")
+ hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, pEnumDevices.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint enumeration failed.")
 
 hr = pEnumDevices->GetCount(&uiCount);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint count failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint count failed.")
 
 for (UINT i = 0; i < uiCount; i++)
 {
- IMMDevice *pDevice = NULL;
- IPropertyStore *pProperty = NULL;
+ ComPtr<IMMDevice> pDevice = nullptr;
+ ComPtr<IPropertyStore> pProperty = nullptr;
 PROPVARIANT varName;
 PropVariantInit(&varName);
 
@@ -470,27 +467,24 @@
 deviceInfo.m_dataFormats.clear();
 deviceInfo.m_sampleRates.clear();
 
- hr = pEnumDevices->Item(i, &pDevice);
+ hr = pEnumDevices->Item(i, pDevice.GetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint failed.");
+ CLog::LogF(LOGERROR, "Retrieval of DirectSound endpoint failed.");
 goto failed;
 }
 
- hr = pDevice->OpenPropertyStore(STGM_READ, &pProperty);
+ hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint properties failed.");
- SAFE_RELEASE(pDevice);
+ CLog::LogF(LOGERROR, "Retrieval of DirectSound endpoint properties failed.");
 goto failed;
 }
 
 hr = pProperty->GetValue(PKEY_Device_FriendlyName, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint device name failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::LogF(LOGERROR, "Retrieval of DirectSound endpoint device name failed.");
 goto failed;
 }
 
@@ -500,9 +494,7 @@
 hr = pProperty->GetValue(PKEY_AudioEndpoint_GUID, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint GUID failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::LogF(LOGERROR, "Retrieval of DirectSound endpoint GUID failed.");
 goto failed;
 }
 
@@ -512,9 +504,7 @@
 hr = pProperty->GetValue(PKEY_AudioEndpoint_FormFactor, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint form factor failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::LogF(LOGERROR, "Retrieval of DirectSound endpoint form factor failed.");
 goto failed;
 }
 std::string strWinDevType = winEndpoints[(EndpointFormFactor)varName.uiVal].winEndpointType;
@@ -523,13 +513,9 @@
 PropVariantClear(&varName);
 
 /* In shared mode Windows tells us what format the audio must be in. */
- IAudioClient *pClient;
- hr = pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&pClient);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Activate device failed (%s)", WASAPIErrToStr(hr));
- goto failed;
- }
+ ComPtr<IAudioClient> pClient;
+ hr = pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(pClient.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Activate device failed.")
 
 //hr = pClient->GetMixFormat(&pwfxex);
 hr = pProperty->GetValue(PKEY_AudioEngine_DeviceFormat, &varName);
@@ -553,12 +539,8 @@
 }
 else
 {
- CLog::Log(LOGERROR, __FUNCTION__": Getting DeviceFormat failed (%s)", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "Getting DeviceFormat failed (%s)", WASAPIErrToStr(hr));
 }
- pClient->Release();
-
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
 
 deviceInfo.m_deviceName = strDevName;
 deviceInfo.m_displayName = strWinDevType.append(strFriendlyName);
@@ -584,11 +566,7 @@
 failed:
 
 if (FAILED(hr))
- CLog::Log(LOGERROR, __FUNCTION__": Failed to enumerate WASAPI endpoint devices (%s).", WASAPIErrToStr(hr));
-
- SAFE_RELEASE(pEnumDevices);
- SAFE_RELEASE(pEnumerator);
-
+ CLog::LogF(LOGERROR, "Failed to enumerate WASAPI endpoint devices (%s).", WASAPIErrToStr(hr));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -598,16 +576,16 @@
 DWORD status = 0;
 if (m_pBuffer->GetStatus(&status) != DS_OK)
 {
- CLog::Log(LOGERROR, "%s: GetStatus() failed", __FUNCTION__);
+ CLog::LogF(LOGERROR, "GetStatus() failed");
 return;
 }
 
 if (!(status & DSBSTATUS_PLAYING) && m_CacheLen != 0) // If we have some data, see if we can start playback
 {
 HRESULT hr = m_pBuffer->Play(0, 0, DSBPLAY_LOOPING);
- CLog::Log(LOGDEBUG,__FUNCTION__ ": Resuming Playback");
+ CLog::LogF(LOGDEBUG, "Resuming Playback");
 if (FAILED(hr))
- CLog::Log(LOGERROR, __FUNCTION__": Failed to play the DirectSound buffer: %s", dserr2str(hr));
+ CLog::LogF(LOGERROR, "Failed to play the DirectSound buffer: %s", dserr2str(hr));
 }
 }
 
@@ -619,7 +597,9 @@
 HRESULT res = m_pBuffer->GetCurrentPosition(&playCursor, &writeCursor); // Get the current playback and safe write positions
 if (DS_OK != res)
 {
- CLog::Log(LOGERROR,__FUNCTION__ ": GetCurrentPosition failed. Unable to determine buffer status. HRESULT = 0x%08x", res);
+ CLog::LogF(LOGERROR,
+ "GetCurrentPosition failed. Unable to determine buffer status. HRESULT = 0x%08x",
+ res);
 m_isDirtyDS = true;
 return false;
 }
@@ -645,7 +625,8 @@
 (playCursor < m_BufferOffset && m_BufferOffset < writeCursor) || // (2)
 (playCursor > writeCursor && playCursor < m_BufferOffset)) // (3)
 {
- CLog::Log(LOGWARNING, "CWin32DirectSound::GetSpace - buffer underrun - W:%u, P:%u, O:%u.", writeCursor, playCursor, m_BufferOffset);
+ CLog::Log(LOGWARNING, "CWin32DirectSound::GetSpace - buffer underrun - W:%u, P:%u, O:%u.",
+ writeCursor, playCursor, m_BufferOffset);
 m_BufferOffset = writeCursor; // Catch up
 //m_pBuffer->Stop(); // Wait until someone gives us some data to restart playback (prevents glitches)
 m_BufferTimeouts++;
@@ -745,59 +726,36 @@
 
 std::string CAESinkDirectSound::GetDefaultDevice()
 {
- IMMDeviceEnumerator* pEnumerator = NULL;
- IMMDevice* pDevice = NULL;
- IPropertyStore* pProperty = NULL;
- HRESULT hr;
- PROPVARIANT varName;
- std::string strDevName = "default";
-
- hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Could not allocate WASAPI device enumerator. CoCreateInstance error code: %s", WASAPIErrToStr(hr));
- goto failed;
- }
+ HRESULT hr;
+ ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
+ ComPtr<IMMDevice> pDevice = nullptr;
+ ComPtr<IPropertyStore> pProperty = nullptr;
+ PROPVARIANT varName;
+ std::string strDevName = "default";
 
- hr = pEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &pDevice);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of audio endpoint enumeration failed.");
- goto failed;
- }
+ hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator")
 
- hr = pDevice->OpenPropertyStore(STGM_READ, &pProperty);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint properties failed.");
- goto failed;
- }
+ hr = pEnumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, pDevice.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrival of audio endpoint enumeration failed.")
+
+ hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of DirectSound endpoint properties failed.")
 
 PropVariantInit(&varName);
 hr = pProperty->GetValue(PKEY_AudioEndpoint_FormFactor, &varName);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint form factor failed.");
- goto failed;
- }
+ EXIT_ON_FAILURE(hr, "Retrival of DirectSound endpoint form factor failed.")
+
 AEDeviceType aeDeviceType = winEndpoints[(EndpointFormFactor)varName.uiVal].aeDeviceType;
 PropVariantClear(&varName);
 
 hr = pProperty->GetValue(PKEY_AudioEndpoint_GUID, &varName);
- if (FAILED(hr))
- {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of DirectSound endpoint GUID failed."); 
- goto failed;
- }
+ EXIT_ON_FAILURE(hr, "Retrieval of DirectSound endpoint GUID failed")
 
 strDevName = KODI::PLATFORM::WINDOWS::FromW(varName.pwszVal);
 PropVariantClear(&varName);
 
 failed:
 
- SAFE_RELEASE(pProperty);
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pEnumerator);
-
 return strDevName;
 }

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,9 +22,12 @@
 #include <stdint.h>
 #include "cores/AudioEngine/Interfaces/AESink.h"
 #include "cores/AudioEngine/Utils/AEDeviceInfo.h"
-
 #include "threads/CriticalSection.h"
 
+#include <mmsystem.h>
+#include <DSound.h>
+#include <wrl/client.h>
+
 class CAESinkDirectSound : public IAESink
 {
 public:
@@ -33,8 +36,8 @@
 CAESinkDirectSound();
 virtual ~CAESinkDirectSound();
 
- static void Register();
- static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat);
+ static void Register();
+ static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat);
 
 virtual bool Initialize(AEAudioFormat &format, std::string &device);
 virtual void Deinitialize();
@@ -55,8 +58,8 @@
 unsigned int GetSpace();
 const char *dserr2str(int err);
 
- LPDIRECTSOUNDBUFFER m_pBuffer;
- LPDIRECTSOUND8 m_pDSound;
+ Microsoft::WRL::ComPtr<IDirectSoundBuffer> m_pBuffer;
+ Microsoft::WRL::ComPtr<IDirectSound> m_pDSound;
 
 AEAudioFormat m_format;
 enum AEDataFormat m_encodedFormat;

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkPi.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkSNDIO.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -41,14 +41,26 @@
 DEFINE_PROPERTYKEY(PKEY_Device_EnumeratorName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 24);
 
 extern const char *WASAPIErrToStr(HRESULT err);
-#define EXIT_ON_FAILURE(hr, reason, ...) if(FAILED(hr)) {CLog::Log(LOGERROR, reason " - %s", __VA_ARGS__, WASAPIErrToStr(hr)); goto failed;}
+#define EXIT_ON_FAILURE(hr, reason) if(FAILED(hr)) {CLog::LogF(LOGERROR, reason " - HRESULT = %li ErrorMessage = %s", hr, WASAPIErrToStr(hr)); goto failed;}
+
+template<class T>
+inline void SafeRelease(T **ppT)
+{
+ if (*ppT)
+ {
+ (*ppT)->Release();
+ *ppT = nullptr;
+ }
+}
+
+using namespace Microsoft::WRL;
 
 CAESinkWASAPI::CAESinkWASAPI() :
 m_needDataEvent(0),
- m_pDevice(NULL),
- m_pAudioClient(NULL),
- m_pRenderClient(NULL),
- m_pAudioClock(NULL),
+ m_pDevice(nullptr),
+ m_pAudioClient(nullptr),
+ m_pRenderClient(nullptr),
+ m_pAudioClock(nullptr),
 m_encodedChannels(0),
 m_encodedSampleRate(0),
 sinkReqFormat(AE_FMT_INVALID),
@@ -62,7 +74,7 @@
 m_sinkLatency(0.0),
 m_sinkFrames(0),
 m_clockFreq(0),
- m_pBuffer(NULL),
+ m_pBuffer(nullptr),
 m_bufferPtr(0)
 {
 m_channelLayout.Reset();
@@ -72,24 +84,24 @@
 {
 }
 
-void CAESinkWASAPI::Register()
-{
- AE::AESinkRegEntry reg;
- reg.sinkName = "WASAPI";
- reg.createFunc = CAESinkWASAPI::Create;
- reg.enumerateFunc = CAESinkWASAPI::EnumerateDevicesEx;
- AE::CAESinkFactory::RegisterSink(reg);
-}
-
-IAESink* CAESinkWASAPI::Create(std::string &device, AEAudioFormat &desiredFormat)
-{
- IAESink *sink = new CAESinkWASAPI();
- if (sink->Initialize(desiredFormat, device))
- return sink;
-
- delete sink;
- return nullptr;
-}
+void CAESinkWASAPI::Register()
+{
+ AE::AESinkRegEntry reg;
+ reg.sinkName = "WASAPI";
+ reg.createFunc = CAESinkWASAPI::Create;
+ reg.enumerateFunc = CAESinkWASAPI::EnumerateDevicesEx;
+ AE::CAESinkFactory::RegisterSink(reg);
+}
+
+IAESink* CAESinkWASAPI::Create(std::string &device, AEAudioFormat &desiredFormat)
+{
+ IAESink *sink = new CAESinkWASAPI();
+ if (sink->Initialize(desiredFormat, device))
+ return sink;
+
+ delete sink;
+ return nullptr;
+}
 
 bool CAESinkWASAPI::Initialize(AEAudioFormat &format, std::string &device)
 {
@@ -111,33 +123,38 @@
 if(!bdefault)
 {
 hr = CAESinkFactoryWin::ActivateWASAPIDevice(device, &m_pDevice);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of WASAPI endpoint failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of WASAPI endpoint failed.")
 }
 
 if (!m_pDevice)
 {
 if(!bdefault)
- CLog::Log(LOGINFO, __FUNCTION__": Could not locate the device named \"%s\" in the list of WASAPI endpoint devices. Trying the default device...", device.c_str());
+ {
+ CLog::LogF(LOGINFO,
+ "Could not locate the device named \"%s\" in the list of WASAPI endpoint devices. "
+ " Trying the default device...",
+ device);
+ }
 
 std::string defaultId = CAESinkFactoryWin::GetDefaultDeviceId();
 if (defaultId.empty())
 {
- CLog::Log(LOGINFO, __FUNCTION__": Could not locate the default device id in the list of WASAPI endpoint devices.");
+ CLog::LogF(LOGINFO, "Could not locate the default device id in the list of WASAPI endpoint devices.");
 goto failed;
 }
 
 hr = CAESinkFactoryWin::ActivateWASAPIDevice(defaultId, &m_pDevice);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not retrieve the default WASAPI audio endpoint.")
+ EXIT_ON_FAILURE(hr, "Could not retrieve the default WASAPI audio endpoint.")
 
 device = defaultId;
 }
 
- hr = m_pDevice->Activate(&m_pAudioClient);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Activating the WASAPI endpoint device failed.")
+ hr = m_pDevice->Activate(m_pAudioClient.ReleaseAndGetAddressOf());
+ EXIT_ON_FAILURE(hr, "Activating the WASAPI endpoint device failed.")
 
 if (!InitializeExclusive(format))
 {
- CLog::Log(LOGINFO, __FUNCTION__": Could not Initialize Exclusive with that format");
+ CLog::LogF(LOGINFO, "Could not Initialize Exclusive with that format");
 goto failed;
 }
 
@@ -148,18 +165,18 @@
 m_format = format;
 sinkRetFormat = format.m_dataFormat;
 
- hr = m_pAudioClient->GetService(IID_IAudioRenderClient, (void**)&m_pRenderClient);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not initialize the WASAPI render client interface.")
+ hr = m_pAudioClient->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(m_pRenderClient.ReleaseAndGetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not initialize the WASAPI render client interface.")
 
- hr = m_pAudioClient->GetService(IID_IAudioClock, (void**)&m_pAudioClock);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not initialize the WASAPI audio clock interface.")
+ hr = m_pAudioClient->GetService(IID_IAudioClock, reinterpret_cast<void**>(m_pAudioClock.ReleaseAndGetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not initialize the WASAPI audio clock interface.")
 
 hr = m_pAudioClock->GetFrequency(&m_clockFreq);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of IAudioClock::GetFrequency failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of IAudioClock::GetFrequency failed.")
 
 m_needDataEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
 hr = m_pAudioClient->SetEventHandle(m_needDataEvent);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not set the WASAPI event handler.");
+ EXIT_ON_FAILURE(hr, "Could not set the WASAPI event handler.");
 
 m_initialized = true;
 m_isDirty = false;
@@ -175,11 +192,8 @@
 return true;
 
 failed:
- CLog::Log(LOGERROR, __FUNCTION__": WASAPI initialization failed.");
- SAFE_RELEASE(m_pRenderClient);
- SAFE_RELEASE(m_pAudioClient);
- SAFE_RELEASE(m_pAudioClock);
- SAFE_RELEASE(m_pDevice);
+ CLog::LogF(LOGERROR, "WASAPI initialization failed.");
+ SafeRelease(&m_pDevice);
 if(m_needDataEvent)
 {
 CloseHandle(m_needDataEvent);
@@ -204,17 +218,17 @@
 }
 catch (...)
 {
- CLog::Log(LOGDEBUG, "%s: Invalidated AudioClient - Releasing", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "Invalidated AudioClient - Releasing");
 }
 }
 m_running = false;
 
 CloseHandle(m_needDataEvent);
 
- SAFE_RELEASE(m_pRenderClient);
- SAFE_RELEASE(m_pAudioClient);
- SAFE_RELEASE(m_pAudioClock);
- SAFE_RELEASE(m_pDevice);
+ m_pRenderClient = nullptr;
+ m_pAudioClient = nullptr;
+ m_pAudioClock = nullptr;
+ SafeRelease(&m_pDevice);
 
 m_initialized = false;
 
@@ -243,7 +257,7 @@
 do {
 hr = m_pAudioClock->GetPosition(&pos, &tick);
 } while (hr != S_OK && ++retries < 100);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of IAudioClock::GetPosition failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of IAudioClock::GetPosition failed.")
 
 status.delay = (double)(m_sinkFrames + m_bufferPtr) / m_format.m_sampleRate - (double)pos / m_clockFreq;
 status.tick = rescale_u64(tick, CurrentHostFrequency(), 10000000); /* convert from 100ns back to qpc ticks */
@@ -291,14 +305,14 @@
 hr = m_pAudioClient->Reset();
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " AudioClient reset failed due to %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, " AudioClient reset failed due to %s", WASAPIErrToStr(hr));
 return 0;
 }
 hr = m_pRenderClient->GetBuffer(NumFramesRequested, &buf);
 if (FAILED(hr))
 {
 #ifdef _DEBUG
- CLog::Log(LOGERROR, __FUNCTION__": GetBuffer failed due to %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "GetBuffer failed due to %s", WASAPIErrToStr(hr));
 #endif
 m_isDirty = true; //flag new device or re-init needed
 return INT_MAX;
@@ -310,7 +324,7 @@
 if (FAILED(hr))
 {
 #ifdef _DEBUG
- CLog::Log(LOGDEBUG, __FUNCTION__": ReleaseBuffer failed due to %s.", WASAPIErrToStr(hr));
+ CLog::LogF(LOGDEBUG, "ReleaseBuffer failed due to %s.", WASAPIErrToStr(hr));
 #endif
 m_isDirty = true; //flag new device or re-init needed
 return INT_MAX;
@@ -319,7 +333,7 @@
 
 hr = m_pAudioClient->Start(); //start the audio driver running
 if (FAILED(hr))
- CLog::Log(LOGERROR, __FUNCTION__": AudioClient Start Failed");
+ CLog::LogF(LOGERROR, "AudioClient Start Failed");
 m_running = true; //signal that we're processing frames
 return 0U;
 }
@@ -336,7 +350,7 @@
 
 if(eventAudioCallback != WAIT_OBJECT_0 || !&buf)
 {
- CLog::Log(LOGERROR, __FUNCTION__": Endpoint Buffer timed out");
+ CLog::LogF(LOGERROR, "Endpoint Buffer timed out");
 return INT_MAX;
 }
 
@@ -351,7 +365,8 @@
 
 if (m_avgTimeWaiting < 3.0)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": Possible AQ Loss: Avg. Time Waiting for Audio Driver callback : %dmsec", (int)m_avgTimeWaiting);
+ CLog::LogF(LOGDEBUG, "Possible AQ Loss: Avg. Time Waiting for Audio Driver callback : %dmsec",
+ (int)m_avgTimeWaiting);
 }
 #endif
 
@@ -359,7 +374,7 @@
 if (FAILED(hr))
 {
 #ifdef _DEBUG
- CLog::Log(LOGERROR, __FUNCTION__": GetBuffer failed due to %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "GetBuffer failed due to %s", WASAPIErrToStr(hr));
 #endif
 return INT_MAX;
 }
@@ -369,7 +384,7 @@
 if (FAILED(hr))
 {
 #ifdef _DEBUG
- CLog::Log(LOGDEBUG, __FUNCTION__": ReleaseBuffer failed due to %s.", WASAPIErrToStr(hr));
+ CLog::LogF(LOGDEBUG, "ReleaseBuffer failed due to %s.", WASAPIErrToStr(hr));
 #endif
 return INT_MAX;
 }
@@ -410,12 +425,12 @@
 hr = CAESinkFactoryWin::ActivateWASAPIDevice(details.strDeviceId, &pDevice);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint failed.");
+ CLog::LogF(LOGERROR, "Retrieval of WASAPI endpoint failed.");
 goto failed;
 }
 
- IAudioClient *pClient = nullptr;
- hr = pDevice->Activate(&pClient);
+ ComPtr<IAudioClient> pClient = nullptr;
+ hr = pDevice->Activate(pClient.GetAddressOf());
 if (SUCCEEDED(hr))
 {
 /* Test format DTS-HD */
@@ -432,15 +447,20 @@
 hr = pClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE, &wfxex.Format, NULL);
 if (hr == AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED)
 {
- CLog::Log(LOGNOTICE, __FUNCTION__": Exclusive mode is not allowed on device \"%s\", check device settings.", details.strDescription.c_str());
- SAFE_RELEASE(pClient);
- SAFE_RELEASE(pDevice);
+ CLog::LogF(LOGNOTICE,
+ "Exclusive mode is not allowed on device \"%s\", check device settings.",
+ details.strDescription);
+ SafeRelease(&pDevice);
 continue; 
 }
 if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
 {
 if(FAILED(hr))
- CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_DTSHD), details.strDescription.c_str());
+ {
+ CLog::LogF(LOGNOTICE, "stream type \"%s\" on device \"%s\" seems to be not supported.",
+ CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_DTSHD),
+ details.strDescription);
+ }
 
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD);
 add192 = true;
@@ -452,7 +472,11 @@
 if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
 {
 if(FAILED(hr))
- CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_TRUEHD), details.strDescription.c_str());
+ {
+ CLog::LogF(LOGNOTICE, "stream type \"%s\" on device \"%s\" seems to be not supported.",
+ CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_TRUEHD),
+ details.strDescription);
+ }
 
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_TRUEHD);
 add192 = true;
@@ -467,7 +491,12 @@
 if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
 {
 if(FAILED(hr))
- CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_EAC3), details.strDescription.c_str());
+ {
+ CLog::LogF(LOGNOTICE,
+ "stream type \"%s\" on device \"%s\" seems to be not supported.",
+ CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_EAC3),
+ details.strDescription);
+ }
 
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_EAC3);
 add192 = true;
@@ -483,7 +512,10 @@
 if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
 {
 if(FAILED(hr))
- CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", "STREAM_TYPE_DTS", details.strDescription.c_str());
+ {
+ CLog::LogF(LOGNOTICE, "stream type \"%s\" on device \"%s\" seems to be not supported.",
+ "STREAM_TYPE_DTS", details.strDescription);
+ }
 
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD_CORE);
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_2048);
@@ -497,7 +529,11 @@
 if (SUCCEEDED(hr) || details.eDeviceType == AE_DEVTYPE_HDMI)
 {
 if(FAILED(hr))
- CLog::Log(LOGNOTICE, __FUNCTION__": stream type \"%s\" on device \"%s\" seems to be not supported.", CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_AC3), details.strDescription.c_str());
+ {
+ CLog::LogF(LOGNOTICE, "stream type \"%s\" on device \"%s\" seems to be not supported.",
+ CAEUtil::StreamTypeToStr(CAEStreamInfo::STREAM_TYPE_AC3),
+ details.strDescription);
+ }
 
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_AC3);
 }
@@ -555,14 +591,15 @@
 else if (wfxex.Format.nSamplesPerSec == 192000 && add192)
 {
 deviceInfo.m_sampleRates.push_back(WASAPISampleRates[j]);
- CLog::Log(LOGNOTICE, __FUNCTION__": sample rate 192khz on device \"%s\" seems to be not supported.", details.strDescription.c_str());
+ CLog::LogF(LOGNOTICE, "sample rate 192khz on device \"%s\" seems to be not supported.",
+ details.strDescription);
 }
 }
- pClient->Release();
+ pClient = nullptr;
 }
 else
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": Failed to activate device for passthrough capability testing.");
+ CLog::LogF(LOGDEBUG, "Failed to activate device for passthrough capability testing.");
 }
 
 deviceInfo.m_deviceName = details.strDeviceId;
@@ -588,14 +625,14 @@
 deviceInfoList.push_back(deviceInfo);
 }
 
- SAFE_RELEASE(pDevice);
+ SafeRelease(&pDevice);
 }
 return;
 
 failed:
 
 if (FAILED(hr))
- CLog::Log(LOGERROR, __FUNCTION__": Failed to enumerate WASAPI endpoint devices (%s).", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "Failed to enumerate WASAPI endpoint devices (%s).", WASAPIErrToStr(hr));
 }
 
 //Private utility functions////////////////////////////////////////////////////
@@ -655,18 +692,20 @@
 
 if (SUCCEEDED(hr))
 {
- CLog::Log(LOGINFO, __FUNCTION__": Format is Supported - will attempt to Initialize");
+ CLog::LogF(LOGINFO, "Format is Supported - will attempt to Initialize");
 goto initialize;
 }
 else if (hr != AUDCLNT_E_UNSUPPORTED_FORMAT) //It failed for a reason unrelated to an unsupported format.
 {
- CLog::Log(LOGERROR, __FUNCTION__": IsFormatSupported failed (%s)", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "IsFormatSupported failed (%s)", WASAPIErrToStr(hr));
 return false;
 }
 else if (format.m_dataFormat == AE_FMT_RAW) //No sense in trying other formats for passthrough.
 return false;
 
- CLog::Log(LOGDEBUG, LOGAUDIO, __FUNCTION__": IsFormatSupported failed (%s) - trying to find a compatible format", WASAPIErrToStr(hr));
+ CLog::LogF(LOGDEBUG, LOGAUDIO,
+ "IsFormatSupported failed (%s) - trying to find a compatible format",
+ WASAPIErrToStr(hr));
 
 int closestMatch;
 unsigned int requestedChannels = wfxex.Format.nChannels;
@@ -726,7 +765,7 @@
 closestMatch = i;
 }
 else if (hr != AUDCLNT_E_UNSUPPORTED_FORMAT)
- CLog::Log(LOGERROR, __FUNCTION__": IsFormatSupported failed (%s)", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "IsFormatSupported failed (%s)", WASAPIErrToStr(hr));
 }
 
 if (closestMatch >= 0)
@@ -738,7 +777,8 @@
 }
 }
 
- CLog::Log(LOGERROR, __FUNCTION__": Unable to locate a supported output format for the device. Check the speaker settings in the control panel.");
+ CLog::LogF(LOGERROR, "Unable to locate a supported output format for the device. "
+ "Check the speaker settings in the control panel.");
 
 /* We couldn't find anything supported. This should never happen */
 /* unless the user set the wrong speaker setting in the control panel */
@@ -782,7 +822,7 @@
 audioSinkBufferDurationMsec = (REFERENCE_TIME)500000;
 if (IsUSBDevice())
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": detected USB device, increasing buffer size");
+ CLog::LogF(LOGDEBUG, "detected USB device, increasing buffer size");
 audioSinkBufferDurationMsec = (REFERENCE_TIME)1000000;
 }
 audioSinkBufferDurationMsec = (REFERENCE_TIME)((audioSinkBufferDurationMsec / format.m_frameSize) * format.m_frameSize); //even number of frames
@@ -800,20 +840,18 @@
 hr = m_pAudioClient->GetBufferSize(&m_uiBufferLen);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": GetBufferSize Failed : %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "GetBufferSize Failed : %s", WASAPIErrToStr(hr));
 return false;
 }
 
 audioSinkBufferDurationMsec = (REFERENCE_TIME) ((10000.0 * 1000 / wfxex.Format.nSamplesPerSec * m_uiBufferLen) + 0.5);
 
 /* Release the previous allocations */
- SAFE_RELEASE(m_pAudioClient);
-
 /* Create a new audio client */
- hr = m_pDevice->Activate(&m_pAudioClient);
+ hr = m_pDevice->Activate(m_pAudioClient.ReleaseAndGetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Device Activation Failed : %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "Device Activation Failed : %s", WASAPIErrToStr(hr));
 return false;
 }
 
@@ -823,7 +861,7 @@
 }
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to initialize WASAPI in exclusive mode %d - (%s).", HRESULT(hr), WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "Failed to initialize WASAPI in exclusive mode %d - (%s).", HRESULT(hr), WASAPIErrToStr(hr));
 CLog::Log(LOGDEBUG, " Sample Rate : %d", wfxex.Format.nSamplesPerSec);
 CLog::Log(LOGDEBUG, " Sample Format : %s", CAEUtil::DataFormatToStr(format.m_dataFormat));
 CLog::Log(LOGDEBUG, " Bits Per Sample : %d", wfxex.Format.wBitsPerSample);
@@ -833,7 +871,7 @@
 CLog::Log(LOGDEBUG, " Avg. Bytes Sec : %d", wfxex.Format.nAvgBytesPerSec);
 CLog::Log(LOGDEBUG, " Samples/Block : %d", wfxex.Samples.wSamplesPerBlock);
 CLog::Log(LOGDEBUG, " Format cBSize : %d", wfxex.Format.cbSize);
- CLog::Log(LOGDEBUG, " Channel Layout : %s", ((std::string)format.m_channelLayout).c_str());
+ CLog::Log(LOGDEBUG, " Channel Layout : %s", ((std::string)format.m_channelLayout));
 CLog::Log(LOGDEBUG, " Enc. Channels : %d", wfxex_iec61937.dwEncodedChannelCount);
 CLog::Log(LOGDEBUG, " Enc. Samples/Sec: %d", wfxex_iec61937.dwEncodedSamplesPerSec);
 CLog::Log(LOGDEBUG, " Channel Mask : %d", wfxex.dwChannelMask);
@@ -849,13 +887,13 @@
 hr = m_pAudioClient->GetStreamLatency(&hnsLatency);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": GetStreamLatency Failed : %s", WASAPIErrToStr(hr));
+ CLog::LogF(LOGERROR, "GetStreamLatency Failed : %s", WASAPIErrToStr(hr));
 return false;
 }
 
 m_sinkLatency = hnsLatency * 0.0000002;
 
- CLog::Log(LOGINFO, __FUNCTION__": WASAPI Exclusive Mode Sink Initialized using: %s, %d, %d",
+ CLog::LogF(LOGINFO, "WASAPI Exclusive Mode Sink Initialized using: %s, %d, %d",
 CAEUtil::DataFormatToStr(format.m_dataFormat),
 wfxex.Format.nSamplesPerSec,
 wfxex.Format.nChannels);
@@ -882,7 +920,7 @@
 }
 catch (...)
 {
- CLog::Log(LOGDEBUG, "%s: Invalidated AudioClient - Releasing", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "Invalidated AudioClient - Releasing");
 }
 }
 m_running = false;

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2010-2013 Team XBMC
-* http://xbmc.org
+* 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
@@ -26,37 +26,37 @@
 #include "cores/AudioEngine/Sinks/windows/AESinkFactoryWin.h"
 #include "cores/AudioEngine/Utils/AEDeviceInfo.h"
 
+#include <wrl/client.h>
 
 class CAESinkWASAPI : public IAESink
 {
 public:
- virtual const char *GetName() { return "WASAPI"; }
-
 CAESinkWASAPI();
 virtual ~CAESinkWASAPI();
 
- static void Register();
- static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat);
-
- virtual bool Initialize(AEAudioFormat &format, std::string &device);
- virtual void Deinitialize();
+ static void Register();
+ static IAESink* Create(std::string &device, AEAudioFormat &desiredFormat);
+ static void EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force = false);
 
- virtual void GetDelay(AEDelayStatus& status);
- virtual double GetCacheTotal();
- virtual unsigned int AddPackets(uint8_t **data, unsigned int frames, unsigned int offset);
- virtual void Drain();
- static void EnumerateDevicesEx(AEDeviceInfoList &deviceInfoList, bool force = false);
+ // IAESink overrides
+ const char *GetName() override { return "WASAPI"; }
+ bool Initialize(AEAudioFormat &format, std::string &device) override;
+ void Deinitialize() override;
+ void GetDelay(AEDelayStatus& status) override;
+ double GetCacheTotal() override;
+ unsigned int AddPackets(uint8_t **data, unsigned int frames, unsigned int offset) override;
+ void Drain() override;
 
 private:
- bool InitializeExclusive(AEAudioFormat &format);
- static void BuildWaveFormatExtensibleIEC61397(AEAudioFormat &format, WAVEFORMATEXTENSIBLE_IEC61937 &wfxex);
+ bool InitializeExclusive(AEAudioFormat &format);
+ static void BuildWaveFormatExtensibleIEC61397(AEAudioFormat &format, WAVEFORMATEXTENSIBLE_IEC61937 &wfxex);
 bool IsUSBDevice();
 
- HANDLE m_needDataEvent;
- IAEWASAPIDevice *m_pDevice;
- IAudioClient *m_pAudioClient;
- IAudioRenderClient *m_pRenderClient;
- IAudioClock *m_pAudioClock;
+ HANDLE m_needDataEvent;
+ IAEWASAPIDevice* m_pDevice;
+ Microsoft::WRL::ComPtr<IAudioClient> m_pAudioClient;
+ Microsoft::WRL::ComPtr<IAudioRenderClient> m_pRenderClient;
+ Microsoft::WRL::ComPtr<IAudioClock> m_pAudioClock;
 
 AEAudioFormat m_format;
 unsigned int m_encodedChannels;

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -44,9 +44,18 @@
 extern const char *WASAPIErrToStr(HRESULT err);
 
 #define EXIT_ON_FAILURE(hr, reason, ...) if(FAILED(hr)) {CLog::Log(LOGERROR, reason " - %s", __VA_ARGS__, WASAPIErrToStr(hr)); goto failed;}
-#define SAFE_DESTROY_VOICE(x) do { if(x) { x->DestroyVoice(); x = nullptr; } }while(0);
 #define XAUDIO_BUFFERS_IN_QUEUE 2
 
+template <class TVoice>
+inline void SafeDestroyVoice(TVoice **ppVoice)
+{
+ if (*ppVoice)
+ {
+ (*ppVoice)->DestroyVoice();
+ *ppVoice = nullptr;
+ }
+}
+
 /// ----------------- CAESinkXAudio ------------------------
 
 CAESinkXAudio::CAESinkXAudio() :
@@ -93,23 +102,23 @@
 m_xAudio2.Reset();
 }
 
-void CAESinkXAudio::Register()
-{
- AE::AESinkRegEntry reg;
- reg.sinkName = "XAUDIO";
- reg.createFunc = CAESinkXAudio::Create;
- reg.enumerateFunc = CAESinkXAudio::EnumerateDevicesEx;
- AE::CAESinkFactory::RegisterSink(reg);
-}
-
-IAESink* CAESinkXAudio::Create(std::string &device, AEAudioFormat &desiredFormat)
-{
- IAESink *sink = new CAESinkXAudio();
- if (sink->Initialize(desiredFormat, device))
- return sink;
-
- delete sink;
- return nullptr;
+void CAESinkXAudio::Register()
+{
+ AE::AESinkRegEntry reg;
+ reg.sinkName = "XAUDIO";
+ reg.createFunc = CAESinkXAudio::Create;
+ reg.enumerateFunc = CAESinkXAudio::EnumerateDevicesEx;
+ AE::CAESinkFactory::RegisterSink(reg);
+}
+
+IAESink* CAESinkXAudio::Create(std::string &device, AEAudioFormat &desiredFormat)
+{
+ IAESink *sink = new CAESinkXAudio();
+ if (sink->Initialize(desiredFormat, device))
+ return sink;
+
+ delete sink;
+ return nullptr;
 }
 
 bool CAESinkXAudio::Initialize(AEAudioFormat &format, std::string &device)
@@ -165,8 +174,8 @@
 }
 m_running = false;
 
- SAFE_DESTROY_VOICE(m_sourceVoice);
- SAFE_DESTROY_VOICE(m_masterVoice);
+ SafeDestroyVoice(&m_sourceVoice);
+ SafeDestroyVoice(&m_masterVoice);
 
 m_initialized = false;
 }
@@ -361,7 +370,7 @@
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTSHD);
 add192 = true;
 }
- SAFE_DESTROY_VOICE(mSourceVoice);
+ SafeDestroyVoice(&mSourceVoice);
 
 /* Test format Dolby TrueHD */
 wfxex.SubFormat = KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_MLP;
@@ -383,8 +392,8 @@
 wfxex.Format.nBlockAlign = wfxex.Format.nChannels * (wfxex.Format.wBitsPerSample >> 3);
 wfxex.Format.nAvgBytesPerSec = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;
 
- SAFE_DESTROY_VOICE(mSourceVoice);
- SAFE_DESTROY_VOICE(mMasterVoice);
+ SafeDestroyVoice(&mSourceVoice);
+ SafeDestroyVoice(&mMasterVoice);
 hr2 = xaudio2->CreateMasteringVoice(&mMasterVoice, wfxex.Format.nChannels, wfxex.Format.nSamplesPerSec,
 0, deviceId.c_str(), nullptr, AudioCategory_Media);
 hr = xaudio2->CreateSourceVoice(&mSourceVoice, &wfxex.Format);
@@ -406,8 +415,8 @@
 wfxex.Format.nBlockAlign = wfxex.Format.nChannels * (wfxex.Format.wBitsPerSample >> 3);
 wfxex.Format.nAvgBytesPerSec = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;
 
- SAFE_DESTROY_VOICE(mSourceVoice);
- SAFE_DESTROY_VOICE(mMasterVoice);
+ SafeDestroyVoice(&mSourceVoice);
+ SafeDestroyVoice(&mMasterVoice);
 hr2 = xaudio2->CreateMasteringVoice(&mMasterVoice, wfxex.Format.nChannels, wfxex.Format.nSamplesPerSec,
 0, deviceId.c_str(), nullptr, AudioCategory_Media);
 hr = xaudio2->CreateSourceVoice(&mSourceVoice, &wfxex.Format);
@@ -422,7 +431,7 @@
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_1024);
 deviceInfo.m_streamTypes.push_back(CAEStreamInfo::STREAM_TYPE_DTS_512);
 }
- SAFE_DESTROY_VOICE(mSourceVoice);
+ SafeDestroyVoice(&mSourceVoice);
 
 /* Test format Dolby AC3 */
 wfxex.SubFormat = KSDATAFORMAT_SUBTYPE_IEC61937_DOLBY_DIGITAL;
@@ -464,7 +473,7 @@
 wfxex.Samples.wValidBitsPerSample = wfxex.Format.wBitsPerSample;
 }
 
- SAFE_DESTROY_VOICE(mSourceVoice);
+ SafeDestroyVoice(&mSourceVoice);
 hr = xaudio2->CreateSourceVoice(&mSourceVoice, &wfxex.Format);
 
 if (SUCCEEDED(hr))
@@ -484,8 +493,8 @@
 
 for (int j = 0; j < WASAPISampleRateCount; j++)
 {
- SAFE_DESTROY_VOICE(mSourceVoice);
- SAFE_DESTROY_VOICE(mMasterVoice);
+ SafeDestroyVoice(&mSourceVoice);
+ SafeDestroyVoice(&mMasterVoice);
 
 wfxex.Format.nSamplesPerSec = WASAPISampleRates[j];
 wfxex.Format.nAvgBytesPerSec = wfxex.Format.nSamplesPerSec * wfxex.Format.nBlockAlign;
@@ -501,8 +510,8 @@
 CLog::Log(LOGNOTICE, __FUNCTION__": sample rate 192khz on device \"%s\" seems to be not supported.", details.strDescription.c_str());
 }
 }
- SAFE_DESTROY_VOICE(mSourceVoice);
- SAFE_DESTROY_VOICE(mMasterVoice);
+ SafeDestroyVoice(&mSourceVoice);
+ SafeDestroyVoice(&mMasterVoice);
 
 deviceInfo.m_deviceName = details.strDeviceId;
 deviceInfo.m_displayName = details.strWinDevType.append(details.strDescription);
@@ -584,7 +593,12 @@
 if (!pMasterVoice)
 {
 if (!bdefault)
- CLog::Log(LOGINFO, __FUNCTION__": Could not locate the device named \"%s\" in the list of Xaudio endpoint devices. Trying the default device...", device.c_str());
+ {
+ CLog::Log(LOGINFO,
+ __FUNCTION__ ": Could not locate the device named \"%s\" in the list of Xaudio "
+ "endpoint devices. Trying the default device...",
+ KODI::PLATFORM::WINDOWS::FromW(device));
+ }
 
 // smartphone issue: providing device ID (even default ID) causes E_NOINTERFACE result
 // workaround: device = nullptr will initialize default audio endpoint

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/AESinkXAudio.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin10.cpp Changed

@@ -95,12 +95,12 @@
 nChannels = std::max(std::min(smpwfxex->Format.nChannels, (WORD)8), (WORD)2);
 ulChannelMask = smpwfxex->dwChannelMask;
 }
- else
- {
- // suppose stereo
- nChannels = 2;
- ulChannelMask = 3;
- }
+ else
+ {
+ // suppose stereo
+ nChannels = 2;
+ ulChannelMask = 3;
+ }
 
 propObj = devInfo->Properties->Lookup(PKEY_AudioEndpoint_PhysicalSpeakers);
 details.uiChannelMask = propObj ? safe_cast<uint32>(propObj) : ulChannelMask;
@@ -201,14 +201,14 @@
 IAudioClient* pClient = CAudioInterfaceActivator::ActivateAsync(deviceIdW.c_str())
 .then([&hr](Concurrency::task<IAudioClient*> task) -> IAudioClient*
 {
- try
- {
- return task.get();
- }
- catch (Platform::COMException^ ex)
- {
- hr = ex->HResult;
- return nullptr;
+ try
+ {
+ return task.get();
+ }
+ catch (Platform::COMException^ ex)
+ {
+ hr = ex->HResult;
+ return nullptr;
 }
 }).get();

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Sinks/windows/AESinkFactoryWin32.cpp Changed

@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <mmdeviceapi.h>
+#include <wrl/client.h>
 
 const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
 const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
@@ -34,70 +35,69 @@
 DEFINE_PROPERTYKEY(PKEY_Device_EnumeratorName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 24);
 
 extern const char *WASAPIErrToStr(HRESULT err);
-#define EXIT_ON_FAILURE(hr, reason, ...) if(FAILED(hr)) {CLog::Log(LOGERROR, reason " - %s", __VA_ARGS__, WASAPIErrToStr(hr)); goto failed;}
+#define EXIT_ON_FAILURE(hr, reason) if(FAILED(hr)) {CLog::LogF(LOGERROR, reason " - HRESULT = %li ErrorMessage = %s", hr, WASAPIErrToStr(hr)); goto failed;}
+
+using namespace Microsoft::WRL;
 
 std::vector<RendererDetail> CAESinkFactoryWin::GetRendererDetails()
 {
 std::vector<RendererDetail> list;
- IMMDeviceEnumerator* pEnumerator = NULL;
- IMMDeviceCollection* pEnumDevices = NULL;
- IMMDevice* pDefaultDevice = NULL;
- LPWSTR pwszID = NULL;
- std::wstring wstrDDID;
- HRESULT hr;
-
- hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not allocate WASAPI device enumerator. CoCreateInstance error code: %li", hr)
+ ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
+ ComPtr<IMMDeviceCollection> pEnumDevices = nullptr;
+ ComPtr<IMMDevice> pDefaultDevice = nullptr;
+ LPWSTR pwszID = nullptr;
+ std::wstring wstrDDID;
+ HRESULT hr;
+
+ hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator.")
 
 UINT uiCount = 0;
 
 // get the default audio endpoint
- if (pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDefaultDevice) == S_OK)
+ if (pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, pDefaultDevice.GetAddressOf()) == S_OK)
 {
 if (pDefaultDevice->GetId(&pwszID) == S_OK)
 {
 wstrDDID = pwszID;
 CoTaskMemFree(pwszID);
 }
- SAFE_RELEASE(pDefaultDevice);
+ pDefaultDevice.Reset();
 }
 
 // enumerate over all audio endpoints
- hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEnumDevices);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint enumeration failed.")
+ hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, pEnumDevices.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint enumeration failed.")
 
 hr = pEnumDevices->GetCount(&uiCount);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint count failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint count failed.")
 
 for (UINT i = 0; i < uiCount; i++)
 {
 RendererDetail details;
- IMMDevice *pDevice = NULL;
- IPropertyStore *pProperty = NULL;
+ ComPtr<IMMDevice> pDevice = nullptr;
+ ComPtr<IPropertyStore> pProperty = nullptr;
 PROPVARIANT varName;
 PropVariantInit(&varName);
 
- hr = pEnumDevices->Item(i, &pDevice);
+ hr = pEnumDevices->Item(i, pDevice.GetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint failed.");
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint failed.");
 goto failed;
 }
 
- hr = pDevice->OpenPropertyStore(STGM_READ, &pProperty);
+ hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.ReleaseAndGetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint properties failed.");
- SAFE_RELEASE(pDevice);
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint properties failed.");
 goto failed;
 }
 
 hr = pProperty->GetValue(PKEY_Device_FriendlyName, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint device name failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint device name failed.");
 goto failed;
 }
 
@@ -107,9 +107,7 @@
 hr = pProperty->GetValue(PKEY_AudioEndpoint_GUID, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint GUID failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint GUID failed.");
 goto failed;
 }
 
@@ -119,9 +117,7 @@
 hr = pProperty->GetValue(PKEY_AudioEndpoint_FormFactor, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint form factor failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint form factor failed.");
 goto failed;
 }
 details.strWinDevType = winEndpoints[(EndpointFormFactor)varName.uiVal].winEndpointType;
@@ -132,9 +128,7 @@
 hr = pProperty->GetValue(PKEY_AudioEndpoint_PhysicalSpeakers, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint speaker layout failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
+ CLog::Log(LOGERROR, "Retrieval of WASAPI endpoint speaker layout failed.");
 goto failed;
 }
 
@@ -150,22 +144,13 @@
 }
 
 list.push_back(details);
-
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pProperty);
 }
 
- SAFE_RELEASE(pEnumDevices);
- SAFE_RELEASE(pEnumerator);
-
 return list;
 
 failed:
 
- CLog::Log(LOGERROR, __FUNCTION__": Failed to enumerate audio renderer devices.");
- SAFE_RELEASE(pEnumDevices);
- SAFE_RELEASE(pEnumerator);
-
+ CLog::Log(LOGERROR, "Failed to enumerate audio renderer devices.");
 return list;
 }
 
@@ -182,12 +167,11 @@
 
 try
 {
- IAudioClient* pClient = nullptr;
-
- hr = m_pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&pClient);
+ ComPtr<IAudioClient> pClient = nullptr;
+ hr = m_pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, reinterpret_cast<void**>(pClient.GetAddressOf()));
 if (SUCCEEDED(hr) && pClient)
 {
- *ppAudioClient = pClient;
+ *ppAudioClient = pClient.Detach();
 return hr;
 }
 }
@@ -197,7 +181,6 @@
 
 int AEWASAPIDeviceWin32::Release() override
 {
- SAFE_RELEASE(m_pDevice);
 delete this;
 return 0;
 };
@@ -205,11 +188,11 @@
 bool AEWASAPIDeviceWin32::IsUSBDevice() override
 {
 bool ret = false;
- IPropertyStore *pProperty = NULL;
+ ComPtr<IPropertyStore> pProperty = nullptr;
 PROPVARIANT varName;
 PropVariantInit(&varName);
 
- HRESULT hr = m_pDevice->OpenPropertyStore(STGM_READ, &pProperty);
+ HRESULT hr = m_pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf());
 if (!SUCCEEDED(hr))
 return ret;
 hr = pProperty->GetValue(PKEY_Device_EnumeratorName, &varName);
@@ -218,7 +201,6 @@
 StringUtils::ToUpper(str);
 ret = (str == "USB");
 PropVariantClear(&varName);
- SAFE_RELEASE(pProperty);
 return ret;
 }
 
@@ -229,50 +211,44 @@
 }
 
 private:
- IMMDevice* m_pDevice{ nullptr };
+ ComPtr<IMMDevice> m_pDevice{ nullptr };
 };
 
 std::string CAESinkFactoryWin::GetDefaultDeviceId()
 {
 std::string strDeviceId = "";
- IMMDevice* pDevice;
- IMMDeviceEnumerator* pEnumerator = NULL;
+ ComPtr<IMMDevice> pDevice = nullptr;
+ ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
 LPWSTR pwszID = NULL;
 std::wstring wstrDDID;
 
- HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not allocate WASAPI device enumerator. CoCreateInstance error code: %li", hr)
+ HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator.")
 
 // get the default audio endpoint
- if (pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &pDevice) == S_OK)
+ if (pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, pDevice.GetAddressOf()) == S_OK)
 {
- IPropertyStore *pProperty = NULL;
+ ComPtr<IPropertyStore> pProperty = nullptr;
 PROPVARIANT varName;
 PropVariantInit(&varName);
 
- hr = pDevice->OpenPropertyStore(STGM_READ, &pProperty);
+ hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf());
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint properties failed.");
- SAFE_RELEASE(pDevice);
+ CLog::LogF(LOGERROR, "Retrieval of WASAPI endpoint properties failed.");
 goto failed;
 }
 
 hr = pProperty->GetValue(PKEY_AudioEndpoint_GUID, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint GUID failed.");
- SAFE_RELEASE(pProperty);
- SAFE_RELEASE(pDevice);
+ CLog::LogF(LOGERROR, "Retrieval of WASAPI endpoint GUID failed.");
 goto failed;
 }
 strDeviceId = KODI::PLATFORM::WINDOWS::FromW(varName.pwszVal);
 PropVariantClear(&varName);
 
- SAFE_RELEASE(pProperty);
- SAFE_RELEASE(pDevice);
 }
- SAFE_RELEASE(pEnumerator);
 
 failed:
 return strDeviceId;
@@ -280,41 +256,40 @@
 
 HRESULT CAESinkFactoryWin::ActivateWASAPIDevice(std::string &device, IAEWASAPIDevice **ppDevice)
 {
- IMMDevice* pDevice;
- IMMDeviceEnumerator* pEnumerator = NULL;
- IMMDeviceCollection* pEnumDevices = NULL;
+ ComPtr<IMMDevice> pDevice = nullptr;
+ ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
+ ComPtr<IMMDeviceCollection> pEnumDevices = nullptr;
 
 if (!ppDevice)
 return E_POINTER;
 
- HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Could not allocate WASAPI device enumerator. CoCreateInstance error code: %li", hr)
+ HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
+ EXIT_ON_FAILURE(hr, "Could not allocate WASAPI device enumerator.")
 
 /* Get our device. First try to find the named device. */
 UINT uiCount = 0;
 
- hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEnumDevices);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint enumeration failed.")
+ hr = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, pEnumDevices.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint enumeration failed.")
 
 hr = pEnumDevices->GetCount(&uiCount);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of audio endpoint count failed.")
+ EXIT_ON_FAILURE(hr, "Retrieval of audio endpoint count failed.")
 
 for (UINT i = 0; i < uiCount; i++)
 {
- IPropertyStore *pProperty = NULL;
+ ComPtr<IPropertyStore> pProperty = nullptr;
 PROPVARIANT varName;
 
- hr = pEnumDevices->Item(i, &pDevice);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of WASAPI endpoint failed.")
+ hr = pEnumDevices->Item(i, pDevice.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of WASAPI endpoint failed.")
 
- hr = pDevice->OpenPropertyStore(STGM_READ, &pProperty);
- EXIT_ON_FAILURE(hr, __FUNCTION__": Retrieval of WASAPI endpoint properties failed.")
+ hr = pDevice->OpenPropertyStore(STGM_READ, pProperty.GetAddressOf());
+ EXIT_ON_FAILURE(hr, "Retrieval of WASAPI endpoint properties failed.")
 
 hr = pProperty->GetValue(PKEY_AudioEndpoint_GUID, &varName);
 if (FAILED(hr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Retrieval of WASAPI endpoint GUID failed.");
- SAFE_RELEASE(pProperty);
+ CLog::LogF(LOGERROR, "Retrieval of WASAPI endpoint GUID failed.");
 goto failed;
 }
 
@@ -323,18 +298,14 @@
 if (device == strDevName)
 i = uiCount;
 else
- SAFE_RELEASE(pDevice);
+ pDevice.Reset();
 
 PropVariantClear(&varName);
- SAFE_RELEASE(pProperty);
 }
 
- SAFE_RELEASE(pEnumDevices);
- SAFE_RELEASE(pEnumerator);
-
 if (pDevice)
 {
- AEWASAPIDeviceWin32* pAEDevice = new AEWASAPIDeviceWin32(pDevice);
+ AEWASAPIDeviceWin32* pAEDevice = new AEWASAPIDeviceWin32(pDevice.Get());
 pAEDevice->deviceId = device;
 *ppDevice = pAEDevice;
 return S_OK;
@@ -343,10 +314,6 @@
 return E_FAIL;
 
 failed:
- CLog::Log(LOGERROR, __FUNCTION__": WASAPI initialization failed.");
- SAFE_RELEASE(pDevice);
- SAFE_RELEASE(pEnumDevices);
- SAFE_RELEASE(pEnumerator);
-
+ CLog::LogF(LOGERROR, "WASAPI initialization failed.");
 return hr;
 }

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEChannelData.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEChannelInfo.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEELDParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEELDParser.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AELimiter.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AELimiter.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AERingBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEStreamData.h Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/cores/DataCacheCore.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DataCacheCore.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/DllLoader-linux.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/DllLoader.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -49,7 +49,7 @@
 #endif
 
 // Entry point of a dll (DllMain)
-typedef int (APIENTRY *EntryFunc)(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
+typedef int (APIENTRY *EntryFunc)(HINSTANCE hinstDLL, DWORD fdwReason, void* lpvReserved);
 
 
 #ifdef TARGET_POSIX
@@ -603,64 +603,6 @@
 if (!EntryAddress)
 ResolveExport("DllMain", (void**)&EntryAddress);
 
- // patch some unwanted calls in memory
- if (strstr(GetName(), "QuickTime.qts"))
- {
- int i;
- uintptr_t dispatch_addr;
- uintptr_t imagebase_addr;
- uintptr_t dispatch_rva;
-
- ResolveExport("theQuickTimeDispatcher", (void **)&dispatch_addr);
- imagebase_addr = (uintptr_t)hModule;
- CLog::Log(LOGDEBUG,
- "Virtual Address of theQuickTimeDispatcher = %p",
- (void *)dispatch_addr);
- CLog::Log(LOGDEBUG, "ImageBase of %s = %p",
- GetName(), (void *)imagebase_addr);
-
- dispatch_rva = dispatch_addr - imagebase_addr;
-
- CLog::Log(LOGDEBUG,
- "Relative Virtual Address of theQuickTimeDispatcher = %p",
- (void *)dispatch_rva);
-
- uintptr_t base = imagebase_addr;
- if (dispatch_rva == 0x124C30)
- {
- CLog::Log(LOGINFO, "QuickTime5 DLLs found\n");
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x19e842)[i] = 0x90; // make_new_region ?
- for (i = 0;i < 28;i++) ((BYTE*)base + 0x19e86d)[i] = 0x90; // call__call_CreateCompatibleDC ?
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x19e898)[i] = 0x90; // jmp_to_call_loadbitmap ?
- for (i = 0;i < 9;i++) ((BYTE*)base + 0x19e8ac)[i] = 0x90; // call__calls_OLE_shit ?
- for (i = 0;i < 106;i++) ((BYTE*)base + 0x261B10)[i] = 0x90; // disable threads
- }
- else if (dispatch_rva == 0x13B330)
- {
- CLog::Log(LOGINFO, "QuickTime6 DLLs found\n");
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x2730CC)[i] = 0x90; // make_new_region
- for (i = 0;i < 28;i++) ((BYTE*)base + 0x2730f7)[i] = 0x90; // call__call_CreateCompatibleDC
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x273122)[i] = 0x90; // jmp_to_call_loadbitmap
- for (i = 0;i < 9;i++) ((BYTE*)base + 0x273131)[i] = 0x90; // call__calls_OLE_shit
- for (i = 0;i < 96;i++) ((BYTE*)base + 0x2AC852)[i] = 0x90; // disable threads
- }
- else if (dispatch_rva == 0x13C3E0)
- {
- CLog::Log(LOGINFO, "QuickTime6.3 DLLs found\n");
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x268F6C)[i] = 0x90; // make_new_region
- for (i = 0;i < 28;i++) ((BYTE*)base + 0x268F97)[i] = 0x90; // call__call_CreateCompatibleDC
- for (i = 0;i < 5;i++) ((BYTE*)base + 0x268FC2)[i] = 0x90; // jmp_to_call_loadbitmap
- for (i = 0;i < 9;i++) ((BYTE*)base + 0x268FD1)[i] = 0x90; // call__calls_OLE_shit
- for (i = 0;i < 96;i++) ((BYTE*)base + 0x2B4722)[i] = 0x90; // disable threads
- }
- else
- {
- CLog::Log(LOGERROR, "Unsupported QuickTime version");
- }
-
- CLog::Log(LOGINFO, "QuickTime.qts patched!!!\n");
- }
-
 #ifdef LOGALL
 CLog::Log(LOGDEBUG, "Executing EntryPoint with DLL_PROCESS_ATTACH at: 0x%x - Dll: %s", pLoader->EntryAddress, sName);
 #endif

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/DllLoader.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/DllLoaderContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/DllLoaderContainer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/LibraryLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/LibraryLoader.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/SoLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/SoLoader.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/Win32DllLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/coff.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/coff.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -29,7 +29,7 @@
 
 #define DEFAULT_DLLPATH "special://xbmc/system/players/mplayer/codecs/"
 #define HIGH_WORD(a) ((uintptr_t)(a) >> 16)
-#define LOW_WORD(a) ((WORD)(((uintptr_t)(a)) & MAXWORD))
+#define LOW_WORD(a) ((unsigned short)(((uintptr_t)(a)) & MAXWORD))
 
 //#define API_DEBUG
 
@@ -49,7 +49,7 @@
 }
 }
 
-extern "C" HMODULE __stdcall dllLoadLibraryExtended(LPCSTR lib_file, LPCSTR sourcedll)
+extern "C" HMODULE __stdcall dllLoadLibraryExtended(const char* lib_file, const char* sourcedll)
 {
 char libname[MAX_PATH + 1] = {};
 char libpath[MAX_PATH + 1] = {};
@@ -104,7 +104,7 @@
 return NULL;
 }
 
-extern "C" HMODULE __stdcall dllLoadLibraryA(LPCSTR file)
+extern "C" HMODULE __stdcall dllLoadLibraryA(const char* file)
 {
 return dllLoadLibraryExtended(file, NULL);
 }
@@ -114,7 +114,7 @@
 #define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
 #define LOAD_IGNORE_CODE_AUTHZ_LEVEL 0x00000010
 
-extern "C" HMODULE __stdcall dllLoadLibraryExExtended(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags, LPCSTR sourcedll)
+extern "C" HMODULE __stdcall dllLoadLibraryExExtended(const char* lpLibFileName, HANDLE hFile, DWORD dwFlags, const char* sourcedll)
 {
 char strFlags[512];
 strFlags[0] = '\0';
@@ -129,7 +129,7 @@
 return dllLoadLibraryExtended(lpLibFileName, sourcedll);
 }
 
-extern "C" HMODULE __stdcall dllLoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags)
+extern "C" HMODULE __stdcall dllLoadLibraryExA(const char* lpLibFileName, HANDLE hFile, DWORD dwFlags)
 {
 return dllLoadLibraryExExtended(lpLibFileName, hFile, dwFlags, NULL);
 }
@@ -152,7 +152,7 @@
 return 1;
 }
 
-extern "C" FARPROC __stdcall dllGetProcAddress(HMODULE hModule, LPCSTR function)
+extern "C" intptr_t (*__stdcall dllGetProcAddress(HMODULE hModule, const char* function))(void)
 {
 uintptr_t loc = (uintptr_t)_ReturnAddress();
 
@@ -171,7 +171,7 @@
 {
 if( dll->ResolveOrdinal(LOW_WORD(function), &address) )
 {
- CLog::Log(LOGDEBUG, "%s(%p(%s), %d) => %p", __FUNCTION__, hModule, dll->GetName(), LOW_WORD(function), address);
+ CLog::Log(LOGDEBUG, "%s(%p(%s), %d) => %p", __FUNCTION__, static_cast<void*>(hModule), dll->GetName(), LOW_WORD(function), address);
 }
 else if( dll->IsSystemDll() )
 {
@@ -189,14 +189,14 @@
 else
 {
 address = NULL;
- CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p",__FUNCTION__ , hModule, dll->GetName(), function, address);
+ CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p",__FUNCTION__ , static_cast<void*>(hModule), dll->GetName(), function, address);
 }
 }
 else
 {
 if( dll->ResolveExport(function, &address) )
 {
- CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p",__FUNCTION__ , hModule, dll->GetName(), function, address);
+ CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p",__FUNCTION__ , static_cast<void*>(hModule), dll->GetName(), function, address);
 }
 else
 {
@@ -213,15 +213,15 @@
 else
 {
 address = NULL;
- CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p", __FUNCTION__, hModule, dll->GetName(), function, address);
+ CLog::Log(LOGDEBUG, "%s(%p(%s), '%s') => %p", __FUNCTION__, static_cast<void*>(hModule), dll->GetName(), function, address);
 }
 }
 }
 
- return (FARPROC)address;
+ return (intptr_t(*)(void)) address;
 }
 
-extern "C" HMODULE WINAPI dllGetModuleHandleA(LPCSTR lpModuleName)
+extern "C" HMODULE WINAPI dllGetModuleHandleA(const char* lpModuleName)
 {
 /*
 If the file name extension is omitted, the default library extension .dll is appended.

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll.h Changed

@@ -22,11 +22,11 @@
  *
  */
 
-extern "C" HMODULE __stdcall dllLoadLibraryExtended(LPCSTR file, LPCSTR sourcedll);
-extern "C" HMODULE __stdcall dllLoadLibraryA(LPCSTR file);
-extern "C" HMODULE __stdcall dllLoadLibraryExExtended(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags, LPCSTR sourcedll);
-extern "C" HMODULE __stdcall dllLoadLibraryExA(LPCSTR lpLibFileName, HANDLE hFile, DWORD dwFlags);
+extern "C" HMODULE __stdcall dllLoadLibraryExtended(const char* file, const char* sourcedll);
+extern "C" HMODULE __stdcall dllLoadLibraryA(const char* file);
+extern "C" HMODULE __stdcall dllLoadLibraryExExtended(const char* lpLibFileName, HANDLE hFile, DWORD dwFlags, const char* sourcedll);
+extern "C" HMODULE __stdcall dllLoadLibraryExA(const char* lpLibFileName, HANDLE hFile, DWORD dwFlags);
 extern "C" int __stdcall dllFreeLibrary(HINSTANCE hLibModule);
-extern "C" FARPROC __stdcall dllGetProcAddress(HMODULE hModule, LPCSTR function);
-extern "C" HMODULE WINAPI dllGetModuleHandleA(LPCSTR lpModuleName);
+extern "C" intptr_t (*__stdcall dllGetProcAddress(HMODULE hModule, const char* function))(void);
+extern "C" HMODULE WINAPI dllGetModuleHandleA(const char* lpModuleName);

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_tracker.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_tracker_file.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_tracker_library.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_tracker_library.h Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/dll_util.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/exports/emu_dummy.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -77,7 +77,7 @@
 #if !defined(TARGET_WINDOWS)
 #include <dlfcn.h>
 #endif
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #include "utils/StringUtils.h"
 
 #if defined(TARGET_WINDOWS)
@@ -675,10 +675,10 @@
 // let the operating system handle it
 // not supported: return lseeki64(fd, lPos, iWhence);
 CLog::Log(LOGWARNING, "msvcrt.dll: dll_lseeki64 called, TODO: add 'int64 -> long' type checking"); //warning
- return (__int64)lseek(fd, (long)lPos, iWhence);
+ return static_cast<long long>(lseek(fd, (long)lPos, iWhence));
 }
 CLog::Log(LOGERROR, "%s emulated function failed", __FUNCTION__);
- return (__int64)-1;
+ return -1ll;
 }
 
 __off_t dll_lseek(int fd, __off_t lPos, int iWhence)
@@ -1315,12 +1315,12 @@
 return -1;
 }
 
- __int64 dll_telli64(int fd)
+ long long dll_telli64(int fd)
 {
 CFile* pFile = g_emuFileWrapper.GetFileXbmcByDescriptor(fd);
 if (pFile != NULL)
 {
- return (__int64)pFile->GetPosition();
+ return static_cast<long long>(pFile->GetPosition());
 }
 else if (!IS_STD_DESCRIPTOR(fd))
 {
@@ -1329,7 +1329,7 @@
 // not supported return telli64(fd);
 CLog::Log(LOGWARNING, "msvcrt.dll: dll_telli64 called, TODO: add 'int64 -> long' type checking"); //warning
 #ifndef TARGET_POSIX
- return (__int64)tell(fd);
+ return static_cast<long long>(tell(fd));
 #elif defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
 return lseek(fd, 0, SEEK_CUR);
 #else

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/exports/emu_msvcrt.h Changed

@@ -116,7 +116,7 @@
   long dll_ftell(FILE *stream);
   off64_t dll_ftell64(FILE *stream);
   long dll_tell ( int fd );
-  __int64 dll_telli64 ( int fd );
+  long long dll_telli64 ( int fd );
   size_t dll_fwrite ( const void * buffer, size_t size, size_t count, FILE * stream );
   int dll_fflush (FILE * stream);
   int dll_ferror (FILE * stream);
@@ -132,11 +132,11 @@
   int dll_initterm(PFV * start, PFV * end);
   uintptr_t dll_beginthread(void( *start_address )( void * ),unsigned stack_size,void *arglist);
   HANDLE dll_beginthreadex(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
-                           LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD dwCreationFlags,
+                           LPTHREAD_START_ROUTINE lpStartAddress, void* lpParameter, DWORD dwCreationFlags,
 #ifdef TARGET_FREEBSD
-                           LPLONG lpThreadId);
+                           long* lpThreadId);
 #else
-                           LPDWORD lpThreadId);
+                           unsigned int lpThreadId);
 #endif
   int dll_stati64(const char *path, struct _stati64 *buffer);
   int dll_stat64(const char *path, struct __stat64 *buffer);

_service:download_files:master.tar.gz/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/ExternalPlayer/ExternalPlayer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/FFmpeg.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -27,19 +27,19 @@
 #include "URL.h"
 #include <map>
 
-static XbmcThreads::ThreadLocal<CFFmpegLog> CFFmpegLogTls;
+static thread_local CFFmpegLog* CFFmpegLogTls;
 
 void CFFmpegLog::SetLogLevel(int level)
 {
 CFFmpegLog::ClearLogLevel();
 CFFmpegLog *log = new CFFmpegLog();
 log->level = level;
- CFFmpegLogTls.set(log);
+ CFFmpegLogTls = log;
 }
 
 int CFFmpegLog::GetLogLevel()
 {
- CFFmpegLog* log = CFFmpegLogTls.get();
+ CFFmpegLog* log = CFFmpegLogTls;
 if (!log)
 return -1;
 return log->level;
@@ -47,8 +47,8 @@
 
 void CFFmpegLog::ClearLogLevel()
 {
- CFFmpegLog* log = CFFmpegLogTls.get();
- CFFmpegLogTls.set(nullptr);
+ CFFmpegLog* log = CFFmpegLogTls;
+ CFFmpegLogTls = nullptr;
 if (log)
 delete log;
 }

_service:download_files:master.tar.gz/xbmc/cores/FFmpeg.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/IPlayerCallback.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayer.cpp Changed

@@ -25,18 +25,18 @@
 #include "RetroPlayerVideo.h"
 #include "addons/AddonManager.h"
 #include "cores/DataCacheCore.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
 #include "cores/RetroPlayer/rendering/RPRenderManager.h"
 #include "dialogs/GUIDialogYesNo.h"
 #include "filesystem/File.h"
+#include "games/addons/input/GameClientInput.h"
 #include "games/addons/playback/IGameClientPlayback.h"
 #include "games/addons/savestates/Savestate.h"
 #include "games/addons/savestates/SavestateUtils.h"
 #include "games/addons/GameClient.h"
 #include "games/addons/GameClientTiming.h" //! @todo
 #include "games/dialogs/osd/DialogGameVideoSelect.h"
-#include "games/ports/PortManager.h"
 #include "games/tags/GameInfoTag.h"
 #include "games/GameServices.h"
 #include "games/GameUtils.h"
@@ -81,7 +81,7 @@
 // Currently this may prompt the user, the goal is to figure this out silently
 if (!GAME::CGameUtils::FillInGameClient(fileCopy, true))
 {
- CLog::Log(LOGINFO, "RetroPlayer: No compatible game client selected, aborting playback");
+ CLog::Log(LOGINFO, "RetroPlayer[PLAYER]: No compatible game client selected, aborting playback");
 return false;
 }
 
@@ -91,7 +91,7 @@
 m_processInfo.reset(CRPProcessInfo::CreateInstance());
 if (!m_processInfo)
 {
- CLog::Log(LOGERROR, "Failed to create RetroPlayer - no process info registered");
+ CLog::Log(LOGERROR, "RetroPlayer[PLAYER]: Failed to create - no process info registered");
 return false;
 }
 
@@ -114,11 +114,11 @@
 ADDON::AddonPtr addon;
 if (gameClientId.empty())
 {
- CLog::Log(LOGERROR, "Can't play game, no game client was passed to RetroPlayer!");
+ CLog::Log(LOGERROR, "RetroPlayer[PLAYER]: Can't play game, no game client was passed!");
 }
 else if (!CServiceBroker::GetAddonMgr().GetAddon(gameClientId, addon, ADDON::ADDON_GAMEDLL))
 {
- CLog::Log(LOGERROR, "Can't find add-on %s for game file!", gameClientId.c_str());
+ CLog::Log(LOGERROR, "RetroPlayer[PLAYER]: Can't find add-on %s for game file!", gameClientId.c_str());
 }
 else
 {
@@ -132,22 +132,22 @@
 if (!bStandalone)
 {
 std::string redactedPath = CURL::GetRedacted(fileCopy.GetPath());
- CLog::Log(LOGINFO, "RetroPlayer: Opening: %s", redactedPath.c_str());
+ CLog::Log(LOGINFO, "RetroPlayer[PLAYER]: Opening: %s", redactedPath.c_str());
 bSuccess = m_gameClient->OpenFile(fileCopy, m_audio.get(), m_video.get(), m_input.get());
 }
 else
 {
- CLog::Log(LOGINFO, "RetroPlayer: Opening standalone");
+ CLog::Log(LOGINFO, "RetroPlayer[PLAYER]: Opening standalone");
 bSuccess = m_gameClient->OpenStandalone(m_audio.get(), m_video.get(), m_input.get());
 }
 
 if (bSuccess)
- CLog::Log(LOGDEBUG, "RetroPlayer: Using game client %s", gameClientId.c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Using game client %s", gameClientId.c_str());
 else
- CLog::Log(LOGERROR, "RetroPlayer: Failed to open file using %s", gameClientId.c_str());
+ CLog::Log(LOGERROR, "RetroPlayer[PLAYER]: Failed to open file using %s", gameClientId.c_str());
 }
 else
- CLog::Log(LOGERROR, "RetroPlayer: Failed to initialize %s", gameClientId.c_str());
+ CLog::Log(LOGERROR, "RetroPlayer[PLAYER]: Failed to initialize %s", gameClientId.c_str());
 }
 
 if (bSuccess && !bStandalone)
@@ -175,10 +175,10 @@
 if (bSuccess)
 {
 std::string redactedSavestatePath = CURL::GetRedacted(savestatePath);
- CLog::Log(LOGDEBUG, "RetroPlayer: Loading savestate %s", redactedSavestatePath.c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[SAVE]: Loading savestate %s", redactedSavestatePath.c_str());
 
 if (!SetPlayerState(savestatePath))
- CLog::Log(LOGERROR, "RetroPlayer: Failed to load savestate");
+ CLog::Log(LOGERROR, "RetroPlayer[SAVE]: Failed to load savestate");
 }
 }
 
@@ -194,6 +194,7 @@
 else
 {
 m_gameClient.reset();
+ m_input.reset();
 m_audio.reset();
 m_video.reset();
 }
@@ -203,7 +204,7 @@
 
 bool CRetroPlayer::CloseFile(bool reopen /* = false */)
 {
- CLog::Log(LOGDEBUG, "RetroPlayer: Closing file");
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Closing file");
 
 m_autoSave.reset();
 
@@ -213,9 +214,9 @@
 {
 std::string savePath = m_gameClient->GetPlayback()->CreateSavestate();
 if (!savePath.empty())
- CLog::Log(LOGDEBUG, "Saved state to %s", CURL::GetRedacted(savePath).c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[SAVE]: Saved state to %s", CURL::GetRedacted(savePath).c_str());
 else
- CLog::Log(LOGDEBUG, "Failed to save state at close");
+ CLog::Log(LOGDEBUG, "RetroPlayer[SAVE]: Failed to save state at close");
 
 UnregisterWindowCallbacks();
 m_gameClient->CloseFile();
@@ -224,12 +225,15 @@
 m_callback.OnPlayBackEnded();
 }
 
+ m_input.reset();
 m_audio.reset();
 m_video.reset();
 
 m_renderManager.reset();
 m_processInfo.reset();
 
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Playback ended");
+
 return true;
 }
 
@@ -399,7 +403,8 @@
 
 m_gameClient->GetPlayback()->SetSpeed(0.0);
 
- m_gameServices.PortManager().HardwareReset();
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Sending reset command via ACTION_PLAYER_RESET");
+ m_gameClient->Input().HardwareReset();
 
 // If rewinding or paused, begin playback
 if (speed <= 0.0f)
@@ -413,6 +418,7 @@
 {
 if (m_gameClient && m_gameClient->GetPlayback()->GetSpeed() == 0.0)
 {
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Closing OSD via ACTION_SHOW_OSD");
 CloseOSD();
 return true;
 }
@@ -433,7 +439,7 @@
 savestatePath = m_gameClient->GetPlayback()->CreateSavestate();
 if (savestatePath.empty())
 {
- CLog::Log(LOGDEBUG, "Continuing without saving");
+ CLog::Log(LOGDEBUG, "RetroPlayer[SAVE]: Continuing without saving");
 m_autoSave.reset();
 }
 }
@@ -454,7 +460,8 @@
 
 if (m_gameClient)
 {
- const bool bFullscreen = (g_windowManager.GetActiveWindowID() == WINDOW_FULLSCREEN_GAME);
+ const int activeId = g_windowManager.GetActiveWindowOrDialog();
+ const bool bFullscreen = (activeId == WINDOW_FULLSCREEN_GAME);
 
 switch (m_state)
 {
@@ -549,7 +556,10 @@
 m_renderManager->SetSpeed(newSpeed);
 m_processInfo->SetSpeed(static_cast<float>(newSpeed));
 if (newSpeed != 0.0)
+ {
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Closing OSD via speed change (%f)", newSpeed);
 CloseOSD();
+ }
 }
 
 void CRetroPlayer::CloseOSD()
@@ -573,21 +583,21 @@
 const CGameInfoTag *tag = file.GetGameInfoTag();
 if (tag)
 {
- CLog::Log(LOGDEBUG, "RetroPlayer: ---------------------------------------");
- CLog::Log(LOGDEBUG, "RetroPlayer: Game tag loaded");
- CLog::Log(LOGDEBUG, "RetroPlayer: URL: %s", tag->GetURL().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Title: %s", tag->GetTitle().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Platform: %s", tag->GetPlatform().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Genres: %s", StringUtils::Join(tag->GetGenres(), ", ").c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Developer: %s", tag->GetDeveloper().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: ---------------------------------------");
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Game tag loaded");
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: URL: %s", tag->GetURL().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Title: %s", tag->GetTitle().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Platform: %s", tag->GetPlatform().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Genres: %s", StringUtils::Join(tag->GetGenres(), ", ").c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Developer: %s", tag->GetDeveloper().c_str());
 if (tag->GetYear() > 0)
- CLog::Log(LOGDEBUG, "RetroPlayer: Year: %u", tag->GetYear());
- CLog::Log(LOGDEBUG, "RetroPlayer: Game Code: %s", tag->GetID().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Region: %s", tag->GetRegion().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Publisher: %s", tag->GetPublisher().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Format: %s", tag->GetFormat().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Cartridge type: %s", tag->GetCartridgeType().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: Game client: %s", tag->GetGameClient().c_str());
- CLog::Log(LOGDEBUG, "RetroPlayer: ---------------------------------------");
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Year: %u", tag->GetYear());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Game Code: %s", tag->GetID().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Region: %s", tag->GetRegion().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Publisher: %s", tag->GetPublisher().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Format: %s", tag->GetFormat().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Cartridge type: %s", tag->GetCartridgeType().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: Game client: %s", tag->GetGameClient().c_str());
+ CLog::Log(LOGDEBUG, "RetroPlayer[PLAYER]: ---------------------------------------");
 }
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayerAudio.cpp Changed

@@ -36,10 +36,13 @@
   m_pAudioStream(nullptr),
   m_bAudioEnabled(true)
 {
+  CLog::Log(LOGDEBUG, "RetroPlayer[AUDIO]: Initializing audio");
 }
 
 CRetroPlayerAudio::~CRetroPlayerAudio()
 {
+  CLog::Log(LOGDEBUG, "RetroPlayer[AUDIO]: Deinitializing audio");
+
   CloseStream();
 }
 
@@ -74,12 +77,12 @@
   if (m_pAudioStream != nullptr)
     CloseStream();
 
-  CLog::Log(LOGINFO, "RetroPlayerAudio: Creating audio stream, sample rate = %d", samplerate);
+  CLog::Log(LOGINFO, "RetroPlayer[AUDIO]: Creating audio stream, sample rate = %d", samplerate);
 
   // Resampling is not supported
   if (NormalizeSamplerate(samplerate) != samplerate)
   {
-    CLog::Log(LOGERROR, "RetroPlayerAudio: Resampling to %d not supported", NormalizeSamplerate(samplerate));
+    CLog::Log(LOGERROR, "RetroPlayer[AUDIO]: Resampling to %d not supported", NormalizeSamplerate(samplerate));
     return false;
   }
 
@@ -91,7 +94,7 @@
 
   if (!m_pAudioStream)
   {
-    CLog::Log(LOGERROR, "RetroPlayerAudio: Failed to create audio stream");
+    CLog::Log(LOGERROR, "RetroPlayer[AUDIO]: Failed to create audio stream");
     return false;
   }
 
@@ -104,6 +107,8 @@
 
 bool CRetroPlayerAudio::OpenEncodedStream(AVCodecID codec, unsigned int samplerate, const CAEChannelInfo& channelLayout)
 {
+  CLog::Log(LOGERROR, "RetroPlayer[AUDIO]: Encoded audio stream not supported");
+
   return true; //! @todo
 }
 
@@ -123,6 +128,8 @@
 {
   if (m_pAudioStream)
   {
+    CLog::Log(LOGDEBUG, "RetroPlayer[AUDIO]: Closing audio stream");
+
     CServiceBroker::GetActiveAE().FreeStream(m_pAudioStream);
     m_pAudioStream = nullptr;
   }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayerAutoSave.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayerInput.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/RetroPlayerVideo.cpp Changed

@@ -20,6 +20,7 @@
 
 #include "RetroPlayerVideo.h"
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
+#include "cores/RetroPlayer/rendering/RenderTranslator.h"
 #include "cores/RetroPlayer/rendering/RPRenderManager.h"
 #include "utils/log.h"
 
@@ -30,18 +31,26 @@
   m_renderManager(renderManager),
   m_processInfo(processInfo)
 {
+  CLog::Log(LOGDEBUG, "RetroPlayer[VIDEO]: Initializing video");
+
   m_renderManager.Initialize();
 }
 
 CRetroPlayerVideo::~CRetroPlayerVideo()
 {
+  CLog::Log(LOGDEBUG, "RetroPlayer[VIDEO]: Deinitializing video");
+
   CloseStream();
   m_renderManager.Deinitialize();
 }
 
 bool CRetroPlayerVideo::OpenPixelStream(AVPixelFormat pixfmt, unsigned int width, unsigned int height, unsigned int orientationDeg)
 {
-  CLog::Log(LOGINFO, "RetroPlayerVideo: Creating video stream with pixel format: %i, %dx%d", pixfmt, width, height);
+  CLog::Log(LOGDEBUG, "RetroPlayer[VIDEO]: Creating video stream - format %s, %ux%u, %u deg",
+      CRenderTranslator::TranslatePixelFormat(pixfmt),
+      width,
+      height,
+      orientationDeg);
 
   m_processInfo.SetVideoPixelFormat(pixfmt);
   m_processInfo.SetVideoDimensions(width, height);
@@ -51,6 +60,8 @@
 
 bool CRetroPlayerVideo::OpenEncodedStream(AVCodecID codec)
 {
+  CLog::Log(LOGERROR, "RetroPlayer[VIDEO]: Encoded video stream not supported");
+
   return false; //! @todo
 }
 
@@ -61,5 +72,7 @@
 
 void CRetroPlayerVideo::CloseStream()
 {
+  CLog::Log(LOGDEBUG, "RetroPlayer[VIDEO]: Closing video stream");
+
   m_renderManager.Flush();
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge Added

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.cpp Added

@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2017 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 "GUIGameRenderManager.h"
+#include "GUIGameVideoHandle.h"
+#include "GUIRenderHandle.h"
+#include "GUIRenderTarget.h"
+#include "GUIRenderTargetFactory.h"
+#include "IRenderCallback.h"
+#include "threads/SingleLock.h"
+
+using namespace KODI;
+using namespace RETRO;
+
+CGUIGameRenderManager::~CGUIGameRenderManager() = default;
+
+void CGUIGameRenderManager::RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback)
+{
+ // Set factory
+ {
+ CSingleLock lock(m_targetMutex);
+ m_factory = factory;
+ UpdateRenderTargets();
+ }
+
+ // Set callback
+ {
+ CSingleLock lock(m_callbackMutex);
+ m_callback = callback;
+ }
+}
+
+void CGUIGameRenderManager::UnregisterPlayer()
+{
+ // Reset callback
+ {
+ CSingleLock lock(m_callbackMutex);
+ m_callback = nullptr;
+ }
+
+ // Reset factory
+ {
+ CSingleLock lock(m_targetMutex);
+ m_factory = nullptr;
+ UpdateRenderTargets();
+ }
+}
+
+std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterControl(CGUIGameControl &control)
+{
+ CSingleLock lock(m_targetMutex);
+
+ // Create handle for game control
+ std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderControlHandle(*this, control));
+
+ std::shared_ptr<CGUIRenderTarget> renderTarget;
+ if (m_factory != nullptr)
+ renderTarget.reset(m_factory->CreateRenderControl(control));
+
+ m_renderTargets.insert(std::make_pair(renderHandle.get(), std::move(renderTarget)));
+
+ return renderHandle;
+}
+
+std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterWindow(CGameWindowFullScreen &window)
+{
+ CSingleLock lock(m_targetMutex);
+
+ // Create handle for game window
+ std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderFullScreenHandle(*this, window));
+
+ std::shared_ptr<CGUIRenderTarget> renderTarget;
+ if (m_factory != nullptr)
+ renderTarget.reset(m_factory->CreateRenderFullScreen(window));
+
+ m_renderTargets.insert(std::make_pair(renderHandle.get(), std::move(renderTarget)));
+
+ return renderHandle;
+}
+
+std::shared_ptr<CGUIGameVideoHandle> CGUIGameRenderManager::RegisterDialog(GAME::CDialogGameVideoSelect &dialog)
+{
+ return std::make_shared<CGUIGameVideoHandle>(*this);
+}
+
+void CGUIGameRenderManager::UnregisterHandle(CGUIRenderHandle *handle)
+{
+ CSingleLock lock(m_targetMutex);
+
+ m_renderTargets.erase(handle);
+}
+
+void CGUIGameRenderManager::Render(CGUIRenderHandle *handle)
+{
+ CSingleLock lock(m_targetMutex);
+
+ auto it = m_renderTargets.find(handle);
+ if (it != m_renderTargets.end())
+ {
+ const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
+ if (renderTarget)
+ renderTarget->Render();
+ }
+}
+
+void CGUIGameRenderManager::RenderEx(CGUIRenderHandle *handle)
+{
+ CSingleLock lock(m_targetMutex);
+
+ auto it = m_renderTargets.find(handle);
+ if (it != m_renderTargets.end())
+ {
+ const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
+ if (renderTarget)
+ renderTarget->RenderEx();
+ }
+}
+
+void CGUIGameRenderManager::ClearBackground(CGUIRenderHandle *handle)
+{
+ CSingleLock lock(m_targetMutex);
+
+ auto it = m_renderTargets.find(handle);
+ if (it != m_renderTargets.end())
+ {
+ const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
+ if (renderTarget)
+ renderTarget->ClearBackground();
+ }
+}
+
+bool CGUIGameRenderManager::IsDirty(CGUIRenderHandle *handle)
+{
+ CSingleLock lock(m_targetMutex);
+
+ auto it = m_renderTargets.find(handle);
+ if (it != m_renderTargets.end())
+ {
+ const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
+ if (renderTarget)
+ return renderTarget->IsDirty();
+ }
+
+ return false;
+}
+
+bool CGUIGameRenderManager::IsPlayingGame()
+{
+ CSingleLock lock(m_callbackMutex);
+
+ return m_callback != nullptr;
+}
+
+bool CGUIGameRenderManager::SupportsRenderFeature(ERENDERFEATURE feature)
+{
+ CSingleLock lock(m_callbackMutex);
+
+ if (m_callback != nullptr)
+ return m_callback->SupportsRenderFeature(feature);
+
+ return false;
+}
+
+bool CGUIGameRenderManager::SupportsScalingMethod(ESCALINGMETHOD method)
+{
+ CSingleLock lock(m_callbackMutex);
+
+ if (m_callback != nullptr)
+ return m_callback->SupportsScalingMethod(method);
+
+ return false;
+}
+
+void CGUIGameRenderManager::UpdateRenderTargets()
+{
+ if (m_factory != nullptr)
+ {
+ for (auto &it: m_renderTargets)
+ {
+ CGUIRenderHandle *handle = it.first;
+ std::shared_ptr<CGUIRenderTarget> &renderTarget = it.second;
+
+ if (!renderTarget)
+ renderTarget.reset(CreateRenderTarget(handle));
+ }
+ }
+ else
+ {
+ for (auto &it : m_renderTargets)
+ it.second.reset();
+ }
+}
+
+CGUIRenderTarget *CGUIGameRenderManager::CreateRenderTarget(CGUIRenderHandle *handle)
+{
+ switch (handle->Type())
+ {
+ case RENDER_HANDLE::CONTROL:
+ {
+ CGUIRenderControlHandle *controlHandle = static_cast<CGUIRenderControlHandle*>(handle);
+ return m_factory->CreateRenderControl(controlHandle->GetControl());
+ }
+ case RENDER_HANDLE::WINDOW:
+ {
+ CGUIRenderFullScreenHandle *fullScreenHandle = static_cast<CGUIRenderFullScreenHandle*>(handle);
+ return m_factory->CreateRenderFullScreen(fullScreenHandle->GetWindow());
+ }
+ default:
+ break;
+ }
+
+ return nullptr;
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameRenderManager.h Added

@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 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 "cores/IPlayer.h"
+#include "threads/CriticalSection.h"
+
+#include <map>
+#include <memory>
+
+namespace KODI
+{
+namespace GAME
+{
+ class CDialogGameVideoSelect;
+}
+
+namespace RETRO
+{
+ class CGameWindowFullScreen;
+ class CGUIGameControl;
+ class CGUIGameVideoHandle;
+ class CGUIRenderTargetFactory;
+ class CGUIRenderHandle;
+ class CGUIRenderTarget;
+ class IRenderCallback;
+
+ /*!
+ * \brief Class to safely route commands between the GUI and RetroPlayer
+ *
+ * This class is brought up before the GUI and player core factory. It
+ * provides the GUI with safe access to a registered player.
+ *
+ * Access to the player is done through handles. When a handle is no
+ * longer needed, it should be destroyed.
+ *
+ * Two kinds of handles are provided:
+ *
+ * - CGUIRenderHandle
+ * Allows the holder to invoke render events
+ *
+ * - CGUIGameVideoHandle
+ * Allows the holder to query video properties, such as the filter
+ * or view mode.
+ *
+ * Each manager fulfills the following design requirements:
+ *
+ * 1. No assumption of player lifetimes
+ *
+ * 2. No assumption of GUI element lifetimes, as long as handles are
+ * destroyed before this class is destructed
+ *
+ * 3. No limit on the number of handles
+ */
+ class CGUIGameRenderManager
+ {
+ friend class CGUIGameVideoHandle;
+ friend class CGUIRenderHandle;
+
+ public:
+ CGUIGameRenderManager() = default;
+ ~CGUIGameRenderManager();
+
+ /*!
+ * \brief Register a RetroPlayer instance
+ *
+ * \param factory The interface for creating render targets exposed to the GUI
+ * \param callback The interface for querying video properties
+ */
+ void RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback);
+
+ /*!
+ * \brief Unregister a RetroPlayer instance
+ */
+ void UnregisterPlayer();
+
+ /*!
+ * \brief Register a GUI game control ("gamewindow" skin control)
+ *
+ * \param control The game control
+ *
+ * \return A handle to invoke render events
+ */
+ std::shared_ptr<CGUIRenderHandle> RegisterControl(CGUIGameControl &control);
+
+ /*!
+ * \brief Register a fullscreen game window ("FullscreenGame" window)
+ *
+ * \param window The game window
+ *
+ * \return A handle to invoke render events
+ */
+ std::shared_ptr<CGUIRenderHandle> RegisterWindow(CGameWindowFullScreen &window);
+
+ /*!
+ * \brief Register a video select dialog (for selecting video filters,
+ * view modes, etc.)
+ *
+ * \param dialog The video select dialog
+ *
+ * \return A handle to query game and video properties
+ */
+ std::shared_ptr<CGUIGameVideoHandle> RegisterDialog(GAME::CDialogGameVideoSelect &dialog);
+
+ protected:
+ // Functions exposed to friend class CGUIRenderHandle
+ void UnregisterHandle(CGUIRenderHandle *handle);
+ void Render(CGUIRenderHandle *handle);
+ void RenderEx(CGUIRenderHandle *handle);
+ void ClearBackground(CGUIRenderHandle *handle);
+ bool IsDirty(CGUIRenderHandle *handle);
+
+ // Functions exposed to friend class CGUIGameVideoHandle
+ void UnregisterHandle(CGUIGameVideoHandle *handle) { }
+ bool IsPlayingGame();
+ bool SupportsRenderFeature(ERENDERFEATURE feature);
+ bool SupportsScalingMethod(ESCALINGMETHOD method);
+
+ private:
+ /*!
+ * \brief Helper function to create or destroy render targets when a
+ * factory is registered/unregistered
+ */
+ void UpdateRenderTargets();
+
+ /*!
+ * \brief Helper function to create a render target
+ *
+ * \param handle The handle given to the registered GUI element
+ *
+ * \return A target to receive rendering commands
+ */
+ CGUIRenderTarget *CreateRenderTarget(CGUIRenderHandle *handle);
+
+ // Render events
+ CGUIRenderTargetFactory *m_factory = nullptr;
+ std::map<CGUIRenderHandle*, std::shared_ptr<CGUIRenderTarget>> m_renderTargets;
+ CCriticalSection m_targetMutex;
+
+ // Video properties
+ IRenderCallback *m_callback = nullptr;
+ CCriticalSection m_callbackMutex;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameSettings.h Added

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2017 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 "IGUIRenderSettings.h"
+#include "cores/RetroPlayer/rendering/RenderSettings.h"
+#include "threads/CriticalSection.h"
+#include "utils/Observer.h"
+
+#include <memory>
+
+class CGameSettings;
+
+namespace KODI
+{
+namespace RETRO
+{
+ class CRPProcessInfo;
+
+ class CGUIGameSettings : public IGUIRenderSettings,
+ public Observer
+ {
+ public:
+ CGUIGameSettings(CRPProcessInfo &processInfo);
+ ~CGUIGameSettings();
+
+ // implementation of IGUIRenderSettings
+ CRenderSettings GetSettings() const override;
+
+ // implementation of Observer
+ void Notify(const Observable &obs, const ObservableMessage msg) override;
+
+ private:
+ void UpdateSettings();
+
+ // Construction parameters
+ CRPProcessInfo &m_processInfo;
+
+ // GUI parameters
+ CGameSettings &m_guiSettings;
+
+ // Render parameters
+ CRenderSettings m_renderSettings;
+
+ // Synchronization parameters
+ CCriticalSection m_mutex;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIGameVideoHandle.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderHandle.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.cpp Added

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 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 "GUIRenderTarget.h"
+#include "cores/RetroPlayer/guicontrols/GUIGameControl.h"
+#include "cores/RetroPlayer/guiwindows/GameWindowFullScreen.h"
+#include "cores/RetroPlayer/rendering/IRenderManager.h"
+
+using namespace KODI;
+using namespace RETRO;
+
+// --- CGUIRenderTarget --------------------------------------------------------
+
+CGUIRenderTarget::CGUIRenderTarget(IRenderManager *renderManager) :
+ m_renderManager(renderManager)
+{
+}
+
+// --- CGUIRenderControl -------------------------------------------------------
+
+CGUIRenderControl::CGUIRenderControl(IRenderManager *renderManager, CGUIGameControl &gameControl) :
+ CGUIRenderTarget(renderManager),
+ m_gameControl(gameControl)
+{
+}
+
+void CGUIRenderControl::Render()
+{
+ m_renderManager->RenderControl(true, true, m_gameControl.GetRenderRegion(), m_gameControl.GetRenderSettings());
+}
+
+void CGUIRenderControl::RenderEx()
+{
+ //! @todo
+ //m_renderManager->RenderControl(false, false, m_gameControl.GetRenderRegion(), m_gameControl.GetRenderSettings());
+}
+
+// --- CGUIRenderFullScreen ----------------------------------------------------
+
+CGUIRenderFullScreen::CGUIRenderFullScreen(IRenderManager *renderManager, CGameWindowFullScreen &window) :
+ CGUIRenderTarget(renderManager),
+ m_window(window)
+{
+}
+
+void CGUIRenderFullScreen::Render()
+{
+ m_renderManager->RenderWindow(true, m_window.GetCoordsRes());
+}
+
+void CGUIRenderFullScreen::RenderEx()
+{
+ //! @todo
+ //m_renderManager->RenderWindow(false, m_window.GetCoordsRes());
+}
+
+void CGUIRenderFullScreen::ClearBackground()
+{
+ m_renderManager->ClearBackground();
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderTarget.h Added

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2017 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
+
+namespace KODI
+{
+namespace RETRO
+{
+ class CGameWindowFullScreen;
+ class CGUIGameControl;
+ class IRenderManager;
+
+ // --- CGUIRenderTarget ------------------------------------------------------
+
+ /*!
+ * \brief A target of rendering commands
+ *
+ * This class abstracts the destination of rendering commands. As a result,
+ * controls and windows are given a unified API.
+ */
+ class CGUIRenderTarget
+ {
+ public:
+ CGUIRenderTarget(IRenderManager *renderManager);
+
+ virtual ~CGUIRenderTarget() = default;
+
+ /*!
+ * \brief Draw the frame to the rendering area
+ */
+ virtual void Render() = 0;
+
+ /*!
+ * \brief Draw the frame to the rendering area differently somehow
+ */
+ virtual void RenderEx() = 0;
+
+ /*!
+ * \brief Clear the background of the rendering area
+ */
+ virtual void ClearBackground() { } //! @todo
+
+ /*!
+ * \brief Check of the rendering area is dirty
+ */
+ virtual bool IsDirty() { return true; } //! @todo
+
+ protected:
+ // Construction parameters
+ IRenderManager *const m_renderManager;
+ };
+
+ // --- CGUIRenderControl -----------------------------------------------------
+
+ class CGUIRenderControl : public CGUIRenderTarget
+ {
+ public:
+ CGUIRenderControl(IRenderManager *renderManager, CGUIGameControl &gameControl);
+ ~CGUIRenderControl() override = default;
+
+ // implementation of CGUIRenderTarget
+ void Render() override;
+ void RenderEx() override;
+
+ private:
+ // Construction parameters
+ CGUIGameControl &m_gameControl;
+ };
+
+ // --- CGUIRenderFullScreen --------------------------------------------------
+
+ class CGUIRenderFullScreen : public CGUIRenderTarget
+ {
+ public:
+ CGUIRenderFullScreen(IRenderManager *renderManager, CGameWindowFullScreen &window);
+ ~CGUIRenderFullScreen() override = default;
+
+ // implementation of CGUIRenderTarget
+ void Render() override;
+ void RenderEx() override;
+ void ClearBackground() override;
+
+ private:
+ // Construction parameters
+ CGameWindowFullScreen &m_window;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/GUIRenderTargetFactory.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/IGUIRenderSettings.h Added

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2017 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 "cores/RetroPlayer/rendering/RenderSettings.h"
+
+namespace KODI
+{
+namespace RETRO
+{
+ /*!
+ * \brief Interface to pass render settings from the GUI to the renderer
+ */
+ class IGUIRenderSettings
+ {
+ public:
+ virtual ~IGUIRenderSettings() = default;
+
+ /*!
+ * \brief Returns true if this render target has a scaling method set
+ */
+ virtual bool HasScalingMethod() const { return true; }
+
+ /*!
+ * \brief Returns true if this render target has a view mode set
+ */
+ virtual bool HasViewMode() const { return true; }
+
+ /*!
+ * \brief Get the settings used to render this target
+ *
+ * \return The render settings
+ */
+ virtual CRenderSettings GetSettings() const = 0;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guibridge/IRenderCallback.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guicontrols/GUIGameControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guicontrols/GUIRenderSettings.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows Added

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows/CMakeLists.txt Added

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.cpp Added

@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2017 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 "GameWindowFullScreen.h"
+#include "GameWindowFullScreenText.h"
+#include "cores/RetroPlayer/guibridge/GUIGameRenderManager.h"
+#include "cores/RetroPlayer/guibridge/GUIRenderHandle.h"
+#include "guilib/GraphicContext.h" //! @todo Remove me
+#include "guilib/GUIDialog.h"
+#include "guilib/GUIControl.h"
+#include "guilib/GUIWindowManager.h" //! @todo Remove me
+#include "guilib/WindowIDs.h"
+#include "input/Action.h"
+#include "input/ActionIDs.h"
+#include "GUIInfoManager.h" //! @todo Remove me
+#include "ServiceBroker.h"
+
+using namespace KODI;
+using namespace RETRO;
+
+CGameWindowFullScreen::CGameWindowFullScreen(void) :
+ CGUIWindow(WINDOW_FULLSCREEN_GAME, "VideoFullScreen.xml"),
+ m_fullscreenText(new CGameWindowFullScreenText(*this))
+{
+ // initialize CGUIControl
+ m_controlStats = new GUICONTROLSTATS;
+
+ // initialize CGUIWindow
+ m_loadType = KEEP_IN_MEMORY;
+
+ RegisterWindow();
+}
+
+CGameWindowFullScreen::~CGameWindowFullScreen()
+{
+ UnregisterWindow();
+
+ delete m_controlStats;
+}
+
+void CGameWindowFullScreen::Process(unsigned int currentTime, CDirtyRegionList &dirtyregion)
+{
+ if (m_renderHandle->IsDirty())
+ MarkDirtyRegion();
+
+ m_controlStats->Reset();
+
+ CGUIWindow::Process(currentTime, dirtyregion);
+
+ //! @todo This isn't quite optimal - ideally we'd only be dirtying up the actual video render rect
+ //! which is probably the job of the renderer as it can more easily track resizing etc.
+ m_renderRegion.SetRect(0, 0, static_cast<float>(g_graphicsContext.GetWidth()), static_cast<float>(g_graphicsContext.GetHeight()));
+}
+
+void CGameWindowFullScreen::Render()
+{
+ m_renderHandle->Render();
+
+ CGUIWindow::Render();
+}
+
+void CGameWindowFullScreen::RenderEx()
+{
+ CGUIWindow::RenderEx();
+
+ m_renderHandle->RenderEx();
+}
+
+bool CGameWindowFullScreen::OnAction(const CAction &action)
+{
+ switch (action.GetID())
+ {
+ case ACTION_SHOW_OSD:
+ {
+ ToggleOSD();
+ return true;
+ }
+ case ACTION_TRIGGER_OSD:
+ {
+ TriggerOSD();
+ return true;
+ }
+ case ACTION_SHOW_GUI:
+ {
+ // Switch back to the menu
+ g_windowManager.PreviousWindow();
+ return true;
+ }
+ case ACTION_ASPECT_RATIO:
+ {
+ // Toggle the aspect ratio mode (only if the info is onscreen)
+ //g_application.GetAppPlayer().SetRenderViewMode(CViewModeSettings::GetNextQuickCycleViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode));
+ return true;
+ }
+ default:
+ break;
+ }
+
+ return CGUIWindow::OnAction(action);
+}
+
+bool CGameWindowFullScreen::OnMessage(CGUIMessage& message)
+{
+ switch (message.GetMessage())
+ {
+ case GUI_MSG_SETFOCUS:
+ case GUI_MSG_LOSTFOCUS:
+ {
+ if (message.GetSenderId() != WINDOW_FULLSCREEN_GAME)
+ return true;
+ break;
+ }
+ default:
+ break;
+ }
+
+ return CGUIWindow::OnMessage(message);
+}
+
+void CGameWindowFullScreen::FrameMove()
+{
+ m_fullscreenText->FrameMove();
+
+ CGUIWindow::FrameMove();
+}
+
+void CGameWindowFullScreen::ClearBackground()
+{
+ m_renderHandle->ClearBackground();
+
+ CGUIWindow::ClearBackground();
+}
+
+bool CGameWindowFullScreen::HasVisibleControls()
+{
+ return m_controlStats->nCountVisible > 0;
+}
+
+void CGameWindowFullScreen::OnWindowLoaded()
+{
+ CGUIWindow::OnWindowLoaded();
+
+ // Override the clear colour - we must never clear fullscreen
+ m_clearBackground = 0;
+
+ m_fullscreenText->OnWindowLoaded();
+}
+
+void CGameWindowFullScreen::OnInitWindow()
+{
+ g_infoManager.SetShowInfo(false);
+ g_infoManager.SetDisplayAfterSeek(0); // Make sure display after seek is off
+
+ // Switch resolution
+ g_graphicsContext.SetFullScreenVideo(true); //! @todo
+
+ CGUIWindow::OnInitWindow();
+}
+
+void CGameWindowFullScreen::OnDeinitWindow(int nextWindowID)
+{
+ // Close all active modal dialogs
+ g_windowManager.CloseInternalModalDialogs(true);
+
+ CGUIWindow::OnDeinitWindow(nextWindowID);
+
+ g_graphicsContext.SetFullScreenVideo(false); //! @todo
+}
+
+void CGameWindowFullScreen::ToggleOSD()
+{
+ CGUIDialog *pOSD = GetOSD();
+ if (pOSD != nullptr)
+ {
+ if (pOSD->IsDialogRunning())
+ pOSD->Close();
+ else
+ pOSD->Open();
+ }
+
+ MarkDirtyRegion();
+}
+
+void CGameWindowFullScreen::TriggerOSD()
+{
+ CGUIDialog *pOSD = GetOSD();
+ if (pOSD != nullptr)
+ {
+ if (!pOSD->IsDialogRunning())
+ pOSD->Open();
+ }
+}
+
+CGUIDialog *CGameWindowFullScreen::GetOSD()
+{
+ return g_windowManager.GetDialog(WINDOW_DIALOG_GAME_OSD);
+}
+
+void CGameWindowFullScreen::RegisterWindow()
+{
+ m_renderHandle = CServiceBroker::GetGameRenderManager().RegisterWindow(*this);
+}
+
+void CGameWindowFullScreen::UnregisterWindow()
+{
+ m_renderHandle.reset();
+}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreen.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/guiwindows/GameWindowFullScreenText.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/BaseRenderBufferPool.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/RPProcessInfo.cpp Changed

@@ -28,12 +28,15 @@
 #include "settings/DisplaySettings.h"
 #include "settings/MediaSettings.h"
 #include "threads/SingleLock.h"
+#include "utils/log.h"
 #include "windowing/WinSystem.h"
 
 extern "C" {
 #include "libavutil/pixdesc.h"
 }
 
+#include <utility>
+
 using namespace KODI;
 using namespace RETRO;
 
@@ -41,7 +44,8 @@
 std::vector<std::unique_ptr<IRendererFactory>> CRPProcessInfo::m_rendererFactories;
 CCriticalSection CRPProcessInfo::m_createSection;
 
-CRPProcessInfo::CRPProcessInfo() :
+CRPProcessInfo::CRPProcessInfo(std::string platformName) :
+ m_platformName(std::move(platformName)),
 m_renderBufferManager(new CRenderBufferManager),
 m_renderContext(new CRenderContext(&CServiceBroker::GetRenderSystem(),
 &CServiceBroker::GetWinSystem(),
@@ -51,7 +55,7 @@
 {
 for (auto &rendererFactory : m_rendererFactories)
 {
- RenderBufferPoolVector bufferPools = rendererFactory->CreateBufferPools();
+ RenderBufferPoolVector bufferPools = rendererFactory->CreateBufferPools(*m_renderContext);
 m_renderBufferManager->RegisterPools(rendererFactory.get(), std::move(bufferPools));
 }
 
@@ -70,28 +74,61 @@
 
 CRPProcessInfo* CRPProcessInfo::CreateInstance()
 {
+ CRPProcessInfo *processInfo = nullptr;
+
 CSingleLock lock(m_createSection);
 
 if (m_processControl != nullptr)
- return m_processControl();
+ {
+ processInfo = m_processControl();
 
- return nullptr;
+ if (processInfo != nullptr)
+ CLog::Log(LOGINFO, "RetroPlayer[PROCESS]: Created process info for %s", processInfo->GetPlatformName().c_str());
+ else
+ CLog::Log(LOGERROR, "RetroPlayer[PROCESS]: Failed to create process info");
+ }
+ else
+ {
+ CLog::Log(LOGERROR, "RetroPlayer[PROCESS]: No process control registered");
+ }
+
+ return processInfo;
 }
 
 void CRPProcessInfo::RegisterProcessControl(CreateRPProcessControl createFunc)
 {
+ std::unique_ptr<CRPProcessInfo> processInfo(createFunc());
+
 CSingleLock lock(m_createSection);
 
- m_processControl = createFunc;
+ if (processInfo)
+ {
+ CLog::Log(LOGINFO, "RetroPlayer[PROCESS]: Registering process control for %s",
+ processInfo->GetPlatformName().c_str());
+ m_processControl = createFunc;
+ }
+ else
+ {
+ CLog::Log(LOGERROR, "RetroPlayer[PROCESS]: Failed to register process control");
+ m_processControl = nullptr;
+ }
 }
 
 void CRPProcessInfo::RegisterRendererFactory(IRendererFactory *factory)
 {
 CSingleLock lock(m_createSection);
 
+ CLog::Log(LOGINFO, "RetroPlayer[RENDER]: Registering renderer factory for %s",
+ factory->RenderSystemName().c_str());
+
 m_rendererFactories.emplace_back(factory);
 }
 
+std::string CRPProcessInfo::GetRenderSystemName(IRenderBufferPool *renderBufferPool) const
+{
+ return m_renderBufferManager->GetRenderSystemName(renderBufferPool);
+}
+
 CRPBaseRenderer *CRPProcessInfo::CreateRenderer(IRenderBufferPool *renderBufferPool, const CRenderSettings &renderSettings)
 {
 CSingleLock lock(m_createSection);
@@ -106,6 +143,8 @@
 }
 }
 
+ CLog::Log(LOGERROR, "RetroPlayer[RENDER]: Failed to find a suitable renderer factory");
+
 return nullptr;
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/RPProcessInfo.h Changed

@@ -49,8 +49,9 @@
 public:
 virtual ~IRendererFactory() = default;
 
+ virtual std::string RenderSystemName() const = 0;
 virtual CRPBaseRenderer *CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool) = 0;
- virtual RenderBufferPoolVector CreateBufferPools() = 0;
+ virtual RenderBufferPoolVector CreateBufferPools(CRenderContext &context) = 0;
 };
 
 class CRPProcessInfo
@@ -62,6 +63,9 @@
 
 virtual ~CRPProcessInfo();
 
+ const std::string &GetPlatformName() const { return m_platformName; }
+ std::string GetRenderSystemName(IRenderBufferPool *renderBufferPool) const;
+
 CRPBaseRenderer *CreateRenderer(IRenderBufferPool *renderBufferPool, const CRenderSettings &renderSettings);
 
 void SetDataCache(CDataCacheCore *cache);
@@ -88,19 +92,26 @@
 void SetPlayTimes(time_t start, int64_t current, int64_t min, int64_t max);
 
 protected:
- CRPProcessInfo();
+ CRPProcessInfo(std::string platformName);
 
 static std::vector<ESCALINGMETHOD> GetScalingMethods();
 
+ // Static factories
 static CreateRPProcessControl m_processControl;
 static std::vector<std::unique_ptr<IRendererFactory>> m_rendererFactories;
 static CCriticalSection m_createSection;
 
+ // Construction parameters
+ const std::string m_platformName;
+
+ // Process info parameters
 CDataCacheCore *m_dataCache = nullptr;
 
+ // Rendering parameters
 std::unique_ptr<CRenderBufferManager> m_renderBufferManager;
 
 private:
+ // Rendering parameters
 std::unique_ptr<CRenderContext> m_renderContext;
 ESCALINGMETHOD m_defaultScalingMethod = VS_SCALINGMETHOD_AUTO;
 };

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/RenderBufferManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/RenderBufferManager.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/X11/RPProcessInfoX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/X11/RPProcessInfoX11.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/amlogic/RPProcessInfoAmlogic.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/amlogic/RPProcessInfoAmlogic.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/android/RPProcessInfoAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/android/RPProcessInfoAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/gbm/RPProcessInfoGbm.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/gbm/RPProcessInfoGbm.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/ios/RPProcessInfoIOS.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/ios/RPProcessInfoIOS.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/osx/RPProcessInfoOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/osx/RPProcessInfoOSX.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/rbpi/RPProcessInfoPi.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/rbpi/RPProcessInfoPi.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/wayland/RPProcessInfoWayland.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/wayland/RPProcessInfoWayland.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/windows/RPProcessInfoWin.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/process/windows/RPProcessInfoWin.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.cpp Deleted

@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2017 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 "GUIGameRenderManager.h"
-#include "GUIGameVideoHandle.h"
-#include "GUIRenderHandle.h"
-#include "GUIRenderTarget.h"
-#include "GUIRenderTargetFactory.h"
-#include "IRenderCallback.h"
-#include "threads/SingleLock.h"
-
-using namespace KODI;
-using namespace RETRO;
-
-CGUIGameRenderManager::~CGUIGameRenderManager() = default;
-
-void CGUIGameRenderManager::RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback)
-{
- {
- CSingleLock lock(m_targetMutex);
- m_factory = factory;
- UpdateRenderTargets();
- }
-
- {
- CSingleLock lock(m_callbackMutex);
- m_callback = callback;
- }
-}
-
-void CGUIGameRenderManager::UnregisterPlayer()
-{
- {
- CSingleLock lock(m_callbackMutex);
- m_callback = nullptr;
- }
-
- {
- CSingleLock lock(m_targetMutex);
- m_factory = nullptr;
- UpdateRenderTargets();
- }
-}
-
-std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterControl(CGUIGameControl &control)
-{
- CSingleLock lock(m_targetMutex);
-
- std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderControlHandle(*this, control));
-
- std::shared_ptr<CGUIRenderTarget> renderTarget;
- if (m_factory != nullptr)
- renderTarget.reset(m_factory->CreateRenderControl(control));
-
- m_renderTargets.insert(std::make_pair(renderHandle.get(), std::move(renderTarget)));
-
- return renderHandle;
-}
-
-std::shared_ptr<CGUIRenderHandle> CGUIGameRenderManager::RegisterWindow(CGameWindowFullScreen &window)
-{
- CSingleLock lock(m_targetMutex);
-
- std::shared_ptr<CGUIRenderHandle> renderHandle(new CGUIRenderFullScreenHandle(*this, window));
-
- std::shared_ptr<CGUIRenderTarget> renderTarget;
- if (m_factory != nullptr)
- renderTarget.reset(m_factory->CreateRenderFullScreen(window));
-
- m_renderTargets.insert(std::make_pair(renderHandle.get(), std::move(renderTarget)));
-
- return renderHandle;
-}
-
-std::shared_ptr<CGUIGameVideoHandle> CGUIGameRenderManager::RegisterDialog(GAME::CDialogGameVideoSelect &dialog)
-{
- return std::make_shared<CGUIGameVideoHandle>(*this);
-}
-
-void CGUIGameRenderManager::UnregisterHandle(CGUIRenderHandle *handle)
-{
- CSingleLock lock(m_targetMutex);
-
- m_renderTargets.erase(handle);
-}
-
-void CGUIGameRenderManager::Render(CGUIRenderHandle *handle)
-{
- CSingleLock lock(m_targetMutex);
-
- auto it = m_renderTargets.find(handle);
- if (it != m_renderTargets.end())
- {
- const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
- if (renderTarget)
- renderTarget->Render();
- }
-}
-
-void CGUIGameRenderManager::RenderEx(CGUIRenderHandle *handle)
-{
- CSingleLock lock(m_targetMutex);
-
- auto it = m_renderTargets.find(handle);
- if (it != m_renderTargets.end())
- {
- const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
- if (renderTarget)
- renderTarget->RenderEx();
- }
-}
-
-void CGUIGameRenderManager::ClearBackground(CGUIRenderHandle *handle)
-{
- CSingleLock lock(m_targetMutex);
-
- auto it = m_renderTargets.find(handle);
- if (it != m_renderTargets.end())
- {
- const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
- if (renderTarget)
- renderTarget->ClearBackground();
- }
-}
-
-bool CGUIGameRenderManager::IsDirty(CGUIRenderHandle *handle)
-{
- CSingleLock lock(m_targetMutex);
-
- auto it = m_renderTargets.find(handle);
- if (it != m_renderTargets.end())
- {
- const std::shared_ptr<CGUIRenderTarget> &renderTarget = it->second;
- if (renderTarget)
- return renderTarget->IsDirty();
- }
-
- return false;
-}
-
-bool CGUIGameRenderManager::IsPlayingGame()
-{
- CSingleLock lock(m_callbackMutex);
-
- return m_callback != nullptr;
-}
-
-bool CGUIGameRenderManager::SupportsRenderFeature(ERENDERFEATURE feature)
-{
- CSingleLock lock(m_callbackMutex);
-
- if (m_callback != nullptr)
- return m_callback->SupportsRenderFeature(feature);
-
- return false;
-}
-
-bool CGUIGameRenderManager::SupportsScalingMethod(ESCALINGMETHOD method)
-{
- CSingleLock lock(m_callbackMutex);
-
- if (m_callback != nullptr)
- return m_callback->SupportsScalingMethod(method);
-
- return false;
-}
-
-void CGUIGameRenderManager::UpdateRenderTargets()
-{
- if (m_factory != nullptr)
- {
- for (auto &it: m_renderTargets)
- {
- CGUIRenderHandle *handle = it.first;
- std::shared_ptr<CGUIRenderTarget> &renderTarget = it.second;
-
- if (!renderTarget)
- renderTarget.reset(CreateRenderTarget(handle));
- }
- }
- else
- {
- for (auto &it : m_renderTargets)
- it.second.reset();
- }
-}
-
-CGUIRenderTarget *CGUIGameRenderManager::CreateRenderTarget(CGUIRenderHandle *handle)
-{
- switch (handle->Type())
- {
- case RENDER_HANDLE::CONTROL:
- {
- CGUIRenderControlHandle *controlHandle = static_cast<CGUIRenderControlHandle*>(handle);
- return m_factory->CreateRenderControl(controlHandle->GetControl());
- }
- case RENDER_HANDLE::WINDOW:
- {
- CGUIRenderFullScreenHandle *fullScreenHandle = static_cast<CGUIRenderFullScreenHandle*>(handle);
- return m_factory->CreateRenderFullScreen(fullScreenHandle->GetWindow());
- }
- default:
- break;
- }
-
- return nullptr;
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/GUIGameRenderManager.h Deleted

@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017 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 "cores/IPlayer.h"
-#include "threads/CriticalSection.h"
-
-#include <map>
-#include <memory>
-
-namespace KODI
-{
-namespace GAME
-{
- class CDialogGameVideoSelect;
-}
-
-namespace RETRO
-{
- class CGameWindowFullScreen;
- class CGUIGameControl;
- class CGUIGameVideoHandle;
- class CGUIRenderTargetFactory;
- class CGUIRenderHandle;
- class CGUIRenderTarget;
- class IRenderCallback;
-
- class CGUIGameRenderManager
- {
- friend class CGUIGameVideoHandle;
- friend class CGUIRenderHandle;
-
- public:
- CGUIGameRenderManager() = default;
- ~CGUIGameRenderManager();
-
- void RegisterPlayer(CGUIRenderTargetFactory *factory, IRenderCallback *callback);
- void UnregisterPlayer();
-
- std::shared_ptr<CGUIRenderHandle> RegisterControl(CGUIGameControl &control);
- std::shared_ptr<CGUIRenderHandle> RegisterWindow(CGameWindowFullScreen &window);
- std::shared_ptr<CGUIGameVideoHandle> RegisterDialog(GAME::CDialogGameVideoSelect &dialog);
-
- protected:
- // Functions exposed to friend class CGUIRenderHandle
- void UnregisterHandle(CGUIRenderHandle *handle);
- void Render(CGUIRenderHandle *handle);
- void RenderEx(CGUIRenderHandle *handle);
- void ClearBackground(CGUIRenderHandle *handle);
- bool IsDirty(CGUIRenderHandle *handle);
-
- // Functions exposed to friend class CGUIGameVideoHandle
- void UnregisterHandle(CGUIGameVideoHandle *handle) { }
- bool IsPlayingGame();
- bool SupportsRenderFeature(ERENDERFEATURE feature);
- bool SupportsScalingMethod(ESCALINGMETHOD method);
-
- private:
- void UpdateRenderTargets();
-
- CGUIRenderTarget *CreateRenderTarget(CGUIRenderHandle *handle);
-
- CGUIRenderTargetFactory *m_factory = nullptr;
- std::map<CGUIRenderHandle*, std::shared_ptr<CGUIRenderTarget>> m_renderTargets;
- CCriticalSection m_targetMutex;
-
- IRenderCallback *m_callback = nullptr;
- CCriticalSection m_callbackMutex;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/GUIGameSettings.h Deleted

@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2017 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 "IGUIRenderSettings.h"
-#include "RenderSettings.h"
-#include "threads/CriticalSection.h"
-#include "utils/Observer.h"
-
-#include <memory>
-
-class CGameSettings;
-
-namespace KODI
-{
-namespace RETRO
-{
- class CRPProcessInfo;
-
- class CGUIGameSettings : public IGUIRenderSettings,
- public Observer
- {
- public:
- CGUIGameSettings(CRPProcessInfo &processInfo);
- ~CGUIGameSettings();
-
- // implementation of IGUIRenderSettings
- CRenderSettings GetSettings() const override;
-
- // implementation of Observer
- void Notify(const Observable &obs, const ObservableMessage msg) override;
-
- private:
- void UpdateSettings();
-
- // Construction parameters
- CRPProcessInfo &m_processInfo;
-
- // GUI parameters
- CGameSettings &m_guiSettings;
-
- // Render parameters
- CRenderSettings m_renderSettings;
-
- // Synchronization parameters
- CCriticalSection m_mutex;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.cpp Deleted

@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2017 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 "GUIRenderTarget.h"
-#include "IRenderManager.h"
-#include "cores/RetroPlayer/guicontrols/GUIGameControl.h"
-#include "cores/RetroPlayer/windows/GameWindowFullScreen.h"
-
-using namespace KODI;
-using namespace RETRO;
-
-// --- CGUIRenderTarget --------------------------------------------------------
-
-CGUIRenderTarget::CGUIRenderTarget(IRenderManager *renderManager) :
- m_renderManager(renderManager)
-{
-}
-
-// --- CGUIRenderControl -------------------------------------------------------
-
-CGUIRenderControl::CGUIRenderControl(IRenderManager *renderManager, CGUIGameControl &gameControl) :
- CGUIRenderTarget(renderManager),
- m_gameControl(gameControl)
-{
-}
-
-void CGUIRenderControl::Render()
-{
- m_renderManager->RenderControl(true, true, m_gameControl.GetRenderRegion(), m_gameControl.GetRenderSettings());
-}
-
-void CGUIRenderControl::RenderEx()
-{
- //! @todo
- //m_renderManager->RenderControl(false, false, m_gameControl.GetRenderRegion(), m_gameControl.GetRenderSettings());
-}
-
-// --- CGUIRenderFullScreen ----------------------------------------------------
-
-CGUIRenderFullScreen::CGUIRenderFullScreen(IRenderManager *renderManager, CGameWindowFullScreen &window) :
- CGUIRenderTarget(renderManager),
- m_window(window)
-{
-}
-
-void CGUIRenderFullScreen::Render()
-{
- m_renderManager->RenderWindow(true, m_window.GetCoordsRes());
-}
-
-void CGUIRenderFullScreen::RenderEx()
-{
- //! @todo
- //m_renderManager->RenderWindow(false, m_window.GetCoordsRes());
-}
-
-void CGUIRenderFullScreen::ClearBackground()
-{
- m_renderManager->ClearBackground();
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/GUIRenderTarget.h Deleted

@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2017 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
-
-namespace KODI
-{
-namespace RETRO
-{
- class CGameWindowFullScreen;
- class CGUIGameControl;
- class IRenderManager;
-
- // --- CGUIRenderTarget ------------------------------------------------------
-
- class CGUIRenderTarget
- {
- public:
- CGUIRenderTarget(IRenderManager *renderManager);
-
- virtual ~CGUIRenderTarget() = default;
-
- virtual void Render() = 0;
-
- virtual void RenderEx() = 0;
-
- virtual void ClearBackground() { } //! @todo
-
- virtual bool IsDirty() { return true; } //! @todo
-
- protected:
- // Construction parameters
- IRenderManager *const m_renderManager;
- };
-
- // --- CGUIRenderControl -----------------------------------------------------
-
- class CGUIRenderControl : public CGUIRenderTarget
- {
- public:
- CGUIRenderControl(IRenderManager *renderManager, CGUIGameControl &gameControl);
- ~CGUIRenderControl() override = default;
-
- // implementation of CGUIRenderTarget
- void Render() override;
- void RenderEx() override;
-
- private:
- // Construction parameters
- CGUIGameControl &m_gameControl;
- };
-
- // --- CGUIRenderFullScreen --------------------------------------------------
-
- class CGUIRenderFullScreen : public CGUIRenderTarget
- {
- public:
- CGUIRenderFullScreen(IRenderManager *renderManager, CGameWindowFullScreen &window);
- ~CGUIRenderFullScreen() override = default;
-
- // implementation of CGUIRenderTarget
- void Render() override;
- void RenderEx() override;
- void ClearBackground() override;
-
- private:
- // Construction parameters
- CGameWindowFullScreen &m_window;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/IGUIRenderSettings.h Deleted

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 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 "RenderSettings.h"
-
-namespace KODI
-{
-namespace RETRO
-{
- /*!
- * \brief Interface to pass render settings from the GUI to the renderer
- */
- class IGUIRenderSettings
- {
- public:
- virtual ~IGUIRenderSettings() = default;
-
- /*!
- * \brief Returns true if this render target has a scaling method set
- */
- virtual bool HasScalingMethod() const { return true; }
-
- /*!
- * \brief Returns true if this render target has a view mode set
- */
- virtual bool HasViewMode() const { return true; }
-
- /*!
- * \brief Get the settings used to render this target
- *
- * \return The render settings
- */
- virtual CRenderSettings GetSettings() const = 0;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/IRenderManager.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RPRenderManager.cpp Changed

@@ -19,11 +19,12 @@
 */
 
 #include "RPRenderManager.h"
-#include "GUIGameSettings.h"
-#include "GUIRenderTargetFactory.h"
-#include "IGUIRenderSettings.h"
 #include "RenderContext.h"
 #include "RenderSettings.h"
+#include "RenderTranslator.h"
+#include "cores/RetroPlayer/guibridge/GUIGameSettings.h"
+#include "cores/RetroPlayer/guibridge/GUIRenderTargetFactory.h"
+#include "cores/RetroPlayer/guibridge/IGUIRenderSettings.h"
 #include "cores/RetroPlayer/process/IRenderBuffer.h"
 #include "cores/RetroPlayer/process/IRenderBufferPool.h"
 #include "cores/RetroPlayer/process/RenderBufferManager.h"
@@ -54,10 +55,13 @@
 
 void CRPRenderManager::Initialize()
 {
+ CLog::Log(LOGDEBUG, "RetroPlayer[RENDER]: Initializing render manager");
 }
 
 void CRPRenderManager::Deinitialize()
 {
+ CLog::Log(LOGDEBUG, "RetroPlayer[RENDER]: Deinitializing render manager");
+
 for (auto &pixelScaler : m_scalers)
 {
 if (pixelScaler.second != nullptr)
@@ -81,6 +85,12 @@
 m_height = height;
 m_orientation = orientation;
 
+ CLog::Log(LOGINFO, "RetroPlayer[RENDER]: Configuring format %s, %ux%u, %u deg",
+ CRenderTranslator::TranslatePixelFormat(format),
+ width,
+ height,
+ orientation);
+
 CSingleLock lock(m_stateMutex);
 
 m_state = RENDER_STATE::CONFIGURING;
@@ -158,6 +168,8 @@
 {
 MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_SWITCHTOFULLSCREEN);
 m_state = RENDER_STATE::CONFIGURED;
+
+ CLog::Log(LOGINFO, "RetroPlayer[RENDER]: Renderer configured on first frame");
 }
 
 if (m_state == RENDER_STATE::CONFIGURED)
@@ -358,6 +370,9 @@
 // If buffer pool has no compatible renderers, create one now
 if (!renderer)
 {
+ CLog::Log(LOGERROR, "RetroPlayer[RENDER]: Creating renderer for %s",
+ m_processInfo.GetRenderSystemName(bufferPool).c_str());
+
 renderer.reset(m_processInfo.CreateRenderer(bufferPool, renderSettings));
 if (renderer && renderer->Configure(m_format, m_width, m_height, m_orientation))
 {
@@ -421,6 +436,8 @@
 std::vector<uint8_t> cachedFrame = std::move(m_cachedFrame);
 if (!cachedFrame.empty())
 {
+ CLog::Log(LOGERROR, "RetroPlayer[RENDER]: Creating render buffer for renderer");
+
 IRenderBuffer *renderBuffer = bufferPool->GetBuffer(cachedFrame.size());
 if (renderBuffer != nullptr)
 {
@@ -432,6 +449,10 @@
 }
 m_cachedFrame = std::move(cachedFrame);
 }
+ else
+ {
+ CLog::Log(LOGERROR, "RetroPlayer[RENDER]: Failed to create render buffer, no cached frame");
+ }
 }
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RPRenderManager.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RenderContext.cpp Changed

@@ -70,16 +70,39 @@
 m_rendering->ApplyStateBlock();
 }
 
-void CRenderContext::EnableGUIShader()
+bool CRenderContext::IsExtSupported(const char* extension)
+{
+ return m_rendering->IsExtSupported(extension);
+}
+
+#if defined(HAS_GL) || defined(HAS_GLES)
+namespace
+{
+static ESHADERMETHOD TranslateShaderMethod(GL_SHADER_METHOD method)
+{
+ switch (method)
+ {
+ case GL_SHADER_METHOD::DEFAULT: return SM_DEFAULT;
+ case GL_SHADER_METHOD::TEXTURE: return SM_TEXTURE;
+ default:
+ break;
+ }
+
+ return SM_DEFAULT;
+}
+}
+#endif
+
+void CRenderContext::EnableGUIShader(GL_SHADER_METHOD method)
 {
 #if defined(HAS_GL)
 CRenderSystemGL *rendering = dynamic_cast<CRenderSystemGL*>(m_rendering);
 if (rendering != nullptr)
- rendering->EnableShader(SM_TEXTURE);
+ rendering->EnableShader(TranslateShaderMethod(method));
 #elif HAS_GLES >= 2
 CRenderSystemGLES *renderingGLES = dynamic_cast<CRenderSystemGLES*>(m_rendering);
 if (renderingGLES != nullptr)
- renderingGLES->EnableGUIShader(SM_TEXTURE);
+ renderingGLES->EnableGUIShader(TranslateShaderMethod(method));
 #endif
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RenderContext.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RenderGeometry.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RenderTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/RenderTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/MMALRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPBaseRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.cpp Changed

@@ -25,6 +25,8 @@
 
 #if defined(HAS_DX)
 #include "guilib/GUIShaderDX.h"
+#include <DirectXMath.h>
+using namespace DirectX;
 #endif
 
 using namespace KODI;
@@ -32,14 +34,19 @@
 
 #define BUFFER_OFFSET(i) (static_cast<char*>(NULL) + (i))
 
-// --- CRendererFactoryGuiTexture ------------------------------------------------
+// --- CRendererFactoryGuiTexture ----------------------------------------------
+
+std::string CRendererFactoryGuiTexture::RenderSystemName() const
+{
+ return "GUITexture";
+}
 
 CRPBaseRenderer *CRendererFactoryGuiTexture::CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool)
 {
 return new CRPRendererGuiTexture(settings, context, std::move(bufferPool));
 }
 
-RenderBufferPoolVector CRendererFactoryGuiTexture::CreateBufferPools()
+RenderBufferPoolVector CRendererFactoryGuiTexture::CreateBufferPools(CRenderContext &context)
 {
 return {
 #if !defined(HAS_DX)
@@ -143,7 +150,7 @@
 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 glEnable(GL_BLEND);
 
- m_context.EnableGUIShader();
+ m_context.EnableGUIShader(GL_SHADER_METHOD::TEXTURE);
 
 GLubyte colour[4];
 GLubyte idx[4] = {0, 1, 3, 2}; // Determines order of the vertices
@@ -234,7 +241,7 @@
 glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
 glEnable(GL_BLEND); // Turn blending On
 
- m_context.EnableGUIShader();
+ m_context.EnableGUIShader(GL_SHADER_METHOD::TEXTURE);
 
 GLubyte col[4];
 GLfloat ver[4][3];

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererMMAL.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererMMAL.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGL.cpp Changed

@@ -27,212 +27,117 @@
 
 // --- CRendererFactoryOpenGL --------------------------------------------------
 
+std::string CRendererFactoryOpenGL::RenderSystemName() const
+{
+ return "OpenGL";
+}
+
 CRPBaseRenderer *CRendererFactoryOpenGL::CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool)
 {
 return new CRPRendererOpenGL(settings, context, std::move(bufferPool));
 }
 
-RenderBufferPoolVector CRendererFactoryOpenGL::CreateBufferPools()
+RenderBufferPoolVector CRendererFactoryOpenGL::CreateBufferPools(CRenderContext &context)
 {
- return { std::make_shared<CRenderBufferPoolOpenGL>() };
+ return { std::make_shared<CRenderBufferPoolOpenGL>(context) };
 }
 
 // --- CRenderBufferOpenGL -----------------------------------------------------
 
-CRenderBufferOpenGL::CRenderBufferOpenGL(AVPixelFormat format, AVPixelFormat targetFormat, unsigned int width, unsigned int height) :
- CRenderBufferOpenGLES(format, targetFormat, width, height)
+CRenderBufferOpenGL::CRenderBufferOpenGL(CRenderContext &context,
+ GLuint pixeltype,
+ GLuint internalformat,
+ GLuint pixelformat,
+ GLuint bpp,
+ unsigned int width,
+ unsigned int height) :
+ CRenderBufferOpenGLES(context,
+ pixeltype,
+ internalformat,
+ pixelformat,
+ bpp,
+ width,
+ height)
 {
 }
 
-void CRenderBufferOpenGL::CreateTexture()
-{
- glEnable(m_textureTarget);
-
- glGenTextures(1, &m_textureId);
-
- glBindTexture(m_textureTarget, m_textureId);
-
- glTexImage2D(m_textureTarget, 0, GL_RGBA, m_width, m_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL);
-
- glTexParameteri(m_textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- glTexParameteri(m_textureTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- glDisable(m_textureTarget);
-}
-
 bool CRenderBufferOpenGL::UploadTexture()
 {
- if (m_textureBuffer.empty())
- {
- CLog::Log(LOGERROR, "Renderer: Unknown target texture size");
- return false;
- }
-
- if (m_targetFormat == AV_PIX_FMT_NONE)
- {
- CLog::Log(LOGERROR, "Renderer: Invalid target pixel format");
- return false;
- }
-
- if (!CreateScalingContext())
- return false;
-
 if (!glIsTexture(m_textureId))
 CreateTexture();
 
- ScalePixels(m_data.data(), m_data.size(), m_textureBuffer.data(), m_textureBuffer.size());
-
- glEnable(m_textureTarget);
-
- const unsigned int bpp = 1;
- glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
-
- const unsigned datatype = GL_UNSIGNED_BYTE;
-
- glPixelStorei(GL_UNPACK_ROW_LENGTH, m_width);
-
 glBindTexture(m_textureTarget, m_textureId);
- glTexSubImage2D(m_textureTarget, 0, 0, 0, m_width, m_height, GL_BGRA, datatype, m_textureBuffer.data());
 
- glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+ const int stride = GetFrameSize() / m_height;
 
- glBindTexture(m_textureTarget, 0);
+ glPixelStorei(GL_UNPACK_ALIGNMENT, m_bpp);
 
- glDisable(m_textureTarget);
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, stride / m_bpp);
+ glTexSubImage2D(m_textureTarget, 0, 0, 0, m_width, m_height, m_pixelformat, m_pixeltype, m_data.data());
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
 
 return true;
 }
 
 // --- CRenderBufferPoolOpenGL -------------------------------------------------
 
-IRenderBuffer *CRenderBufferPoolOpenGL::CreateRenderBuffer(void *header /* = nullptr */)
+CRenderBufferPoolOpenGL::CRenderBufferPoolOpenGL(CRenderContext &context)
+ : CRenderBufferPoolOpenGLES(context)
 {
- return new CRenderBufferOpenGL(m_format, m_targetFormat, m_width, m_height);
 }
 
-// --- CRPRendererOpenGL -------------------------------------------------------
-
-CRPRendererOpenGL::CRPRendererOpenGL(const CRenderSettings &renderSettings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool) :
- CRPRendererOpenGLES(renderSettings, context, std::move(bufferPool))
+IRenderBuffer *CRenderBufferPoolOpenGL::CreateRenderBuffer(void *header /* = nullptr */)
 {
- // Initialize CRPRendererOpenGLES
- m_clearColour = m_context.UseLimitedColor() ? (16.0f / 0xff) : 0.0f;
+ return new CRenderBufferOpenGL(m_context,
+ m_pixeltype,
+ m_internalformat,
+ m_pixelformat,
+ m_bpp,
+ m_width,
+ m_height);
 }
 
-void CRPRendererOpenGL::RenderInternal(bool clear, uint8_t alpha)
+bool CRenderBufferPoolOpenGL::ConfigureInternal()
 {
- if (clear)
+ // Configure CRenderBufferPoolOpenGLES
+ switch (m_format)
 {
- if (alpha == 255)
- DrawBlackBars();
- else
- ClearBackBuffer();
- }
-
- if (alpha < 255)
+ case AV_PIX_FMT_0RGB32:
 {
- glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glColor4f(1.0f, 1.0f, 1.0f, alpha / 250.f);
+ m_pixeltype = GL_UNSIGNED_BYTE;
+ m_internalformat = GL_RGBA;
+ m_pixelformat = GL_BGRA;
+ m_bpp = sizeof(uint32_t);
+ return true;
 }
- else
+ case AV_PIX_FMT_RGB555:
 {
- glDisable(GL_BLEND);
- glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+ m_pixeltype = GL_UNSIGNED_SHORT_5_5_5_1;
+ m_internalformat = GL_RGB;
+ m_pixelformat = GL_RGB;
+ m_bpp = sizeof(uint16_t);
+ return true;
 }
-
- Render();
-
- glEnable(GL_BLEND);
- glFlush();
-}
-
-void CRPRendererOpenGL::Render()
-{
- if (m_renderBuffer == nullptr)
- return;
-
- CRenderBufferOpenGL *renderBuffer = static_cast<CRenderBufferOpenGL*>(m_renderBuffer);
-
- glEnable(m_textureTarget);
-
- glActiveTextureARB(GL_TEXTURE0);
-
- glBindTexture(m_textureTarget, renderBuffer->TextureID());
-
- // Try some clamping or wrapping
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- GLint filter = (m_renderSettings.VideoSettings().GetScalingMethod() == VS_SCALINGMETHOD_NEAREST ? GL_NEAREST : GL_LINEAR);
- glTexParameteri(m_textureTarget, GL_TEXTURE_MAG_FILTER, filter);
- glTexParameteri(m_textureTarget, GL_TEXTURE_MIN_FILTER, filter);
-
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
- glBegin(GL_QUADS);
-
- CRect rect = m_sourceRect;
-
- rect.x1 /= m_sourceWidth;
- rect.x2 /= m_sourceWidth;
- rect.y1 /= m_sourceHeight;
- rect.y2 /= m_sourceHeight;
-
- glTexCoord2f(rect.x1, rect.y1); glVertex2f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y);
- glTexCoord2f(rect.x2, rect.y1); glVertex2f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y);
- glTexCoord2f(rect.x2, rect.y2); glVertex2f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y);
- glTexCoord2f(rect.x1, rect.y2); glVertex2f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y);
-
- glEnd();
-
- glBindTexture(m_textureTarget, 0);
- glDisable(m_textureTarget);
-}
-
-void CRPRendererOpenGL::DrawBlackBars()
-{
- glColor4f(m_clearColour, m_clearColour, m_clearColour, 1.0f);
- glDisable(GL_BLEND);
- glBegin(GL_QUADS);
-
- //top quad
- if (m_rotatedDestCoords[0].y > 0.0)
+ case AV_PIX_FMT_RGB565:
 {
- glVertex4f(0.0, 0.0, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), 0.0, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), m_rotatedDestCoords[0].y, 0.0, 1.0);
- glVertex4f(0.0, m_rotatedDestCoords[0].y, 0.0, 1.0);
+ m_pixeltype = GL_UNSIGNED_SHORT_5_6_5;
+ m_internalformat = GL_RGB;
+ m_pixelformat = GL_RGB;
+ m_bpp = sizeof(uint16_t);
+ return true;
 }
-
- //bottom quad
- if (m_rotatedDestCoords[2].y < m_context.GetScreenHeight())
- {
- glVertex4f(0.0, m_rotatedDestCoords[2].y, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), m_rotatedDestCoords[2].y, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), m_context.GetScreenHeight(), 0.0, 1.0);
- glVertex4f(0.0, m_context.GetScreenHeight(), 0.0, 1.0);
+ default:
+ break;
 }
 
- //left quad
- if (m_rotatedDestCoords[0].x > 0.0)
- {
- glVertex4f(0.0, m_rotatedDestCoords[0].y, 0.0, 1.0);
- glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y, 0.0, 1.0);
- glVertex4f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[2].y, 0.0, 1.0);
- glVertex4f(0.0, m_rotatedDestCoords[2].y, 0.0, 1.0);
- }
+ return false;
+}
 
- //right quad
- if (m_rotatedDestCoords[2].x < m_context.GetScreenWidth())
- {
- glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[0].y, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), m_rotatedDestCoords[0].y, 0.0, 1.0);
- glVertex4f(m_context.GetScreenWidth(), m_rotatedDestCoords[2].y, 0.0, 1.0);
- glVertex4f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y, 0.0, 1.0);
- }
+// --- CRPRendererOpenGL -------------------------------------------------------
 
- glEnd();
+CRPRendererOpenGL::CRPRendererOpenGL(const CRenderSettings &renderSettings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool) :
+ CRPRendererOpenGLES(renderSettings, context, std::move(bufferPool))
+{
+ // Initialize CRPRendererOpenGLES
+ m_clearColour = m_context.UseLimitedColor() ? (16.0f / 0xff) : 0.0f;
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGL.h Changed

@@ -36,31 +36,37 @@
 virtual ~CRendererFactoryOpenGL() = default;
 
 // implementation of IRendererFactory
+ std::string RenderSystemName() const override;
 CRPBaseRenderer *CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool) override;
- RenderBufferPoolVector CreateBufferPools() override;
+ RenderBufferPoolVector CreateBufferPools(CRenderContext &context) override;
 };
 
 class CRenderBufferOpenGL : public CRenderBufferOpenGLES
 {
 public:
- CRenderBufferOpenGL(AVPixelFormat format, AVPixelFormat targetFormat, unsigned int width, unsigned int height);
+ CRenderBufferOpenGL(CRenderContext &context,
+ GLuint pixeltype,
+ GLuint internalformat,
+ GLuint pixelformat,
+ GLuint bpp,
+ unsigned int width,
+ unsigned int height);
 ~CRenderBufferOpenGL() override = default;
 
 // implementation of IRenderBuffer via CRenderBufferOpenGLES
 bool UploadTexture() override;
-
- private:
- void CreateTexture();
 };
 
 class CRenderBufferPoolOpenGL : public CRenderBufferPoolOpenGLES
 {
 public:
- CRenderBufferPoolOpenGL() = default;
+ CRenderBufferPoolOpenGL(CRenderContext &context);
 ~CRenderBufferPoolOpenGL() override = default;
 
+ protected:
 // implementation of CBaseRenderBufferPool via CRenderBufferPoolOpenGLES
 IRenderBuffer *CreateRenderBuffer(void *header = nullptr) override;
+ bool ConfigureInternal() override;
 };
 
 class CRPRendererOpenGL : public CRPRendererOpenGLES
@@ -68,15 +74,6 @@
 public:
 CRPRendererOpenGL(const CRenderSettings &renderSettings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool);
 ~CRPRendererOpenGL() override = default;
-
- protected:
- // implementation of CRPBaseRenderer via CRPRendererOpenGLES
- void RenderInternal(bool clear, uint8_t alpha) override;
-
- private:
- void Render();
-
- void DrawBlackBars();
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.cpp Changed

@@ -24,94 +24,106 @@
 #include "utils/GLUtils.h"
 #include "utils/log.h"
 
-extern "C" {
-#include "libswscale/swscale.h"
-}
-
 #include <cstring>
+#include <stddef.h>
+
+#define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 using namespace KODI;
 using namespace RETRO;
 
 // --- CRendererFactoryOpenGLES ------------------------------------------------
 
+std::string CRendererFactoryOpenGLES::RenderSystemName() const
+{
+ return "OpenGLES";
+}
+
 CRPBaseRenderer *CRendererFactoryOpenGLES::CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool)
 {
 return new CRPRendererOpenGLES(settings, context, std::move(bufferPool));
 }
 
-RenderBufferPoolVector CRendererFactoryOpenGLES::CreateBufferPools()
+RenderBufferPoolVector CRendererFactoryOpenGLES::CreateBufferPools(CRenderContext &context)
 {
- return { std::make_shared<CRenderBufferPoolOpenGLES>() };
+ return { std::make_shared<CRenderBufferPoolOpenGLES>(context) };
 }
 
 // --- CRenderBufferOpenGLES ---------------------------------------------------
 
-CRenderBufferOpenGLES::CRenderBufferOpenGLES(AVPixelFormat format, AVPixelFormat targetFormat, unsigned int width, unsigned int height) :
- m_format(format),
- m_targetFormat(targetFormat),
+CRenderBufferOpenGLES::CRenderBufferOpenGLES(CRenderContext &context,
+ GLuint pixeltype,
+ GLuint internalformat,
+ GLuint pixelformat,
+ GLuint bpp,
+ unsigned int width,
+ unsigned int height) :
+ m_context(context),
+ m_pixeltype(pixeltype),
+ m_internalformat(internalformat),
+ m_pixelformat(pixelformat),
+ m_bpp(bpp),
 m_width(width),
 m_height(height)
 {
- size_t targetSize = m_width * m_height * glFormatElementByteCount(GL_RGBA); //! @todo: Get GLenum format from renderer
- m_textureBuffer.resize(targetSize);
 }
 
 CRenderBufferOpenGLES::~CRenderBufferOpenGLES()
 {
 DeleteTexture();
-
- if (m_swsContext != nullptr)
- sws_freeContext(m_swsContext);
 }
 
 void CRenderBufferOpenGLES::CreateTexture()
 {
- glEnable(m_textureTarget);
-
 glGenTextures(1, &m_textureId);
 
 glBindTexture(m_textureTarget, m_textureId);
 
- glTexImage2D(m_textureTarget, 0, GL_LUMINANCE, m_width, m_height, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
+ glTexImage2D(m_textureTarget, 0, m_internalformat, m_width, m_height, 0, m_pixelformat, m_pixeltype, NULL);
 
 glTexParameteri(m_textureTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 glTexParameteri(m_textureTarget, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
- glDisable(m_textureTarget);
 }
 
 bool CRenderBufferOpenGLES::UploadTexture()
 {
- if (m_textureBuffer.empty())
- {
- CLog::Log(LOGERROR, "Renderer: Unknown target texture size");
- return false;
- }
-
- if (!CreateScalingContext())
- return false;
-
 if (!glIsTexture(m_textureId))
 CreateTexture();
 
- ScalePixels(m_data.data(), m_data.size(), m_textureBuffer.data(), m_textureBuffer.size());
-
- glEnable(m_textureTarget);
-
- const unsigned int bpp = 1;
- glPixelStorei(GL_UNPACK_ALIGNMENT, bpp);
-
- const unsigned datatype = GL_UNSIGNED_BYTE;
-
 glBindTexture(m_textureTarget, m_textureId);
- glTexSubImage2D(m_textureTarget, 0, 0, 0, m_width, m_height, GL_LUMINANCE, datatype, m_textureBuffer.data());
 
- glBindTexture(m_textureTarget, 0);
+ const int stride = GetFrameSize() / m_height;
+
+ glPixelStorei(GL_UNPACK_ALIGNMENT, m_bpp);
 
- glDisable(m_textureTarget);
+ if (m_bpp == 4 && m_pixelformat == GL_RGBA)
+ {
+ // XOR Swap RGBA -> BGRA
+ // GLES 2.0 doesn't support strided textures (unless GL_UNPACK_ROW_LENGTH_EXT is supported)
+ uint8_t* pixels = const_cast<uint8_t*>(m_data.data());
+ for (unsigned int y = 0; y < m_height; ++y, pixels += stride)
+ {
+ for (int x = 0; x < stride; x += 4)
+ std::swap(pixels[x], pixels[x + 2]);
+ glTexSubImage2D(m_textureTarget, 0, 0, y, m_width, 1, m_pixelformat, m_pixeltype, pixels);
+ }
+ }
+#ifdef GL_UNPACK_ROW_LENGTH_EXT
+ else if (m_context.IsExtSupported("GL_EXT_unpack_subimage"))
+ {
+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / m_bpp);
+ glTexSubImage2D(m_textureTarget, 0, 0, 0, m_width, m_height, m_pixelformat, m_pixeltype, m_data.data());
+ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
+ }
+#endif
+ else
+ {
+ uint8_t* pixels = const_cast<uint8_t*>(m_data.data());
+ for (unsigned int y = 0; y < m_height; ++y, pixels += stride)
+ glTexSubImage2D(m_textureTarget, 0, 0, y, m_width, 1, m_pixelformat, m_pixeltype, pixels);
+ }
 
 return true;
 }
@@ -124,35 +136,13 @@
 m_textureId = 0;
 }
 
-bool CRenderBufferOpenGLES::CreateScalingContext()
-{
- m_swsContext = sws_getContext(m_width, m_height, m_format, m_width, m_height, m_targetFormat,
- SWS_FAST_BILINEAR, NULL, NULL, NULL);
-
- if (m_swsContext == nullptr)
- {
- CLog::Log(LOGERROR, "Renderer: Failed to create swscale context");
- return false;
- }
-
- return true;
-}
+// --- CRenderBufferPoolOpenGLES -----------------------------------------------
 
-void CRenderBufferOpenGLES::ScalePixels(uint8_t *source, size_t sourceSize, uint8_t *target, size_t targetSize)
+CRenderBufferPoolOpenGLES::CRenderBufferPoolOpenGLES(CRenderContext &context)
+ : m_context(context)
 {
- const int sourceStride = sourceSize / m_height;
- const int targetStride = targetSize / m_height;
-
- uint8_t* src[] = { source, nullptr, nullptr, nullptr };
- int srcStride[] = { sourceStride, 0, 0, 0 };
- uint8_t *dst[] = { target, nullptr, nullptr, nullptr };
- int dstStride[] = { targetStride, 0, 0, 0 };
-
- sws_scale(m_swsContext, src, srcStride, 0, m_height, dst, dstStride);
 }
 
-// --- CRenderBufferPoolOpenGLES -----------------------------------------------
-
 bool CRenderBufferPoolOpenGLES::IsCompatible(const CRenderVideoSettings &renderSettings) const
 {
 if (!CRPRendererOpenGLES::SupportsScalingMethod(renderSettings.GetScalingMethod()))
@@ -163,17 +153,64 @@
 
 IRenderBuffer *CRenderBufferPoolOpenGLES::CreateRenderBuffer(void *header /* = nullptr */)
 {
- return new CRenderBufferOpenGLES(m_format, m_targetFormat, m_width, m_height);
+ return new CRenderBufferOpenGLES(m_context,
+ m_pixeltype,
+ m_internalformat,
+ m_pixelformat,
+ m_bpp,
+ m_width,
+ m_height);
 }
 
-bool CRenderBufferPoolOpenGLES::SetTargetFormat(AVPixelFormat targetFormat)
+bool CRenderBufferPoolOpenGLES::ConfigureInternal()
 {
- if (m_targetFormat != AV_PIX_FMT_NONE)
- return false; // Already configured
-
- m_targetFormat = targetFormat;
+ switch (m_format)
+ {
+ case AV_PIX_FMT_0RGB32:
+ {
+ m_pixeltype = GL_UNSIGNED_BYTE;
+ if (m_context.IsExtSupported("GL_EXT_texture_format_BGRA8888") ||
+ m_context.IsExtSupported("GL_IMG_texture_format_BGRA8888"))
+ {
+ m_internalformat = GL_BGRA_EXT;
+ m_pixelformat = GL_BGRA_EXT;
+ }
+ else if (m_context.IsExtSupported("GL_APPLE_texture_format_BGRA8888"))
+ {
+ // Apple's implementation does not conform to spec. Instead, they require
+ // differing format/internalformat, more like GL.
+ m_internalformat = GL_RGBA;
+ m_pixelformat = GL_BGRA_EXT;
+ }
+ else
+ {
+ m_internalformat = GL_RGBA;
+ m_pixelformat = GL_RGBA;
+ }
+ m_bpp = sizeof(uint32_t);
+ return true;
+ }
+ case AV_PIX_FMT_RGB555:
+ {
+ m_pixeltype = GL_UNSIGNED_SHORT_5_5_5_1;
+ m_internalformat = GL_RGB;
+ m_pixelformat = GL_RGB;
+ m_bpp = sizeof(uint16_t);
+ return true;
+ }
+ case AV_PIX_FMT_RGB565:
+ {
+ m_pixeltype = GL_UNSIGNED_SHORT_5_6_5;
+ m_internalformat = GL_RGB;
+ m_pixelformat = GL_RGB;
+ m_bpp = sizeof(uint16_t);
+ return true;
+ }
+ default:
+ break;
+ }
 
- return true;
+ return false;
 }
 
 // --- CRPRendererOpenGLES -----------------------------------------------------
@@ -186,27 +223,19 @@
 CRPRendererOpenGLES::~CRPRendererOpenGLES()
 {
 Deinitialize();
- if (m_swsContext)
- sws_freeContext(m_swsContext);
-}
-
-bool CRPRendererOpenGLES::ConfigureInternal()
-{
- AVPixelFormat targetFormat = AV_PIX_FMT_BGRA; //! @todo
-
- static_cast<CRenderBufferPoolOpenGLES*>(m_bufferPool.get())->SetTargetFormat(targetFormat);
-
- return true;
 }
 
 void CRPRendererOpenGLES::RenderInternal(bool clear, uint8_t alpha)
 {
 if (clear)
 {
- ClearBackBuffer();
+ if (alpha == 255)
+ DrawBlackBars();
+ else
+ ClearBackBuffer();
 }
 
- if (alpha < 0xFF)
+ if (alpha < 255)
 {
 glEnable(GL_BLEND);
 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -219,6 +248,7 @@
 Render(alpha);
 
 glEnable(GL_BLEND);
+ glFlush();
 }
 
 void CRPRendererOpenGLES::FlushInternal()
@@ -261,33 +291,133 @@
 glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 }
 
-void CRPRendererOpenGLES::Render(uint8_t alpha)
+void CRPRendererOpenGLES::DrawBlackBars()
 {
- if (m_renderBuffer == nullptr)
- return;
+ glDisable(GL_BLEND);
 
- CRenderBufferOpenGLES *renderBuffer = static_cast<CRenderBufferOpenGLES*>(m_renderBuffer);
+ struct Svertex
+ {
+ float x;
+ float y;
+ float z;
+ };
+ Svertex vertices[24];
+ GLubyte count = 0;
 
- glDisable(GL_DEPTH_TEST);
+ m_context.EnableGUIShader(GL_SHADER_METHOD::DEFAULT);
+ GLint posLoc = m_context.GUIShaderGetPos();
+ GLint uniCol = m_context.GUIShaderGetUniCol();
 
- // Render texture
- glActiveTexture(GL_TEXTURE0);
- glEnable(m_textureTarget);
- glBindTexture(m_textureTarget, renderBuffer->TextureID());
+ glUniform4f(uniCol, m_clearColour / 255.0f, m_clearColour / 255.0f, m_clearColour / 255.0f, 1.0f);
 
- // Try some clamping or wrapping
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ //top quad
+ if (m_rotatedDestCoords[0].y > 0.0)
+ {
+ GLubyte quad = count;
+ vertices[quad].x = 0.0;
+ vertices[quad].y = 0.0;
+ vertices[quad].z = 0;
+ vertices[quad+1].x = m_context.GetScreenWidth();
+ vertices[quad+1].y = 0;
+ vertices[quad+1].z = 0;
+ vertices[quad+2].x = m_context.GetScreenWidth();
+ vertices[quad+2].y = m_rotatedDestCoords[0].y;
+ vertices[quad+2].z = 0;
+ vertices[quad+3] = vertices[quad+2];
+ vertices[quad+4].x = 0;
+ vertices[quad+4].y = m_rotatedDestCoords[0].y;
+ vertices[quad+4].z = 0;
+ vertices[quad+5] = vertices[quad];
+ count += 6;
+ }
 
- GLint filter = (m_renderSettings.VideoSettings().GetScalingMethod() == VS_SCALINGMETHOD_NEAREST ? GL_NEAREST : GL_LINEAR);
- glTexParameteri(m_textureTarget, GL_TEXTURE_MAG_FILTER, filter);
- glTexParameteri(m_textureTarget, GL_TEXTURE_MIN_FILTER, filter);
+ //bottom quad
+ if (m_rotatedDestCoords[2].y < m_context.GetScreenHeight())
+ {
+ GLubyte quad = count;
+ vertices[quad].x = 0.0;
+ vertices[quad].y = m_rotatedDestCoords[2].y;
+ vertices[quad].z = 0;
+ vertices[quad+1].x = m_context.GetScreenWidth();
+ vertices[quad+1].y = m_rotatedDestCoords[2].y;
+ vertices[quad+1].z = 0;
+ vertices[quad+2].x = m_context.GetScreenWidth();
+ vertices[quad+2].y = m_context.GetScreenHeight();
+ vertices[quad+2].z = 0;
+ vertices[quad+3] = vertices[quad+2];
+ vertices[quad+4].x = 0;
+ vertices[quad+4].y = m_context.GetScreenHeight();
+ vertices[quad+4].z = 0;
+ vertices[quad+5] = vertices[quad];
+ count += 6;
+ }
+
+ //left quad
+ if (m_rotatedDestCoords[0].x > 0.0)
+ {
+ GLubyte quad = count;
+ vertices[quad].x = 0.0;
+ vertices[quad].y = m_rotatedDestCoords[0].y;
+ vertices[quad].z = 0;
+ vertices[quad+1].x = m_rotatedDestCoords[0].x;
+ vertices[quad+1].y = m_rotatedDestCoords[0].y;
+ vertices[quad+1].z = 0;
+ vertices[quad+2].x = m_rotatedDestCoords[3].x;
+ vertices[quad+2].y = m_rotatedDestCoords[3].y;
+ vertices[quad+2].z = 0;
+ vertices[quad+3] = vertices[quad+2];
+ vertices[quad+4].x = 0;
+ vertices[quad+4].y = m_rotatedDestCoords[3].y;
+ vertices[quad+4].z = 0;
+ vertices[quad+5] = vertices[quad];
+ count += 6;
+ }
+
+ //right quad
+ if (m_rotatedDestCoords[2].x < m_context.GetScreenWidth())
+ {
+ GLubyte quad = count;
+ vertices[quad].x = m_rotatedDestCoords[1].x;
+ vertices[quad].y = m_rotatedDestCoords[1].y;
+ vertices[quad].z = 0;
+ vertices[quad+1].x = m_context.GetScreenWidth();
+ vertices[quad+1].y = m_rotatedDestCoords[1].y;
+ vertices[quad+1].z = 0;
+ vertices[quad+2].x = m_context.GetScreenWidth();
+ vertices[quad+2].y = m_rotatedDestCoords[2].y;
+ vertices[quad+2].z = 0;
+ vertices[quad+3] = vertices[quad+2];
+ vertices[quad+4].x = m_rotatedDestCoords[1].x;
+ vertices[quad+4].y = m_rotatedDestCoords[2].y;
+ vertices[quad+4].z = 0;
+ vertices[quad+5] = vertices[quad];
+ count += 6;
+ }
+
+ GLuint vertexVBO;
+
+ glGenBuffers(1, &vertexVBO);
+ glBindBuffer(GL_ARRAY_BUFFER, vertexVBO);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(Svertex)*count, &vertices[0], GL_STATIC_DRAW);
+
+ glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, sizeof(Svertex), 0);
+ glEnableVertexAttribArray(posLoc);
+
+ glDrawArrays(GL_TRIANGLES, 0, count);
+
+ glDisableVertexAttribArray(posLoc);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ glDeleteBuffers(1, &vertexVBO);
 
- //! @todo Translate OpenGL code to GLES
- /*
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ m_context.DisableGUIShader();
+}
 
- glBegin(GL_QUADS);
+void CRPRendererOpenGLES::Render(uint8_t alpha)
+{
+ CRenderBufferOpenGLES *renderBuffer = static_cast<CRenderBufferOpenGLES*>(m_renderBuffer);
+
+ if (renderBuffer == nullptr)
+ return;
 
 CRect rect = m_sourceRect;
 
@@ -296,14 +426,78 @@
 rect.y1 /= m_sourceHeight;
 rect.y2 /= m_sourceHeight;
 
- glTexCoord2f(rect.x1, rect.y1); glVertex2f(m_rotatedDestCoords[0].x, m_rotatedDestCoords[0].y);
- glTexCoord2f(rect.x2, rect.y1); glVertex2f(m_rotatedDestCoords[1].x, m_rotatedDestCoords[1].y);
- glTexCoord2f(rect.x2, rect.y2); glVertex2f(m_rotatedDestCoords[2].x, m_rotatedDestCoords[2].y);
- glTexCoord2f(rect.x1, rect.y2); glVertex2f(m_rotatedDestCoords[3].x, m_rotatedDestCoords[3].y);
+ const uint32_t color = (alpha << 24) | 0xFFFFFF;
+
+ glBindTexture(m_textureTarget, renderBuffer->TextureID());
+
+ GLint filter = GL_NEAREST;
+ if (GetRenderSettings().VideoSettings().GetScalingMethod() == VS_SCALINGMETHOD_LINEAR)
+ filter = GL_LINEAR;
+ glTexParameteri(m_textureTarget, GL_TEXTURE_MAG_FILTER, filter);
+ glTexParameteri(m_textureTarget, GL_TEXTURE_MIN_FILTER, filter);
+ glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(m_textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+ m_context.EnableGUIShader(GL_SHADER_METHOD::TEXTURE);
+
+ GLubyte colour[4];
+ GLubyte idx[4] = {0, 1, 3, 2}; // Determines order of triangle strip
+ GLuint vertexVBO;
+ GLuint indexVBO;
+ struct PackedVertex
+ {
+ float x, y, z;
+ float u1, v1;
+ } vertex[4];
+
+ GLint vertLoc = m_context.GUIShaderGetPos();
+ GLint loc = m_context.GUIShaderGetCoord0();
+ GLint uniColLoc = m_context.GUIShaderGetUniCol();
+
+ // Setup color values
+ colour[0] = static_cast<GLubyte>(GET_R(color));
+ colour[1] = static_cast<GLubyte>(GET_G(color));
+ colour[2] = static_cast<GLubyte>(GET_B(color));
+ colour[3] = static_cast<GLubyte>(GET_A(color));
+
+ for (unsigned int i = 0; i < 4; i++)
+ {
+ // Setup vertex position values
+ vertex[i].x = m_rotatedDestCoords[i].x;
+ vertex[i].y = m_rotatedDestCoords[i].y;
+ vertex[i].z = 0.0f;
+ }
+
+ // Setup texture coordinates
+ vertex[0].u1 = vertex[3].u1 = rect.x1;
+ vertex[0].v1 = vertex[1].v1 = rect.y1;
+ vertex[1].u1 = vertex[2].u1 = rect.x2;
+ vertex[2].v1 = vertex[3].v1 = rect.y2;
+
+ glGenBuffers(1, &vertexVBO);
+ glBindBuffer(GL_ARRAY_BUFFER, vertexVBO);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(PackedVertex)*4, &vertex[0], GL_STATIC_DRAW);
+
+ glVertexAttribPointer(vertLoc, 3, GL_FLOAT, 0, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, x)));
+ glVertexAttribPointer(loc, 2, GL_FLOAT, 0, sizeof(PackedVertex), BUFFER_OFFSET(offsetof(PackedVertex, u1)));
+
+ glEnableVertexAttribArray(vertLoc);
+ glEnableVertexAttribArray(loc);
+
+ glGenBuffers(1, &indexVBO);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexVBO);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLubyte)*4, idx, GL_STATIC_DRAW);
+
+ glUniform4f(uniColLoc,(colour[0] / 255.0f), (colour[1] / 255.0f), (colour[2] / 255.0f), (colour[3] / 255.0f));
+ glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_BYTE, 0);
+
+ glDisableVertexAttribArray(vertLoc);
+ glDisableVertexAttribArray(loc);
 
- glEnd();
- */
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+ glDeleteBuffers(1, &vertexVBO);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+ glDeleteBuffers(1, &indexVBO);
 
- glBindTexture (m_textureTarget, 0);
- glDisable(m_textureTarget);
+ m_context.DisableGUIShader();
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h Changed

@@ -30,8 +30,6 @@
 #include <stdint.h>
 #include <vector>
 
-struct SwsContext;
-
 namespace KODI
 {
 namespace RETRO
@@ -42,14 +40,21 @@
 virtual ~CRendererFactoryOpenGLES() = default;
 
 // implementation of IRendererFactory
+ std::string RenderSystemName() const override;
 CRPBaseRenderer *CreateRenderer(const CRenderSettings &settings, CRenderContext &context, std::shared_ptr<IRenderBufferPool> bufferPool) override;
- RenderBufferPoolVector CreateBufferPools() override;
+ RenderBufferPoolVector CreateBufferPools(CRenderContext &context) override;
 };
 
 class CRenderBufferOpenGLES : public CRenderBufferSysMem
 {
 public:
- CRenderBufferOpenGLES(AVPixelFormat format, AVPixelFormat targetFormat, unsigned int width, unsigned int height);
+ CRenderBufferOpenGLES(CRenderContext &context,
+ GLuint pixeltype,
+ GLuint internalformat,
+ GLuint pixelformat,
+ GLuint bpp,
+ unsigned int width,
+ unsigned int height);
 ~CRenderBufferOpenGLES() override;
 
 // implementation of IRenderBuffer via CRenderBufferSysMem
@@ -58,43 +63,46 @@
 GLuint TextureID() const { return m_textureId; }
 
 protected:
- bool CreateScalingContext();
- void ScalePixels(uint8_t *source, size_t sourceSize, uint8_t *target, size_t targetSize);
-
 // Construction parameters
- const AVPixelFormat m_format;
- const AVPixelFormat m_targetFormat;
+ CRenderContext &m_context;
+ const GLuint m_pixeltype;
+ const GLuint m_internalformat;
+ const GLuint m_pixelformat;
+ const GLuint m_bpp;
 const unsigned int m_width;
 const unsigned int m_height;
 
 const GLenum m_textureTarget = GL_TEXTURE_2D; //! @todo
 GLuint m_textureId = 0;
- std::vector<uint8_t> m_textureBuffer;
 
- private:
 void CreateTexture();
- void DeleteTexture();
 
- SwsContext *m_swsContext = nullptr;
+ private:
+ void DeleteTexture();
 };
 
 class CRenderBufferPoolOpenGLES : public CBaseRenderBufferPool
 {
 public:
- CRenderBufferPoolOpenGLES() = default;
+ CRenderBufferPoolOpenGLES(CRenderContext &context);
 ~CRenderBufferPoolOpenGLES() override = default;
 
- // implementation of IRenderBufferPool via CRenderBufferPoolSysMem
+ // implementation of IRenderBufferPool via CBaseRenderBufferPool
 bool IsCompatible(const CRenderVideoSettings &renderSettings) const override;
 
- // implementation of CBaseRenderBufferPool via CRenderBufferPoolSysMem
+ protected:
+ // implementation of CBaseRenderBufferPool
 IRenderBuffer *CreateRenderBuffer(void *header = nullptr) override;
+ bool ConfigureInternal() override;
 
- // GLES interface
- bool SetTargetFormat(AVPixelFormat targetFormat);
+ // Construction parameters
+ CRenderContext &m_context;
 
- protected:
- AVPixelFormat m_targetFormat = AV_PIX_FMT_NONE; //! @todo Change type to GLenum
+ // Configuration parameters
+ GLuint m_pixeltype = 0;
+ GLuint m_internalformat = 0;
+ GLuint m_pixelformat = 0;
+ GLuint m_bpp = 0;
 };
 
 class CRPRendererOpenGLES : public CRPBaseRenderer
@@ -111,7 +119,6 @@
 
 protected:
 // implementation of CRPBaseRenderer
- bool ConfigureInternal() override;
 void RenderInternal(bool clear, uint8_t alpha) override;
 void FlushInternal() override;
 
@@ -130,10 +137,8 @@
 
 void Render(uint8_t alpha);
 
- AVPixelFormat m_targetFormat = AV_PIX_FMT_NONE;
 GLenum m_textureTarget = GL_TEXTURE_2D;
 float m_clearColour = 0.0f;
- SwsContext *m_swsContext = nullptr;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPWinRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoRenderers/RPWinRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/rendering/VideoShaders/windows/RPWinOutputShader.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/windows Deleted

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/windows/CMakeLists.txt Deleted

_service:download_files:master.tar.gz/xbmc/cores/RetroPlayer/windows/GameWindowFullScreen.cpp Deleted

@@ -1,224 +0,0 @@
-/*
- * Copyright (C) 2017 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 "GameWindowFullScreen.h"
-#include "GameWindowFullScreenText.h"
-#include "cores/RetroPlayer/rendering/GUIGameRenderManager.h"
-#include "cores/RetroPlayer/rendering/GUIRenderHandle.h"
-#include "guilib/GraphicContext.h" //! @todo Remove me
-#include "guilib/GUIDialog.h"
-#include "guilib/GUIControl.h"
-#include "guilib/GUIWindowManager.h" //! @todo Remove me
-#include "guilib/WindowIDs.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
-#include "GUIInfoManager.h" //! @todo Remove me
-#include "ServiceBroker.h"
-
-using namespace KODI;
-using namespace RETRO;
-
-CGameWindowFullScreen::CGameWindowFullScreen(void) :
- CGUIWindow(WINDOW_FULLSCREEN_GAME, "VideoFullScreen.xml"),
- m_fullscreenText(new CGameWindowFullScreenText(*this))
-{
- // initialize CGUIControl
- m_controlStats = new GUICONTROLSTATS;
-
- // initialize CGUIWindow
- m_loadType = KEEP_IN_MEMORY;
-
- RegisterWindow();
-}
-
-CGameWindowFullScreen::~CGameWindowFullScreen()
-{
- UnregisterWindow();
-
- delete m_controlStats;
-}
-
-void CGameWindowFullScreen::Process(unsigned int currentTime, CDirtyRegionList &dirtyregion)
-{
- if (m_renderHandle->IsDirty())
- MarkDirtyRegion();
-
- m_controlStats->Reset();
-
- CGUIWindow::Process(currentTime, dirtyregion);
-
- //! @todo This isn't quite optimal - ideally we'd only be dirtying up the actual video render rect
- //! which is probably the job of the renderer as it can more easily track resizing etc.
- m_renderRegion.SetRect(0, 0, static_cast<float>(g_graphicsContext.GetWidth()), static_cast<float>(g_graphicsContext.GetHeight()));
-}
-
-void CGameWindowFullScreen::Render()
-{
- m_renderHandle->Render();
-
- CGUIWindow::Render();
-}
-
-void CGameWindowFullScreen::RenderEx()
-{
- CGUIWindow::RenderEx();
-
- m_renderHandle->RenderEx();
-}
-
-bool CGameWindowFullScreen::OnAction(const CAction &action)
-{
- switch (action.GetID())
- {
- case ACTION_SHOW_OSD:
- {
- ToggleOSD();
- return true;
- }
- case ACTION_TRIGGER_OSD:
- {
- TriggerOSD();
- return true;
- }
- case ACTION_SHOW_GUI:
- {
- // Switch back to the menu
- g_windowManager.PreviousWindow();
- return true;
- }
- case ACTION_ASPECT_RATIO:
- {
- // Toggle the aspect ratio mode (only if the info is onscreen)
- //g_application.GetAppPlayer().SetRenderViewMode(CViewModeSettings::GetNextQuickCycleViewMode(CMediaSettings::GetInstance().GetCurrentVideoSettings().m_ViewMode));
- return true;
- }
- default:
- break;
- }
-
- return CGUIWindow::OnAction(action);
-}
-
-bool CGameWindowFullScreen::OnMessage(CGUIMessage& message)
-{
- switch (message.GetMessage())
- {
- case GUI_MSG_SETFOCUS:
- case GUI_MSG_LOSTFOCUS:
- {
- if (message.GetSenderId() != WINDOW_FULLSCREEN_GAME)
- return true;
- break;
- }
- default:
- break;
- }
-
- return CGUIWindow::OnMessage(message);
-}
-
-void CGameWindowFullScreen::FrameMove()
-{
- m_fullscreenText->FrameMove();
-
- CGUIWindow::FrameMove();
-}
-
-void CGameWindowFullScreen::ClearBackground()
-{
- m_renderHandle->ClearBackground();
-
- CGUIWindow::ClearBackground();
-}
-
-bool CGameWindowFullScreen::HasVisibleControls()
-{
- return m_controlStats->nCountVisible > 0;
-}
-
-void CGameWindowFullScreen::OnWindowLoaded()
-{
- CGUIWindow::OnWindowLoaded();
-
- // Override the clear colour - we must never clear fullscreen
- m_clearBackground = 0;
-
- m_fullscreenText->OnWindowLoaded();
-}
-
-void CGameWindowFullScreen::OnInitWindow()
-{
- g_infoManager.SetShowInfo(false);
- g_infoManager.SetDisplayAfterSeek(0); // Make sure display after seek is off
-
- // Switch resolution
- g_graphicsContext.SetFullScreenVideo(true); //! @todo
-
- CGUIWindow::OnInitWindow();
-}
-
-void CGameWindowFullScreen::OnDeinitWindow(int nextWindowID)
-{
- // Close all active modal dialogs
- g_windowManager.CloseInternalModalDialogs(true);
-
- CGUIWindow::OnDeinitWindow(nextWindowID);
-
- g_graphicsContext.SetFullScreenVideo(false); //! @todo
-}
-
-void CGameWindowFullScreen::ToggleOSD()
-{
- CGUIDialog *pOSD = GetOSD();
- if (pOSD != nullptr)
- {
- if (pOSD->IsDialogRunning())
- pOSD->Close();
- else
- pOSD->Open();
- }
-
- MarkDirtyRegion();
-}
-
-void CGameWindowFullScreen::TriggerOSD()
-{
- CGUIDialog *pOSD = GetOSD();
- if (pOSD != nullptr)
- {
- if (!pOSD->IsDialogRunning())
- pOSD->Open();
- }
-}
-
-CGUIDialog *CGameWindowFullScreen::GetOSD()
-{
- return g_windowManager.GetDialog(WINDOW_DIALOG_GAME_OSD);
-}
-
-void CGameWindowFullScreen::RegisterWindow()
-{
- m_renderHandle = CServiceBroker::GetGameRenderManager().RegisterWindow(*this);
-}
-
-void CGameWindowFullScreen::UnregisterWindow()
-{
- m_renderHandle.reset();
-}

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

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlay.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodec.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayCodecText.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayImage.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySSA.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlaySpu.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -55,7 +55,8 @@
 
 // amcodec include
 extern "C" {
-#include <amcodec/codec.h>
+#include <codec.h>
+#include <amports/amstream.h>
 } // extern "C"
 
 CEvent g_aml_sync_event;
@@ -345,11 +346,44 @@
 int buf_avail_num;
 } vframe_states_t;
 
-#ifndef AMSTREAM_IOC_VF_STATUS
+static int aml_ioctl_get(CODEC_HANDLE h, int subcmd, unsigned long paramter)
+{
+ struct am_ioctl_parm parm;
+ memset(&parm, 0, sizeof(parm));
+ parm.cmd = subcmd;
+ parm.data_32 = *(unsigned int *)paramter;
+ if (ioctl(h, AMSTREAM_IOC_GET, (unsigned long)&parm) < 0)
+ {
+ CLog::Log(LOGERROR, "aml_ioctl_get failed: subcmd=%x, errno=%d", subcmd, errno);
+ return -1;
+ }
+ *(unsigned int *)paramter = parm.data_32;
+ return 0;
+}
+
+
+#ifndef AMSTREAM_IOC_MAGIC
 #define AMSTREAM_IOC_MAGIC 'S'
+#endif
+
+#ifndef AMSTREAM_IOC_VF_STATUS
 #define AMSTREAM_IOC_VF_STATUS _IOR(AMSTREAM_IOC_MAGIC, 0x60, unsigned long)
 #endif
 
+#ifndef AMSTREAM_IOC_GET_3D_TYPE
+#define AMSTREAM_IOC_GET_3D_TYPE _IOW((AMSTREAM_IOC_MAGIC), 0x3d, unsigned int)
+#endif
+
+
+enum
+{
+ VPP_3D_MODE_NULL = 0,
+ VPP_3D_MODE_LR,
+ VPP_3D_MODE_TB,
+ VPP_3D_MODE_LA,
+ VPP_3D_MODE_FA
+};
+
 /*************************************************************************/
 /*************************************************************************/
 void dumpfile_open(am_private_t *para)
@@ -1478,8 +1512,8 @@
 , m_ptsIs64us(false)
 , m_speed(DVD_PLAYSPEED_NORMAL)
 , m_cur_pts(INT64_0)
- , m_ptsOverflow(0)
 , m_last_pts(0)
+ , m_ptsOverflow(0)
 , m_bufferIndex(-1)
 , m_state(0)
 , m_frameSizeSum(0)
@@ -2248,18 +2282,45 @@
 
 std::string CAMLCodec::GetStereoMode()
 {
- std::string stereo_mode;
+ std::string stereoMode;
+
+ //Get Decoder Stereo mode
+ int decoder_sm(VPP_3D_MODE_NULL);
+ aml_ioctl_get(am_private->vcodec.handle, AMSTREAM_IOC_GET_3D_TYPE, (unsigned long)&decoder_sm);
+
+ switch (decoder_sm)
+ {
+ case VPP_3D_MODE_LR:
+ stereoMode = "left_right";
+ break;
+ case VPP_3D_MODE_TB:
+ stereoMode = "top_bottom";
+ break;
+ case VPP_3D_MODE_LA:
+ case VPP_3D_MODE_FA:
+ default:
+ switch(m_processInfo.GetVideoSettings().m_StereoMode)
+ {
+ case RENDER_STEREO_MODE_SPLIT_VERTICAL:
+ stereoMode = "left_right";
+ break;
+ case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
+ stereoMode = "top_bottom";
+ break;
+ default:
+ stereoMode = m_hints.stereo_mode;
+ break;
+ }
+ }
 
- switch(m_processInfo.GetVideoSettings().m_StereoMode)
+ if (m_processInfo.GetVideoSettings().m_StereoInvert)
 {
- case RENDER_STEREO_MODE_SPLIT_VERTICAL: stereo_mode = "left_right"; break;
- case RENDER_STEREO_MODE_SPLIT_HORIZONTAL: stereo_mode = "top_bottom"; break;
- default: stereo_mode = m_hints.stereo_mode; break;
+ if (stereoMode == "top_bottom")
+ stereoMode = "bottom_top";
+ else if (stereoMode == "left_right")
+ stereoMode = "right_left";
 }
-
- if(m_processInfo.GetVideoSettings().m_StereoInvert)
- stereo_mode = RenderManager::GetStereoModeInvert(stereo_mode);
- return stereo_mode;
+ return stereoMode;
 }
 
 void CAMLCodec::SetVideoRect(const CRect &SrcRect, const CRect &DestRect)

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/AddonVideoCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodec.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2010-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -42,6 +42,39 @@
   }
 }
 
+void VideoPicture::Reset()
+{
+  if (videoBuffer)
+    videoBuffer->Release();
+  videoBuffer = nullptr;
+  pts = DVD_NOPTS_VALUE;
+  dts = DVD_NOPTS_VALUE;
+  iFlags = 0;
+  iRepeatPicture = 0;
+  iDuration = 0;
+  iFrameType = 0;
+  color_space = AVCOL_SPC_UNSPECIFIED;
+  color_range = 0;
+  chroma_position = 0;
+  color_primaries = 0;
+  color_transfer = 0;
+  colorBits = 8;
+  stereoMode.clear();
+
+  qp_table = nullptr;
+  qstride = 0;
+  qscale_type = 0;
+  pict_type = 0;
+
+  hasDisplayMetadata = false;
+  hasLightMetadata = false;
+
+  iWidth = 0;
+  iHeight = 0;
+  iDisplayWidth = 0;
+  iDisplayHeight = 0;
+}
+
 VideoPicture& VideoPicture::CopyRef(const VideoPicture &pic)
 {
   if (videoBuffer)

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

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -28,6 +28,7 @@
 
 extern "C" {
 #include "libavcodec/avcodec.h"
+#include "libavutil/mastering_display_metadata.h"
 }
 
 #include <vector>
@@ -52,6 +53,7 @@
 ~VideoPicture();
 VideoPicture& CopyRef(const VideoPicture &pic);
 VideoPicture& SetParams(const VideoPicture &pic);
+ void Reset(); // reinitialize members, videoBuffer will be released if set!
 
 CVideoBuffer *videoBuffer = nullptr;
 
@@ -61,18 +63,24 @@
 double iRepeatPicture;
 double iDuration;
 unsigned int iFrameType : 4; //< see defines above // 1->I, 2->P, 3->B, 0->Undef
- unsigned int color_matrix : 4;
+ unsigned int color_space;
 unsigned int color_range : 1; //< 1 indicate if we have a full range of color
 unsigned int chroma_position;
 unsigned int color_primaries;
 unsigned int color_transfer;
- char stereo_mode[32];
+ unsigned int colorBits = 8;
+ std::string stereoMode;
 
 int8_t* qp_table; //< Quantization parameters, primarily used by filters
 int qstride;
 int qscale_type;
 int pict_type;
 
+ bool hasDisplayMetadata = false;
+ AVMasteringDisplayMetadata displayMetadata;
+ bool hasLightMetadata = false;
+ AVContentLightMetadata lightMetadata;
+
 unsigned int iWidth;
 unsigned int iHeight;
 unsigned int iDisplayWidth; //< width of the picture without black bars

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -73,21 +73,11 @@
 
 /***************************************************************************/
 
-typedef struct frame_queue {
- double dts;
- double pts;
- double sort_time;
- struct frame_queue *nextframe;
-} frame_queue;
-
 CDVDVideoCodecAmlogic::CDVDVideoCodecAmlogic(CProcessInfo &processInfo)
 : CDVDVideoCodec(processInfo)
 , m_pFormatName("amcodec")
 , m_opened(false)
 , m_codecControlFlags(0)
- , m_last_pts(0.0)
- , m_frame_queue(NULL)
- , m_queue_depth(0)
 , m_framerate(0.0)
 , m_video_rate(0)
 , m_mpeg2_sequence(NULL)
@@ -95,13 +85,11 @@
 , m_bitparser(NULL)
 , m_bitstream(NULL)
 {
- pthread_mutex_init(&m_queue_mutex, NULL);
 }
 
 CDVDVideoCodecAmlogic::~CDVDVideoCodecAmlogic()
 {
 Dispose();
- pthread_mutex_destroy(&m_queue_mutex);
 }
 
 CDVDVideoCodec* CDVDVideoCodecAmlogic::Create(CProcessInfo &processInfo)
@@ -280,17 +268,10 @@
 }
 
 // allocate a dummy VideoPicture buffer.
- // first make sure all properties are reset.
- memset(&m_videobuffer, 0, sizeof(VideoPicture));
-
- m_videobuffer.dts = DVD_NOPTS_VALUE;
- m_videobuffer.pts = DVD_NOPTS_VALUE;
- m_videobuffer.color_range = 0;
- m_videobuffer.color_matrix = 4;
- m_videobuffer.iFlags = 0;
+ m_videobuffer.Reset();
+
 m_videobuffer.iWidth = m_hints.width;
 m_videobuffer.iHeight = m_hints.height;
- m_videobuffer.videoBuffer = nullptr;
 
 m_videobuffer.iDisplayWidth = m_videobuffer.iWidth;
 m_videobuffer.iDisplayHeight = m_videobuffer.iHeight;
@@ -340,9 +321,6 @@
 if (m_bitparser)
 delete m_bitparser, m_bitparser = NULL;
 
- while (m_queue_depth)
- FrameQueuePop();
-
 m_opened = false;
 }
 
@@ -400,9 +378,6 @@
 
 void CDVDVideoCodecAmlogic::Reset(void)
 {
- while (m_queue_depth)
- FrameQueuePop();
-
 m_Codec->Reset();
 m_mpeg2_sequence_pts = 0;
 m_has_keyframe = false;
@@ -468,68 +443,6 @@
 m_Codec->SetSpeed(iSpeed);
 }
 
-void CDVDVideoCodecAmlogic::FrameQueuePop(void)
-{
- if (!m_frame_queue || m_queue_depth == 0)
- return;
-
- pthread_mutex_lock(&m_queue_mutex);
- // pop the top frame off the queue
- frame_queue *top = m_frame_queue;
- m_frame_queue = top->nextframe;
- m_queue_depth--;
- pthread_mutex_unlock(&m_queue_mutex);
-
- // and release it
- free(top);
-}
-
-void CDVDVideoCodecAmlogic::FrameQueuePush(double dts, double pts)
-{
- frame_queue *newframe = (frame_queue*)calloc(sizeof(frame_queue), 1);
- newframe->dts = dts;
- newframe->pts = pts;
- // if both dts or pts are good we use those, else use decoder insert time for frame sort
- if ((newframe->pts != DVD_NOPTS_VALUE) || (newframe->dts != DVD_NOPTS_VALUE))
- {
- // if pts is borked (stupid avi's), use dts for frame sort
- if (newframe->pts == DVD_NOPTS_VALUE)
- newframe->sort_time = newframe->dts;
- else
- newframe->sort_time = newframe->pts;
- }
-
- pthread_mutex_lock(&m_queue_mutex);
- frame_queue *queueWalker = m_frame_queue;
- if (!queueWalker || (newframe->sort_time < queueWalker->sort_time))
- {
- // we have an empty queue, or this frame earlier than the current queue head.
- newframe->nextframe = queueWalker;
- m_frame_queue = newframe;
- }
- else
- {
- // walk the queue and insert this frame where it belongs in display order.
- bool ptrInserted = false;
- frame_queue *nextframe = NULL;
- //
- while (!ptrInserted)
- {
- nextframe = queueWalker->nextframe;
- if (!nextframe || (newframe->sort_time < nextframe->sort_time))
- {
- // if the next frame is the tail of the queue, or our new frame is earlier.
- newframe->nextframe = nextframe;
- queueWalker->nextframe = newframe;
- ptrInserted = true;
- }
- queueWalker = nextframe;
- }
- }
- m_queue_depth++;
- pthread_mutex_unlock(&m_queue_mutex);
-}
-
 void CDVDVideoCodecAmlogic::FrameRateTracking(uint8_t *pData, int iSize, double dts, double pts)
 {
 // mpeg2 handling
@@ -557,85 +470,4 @@
 }
 return;
 }
-
- // everything else
- FrameQueuePush(dts, pts);
-
- // we might have out-of-order pts,
- // so make sure we wait for at least 8 values in sorted queue.
- if (m_queue_depth > 16)
- {
- pthread_mutex_lock(&m_queue_mutex);
-
- float cur_pts = m_frame_queue->pts;
- if (cur_pts == DVD_NOPTS_VALUE)
- cur_pts = m_frame_queue->dts;
-
- pthread_mutex_unlock(&m_queue_mutex);
-
- float duration = cur_pts - m_last_pts;
- m_last_pts = cur_pts;
-
- // clamp duration to sensible range,
- // 66 fsp to 20 fsp
- if (duration >= 15000.0 && duration <= 50000.0)
- {
- double framerate;
- switch((int)(0.5 + duration))
- {
- // 59.940 (16683.333333)
- case 16000 ... 17000:
- framerate = 60000.0 / 1001.0;
- break;
-
- // 50.000 (20000.000000)
- case 20000:
- framerate = 50000.0 / 1000.0;
- break;
-
- // 49.950 (20020.000000)
- case 20020:
- framerate = 50000.0 / 1001.0;
- break;
-
- // 29.970 (33366.666656)
- case 32000 ... 35000:
- framerate = 30000.0 / 1001.0;
- break;
-
- // 25.000 (40000.000000)
- case 39900 ... 40100:
- framerate = 25000.0 / 1000.0;
- break;
-
- // 23.976 (41708.33333)
- case 40200 ... 43200:
- // 23.976 seems to have the crappiest encodings :)
- framerate = 24000.0 / 1001.0;
- break;
-
- default:
- framerate = 0.0;
- //CLog::Log(LOGDEBUG, "%s: unknown duration(%f), cur_pts(%f)",
- // __MODULE_NAME__, duration, cur_pts);
- break;
- }
-
- if (framerate > 0.0 && (int)m_framerate != (int)framerate)
- {
- m_framerate = framerate;
- m_video_rate = (int)(0.5 + (96000.0 / framerate));
-
- if (m_Codec)
- m_Codec->SetVideoRate(m_video_rate);
-
- m_processInfo.SetVideoFps(m_framerate);
-
- CLog::Log(LOGDEBUG, "%s: detected new framerate(%f), video_rate(%d)",
- __MODULE_NAME__, m_framerate, m_video_rate);
- }
- }
-
- FrameQueuePop();
- }
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -28,7 +28,6 @@
 #include <atomic>
 
 class CAMLCodec;
-struct frame_queue;
 struct mpeg2_sequence;
 class CBitstreamParser;
 class CBitstreamConverter;
@@ -88,8 +87,6 @@
 
 protected:
 void Dispose(void);
- void FrameQueuePop(void);
- void FrameQueuePush(double dts, double pts);
 void FrameRateTracking(uint8_t *pData, int iSize, double dts, double pts);
 //void RemoveInfo(CDVDAmlogicInfo* info);
 
@@ -100,10 +97,6 @@
 bool m_opened;
 int m_codecControlFlags;
 CDVDStreamInfo m_hints;
- double m_last_pts;
- frame_queue *m_frame_queue;
- int32_t m_queue_depth;
- pthread_mutex_t m_queue_mutex;
 double m_framerate;
 int m_video_rate;
 float m_aspect_ratio;

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2013-2017 Team XBMC
- * http://xbmc.org
+ * 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
@@ -55,6 +55,8 @@
 #include "platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h"
 #include "settings/Settings.h"
 
+#include "utils/TimeUtils.h"
+
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
@@ -67,6 +69,7 @@
 #define XMEDIAFORMAT_KEY_CROP_RIGHT "crop-right"
 #define XMEDIAFORMAT_KEY_CROP_TOP "crop-top"
 #define XMEDIAFORMAT_KEY_CROP_BOTTOM "crop-bottom"
+#define XMEDIAFORMAT_KEY_TUNNELED_PLAYBACK "feature-tunneled-playback"
 
 using namespace KODI::MESSAGING;
 
@@ -199,7 +202,11 @@
 if (m_frameready)
 m_frameready->Reset();
 
- CLog::Log(LOGDEBUG, LOGVIDEO, "CMediaCodecVideoBuffer::ReleaseOutputBuffer index(%d), render(%d)", m_bufferId, render);
+ if (g_advancedSettings.CanLogComponent(LOGVIDEO))
+ {
+ int64_t diff = displayTime ? displayTime - CurrentHostCounter() : 0;
+ CLog::Log(LOGDEBUG, "CMediaCodecVideoBuffer::ReleaseOutputBuffer index(%d), render(%d), time:%lld, offset:%lld", m_bufferId, render, displayTime, diff);
+ }
 
 media_status_t mstat;
 if (!render || displayTime == 0)
@@ -348,7 +355,7 @@
 , m_render_surface(surface_render)
 , m_mpeg2_sequence(nullptr)
 {
- memset(&m_videobuffer, 0x00, sizeof(VideoPicture));
+ m_videobuffer.Reset();
 }
 
 CDVDVideoCodecAndroidMediaCodec::~CDVDVideoCodecAndroidMediaCodec()
@@ -674,12 +681,8 @@
 
 // setup a YUV420P VideoPicture buffer.
 // first make sure all properties are reset.
- memset(&m_videobuffer, 0x00, sizeof(VideoPicture));
+ m_videobuffer.Reset();
 
- m_videobuffer.dts = DVD_NOPTS_VALUE;
- m_videobuffer.pts = DVD_NOPTS_VALUE;
- m_videobuffer.color_range = 0;
- m_videobuffer.color_matrix = 4;
 m_videobuffer.iWidth = m_hints.width;
 m_videobuffer.iHeight = m_hints.height;
 // these will get reset to crop values later
@@ -1029,6 +1032,7 @@
 {
 // Handle rotation
 AMediaFormat_setInt32(mediaformat, XMEDIAFORMAT_KEY_ROTATION, m_hints.orientation);
+ AMediaFormat_setInt32(mediaformat, XMEDIAFORMAT_KEY_TUNNELED_PLAYBACK, 0);
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp Changed

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

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -39,6 +39,7 @@
 
 extern "C" {
 #include "libavutil/opt.h"
+#include "libavutil/mastering_display_metadata.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersink.h"
 #include "libavfilter/buffersrc.h"
@@ -963,9 +964,10 @@
   AVDictionaryEntry * entry = av_dict_get(av_frame_get_metadata(m_pFrame), "stereo_mode", NULL, 0);
   if(entry && entry->value)
   {
-    strncpy(pVideoPicture->stereo_mode, (const char*)entry->value, sizeof(pVideoPicture->stereo_mode));
-    pVideoPicture->stereo_mode[sizeof(pVideoPicture->stereo_mode)-1] = '\0';
+    pVideoPicture->stereoMode = (const char*)entry->value;
   }
+  else
+    pVideoPicture->stereoMode.clear();
 
   pVideoPicture->iRepeatPicture = 0.5 * m_pFrame->repeat_pict;
   pVideoPicture->iFlags = 0;
@@ -980,9 +982,23 @@
   pVideoPicture->chroma_position = m_pCodecContext->chroma_sample_location;
   pVideoPicture->color_primaries = m_pCodecContext->color_primaries;
   pVideoPicture->color_transfer = m_pCodecContext->color_trc;
-  pVideoPicture->color_matrix = m_pCodecContext->colorspace;
-  if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
-  || m_pCodecContext->pix_fmt     == AV_PIX_FMT_YUVJ420P)
+  pVideoPicture->color_space = m_pCodecContext->colorspace;
+  pVideoPicture->colorBits = 8;
+  // determine how number of bits of encoded video
+  if (m_pCodecContext->pix_fmt == AV_PIX_FMT_YUV420P12)
+    pVideoPicture->colorBits = 12;
+  else if (m_pCodecContext->pix_fmt == AV_PIX_FMT_YUV420P10)
+    pVideoPicture->colorBits = 10;
+  else if (m_pCodecContext->codec_id == AV_CODEC_ID_HEVC &&
+           m_pCodecContext->profile == FF_PROFILE_HEVC_MAIN_10)
+    pVideoPicture->colorBits = 10;
+  else if (m_pCodecContext->codec_id == AV_CODEC_ID_H264 &&
+           (m_pCodecContext->profile == FF_PROFILE_H264_HIGH_10||
+            m_pCodecContext->profile == FF_PROFILE_H264_HIGH_10_INTRA))
+    pVideoPicture->colorBits = 10;
+
+  if (m_pCodecContext->color_range == AVCOL_RANGE_JPEG ||
+    m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P)
     pVideoPicture->color_range = 1;
   else
     pVideoPicture->color_range = 0;
@@ -992,6 +1008,22 @@
                                                   &pVideoPicture->qscale_type);
   pVideoPicture->pict_type = m_pFrame->pict_type;
 
+  // metadata
+  pVideoPicture->hasDisplayMetadata = false;
+  pVideoPicture->hasLightMetadata = false;
+  AVFrameSideData *sd = av_frame_get_side_data(m_pFrame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
+  if (sd)
+  {
+    pVideoPicture->displayMetadata = *(AVMasteringDisplayMetadata *)sd->data;
+    pVideoPicture->hasDisplayMetadata = true;
+  }
+  sd = av_frame_get_side_data(m_pFrame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+  if (sd)
+  {
+    pVideoPicture->lightMetadata = *(AVContentLightMetadata *)sd->data;
+    pVideoPicture->hasLightMetadata = true;
+  }
+
   if (pVideoPicture->iRepeatPicture)
     pVideoPicture->dts = DVD_NOPTS_VALUE;
   else

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,31 +22,34 @@
 // which we don't use here
 #define FF_API_OLD_SAMPLE_FMT 0
 
-#include <dxva.h>
-#include <d3d11.h>
-#include <Initguid.h>
-#include <windows.h>
-
+#include "DXVA.h"
+#include "cores/VideoPlayer/DVDCodecs/DVDCodecUtils.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/Process/ProcessInfo.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
-#include "../DVDCodecUtils.h"
-#include "DXVA.h"
+#include "rendering/dx/DeviceResources.h"
+#include "rendering/dx/RenderContext.h"
 #include "ServiceBroker.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
 #include "utils/Log.h"
 #include "utils/StringUtils.h"
 #include "utils/SystemInfo.h"
-#include "rendering/dx/DeviceResources.h"
-#include "rendering/dx/RenderContext.h"
+
+#include <dxva.h>
+#include <d3d11.h>
+#include <Initguid.h>
+#include <windows.h>
 
 using namespace DXVA;
+using namespace Microsoft::WRL;
 
-DEFINE_GUID(DXVADDI_Intel_ModeH264_A, 0x604F8E64,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
-DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
-DEFINE_GUID(DXVADDI_Intel_ModeVC1_E , 0xBCC5DB6D,0xA2B6,0x4AF0,0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_A, 0x604F8E64,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
+DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
+DEFINE_GUID(DXVADDI_Intel_ModeVC1_E, 0xBCC5DB6D,0xA2B6,0x4AF0,0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89);
+DEFINE_GUID(DXVA_ModeH264_VLD_NoFGT_Flash, 0x4245F676,0x2BBC,0x4166,0xa0,0xBB,0x54,0xE7,0xB8,0x49,0xC3,0x80);
+DEFINE_GUID(DXVA_Intel_VC1_ClearVideo_2, 0xE07EC519,0xE651,0x4CD6,0xAC,0x84,0x13,0x70,0xCC,0xEE,0xC8,0x51);
 
 // redefine DXVA_NoEncrypt with other macro, solves unresolved external symbol linker error
 #ifdef DXVA_NoEncrypt 
@@ -54,63 +57,83 @@
 #endif
 DEFINE_GUID(DXVA_NoEncrypt, 0x1b81beD0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
 
+static const int PROFILES_MPEG2_SIMPLE[] = { FF_PROFILE_MPEG2_SIMPLE, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_MPEG2_MAIN[] = { FF_PROFILE_MPEG2_SIMPLE,
+ FF_PROFILE_MPEG2_MAIN, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_H264_HIGH[] = { FF_PROFILE_H264_BASELINE,
+ FF_PROFILE_H264_CONSTRAINED_BASELINE,
+ FF_PROFILE_H264_MAIN,
+ FF_PROFILE_H264_HIGH, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_HEVC_MAIN[] = { FF_PROFILE_HEVC_MAIN, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_HEVC_MAIN10[] = { FF_PROFILE_HEVC_MAIN,
+ FF_PROFILE_HEVC_MAIN_10, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_VP9_0[] = { FF_PROFILE_VP9_0, 
+ FF_PROFILE_UNKNOWN };
+static const int PROFILES_VP9_10_2[] = { FF_PROFILE_VP9_2, 
+ FF_PROFILE_UNKNOWN };
+
 typedef struct {
 const char *name;
 const GUID *guid;
 int codec;
+ const int* profiles;
 } dxva2_mode_t;
 
 /* XXX Prefered modes must come first */
 static const std::vector<dxva2_mode_t> dxva2_modes = {
- { "MPEG2 VLD", &D3D11_DECODER_PROFILE_MPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO },
- { "MPEG1/2 VLD", &D3D11_DECODER_PROFILE_MPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO },
- { "MPEG2 MoComp", &D3D11_DECODER_PROFILE_MPEG2_MOCOMP, 0 },
- { "MPEG2 IDCT", &D3D11_DECODER_PROFILE_MPEG2_IDCT, 0 },
-
-#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO
- /* We must prefer Intel specific ones if the flag doesn't exists */
- { "Intel H.264 VLD, no FGT", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
- { "Intel H.264 inverse discrete cosine transform (IDCT), no FGT", &DXVADDI_Intel_ModeH264_C, 0 },
- { "Intel H.264 motion compensation (MoComp), no FGT", &DXVADDI_Intel_ModeH264_A, 0 },
- { "Intel VC-1 VLD", &DXVADDI_Intel_ModeVC1_E, 0 },
-#endif
-
- { "H.264 variable-length decoder (VLD), FGT", &D3D11_DECODER_PROFILE_H264_VLD_FGT, AV_CODEC_ID_H264 },
- { "H.264 VLD, no FGT", &D3D11_DECODER_PROFILE_H264_VLD_NOFGT, AV_CODEC_ID_H264 },
- { "H.264 IDCT, FGT", &D3D11_DECODER_PROFILE_H264_IDCT_FGT, 0, },
- { "H.264 inverse discrete cosine transform (IDCT), no FGT", &D3D11_DECODER_PROFILE_H264_IDCT_NOFGT, 0, },
- { "H.264 MoComp, FGT", &D3D11_DECODER_PROFILE_H264_MOCOMP_FGT, 0, },
- { "H.264 motion compensation (MoComp), no FGT", &D3D11_DECODER_PROFILE_H264_MOCOMP_NOFGT, 0, },
-
- { "Windows Media Video 8 MoComp", &D3D11_DECODER_PROFILE_WMV8_MOCOMP, 0 },
- { "Windows Media Video 8 post processing", &D3D11_DECODER_PROFILE_WMV8_POSTPROC, 0 },
-
- { "Windows Media Video 9 IDCT", &D3D11_DECODER_PROFILE_WMV9_IDCT, 0 },
- { "Windows Media Video 9 MoComp", &D3D11_DECODER_PROFILE_WMV9_MOCOMP, 0 },
- { "Windows Media Video 9 post processing", &D3D11_DECODER_PROFILE_WMV9_POSTPROC, 0 },
-
- { "VC-1 VLD", &D3D11_DECODER_PROFILE_VC1_VLD, AV_CODEC_ID_VC1 },
- { "VC-1 VLD", &D3D11_DECODER_PROFILE_VC1_VLD, AV_CODEC_ID_WMV3 },
- { "VC-1 VLD 2010", &D3D11_DECODER_PROFILE_VC1_D2010, AV_CODEC_ID_VC1 },
- { "VC-1 VLD 2010", &D3D11_DECODER_PROFILE_VC1_D2010, AV_CODEC_ID_WMV3 },
- { "VC-1 IDCT", &D3D11_DECODER_PROFILE_VC1_IDCT, 0 },
- { "VC-1 MoComp", &D3D11_DECODER_PROFILE_VC1_MOCOMP, 0 },
- { "VC-1 post processing", &D3D11_DECODER_PROFILE_VC1_POSTPROC, 0 },
-
- /* HEVC / H.265 */
- { "HEVC / H.265 variable-length decoder, main", &D3D11_DECODER_PROFILE_HEVC_VLD_MAIN, AV_CODEC_ID_HEVC },
- { "HEVC / H.265 variable-length decoder, main10", &D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10, AV_CODEC_ID_HEVC },
-
- /* VP9 */
- { "VP9 VLD, Profile 0", &D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0, AV_CODEC_ID_VP9 },
-
-#ifdef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO
- /* Intel specific modes (only useful on older GPUs) */
- { "Intel H.264 VLD, no FGT", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 },
- { "Intel H.264 inverse discrete cosine transform (IDCT), no FGT", &DXVADDI_Intel_ModeH264_C, 0 },
- { "Intel H.264 motion compensation (MoComp), no FGT", &DXVADDI_Intel_ModeH264_A, 0 },
- { "Intel VC-1 VLD", &DXVADDI_Intel_ModeVC1_E, 0 },
-#endif
+ { "MPEG2 variable-length decoder", &D3D11_DECODER_PROFILE_MPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO, PROFILES_MPEG2_MAIN },
+ { "MPEG1/2 variable-length decoder", &D3D11_DECODER_PROFILE_MPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO, PROFILES_MPEG2_MAIN },
+ { "MPEG2 motion compensation", &D3D11_DECODER_PROFILE_MPEG2_MOCOMP, 0, nullptr },
+ { "MPEG2 inverse discrete cosine transform", &D3D11_DECODER_PROFILE_MPEG2_IDCT, 0, nullptr},
+
+ { "MPEG-1 variable-length decoder", &D3D11_DECODER_PROFILE_MPEG1_VLD, 0, nullptr },
+
+ { "H.264 variable-length decoder, film grain technology", &D3D11_DECODER_PROFILE_H264_VLD_FGT, AV_CODEC_ID_H264, PROFILES_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology (Intel ClearVideo)", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264, PROFILES_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology", &D3D11_DECODER_PROFILE_H264_VLD_NOFGT, AV_CODEC_ID_H264, PROFILES_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology, FMO/ASO", &D3D11_DECODER_PROFILE_H264_VLD_WITHFMOASO_NOFGT, AV_CODEC_ID_H264, PROFILES_H264_HIGH },
+ { "H.264 variable-length decoder, no film grain technology, Flash", &DXVA_ModeH264_VLD_NoFGT_Flash, AV_CODEC_ID_H264, PROFILES_H264_HIGH },
+
+ { "H.264 inverse discrete cosine transform, film grain technology", &D3D11_DECODER_PROFILE_H264_IDCT_FGT, 0, nullptr },
+ { "H.264 inverse discrete cosine transform, no film grain technology", &D3D11_DECODER_PROFILE_H264_IDCT_NOFGT, 0, nullptr },
+ { "H.264 inverse discrete cosine transform, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_C, 0, nullptr },
+
+ { "H.264 motion compensation, film grain technology", &D3D11_DECODER_PROFILE_H264_MOCOMP_FGT, 0, nullptr },
+ { "H.264 motion compensation, no film grain technology", &D3D11_DECODER_PROFILE_H264_MOCOMP_NOFGT, 0, nullptr },
+ { "H.264 motion compensation, no film grain technology (Intel)", &DXVADDI_Intel_ModeH264_A, 0, nullptr },
+
+ { "H.264 stereo high profile, mbs flag set", &D3D11_DECODER_PROFILE_H264_VLD_STEREO_PROGRESSIVE_NOFGT, 0, nullptr },
+ { "H.264 stereo high profile", &D3D11_DECODER_PROFILE_H264_VLD_STEREO_NOFGT, 0, nullptr },
+ { "H.264 multiview high profile", &D3D11_DECODER_PROFILE_H264_VLD_MULTIVIEW_NOFGT, 0, nullptr },
+
+ { "Windows Media Video 8 motion compensation", &D3D11_DECODER_PROFILE_WMV8_MOCOMP, 0, nullptr },
+ { "Windows Media Video 8 post processing", &D3D11_DECODER_PROFILE_WMV8_POSTPROC, 0, nullptr },
+
+ { "Windows Media Video 9 inverse discrete cosine transform", &D3D11_DECODER_PROFILE_WMV9_IDCT, 0, nullptr },
+ { "Windows Media Video 9 motion compensation", &D3D11_DECODER_PROFILE_WMV9_MOCOMP, 0, nullptr },
+ { "Windows Media Video 9 post processing", &D3D11_DECODER_PROFILE_WMV9_POSTPROC, 0, nullptr },
+
+ { "VC-1 variable-length decoder", &D3D11_DECODER_PROFILE_VC1_VLD, AV_CODEC_ID_VC1, nullptr },
+ { "VC-1 variable-length decoder", &D3D11_DECODER_PROFILE_VC1_VLD, AV_CODEC_ID_WMV3, nullptr },
+ { "VC-1 variable-length decoder 2010", &D3D11_DECODER_PROFILE_VC1_D2010, AV_CODEC_ID_VC1, nullptr },
+ { "VC-1 variable-length decoder 2010", &D3D11_DECODER_PROFILE_VC1_D2010, AV_CODEC_ID_WMV3, nullptr },
+ { "VC-1 variable-length decoder 2 (Intel)", &DXVA_Intel_VC1_ClearVideo_2, 0, nullptr },
+ { "VC-1 variable-length decoder (Intel)", &DXVADDI_Intel_ModeVC1_E, 0, nullptr },
+
+ { "VC-1 inverse discrete cosine transform", &D3D11_DECODER_PROFILE_VC1_IDCT, 0, nullptr },
+ { "VC-1 motion compensation", &D3D11_DECODER_PROFILE_VC1_MOCOMP, 0, nullptr },
+ { "VC-1 post processing", &D3D11_DECODER_PROFILE_VC1_POSTPROC, 0, nullptr },
+
+ { "HEVC variable-length decoder, main", &D3D11_DECODER_PROFILE_HEVC_VLD_MAIN, AV_CODEC_ID_HEVC, PROFILES_HEVC_MAIN },
+ { "HEVC variable-length decoder, main10", &D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10, AV_CODEC_ID_HEVC, PROFILES_HEVC_MAIN10 },
+
+ { "VP9 variable-length decoder, Profile 0", &D3D11_DECODER_PROFILE_VP9_VLD_PROFILE0, AV_CODEC_ID_VP9, PROFILES_VP9_0 },
+ { "VP9 variable-length decoder, 10bit, profile 2", &D3D11_DECODER_PROFILE_VP9_VLD_10BIT_PROFILE2, AV_CODEC_ID_VP9, PROFILES_VP9_10_2 },
 };
 
 // Prefered targets must be first
@@ -281,10 +304,10 @@
 
 bool CDXVAContext::CreateContext()
 {
- ID3D11Device* pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext* pD3DDeviceContext = DX::DeviceResources::Get()->GetImmediateContext();
- if ( FAILED(pD3DDevice->QueryInterface(__uuidof(ID3D11VideoDevice), reinterpret_cast<void**>(&m_service)))
- || FAILED(pD3DDeviceContext->QueryInterface(__uuidof(ID3D11VideoContext), reinterpret_cast<void**>(&m_vcontext))))
+ ComPtr<ID3D11Device> pD3DDevice(DX::DeviceResources::Get()->GetD3DDevice());
+ ComPtr<ID3D11DeviceContext> pD3DDeviceContext(DX::DeviceResources::Get()->GetImmediateContext());
+
+ if (FAILED(pD3DDevice.As(&m_service)) || FAILED(pD3DDeviceContext.As(&m_vcontext)))
 {
 CLog::LogF(LOGWARNING, "failed to get Video Device and Context.");
 return false;
@@ -308,8 +331,8 @@
 void CDXVAContext::DestroyContext()
 {
 delete[] m_input_list;
- SAFE_RELEASE(m_service);
- SAFE_RELEASE(m_vcontext);
+ m_service = nullptr;
+ m_vcontext = nullptr;
 }
 
 void CDXVAContext::QueryCaps()
@@ -332,82 +355,106 @@
 }
 }
 
-bool CDXVAContext::GetInputAndTarget(int codec, bool bHighBitdepth, GUID &inGuid, DXGI_FORMAT &outFormat) const
+bool CDXVAContext::GetFormatAndConfig(AVCodecContext* avctx, D3D11_VIDEO_DECODER_DESC &format, D3D11_VIDEO_DECODER_CONFIG &config) const
 {
- outFormat = DXGI_FORMAT_UNKNOWN;
+ format.OutputFormat = DXGI_FORMAT_UNKNOWN;
 
 // iterate through our predefined dxva modes and find the first matching for desired codec
 // once we found a mode, get a target we support in render_targets_dxgi DXGI_FORMAT_UNKNOWN
 for (const dxva2_mode_t& mode : dxva2_modes)
 {
- if (mode.codec != codec)
+ if (mode.codec != avctx->codec_id)
 continue;
 
- for (unsigned i = 0; i < m_input_count && outFormat == DXGI_FORMAT_UNKNOWN; i++)
+ bool supported = false;
+ for (unsigned i = 0; i < m_input_count && !supported; i++)
+ {
+ supported = IsEqualGUID(m_input_list[i], *mode.guid) != 0;
+ }
+ if (supported)
 {
- bool supported = IsEqualGUID(m_input_list[i], *mode.guid) != 0;
- if (codec == AV_CODEC_ID_HEVC)
+ // check profiles
+ supported = false;
+ if (mode.profiles == nullptr)
+ supported = true;
+ else if (avctx->profile == FF_PROFILE_UNKNOWN)
+ supported = true;
+ else for (const int *pProfile = &mode.profiles[0]; *pProfile != FF_PROFILE_UNKNOWN; ++pProfile)
 {
- if (bHighBitdepth && !IsEqualGUID(m_input_list[i], D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10))
- supported = false;
- else if (!bHighBitdepth && IsEqualGUID(m_input_list[i], D3D11_DECODER_PROFILE_HEVC_VLD_MAIN10))
- supported = false;
+ if (*pProfile == avctx->profile)
+ {
+ supported = true;
+ break;
+ }
 }
 if (!supported)
+ CLog::LogFunction(LOGDEBUG, "DXVA", "Unsupported profile %d for %s.", avctx->profile, mode.name);
+ }
+ if (!supported)
+ continue;
+
+ CLog::LogFunction(LOGDEBUG, "DXVA", "trying '%s'.", mode.name);
+ for (unsigned j = 0; render_targets_dxgi[j]; ++j)
+ {
+ bool bHighBits = (avctx->codec_id == AV_CODEC_ID_HEVC && (avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10 || avctx->profile == FF_PROFILE_HEVC_MAIN_10))
+ || (avctx->codec_id == AV_CODEC_ID_VP9 && (avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10 || avctx->profile == FF_PROFILE_VP9_2));
+ if (bHighBits && render_targets_dxgi[j] < DXGI_FORMAT_P010)
 continue;
 
- CLog::LogFunction(LOGDEBUG, "DXVA", "trying '%s'.", mode.name);
- for (unsigned j = 0; render_targets_dxgi[j] != DXGI_FORMAT_UNKNOWN && outFormat == DXGI_FORMAT_UNKNOWN; j++)
+ BOOL format_supported = FALSE;
+ HRESULT res = m_service->CheckVideoDecoderFormat(mode.guid, render_targets_dxgi[j], &format_supported);
+ if (FAILED(res) || !format_supported)
 {
- BOOL supported;
- if (bHighBitdepth && render_targets_dxgi[j] != DXGI_FORMAT_P010 && render_targets_dxgi[j] != DXGI_FORMAT_P016)
- continue;
- if (!bHighBitdepth && (render_targets_dxgi[j] == DXGI_FORMAT_P010 || render_targets_dxgi[j] == DXGI_FORMAT_P016))
- continue;
-
- HRESULT res = m_service->CheckVideoDecoderFormat(&m_input_list[i], render_targets_dxgi[j], &supported);
- if (FAILED(res))
- {
- CLog::LogFunction(LOGNOTICE, "DXVA", "failed check supported decoder format.");
- break;
- }
- if (supported)
- {
- inGuid = m_input_list[i];
- outFormat = render_targets_dxgi[j];
- break;
- }
+ CLog::LogFunction(LOGNOTICE, "DXVA", "Ouput format %d is not supported by '%s'", render_targets_dxgi[j], mode.name);
+ continue;
 }
- }
 
- if (outFormat != DXGI_FORMAT_UNKNOWN)
- break;
- }
+ // check decoder config
+ D3D11_VIDEO_DECODER_DESC checkFormat =
+ {
+ *mode.guid,
+ avctx->coded_width,
+ avctx->coded_height,
+ render_targets_dxgi[j]
+ };
+ if (!GetConfig(checkFormat, config))
+ continue;
 
- if (outFormat == DXGI_FORMAT_UNKNOWN)
- return false;
+ // config is found, update decoder description
+ format.Guid = *mode.guid;
+ format.OutputFormat = render_targets_dxgi[j];
+ format.SampleWidth = avctx->coded_width;
+ format.SampleHeight = avctx->coded_height;
+ return true;
+ }
+ }
 
- return true;
+ return false;
 }
 
-bool CDXVAContext::GetConfig(const D3D11_VIDEO_DECODER_DESC *format, D3D11_VIDEO_DECODER_CONFIG &config) const
+bool CDXVAContext::GetConfig(const D3D11_VIDEO_DECODER_DESC &format, D3D11_VIDEO_DECODER_CONFIG &config) const
 {
 // find what decode configs are available
 UINT cfg_count = 0;
- HRESULT res = m_service->GetVideoDecoderConfigCount(format, &cfg_count);
+ HRESULT res = m_service->GetVideoDecoderConfigCount(&format, &cfg_count);
 
 if (FAILED(res))
 {
 CLog::LogF(LOGNOTICE, "failed getting decoder configuration count.");
 return false;
 }
+ if (!cfg_count)
+ {
+ CLog::LogF(LOGNOTICE, "no decoder configuration possible for %dx%d (%d).", format.SampleWidth, format.SampleHeight, format.OutputFormat);
+ return false;
+ }
 
- config = {};
+ config = { 0 };
 unsigned bitstream = 2; // ConfigBitstreamRaw = 2 is required for Poulsbo and handles skipping better with nVidia
 for (unsigned i = 0; i< cfg_count; i++)
 {
 D3D11_VIDEO_DECODER_CONFIG pConfig = {0};
- if (FAILED(m_service->GetVideoDecoderConfig(format, i, &pConfig)))
+ if (FAILED(m_service->GetVideoDecoderConfig(&format, i, &pConfig)))
 {
 CLog::LogF(LOGNOTICE, "failed getting decoder configuration.");
 return false;
@@ -434,11 +481,12 @@
 return true;
 }
 
-bool CDXVAContext::CreateSurfaces(D3D11_VIDEO_DECODER_DESC format, unsigned int count, unsigned int alignment, ID3D11VideoDecoderOutputView **surfaces) const
+bool CDXVAContext::CreateSurfaces(const D3D11_VIDEO_DECODER_DESC &format, const uint32_t count, const uint32_t alignment
+ , ID3D11VideoDecoderOutputView **surfaces) const
 {
 HRESULT hr = S_OK;
- ID3D11Device* pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext1* pD3DDeviceContext = DX::DeviceResources::Get()->GetImmediateContext();
+ ComPtr<ID3D11Device> pD3DDevice(DX::DeviceResources::Get()->GetD3DDevice());
+ ComPtr<ID3D11DeviceContext1> pD3DDeviceContext(DX::DeviceResources::Get()->GetImmediateContext());
 
 unsigned bindFlags = D3D11_BIND_DECODER;
 
@@ -450,8 +498,10 @@
 FFALIGN(format.SampleHeight, alignment), 
 count, 1, bindFlags);
 
- ID3D11Texture2D *texture = nullptr;
- if (FAILED(pD3DDevice->CreateTexture2D(&texDesc, NULL, &texture)))
+ CLog::LogFunction(LOGDEBUG, "DXVA", "allocating %d surfaces with format %d.", count, format.OutputFormat);
+
+ ComPtr<ID3D11Texture2D> texture;
+ if (FAILED(pD3DDevice->CreateTexture2D(&texDesc, NULL, texture.GetAddressOf())))
 {
 CLog::LogF(LOGERROR, "failed creating decoder texture array.");
 return false;
@@ -467,7 +517,7 @@
 for (i = 0; i < count; ++i)
 {
 vdovDesc.Texture2D.ArraySlice = D3D11CalcSubresource(0, i, texDesc.MipLevels);
- hr = m_service->CreateVideoDecoderOutputView(texture, &vdovDesc, &surfaces[i]);
+ hr = m_service->CreateVideoDecoderOutputView(texture.Get(), &vdovDesc, &surfaces[i]);
 if (FAILED(hr))
 {
 CLog::LogF(LOGERROR, "failed creating surfaces.");
@@ -475,18 +525,21 @@
 }
 pD3DDeviceContext->ClearView(surfaces[i], clearColor, nullptr, 0);
 }
- SAFE_RELEASE(texture);
 
 if (FAILED(hr))
 {
- for (size_t j = 0; j < i; ++j)
- SAFE_RELEASE(surfaces[j]);
+ for (size_t j = 0; j Release();
+ surfaces[j] = nullptr;
+ };
 }
 
 return SUCCEEDED(hr);
 }
 
-bool CDXVAContext::CreateDecoder(D3D11_VIDEO_DECODER_DESC *format, const D3D11_VIDEO_DECODER_CONFIG *config, ID3D11VideoDecoder **decoder, ID3D11VideoContext **context)
+bool CDXVAContext::CreateDecoder(const D3D11_VIDEO_DECODER_DESC &format, const D3D11_VIDEO_DECODER_CONFIG &config
+ , ID3D11VideoDecoder **decoder, ID3D11VideoContext **context)
 {
 CSingleLock lock(m_section);
 
@@ -495,13 +548,12 @@
 {
 if (!m_atiWorkaround || retry > 0)
 {
- ID3D11VideoDecoder* pDecoder = nullptr;
- HRESULT res = m_service->CreateVideoDecoder(format, config, &pDecoder);
+ ComPtr<ID3D11VideoDecoder> pDecoder;
+ HRESULT res = m_service->CreateVideoDecoder(&format, &config, pDecoder.GetAddressOf());
 if (!FAILED(res))
 {
- *decoder = pDecoder;
- *context = m_vcontext;
- m_vcontext->AddRef();
+ *decoder = pDecoder.Detach();
+ m_vcontext.CopyTo(context);
 return true;
 }
 }
@@ -557,27 +609,25 @@
 return nullptr;
 
 if (planes[idx])
- return planes[idx];
+ return planes[idx].Get();
 
- ID3D11Resource* pResource = nullptr;
+ ComPtr<ID3D11Resource> pResource;
 D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC vpivd;
 
- ID3D11VideoDecoderOutputView *pView = reinterpret_cast<ID3D11VideoDecoderOutputView*>(view);
+ ComPtr<ID3D11VideoDecoderOutputView> pView(reinterpret_cast<ID3D11VideoDecoderOutputView*>(view));
 pView->GetDesc(&vpivd);
- pView->GetResource(&pResource);
+ pView->GetResource(pResource.GetAddressOf());
 
 DXGI_FORMAT plane_format = plane_formats[format - DXGI_FORMAT_NV12][idx];
 CD3D11_SHADER_RESOURCE_VIEW_DESC srvDesc(D3D11_SRV_DIMENSION_TEXTURE2DARRAY, plane_format,
 0, 1, vpivd.Texture2D.ArraySlice, 1);
 
- ID3D11Device* pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
- HRESULT hr = pD3DDevice->CreateShaderResourceView(pResource, &srvDesc,
- reinterpret_cast<ID3D11ShaderResourceView**>(&planes[idx]));
+ ComPtr<ID3D11Device> pD3DDevice(DX::DeviceResources::Get()->GetD3DDevice());
+ HRESULT hr = pD3DDevice->CreateShaderResourceView(pResource.Get(), &srvDesc, planes[idx].ReleaseAndGetAddressOf());
 if (FAILED(hr))
 CLog::LogF(LOGERROR, "unable to create SRV for decoder surface (%d)", plane_format);
 
- SAFE_RELEASE(pResource);
- return planes[idx];
+ return planes[idx].Get();
 }
 
 void CDXVAOutputBuffer::SetRef(AVFrame* frame)
@@ -590,8 +640,8 @@
 void CDXVAOutputBuffer::Unref()
 {
 view = nullptr;
- SAFE_RELEASE(planes[0]);
- SAFE_RELEASE(planes[1]);
+ planes[0] = nullptr;
+ planes[1] = nullptr;
 av_frame_unref(m_pFrame);
 }
 
@@ -616,13 +666,13 @@
 CDXVAOutputBuffer* retPic;
 if (!m_freeOut.empty())
 {
- int idx = m_freeOut.front();
+ size_t idx = m_freeOut.front();
 m_freeOut.pop_front();
 retPic = m_out[idx];
 }
 else
 {
- int idx = m_out.size();
+ size_t idx = m_out.size();
 retPic = new CDXVAOutputBuffer(idx);
 m_out.push_back(retPic);
 }
@@ -644,7 +694,7 @@
 void CDXVABufferPool::AddView(ID3D11View* view)
 {
 CSingleLock lock(m_section);
- int idx = m_views.size();
+ size_t idx = m_views.size();
 m_views.push_back(view);
 m_freeViews.push_back(idx);
 }
@@ -657,14 +707,15 @@
 if (it == m_views.end())
 return;
 
- int idx = it - m_views.begin();
+ size_t idx = it - m_views.begin();
 m_freeViews.push_back(idx);
 }
 
 bool CDXVABufferPool::IsValid(ID3D11View* surf)
 {
 CSingleLock lock(m_section);
- return std::find(m_views.begin(), m_views.end(), surf) != m_views.end();
+ auto it = std::find(m_views.begin(), m_views.end(), surf);
+ return it != m_views.end();
 }
 
 ID3D11View* CDXVABufferPool::GetView()
@@ -673,7 +724,7 @@
 
 if (!m_freeViews.empty())
 {
- int idx = m_freeViews.front();
+ size_t idx = m_freeViews.front();
 m_freeViews.pop_front();
 
 auto view = m_views[idx];
@@ -686,18 +737,19 @@
 {
 CSingleLock lock(m_section);
 
- for (auto view : m_views)
- SAFE_RELEASE(view);
- m_freeViews.clear();
+ for (auto v : m_views)
+ if (v) v->Release();
 
 for (auto buf : m_out)
 delete buf;
 
+ m_views.clear();
+ m_freeViews.clear();
 m_out.clear();
 m_freeOut.clear();
 }
 
-int CDXVABufferPool::Size()
+size_t CDXVABufferPool::Size()
 {
 CSingleLock lock(m_section);
 return m_views.size();
@@ -713,7 +765,7 @@
 {
 CSingleLock lock(m_section);
 // out buffers hold views
- int buffRefs = m_out.size() - m_freeOut.size();
+ size_t buffRefs = m_out.size() - m_freeOut.size();
 // ffmpeg refs = total - free - out refs
 return m_freeViews.size() != m_views.size() - buffRefs;
 }
@@ -760,7 +812,7 @@
 
 CDecoder::~CDecoder()
 {
- CLog::LogF(LOGDEBUG, "destructing decoder, %p.", this);
+ CLog::LogF(LOGDEBUG, "destructing decoder, %p.", static_cast<void*>(this));
 DX::Windowing().Unregister(this);
 Close();
 free(m_context->surface);
@@ -781,9 +833,13 @@
 void CDecoder::Close()
 {
 CSingleLock lock(m_section);
- SAFE_RELEASE(m_decoder);
- SAFE_RELEASE(m_vcontext);
- SAFE_RELEASE(m_videoBuffer);
+ m_decoder = nullptr;
+ m_vcontext = nullptr;
+ if (m_videoBuffer)
+ {
+ m_videoBuffer->Release();
+ m_videoBuffer = nullptr;
+ }
 memset(&m_format, 0, sizeof(m_format));
 
 if (m_dxva_context)
@@ -929,14 +985,13 @@
 if (!CDXVAContext::EnsureContext(&m_dxva_context, this))
 return false;
 
- bool bHighBitdepth = (avctx->codec_id == AV_CODEC_ID_HEVC && (avctx->sw_pix_fmt == AV_PIX_FMT_YUV420P10 || avctx->profile == FF_PROFILE_HEVC_MAIN_10));
- if (!m_dxva_context->GetInputAndTarget(avctx->codec_id, bHighBitdepth, m_format.Guid, m_format.OutputFormat))
+ if (!m_dxva_context->GetFormatAndConfig(avctx, m_format, *m_context->cfg))
 {
 CLog::LogFunction(LOGDEBUG, "DXVA", "unable to find an input/output format combination.");
 return false;
 }
 
- CLog::LogFunction(LOGDEBUG, "DXVA", "selected input/output format: %d.", m_format.OutputFormat);
+ CLog::LogFunction(LOGDEBUG, "DXVA", "selected output format: %d.", m_format.OutputFormat);
 CLog::LogFunction(LOGDEBUG, "DXVA", "source requires %d references.", avctx->refs);
 if (m_format.Guid == DXVADDI_Intel_ModeH264_E && avctx->refs > 11)
 {
@@ -945,38 +1000,38 @@
 return false;
 }
 
- m_format.SampleWidth = avctx->coded_width;
- m_format.SampleHeight = avctx->coded_height;
-
 if (7 > m_shared)
 m_shared = 7;
 
- if(avctx->refs > m_refs)
- m_refs = avctx->refs+2;
- if (avctx->codec_id == AV_CODEC_ID_HEVC)
- m_refs = 16;
+ m_refs = 2; // 1 decode + 1 safety
+ m_surface_alignment = 16;
 
- if(m_refs == 0)
+ switch (avctx->codec_id)
 {
- if( avctx->codec_id == AV_CODEC_ID_H264
- || avctx->codec_id == AV_CODEC_ID_HEVC)
- m_refs = 16;
- else
- m_refs = 2;
- }
- /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
- but it causes issues for H.264 on certain AMD GPUs..... */
- if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO)
+ case AV_CODEC_ID_MPEG2VIDEO:
+ /* decoding MPEG-2 requires additional alignment on some Intel GPUs,
+ but it causes issues for H.264 on certain AMD GPUs..... */
 m_surface_alignment = 32;
- /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
- all coding features have enough room to work with */
- else if (avctx->codec_id == AV_CODEC_ID_HEVC)
+ m_refs += 2 + 2;
+ break;
+ case AV_CODEC_ID_HEVC:
+ /* the HEVC DXVA2 spec asks for 128 pixel aligned surfaces to ensure
+ all coding features have enough room to work with */
 m_surface_alignment = 128;
- else
- m_surface_alignment = 16;
+ m_refs += 16;
+ break;
+ case AV_CODEC_ID_H264:
+ m_refs += 16;
+ break;
+ case AV_CODEC_ID_VP9:
+ m_refs += 4;
+ break;
+ default:
+ m_refs += 2;
+ }
 
- if (!m_dxva_context->GetConfig(&m_format, *m_context->cfg))
- return false;
+ if (avctx->active_thread_type & FF_THREAD_FRAME)
+ m_refs += avctx->thread_count;
 
 m_bufferPool = std::make_shared<CDXVABufferPool>();
 
@@ -1030,8 +1085,7 @@
 
 if(frame)
 {
- ID3D11View* view = reinterpret_cast<ID3D11View*>(frame->data[3]);
- if (m_bufferPool->IsValid(view))
+ if (m_bufferPool->IsValid(reinterpret_cast<ID3D11View*>(frame->data[3])))
 {
 SAFE_RELEASE(m_videoBuffer);
 m_videoBuffer = reinterpret_cast<CDXVAOutputBuffer*>(m_bufferPool->Get());
@@ -1147,7 +1201,7 @@
 data.pPrivateOutputData = &status;
 data.PrivateOutputDataSize = avctx->codec_id == AV_CODEC_ID_H264 ? sizeof(DXVA_Status_H264) : sizeof(DXVA_Status_VC1);
 HRESULT hr;
- if (FAILED(hr = m_dxva_context->GetVideoContext()->DecoderExtension(m_decoder, &data)))
+ if (FAILED(hr = m_dxva_context->GetVideoContext()->DecoderExtension(m_decoder.Get(), &data)))
 {
 CLog::LogFunction(LOGWARNING, "DXVA", "failed to get decoder status - 0x%08X.", hr);
 return CDVDVideoCodec::VC_ERROR;
@@ -1169,28 +1223,24 @@
 
 bool CDecoder::OpenDecoder()
 {
- SAFE_RELEASE(m_decoder);
- SAFE_RELEASE(m_vcontext);
+ m_decoder = nullptr;
+ m_vcontext = nullptr;
 m_context->decoder = nullptr;
 m_context->video_context = nullptr;
 
- m_context->surface_count = m_refs + 1 + 1 + m_shared; // refs + 1 decode + 1 libavcodec safety + processor buffer
-
- CLog::LogFunction(LOGDEBUG, "DXVA", "allocating %d surfaces with format %d.", m_context->surface_count, m_format.OutputFormat);
+ m_context->surface_count = m_refs + m_shared; // refs + processor buffer
 
 if (!m_dxva_context->CreateSurfaces(m_format, m_context->surface_count, m_surface_alignment, m_context->surface))
 return false;
 
- for(unsigned i = 0; i < m_context->surface_count; i++)
- {
+ for (unsigned i = 0; i < m_context->surface_count; i++)
 m_bufferPool->AddView(m_context->surface[i]);
- }
 
- if (!m_dxva_context->CreateDecoder(&m_format, m_context->cfg, &m_decoder, &m_vcontext))
+ if (!m_dxva_context->CreateDecoder(m_format, *m_context->cfg, m_decoder.GetAddressOf(), m_vcontext.GetAddressOf()))
 return false;
 
- m_context->decoder = m_decoder;
- m_context->video_context = m_vcontext;
+ m_context->decoder = m_decoder.Get();
+ m_context->video_context = m_vcontext.Get();
 
 return true;
 }
@@ -1272,5 +1322,5 @@
 void CDecoder::CloseDXVADecoder()
 {
 CSingleLock lock(m_section);
- SAFE_RELEASE(m_decoder);
+ m_decoder = nullptr;
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/DXVA.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -27,6 +27,7 @@
 #include <libavcodec/avcodec.h>
 #include <libavcodec/d3d11va.h>
 #include <vector>
+#include <wrl/client.h>
 
 class CProcessInfo;
 
@@ -52,7 +53,7 @@
 private:
 CDXVAOutputBuffer(int id);
 
- ID3D11View* planes[2]{ nullptr, nullptr };
+ Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> planes[2];
 AVFrame* m_pFrame{ nullptr };
 };
 
@@ -72,7 +73,7 @@
 void ReturnView(ID3D11View* view);
 ID3D11View* GetView();
 bool IsValid(ID3D11View* view);
- int Size();
+ size_t Size();
 bool HasFree();
 bool HasRefs();
 
@@ -81,9 +82,9 @@
 CCriticalSection m_section;
 
 std::vector<ID3D11View*> m_views;
- std::deque<int> m_freeViews;
+ std::deque<size_t> m_freeViews;
 std::vector<CDXVAOutputBuffer*> m_out;
- std::deque<int> m_freeOut;
+ std::deque<size_t> m_freeOut;
 };
 
 class CDecoder;
@@ -92,12 +93,13 @@
 {
 public:
 static bool EnsureContext(CDXVAContext **ctx, CDecoder *decoder);
- bool GetInputAndTarget(int codec, bool bHighBitdepth, GUID &inGuid, DXGI_FORMAT &outFormat) const;
- bool GetConfig(const D3D11_VIDEO_DECODER_DESC *format, D3D11_VIDEO_DECODER_CONFIG &config) const;
- bool CreateSurfaces(D3D11_VIDEO_DECODER_DESC format, unsigned int count, unsigned int alignment, ID3D11VideoDecoderOutputView **surfaces) const;
- bool CreateDecoder(D3D11_VIDEO_DECODER_DESC *format, const D3D11_VIDEO_DECODER_CONFIG *config, ID3D11VideoDecoder **decoder, ID3D11VideoContext **context);
+ bool GetFormatAndConfig(AVCodecContext* avctx, D3D11_VIDEO_DECODER_DESC &format, D3D11_VIDEO_DECODER_CONFIG &config) const;
+ bool CreateSurfaces(const D3D11_VIDEO_DECODER_DESC &format, const uint32_t count, const uint32_t alignment
+ , ID3D11VideoDecoderOutputView **surfaces) const;
+ bool CreateDecoder(const D3D11_VIDEO_DECODER_DESC &format, const D3D11_VIDEO_DECODER_CONFIG &config
+ , ID3D11VideoDecoder **decoder, ID3D11VideoContext **context);
 void Release(CDecoder *decoder);
- ID3D11VideoContext* GetVideoContext() const { return m_vcontext; }
+ ID3D11VideoContext* GetVideoContext() const { return m_vcontext.Get(); }
 
 private:
 CDXVAContext();
@@ -106,12 +108,13 @@
 void DestroyContext();
 void QueryCaps();
 bool IsValidDecoder(CDecoder *decoder);
+ bool GetConfig(const D3D11_VIDEO_DECODER_DESC &format, D3D11_VIDEO_DECODER_CONFIG &config) const;
 
 static CDXVAContext *m_context;
 static CCriticalSection m_section;
 
- ID3D11VideoContext* m_vcontext;
- ID3D11VideoDevice* m_service;
+ Microsoft::WRL::ComPtr<ID3D11VideoContext> m_vcontext;
+ Microsoft::WRL::ComPtr<ID3D11VideoDevice> m_service;
 int m_refCount;
 UINT m_input_count;
 GUID *m_input_list;
@@ -167,8 +170,8 @@
 
 int m_refs;
 HANDLE m_device;
- ID3D11VideoDecoder *m_decoder;
- ID3D11VideoContext *m_vcontext;
+ Microsoft::WRL::ComPtr<ID3D11VideoDecoder> m_decoder;
+ Microsoft::WRL::ComPtr<ID3D11VideoContext> m_vcontext;
 D3D11_VIDEO_DECODER_DESC m_format;
 CDXVAOutputBuffer *m_videoBuffer;
 struct AVD3D11VAContext *m_context;

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -69,7 +69,7 @@
 
 CMMALVideo::CMMALVideo(CProcessInfo &processInfo) : CDVDVideoCodec(processInfo)
 {
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s %p", CLASSNAME, __func__, this);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s %p", CLASSNAME, __func__, static_cast<void*>(this));
 
 m_decoded_width = 0;
 m_decoded_height = 0;
@@ -104,7 +104,7 @@
 
 CMMALVideo::~CMMALVideo()
 {
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s %p", CLASSNAME, __func__, this);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s %p", CLASSNAME, __func__, static_cast<void*>(this));
 if (!m_finished)
 Dispose();
 
@@ -184,7 +184,8 @@
 
 void CMMALVideo::dec_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s port:%p buffer %p, len %d cmd:%x", CLASSNAME, __func__, port, buffer, buffer->length, buffer->cmd);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s port:%p buffer %p, len %d cmd:%x", CLASSNAME, __func__,
+ static_cast<void*>(port), static_cast<void*>(buffer), buffer->length, buffer->cmd);
 mmal_buffer_header_release(buffer);
 CSingleLock output_lock(m_output_mutex);
 m_output_cond.notifyAll();
@@ -200,7 +201,11 @@
 void CMMALVideo::dec_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
 if (!(buffer->cmd == 0 && buffer->length > 0))
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s port:%p buffer %p, len %d cmd:%x flags:%x", CLASSNAME, __func__, port, buffer, buffer->length, buffer->cmd, buffer->flags);
+ {
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s port:%p buffer %p, len %d cmd:%x flags:%x", CLASSNAME,
+ __func__, static_cast<void*>(port), static_cast<void*>(buffer), buffer->length,
+ buffer->cmd, buffer->flags);
+ }
 
 bool kept = false;
 CMMALVideoBuffer *omvb = (CMMALVideoBuffer *)buffer->user_data;
@@ -225,10 +230,15 @@
 if (g_advancedSettings.m_omxDecodeStartWithValidFrame && (buffer->flags & MMAL_BUFFER_HEADER_FLAG_CORRUPTED))
 wanted = false;
 m_num_decoded++;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - omvb:%p mmal:%p len:%u dts:%.3f pts:%.3f flags:%x:%x pool:%p %dx%d (%dx%d) %dx%d (%dx%d) enc:%.4s",
- CLASSNAME, __func__, buffer, omvb, buffer->length, buffer->dts*1e-6, buffer->pts*1e-6, buffer->flags, buffer->type->video.flags,
- omvb->Width(), omvb->Height(), omvb->AlignedWidth(), omvb->AlignedHeight(),
- m_decoded_width, m_decoded_height, m_decoded_aligned_width, m_decoded_aligned_height, (char*)&omvb->Encoding());
+ CLog::Log(LOGDEBUG, LOGVIDEO,
+ "%s::%s - omvb:%p mmal:%p len:%u dts:%.3f pts:%.3f flags:%x:%x pool:%p %dx%d "
+ "(%dx%d) %dx%d (%dx%d) enc:%.4s",
+ CLASSNAME, __func__, static_cast<void*>(buffer), static_cast<void*>(omvb),
+ buffer->length, buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->flags,
+ buffer->type->video.flags, static_cast<void*>(m_pool.get()), omvb->Width(),
+ omvb->Height(), omvb->AlignedWidth(), omvb->AlignedHeight(), m_decoded_width,
+ m_decoded_height, m_decoded_aligned_width, m_decoded_aligned_height,
+ (char*)&omvb->Encoding());
 if (wanted)
 {
 std::shared_ptr<CMMALPool> pool = std::dynamic_pointer_cast<CMMALPool>(m_pool);
@@ -323,7 +333,8 @@
 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;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - %-8p %-6d flags:%x", CLASSNAME, __func__, buffer, buffer->length, buffer->flags);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - %-8p %-6d flags:%x", CLASSNAME, __func__, static_cast<void*>(buffer),
+ buffer->length, buffer->flags);
 status = mmal_port_send_buffer(m_dec_input, buffer);
 if (status != MMAL_SUCCESS)
 {
@@ -618,8 +629,12 @@
 m_packet_num++;
 buffer->flags |= MMAL_BUFFER_HEADER_FLAG_FRAME_END;
 }
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - %-8p %-6d/%-6d dts:%.3f pts:%.3f flags:%x ready_queue(%d)",
- CLASSNAME, __func__, buffer, buffer->length, iSize, packet.dts == DVD_NOPTS_VALUE ? 0.0 : packet.dts*1e-6, packet.pts == DVD_NOPTS_VALUE ? 0.0 : packet.pts*1e-6, buffer->flags, m_output_ready.size());
+ CLog::Log(LOGDEBUG, LOGVIDEO,
+ "%s::%s - %-8p %-6d/%-6d dts:%.3f pts:%.3f flags:%x ready_queue(%d)", CLASSNAME,
+ __func__, static_cast<void*>(buffer), buffer->length, iSize,
+ packet.dts == DVD_NOPTS_VALUE ? 0.0 : packet.dts * 1e-6,
+ packet.pts == DVD_NOPTS_VALUE ? 0.0 : packet.pts * 1e-6, buffer->flags,
+ m_output_ready.size());
 status = mmal_port_send_buffer(m_dec_input, buffer);
 if (status != MMAL_SUCCESS)
 {
@@ -785,7 +800,6 @@
 picture->videoBuffer = dynamic_cast<CVideoBuffer*>(buffer);
 assert(picture->videoBuffer);
 picture->color_range = 0;
- picture->color_matrix = 4;
 picture->iWidth = buffer->Width() ? buffer->Width() : m_decoded_width;
 picture->iHeight = buffer->Height() ? buffer->Height() : m_decoded_height;
 picture->iDisplayWidth = picture->iWidth;
@@ -809,9 +823,12 @@
 picture->iFlags = 0;
 if (buffer->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_USER3)
 picture->iFlags |= DVP_FLAG_DROPPED;
- CLog::Log(LOGINFO, LOGVIDEO, "%s::%s dts:%.3f pts:%.3f flags:%x:%x MMALBuffer:%p mmal_buffer:%p", CLASSNAME, __func__,
- picture->dts == DVD_NOPTS_VALUE ? 0.0 : picture->dts*1e-6, picture->pts == DVD_NOPTS_VALUE ? 0.0 : picture->pts*1e-6,
- picture->iFlags, buffer->mmal_buffer->flags, buffer, buffer->mmal_buffer);
+ CLog::Log(LOGINFO, LOGVIDEO,
+ "%s::%s dts:%.3f pts:%.3f flags:%x:%x MMALBuffer:%p mmal_buffer:%p", CLASSNAME,
+ __func__, picture->dts == DVD_NOPTS_VALUE ? 0.0 : picture->dts * 1e-6,
+ picture->pts == DVD_NOPTS_VALUE ? 0.0 : picture->pts * 1e-6, picture->iFlags,
+ buffer->mmal_buffer->flags, static_cast<void*>(buffer),
+ static_cast<void*>(buffer->mmal_buffer));
 assert(!(buffer->mmal_buffer->flags & MMAL_BUFFER_HEADER_FLAG_DECODEONLY));
 buffer->mmal_buffer->flags &= ~MMAL_BUFFER_HEADER_FLAG_USER3;
 buffer->m_stills = m_hints.stills;

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.cpp Changed

@@ -136,7 +136,7 @@
 
 CDecoder::CDecoder(CProcessInfo &processInfo, CDVDStreamInfo &hints) : m_processInfo(processInfo), m_hints(hints)
 {
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - create %p", CLASSNAME, __FUNCTION__, this);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - create %p", CLASSNAME, __FUNCTION__, static_cast<void*>(this));
 m_avctx = nullptr;
 m_pool = nullptr;
 }
@@ -145,7 +145,7 @@
 {
 if (m_renderBuffer)
 m_renderBuffer->Release();
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - destroy %p", CLASSNAME, __FUNCTION__, this);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - destroy %p", CLASSNAME, __FUNCTION__, static_cast<void*>(this));
 }
 
 long CDecoder::Release()
@@ -158,7 +158,8 @@
 {
 CGPUMEM *gmem = (CGPUMEM *)opaque;
 CMMALYUVBuffer *YUVBuffer = (CMMALYUVBuffer *)gmem->m_opaque;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s buf:%p gmem:%p", CLASSNAME, __FUNCTION__, YUVBuffer, gmem);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s buf:%p gmem:%p", CLASSNAME, __FUNCTION__,
+ static_cast<void*>(YUVBuffer), static_cast<void*>(gmem));
 
 YUVBuffer->Release();
 }
@@ -215,7 +216,10 @@
 frame->extended_data = frame->data;
 // Leave extended buf alone
 
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s buf:%p mmal:%p gmem:%p avbuf:%p:%p:%p", CLASSNAME, __FUNCTION__, YUVBuffer, YUVBuffer->mmal_buffer, gmem, frame->data[0], frame->data[1], frame->data[2]);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s buf:%p mmal:%p gmem:%p avbuf:%p:%p:%p", CLASSNAME,
+ __FUNCTION__, static_cast<void*>(YUVBuffer), static_cast<void*>(YUVBuffer->mmal_buffer),
+ static_cast<void*>(gmem), static_cast<void*>(frame->data[0]),
+ static_cast<void*>(frame->data[1]), static_cast<void*>(frame->data[2]));
 
 return 0;
 }
@@ -266,7 +270,9 @@
 if ((frame->format != AV_PIX_FMT_YUV420P && frame->format != AV_PIX_FMT_BGR0 && frame->format != AV_PIX_FMT_RGB565LE) ||
 frame->buf[1] != nullptr || frame->buf[0] == nullptr)
 {
- CLog::Log(LOGERROR, "%s::%s frame format invalid format:%d buf:%p,%p", CLASSNAME, __func__, frame->format, frame->buf[0], frame->buf[1]);
+ CLog::Log(LOGERROR, "%s::%s frame format invalid format:%d buf:%p,%p", CLASSNAME, __func__,
+ frame->format, static_cast<void*>(frame->buf[0]),
+ static_cast<void*>(frame->buf[1]));
 return CDVDVideoCodec::VC_ERROR;
 }
 CVideoBuffer *old = m_renderBuffer;
@@ -282,7 +288,12 @@
 if (m_renderBuffer)
 {
 m_renderBuffer->m_stills = m_hints.stills;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - mmal:%p buf:%p old:%p gpu:%p %dx%d (%dx%d)", CLASSNAME, __FUNCTION__, m_renderBuffer->mmal_buffer, m_renderBuffer, old, m_renderBuffer->GetMem(), m_renderBuffer->Width(), m_renderBuffer->Height(), m_renderBuffer->AlignedWidth(), m_renderBuffer->AlignedHeight());
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - mmal:%p buf:%p old:%p gpu:%p %dx%d (%dx%d)",
+ CLASSNAME, __FUNCTION__, static_cast<void*>(m_renderBuffer->mmal_buffer),
+ static_cast<void*>(m_renderBuffer), static_cast<void*>(old),
+ static_cast<void*>(m_renderBuffer->GetMem()), m_renderBuffer->Width(),
+ m_renderBuffer->Height(), m_renderBuffer->AlignedWidth(),
+ m_renderBuffer->AlignedHeight());
 m_renderBuffer->Acquire();
 }
 }
@@ -310,7 +321,12 @@
 picture->videoBuffer->Release();
 
 picture->videoBuffer = m_renderBuffer;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p old:%p gpu:%p %dx%d (%dx%d)", CLASSNAME, __FUNCTION__, m_renderBuffer->mmal_buffer, 1e-6*picture->dts, 1e-6*picture->pts, m_renderBuffer, old, m_renderBuffer->GetMem(), m_renderBuffer->Width(), m_renderBuffer->Height(), m_renderBuffer->AlignedWidth(), m_renderBuffer->AlignedHeight());
+ CLog::Log(
+ LOGDEBUG, LOGVIDEO, "%s::%s - mmal:%p dts:%.3f pts:%.3f buf:%p old:%p gpu:%p %dx%d (%dx%d)",
+ CLASSNAME, __FUNCTION__, static_cast<void*>(m_renderBuffer->mmal_buffer), 1e-6 * picture->dts,
+ 1e-6 * picture->pts, static_cast<void*>(m_renderBuffer), static_cast<void*>(old),
+ static_cast<void*>(m_renderBuffer->GetMem()), m_renderBuffer->Width(),
+ m_renderBuffer->Height(), m_renderBuffer->AlignedWidth(), m_renderBuffer->AlignedHeight());
 picture->videoBuffer->Acquire();
 
 return true;

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2014 Team XBMC
- * http://xbmc.org
+ * http://kodi.tv
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -842,10 +842,8 @@
 
 // send frame to output for processing
 CVaapiDecodedPicture pic;
- memset(&pic.DVDPic, 0, sizeof(pic.DVDPic));
 static_cast<ICallbackHWAccel*>(avctx->opaque)->GetPictureCommon(&pic.DVDPic);
 pic.videoSurface = surf;
- pic.DVDPic.color_matrix = avctx->colorspace;
 m_bufferStats.IncDecoded();
 m_vaapiOutput.m_dataPort.SendOutMessage(COutputDataProtocol::NEWFRAME, &pic, sizeof(pic));
 
@@ -1366,6 +1364,20 @@
 }
 }
 
+void CVaapiRenderPicture::GetPlanes(uint8_t*(&planes)[YuvImage::MAX_PLANES])
+{
+ planes[0] = avFrame->data[0];
+ planes[1] = avFrame->data[1];
+ planes[2] = avFrame->data[2];
+}
+
+void CVaapiRenderPicture::GetStrides(int(&strides)[YuvImage::MAX_PLANES])
+{
+ strides[0] = avFrame->linesize[0];
+ strides[1] = avFrame->linesize[1];
+ strides[2] = avFrame->linesize[2];
+}
+
 //-----------------------------------------------------------------------------
 // Output
 //-----------------------------------------------------------------------------
@@ -1925,7 +1937,7 @@
 if (!m_config.processInfo->Supports(method))
 method = VS_INTERLACEMETHOD_VAAPI_BOB;
 
- if (m_pp && (method != m_currentDiMethod || !m_pp->Compatible(method)))
+ if (m_pp && !m_pp->UpdateDeintMethod(method))
 {
 delete m_pp;
 m_pp = NULL;
@@ -1948,7 +1960,6 @@
 if (m_pp->PreInit(m_config))
 {
 m_pp->Init(method);
- m_currentDiMethod = method;
 
 if (method == VS_INTERLACEMETHOD_DEINTERLACE)
 m_config.processInfo->SetVideoDeintMethod("yadif");
@@ -1972,7 +1983,7 @@
 else
 {
 method = VS_INTERLACEMETHOD_NONE;
- if (m_pp && !m_pp->Compatible(method))
+ if (m_pp && !m_pp->UpdateDeintMethod(method))
 {
 delete m_pp;
 m_pp = NULL;
@@ -1991,7 +2002,6 @@
 if (m_pp->PreInit(m_config))
 {
 m_pp->Init(method);
- m_currentDiMethod = method;
 m_config.processInfo->SetVideoDeintMethod("none");
 }
 else
@@ -2214,7 +2224,7 @@
 
 }
 
-bool CSkipPostproc::Compatible(EINTERLACEMETHOD method)
+bool CSkipPostproc::UpdateDeintMethod(EINTERLACEMETHOD method)
 {
 if (method == VS_INTERLACEMETHOD_NONE)
 return true;
@@ -2382,9 +2392,6 @@
 m_currentIdx = 0;
 m_frameCount = 0;
 
-// if (method == VS_INTERLACEMETHOD_NONE)
-// return true;
-
 VAProcFilterParameterBufferDeinterlacing filterparams;
 filterparams.type = VAProcFilterDeinterlacing;
 filterparams.algorithm = vppMethod;
@@ -2474,14 +2481,16 @@
 // clear reference in case we return false
 m_videoSurfaces.ClearReference(surf);
 
+ // move window of frames we are looking at to account for backward (=future) refs
+ const auto currentIdx = m_currentIdx - m_backwardRefs;
+
 // make sure we have all needed forward refs
- if ((m_currentIdx - m_forwardRefs) < m_decodedPics.back().index)
+ if ((currentIdx - m_forwardRefs) < m_decodedPics.back().index)
 {
 Advance();
 return false;
 }
 
- const auto currentIdx = m_currentIdx;
 auto it = std::find_if(m_decodedPics.begin(), m_decodedPics.end(),
 [currentIdx](const CVaapiDecodedPicture &picture){
 return picture.index == currentIdx;
@@ -2540,9 +2549,9 @@
 pipelineParams->num_forward_references = 0;
 pipelineParams->num_backward_references = 0;
 
- int maxPic = m_currentIdx + m_backwardRefs;
- int minPic = m_currentIdx - m_forwardRefs;
- int curPic = m_currentIdx;
+ int maxPic = currentIdx + m_backwardRefs;
+ int minPic = currentIdx - m_forwardRefs;
+ int curPic = currentIdx;
 
 // deinterlace flag
 if (m_vppMethod != VS_INTERLACEMETHOD_NONE)
@@ -2658,7 +2667,7 @@
 auto it = m_decodedPics.begin();
 while (it != m_decodedPics.end())
 {
- if (it->index < m_currentIdx - m_forwardRefs)
+ if (it->index < m_currentIdx - m_forwardRefs - m_backwardRefs)
 {
 m_config.videoSurfaces->ClearRender(it->videoSurface);
 it = m_decodedPics.erase(it);
@@ -2684,8 +2693,12 @@
 }
 }
 
-bool CVppPostproc::Compatible(EINTERLACEMETHOD method)
+bool CVppPostproc::UpdateDeintMethod(EINTERLACEMETHOD method)
 {
+ // could try to update method, for now trigger deinit/init
+ if (method != m_vppMethod)
+ return false;
+
 if (method == VS_INTERLACEMETHOD_VAAPI_BOB ||
 method == VS_INTERLACEMETHOD_VAAPI_MADI ||
 method == VS_INTERLACEMETHOD_VAAPI_MACI ||
@@ -2924,6 +2937,9 @@
 else
 m_pFilterFrameIn->pts = (inPic.DVDPic.pts / DVD_TIME_BASE) * AV_TIME_BASE;
 
+ m_pFilterFrameIn->pkt_dts = m_pFilterFrameIn->pts;
+ m_pFilterFrameIn->best_effort_timestamp = m_pFilterFrameIn->pts;
+
 av_frame_get_buffer(m_pFilterFrameIn, 64);
 
 uint8_t *src, *dst;
@@ -2999,9 +3015,10 @@
 
 outPic.source = CVaapiProcessedPicture::FFMPEG_SRC;
 
- if(outPic.frame->pts != AV_NOPTS_VALUE)
+ int64_t bpts = av_frame_get_best_effort_timestamp(outPic.frame);
+ if(bpts != AV_NOPTS_VALUE)
 {
- outPic.DVDPic.pts = (double)outPic.frame->pts * DVD_TIME_BASE / AV_TIME_BASE;
+ outPic.DVDPic.pts = (double)bpts * DVD_TIME_BASE / AV_TIME_BASE;
 }
 else
 outPic.DVDPic.pts = DVD_NOPTS_VALUE;
@@ -3013,11 +3030,6 @@
 }
 m_lastOutPts = pts;
 
- //for (int i = 0; i < 4; i++)
- // outPic.DVDPic.data[i] = outPic.frame->data[i];
- //for (int i = 0; i < 4; i++)
- // outPic.DVDPic.iLineSize[i] = outPic.frame->linesize[i];
-
 return true;
 }
 
@@ -3043,8 +3055,12 @@
 m_lastOutPts = DVD_NOPTS_VALUE;
 }
 
-bool CFFmpegPostproc::Compatible(EINTERLACEMETHOD method)
+bool CFFmpegPostproc::UpdateDeintMethod(EINTERLACEMETHOD method)
 {
+ // switching between certain methods should be done without deinit/init
+ if (method != m_diMethod)
+ return false;
+
 if (method == VS_INTERLACEMETHOD_DEINTERLACE)
 return true;
 else if (method == VS_INTERLACEMETHOD_RENDER_BOB)

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2014 Team XBMC
- * http://xbmc.org
+ * http://kodi.tv
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 #include "threads/Event.h"
 #include "threads/Thread.h"
 #include "utils/ActorProtocol.h"
-#include "guilib/Geometry.h"
+#include "utils/Geometry.h"
 #include <list>
 #include <map>
 #include <memory>
@@ -181,6 +181,8 @@
 {
 public:
 explicit CVaapiRenderPicture(int id) : CVideoBuffer(id) { }
+ void GetPlanes(uint8_t*(&planes)[YuvImage::MAX_PLANES]) override;
+ void GetStrides(int(&strides)[YuvImage::MAX_PLANES]) override;
 VideoPicture DVDPic;
 CVaapiProcessedPicture procPic;
 AVFrame *avFrame = nullptr;
@@ -289,7 +291,6 @@
 CVaapiDecodedPicture m_currentPicture;
 CPostproc *m_pp;
 SDiMethods m_diMethods;
- EINTERLACEMETHOD m_currentDiMethod;
 };
 
 //-----------------------------------------------------------------------------
@@ -455,7 +456,7 @@
 virtual bool Filter(CVaapiProcessedPicture &outPic) = 0;
 virtual void ClearRef(VASurfaceID surf) = 0;
 virtual void Flush() = 0;
- virtual bool Compatible(EINTERLACEMETHOD method) = 0;
+ virtual bool UpdateDeintMethod(EINTERLACEMETHOD method) = 0;
 virtual bool DoesSync() = 0;
 virtual bool WantsPic() {return true;}
 protected:
@@ -475,7 +476,7 @@
 bool Filter(CVaapiProcessedPicture &outPic) override;
 void ClearRef(VASurfaceID surf) override;
 void Flush() override;
- bool Compatible(EINTERLACEMETHOD method) override;
+ bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
 bool DoesSync() override;
 protected:
 CVaapiDecodedPicture m_pic;
@@ -495,7 +496,7 @@
 bool Filter(CVaapiProcessedPicture &outPic) override;
 void ClearRef(VASurfaceID surf) override;
 void Flush() override;
- bool Compatible(EINTERLACEMETHOD method) override;
+ bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
 bool DoesSync() override;
 bool WantsPic() override;
 protected:
@@ -527,7 +528,7 @@
 bool Filter(CVaapiProcessedPicture &outPic) override;
 void ClearRef(VASurfaceID surf) override;
 void Flush() override;
- bool Compatible(EINTERLACEMETHOD method) override;
+ bool UpdateDeintMethod(EINTERLACEMETHOD method) override;
 bool DoesSync() override;
 protected:
 bool CheckSuccess(VAStatus status);

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -1099,10 +1099,9 @@
 
 // send frame to output for processing
 CVdpauDecodedPicture pic;
- memset(&pic.DVDPic, 0, sizeof(pic.DVDPic));
 static_cast<ICallbackHWAccel*>(avctx->opaque)->GetPictureCommon(&pic.DVDPic);
 pic.videoSurface = surf;
- pic.DVDPic.color_matrix = avctx->colorspace;
+ pic.DVDPic.color_space = avctx->colorspace;
 m_bufferStats.IncDecoded();
 m_vdpauOutput.m_dataPort.SendOutMessage(COutputDataProtocol::NEWFRAME, &pic, sizeof(pic));
 
@@ -1877,12 +1876,12 @@
 }
 if (m_Brightness != m_config.processInfo->GetVideoSettings().m_Brightness ||
 m_Contrast != m_config.processInfo->GetVideoSettings().m_Contrast ||
- m_ColorMatrix != m_mixerInput[1].DVDPic.color_matrix)
+ m_ColorMatrix != m_mixerInput[1].DVDPic.color_space)
 {
 SetColor();
 m_Brightness = m_config.processInfo->GetVideoSettings().m_Brightness;
 m_Contrast = m_config.processInfo->GetVideoSettings().m_Contrast;
- m_ColorMatrix = m_mixerInput[1].DVDPic.color_matrix;
+ m_ColorMatrix = m_mixerInput[1].DVDPic.color_space;
 }
 if (m_NoiseReduction != m_config.processInfo->GetVideoSettings().m_NoiseReduction)
 {
@@ -2031,7 +2030,7 @@
 m_Procamp.contrast = (float)((m_config.processInfo->GetVideoSettings().m_Contrast)+50) / 100;
 
 VdpColorStandard colorStandard;
- switch(m_mixerInput[1].DVDPic.color_matrix)
+ switch(m_mixerInput[1].DVDPic.color_space)
 {
 case AVCOL_SPC_BT709:
 colorStandard = VDP_COLOR_STANDARD_ITUR_BT_709;

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VDPAU.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDCodecs/Video/VTB.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemux.cpp Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxBXA.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCC.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxCDDA.h Changed

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

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -205,7 +205,7 @@
     if (stream->m_context->profile != st->profile &&
         stream->m_context->profile != FF_PROFILE_UNKNOWN)
     {
-      CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} profile changed from %d to %d", st->uniqueId, st->profile, stream->m_context->profile);
+      CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) profile changed from {} to {}", st->uniqueId, st->profile, stream->m_context->profile);
       st->profile = stream->m_context->profile;
       st->changes++;
       st->disabled = false;
@@ -214,7 +214,7 @@
     if (stream->m_context->level != st->level &&
         stream->m_context->level != FF_LEVEL_UNKNOWN)
     {
-      CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} level changed from %d to %d", st->uniqueId, st->level, stream->m_context->level);
+      CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) level changed from {} to {}", st->uniqueId, st->level, stream->m_context->level);
       st->level = stream->m_context->level;
       st->changes++;
       st->disabled = false;
@@ -228,7 +228,7 @@
         if (stream->m_context->channels != sta->iChannels &&
             stream->m_context->channels != 0)
         {
-          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} channels changed from %d to %d", st->uniqueId, sta->iChannels, stream->m_context->channels);
+          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) channels changed from {} to {}", st->uniqueId, sta->iChannels, stream->m_context->channels);
           sta->iChannels = stream->m_context->channels;
           sta->changes++;
           sta->disabled = false;
@@ -236,7 +236,7 @@
         if (stream->m_context->sample_rate != sta->iSampleRate &&
             stream->m_context->sample_rate != 0)
         {
-          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} samplerate changed from %d to %d", st->uniqueId, sta->iSampleRate, stream->m_context->sample_rate);
+          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) samplerate changed from {} to {}", st->uniqueId, sta->iSampleRate, stream->m_context->sample_rate);
           sta->iSampleRate = stream->m_context->sample_rate;
           sta->changes++;
           sta->disabled = false;
@@ -249,7 +249,7 @@
         if (stream->m_context->width != stv->iWidth &&
             stream->m_context->width != 0)
         {
-          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} width changed from %d to %d", st->uniqueId, stv->iWidth, stream->m_context->width);
+          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) width changed from {} to {}", st->uniqueId, stv->iWidth, stream->m_context->width);
           stv->iWidth = stream->m_context->width;
           stv->changes++;
           stv->disabled = false;
@@ -257,7 +257,7 @@
         if (stream->m_context->height != stv->iHeight &&
             stream->m_context->height != 0)
         {
-          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - {%d} height changed from %d to %d", st->uniqueId, stv->iHeight, stream->m_context->height);
+          CLog::Log(LOGDEBUG, "CDVDDemuxClient::ParsePacket - ({}) height changed from {} to {}", st->uniqueId, stv->iHeight, stream->m_context->height);
           stv->iHeight = stream->m_context->height;
           stv->changes++;
           stv->disabled = false;
@@ -438,7 +438,6 @@
     streamVideo->iFpsRate        = source->iFpsRate;
     streamVideo->fAspect         = source->fAspect;
     streamVideo->iBitRate = source->iBitRate;
-    streamVideo->stereo_mode     = "mono";
     if (source->ExtraSize > 0 && source->ExtraData)
     {
       delete[] streamVideo->ExtraData;

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

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxUtils.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxVobsub.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DVDFactoryDemuxer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDDemuxers/DemuxMultiSource.h Changed

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

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStream.cpp Changed

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

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

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamFile.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamMemory.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamStack.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DVDStateSerializer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/DllDvdNav.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamAddon.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiSource.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/InputStreamMultiStreams.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDInputStreams/dvdnav/config.h Changed

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -209,7 +209,7 @@
 level = right.level;
 flags = right.flags;
 
- if( withextradata && right.ExtraSize )
+ if (withextradata && right.ExtraSize)
 {
 extrasize = right.ExtraSize;
 extradata = malloc(extrasize);
@@ -221,7 +221,7 @@
 cryptoSession = right.cryptoSession;
 externalInterfaces = right.externalInterfaces;
 
- if( right.type == STREAM_AUDIO )
+ if (right.type == STREAM_AUDIO)
 {
 const CDemuxStreamAudio *stream = static_cast<const CDemuxStreamAudio*>(&right);
 channels = stream->iChannels;
@@ -231,7 +231,7 @@
 bitspersample = stream->iBitsPerSample;
 channellayout = stream->iChannelLayout;
 }
- else if( right.type == STREAM_VIDEO )
+ else if (right.type == STREAM_VIDEO)
 {
 const CDemuxStreamVideo *stream = static_cast<const CDemuxStreamVideo*>(&right);
 fpsscale = stream->iFpsScale;
@@ -246,7 +246,7 @@
 bitsperpixel = stream->iBitsPerPixel;
 stereo_mode = stream->stereo_mode;
 }
- else if( right.type == STREAM_SUBTITLE )
+ else if (right.type == STREAM_SUBTITLE)
 {
 }
 }

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDFactorySubtitle.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleLineCollection.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParser.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMPL2.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSSA.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSami.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserSubrip.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleParserVplayer.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleStream.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitleTagSami.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitlesLibass.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/DVDSubtitles/DllLibass.h Changed

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Interface/Addon/DemuxCrypto.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Interface/Addon/DemuxPacket.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Interface/Addon/TimingConstants.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Interface/StreamInfo.h Changed

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

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

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/VideoBuffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/VideoBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/X11/ProcessInfoX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/X11/ProcessInfoX11.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/ios/ProcessInfoIOS.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/ios/ProcessInfoIos.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/osx/ProcessInfoOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/osx/ProcessInfoOSX.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/wayland/ProcessInfoWayland.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/wayland/ProcessInfoWayland.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/windows/ProcessInfoWin.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/windows/ProcessInfoWin.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/windows/ProcessInfoWin10.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/Process/windows/ProcessInfoWin10.h Changed

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

@@ -54,7 +54,6 @@
 #include "DVDDemuxers/DVDDemuxCC.h"
 #include "cores/FFmpeg.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
-#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "cores/VideoPlayer/Process/ProcessInfo.h"
 #include "settings/AdvancedSettings.h"
 #include "FileItem.h"
@@ -3651,8 +3650,6 @@
 if (hint.stereo_mode.empty())
 hint.stereo_mode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(m_item.GetPath());
 
- SelectionStream& s = m_SelectionStreams.Get(STREAM_VIDEO, 0);
-
 if (hint.flags & AV_DISPOSITION_ATTACHED_PIC)
 return false;
 
@@ -3663,7 +3660,7 @@
 if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_ADJUSTREFRESHRATE) != ADJUST_REFRESHRATE_OFF)
 {
 double framerate = DVD_TIME_BASE / CDVDCodecUtils::NormalizeFrameduration((double)DVD_TIME_BASE * hint.fpsscale / hint.fpsrate);
- m_renderManager.TriggerUpdateResolution(static_cast<float>(framerate), hint.width, RenderManager::GetStereoModeFlags(hint.stereo_mode));
+ m_renderManager.TriggerUpdateResolution(static_cast<float>(framerate), hint.width, hint.stereo_mode);
 }
 }
 
@@ -3688,9 +3685,6 @@
 m_Edl.ReadEditDecisionLists(m_item.GetDynPath(), fFramesPerSecond, m_CurrentVideo.hint.height);
 }
 
- if (s.stereo_mode == "mono")
- s.stereo_mode = "";
-
 static_cast<IDVDStreamPlayerVideo*>(player)->SetSpeed(m_streamPlayerSpeed);
 m_CurrentVideo.syncState = IDVDStreamPlayer::SYNC_STARTING;
 m_CurrentVideo.packets = 0;
@@ -3806,10 +3800,11 @@
 m_pDemuxer->EnableStream(current.demuxerId, current.id, false);
 
 IDVDStreamPlayer* player = GetStreamPlayer(current.player);
- if(player)
+ if (player)
 {
 if ((current.type == STREAM_AUDIO && current.syncState != IDVDStreamPlayer::SYNC_INSYNC) ||
- (current.type == STREAM_VIDEO && current.syncState != IDVDStreamPlayer::SYNC_INSYNC))
+ (current.type == STREAM_VIDEO && current.syncState != IDVDStreamPlayer::SYNC_INSYNC) ||
+ m_bAbortRequest)
 bWaitForBuffers = false;
 player->CloseStream(bWaitForBuffers);
 }
@@ -4779,7 +4774,8 @@
 
 void CVideoPlayer::TriggerUpdateResolution()
 {
- m_renderManager.TriggerUpdateResolution(0, 0, 0);
+ std::string stereomode;
+ m_renderManager.TriggerUpdateResolution(0, 0, stereomode);
 }
 
 bool CVideoPlayer::IsRenderingVideo()

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,7 +20,6 @@
 
 #include "system.h"
 #include "ServiceBroker.h"
-#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "windowing/WinSystem.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/Settings.h"
@@ -39,8 +38,6 @@
 #include <iterator>
 #include "utils/log.h"
 
-using namespace RenderManager;
-
 class CDVDMsgVideoCodecChange : public CDVDMsg
 {
 public:
@@ -314,8 +311,6 @@
 {
 CLog::Log(LOGNOTICE, "running thread: video_thread");
 
- memset(&m_picture, 0, sizeof(VideoPicture));
-
 double pts = 0;
 double frametime = (double)DVD_TIME_BASE / m_fFrameRate;
 
@@ -682,9 +677,35 @@
 m_picture.pts = m_picture.dts;
 
 // use forced aspect if any
- if( m_fForcedAspectRatio != 0.0f )
+ if (m_fForcedAspectRatio != 0.0f)
 m_picture.iDisplayWidth = (int) (m_picture.iDisplayHeight * m_fForcedAspectRatio);
 
+ // set stereo mode if not set by decoder
+ if (m_picture.stereoMode.empty())
+ {
+ std::string stereoMode;
+ switch(m_processInfo.GetVideoSettings().m_StereoMode)
+ {
+ case RENDER_STEREO_MODE_SPLIT_VERTICAL:
+ stereoMode = "left_right";
+ if (m_processInfo.GetVideoSettings().m_StereoInvert)
+ stereoMode = "right_left";
+ break;
+ case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
+ stereoMode = "top_bottom";
+ if (m_processInfo.GetVideoSettings().m_StereoInvert)
+ stereoMode = "bottom_top";
+ break;
+ default:
+ stereoMode = m_hints.stereo_mode;
+ break;
+ }
+ if (!stereoMode.empty() && stereoMode != "mono")
+ {
+ m_picture.stereoMode = stereoMode;
+ }
+ }
+
 // if frame has a pts (usually originiating from demux packet), use that
 if (m_picture.pts != DVD_NOPTS_VALUE)
 {
@@ -803,69 +824,22 @@
 }
 }
 
-std::string CVideoPlayerVideo::GetStereoMode()
-{
- std::string stereoMode;
-
- switch(m_processInfo.GetVideoSettings().m_StereoMode)
- {
- case RENDER_STEREO_MODE_SPLIT_VERTICAL:
- stereoMode = "left_right";
- break;
- case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
- stereoMode = "top_bottom";
- break;
- default:
- stereoMode = m_processInfo.GetVideoStereoMode();
- break;
- }
-
- if (m_processInfo.GetVideoSettings().m_StereoInvert)
- stereoMode = GetStereoModeInvert(stereoMode);
-
- return stereoMode;
-}
-
 CVideoPlayerVideo::EOutputState CVideoPlayerVideo::OutputPicture(const VideoPicture* pPicture)
 {
 m_bAbortOutput = false;
 
- if (m_syncState == ESyncState::SYNC_STARTING)
- m_processInfo.SetVideoStereoMode(m_hints.stereo_mode);
- // grab stereo mode from image if available
- if (pPicture->stereo_mode[0] && m_processInfo.GetVideoStereoMode().compare(pPicture->stereo_mode) != 0)
+ if (m_processInfo.GetVideoStereoMode() != pPicture->stereoMode)
 {
- m_processInfo.SetVideoStereoMode(pPicture->stereo_mode);
+ m_processInfo.SetVideoStereoMode(pPicture->stereoMode);
 // signal about changes in video parameters
 m_messageParent.Put(new CDVDMsg(CDVDMsg::PLAYER_AVCHANGE));
 }
 
- /* figure out steremode expected based on user settings and hints */
- unsigned int stereo_flags = GetStereoModeFlags(GetStereoMode());
-
 double config_framerate = m_bFpsInvalid ? 0.0 : m_fFrameRate;
 
- unsigned flags = 0;
- if (pPicture->color_range == 1)
- flags |= CONF_FLAGS_YUV_FULLRANGE;
-
- flags |= GetFlagsChromaPosition(pPicture->chroma_position)
- | GetFlagsColorMatrix(pPicture->color_matrix, pPicture->iWidth, pPicture->iHeight)
- | GetFlagsColorPrimaries(pPicture->color_primaries)
- | GetFlagsColorTransfer(pPicture->color_transfer);
-
-
- if(m_bAllowFullscreen)
- {
- flags |= CONF_FLAGS_FULLSCREEN;
- m_bAllowFullscreen = false; // only allow on first configure
- }
-
- flags |= stereo_flags;
-
 if (!m_renderManager.Configure(*pPicture,
 static_cast<float>(config_framerate),
- flags,
+ m_bAllowFullscreen,
 m_hints.orientation,
 m_pVideoCodec->GetAllowedReferences()))
 {
@@ -873,6 +847,8 @@
 return OUTPUT_ABORT;
 }
 
+ m_bAllowFullscreen = false;
+
 //try to calculate the framerate
 m_ptsTracker.Add(pPicture->pts);
 if (!m_stalled)

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -25,7 +25,7 @@
 
 #include "RenderInfo.h"
 #include "guilib/Resolution.h"
-#include "guilib/Geometry.h"
+#include "utils/Geometry.h"
 #include "VideoShaders/ShaderFormats.h"
 #include "cores/IPlayer.h"
 #include "cores/VideoPlayer/Process/VideoBuffer.h"
@@ -63,7 +63,7 @@
   virtual ~CBaseRenderer();
 
   // Player functions
-  virtual bool Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation) = 0;
+  virtual bool Configure(const VideoPicture &picture, float fps, unsigned int orientation) = 0;
   virtual bool IsConfigured() = 0;
   virtual void AddVideoPicture(const VideoPicture &picture, int index, double currentClock) = 0;
   virtual bool IsPictureHW(const VideoPicture &picture) { return false; };

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/DebugRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/FrameBufferObject.cpp Changed

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -34,6 +34,7 @@
 #include "rendering/dx/DeviceResources.h"
 
 using namespace DXVA;
+using namespace Microsoft::WRL;
 
 #define LOGIFERROR(a) \
 do { \
@@ -65,30 +66,28 @@
 {
 CSingleLock lock(m_section);
 Close();
- SAFE_RELEASE(m_pVideoDevice);
+ m_pVideoDevice = nullptr;
 }
 
 void CProcessorHD::Close()
 {
 CSingleLock lock(m_section);
- SAFE_RELEASE(m_pEnumerator);
- SAFE_RELEASE(m_pVideoProcessor);
- SAFE_RELEASE(m_pVideoContext);
+ m_pEnumerator = nullptr;
+ m_pVideoProcessor = nullptr;
+ m_pVideoContext = nullptr;
 }
 
 bool CProcessorHD::PreInit()
 {
- SAFE_RELEASE(m_pVideoDevice);
-
- ID3D11Device* pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
- if (FAILED(pD3DDevice->QueryInterface(__uuidof(ID3D11VideoDevice), reinterpret_cast<void**>(&m_pVideoDevice))))
+ ComPtr<ID3D11Device> pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ if (FAILED(pD3DDevice.As(&m_pVideoDevice)))
 {
 CLog::Log(LOGWARNING, "%s: failed to get video device.", __FUNCTION__);
 return false;
 }
 
- D3D11_VIDEO_PROCESSOR_CONTENT_DESC desc1;
- ZeroMemory(&desc1, sizeof(D3D11_VIDEO_PROCESSOR_CONTENT_DESC));
+ D3D11_VIDEO_PROCESSOR_CONTENT_DESC desc1 = { };
+ memset(&desc1, 0, sizeof(D3D11_VIDEO_PROCESSOR_CONTENT_DESC));
 desc1.InputFrameFormat = D3D11_VIDEO_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST;
 desc1.InputWidth = 640;
 desc1.InputHeight = 480;
@@ -97,23 +96,23 @@
 desc1.Usage = D3D11_VIDEO_USAGE_PLAYBACK_NORMAL;
 
 // try to create video enum
- if (FAILED(m_pVideoDevice->CreateVideoProcessorEnumerator(&desc1, &m_pEnumerator)))
+ if (FAILED(m_pVideoDevice->CreateVideoProcessorEnumerator(&desc1, m_pEnumerator.ReleaseAndGetAddressOf())))
 {
 CLog::Log(LOGWARNING, "%s: failed to create Video Enumerator.", __FUNCTION__);
 return false;
 }
 
- SAFE_RELEASE(m_pEnumerator);
+ m_pEnumerator = nullptr;
 return true;
 }
 
 bool CProcessorHD::InitProcessor()
 {
- SAFE_RELEASE(m_pEnumerator);
- SAFE_RELEASE(m_pVideoContext);
+ m_pEnumerator = nullptr;
+ m_pVideoContext = nullptr;
 
- ID3D11DeviceContext1* pD3DDeviceContext = DX::DeviceResources::Get()->GetImmediateContext();
- if (FAILED(pD3DDeviceContext->QueryInterface(__uuidof(ID3D11VideoContext), reinterpret_cast<void**>(&m_pVideoContext))))
+ ComPtr<ID3D11DeviceContext1> pD3DDeviceContext = DX::DeviceResources::Get()->GetImmediateContext();
+ if (FAILED(pD3DDeviceContext.As(&m_pVideoContext)))
 {
 CLog::Log(LOGWARNING, "%s: Context initialization is failed.", __FUNCTION__);
 return false;
@@ -121,8 +120,8 @@
 
 CLog::Log(LOGDEBUG, "%s: Initing Video Enumerator with params: %dx%d.", __FUNCTION__, m_width, m_height);
 
- D3D11_VIDEO_PROCESSOR_CONTENT_DESC contentDesc;
- ZeroMemory(&contentDesc, sizeof(contentDesc));
+ D3D11_VIDEO_PROCESSOR_CONTENT_DESC contentDesc = {};
+ memset(&contentDesc, 0, sizeof(contentDesc));
 contentDesc.InputFrameFormat = D3D11_VIDEO_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST;
 contentDesc.InputWidth = m_width;
 contentDesc.InputHeight = m_height;
@@ -130,7 +129,7 @@
 contentDesc.OutputHeight = m_height;
 contentDesc.Usage = D3D11_VIDEO_USAGE_PLAYBACK_NORMAL;
 
- if (FAILED(m_pVideoDevice->CreateVideoProcessorEnumerator(&contentDesc, &m_pEnumerator)))
+ if (FAILED(m_pVideoDevice->CreateVideoProcessorEnumerator(&contentDesc, m_pEnumerator.ReleaseAndGetAddressOf())))
 {
 CLog::Log(LOGWARNING, "%s: failed to init video enumerator with params: %dx%d.", __FUNCTION__, m_width, m_height);
 return false;
@@ -230,7 +229,8 @@
 bool CProcessorHD::CheckFormats() const
 {
 // check default output format DXGI_FORMAT_B8G8R8A8_UNORM (as render target)
- if (!IsFormatSupported(DXGI_FORMAT_B8G8R8A8_UNORM, D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
+ DXGI_FORMAT backBufferFormat = DX::Windowing().GetBackBuffer()->GetFormat();
+ if (!IsFormatSupported(backBufferFormat, D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
 return false;
 return true;
 }
@@ -278,11 +278,10 @@
 if (!m_pEnumerator && !ReInit())
 return false;
 
- SAFE_RELEASE(m_pVideoProcessor);
 CLog::Log(LOGDEBUG, "%s: Creating processor.", __FUNCTION__);
 
 // create processor
- HRESULT hr = m_pVideoDevice->CreateVideoProcessor(m_pEnumerator, m_procIndex, &m_pVideoProcessor);
+ HRESULT hr = m_pVideoDevice->CreateVideoProcessor(m_pEnumerator.Get(), m_procIndex, m_pVideoProcessor.ReleaseAndGetAddressOf());
 if (FAILED(hr))
 {
 CLog::Log(LOGDEBUG, "%s: Failed creating video processor with error %x.", __FUNCTION__, hr);
@@ -292,7 +291,7 @@
 // Output background color (black)
 D3D11_VIDEO_COLOR color;
 color.YCbCr = { 0.0625f, 0.5f, 0.5f, 1.0f }; // black color
- m_pVideoContext->VideoProcessorSetOutputBackgroundColor(m_pVideoProcessor, TRUE, &color);
+ m_pVideoContext->VideoProcessorSetOutputBackgroundColor(m_pVideoProcessor.Get(), TRUE, &color);
 
 return true;
 }
@@ -316,13 +315,14 @@
 else
 val = range.Default;
 
- m_pVideoContext->VideoProcessorSetStreamFilter(m_pVideoProcessor, DEFAULT_STREAM_INDEX, filter, val != range.Default, val);
+ m_pVideoContext->VideoProcessorSetStreamFilter(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, filter, val != range.Default, val);
 return true;
 }
 
 ID3D11VideoProcessorInputView* CProcessorHD::GetInputView(CRenderBuffer* view) const
 {
- ID3D11VideoProcessorInputView* inputView = nullptr;
+ HRESULT hr = S_FALSE;
+ ComPtr<ID3D11VideoProcessorInputView> inputView;
 D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC vpivd = { 0, D3D11_VPIV_DIMENSION_TEXTURE2D,{ 0, 0 } };
 
 if (view->format == BUFFER_FMT_D3D11_BYPASS)
@@ -335,42 +335,139 @@
 return nullptr;
 }
 
- ID3D11Resource* resource = nullptr;
+ ComPtr<ID3D11Resource> resource;
 D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC vdovd;
 decoderView->GetDesc(&vdovd);
- decoderView->GetResource(&resource);
+ decoderView->GetResource(resource.GetAddressOf());
 vpivd.Texture2D.ArraySlice = vdovd.Texture2D.ArraySlice;
 
- if (FAILED(m_pVideoDevice->CreateVideoProcessorInputView(resource, m_pEnumerator, &vpivd, &inputView)))
- CLog::Log(LOGERROR, "%s: cannot create processor input view.", __FUNCTION__);
-
- resource->Release();
+ hr = m_pVideoDevice->CreateVideoProcessorInputView(resource.Get(), m_pEnumerator.Get(), &vpivd, inputView.GetAddressOf());
 }
 else if (view->format == BUFFER_FMT_D3D11_NV12
 || view->format == BUFFER_FMT_D3D11_P010
 || view->format == BUFFER_FMT_D3D11_P016)
 {
- if (FAILED(m_pVideoDevice->CreateVideoProcessorInputView(view->GetResource(), m_pEnumerator, &vpivd, &inputView)))
- CLog::Log(LOGERROR, "%s: cannot create processor input view.", __FUNCTION__);
+ hr = m_pVideoDevice->CreateVideoProcessorInputView(view->GetResource(), m_pEnumerator.Get(), &vpivd, inputView.GetAddressOf());
 }
 
- return inputView;
+ if (FAILED(hr) || hr == S_FALSE)
+ CLog::Log(LOGERROR, "%s: cannot create processor input view.", __FUNCTION__);
+
+ return inputView.Detach();
 }
 
 static void ReleaseStream(D3D11_VIDEO_PROCESSOR_STREAM &stream_data)
 {
- SAFE_RELEASE(stream_data.pInputSurface);
-
- for (size_t i = 0; i < stream_data.PastFrames; ++i)
- SAFE_RELEASE(stream_data.ppPastSurfaces[i]);
-
- for (size_t i = 0; i < stream_data.FutureFrames; ++i)
- SAFE_RELEASE(stream_data.ppFutureSurfaces[i]);
-
 delete[] stream_data.ppPastSurfaces;
 delete[] stream_data.ppFutureSurfaces;
 }
 
+static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(CRenderBuffer* view) 
+{
+ if (view->color_space == AVCOL_SPC_RGB)
+ {
+ if (!view->full_range) 
+ {
+ if (view->primaries == AVCOL_PRI_BT2020) 
+ {
+ if (view->color_transfer == AVCOL_TRC_SMPTEST2084) 
+ {
+ return DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020;
+ }
+ else 
+ {
+ return DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020;
+ }
+ }
+ else 
+ {
+ return DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709;
+ }
+ }
+ else 
+ {
+ if (view->primaries == AVCOL_PRI_BT2020) 
+ {
+ if (view->color_transfer == AVCOL_TRC_SMPTEST2084) 
+ {
+ return DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020;
+ }
+ else 
+ {
+ return DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020;
+ }
+ }
+ else 
+ {
+ if (view->color_transfer == AVCOL_TRC_LINEAR ||
+ view->color_transfer == AVCOL_TRC_LOG) 
+ {
+ return DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709;
+ }
+ else 
+ {
+ return DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709;
+ }
+ }
+ }
+ }
+ else 
+ {
+ if (view->primaries == AVCOL_PRI_BT2020) // UHDTV
+ {
+ if (view->color_transfer == AVCOL_TRC_SMPTEST2084) // HDR
+ {
+ return DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020;
+ // Could also be:
+ // DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020
+ }
+ else
+ {
+ if (view->full_range)
+ {
+ return DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020;
+ }
+ else
+ {
+ return DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020;
+ // Could also be:
+ // DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020
+ }
+ }
+ }
+ else if (view->primaries == AVCOL_PRI_BT470BG ||
+ view->primaries == AVCOL_PRI_SMPTE170M) // SDTV
+ {
+ if (view->full_range)
+ {
+ return DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601;
+ }
+ else
+ {
+ return DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601;
+ }
+ }
+ else // HDTV
+ {
+ if (view->full_range)
+ {
+ if (view->color_transfer == AVCOL_TRC_SMPTE170M)
+ {
+ return DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601;
+ }
+ else
+ {
+ return DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709;
+ }
+ }
+ else
+ {
+ return DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709;
+ }
+ }
+ }
+}
+
 bool CProcessorHD::Render(CRect src, CRect dst, ID3D11Resource* target, CRenderBuffer** views, DWORD flags, UINT frameIdx, UINT rotation, float contrast, float brightness)
 {
 HRESULT hr;
@@ -412,7 +509,7 @@
 if (futureFrames)
 stream_data.ppFutureSurfaces = new ID3D11VideoProcessorInputView*[futureFrames];
 
- ID3D11VideoProcessorInputView* view = nullptr;
+ std::vector<ComPtr<ID3D11VideoProcessorInputView>> comViews;
 int start = 2 - futureFrames;
 int end = 2 + pastFrames;
 int count = 0;
@@ -422,23 +519,28 @@
 if (!views[i])
 continue;
 
- view = GetInputView(views[i]);
+ ComPtr<ID3D11VideoProcessorInputView> view;
+ view.Attach(GetInputView(views[i]));
+
 if (i > 2)
 {
 // frames order should be { ?, T-3, T-2, T-1 }
- stream_data.ppPastSurfaces[2 + pastFrames - i] = view;
+ stream_data.ppPastSurfaces[2 + pastFrames - i] = view.Get();
 }
 else if (i == 2)
 {
- stream_data.pInputSurface = view;
+ stream_data.pInputSurface = view.Get();
 }
 else if (i < 2)
 {
 // frames order should be { T+1, T+2, T+3, .. }
- stream_data.ppFutureSurfaces[1 - i] = view;
+ stream_data.ppFutureSurfaces[1 - i] = view.Get();
 }
 if (view)
+ {
 count++;
+ comViews.push_back(view);
+ }
 }
 
 if (count != pastFrames + futureFrames + 1)
@@ -464,31 +566,47 @@
 stream_data.OutputIndex = flags & RENDER_FLAG_FIELD1 && !frameProgressive ? 1 : 0;
 
 // input format
- m_pVideoContext->VideoProcessorSetStreamFrameFormat(m_pVideoProcessor, DEFAULT_STREAM_INDEX, dxvaFrameFormat);
- // input colorspace
- D3D11_VIDEO_PROCESSOR_COLOR_SPACE colorSpace
- {
- 0, // 0 - Playback, 1 - Processing
- 0, // 0 - Full (0-255), 1 - Limited (16-235) (RGB)
- views[2]->flags & CONF_FLAGS_YUVCOEF_BT709 ? 1 : 0, // 0 - BT.601, 1 - BT.709
- 0, // 0 - Conventional YCbCr, 1 - xvYCC
- views[2]->flags & CONF_FLAGS_YUV_FULLRANGE ? 2 : 1, // 0 - driver defaults, 2 - Full range [0-255], 1 - Studio range [16-235] (YUV)
- };
- m_pVideoContext->VideoProcessorSetStreamColorSpace(m_pVideoProcessor, DEFAULT_STREAM_INDEX, &colorSpace);
+ m_pVideoContext->VideoProcessorSetStreamFrameFormat(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, dxvaFrameFormat);
 // Source rect
- m_pVideoContext->VideoProcessorSetStreamSourceRect(m_pVideoProcessor, DEFAULT_STREAM_INDEX, TRUE, &sourceRECT);
+ m_pVideoContext->VideoProcessorSetStreamSourceRect(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, TRUE, &sourceRECT);
 // Stream dest rect
- m_pVideoContext->VideoProcessorSetStreamDestRect(m_pVideoProcessor, DEFAULT_STREAM_INDEX, TRUE, &dstRECT);
+ m_pVideoContext->VideoProcessorSetStreamDestRect(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, TRUE, &dstRECT);
 // Output rect
- m_pVideoContext->VideoProcessorSetOutputTargetRect(m_pVideoProcessor, TRUE, &dstRECT);
- // Output color space
- // don't apply any color range conversion, this will be fixed at later stage.
- colorSpace.Usage = 0; // 0 - playback, 1 - video processing
- colorSpace.RGB_Range = DX::Windowing().UseLimitedColor() ? 1 : 0; // 0 - 0-255, 1 - 16-235
- colorSpace.YCbCr_Matrix = 1; // 0 - BT.601, 1 = BT.709
- colorSpace.YCbCr_xvYCC = 1; // 0 - Conventional YCbCr, 1 - xvYCC
- colorSpace.Nominal_Range = 0; // 2 - 0-255, 1 = 16-235, 0 - undefined
- m_pVideoContext->VideoProcessorSetOutputColorSpace(m_pVideoProcessor, &colorSpace);
+ m_pVideoContext->VideoProcessorSetOutputTargetRect(m_pVideoProcessor.Get(), TRUE, &dstRECT);
+
+ ComPtr<ID3D11VideoContext1> videoCtx1;
+ if (SUCCEEDED(m_pVideoContext.As(&videoCtx1)))
+ {
+ videoCtx1->VideoProcessorSetStreamColorSpace1(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, GetDXGIColorSpace(views[2]));
+ // TODO select color space depend on real output format
+ DXGI_COLOR_SPACE_TYPE colorSpace = DX::Windowing().UseLimitedColor() ? DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 : DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709; 
+ videoCtx1->VideoProcessorSetOutputColorSpace1(m_pVideoProcessor.Get(), colorSpace);
+ // makes target available for processing in shaders
+ videoCtx1->VideoProcessorSetOutputShaderUsage(m_pVideoProcessor.Get(), 1);
+ }
+ else
+ {
+ // input colorspace
+ bool isBT601 = views[2]->color_space == AVCOL_SPC_BT470BG || views[2]->color_space == AVCOL_SPC_SMPTE170M;
+ D3D11_VIDEO_PROCESSOR_COLOR_SPACE colorSpace
+ {
+ 0, // 0 - Playback, 1 - Processing
+ views[2]->full_range ? 0 : 1, // 0 - Full (0-255), 1 - Limited (16-235) (RGB)
+ isBT601 ? 1 : 0, // 0 - BT.601, 1 - BT.709
+ 0, // 0 - Conventional YCbCr, 1 - xvYCC
+ views[2]->full_range ? 2 : 1, // 0 - driver defaults, 2 - Full range [0-255], 1 - Studio range [16-235] (YUV)
+ };
+ m_pVideoContext->VideoProcessorSetStreamColorSpace(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, &colorSpace);
+ // Output color space
+ // don't apply any color range conversion, this will be fixed at later stage.
+ colorSpace.Usage = 0; // 0 - playback, 1 - video processing
+ colorSpace.RGB_Range = DX::Windowing().UseLimitedColor() ? 1 : 0; // 0 - 0-255, 1 - 16-235
+ colorSpace.YCbCr_Matrix = 1; // 0 - BT.601, 1 = BT.709
+ colorSpace.YCbCr_xvYCC = 1; // 0 - Conventional YCbCr, 1 - xvYCC
+ colorSpace.Nominal_Range = 0; // 2 - 0-255, 1 = 16-235, 0 - undefined
+ m_pVideoContext->VideoProcessorSetOutputColorSpace(m_pVideoProcessor.Get(), &colorSpace);
+ }
+
 // brightness
 ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS, 
 brightness, 0, 100, 50);
@@ -499,25 +617,25 @@
 ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_HUE, 50, 0, 100, 50);
 ApplyFilter(D3D11_VIDEO_PROCESSOR_FILTER_SATURATION, 50, 0, 100, 50);
 // Rotation
- m_pVideoContext->VideoProcessorSetStreamRotation(m_pVideoProcessor, DEFAULT_STREAM_INDEX, rotation != 0
+ m_pVideoContext->VideoProcessorSetStreamRotation(m_pVideoProcessor.Get(), DEFAULT_STREAM_INDEX, rotation != 0
 , static_cast<D3D11_VIDEO_PROCESSOR_ROTATION>(rotation / 90));
+
 // create output view for surface.
 D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC OutputViewDesc = { D3D11_VPOV_DIMENSION_TEXTURE2D, { 0 }};
- ID3D11VideoProcessorOutputView* pOutputView = nullptr;
- hr = m_pVideoDevice->CreateVideoProcessorOutputView(target, m_pEnumerator, &OutputViewDesc, &pOutputView);
+ ComPtr<ID3D11VideoProcessorOutputView> pOutputView;
+ hr = m_pVideoDevice->CreateVideoProcessorOutputView(target, m_pEnumerator.Get(), &OutputViewDesc, pOutputView.GetAddressOf());
 if (S_OK != hr)
 CLog::Log(FAILED(hr) ? LOGERROR : LOGWARNING, "%s: Device returns result '%x' while creating processor output view.", __FUNCTION__, hr);
 
 if (SUCCEEDED(hr))
 {
- hr = m_pVideoContext->VideoProcessorBlt(m_pVideoProcessor, pOutputView, frameIdx, 1, &stream_data);
+ hr = m_pVideoContext->VideoProcessorBlt(m_pVideoProcessor.Get(), pOutputView.Get(), frameIdx, 1, &stream_data);
 if (S_OK != hr)
 {
 CLog::Log(FAILED(hr) ? LOGERROR : LOGWARNING, "%s: Device returns result '%x' while VideoProcessorBlt execution.", __FUNCTION__, hr);
 }
 }
 
- SAFE_RELEASE(pOutputView);
 ReleaseStream(stream_data);
 
 return !FAILED(hr);

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,7 +23,9 @@
 #include "DVDCodecs/Video/DVDVideoCodecFFmpeg.h"
 #include "DVDCodecs/Video/DXVA.h"
 #include "guilib/D3DResource.h"
-#include "guilib/Geometry.h"
+#include "utils/Geometry.h"
+
+#include <wrl/client.h>
 
 class CRenderBuffer;
 
@@ -84,10 +86,10 @@
 D3D11_VIDEO_PROCESSOR_FILTER_RANGE Range;
 };
 ProcAmpInfo m_Filters[NUM_FILTERS];
- ID3D11VideoDevice *m_pVideoDevice;
- ID3D11VideoContext *m_pVideoContext;
- ID3D11VideoProcessorEnumerator *m_pEnumerator;
- ID3D11VideoProcessor *m_pVideoProcessor;
+ Microsoft::WRL::ComPtr<ID3D11VideoDevice> m_pVideoDevice;
+ Microsoft::WRL::ComPtr<ID3D11VideoContext> m_pVideoContext;
+ Microsoft::WRL::ComPtr<ID3D11VideoProcessorEnumerator> m_pEnumerator;
+ Microsoft::WRL::ComPtr<ID3D11VideoProcessor> m_pVideoProcessor;
 };
 
 };

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -54,13 +54,13 @@
 CMMALBuffer::CMMALBuffer(int id) : CVideoBuffer(id)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
+ CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, static_cast<void*>(this));
 }
 
 CMMALBuffer::~CMMALBuffer()
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, this);
+ CLog::Log(LOGDEBUG, "%s::%s %p", CLASSNAME, __func__, static_cast<void*>(this));
 }
 
 void CMMALBuffer::Unref()
@@ -156,7 +156,10 @@
 if (!m_mmal_pool)
 CLog::Log(LOGERROR, "%s::%s Failed to create pool for port %s", CLASSNAME, __func__, port->name);
 else
- CLog::Log(LOGDEBUG, "%s::%s Created pool %p of size %d x %d for port %s", CLASSNAME, __func__, m_mmal_pool, num_buffers, buffer_size, port->name);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s Created pool %p of size %d x %d for port %s", CLASSNAME, __func__,
+ static_cast<void*>(m_mmal_pool), num_buffers, buffer_size, port->name);
+ }
 }
 
 CMMALPool::~CMMALPool()
@@ -165,7 +168,8 @@
 MMAL_STATUS_T status;
 
 MMAL_PORT_T *port = m_input ? m_component->input[0] : m_component->output[0];
- CLog::Log(LOGDEBUG, "%s::%s Destroying pool %p for port %s", CLASSNAME, __func__, m_mmal_pool, port->name);
+ CLog::Log(LOGDEBUG, "%s::%s Destroying pool %p for port %s", CLASSNAME, __func__,
+ static_cast<void*>(m_mmal_pool), port->name);
 
 if (port && port->is_enabled)
 {
@@ -254,7 +258,9 @@
 const unsigned int size_c = m_geo.stride_c * m_geo.height_c;
 m_size = (size_y + size_c * m_geo.planes_c) * m_geo.stripes;
 }
- CLog::Log(LOGDEBUG, "%s::%s pool:%p %dx%d (%dx%d) pix:%d size:%d fmt:%.4s", CLASSNAME, __func__, m_mmal_pool, width, height, alignedWidth, alignedHeight, format, size, (char *)&m_mmal_format);
+ CLog::Log(LOGDEBUG, "%s::%s pool:%p %dx%d (%dx%d) pix:%d size:%d fmt:%.4s", CLASSNAME, __func__,
+ static_cast<void*>(m_mmal_pool), width, height, alignedWidth, alignedHeight, format, size,
+ (char*)&m_mmal_format);
 }
 
 void CMMALPool::Configure(AVPixelFormat format, int size)
@@ -357,10 +363,22 @@
 }
 }
 if (timeout > 0 && !omvb)
- CLog::Log(LOGERROR, "%s::%s - failed pool:%p omvb:%p mmal:%p timeout:%d", CLASSNAME, __FUNCTION__, m_mmal_pool, omvb, buffer, timeout);
+ {
+ CLog::Log(LOGERROR, "%s::%s - failed pool:%p omvb:%p mmal:%p timeout:%d", CLASSNAME,
+ __FUNCTION__, static_cast<void*>(m_mmal_pool), static_cast<void*>(omvb),
+ static_cast<void*>(buffer), timeout);
+ }
 else if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s pool:%p omvb:%p mmal:%p gmem:%p new:%d id:%d to:%d %dx%d (%dx%d) size:%d pool:%p:%p enc:%.4s", CLASSNAME, __FUNCTION__, m_mmal_pool, omvb, buffer, gmem, newbuf, id, timeout,
- m_width, m_height, AlignedWidth(), AlignedHeight(), buffer ? buffer->alloc_size : 0, omvb ? &*omvb->Pool() : nullptr, &*GetPtr(), (char *)&m_mmal_format);
+ {
+ CLog::Log(LOGDEBUG,
+ "%s::%s pool:%p omvb:%p mmal:%p gmem:%p new:%d id:%d to:%d %dx%d (%dx%d) size:%d "
+ "pool:%p:%p enc:%.4s",
+ CLASSNAME, __FUNCTION__, static_cast<void*>(m_mmal_pool), static_cast<void*>(omvb),
+ static_cast<void*>(buffer), static_cast<void*>(gmem), newbuf, id, timeout, m_width,
+ m_height, AlignedWidth(), AlignedHeight(), buffer ? buffer->alloc_size : 0,
+ omvb ? static_cast<void*>(omvb->Pool().get()) : nullptr, static_cast<void*>(GetPtr().get()),
+ (char*)&m_mmal_format);
+ }
 return omvb;
 }
 
@@ -376,10 +394,21 @@
 while (omvb = GetBuffer(0), omvb)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s Send omvb:%p mmal:%p from pool %p to %s len:%d cmd:%x flags:%x pool:%p", CLASSNAME, __func__, omvb, omvb->mmal_buffer, m_mmal_pool, port->name, omvb->mmal_buffer->length, omvb->mmal_buffer->cmd, omvb->mmal_buffer->flags, &*omvb->Pool());
+ {
+ CLog::Log(
+ LOGDEBUG, "%s::%s Send omvb:%p mmal:%p from pool %p to %s len:%d cmd:%x flags:%x pool:%p",
+ CLASSNAME, __func__, static_cast<void*>(omvb), static_cast<void*>(omvb->mmal_buffer),
+ static_cast<void*>(m_mmal_pool), port->name, omvb->mmal_buffer->length,
+ omvb->mmal_buffer->cmd, omvb->mmal_buffer->flags, static_cast<void*>(omvb->Pool().get()));
+ }
 MMAL_STATUS_T status = mmal_port_send_buffer(port, omvb->mmal_buffer);
 if (status != MMAL_SUCCESS)
- CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p from pool %p to %s (status=0%x %s)", CLASSNAME, __func__, omvb, omvb->mmal_buffer, m_mmal_pool, port->name, status, mmal_status_to_string(status));
+ {
+ CLog::Log(
+ LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p from pool %p to %s (status=0%x %s)",
+ CLASSNAME, __func__, static_cast<void*>(omvb), static_cast<void*>(omvb->mmal_buffer),
+ static_cast<void*>(m_mmal_pool), port->name, status, mmal_status_to_string(status));
+ }
 }
 }
 
@@ -405,7 +434,7 @@
 CSingleLock lock(m_sharedSection);
 CRenderInfo info;
 
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s opaque:%p", CLASSNAME, __func__, this);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s opaque:%p", CLASSNAME, __func__, static_cast<void*>(this));
 
 info.max_buffer_size = NUM_BUFFERS;
 info.optimal_buffer_size = NUM_BUFFERS;
@@ -417,8 +446,12 @@
 void CMMALRenderer::vout_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x", CLASSNAME, __func__,
- buffer->user_data, buffer, buffer->dts*1e-6, buffer->pts*1e-6, buffer->length, buffer->cmd, buffer->flags);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x",
+ CLASSNAME, __func__, static_cast<void*>(buffer->user_data),
+ static_cast<void*>(buffer), buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->length,
+ buffer->cmd, buffer->flags);
+ }
 buffer->length = 0;
 mmal_queue_put(m_queue_process, buffer);
 }
@@ -631,7 +664,9 @@
 CMMALBuffer *omvb = (CMMALBuffer *)buffer->user_data;
 assert(buffer == omvb->mmal_buffer);
 omvb->Release();
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - discard omvb:%p mmal:%p vsync:%d queue:%d diff:%f", CLASSNAME, __func__, omvb, buffer, g_RBP.LastVsync(), mmal_queue_length(m_queue_render), m_error);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - discard omvb:%p mmal:%p vsync:%d queue:%d diff:%f",
+ CLASSNAME, __func__, static_cast<void*>(omvb), static_cast<void*>(buffer),
+ g_RBP.LastVsync(), mmal_queue_length(m_queue_render), m_error);
 }
 }
 // this is case where we would like to display a new frame
@@ -648,9 +683,16 @@
 CheckConfigurationVout(omvb->Width(), omvb->Height(), omvb->AlignedWidth(), omvb->AlignedHeight(), omvb->Encoding());
 MMAL_STATUS_T status = mmal_port_send_buffer(m_vout_input, buffer);
 if (status != MMAL_SUCCESS)
- CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)", CLASSNAME, __func__, omvb, buffer, m_vout_input->name, status, mmal_status_to_string(status));
+ {
+ CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)",
+ CLASSNAME, __func__, static_cast<void*>(omvb), static_cast<void*>(buffer),
+ m_vout_input->name, status, mmal_status_to_string(status));
+ }
 }
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - omvb:%p mmal:%p vsync:%d queue:%d diff:%f", CLASSNAME, __func__, buffer ? buffer->user_data : nullptr, buffer, g_RBP.LastVsync(), mmal_queue_length(m_queue_render), m_error);
+ CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - omvb:%p mmal:%p vsync:%d queue:%d diff:%f", CLASSNAME,
+ __func__, buffer ? static_cast<void*>(buffer->user_data) : nullptr,
+ static_cast<void*>(buffer), g_RBP.LastVsync(), mmal_queue_length(m_queue_render),
+ m_error);
 }
 }
 CLog::Log(LOGDEBUG, "%s::%s - stopping", CLASSNAME, __func__);
@@ -670,8 +712,13 @@
 
 CMMALBuffer *omvb = (CMMALBuffer *)buffer->user_data;
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s %s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x enc:%.4s", CLASSNAME, __func__,
- omvb ? omvb->GetStateName():"", omvb, buffer, buffer->dts*1e-6, buffer->pts*1e-6, buffer->length, buffer->cmd, buffer->flags, omvb ? (char *)&omvb->Encoding():"");
+ {
+ CLog::Log(LOGDEBUG,
+ "%s::%s %s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x enc:%.4s",
+ CLASSNAME, __func__, omvb ? omvb->GetStateName() : "", static_cast<void*>(omvb),
+ static_cast<void*>(buffer), buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->length,
+ buffer->cmd, buffer->flags, omvb ? (char*)&omvb->Encoding() : "");
+ }
 
 assert(omvb && buffer == omvb->mmal_buffer);
 assert(buffer->cmd == 0);
@@ -741,7 +788,12 @@
 {
 MMAL_STATUS_T status = mmal_port_send_buffer(m_deint_input, omvb->mmal_buffer);
 if (status != MMAL_SUCCESS)
- CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)", CLASSNAME, __func__, omvb, omvb->mmal_buffer, m_deint_input->name, status, mmal_status_to_string(status));
+ {
+ CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)",
+ CLASSNAME, __func__, static_cast<void*>(omvb),
+ static_cast<void*>(omvb->mmal_buffer), m_deint_input->name, status,
+ mmal_status_to_string(status));
+ }
 else
 kept = true;
 }
@@ -757,7 +809,12 @@
 {
 MMAL_STATUS_T status = mmal_port_send_buffer(m_vout_input, omvb->mmal_buffer);
 if (status != MMAL_SUCCESS)
- CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)", CLASSNAME, __func__, omvb, omvb->mmal_buffer, m_vout_input->name, status, mmal_status_to_string(status));
+ {
+ CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal:%p to %s (status=0%x %s)",
+ CLASSNAME, __func__, static_cast<void*>(omvb),
+ static_cast<void*>(omvb->mmal_buffer), m_vout_input->name, status,
+ mmal_status_to_string(status));
+ }
 else
 kept = true;
 }
@@ -773,7 +830,7 @@
 {
 mmal_queue_put(m_queue_render, buffer);
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, omvb);
+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_queue_render", CLASSNAME, __func__, static_cast<void*>(omvb));
 kept = true;
 }
 else
@@ -782,10 +839,14 @@
 if (m_vout_input)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, omvb);
+ CLog::Log(LOGDEBUG, "%s::%s send %p to m_vout_input", CLASSNAME, __func__, static_cast<void*>(omvb));
 MMAL_STATUS_T status = mmal_port_send_buffer(m_vout_input, buffer);
 if (status != MMAL_SUCCESS)
- CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal%:p to %s (status=0%x %s)", CLASSNAME, __func__, omvb, buffer, m_vout_input->name, status, mmal_status_to_string(status));
+ {
+ CLog::Log(LOGERROR, "%s::%s - Failed to send omvb:%p mmal%:p to %s (status=0%x %s)",
+ CLASSNAME, __func__, static_cast<void*>(omvb), static_cast<void*>(buffer),
+ m_vout_input->name, status, mmal_status_to_string(status));
+ }
 else
 kept = true;
 }
@@ -798,8 +859,14 @@
 if (!kept)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s %s Not kept: omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x enc:%.4s", CLASSNAME, __func__,
- omvb ? omvb->GetStateName():"", omvb, buffer, buffer->dts*1e-6, buffer->pts*1e-6, buffer->length, buffer->cmd, buffer->flags, omvb ? (char *)&omvb->Encoding():"");
+ {
+ CLog::Log(
+ LOGDEBUG,
+ "%s::%s %s Not kept: omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x enc:%.4s",
+ CLASSNAME, __func__, omvb ? omvb->GetStateName() : "", static_cast<void*>(omvb),
+ static_cast<void*>(buffer), buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->length,
+ buffer->cmd, buffer->flags, omvb ? (char*)&omvb->Encoding() : "");
+ }
 if (omvb)
 omvb->Release();
 else
@@ -838,7 +905,10 @@
 CMMALBuffer *buffer = dynamic_cast<CMMALBuffer*>(pic.videoBuffer);
 assert(buffer);
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, buffer, buffer->mmal_buffer, id);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s MMAL - %p (%p) %i", CLASSNAME, __func__, static_cast<void*>(buffer),
+ static_cast<void*>(buffer->mmal_buffer), id);
+ }
 
 assert(!m_buffers[id]);
 buffer->Acquire();
@@ -846,7 +916,7 @@
 UpdateFramerateStats(pic.pts);
 }
 
-bool CMMALRenderer::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CMMALRenderer::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 CSingleLock lock(m_sharedSection);
 ReleaseBuffers();
@@ -857,8 +927,11 @@
 m_sourceHeight = picture.iHeight;
 m_renderOrientation = orientation;
 
+ m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+ GetFlagsColorPrimaries(picture.color_primaries) |
+ GetFlagsStereoMode(picture.stereoMode);
+
 m_fps = fps;
- m_iFlags = flags;
 m_error = 0.0;
 m_lastPts = DVD_NOPTS_VALUE;
 m_frameInterval = 0.0;
@@ -868,7 +941,7 @@
 m_src_rect.SetRect(0, 0, 0, 0);
 m_dst_rect.SetRect(0, 0, 0, 0);
 
- CLog::Log(LOGDEBUG, "%s::%s - %dx%d->%dx%d@%.2f flags:%x format:%d orient:%d", CLASSNAME, __func__, picture.iWidth, picture.iHeight, picture.iDisplayWidth, picture.iDisplayHeight, fps, flags, m_format, orientation);
+ CLog::Log(LOGDEBUG, "%s::%s - %dx%d->%dx%d@%.2f flags:%x format:%d orient:%d", CLASSNAME, __func__, picture.iWidth, picture.iHeight, picture.iDisplayWidth, picture.iDisplayHeight, fps, m_iFlags, m_format, orientation);
 
 // calculate the input frame aspect ratio
 CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);
@@ -884,7 +957,10 @@
 CSingleLock lock(m_sharedSection);
 CMMALBuffer *omvb = m_buffers[id];
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s - MMAL: source:%d omvb:%p mmal:%p", CLASSNAME, __func__, id, omvb, omvb ? omvb->mmal_buffer:NULL);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s - MMAL: source:%d omvb:%p mmal:%p", CLASSNAME, __func__, id,
+ static_cast<void*>(omvb), omvb ? static_cast<void*>(omvb->mmal_buffer) : nullptr);
+ }
 if (m_buffers[id])
 m_buffers[id]->Release();
 m_buffers[id] = nullptr;
@@ -929,7 +1005,11 @@
 // we only want to upload frames once
 if (omvb && omvb->m_rendered)
 {
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x skipping", CLASSNAME, __func__, clear, flags, alpha, index, omvb, omvb->mmal_buffer, omvb->mmal_buffer->flags);
+ CLog::Log(
+ LOGDEBUG, LOGVIDEO,
+ "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x skipping",
+ CLASSNAME, __func__, clear, flags, alpha, index, static_cast<void*>(omvb),
+ static_cast<void*>(omvb->mmal_buffer), omvb->mmal_buffer->flags);
 SetVideoRect(m_cachedSourceRect, m_cachedDestRect);
 goto exit;
 }
@@ -938,7 +1018,10 @@
 {
 // dummy buffer from omxplayer
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s - OMX: clear:%d flags:%x alpha:%d source:%d omvb:%p", CLASSNAME, __func__, clear, flags, alpha, index, omvb);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s - OMX: clear:%d flags:%x alpha:%d source:%d omvb:%p", CLASSNAME,
+ __func__, clear, flags, alpha, index, static_cast<void*>(omvb));
+ }
 }
 else if (omvb && omvb->mmal_buffer)
 {
@@ -946,7 +1029,13 @@
 omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED | MMAL_BUFFER_HEADER_VIDEO_FLAG_TOP_FIELD_FIRST;
 else if (flags & RENDER_FLAG_BOT)
 omvb->mmal_buffer->flags |= MMAL_BUFFER_HEADER_VIDEO_FLAG_INTERLACED;
- CLog::Log(LOGDEBUG, LOGVIDEO, "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x len:%d data:%p enc:%.4s", CLASSNAME, __func__, clear, flags, alpha, index, omvb, omvb->mmal_buffer, omvb->mmal_buffer->flags, omvb->mmal_buffer->length, omvb->mmal_buffer->data, (char *)&omvb->Encoding());
+ CLog::Log(LOGDEBUG, LOGVIDEO,
+ "%s::%s - MMAL: clear:%d flags:%x alpha:%d source:%d omvb:%p mmal:%p mflags:%x "
+ "len:%d data:%p enc:%.4s",
+ CLASSNAME, __func__, clear, flags, alpha, index, static_cast<void*>(omvb),
+ static_cast<void*>(omvb->mmal_buffer), omvb->mmal_buffer->flags,
+ omvb->mmal_buffer->length, static_cast<void*>(omvb->mmal_buffer->data),
+ (char*)&omvb->Encoding());
 assert(omvb->mmal_buffer && omvb->mmal_buffer->data && omvb->mmal_buffer->length);
 omvb->Acquire();
 omvb->m_rendered = true;
@@ -954,7 +1043,13 @@
 mmal_queue_put(m_queue_process, omvb->mmal_buffer);
 }
 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, index, omvb, omvb ? omvb->mmal_buffer : nullptr);
+ {
+ 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, index, static_cast<void*>(omvb),
+ omvb ? static_cast<void*>(omvb->mmal_buffer) : nullptr);
+ }
 
 exit:
 lock.Leave();
@@ -1038,7 +1133,7 @@
 if (!m_bConfigured)
 return false;
 
- CLog::Log(LOGDEBUG, "%s::%s - %p", CLASSNAME, __func__, capture);
+ CLog::Log(LOGDEBUG, "%s::%s - %p", CLASSNAME, __func__, static_cast<void*>(capture));
 
 capture->BeginRender();
 capture->EndRender();
@@ -1206,8 +1301,12 @@
 void CMMALRenderer::deint_input_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x", CLASSNAME, __func__,
- buffer->user_data, buffer, buffer->dts*1e-6, buffer->pts*1e-6, buffer->length, buffer->cmd, buffer->flags);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x",
+ CLASSNAME, __func__, static_cast<void*>(buffer->user_data),
+ static_cast<void*>(buffer), buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->length,
+ buffer->cmd, buffer->flags);
+ }
 mmal_queue_put(m_queue_process, buffer);
 }
 
@@ -1220,8 +1319,12 @@
 void CMMALRenderer::deint_output_port_cb(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer)
 {
 if (VERBOSE && g_advancedSettings.CanLogComponent(LOGVIDEO))
- CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x", CLASSNAME, __func__,
- buffer->user_data, buffer, buffer->dts*1e-6, buffer->pts*1e-6, buffer->length, buffer->cmd, buffer->flags);
+ {
+ CLog::Log(LOGDEBUG, "%s::%s omvb:%p mmal:%p dts:%.3f pts:%.3f len:%d cmd:%x flags:%x",
+ CLASSNAME, __func__, static_cast<void*>(buffer->user_data),
+ static_cast<void*>(buffer), buffer->dts * 1e-6, buffer->pts * 1e-6, buffer->length,
+ buffer->cmd, buffer->flags);
+ }
 mmal_queue_put(m_queue_process, buffer);
 }

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

@@ -2,7 +2,7 @@
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -30,8 +30,8 @@
 #include "../RenderCapture.h"
 #include "cores/VideoSettings.h"
 #include "cores/VideoPlayer/DVDStreamInfo.h"
-#include "guilib/Geometry.h"
 #include "threads/Thread.h"
+#include "utils/Geometry.h"
 
 // worst case number of buffers. 12 for decoder. 8 for multi-threading in ffmpeg. NUM_BUFFERS for renderer.
 // Note, generally these won't necessarily result in allocated pictures
@@ -149,7 +149,7 @@
   bool RenderCapture(CRenderCapture* capture);
 
   // Player functions
-  virtual bool         Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation) override;
+  virtual bool         Configure(const VideoPicture &picture, float fps, unsigned int orientation) override;
   virtual void         ReleaseBuffer(int idx) override;
   virtual void         UnInit();
   virtual void         Flush() override;

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

@@ -27,7 +27,8 @@
 #include "utils/ScreenshotAML.h"
 #include "settings/MediaSettings.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
-#include "../RenderFactory.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "settings/AdvancedSettings.h"
 
 CRendererAML::CRendererAML()
@@ -55,14 +56,16 @@
   return true;
 }
 
-bool CRendererAML::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererAML::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
   m_sourceWidth = picture.iWidth;
   m_sourceHeight = picture.iHeight;
   m_renderOrientation = orientation;
 
-  // Save the flags.
-  m_iFlags = flags;
+  m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+             GetFlagsColorMatrix(picture.color_space, picture.iWidth, picture.iHeight) |
+             GetFlagsColorPrimaries(picture.color_primaries) |
+             GetFlagsStereoMode(picture.stereoMode);
 
   // Calculate the input frame aspect ratio.
   CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.cpp Changed

@@ -22,6 +22,7 @@
 
 #include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "utils/log.h"
 #include "windowing/gbm/DRMAtomic.h"
 
@@ -52,15 +53,17 @@
   return true;
 }
 
-bool CRendererDRMPRIME::Configure(const VideoPicture& picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererDRMPRIME::Configure(const VideoPicture& picture, float fps, unsigned int orientation)
 {
   m_format = picture.videoBuffer->GetFormat();
   m_sourceWidth = picture.iWidth;
   m_sourceHeight = picture.iHeight;
   m_renderOrientation = orientation;
 
-  // Save the flags.
-  m_iFlags = flags;
+  m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+             GetFlagsColorMatrix(picture.color_space, picture.iWidth, picture.iHeight) |
+             GetFlagsColorPrimaries(picture.color_primaries) |
+             GetFlagsStereoMode(picture.stereoMode);
 
   // Calculate the input frame aspect ratio.
   CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodec.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodec.h Changed

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

@@ -18,17 +18,17 @@
 *
 */
 
-#if defined(TARGET_ANDROID)
-
 #include "RendererMediaCodecSurface.h"
 
 #include "../RenderCapture.h"
+#include "../RenderFlags.h"
 #include "guilib/GraphicContext.h"
 #include "rendering/RenderSystem.h"
 #include "settings/MediaSettings.h"
 #include "platform/android/activity/XBMCApp.h"
 #include "DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h"
 #include "utils/log.h"
+#include "utils/TimeUtils.h"
 #include "../RenderFactory.h"
 
 #include <thread>
@@ -57,7 +57,7 @@
 return true;
 }
 
-bool CRendererMediaCodecSurface::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererMediaCodecSurface::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 CLog::Log(LOGNOTICE, "CRendererMediaCodecSurface::Configure");
 
@@ -65,8 +65,10 @@
 m_sourceHeight = picture.iHeight;
 m_renderOrientation = orientation;
 
- // Save the flags.
- m_iFlags = flags;
+ m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+ GetFlagsColorMatrix(picture.color_space, picture.iWidth, picture.iHeight) |
+ GetFlagsColorPrimaries(picture.color_primaries) |
+ GetFlagsStereoMode(picture.stereoMode);
 
 // Calculate the input frame aspect ratio.
 CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);
@@ -95,7 +97,7 @@
 {
 int64_t nanodiff(static_cast<int64_t>((picture.pts - currentClock) * 1000));
 dynamic_cast<CMediaCodecVideoBuffer*>(picture.videoBuffer)->RenderUpdate(m_surfDestRect,
- std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::steady_clock::now().time_since_epoch()).count() + nanodiff);
+ CurrentHostCounter() + nanodiff);
 }
 }
 
@@ -163,5 +165,3 @@
 break;
 }
 }
-
-#endif

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodecSurface.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPIGL.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -60,7 +60,7 @@
 }
 }
 
-bool CRendererVAAPI::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererVAAPI::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 CVaapiRenderPicture *pic = dynamic_cast<CVaapiRenderPicture*>(picture.videoBuffer);
 if (pic->procPic.videoSurface != VA_INVALID_ID)
@@ -84,13 +84,14 @@
 fence = GL_NONE;
 }
 
- return CLinuxRendererGL::Configure(picture, fps, flags, orientation);
+ return CLinuxRendererGL::Configure(picture, fps, orientation);
 }
 
 bool CRendererVAAPI::ConfigChanged(const VideoPicture &picture)
 {
 CVaapiRenderPicture *pic = dynamic_cast<CVaapiRenderPicture*>(picture.videoBuffer);
- if (pic->procPic.videoSurface != VA_INVALID_ID && !m_isVAAPIBuffer)
+ if ((pic->procPic.videoSurface != VA_INVALID_ID && !m_isVAAPIBuffer) ||
+ (pic->procPic.videoSurface == VA_INVALID_ID && m_isVAAPIBuffer))
 return true;
 
 return false;
@@ -108,11 +109,7 @@
 
 EShaderFormat CRendererVAAPI::GetShaderFormat()
 {
- EShaderFormat ret = SHADER_NONE;
-
- ret = SHADER_NV12;
-
- return ret;
+ return SHADER_NV12;
 }
 
 bool CRendererVAAPI::LoadShadersHook()
@@ -132,7 +129,7 @@
 return CreateNV12Texture(index);
 }
 
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = buf.image;
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = buf.fields[0];
 
@@ -160,7 +157,7 @@
 return;
 }
 
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 buf.fields[FIELD_FULL][0].id = 0;
 buf.fields[FIELD_FULL][1].id = 0;
 buf.fields[FIELD_FULL][2].id = 0;
@@ -168,13 +165,7 @@
 
 bool CRendererVAAPI::UploadTexture(int index)
 {
- if (!m_isVAAPIBuffer)
- {
- return UploadNV12Texture(index);
- }
-
- YUVBUFFER &buf = m_buffers[index];
-
+ CPictureBuffer &buf = m_buffers[index];
 CVaapiRenderPicture *pic = dynamic_cast<CVaapiRenderPicture*>(buf.videoBuffer);
 
 if (!pic || !pic->valid)
@@ -182,7 +173,20 @@
 return false;
 }
 
+ if (!m_isVAAPIBuffer)
+ {
+ YuvImage &dst = m_buffers[index].image;
+ YuvImage src;
+ pic->GetPlanes(src.plane);
+ pic->GetStrides(src.stride);
+ UnBindPbo(m_buffers[index]);
+ CVideoBuffer::CopyNV12Picture(&dst, &src);
+ BindPbo(m_buffers[index]);
+ return UploadNV12Texture(index);
+ }
+
 m_vaapiTextures[index].Map(pic);
+ m_buffers[index].m_srcTextureBits = m_vaapiTextures[index].GetBits();
 
 YuvImage &im = buf.image;
 YUVPLANE (&planes)[3] = buf.fields[0];

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPIGL.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPIGLES.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -60,7 +60,7 @@
 }
 }
 
-bool CRendererVAAPI::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererVAAPI::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 CVaapiRenderPicture *pic = dynamic_cast<CVaapiRenderPicture*>(picture.videoBuffer);
 if (pic->procPic.videoSurface != VA_INVALID_ID)
@@ -84,7 +84,7 @@
 fence = GL_NONE;
 }
 
- return CLinuxRendererGLES::Configure(picture, fps, flags, orientation);
+ return CLinuxRendererGLES::Configure(picture, fps, orientation);
 }
 
 bool CRendererVAAPI::ConfigChanged(const VideoPicture &picture)
@@ -209,8 +209,6 @@
 planes[1].id = m_vaapiTextures[index].m_textureVU;
 planes[2].id = m_vaapiTextures[index].m_textureVU;
 
- glEnable(m_textureTarget);
-
 for (int p=0; p<2; p++)
 {
 glBindTexture(m_textureTarget, planes[p].id);
@@ -224,7 +222,6 @@
 }
 
 CalculateTextureSourceRects(index, 3);
- glDisable(m_textureTarget);
 return true;
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVAAPIGLES.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2017 Team XBMC
- * http://xbmc.org
+ * 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
@@ -55,7 +55,7 @@
 m_interopState.Finish();
 }
 
-bool CRendererVDPAU::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CRendererVDPAU::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 CVdpauRenderPicture *pic = dynamic_cast<CVdpauRenderPicture*>(picture.videoBuffer);
 if (pic->procPic.isYuv)
@@ -75,7 +75,7 @@
 fence = GL_NONE;
 }
 
- return CLinuxRendererGL::Configure(picture, fps, flags, orientation);
+ return CLinuxRendererGL::Configure(picture, fps, orientation);
 }
 
 bool CRendererVDPAU::ConfigChanged(const VideoPicture &picture)
@@ -288,7 +288,7 @@
 
 bool CRendererVDPAU::CreateVDPAUTexture(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = buf.image;
 YUVPLANE &plane = buf.fields[FIELD_FULL][0];
 
@@ -311,7 +311,7 @@
 
 void CRendererVDPAU::DeleteVDPAUTexture(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YUVPLANE &plane = buf.fields[FIELD_FULL][0];
 
 plane.id = 0;
@@ -319,7 +319,7 @@
 
 bool CRendererVDPAU::UploadVDPAUTexture(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 VDPAU::CVdpauRenderPicture *pic = dynamic_cast<VDPAU::CVdpauRenderPicture*>(buf.videoBuffer);
 
 YUVPLANE &plane = buf.fields[FIELD_FULL][0];
@@ -365,7 +365,7 @@
 
 bool CRendererVDPAU::CreateVDPAUTexture420(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = buf.image;
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = buf.fields[0];
 GLuint *pbo = buf.pbo;
@@ -394,7 +394,7 @@
 
 void CRendererVDPAU::DeleteVDPAUTexture420(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 
 buf.fields[0][0].id = 0;
 buf.fields[1][0].id = 0;
@@ -405,7 +405,7 @@
 
 bool CRendererVDPAU::UploadVDPAUTexture420(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = buf.image;
 
 VDPAU::CVdpauRenderPicture *pic = dynamic_cast<VDPAU::CVdpauRenderPicture*>(buf.videoBuffer);

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVDPAU.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -61,7 +61,7 @@
 
 void CRendererVTB::ReleaseBuffer(int idx)
 {
- YUVBUFFER &buf = m_buffers[idx];
+ CPictureBuffer &buf = m_buffers[idx];
 if (buf.videoBuffer)
 {
 VTB::CVideoBufferVTB *vb = dynamic_cast<VTB::CVideoBufferVTB*>(buf.videoBuffer);
@@ -92,7 +92,7 @@
 
 bool CRendererVTB::CreateTexture(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = buf.image;
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = buf.fields[0];
 
@@ -149,7 +149,7 @@
 
 bool CRendererVTB::UploadTexture(int index)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = m_buffers[index].fields[0];
 
 VTB::CVideoBufferVTB *vb = dynamic_cast<VTB::CVideoBufferVTB*>(buf.videoBuffer);
@@ -211,7 +211,7 @@
 
 void CRendererVTB::AfterRenderHook(int idx)
 {
- YUVBUFFER &buf = m_buffers[idx];
+ CPictureBuffer &buf = m_buffers[idx];
 VTB::CVideoBufferVTB *vb = dynamic_cast<VTB::CVideoBufferVTB*>(buf.videoBuffer);
 if (!vb)
 {
@@ -228,7 +228,7 @@
 
 bool CRendererVTB::NeedBuffer(int idx)
 {
- YUVBUFFER &buf = m_buffers[idx];
+ CPictureBuffer &buf = m_buffers[idx];
 VTB::CVideoBufferVTB *vb = dynamic_cast<VTB::CVideoBufferVTB*>(buf.videoBuffer);
 if (!vb)
 {

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGLES.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2007-2017 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -32,6 +32,11 @@
   m_interop = interop;
 }
 
+int CVaapiTexture::GetBits()
+{
+  return m_bits;
+}
+
 bool CVaapiTexture::Map(CVaapiRenderPicture *pic)
 {
   VAStatus status;
@@ -65,6 +70,7 @@
   {
     case VA_FOURCC('N','V','1','2'):
     {
+      m_bits = 8;
       attrib = attribs;
       *attrib++ = EGL_LINUX_DRM_FOURCC_EXT;
       *attrib++ = fourcc_code('R', '8', ' ', ' ');
@@ -113,7 +119,7 @@
         return false;
       }
 
-      GLint format;
+      GLint format, type;
 
       glGenTextures(1, &m_textureY);
       glBindTexture(m_interop.textureTarget, m_textureY);
@@ -132,6 +138,16 @@
       glTexParameteri(m_interop.textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
       m_interop.glEGLImageTargetTexture2DOES(m_interop.textureTarget, m_glSurface.eglImageVU);
       glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &format);
+      glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type);
+      if (type == GL_UNSIGNED_BYTE)
+        m_bits = 8;
+      else if (type == GL_UNSIGNED_SHORT)
+        m_bits = 16;
+      else
+      {
+        CLog::Log(LOGWARNING, "Did not expect texture type: %d", (int) type);
+        m_bits = 8;
+      }
 
       glBindTexture(m_interop.textureTarget, 0);
 
@@ -139,6 +155,7 @@
     }
     case VA_FOURCC('P','0','1','0'):
     {
+      m_bits = 10;
       attrib = attribs;
       *attrib++ = EGL_LINUX_DRM_FOURCC_EXT;
       *attrib++ = fourcc_code('R', '1', '6', ' ');
@@ -187,7 +204,7 @@
         return false;
       }
 
-      GLint format;
+      GLint format, type;
 
       glGenTextures(1, &m_textureY);
       glBindTexture(m_interop.textureTarget, m_textureY);
@@ -206,6 +223,16 @@
       glTexParameteri(m_interop.textureTarget, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
       m_interop.glEGLImageTargetTexture2DOES(m_interop.textureTarget, m_glSurface.eglImageVU);
       glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_FORMAT, &format);
+      glGetIntegerv(GL_IMPLEMENTATION_COLOR_READ_TYPE, &type);
+      if (type == GL_UNSIGNED_BYTE)
+        m_bits = 8;
+      else if (type == GL_UNSIGNED_SHORT)
+        m_bits = 16;
+      else
+      {
+        CLog::Log(LOGWARNING, "Did not expect texture type: %d", (int) type);
+        m_bits = 8;
+      }
 
       glBindTexture(m_interop.textureTarget, 0);
 
@@ -213,6 +240,7 @@
     }
     case VA_FOURCC('B','G','R','A'):
     {
+      m_bits = 8;
       attrib = attribs;
       *attrib++ = EGL_DRM_BUFFER_FORMAT_MESA;
       *attrib++ = EGL_DRM_BUFFER_FORMAT_ARGB32_MESA;

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VdpauGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VdpauGL.h Changed

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

@@ -3,7 +3,7 @@
 * Based on XBoxRenderer by Frodo/jcmarshall
 * Portions Copyright (c) by the authors of ffmpeg / xvid /mplayer
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -101,7 +101,7 @@
 0x00, 0x00, 0x00, 0x00,
 };
 
-CLinuxRendererGL::YUVBUFFER::YUVBUFFER()
+CLinuxRendererGL::CPictureBuffer::CPictureBuffer()
 {
 memset(&fields, 0, sizeof(fields));
 memset(&image , 0, sizeof(image));
@@ -110,7 +110,7 @@
 loaded = false;
 }
 
-CLinuxRendererGL::YUVBUFFER::~YUVBUFFER() = default;
+CLinuxRendererGL::CPictureBuffer::~CPictureBuffer() = default;
 
 CBaseRenderer* CLinuxRendererGL::Create(CVideoBuffer *buffer)
 {
@@ -192,7 +192,7 @@
 return false;
 
 int index = m_iYV12RenderBuffer;
- YUVBUFFER& buf = m_buffers[index];
+ CPictureBuffer& buf = m_buffers[index];
 
 if (!buf.fields[FIELD_FULL][0].id)
 return false;
@@ -239,7 +239,7 @@
 return false;
 }
 
-bool CLinuxRendererGL::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CLinuxRendererGL::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 m_format = picture.videoBuffer->GetFormat();
 m_sourceWidth = picture.iWidth;
@@ -247,8 +247,12 @@
 m_renderOrientation = orientation;
 m_fps = fps;
 
- // Save the flags.
- m_iFlags = flags;
+ m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+ GetFlagsStereoMode(picture.stereoMode);
+
+ m_srcPrimaries = GetSrcPrimaries(static_cast<AVColorPrimaries>(picture.color_primaries),
+ picture.iWidth, picture.iHeight);
+ m_toneMap = false;
 
 // Calculate the input frame aspect ratio.
 CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);
@@ -313,15 +317,24 @@
 
 void CLinuxRendererGL::AddVideoPicture(const VideoPicture &picture, int index, double currentClock)
 {
- YUVBUFFER &buf = m_buffers[index];
+ CPictureBuffer &buf = m_buffers[index];
 buf.videoBuffer = picture.videoBuffer;
 buf.videoBuffer->Acquire();
 buf.loaded = false;
+ buf.m_srcPrimaries = static_cast<AVColorPrimaries>(picture.color_primaries);
+ buf.m_srcColSpace = static_cast<AVColorSpace>(picture.color_space);
+ buf.m_srcFullRange = picture.color_range == 1;
+ buf.m_srcBits = picture.colorBits;
+
+ buf.hasDisplayMetadata = picture.hasDisplayMetadata;
+ buf.displayMetadata = picture.displayMetadata;
+ buf.hasLightMetadata = picture.hasLightMetadata;
+ buf.lightMetadata = picture.lightMetadata;
 }
 
 void CLinuxRendererGL::ReleaseBuffer(int idx)
 {
- YUVBUFFER &buf = m_buffers[idx];
+ CPictureBuffer &buf = m_buffers[idx];
 if (buf.videoBuffer)
 {
 buf.videoBuffer->Release();
@@ -351,7 +364,7 @@
 
 void CLinuxRendererGL::CalculateTextureSourceRects(int source, int num_planes)
 {
- YUVBUFFER& buf = m_buffers[source];
+ CPictureBuffer& buf = m_buffers[source];
 YuvImage* im = &buf.image;
 
 // calculate the source rectangle
@@ -907,7 +920,9 @@
 if (m_scalingMethod == VS_SCALINGMETHOD_LANCZOS3_FAST || m_scalingMethod == VS_SCALINGMETHOD_SPLINE36_FAST)
 {
 m_pYUVShader = new YUV2RGBFilterShader4(m_textureTarget == GL_TEXTURE_RECTANGLE_ARB,
- m_iFlags, shaderFormat, m_nonLinStretch,
+ shaderFormat, m_nonLinStretch,
+ AVColorPrimaries::AVCOL_PRI_BT709, m_srcPrimaries,
+ m_toneMap,
 m_scalingMethod, out);
 if (!m_cmsOn)
 m_pYUVShader->SetConvertFullColorRange(m_fullRange);
@@ -930,8 +945,9 @@
 
 if (!m_pYUVShader)
 {
- m_pYUVShader = new YUV2RGBProgressiveShader(m_textureTarget == GL_TEXTURE_RECTANGLE_ARB, m_iFlags, shaderFormat,
- m_nonLinStretch && m_renderQuality == RQ_SINGLEPASS, out);
+ m_pYUVShader = new YUV2RGBProgressiveShader(m_textureTarget == GL_TEXTURE_RECTANGLE_ARB, shaderFormat,
+ m_nonLinStretch && m_renderQuality == RQ_SINGLEPASS,
+ AVColorPrimaries::AVCOL_PRI_BT709, m_srcPrimaries, m_toneMap, out);
 
 if (!m_cmsOn)
 m_pYUVShader->SetConvertFullColorRange(m_fullRange);
@@ -1043,8 +1059,23 @@
 
 void CLinuxRendererGL::RenderSinglePass(int index, int field)
 {
+ CPictureBuffer &buf = m_buffers[index];
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = m_buffers[index].fields[field];
 
+ AVColorPrimaries srcPrim = GetSrcPrimaries(buf.m_srcPrimaries, buf.image.width, buf.image.height);
+ if (srcPrim != m_srcPrimaries)
+ {
+ m_srcPrimaries = srcPrim;
+ m_reloadShaders = true;
+ }
+
+ bool toneMap = false;
+ if (buf.hasLightMetadata || (buf.hasDisplayMetadata && buf.displayMetadata.has_luminance))
+ toneMap = true;
+ if (toneMap != m_toneMap)
+ m_reloadShaders = true;
+ m_toneMap = toneMap;
+
 if (m_reloadShaders)
 {
 LoadShaders(field);
@@ -1071,6 +1102,9 @@
 m_pYUVShader->SetContrast(m_videoSettings.m_Contrast * 0.02f);
 m_pYUVShader->SetWidth(planes[0].texwidth);
 m_pYUVShader->SetHeight(planes[0].texheight);
+ m_pYUVShader->SetColParams(buf.m_srcColSpace, buf.m_srcBits, !buf.m_srcFullRange, buf.m_srcTextureBits);
+ m_pYUVShader->SetDisplayMetadata(buf.hasDisplayMetadata, buf.displayMetadata,
+ buf.hasLightMetadata, buf.lightMetadata);
 
 //disable non-linear stretch when a dvd menu is shown, parts of the menu are rendered through the overlay renderer
 //having non-linear stretch on breaks the alignment
@@ -1186,8 +1220,23 @@
 
 void CLinuxRendererGL::RenderToFBO(int index, int field, bool weave /*= false*/)
 {
+ CPictureBuffer &buf = m_buffers[index];
 YUVPLANE (&planes)[YuvImage::MAX_PLANES] = m_buffers[index].fields[field];
 
+ AVColorPrimaries srcPrim = GetSrcPrimaries(buf.m_srcPrimaries, buf.image.width, buf.image.height);
+ if (srcPrim != m_srcPrimaries)
+ {
+ m_srcPrimaries = srcPrim;
+ m_reloadShaders = true;
+ }
+
+ bool toneMap = false;
+ if (buf.hasLightMetadata || (buf.hasDisplayMetadata && buf.displayMetadata.has_luminance))
+ toneMap = true;
+ if (toneMap != m_toneMap)
+ m_reloadShaders = true;
+ m_toneMap = toneMap;
+
 if (m_reloadShaders)
 {
 m_reloadShaders = 0;
@@ -1244,6 +1293,7 @@
 m_pYUVShader->SetWidth(planes[0].texwidth);
 m_pYUVShader->SetHeight(planes[0].texheight);
 m_pYUVShader->SetNonLinStretch(1.0);
+ m_pYUVShader->SetColParams(buf.m_srcColSpace, buf.m_srcBits, !buf.m_srcFullRange, buf.m_srcTextureBits);
 
 if (field == FIELD_TOP)
 m_pYUVShader->SetField(1);
@@ -1778,6 +1828,7 @@
 /* since we also want the field textures, pitch must be texture aligned */
 unsigned p;
 
+ CPictureBuffer &buf = m_buffers[index];
 YuvImage &im = m_buffers[index].image;
 GLuint *pbo = m_buffers[index].pbo;
 
@@ -1788,11 +1839,27 @@
 im.cshift_x = 1;
 im.cshift_y = 1;
 
- if(m_format == AV_PIX_FMT_YUV420P16 ||
- m_format == AV_PIX_FMT_YUV420P14 ||
- m_format == AV_PIX_FMT_YUV420P12 ||
- m_format == AV_PIX_FMT_YUV420P10 ||
- m_format == AV_PIX_FMT_YUV420P9)
+ switch (m_format)
+ {
+ case AV_PIX_FMT_YUV420P16:
+ buf.m_srcTextureBits = 16;
+ break;
+ case AV_PIX_FMT_YUV420P14:
+ buf.m_srcTextureBits = 14;
+ break;
+ case AV_PIX_FMT_YUV420P12:
+ buf.m_srcTextureBits = 12;
+ break;
+ case AV_PIX_FMT_YUV420P10:
+ buf.m_srcTextureBits = 10;
+ break;
+ case AV_PIX_FMT_YUV420P9:
+ buf.m_srcTextureBits = 9;
+ break;
+ default:
+ break;
+ }
+ if (buf.m_srcTextureBits > 8)
 im.bpp = 2;
 else
 im.bpp = 1;
@@ -1905,7 +1972,7 @@
 
 bool CLinuxRendererGL::UploadYV12Texture(int source)
 {
- YUVBUFFER& buf = m_buffers[source];
+ CPictureBuffer& buf = m_buffers[source];
 YuvImage* im = &buf.image;
 
 bool deinterlacing;
@@ -2025,7 +2092,7 @@
 //********************************************************************************************************
 bool CLinuxRendererGL::UploadNV12Texture(int source)
 {
- YUVBUFFER& buf = m_buffers[source];
+ CPictureBuffer& buf = m_buffers[source];
 YuvImage* im = &buf.image;
 
 bool deinterlacing;
@@ -2084,7 +2151,7 @@
 bool CLinuxRendererGL::CreateNV12Texture(int index)
 {
 // since we also want the field textures, pitch must be texture aligned
- YUVBUFFER& buf = m_buffers[index];
+ CPictureBuffer& buf = m_buffers[index];
 YuvImage &im = buf.image;
 GLuint *pbo = buf.pbo;
 
@@ -2215,7 +2282,7 @@
 
 void CLinuxRendererGL::DeleteNV12Texture(int index)
 {
- YUVBUFFER& buf = m_buffers[index];
+ CPictureBuffer& buf = m_buffers[index];
 YuvImage &im = buf.image;
 GLuint *pbo = buf.pbo;
 
@@ -2266,7 +2333,7 @@
 
 bool CLinuxRendererGL::UploadYUV422PackedTexture(int source)
 {
- YUVBUFFER& buf = m_buffers[source];
+ CPictureBuffer& buf = m_buffers[source];
 YuvImage* im = &buf.image;
 
 bool deinterlacing;
@@ -2307,7 +2374,7 @@
 
 void CLinuxRendererGL::DeleteYUV422PackedTexture(int index)
 {
- YUVBUFFER& buf = m_buffers[index];
+ CPictureBuffer& buf = m_buffers[index];
 YuvImage &im = buf.image;
 GLuint *pbo = buf.pbo;
 
@@ -2354,7 +2421,7 @@
 bool CLinuxRendererGL::CreateYUV422PackedTexture(int index)
 {
 // since we also want the field textures, pitch must be texture aligned
- YUVBUFFER& buf = m_buffers[index];
+ CPictureBuffer& buf = m_buffers[index];
 YuvImage &im = buf.image;
 GLuint *pbo = buf.pbo;
 
@@ -2471,7 +2538,7 @@
 {
 for (int i = 0 ; i<m_NumYV12Buffers ; i++)
 {
- YUVBUFFER& buf = m_buffers[i];
+ CPictureBuffer& buf = m_buffers[i];
 
 for (int f = FIELD_FULL; f<=FIELD_BOT ; f++)
 {
@@ -2558,7 +2625,7 @@
 return false;
 }
 
-void CLinuxRendererGL::BindPbo(YUVBUFFER& buff)
+void CLinuxRendererGL::BindPbo(CPictureBuffer& buff)
 {
 bool pbo = false;
 for(int plane = 0; plane < YuvImage::MAX_PLANES; plane++)
@@ -2575,7 +2642,7 @@
 glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
 }
 
-void CLinuxRendererGL::UnBindPbo(YUVBUFFER& buff)
+void CLinuxRendererGL::UnBindPbo(CPictureBuffer& buff)
 {
 bool pbo = false;
 for(int plane = 0; plane < YuvImage::MAX_PLANES; plane++)
@@ -2658,3 +2725,15 @@
 }
 }
 
+AVColorPrimaries CLinuxRendererGL::GetSrcPrimaries(AVColorPrimaries srcPrimaries, unsigned int width, unsigned int height)
+{
+ AVColorPrimaries ret = srcPrimaries;
+ if (ret == AVCOL_PRI_UNSPECIFIED)
+ {
+ if (width > 1024 || height >= 600)
+ ret = AVCOL_PRI_BT709;
+ else
+ ret = AVCOL_PRI_BT470BG;
+ }
+ return ret;
+}

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2007-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -37,6 +37,10 @@
 #include "threads/Event.h"
 #include "VideoShaders/ShaderFormats.h"
 
+extern "C" {
+#include "libavutil/mastering_display_metadata.h"
+}
+
 class CRenderCapture;
 class CRenderSystemGL;
 
@@ -52,20 +56,6 @@
   float bottom;
 };
 
-struct YUVRANGE
-{
-  int y_min, y_max;
-  int u_min, u_max;
-  int v_min, v_max;
-};
-
-struct YUVCOEF
-{
-  float r_up, r_vp;
-  float g_up, g_vp;
-  float b_up, b_vp;
-};
-
 enum RenderMethod
 {
   RENDER_GLSL=0x01,
@@ -87,13 +77,6 @@
 #define FIELD_TOP 1
 #define FIELD_BOT 2
 
-extern YUVRANGE yuv_range_lim;
-extern YUVRANGE yuv_range_full;
-extern YUVCOEF yuv_coef_bt601;
-extern YUVCOEF yuv_coef_bt709;
-extern YUVCOEF yuv_coef_ebu;
-extern YUVCOEF yuv_coef_smtp240m;
-
 class CLinuxRendererGL : public CBaseRenderer
 {
 public:
@@ -104,7 +87,7 @@
   static bool Register();
 
   // Player functions
-  bool Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation) override;
+  bool Configure(const VideoPicture &picture, float fps, unsigned int orientation) override;
   bool IsConfigured() override { return m_bConfigured; }
   void AddVideoPicture(const VideoPicture &picture, int index, double currentClock) override;
   void UnInit() override;
@@ -132,6 +115,7 @@
   virtual void LoadShaders(int field=FIELD_FULL);
   void SetTextureFilter(GLenum method);
   void UpdateVideoFilter();
+  AVColorPrimaries GetSrcPrimaries(AVColorPrimaries srcPrimaries, unsigned int width, unsigned int height);
 
   // textures
   virtual bool UploadTexture(int index);
@@ -202,10 +186,10 @@
     unsigned pixpertex_y;
   };
 
-  struct YUVBUFFER
+  struct CPictureBuffer
   {
-    YUVBUFFER();
-   ~YUVBUFFER();
+    CPictureBuffer();
+   ~CPictureBuffer();
 
     YUVPLANE fields[MAX_FIELDS][YuvImage::MAX_PLANES];
     YuvImage image;
@@ -213,11 +197,22 @@
 
     CVideoBuffer *videoBuffer;
     bool loaded;
+
+    AVColorPrimaries m_srcPrimaries;
+    AVColorSpace m_srcColSpace;
+    int m_srcBits = 8;
+    int m_srcTextureBits = 8;
+    bool m_srcFullRange;
+
+    bool hasDisplayMetadata = false;
+    AVMasteringDisplayMetadata displayMetadata;
+    bool hasLightMetadata = false;
+    AVContentLightMetadata lightMetadata;
   };
 
   // YV12 decoder textures
   // field index 0 is full image, 1 is odd scanlines, 2 is even scanlines
-  YUVBUFFER m_buffers[NUM_BUFFERS];
+  CPictureBuffer m_buffers[NUM_BUFFERS];
 
   void LoadPlane(YUVPLANE& plane, int type,
                  unsigned width,  unsigned height,
@@ -232,12 +227,14 @@
   bool m_useDithering;
   unsigned int m_ditherDepth;
   bool m_fullRange;
+  AVColorPrimaries m_srcPrimaries;
+  bool m_toneMap = false;
 
   // clear colour for "black" bars
   float m_clearColour;
 
-  void BindPbo(YUVBUFFER& buff);
-  void UnBindPbo(YUVBUFFER& buff);
+  void BindPbo(CPictureBuffer& buff);
+  void UnBindPbo(CPictureBuffer& buff);
   bool m_pboSupported;
   bool m_pboUsed;

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2010-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -159,15 +159,17 @@
 return false;
 }
 
-bool CLinuxRendererGLES::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CLinuxRendererGLES::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 m_format = picture.videoBuffer->GetFormat();
 m_sourceWidth = picture.iWidth;
 m_sourceHeight = picture.iHeight;
 m_renderOrientation = orientation;
 
- // Save the flags.
- m_iFlags = flags;
+ m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
+ GetFlagsColorMatrix(picture.color_space, picture.iWidth, picture.iHeight) |
+ GetFlagsColorPrimaries(picture.color_primaries) |
+ GetFlagsStereoMode(picture.stereoMode);
 
 // Calculate the input frame aspect ratio.
 CalculateFrameAspectRatio(picture.iDisplayWidth, picture.iDisplayHeight);
@@ -475,7 +477,7 @@
 }
 }
 
- m_pVideoFilterShader = new ConvolutionFilterShader(m_scalingMethod, false);
+ m_pVideoFilterShader = new ConvolutionFilterShader(m_scalingMethod);
 if (!m_pVideoFilterShader->CompileAndLink())
 {
 CLog::Log(LOGERROR, "GL: Error compiling and linking video filter shader");
@@ -707,17 +709,14 @@
 
 // Y
 glActiveTexture(GL_TEXTURE0);
- glEnable(m_textureTarget);
 glBindTexture(m_textureTarget, planes[0].id);
 
 // U
 glActiveTexture(GL_TEXTURE1);
- glEnable(m_textureTarget);
 glBindTexture(m_textureTarget, planes[1].id);
 
 // V
 glActiveTexture(GL_TEXTURE2);
- glEnable(m_textureTarget);
 glBindTexture(m_textureTarget, planes[2].id);
 
 glActiveTexture(GL_TEXTURE0);
@@ -739,7 +738,6 @@
 pYUVShader->SetField(0);
 
 pYUVShader->SetMatrices(glMatrixProject.Get(), glMatrixModview.Get());
- pYUVShader->SetConvertFullColorRange(!CServiceBroker::GetWinSystem().UseLimitedColor());
 pYUVShader->Enable();
 
 GLubyte idx[4] = {0, 1, 3, 2}; //determines order of triangle strip
@@ -790,15 +788,6 @@
 glDisableVertexAttribArray(Uloc);
 glDisableVertexAttribArray(Vloc);
 
- glActiveTexture(GL_TEXTURE1);
- glDisable(m_textureTarget);
-
- glActiveTexture(GL_TEXTURE2);
- glDisable(m_textureTarget);
-
- glActiveTexture(GL_TEXTURE0);
- glDisable(m_textureTarget);
-
 VerifyGLState();
 }
 
@@ -829,20 +818,17 @@
 glDisable(GL_DEPTH_TEST);
 
 // Y
- glEnable(m_textureTarget);
 glActiveTexture(GL_TEXTURE0);
 glBindTexture(m_textureTarget, planes[0].id);
 VerifyGLState();
 
 // U
 glActiveTexture(GL_TEXTURE1);
- glEnable(m_textureTarget);
 glBindTexture(m_textureTarget, planes[1].id);
 VerifyGLState();
 
 // V
 glActiveTexture(GL_TEXTURE2);
- glEnable(m_textureTarget);
 glBindTexture(m_textureTarget, planes[2].id);
 VerifyGLState();
 
@@ -864,14 +850,11 @@
 pYUVShader->SetContrast(m_videoSettings.m_Contrast * 0.02f);
 pYUVShader->SetWidth(planes[0].texwidth);
 pYUVShader->SetHeight(planes[0].texheight);
- pYUVShader->SetNonLinStretch(1.0);
 if (field == FIELD_TOP)
 pYUVShader->SetField(1);
 else if(field == FIELD_BOT)
 pYUVShader->SetField(0);
 
- pYUVShader->SetConvertFullColorRange(!CServiceBroker::GetWinSystem().UseLimitedColor());
-
 VerifyGLState();
 
 glMatrixModview.Push();
@@ -965,15 +948,6 @@
 
 m_fbo.fbo.EndRender();
 
- glActiveTexture(GL_TEXTURE1);
- glDisable(m_textureTarget);
-
- glActiveTexture(GL_TEXTURE2);
- glDisable(m_textureTarget);
-
- glActiveTexture(GL_TEXTURE0);
- glDisable(m_textureTarget);
-
 VerifyGLState();
 }
 
@@ -998,14 +972,6 @@
 m_pVideoFilterShader->SetWidth(m_sourceWidth);
 m_pVideoFilterShader->SetHeight(m_sourceHeight);
 m_pVideoFilterShader->SetAlpha(1.0f);
-
- //disable non-linear stretch when a dvd menu is shown, parts of the menu are rendered through the overlay renderer
- //having non-linear stretch on breaks the alignment
- if (g_application.GetAppPlayer().IsInMenu())
- m_pVideoFilterShader->SetNonLinStretch(1.0);
- else
- m_pVideoFilterShader->SetNonLinStretch(pow(CDisplaySettings::GetInstance().GetPixelRatio(), g_advancedSettings.m_videoNonLinStretchRatio));
-
 m_pVideoFilterShader->SetMatrices(glMatrixProject.Get(), glMatrixModview.Get());
 m_pVideoFilterShader->Enable();
 }
@@ -1057,7 +1023,6 @@
 VerifyGLState();
 
 glBindTexture(GL_TEXTURE_2D, 0);
- glDisable(GL_TEXTURE_2D);
 VerifyGLState();
 }
 
@@ -1124,7 +1089,6 @@
 YUVBUFFER& buf = m_buffers[source];
 YuvImage* im = &buf.image;
 
- glEnable(m_textureTarget);
 VerifyGLState();
 
 glPixelStorei(GL_UNPACK_ALIGNMENT,1);
@@ -1148,7 +1112,6 @@
 
 CalculateTextureSourceRects(source, 3);
 
- glDisable(m_textureTarget);
 return true;
 }
 
@@ -1224,9 +1187,8 @@
 im.planesize[2] = im.stride[2] * ( im.height >> im.cshift_y );
 
 for (int i = 0; i < 3; i++)
- im.plane[i] = new BYTE[im.planesize[i]];
+ im.plane[i] = new uint8_t[im.planesize[i]];
 
- glEnable(m_textureTarget);
 for(int f = 0;f<MAX_FIELDS;f++)
 {
 for(p = 0;p<YuvImage::MAX_PLANES;p++)
@@ -1289,7 +1251,6 @@
 VerifyGLState();
 }
 }
- glDisable(m_textureTarget);
 return true;
 }
 
@@ -1307,7 +1268,6 @@
 else
 deinterlacing = true;
 
- glEnable(m_textureTarget);
 VerifyGLState();
 
 glPixelStorei(GL_UNPACK_ALIGNMENT, im->bpp);
@@ -1352,7 +1312,6 @@
 
 CalculateTextureSourceRects(source, 3);
 
- glDisable(m_textureTarget);
 return true;
 }
 
@@ -1387,9 +1346,8 @@
 im.planesize[2] = 0;
 
 for (int i = 0; i < 2; i++)
- im.plane[i] = new BYTE[im.planesize[i]];
+ im.plane[i] = new uint8_t[im.planesize[i]];
 
- glEnable(m_textureTarget);
 for(int f = 0;f<MAX_FIELDS;f++)
 {
 for(int p = 0;p<2;p++)
@@ -1443,7 +1401,6 @@
 VerifyGLState();
 }
 }
- glDisable(m_textureTarget);
 
 return true;
 }
@@ -1583,4 +1540,3 @@
 {
 return true;
 }
-

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererDX.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGL.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererGUI.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/OverlayRendererUtil.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -304,8 +304,8 @@
 
 void CRenderCaptureDX::BeginRender()
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ Microsoft::WRL::ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
+ Microsoft::WRL::ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 CD3D11_QUERY_DESC queryDesc(D3D11_QUERY_EVENT);
 
 if (!m_asyncChecked)
@@ -358,20 +358,20 @@
 //generate an occlusion query if we don't have one
 if (!m_query)
 {
- result = pDevice->CreateQuery(&queryDesc, &m_query);
+ result = pDevice->CreateQuery(&queryDesc, m_query.ReleaseAndGetAddressOf());
 if (FAILED(result))
 {
 CLog::LogF(LOGERROR, "CreateQuery failed %s",
 DX::GetErrorDescription(result).c_str());
 m_asyncSupported = false;
- SAFE_RELEASE(m_query);
+ m_query = nullptr;
 }
 }
 }
 else
 {
 //don't use an occlusion query, clean up any old one
- SAFE_RELEASE(m_query);
+ m_query = nullptr;
 }
 }
 
@@ -380,13 +380,13 @@
 // send commands to the GPU queue
 auto deviceResources = DX::DeviceResources::Get();
 deviceResources->FinishCommandList();
- ID3D11DeviceContext* pContext = deviceResources->GetImmediateContext();
+ Microsoft::WRL::ComPtr<ID3D11DeviceContext> pContext = deviceResources->GetImmediateContext();
 
 pContext->CopyResource(m_copyTex.Get(), m_renderTex.Get());
 
 if (m_query)
 {
- pContext->End(m_query);
+ pContext->End(m_query.Get());
 }
 
 if (m_flags & CAPTUREFLAG_IMMEDIATELY)
@@ -400,7 +400,7 @@
 if (m_query)
 {
 //if the result of the occlusion query is available, the data is probably also written into m_copySurface
- HRESULT result = DX::DeviceResources::Get()->GetImmediateContext()->GetData(m_query, nullptr, 0, 0);
+ HRESULT result = DX::DeviceResources::Get()->GetImmediateContext()->GetData(m_query.Get(), nullptr, 0, 0);
 if (SUCCEEDED(result))
 {
 if (S_OK == result)
@@ -453,7 +453,7 @@
 {
 m_renderTex.Release();
 m_copyTex.Release();
- SAFE_RELEASE(m_query);
+ m_query = nullptr;
 m_surfaceWidth = 0;
 m_surfaceHeight = 0;
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderCapture.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderFactory.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * http://kodi.tv
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -22,118 +22,79 @@
 #include <string>
 #include <map>
 
-
-namespace RenderManager {
-
- unsigned int GetFlagsColorMatrix(unsigned int color_matrix, unsigned width, unsigned height)
+unsigned int GetFlagsColorMatrix(unsigned int color_matrix, unsigned width, unsigned height)
+{
+ switch(color_matrix)
 {
- switch(color_matrix)
- {
- case 10: // BT2020_CL
- case 9: // BT2020_NCL
- return CONF_FLAGS_YUVCOEF_BT2020;
- case 7: // SMPTE 240M (1987)
- return CONF_FLAGS_YUVCOEF_240M;
- case 6: // SMPTE 170M
- case 5: // ITU-R BT.470-2
- case 4: // FCC
- return CONF_FLAGS_YUVCOEF_BT601;
- case 1: // ITU-R Rec.709 (1990) -- BT.709
+ case 10: // BT2020_CL
+ case 9: // BT2020_NCL
+ return CONF_FLAGS_YUVCOEF_BT2020;
+ case 7: // SMPTE 240M (1987)
+ return CONF_FLAGS_YUVCOEF_240M;
+ case 6: // SMPTE 170M
+ case 5: // ITU-R BT.470-2
+ case 4: // FCC
+ return CONF_FLAGS_YUVCOEF_BT601;
+ case 1: // ITU-R Rec.709 (1990) -- BT.709
+ return CONF_FLAGS_YUVCOEF_BT709;
+ case 3: // RESERVED
+ case 2: // UNSPECIFIED
+ default:
+ if(width > 1024 || height >= 600)
 return CONF_FLAGS_YUVCOEF_BT709;
- case 3: // RESERVED
- case 2: // UNSPECIFIED
- default:
- if(width > 1024 || height >= 600)
- return CONF_FLAGS_YUVCOEF_BT709;
- else
- return CONF_FLAGS_YUVCOEF_BT601;
- break;
- }
- }
-
- unsigned int GetFlagsChromaPosition(unsigned int chroma_position)
- {
- switch(chroma_position)
- {
- case 1: return CONF_FLAGS_CHROMA_LEFT;
- case 2: return CONF_FLAGS_CHROMA_CENTER;
- case 3: return CONF_FLAGS_CHROMA_TOPLEFT;
- }
- return 0;
- }
-
- unsigned int GetFlagsColorPrimaries(unsigned int color_primaries)
- {
- switch(color_primaries)
- {
- case 1: return CONF_FLAGS_COLPRI_BT709;
- case 4: return CONF_FLAGS_COLPRI_BT470M;
- case 5: return CONF_FLAGS_COLPRI_BT470BG;
- case 6: return CONF_FLAGS_COLPRI_170M;
- case 7: return CONF_FLAGS_COLPRI_240M;
- case 9: return CONF_FLAGS_COLPRI_BT2020;
- }
- return 0;
+ else
+ return CONF_FLAGS_YUVCOEF_BT601;
+ break;
 }
+}
 
- unsigned int GetFlagsColorTransfer(unsigned int color_transfer)
+unsigned int GetFlagsChromaPosition(unsigned int chroma_position)
+{
+ switch(chroma_position)
 {
- switch(color_transfer)
- {
- case 1: return CONF_FLAGS_TRC_BT709;
- case 4: return CONF_FLAGS_TRC_GAMMA22;
- case 5: return CONF_FLAGS_TRC_GAMMA28;
- }
- return 0;
+ case 1: return CONF_FLAGS_CHROMA_LEFT;
+ case 2: return CONF_FLAGS_CHROMA_CENTER;
+ case 3: return CONF_FLAGS_CHROMA_TOPLEFT;
 }
+ return 0;
+}
 
- unsigned int GetStereoModeFlags(const std::string& mode)
+unsigned int GetFlagsColorPrimaries(unsigned int color_primaries)
+{
+ switch(color_primaries)
 {
- static std::map<std::string, unsigned int> convert;
- if(convert.empty())
- {
- convert["mono"] = 0u;
- convert["left_right"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT;
- convert["bottom_top"] = CONF_FLAGS_STEREO_MODE_TAB | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT;
- convert["top_bottom"] = CONF_FLAGS_STEREO_MODE_TAB | CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT;
- convert["checkerboard_rl"] = 0u;
- convert["checkerboard_lr"] = 0u;
- convert["row_interleaved_rl"] = 0u;
- convert["row_interleaved_lr"] = 0u;
- convert["col_interleaved_rl"] = 0u;
- convert["col_interleaved_lr"] = 0u;
- convert["anaglyph_cyan_red"] = 0u;
- convert["right_left"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT;
- convert["anaglyph_green_magenta"] = 0u;
- convert["anaglyph_yellow_blue"] = 0u;
- convert["block_lr"] = 0u;
- convert["block_rl"] = 0u;
- }
- return convert[mode];
+ case 1: return CONF_FLAGS_COLPRI_BT709;
+ case 4: return CONF_FLAGS_COLPRI_BT470M;
+ case 5: return CONF_FLAGS_COLPRI_BT470BG;
+ case 6: return CONF_FLAGS_COLPRI_170M;
+ case 7: return CONF_FLAGS_COLPRI_240M;
+ case 9: return CONF_FLAGS_COLPRI_BT2020;
 }
+ return 0;
+}
 
- std::string GetStereoModeInvert(const std::string& mode)
+unsigned int GetFlagsStereoMode(const std::string& mode)
+{
+ static std::map<std::string, unsigned int> convert;
+ if(convert.empty())
 {
- static std::map<std::string, std::string> convert;
- if(convert.empty())
- {
- convert["left_right"] = "right_left";
- convert["right_left"] = "left_right";
- convert["bottom_top"] = "top_bottom";
- convert["top_bottom"] = "bottom_top";
- convert["checkerboard_rl"] = "checkerboard_lr";
- convert["checkerboard_lr"] = "checkerboard_rl";
- convert["row_interleaved_rl"] = "row_interleaved_lr";
- convert["row_interleaved_lr"] = "row_interleaved_rl";
- convert["col_interleaved_rl"] = "col_interleaved_lr";
- convert["col_interleaved_lr"] = "col_interleaved_rl";
- convert["block_lr"] = "block_rl";
- convert["block_rl"] = "block_lr";
- }
- std::string res = convert[mode];
- if(res.empty())
- return mode;
- else
- return res;
+ convert["mono"] = 0u;
+ convert["left_right"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT;
+ convert["bottom_top"] = CONF_FLAGS_STEREO_MODE_TAB | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT;
+ convert["top_bottom"] = CONF_FLAGS_STEREO_MODE_TAB | CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT;
+ convert["checkerboard_rl"] = 0u;
+ convert["checkerboard_lr"] = 0u;
+ convert["row_interleaved_rl"] = 0u;
+ convert["row_interleaved_lr"] = 0u;
+ convert["col_interleaved_rl"] = 0u;
+ convert["col_interleaved_lr"] = 0u;
+ convert["anaglyph_cyan_red"] = 0u;
+ convert["right_left"] = CONF_FLAGS_STEREO_MODE_SBS | CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT;
+ convert["anaglyph_green_magenta"] = 0u;
+ convert["anaglyph_yellow_blue"] = 0u;
+ convert["block_lr"] = 0u;
+ convert["block_rl"] = 0u;
 }
+ return convert[mode];
 }
+

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.h Changed

@@ -65,12 +65,6 @@
 #define CONF_FLAGS_CHROMA_CENTER  0x0200
 #define CONF_FLAGS_CHROMA_TOPLEFT 0x0300
 
-/* defines color transfer function */
-#define CONF_FLAGS_TRC_MASK(a) ((a) & 0x0c00)
-#define CONF_FLAGS_TRC_BT709      0x0400
-#define CONF_FLAGS_TRC_GAMMA22    0x0800
-#define CONF_FLAGS_TRC_GAMMA28    0x0c00
-
 /* defines 3d modes */
 #define CONF_FLAGS_STEREO_MODE_MASK(a) ((a) & 0x007000)
 #define CONF_FLAGS_STEREO_MODE_SBS     0x001000
@@ -80,16 +74,7 @@
 #define CONF_FLAGS_STEREO_CADANCE_LEFT_RIGHT 0x000000
 #define CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT 0x008000
 
-
-
-namespace RenderManager {
-
-  unsigned int GetFlagsColorMatrix(unsigned int color_matrix, unsigned width, unsigned height);
-  unsigned int GetFlagsChromaPosition(unsigned int chroma_position);
-  unsigned int GetFlagsColorPrimaries(unsigned int color_primaries);
-  unsigned int GetFlagsColorTransfer(unsigned int color_transfer);
-  unsigned int GetStereoModeFlags(const std::string& mode);
-  std::string  GetStereoModeInvert(const std::string& mode);
-
-}
-
+unsigned int GetFlagsColorMatrix(unsigned int color_matrix, unsigned width, unsigned height);
+unsigned int GetFlagsChromaPosition(unsigned int chroma_position);
+unsigned int GetFlagsColorPrimaries(unsigned int color_primaries);
+unsigned int GetFlagsStereoMode(const std::string& mode);

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

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -97,7 +97,7 @@
   }
 }
 
-bool CRenderManager::Configure(const VideoPicture& picture, float fps, unsigned flags, unsigned int orientation, int buffers)
+bool CRenderManager::Configure(const VideoPicture& picture, float fps, bool fullscreen, unsigned int orientation, int buffers)
 {
 
   // check if something has changed
@@ -109,8 +109,8 @@
         m_dwidth == picture.iDisplayWidth &&
         m_dheight == picture.iDisplayHeight &&
         m_fps == fps &&
-        (m_flags & ~CONF_FLAGS_FULLSCREEN) == (flags & ~CONF_FLAGS_FULLSCREEN) &&
         m_orientation == orientation &&
+        m_stereomode == picture.stereoMode &&
         m_NumberBuffers == buffers &&
         m_pRenderer != nullptr &&
         !m_pRenderer->ConfigChanged(picture))
@@ -146,8 +146,8 @@
     m_dwidth = picture.iDisplayWidth;
     m_dheight = picture.iDisplayHeight;
     m_fps = fps;
-    m_flags = flags;
     m_orientation = orientation;
+    m_stereomode = picture.stereoMode;
     m_NumberBuffers  = buffers;
     m_renderState = STATE_CONFIGURING;
     m_stateEvent.Reset();
@@ -155,6 +155,7 @@
     m_dvdClock.SetVsyncAdjust(0);
     m_pConfigPicture.reset(new VideoPicture());
     m_pConfigPicture->CopyRef(picture);
+    m_fullscreen = fullscreen;
 
     CSingleLock lock2(m_presentlock);
     m_presentstep = PRESENT_READY;
@@ -198,7 +199,7 @@
   }
 
   m_pRenderer->SetVideoSettings(m_playerPort->GetVideoSettings());
-  bool result = m_pRenderer->Configure(*m_pConfigPicture, m_fps, m_flags, m_orientation);
+  bool result = m_pRenderer->Configure(*m_pConfigPicture, m_fps, m_orientation);
   if (result)
   {
     CRenderInfo info = m_pRenderer->GetRenderInfo();
@@ -301,9 +302,10 @@
       firstFrame = true;
       FrameWait(50);
 
-      if (m_flags & CONF_FLAGS_FULLSCREEN)
+      if (m_fullscreen)
       {
         CApplicationMessenger::GetInstance().PostMsg(TMSG_SWITCHTOFULLSCREEN);
+        m_fullscreen = false;
       }
     }
 
@@ -679,7 +681,7 @@
     return res;
 
   if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_ADJUSTREFRESHRATE) != ADJUST_REFRESHRATE_OFF)
-    res = CResolutionUtils::ChooseBestResolution(m_fps, m_width, CONF_FLAGS_STEREO_MODE_MASK(m_flags) != 0);
+    res = CResolutionUtils::ChooseBestResolution(m_fps, m_width, !m_stereomode.empty());
 
   return res;
 }
@@ -868,7 +870,7 @@
     {
       if (CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_ADJUSTREFRESHRATE) != ADJUST_REFRESHRATE_OFF && m_fps > 0.0f)
       {
-        RESOLUTION res = CResolutionUtils::ChooseBestResolution(m_fps, m_width, CONF_FLAGS_STEREO_MODE_MASK(m_flags) != 0);
+        RESOLUTION res = CResolutionUtils::ChooseBestResolution(m_fps, m_width, !m_stereomode.empty());
         g_graphicsContext.SetVideoResolution(res, false);
         UpdateLatencyTweak();
       }
@@ -878,13 +880,13 @@
   }
 }
 
-void CRenderManager::TriggerUpdateResolution(float fps, int width, int flags)
+void CRenderManager::TriggerUpdateResolution(float fps, int width, std::string &stereomode)
 {
   if (width)
   {
     m_fps = fps;
     m_width = width;
-    m_flags = flags;
+    m_stereomode = stereomode;
   }
   m_bTriggerUpdateResolution = true;
 }

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/RenderManager.h Changed

@@ -2,7 +2,7 @@
 
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -24,7 +24,7 @@
 
 #include "cores/VideoPlayer/VideoRenderers/BaseRenderer.h"
 #include "cores/VideoPlayer/VideoRenderers/OverlayRenderer.h"
-#include "guilib/Geometry.h"
+#include "utils/Geometry.h"
 #include "guilib/Resolution.h"
 #include "threads/CriticalSection.h"
 #include "cores/VideoSettings.h"
@@ -78,7 +78,7 @@
   bool IsVideoLayer();
   RESOLUTION GetResolution();
   void UpdateResolution();
-  void TriggerUpdateResolution(float fps, int width, int flags);
+  void TriggerUpdateResolution(float fps, int width, std::string &stereomode);
   void SetViewMode(int iViewMode);
   void PreInit();
   void UnInit();
@@ -97,19 +97,8 @@
 
   int GetSkippedFrames()  { return m_QueueSkip; }
 
-  // Functions called from mplayer
-  /**
-   * Called by video player to configure renderer
-   * @param picture
-   * @param fps frames per second of video
-   * @param flags see RenderFlags.h
-   * @param orientation
-   * @param numbers of kept buffer references
-   */
-  bool Configure(const VideoPicture& picture, float fps, unsigned flags, unsigned int orientation, int buffers = 0);
-
+  bool Configure(const VideoPicture& picture, float fps, bool fullscreen, unsigned int orientation, int buffers = 0);
   bool AddVideoPicture(const VideoPicture& picture, volatile std::atomic_bool& bStop, EINTERLACEMETHOD deintMethod, bool wait);
-
   void AddOverlay(CDVDOverlay* o, double pts);
 
   /**
@@ -162,7 +151,6 @@
   CCriticalSection m_datalock;
   bool m_bTriggerUpdateResolution = false;
   bool m_bRenderGUI = true;
-  int m_rendermethod = 0;
   bool m_renderedOverlay = false;
   bool m_renderDebug = false;
   XbmcThreads::EndTime m_debugTimer;
@@ -219,10 +207,11 @@
   unsigned int m_height = 0;
   unsigned int m_dwidth = 0;
   unsigned int m_dheight = 0;
-  unsigned int m_flags = 0;
   float m_fps = 0.0;
   unsigned int m_orientation = 0;
   int m_NumberBuffers = 0;
+  bool m_fullscreen = false;
+  std::string m_stereomode;
 
   int m_lateframes = -1;
   double m_presentpts = 0.0;

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

@@ -1,21 +1,23 @@
-set(SOURCES ConvolutionKernels.cpp
-            YUVMatrix.cpp)
+set(SOURCES ConvolutionKernels.cpp)
 
 set(HEADERS ConvolutionKernels.h
-            YUVMatrix.h
             dither.h
             ShaderFormats.h)
 
 if(CORE_SYSTEM_NAME STREQUAL windows OR CORE_SYSTEM_NAME STREQUAL windowsstore)
-  list(APPEND SOURCES WinVideoFilter.cpp)
-  list(APPEND HEADERS WinVideoFilter.h)
+  list(APPEND SOURCES ConversionMatrix.cpp
+                      WinVideoFilter.cpp)
+  list(APPEND HEADERS ConversionMatrix.h
+                      WinVideoFilter.h)
 endif()
 
 if(OPENGL_FOUND)
-  list(APPEND SOURCES GLSLOutput.cpp
+  list(APPEND SOURCES ConversionMatrix.cpp
+                      GLSLOutput.cpp
                       VideoFilterShaderGL.cpp
                       YUV2RGBShaderGL.cpp)
-  list(APPEND HEADERS GLSLOutput.h
+  list(APPEND HEADERS ConversionMatrix.h
+                      GLSLOutput.h
                       VideoFilterShaderGL.h
                       YUV2RGBShaderGL.h)
 endif()
@@ -26,11 +28,11 @@
                        CORE_PLATFORM_NAME_LC STREQUAL gbm OR
                        CORE_PLATFORM_NAME_LC STREQUAL mir OR
                        CORE_PLATFORM_NAME_LC STREQUAL wayland))
-  list(APPEND SOURCES GLSLOutputGLES.cpp
-                      VideoFilterShaderGLES.cpp
+  list(APPEND SOURCES VideoFilterShaderGLES.cpp
+                      YUVMatrix.cpp
                       YUV2RGBShaderGLES.cpp)
-  list(APPEND HEADERS GLSLOutputGLES.h
-                      VideoFilterShaderGLES.h
+  list(APPEND HEADERS VideoFilterShaderGLES.h
+                      YUVMatrix.h
                       YUV2RGBShaderGLES.h)
 endif()

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.cpp Added

@@ -0,0 +1,596 @@
+/*
+ * Copyright (C) 2005-2018 Team XBMC
+ * http://kodi.tv
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#include "ConversionMatrix.h"
+
+//------------------------------------------------------------------------------
+// constants for primaries and transfers functions and color models
+//------------------------------------------------------------------------------
+
+// source: https://www.khronos.org/registry/DataFormat/specs/1.2/dataformat.1.2.html#PRIMARY_CONVERSION
+
+struct ConvYCbCr
+{
+ float Kr, Kb;
+};
+
+struct Primaries
+{
+ float primaries[3][2];
+ float whitepoint[2];
+};
+
+const ConvYCbCr BT709YCbCr = {0.2126, 0.0722};
+const ConvYCbCr BT601YCbCr = {0.299, 0.114};
+const ConvYCbCr BT2020YCbCr = {0.2627, 0.0593};
+const ConvYCbCr ST240YCbCr = {0.212, 0.087};
+
+const Primaries PrimariesBT709 = {{{0.640, 0.330}, {0.300, 0.600}, {0.150, 0.060}},
+ {0.3127, 0.3290} };
+const Primaries PrimariesBT610_525 = {{{0.640, 0.340}, {0.310, 0.595}, {0.155, 0.070}},
+ {0.3127, 0.3290} };
+const Primaries PrimariesBT610_625 = {{{0.640, 0.330}, {0.290, 0.600}, {0.150, 0.060}},
+ {0.3127, 0.3290} };
+const Primaries PrimariesBT2020 = {{{0.708, 0.292}, {0.170, 0.797}, {0.131, 0.046}},
+ {0.3127, 0.3290} };
+
+//------------------------------------------------------------------------------
+// Matrix helpers
+//------------------------------------------------------------------------------
+// source: http://timjones.io/blog/archive/2014/10/20/the-matrix-inverted
+
+template <unsigned Order>
+float CalculateDeterminant(float (&src)[Order][Order]);
+
+template <unsigned Order>
+void GetSubmatrix(float (&dest)[Order-1][Order-1], float (&src)[Order][Order], unsigned row, unsigned col)
+{
+ unsigned colCount = 0;
+ unsigned rowCount = 0;
+
+ for (unsigned i = 0; i < Order; i++)
+ {
+ if (i != row)
+ {
+ colCount = 0;
+ for (unsigned j = 0; j < Order; j++)
+ {
+ if (j != col)
+ {
+ dest[rowCount][colCount] = src[i][j];
+ colCount++;
+ }
+ }
+ rowCount++;
+ }
+ }
+}
+
+template <unsigned Order>
+float CalculateMinor(float (&src)[Order][Order], unsigned row, unsigned col)
+{
+ float sub[Order-1][Order-1];
+ GetSubmatrix<Order>(sub, src, row, col);
+ return CalculateDeterminant<Order - 1>(sub);
+}
+
+template <unsigned Order>
+float CalculateDeterminant(float (&src)[Order][Order])
+{
+ float det = 0.0f;
+
+ for (unsigned i = 0; i < Order; i++)
+ {
+ // Get minor of element (0, i)
+ float minor = CalculateMinor<Order>(src, 0, i);
+
+ // If this is an odd-numbered row, negate the value.
+ float factor = (i % 2 == 1) ? -1.0f : 1.0f;
+
+ det += factor * src[0][i] * minor;
+ }
+ return det;
+}
+
+template <>
+float CalculateDeterminant<2>(float (&src)[2][2])
+{
+ return src[0][0] * src[1][1] - src[0][1] * src[1][0];
+}
+
+//------------------------------------------------------------------------------
+// Matrix classes
+//------------------------------------------------------------------------------
+
+template <unsigned Order>
+CMatrix<Order>::CMatrix(float (&src)[Order][Order])
+{
+ Copy(m_mat, src);
+}
+
+template <unsigned Order>
+CMatrix<Order>::CMatrix(float (&src)[Order-1][Order-1])
+{
+ *this = src;
+}
+
+template <unsigned Order>
+CMatrix<Order>& CMatrix<Order>::operator=(const CMatrix& src)
+{
+ Copy(m_mat, src.m_mat);
+ return *this;
+}
+
+template <unsigned Order>
+CMatrix<Order>& CMatrix<Order>::operator=(const float (&src)[Order-1][Order-1])
+{
+ for (unsigned i=0; i<Order-1; ++i)
+ for (unsigned j=0; j<Order-1; ++j)
+ m_mat[i][j] = src[i][j];
+
+ for (unsigned i=0; i<Order; ++i)
+ m_mat[i][Order-1] = 0;
+
+ for (unsigned i=0; i<Order; ++i)
+ m_mat[Order-1][i] = 0;
+
+ return *this;
+}
+
+template <unsigned Order>
+float (&CMatrix<Order>::Get())[Order][Order]
+{
+ return m_mat;
+}
+
+template <unsigned Order>
+CMatrix<Order> CMatrix<Order>::Invert()
+{
+ CMatrix<Order> ret;
+ Invert(ret.m_mat, m_mat);
+ return ret;
+}
+
+template <unsigned Order>
+CMatrix<Order> CMatrix<Order>::operator*(const CMatrix& other)
+{
+ return *this * other.m_mat;
+}
+
+template <unsigned Order>
+CMatrix<Order> CMatrix<Order>::operator*=(const CMatrix& other)
+{
+ CMatrix<Order> tmp = *this * other.m_mat;
+ *this = tmp;
+ return *this;
+}
+
+template <unsigned Order>
+CMatrix<Order> CMatrix<Order>::operator*(const float (&other)[Order][Order])
+{
+ CMatrix<Order> ret;
+ for (unsigned i=0; i<Order; ++i)
+ for (unsigned j=0; j<Order; ++j)
+ for (unsigned k=0; k<Order; ++k)
+ ret.m_mat[i][j] += m_mat[i][k] * other[k][j];
+
+ return ret;
+}
+
+template <unsigned Order>
+void CMatrix<Order>::Copy(float (&dst)[Order][Order], const float (&src)[Order][Order])
+{
+ for (unsigned i=0; i<Order; ++i)
+ for (unsigned j=0; j<Order; ++j)
+ dst[i][j] = src[i][j];
+}
+
+template <unsigned Order>
+void CMatrix<Order>::Invert(float (&dst)[Order][Order], float (&src)[Order][Order])
+{
+ // Calculate the inverse of the determinant of src.
+ float det = CalculateDeterminant<Order>(src);
+ float inverseDet = 1.0f / det;
+
+ for (unsigned j = 0; j < Order; j++)
+ {
+ for (unsigned i = 0; i < Order; i++)
+ {
+ // Get minor of element (j, i) - not (i, j) because
+ // this is where the transpose happens.
+ float minor = CalculateMinor<Order>(src, j, i);
+
+ // Multiply by (−1)^{i+j}
+ float factor = ((i + j) % 2 == 1) ? -1.0f : 1.0f;
+ float cofactor = minor * factor;
+
+ dst[i][j] = inverseDet * cofactor;
+ }
+ }
+}
+
+CGlMatrix::CGlMatrix(float (&src)[3][3]) : CMatrix<4>(src)
+{
+
+}
+
+CGlMatrix::CMatrix CGlMatrix::operator*(const float (&other)[4][4])
+{
+ CGlMatrix ret;
+
+ float (&left)[4][4] = m_mat;
+ const float (&right)[4][4] = other;
+
+ ret.m_mat[0][0] = left[0][0] * right[0][0] + left[0][1] * right[1][0] + left[0][2] * right[2][0];
+ ret.m_mat[0][1] = left[0][0] * right[0][1] + left[0][1] * right[1][1] + left[0][2] * right[2][1];
+ ret.m_mat[0][2] = left[0][0] * right[0][2] + left[0][1] * right[1][2] + left[0][2] * right[2][2];
+ ret.m_mat[0][3] = left[0][0] * right[0][3] + left[0][1] * right[1][3] + left[0][2] * right[2][3] + left[0][3];
+ ret.m_mat[1][0] = left[1][0] * right[0][0] + left[1][1] * right[1][0] + left[1][2] * right[2][0];
+ ret.m_mat[1][1] = left[1][0] * right[0][1] + left[1][1] * right[1][1] + left[1][2] * right[2][1];
+ ret.m_mat[1][2] = left[1][0] * right[0][2] + left[1][1] * right[1][2] + left[1][2] * right[2][2];
+ ret.m_mat[1][3] = left[1][0] * right[0][3] + left[1][1] * right[1][3] + left[1][2] * right[2][3] + left[1][3];
+ ret.m_mat[2][0] = left[2][0] * right[0][0] + left[2][1] * right[1][0] + left[2][2] * right[2][0];
+ ret.m_mat[2][1] = left[2][0] * right[0][1] + left[2][1] * right[1][1] + left[2][2] * right[2][1];
+ ret.m_mat[2][2] = left[2][0] * right[0][2] + left[2][1] * right[1][2] + left[2][2] * right[2][2];
+ ret.m_mat[2][3] = left[2][0] * right[0][3] + left[2][1] * right[1][3] + left[2][2] * right[2][3] + left[2][3];
+
+ return ret;
+}
+
+CScale::CScale(float x, float y, float z)
+{
+ m_mat[0][0] = x;
+ m_mat[1][1] = y;
+ m_mat[2][2] = z;
+ m_mat[3][3] = 1;
+}
+
+CTranslate::CTranslate(float x, float y, float z)
+{
+ m_mat[0][0] = 1;
+ m_mat[1][1] = 1;
+ m_mat[2][2] = 1;
+ m_mat[3][3] = 1;
+ m_mat[0][3] = x;
+ m_mat[1][3] = y;
+ m_mat[2][3] = z;
+}
+
+//------------------------------------------------------------------------------
+// Conversion classes
+//------------------------------------------------------------------------------
+
+ConversionToRGB::ConversionToRGB(float Kr, float Kb)
+{
+ float Kg = 1-Kr-Kb;
+ a11 = Kr;
+ a12 = Kg;
+ a13 = Kb;
+ CbDen = 2*(1-Kb);
+ CrDen = 2*(1-Kr);
+
+ m_mat[0][0] = a11; m_mat[0][1] = a12; m_mat[0][2] = a13;
+ m_mat[1][0] = -Kr/CbDen; m_mat[1][1] = -Kg/CbDen; m_mat[1][2] = 0.5;
+ m_mat[2][0] = 0.5; m_mat[2][1] = -Kg/CrDen; m_mat[2][2] = -Kb/CrDen;
+
+ CMatrix<3> inv(m_mat);
+ Copy(m_mat, inv.Invert().Get());
+};
+
+ConversionToRGB& ConversionToRGB::operator=(const float (&src)[3][3])
+{
+ Copy(m_mat, src);
+ return *this;
+}
+
+PrimaryToXYZ::PrimaryToXYZ(const float (&primaries)[3][2], const float (&whitepoint)[2])
+{
+ float By = CalcBy(primaries, whitepoint);
+ float Gy = CalcGy(primaries, whitepoint, By);
+ float Ry = CalcRy(By, Gy);
+
+ m_mat[0][0] = Ry*primaries[0][0]/primaries[0][1];
+ m_mat[0][1] = Gy*primaries[1][0]/primaries[1][1];
+ m_mat[0][2] = By*primaries[2][0]/primaries[2][1];
+ m_mat[1][0] = Ry;
+ m_mat[1][1] = Gy;
+ m_mat[1][2] = By;
+ m_mat[2][0] = Ry/primaries[0][1] * (1- primaries[0][0] - primaries[0][1]);
+ m_mat[2][1] = Gy/primaries[1][1] * (1- primaries[1][0] - primaries[1][1]);
+ m_mat[2][2] = By/primaries[2][1] * (1- primaries[2][0] - primaries[2][1]);
+}
+
+float PrimaryToXYZ::CalcBy(const float p[3][2], const float w[2])
+{
+ float val = ((1-w[0])/w[1] - (1-p[0][0])/p[0][1]) * (p[1][0]/p[1][1] - p[0][0]/p[0][1]) -
+ (w[0]/w[1] - p[0][0]/p[0][1]) * ((1-p[1][0])/p[1][1] - (1-p[0][0])/p[0][1]);
+
+ val /= ((1-p[2][0])/p[2][1] - (1-p[0][0])/p[0][1]) * (p[1][0]/p[1][1] - p[0][0]/p[0][1]) -
+ (p[2][0]/p[2][1] - p[0][0]/p[0][1]) * ((1-p[1][0])/p[1][1] - (1-p[0][0])/p[0][1]);
+
+ return val;
+}
+
+float PrimaryToXYZ::CalcGy(const float p[3][2], const float w[2], const float By)
+{
+ float val = w[0]/w[1] - p[0][0]/p[0][1] - By * (p[2][0]/p[2][1] - p[0][0]/p[0][1]);
+ val /= p[1][0]/p[1][1] - p[0][0]/p[0][1];
+
+ return val;
+}
+
+float PrimaryToXYZ::CalcRy(const float By, const float Gy)
+{
+ return 1.0 - Gy - By;
+}
+
+PrimaryToRGB::PrimaryToRGB(float (&primaries)[3][2], float (&whitepoint)[2]) : PrimaryToXYZ(primaries, whitepoint)
+{
+ CMatrix<3> inv(m_mat);
+ Copy(m_mat, inv.Invert().Get());
+}
+
+//------------------------------------------------------------------------------
+
+void CConvertMatrix::SetColParams(AVColorSpace colSpace, int bits, bool limited, int textuteBits)
+{
+ if (m_colSpace == colSpace &&
+ m_srcBits == bits &&
+ m_limitedSrc == limited &&
+ m_srcTextureBits == textuteBits &&
+ m_pMat)
+ return;
+ 
+ m_colSpace = colSpace;
+ m_srcBits = bits;
+ m_limitedSrc = limited;
+ m_srcTextureBits = textuteBits;
+
+ GenMat();
+}
+
+void CConvertMatrix::SetColPrimaries(AVColorPrimaries dst, AVColorPrimaries src)
+{
+ m_colPrimariesDst = dst;
+ m_colPrimariesSrc = src;
+
+ if (m_colPrimariesDst != m_colPrimariesSrc)
+ {
+ Primaries primToRGB;
+ Primaries primToXYZ;
+ switch (m_colPrimariesSrc)
+ {
+ case AVCOL_PRI_BT709:
+ primToXYZ = PrimariesBT709;
+ m_gammaSrc = 2.2;
+ break;
+ case AVCOL_PRI_BT470BG:
+ primToXYZ = PrimariesBT610_625;
+ m_gammaSrc = 2.2;
+ break;
+ case AVCOL_PRI_SMPTE170M:
+ case AVCOL_PRI_SMPTE240M:
+ primToXYZ = PrimariesBT610_525;
+ m_gammaSrc = 2.2;
+ break;
+ case AVCOL_PRI_BT2020:
+ primToXYZ = PrimariesBT2020;
+ m_gammaSrc = 2.4;
+ break;
+ default:
+ primToXYZ = PrimariesBT709;
+ m_gammaSrc = 2.2;
+ break;
+ }
+ switch (m_colPrimariesDst)
+ {
+ case AVCOL_PRI_BT709:
+ primToRGB = PrimariesBT709;
+ m_gammaDst = 2.2;
+ break;
+ case AVCOL_PRI_BT470BG:
+ primToRGB = PrimariesBT610_625;
+ m_gammaDst = 2.2;
+ break;
+ case AVCOL_PRI_SMPTE170M:
+ case AVCOL_PRI_SMPTE240M:
+ primToRGB = PrimariesBT610_525;
+ m_gammaDst = 2.2;
+ break;
+ case AVCOL_PRI_BT2020:
+ primToRGB = PrimariesBT2020;
+ m_gammaDst = 2.4;
+ break;
+ default:
+ primToRGB = PrimariesBT709;
+ m_gammaDst = 2.2;
+ break;
+ }
+ PrimaryToXYZ toXYZ(primToXYZ.primaries, primToXYZ.whitepoint);
+ PrimaryToRGB toRGB(primToRGB.primaries, primToRGB.whitepoint);
+
+ CMatrix<3> tmp = toRGB*toXYZ;
+ m_pMatPrim.reset(new CMatrix<3>(tmp));
+ }
+ else
+ {
+ m_pMatPrim.reset();
+ }
+}
+
+void CConvertMatrix::SetParams(float contrast, float black, bool limited)
+{
+ m_contrast = contrast;
+ m_black = black;
+ m_limitedDst = limited;
+}
+
+void CConvertMatrix::GenMat()
+{
+ ConvYCbCr convYCbCr;
+ switch (m_colSpace)
+ {
+ case AVCOL_SPC_BT709:
+ convYCbCr = BT709YCbCr;
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ convYCbCr = BT601YCbCr;
+ break;
+ case AVCOL_SPC_SMPTE240M:
+ convYCbCr = ST240YCbCr;
+ break;
+ case AVCOL_SPC_BT2020_NCL:
+ case AVCOL_SPC_BT2020_CL:
+ convYCbCr = BT2020YCbCr;
+ break;
+ default:
+ convYCbCr = BT709YCbCr;
+ break;
+ }
+
+ ConversionToRGB mConvRGB(convYCbCr.Kr, convYCbCr.Kb);
+
+ m_pMat.reset(new CGlMatrix(mConvRGB.Get()));
+
+ CTranslate trans(0, -0.5, -0.5);
+ *m_pMat *= trans;
+
+ if (m_limitedSrc)
+ {
+ if (m_srcBits >= 12)
+ {
+ CScale scale(4080.0f / (3760 - 256), 4080.0f / (3840 - 256), 4080.0f / (3840 - 256));
+ CTranslate trans(- 256.0f / 4080, - 256.0f / 4080, - 256.0f / 4080);
+ *m_pMat *= scale;
+ *m_pMat *= trans;
+ }
+ else if (m_srcBits == 10)
+ {
+ CScale scale(1020.0f / (940 - 64), 1020.0f / (960 - 64), 1020.0f / (960 - 64));
+ CTranslate trans(- 64.0f / 1020, - 64.0f / 1020, - 64.0f / 1020);
+ *m_pMat *= scale;
+ *m_pMat *= trans;
+ }
+ else
+ {
+ CScale scale(255.0f / (235 - 16), 255.0f / (240 - 16), 255.0f / (240 - 16));
+ CTranslate trans(- 16.0f / 255, - 16.0f / 255, - 16.0f / 255);
+ *m_pMat *= scale;
+ *m_pMat *= trans;
+ }
+ }
+
+ if (m_srcTextureBits > 8)
+ {
+ float val = 65535.0f / ((1 << m_srcTextureBits) - 1);
+ CScale scale(val, val, val);
+ *m_pMat *= scale;
+ }
+}
+
+void CConvertMatrix::GetYuvMat(float (&mat)[4][4])
+{
+ if (!m_pMat)
+ return;
+
+ CScale contrast(m_contrast, m_contrast, m_contrast);
+ CTranslate black(m_black, m_black, m_black);
+
+ CGlMatrix ret = contrast;
+ ret *= black;
+ if (m_limitedDst)
+ {
+ float valScale = (235 - 16) / 255.0f;
+ float valTrans = 16.0f / 255;
+ CScale scale(valScale, valScale, valScale);
+ CTranslate trans(valTrans, valTrans, valTrans);
+ ret *= trans;
+ ret *= scale;
+ }
+
+ ret *= m_pMat->Get();
+ float (&src)[4][4] = ret.Get();
+
+ for (int i=0; i<4; ++i)
+ for (int j=0; j<4; ++j)
+ mat[i][j] = src[j][i];
+
+ mat[0][3] = 0.0f;
+ mat[1][3] = 0.0f;
+ mat[2][3] = 0.0f;
+ mat[3][3] = 1.0f;
+}
+
+bool CConvertMatrix::GetPrimMat(float (&mat)[3][3])
+{
+ if (!m_pMatPrim)
+ return false;
+
+ float (&src)[3][3] = m_pMatPrim->Get();
+
+ for (int i=0; i<3; ++i)
+ for (int j=0; j<3; ++j)
+ mat[i][j] = src[j][i];
+
+ return true;
+}
+
+float CConvertMatrix::GetGammaSrc()
+{
+ return m_gammaSrc;
+}
+
+float CConvertMatrix::GetGammaDst()
+{
+ return m_gammaDst;
+}
+
+bool CConvertMatrix::GetRGBYuvCoefs(AVColorSpace colspace, float (&coefs)[3])
+{
+ switch (colspace)
+ {
+ case AVCOL_SPC_BT709:
+ coefs[0] = BT709YCbCr.Kr;
+ coefs[1] = 1 - BT709YCbCr.Kr - BT709YCbCr.Kb;
+ coefs[2] = BT709YCbCr.Kb;
+ break;
+ case AVCOL_SPC_BT470BG:
+ case AVCOL_SPC_SMPTE170M:
+ coefs[0] = BT601YCbCr.Kr;
+ coefs[1] = 1 - BT601YCbCr.Kr - BT601YCbCr.Kb;
+ coefs[2] = BT601YCbCr.Kb;
+ break;
+ case AVCOL_SPC_SMPTE240M:
+ coefs[0] = ST240YCbCr.Kr;
+ coefs[1] = 1 - ST240YCbCr.Kr - ST240YCbCr.Kb;
+ coefs[2] = ST240YCbCr.Kb;
+ break;
+ case AVCOL_SPC_BT2020_NCL:
+ case AVCOL_SPC_BT2020_CL:
+ coefs[0] = ST240YCbCr.Kr;
+ coefs[1] = 1 - ST240YCbCr.Kr - ST240YCbCr.Kb;
+ coefs[2] = ST240YCbCr.Kb;
+ break;
+ default:
+ return false;
+ }
+ return true;
+}

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h Added

@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2005-2018 Team XBMC
+ * http://kodi.tv
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#pragma once
+
+#include <memory>
+
+extern "C" {
+#include "libavutil/pixfmt.h"
+}
+
+template <unsigned Order>
+class CMatrix
+{
+public:
+ CMatrix(float (&src)[Order][Order]);
+ CMatrix(float (&src)[Order-1][Order-1]);
+ CMatrix& operator=(const CMatrix& src);
+ CMatrix& operator=(const float (&src)[Order-1][Order-1]);
+ virtual ~CMatrix() = default;
+
+ float (&Get())[Order][Order];
+ CMatrix Invert();
+ CMatrix operator*(const CMatrix& other);
+ CMatrix operator*=(const CMatrix& other);
+ virtual CMatrix operator*(const float (&other)[Order][Order]);
+
+protected:
+ CMatrix() = default;
+
+ void Copy(float (&dst)[Order][Order], const float (&src)[Order][Order]);
+ void Invert(float (&dst)[Order][Order], float (&src)[Order][Order]);
+
+ float m_mat[Order][Order] = {};
+};
+
+class CGlMatrix : public CMatrix<4>
+{
+public:
+ CGlMatrix() = default;
+ CGlMatrix(float (&src)[3][3]);
+ virtual ~CGlMatrix() = default;
+ CMatrix operator*(const float (&other)[4][4]) override;
+};
+
+class CScale : public CGlMatrix
+{
+public:
+ CScale(float x, float y, float z);
+ virtual ~CScale() = default;
+};
+
+class CTranslate : public CGlMatrix
+{
+public:
+ CTranslate(float x, float y, float z);
+ virtual ~CTranslate() = default;
+};
+
+class ConversionToRGB : public CMatrix<3>
+{
+public:
+ ConversionToRGB(float Kr, float Kb);
+ virtual ~ConversionToRGB() = default;
+ ConversionToRGB& operator=(const float (&src)[3][3]);
+
+protected:
+ ConversionToRGB() = default;
+
+ float a11, a12, a13;
+ float CbDen, CrDen;
+};
+
+class PrimaryToXYZ : public CMatrix<3>
+{
+public:
+ PrimaryToXYZ(const float (&primaries)[3][2], const float (&whitepoint)[2]);
+ virtual ~PrimaryToXYZ() = default;
+
+protected:
+ PrimaryToXYZ() = default;
+ float CalcBy(const float p[3][2], const float w[2]);
+ float CalcGy(const float p[3][2], const float w[2], const float By);
+ float CalcRy(const float By, const float Gy);
+};
+
+class PrimaryToRGB : public PrimaryToXYZ
+{
+public:
+ PrimaryToRGB(float (&primaries)[3][2], float (&whitepoint)[2]);
+ virtual ~PrimaryToRGB() = default;
+};
+
+//------------------------------------------------------------------------------
+
+class CConvertMatrix
+{
+public:
+ CConvertMatrix() = default;
+ virtual ~CConvertMatrix() = default;
+
+ void SetColParams(AVColorSpace colSpace, int bits, bool limited, int textuteBits);
+ void SetColPrimaries(AVColorPrimaries dst, AVColorPrimaries src);
+ void SetParams(float contrast, float black, bool limited);
+ void GetYuvMat(float (&mat)[4][4]);
+ bool GetPrimMat(float (&mat)[3][3]);
+ float GetGammaSrc();
+ float GetGammaDst();
+
+ static bool GetRGBYuvCoefs(AVColorSpace colspace, float (&coefs)[3]);
+ 
+protected:
+ void GenMat();
+
+ std::unique_ptr<CGlMatrix> m_pMat;
+ std::unique_ptr<CMatrix<3>> m_pMatPrim;
+ AVColorSpace m_colSpace = AVCOL_SPC_BT709;
+ AVColorPrimaries m_colPrimariesSrc = AVCOL_PRI_BT709;
+ float m_gammaSrc = 2.2f;
+ bool m_limitedSrc = true;
+ AVColorPrimaries m_colPrimariesDst = AVCOL_PRI_BT709;
+ float m_gammaDst = 2.2f;
+ bool m_limitedDst = false;
+ int m_srcBits = 8;
+ int m_srcTextureBits = 8;
+ int m_dstBits = 8;
+ float m_contrast = 1.0;
+ float m_black = 0.0;
+};

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConvolutionKernels.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutput.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutputGLES.cpp Deleted

@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2007 d4rk
- * Copyright (C) 2007-2015 Team XBMC
- * Copyright (C) 2015 Lauri Mylläri
- * 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_gl.h"
-#include "utils/log.h"
-
-#include "GLSLOutputGLES.h"
-#include "dither.h"
-
-using namespace Shaders;
-
-GLSLOutput::GLSLOutput(int texunit, bool useDithering, unsigned int ditherDepth, bool fullrange, GLuint clutTex, int clutSize)
-{
- // set member variable initial values
- m_1stTexUnit = texunit;
- m_uDither = m_1stTexUnit+0;
- m_uCLUT = m_1stTexUnit+1;
-
- // textures
- m_tDitherTex = 0;
- m_tCLUTTex = clutTex;
-
- // shader attribute handles
- m_hDither = -1;
- m_hDitherQuant = -1;
- m_hDitherSize = -1;
- m_hCLUT = -1;
- m_hCLUTSize = -1;
-
- m_dither = useDithering;
- m_ditherDepth = ditherDepth;
- m_fullRange = fullrange;
- // make sure CMS is enabled - this allows us to keep the texture
- // around to quickly switch between CMS on and off
- m_3DLUT = clutTex > 0;
- m_uCLUTSize = clutSize;
-}
-
-std::string GLSLOutput::GetDefines()
-{
- std::string defines;
- if (m_dither)
- defines += "#define XBMC_DITHER\n";
- if (m_fullRange)
- defines += "#define XBMC_FULLRANGE\n";
-#ifdef HAS_GL
- if (m_3DLUT)
- defines += "#define KODI_3DLUT\n";
-#endif //HAS_GL
- return defines;
-}
-
-void GLSLOutput::OnCompiledAndLinked(GLuint programHandle)
-{
- FreeTextures();
-
- // get uniform locations
- // dithering
- if (m_dither)
- {
- m_hDither = glGetUniformLocation(programHandle, "m_dither");
- m_hDitherQuant = glGetUniformLocation(programHandle, "m_ditherquant");
- m_hDitherSize = glGetUniformLocation(programHandle, "m_dithersize");
- }
- // 3DLUT
- if (m_3DLUT)
- {
-#ifdef HAS_GL
- m_hCLUT = glGetUniformLocation(programHandle, "m_CLUT");
- m_hCLUTSize = glGetUniformLocation(programHandle, "m_CLUTsize");
-#endif //HAS_GL
- }
-
- if (m_dither)
- {
- //! @todo create a dither pattern
-
- // create a dither texture
- glGenTextures(1, &m_tDitherTex);
- if ( m_tDitherTex <= 0 )
- {
- CLog::Log(LOGERROR, "Error creating dither texture");
- return;
- }
- // bind and set texture parameters
- glActiveTexture(GL_TEXTURE0 + m_uDither);
- glBindTexture(GL_TEXTURE_2D, m_tDitherTex);
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-#if defined(HAS_GL)
- glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-#endif
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-
-#if defined(HAS_GL)
- // load dither texture data
- glTexImage2D(GL_TEXTURE_2D, 0, GL_R16, dither_size, dither_size, 0, GL_RED, GL_UNSIGNED_SHORT, dither_matrix);
-#endif
- }
-
- glActiveTexture(GL_TEXTURE0);
-
- VerifyGLState();
-}
-
-bool GLSLOutput::OnEnabled()
-{
-
- if (m_dither)
- {
- // set texture units
- glUniform1i(m_hDither, m_uDither);
- VerifyGLState();
-
- // bind textures
- glActiveTexture(GL_TEXTURE0 + m_uDither);
- glBindTexture(GL_TEXTURE_2D, m_tDitherTex);
- glActiveTexture(GL_TEXTURE0);
- VerifyGLState();
-
- // dither settings
- glUniform1f(m_hDitherQuant, (1<<m_ditherDepth)-1.0);
- VerifyGLState();
- glUniform2f(m_hDitherSize, dither_size, dither_size);
- VerifyGLState();
- }
-
- if (m_3DLUT)
- {
-#ifdef HAS_GL
- // set texture units
- glUniform1i(m_hCLUT, m_uCLUT);
- glUniform1f(m_hCLUTSize, m_uCLUTSize);
- VerifyGLState();
-
- // bind textures
- glActiveTexture(GL_TEXTURE0 + m_uCLUT);
- glBindTexture(GL_TEXTURE_3D, m_tCLUTTex);
- glActiveTexture(GL_TEXTURE0);
- VerifyGLState();
-#endif //HAS_GL
- }
-
- VerifyGLState();
- return true;
-}
-
-void GLSLOutput::OnDisabled()
-{
- // disable textures
- if (m_dither)
- {
- glActiveTexture(GL_TEXTURE0 + m_uDither);
- glDisable(GL_TEXTURE_2D);
- }
- if (m_3DLUT)
- {
-#ifdef HAS_GL
- glActiveTexture(GL_TEXTURE0 + m_uCLUT);
- glDisable(GL_TEXTURE_3D);
-#endif //HAS_GL
- }
- glActiveTexture(GL_TEXTURE0);
- VerifyGLState();
-}
-
-void GLSLOutput::Free()
-{
- FreeTextures();
-}
-
-void GLSLOutput::FreeTextures()
-{
- if (m_tDitherTex)
- {
- glDeleteTextures(1, &m_tDitherTex);
- m_tDitherTex = 0;
- }
-}

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/GLSLOutputGLES.h Deleted

@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2007-2015 Team XBMC
- * Copyright (C) 2015 Lauri Mylläri
- * 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 "system.h"
-#include "utils/GLUtils.h"
-
-namespace Shaders
-{
- class GLSLOutput
- {
- public:
- // take the 1st available texture unit as a parameter
- GLSLOutput(
- int texunit,
- bool useDithering,
- unsigned int ditherDepth,
- bool fullrange,
- GLuint clutTex,
- int clutSize);
- std::string GetDefines();
- void OnCompiledAndLinked(GLuint programHandle);
- bool OnEnabled();
- void OnDisabled();
- void Free();
-
- private:
- void FreeTextures();
-
- bool m_dither;
- unsigned int m_ditherDepth;
- bool m_fullRange;
- bool m_3DLUT;
- // first texture unit available to us
- int m_1stTexUnit;
- int m_uDither;
- int m_uCLUT;
- int m_uCLUTSize;
-
- // defines
-
- // attribute locations
- GLint m_hDither;
- GLint m_hDitherQuant;
- GLint m_hDitherSize;
- GLint m_hCLUT;
- GLint m_hCLUTSize;
-
- // textures
- GLuint m_tDitherTex;
- GLuint m_tCLUTTex;
- };
-}

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGLES.cpp Changed

@@ -1,7 +1,7 @@
 /*
  *      Copyright (c) 2007 d4rk
  *      Copyright (C) 2007-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -31,8 +31,6 @@
 #include "ConvolutionKernels.h"
 #include "rendering/gles/RenderSystemGLES.h"
 
-#define TEXTARGET GL_TEXTURE_2D
-
 using namespace Shaders;
 
 //////////////////////////////////////////////////////////////////////
@@ -49,8 +47,6 @@
   m_sourceTexUnit = 0;
   m_hSourceTex = 0;
 
-  m_stretch = 0.0f;
-
   m_hVertex = -1;
   m_hcoord = -1;
   m_hProj = -1;
@@ -61,30 +57,9 @@
   m_model = nullptr;
   m_alpha = -1;
 
-  std::string shaderv =
-    "attribute vec4 m_attrpos;"
-    "attribute vec2 m_attrcord;"
-    "varying vec2 cord;"
-    "uniform mat4 m_proj;"
-    "uniform mat4 m_model;"
-
-    "void main ()"
-    "{"
-    "mat4 mvp = m_proj * m_model;"
-    "gl_Position = mvp * m_attrpos;"
-    "cord = m_attrcord.xy;"
-    "}";
-  VertexShader()->SetSource(shaderv);
-
-  std::string shaderp =
-    "precision mediump float;"
-    "uniform sampler2D img;"
-    "varying vec2 cord;"
-    "void main()"
-    "{"
-    "gl_FragColor = texture2D(img, cord);"
-    "}";
-  PixelShader()->SetSource(shaderp);
+  VertexShader()->LoadSource("gles_videofilter.vert");
+
+  PixelShader()->LoadSource("gles_videofilter.frag");
 }
 
 void BaseVideoFilterShader::OnCompiledAndLinked()
@@ -104,7 +79,7 @@
   return true;
 }
 
-ConvolutionFilterShader::ConvolutionFilterShader(ESCALINGMETHOD method, bool stretch, GLSLOutput *output)
+ConvolutionFilterShader::ConvolutionFilterShader(ESCALINGMETHOD method)
 {
   m_method = method;
   m_kernelTex1 = 0;
@@ -127,12 +102,12 @@
       m_method == VS_SCALINGMETHOD_SPLINE36_FAST ||
       m_method == VS_SCALINGMETHOD_LANCZOS3_FAST)
   {
-    shadername = "convolution-4x4.glsl";
+    shadername = "gles_convolution-4x4.frag";
   }
   else if (m_method == VS_SCALINGMETHOD_SPLINE36 ||
            m_method == VS_SCALINGMETHOD_LANCZOS3)
   {
-    shadername = "convolution-6x6.glsl";
+    shadername = "gles_convolution-6x6.frag";
   }
 
   if (m_floattex)
@@ -146,30 +121,13 @@
     defines = "#define HAS_FLOAT_TEXTURE 0\n";
   }
 
-  //don't compile in stretch support when it's not needed
-  if (stretch)
-    defines += "#define XBMC_STRETCH 1\n";
-  else
-    defines += "#define XBMC_STRETCH 0\n";
-
-  // get defines from the output stage if used
-  m_glslOutput = output;
-  if (m_glslOutput) {
-    defines += m_glslOutput->GetDefines();
-  }
-
-  //tell shader if we're not using a 1D texture
-  defines += "#define USE1DTEXTURE 0\n";
-
   CLog::Log(LOGDEBUG, "GL: ConvolutionFilterShader: using %s defines:\n%s", shadername.c_str(), defines.c_str());
   PixelShader()->LoadSource(shadername, defines);
-  PixelShader()->AppendSource("output.glsl");
 }
 
 ConvolutionFilterShader::~ConvolutionFilterShader()
 {
   Free();
-  delete m_glslOutput;
 }
 
 void ConvolutionFilterShader::OnCompiledAndLinked()
@@ -180,7 +138,6 @@
   m_hSourceTex = glGetUniformLocation(ProgramHandle(), "img");
   m_hStepXY    = glGetUniformLocation(ProgramHandle(), "stepxy");
   m_hKernTex   = glGetUniformLocation(ProgramHandle(), "kernelTex");
-  m_hStretch   = glGetUniformLocation(ProgramHandle(), "m_stretch");
 
   CConvolutionKernel kernel(m_method, 256);
 
@@ -199,13 +156,12 @@
   }
 
   //make a kernel texture on GL_TEXTURE2 and set clamping and interpolation
-  //TEXTARGET is set to GL_TEXTURE_1D or GL_TEXTURE_2D
   glActiveTexture(GL_TEXTURE2);
-  glBindTexture(TEXTARGET, m_kernelTex1);
-  glTexParameteri(TEXTARGET, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-  glTexParameteri(TEXTARGET, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-  glTexParameteri(TEXTARGET, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-  glTexParameteri(TEXTARGET, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+  glBindTexture(GL_TEXTURE_2D, m_kernelTex1);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
   //if float textures are supported, we can load the kernel as a float texture
   //if not we load it as 8 bit unsigned which gets converted back to float in the shader
@@ -223,13 +179,11 @@
   }
 
   //upload as 2D texture with height of 1
-  glTexImage2D(TEXTARGET, 0, m_internalformat, kernel.GetSize(), 1, 0, GL_RGBA, format, data);
+  glTexImage2D(GL_TEXTURE_2D, 0, m_internalformat, kernel.GetSize(), 1, 0, GL_RGBA, format, data);
 
   glActiveTexture(GL_TEXTURE0);
 
   VerifyGLState();
-
-  if (m_glslOutput) m_glslOutput->OnCompiledAndLinked(ProgramHandle());
 }
 
 bool ConvolutionFilterShader::OnEnabled()
@@ -238,21 +192,19 @@
 
   // set shader attributes once enabled
   glActiveTexture(GL_TEXTURE2);
-  glBindTexture(TEXTARGET, m_kernelTex1);
+  glBindTexture(GL_TEXTURE_2D, m_kernelTex1);
 
   glActiveTexture(GL_TEXTURE0);
   glUniform1i(m_hSourceTex, m_sourceTexUnit);
   glUniform1i(m_hKernTex, 2);
   glUniform2f(m_hStepXY, m_stepX, m_stepY);
-  glUniform1f(m_hStretch, m_stretch);
   VerifyGLState();
-  if (m_glslOutput) m_glslOutput->OnEnabled();
+
   return true;
 }
 
 void ConvolutionFilterShader::OnDisabled()
 {
-  if (m_glslOutput) m_glslOutput->OnDisabled();
 }
 
 void ConvolutionFilterShader::Free()
@@ -260,33 +212,9 @@
   if (m_kernelTex1)
     glDeleteTextures(1, &m_kernelTex1);
   m_kernelTex1 = 0;
-  if (m_glslOutput) m_glslOutput->Free();
   BaseVideoFilterShader::Free();
 }
 
-StretchFilterShader::StretchFilterShader()
-{
-  PixelShader()->LoadSource("stretch.glsl");
-}
-
-void StretchFilterShader::OnCompiledAndLinked()
-{
-  BaseVideoFilterShader::OnCompiledAndLinked();
-
-  m_hSourceTex = glGetUniformLocation(ProgramHandle(), "img");
-  m_hStretch   = glGetUniformLocation(ProgramHandle(), "m_stretch");
-}
-
-bool StretchFilterShader::OnEnabled()
-{
-  BaseVideoFilterShader::OnEnabled();
-
-  glUniform1i(m_hSourceTex, m_sourceTexUnit);
-  glUniform1f(m_hStretch, m_stretch);
-  VerifyGLState();
-  return true;
-}
-
 void DefaultFilterShader::OnCompiledAndLinked()
 {
   BaseVideoFilterShader::OnCompiledAndLinked();

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoFilterShaderGLES.h Changed

@@ -27,7 +27,6 @@
 
 #include "guilib/Shader.h"
 #include "cores/VideoSettings.h"
-#include "GLSLOutputGLES.h"
 
 namespace Shaders {
 
@@ -40,7 +39,6 @@
     virtual void SetSourceTexture(GLint ytex) { m_sourceTexUnit = ytex; }
     virtual void SetWidth(int w) { m_width  = w; m_stepX = w>0?1.0f/w:0; }
     virtual void SetHeight(int h) { m_height = h; m_stepY = h>0?1.0f/h:0; }
-    virtual void SetNonLinStretch(float stretch) { m_stretch = stretch; }
     virtual bool GetTextureFilter(GLint& filter) { return false; }
     virtual GLint GetVertexLoc() { return m_hVertex; }
     virtual GLint GetcoordLoc() { return m_hcoord; }
@@ -52,13 +50,11 @@
     int m_height;
     float m_stepX;
     float m_stepY;
-    float m_stretch;
     GLint m_sourceTexUnit;
 
     // shader attribute handles
     GLint m_hSourceTex;
     GLint m_hStepXY;
-    GLint m_hStretch = 0;
 
     GLint m_hVertex;
     GLint m_hcoord;
@@ -74,7 +70,7 @@
   class ConvolutionFilterShader : public BaseVideoFilterShader
   {
   public:
-    ConvolutionFilterShader(ESCALINGMETHOD method, bool stretch, GLSLOutput *output=NULL);
+    ConvolutionFilterShader(ESCALINGMETHOD method);
     ~ConvolutionFilterShader() override;
     void OnCompiledAndLinked() override;
     bool OnEnabled() override;
@@ -93,16 +89,6 @@
     ESCALINGMETHOD m_method;
     bool m_floattex; //if float textures are supported
     GLint m_internalformat;
-
-    Shaders::GLSLOutput *m_glslOutput;
-  };
-
-  class StretchFilterShader : public BaseVideoFilterShader
-  {
-    public:
-      StretchFilterShader();
-      void OnCompiledAndLinked() override;
-      bool OnEnabled() override;
   };
 
   class DefaultFilterShader : public BaseVideoFilterShader

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -18,18 +18,17 @@
 *
 */
 
+#include "WinVideoFilter.h"
 #include "ConvolutionKernels.h"
-#include "dither.h"
+#include "cores/VideoPlayer/VideoRenderers/VideoShaders/dither.h"
+#include "cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h"
 #include "filesystem/File.h"
 #include "guilib/GraphicContext.h"
 #include "platform/win32/WIN32Util.h"
-#include "Util.h"
-#include "utils/log.h"
-#include "VideoRenderers/WinRenderBuffer.h"
 #include "rendering/dx/RenderContext.h"
 #include "rendering/dx/DeviceResources.h"
-#include "WinVideoFilter.h"
-#include "YUVMatrix.h"
+#include "Util.h"
+#include "utils/log.h"
 
 #include <DirectXPackedVector.h>
 #include <map>
@@ -37,77 +36,6 @@
 using namespace DirectX::PackedVector;
 using namespace Microsoft::WRL;
 
-CYUV2RGBMatrix::CYUV2RGBMatrix()
-{
- m_NeedRecalc = true;
- m_blacklevel = 0.0f;
- m_contrast = 0.0f;
- m_flags = 0;
- m_limitedRange = false;
- m_format = BUFFER_FMT_NONE;
-}
-
-void CYUV2RGBMatrix::SetParameters(float contrast, float blacklevel, unsigned int flags, EBufferFormat format)
-{
- if (m_contrast != contrast)
- {
- m_NeedRecalc = true;
- m_contrast = contrast;
- }
- if (m_blacklevel != blacklevel)
- {
- m_NeedRecalc = true;
- m_blacklevel = blacklevel;
- }
- if (m_flags != flags)
- {
- m_NeedRecalc = true;
- m_flags = flags;
- }
- if (m_format != format)
- {
- m_NeedRecalc = true;
- m_format = format;
- }
- if (m_limitedRange != DX::Windowing().UseLimitedColor())
- {
- m_NeedRecalc = true;
- m_limitedRange = DX::Windowing().UseLimitedColor();
- }
-}
-
-XMFLOAT4X4* CYUV2RGBMatrix::Matrix()
-{
- if (m_NeedRecalc)
- {
- TransformMatrix matrix;
- EShaderFormat fmt = SHADER_NONE;
- if (m_format == BUFFER_FMT_YUV420P10)
- fmt = SHADER_YV12_10;
- CalculateYUVMatrix(matrix, m_flags, fmt, m_blacklevel, m_contrast, m_limitedRange);
-
- m_mat._11 = matrix.m[0][0];
- m_mat._12 = matrix.m[1][0];
- m_mat._13 = matrix.m[2][0];
- m_mat._14 = 0.0f;
- m_mat._21 = matrix.m[0][1];
- m_mat._22 = matrix.m[1][1];
- m_mat._23 = matrix.m[2][1];
- m_mat._24 = 0.0f;
- m_mat._31 = matrix.m[0][2];
- m_mat._32 = matrix.m[1][2];
- m_mat._33 = matrix.m[2][2];
- m_mat._34 = 0.0f;
- m_mat._41 = matrix.m[0][3];
- m_mat._42 = matrix.m[1][3];
- m_mat._43 = matrix.m[2][3];
- m_mat._44 = 1.0f;
-
- m_NeedRecalc = false;
- }
- return &m_mat;
-}
-
 //===================================================================
 
 CWinShader::~CWinShader()
@@ -140,7 +68,7 @@
 D3DX11_PASS_DESC desc = {};
 if (FAILED(m_effect.Get()->GetTechniqueByIndex(0)->GetPassByIndex(0)->GetDesc(&desc)))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to get first pass description.");
+ CLog::LogF(LOGERROR, "Failed to get first pass description.");
 return false;
 }
 
@@ -158,7 +86,7 @@
 {
 if (!m_vb.Map(data))
 {
- CLog::Log(LOGERROR, __FUNCTION__" - failed to lock vertex buffer");
+ CLog::LogF(LOGERROR, "failed to lock vertex buffer");
 return false;
 }
 return true;
@@ -168,7 +96,7 @@
 {
 if (!m_vb.Unmap())
 {
- CLog::Log(LOGERROR, __FUNCTION__" - failed to unlock vertex buffer");
+ CLog::LogF(LOGERROR, "failed to unlock vertex buffer");
 return false;
 }
 return true;
@@ -176,12 +104,12 @@
 
 bool CWinShader::LoadEffect(const std::string& filename, DefinesMap* defines)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__" - loading shader %s", filename.c_str());
+ CLog::LogF(LOGDEBUG, "loading shader %s", filename);
 
 XFILE::CFileStream file;
 if(!file.Open(filename))
 {
- CLog::Log(LOGERROR, __FUNCTION__" - failed to open file %s", filename.c_str());
+ CLog::LogF(LOGERROR, "failed to open file %s", filename);
 return false;
 }
 
@@ -190,7 +118,7 @@
 
 if (!m_effect.Create(pStrEffect, defines))
 {
- CLog::Log(LOGERROR, __FUNCTION__" %s failed", pStrEffect.c_str());
+ CLog::LogF(LOGERROR, "%s failed", pStrEffect);
 return false;
 }
 
@@ -209,7 +137,7 @@
 UINT cPasses;
 if (!m_effect.Begin(&cPasses, 0))
 {
- CLog::Log(LOGERROR, __FUNCTION__" - failed to begin d3d effect");
+ CLog::LogF(LOGERROR, "failed to begin d3d effect");
 return false;
 }
 
@@ -229,19 +157,19 @@
 
 if (!m_effect.BeginPass(iPass))
 {
- CLog::Log(LOGERROR, __FUNCTION__" - failed to begin d3d effect pass");
+ CLog::LogF(LOGERROR, "failed to begin d3d effect pass");
 break;
 }
 
 pContext->DrawIndexed(4, 0, iPass * vertexIndexStep);
 
 if (!m_effect.EndPass())
- CLog::Log(LOGERROR, __FUNCTION__" - failed to end d3d effect pass");
+ CLog::LogF(LOGERROR, "failed to end d3d effect pass");
 
 CD3DHelper::PSClearShaderResources(pContext);
 }
 if (!m_effect.End())
- CLog::Log(LOGERROR, __FUNCTION__" - failed to end d3d effect");
+ CLog::LogF(LOGERROR, "failed to end d3d effect");
 
 if (oldRT)
 pContext->OMSetRenderTargets(1, oldRT.GetAddressOf(), nullptr);
@@ -280,6 +208,20 @@
 effect.SetResources("m_ditherMatrix", m_pDitherView.GetAddressOf(), 1);
 effect.SetFloatArray("m_ditherParams", ditherParams, 3);
 }
+ if (m_toneMapping)
+ {
+ float param = 0.5;
+ if (m_hasLightMetadata)
+ param = log10(100) / log10(m_lightMetadata.MaxCLL);
+ else if (m_hasDisplayMetadata && m_displayMetadata.has_luminance)
+ param = log10(100) / log10(m_displayMetadata.max_luminance.num / m_displayMetadata.max_luminance.den);
+
+ float coefs[3];
+ CConvertMatrix::GetRGBYuvCoefs(AVColorSpace::AVCOL_SPC_BT709, coefs);
+
+ effect.SetScalar("g_toneP1", param);
+ effect.SetFloatArray("g_coefsDst", coefs, 3);
+ }
 }
 
 void COutputShader::GetDefines(DefinesMap& map) const
@@ -292,12 +234,17 @@
 {
 map["KODI_DITHER"] = "";
 }
+ if (m_toneMapping)
+ {
+ map["KODI_TONE_MAPPING"] = "";
+ }
 }
 
-bool COutputShader::Create(bool useCLUT, bool useDithering, int ditherDepth)
+bool COutputShader::Create(bool useCLUT, bool useDithering, int ditherDepth, bool toneMapping)
 {
 m_useCLUT = useCLUT;
 m_ditherDepth = ditherDepth;
+ m_toneMapping = toneMapping;
 
 CWinShader::CreateVertexBuffer(4, sizeof(CUSTOMVERTEX));
 
@@ -312,7 +259,7 @@
 
 if (!LoadEffect(effectString, &defines))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to load shader %s.", effectString.c_str());
+ CLog::LogF(LOGERROR, "Failed to load shader %s.", effectString);
 return false;
 }
 
@@ -352,6 +299,14 @@
 m_pCLUTView = pCLUTView;
 }
 
+void COutputShader::SetDisplayMetadata(bool hasDisplayMetadata, AVMasteringDisplayMetadata displayMetadata, bool hasLightMetadata, AVContentLightMetadata lightMetadata)
+{
+ m_hasDisplayMetadata = hasDisplayMetadata;
+ m_displayMetadata = displayMetadata;
+ m_hasLightMetadata = hasLightMetadata;
+ m_lightMetadata = lightMetadata;
+}
+
 bool COutputShader::CreateCLUTView(int clutSize, uint16_t* clutData, bool isRGB, ID3D11ShaderResourceView** ppCLUTView)
 {
 if (!clutSize || !clutData)
@@ -374,8 +329,8 @@
 else
 cData = clutData;
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetImmediateContext();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetImmediateContext();
 CD3D11_TEXTURE3D_DESC txDesc(DXGI_FORMAT_R16G16B16A16_UNORM, clutSize, clutSize, clutSize, 1,
 D3D11_BIND_SHADER_RESOURCE, D3D11_USAGE_IMMUTABLE);
 
@@ -385,26 +340,28 @@
 texData.SysMemPitch = clutSize * sizeof(uint16_t) * 4;
 texData.SysMemSlicePitch = texData.SysMemPitch * clutSize;
 
- HRESULT hr = pDevice->CreateTexture3D(&txDesc, &texData, &pCLUTTex);
+ HRESULT hr = pDevice->CreateTexture3D(&txDesc, &texData, pCLUTTex.GetAddressOf());
 if (isRGB)
 _aligned_free(cData);
 
 if (FAILED(hr))
 {
- CLog::Log(LOGDEBUG, "%s: unable to create 3dlut texture cube.");
+ CLog::LogF(LOGDEBUG, "unable to create 3dlut texture cube.");
 return false;
 }
 
+ ComPtr<ID3D11ShaderResourceView> clutView;
 CD3D11_SHADER_RESOURCE_VIEW_DESC srvDesc(D3D11_SRV_DIMENSION_TEXTURE3D, DXGI_FORMAT_R16G16B16A16_UNORM, 0, 1);
- hr = pDevice->CreateShaderResourceView(pCLUTTex.Get(), &srvDesc, ppCLUTView);
+ hr = pDevice->CreateShaderResourceView(pCLUTTex.Get(), &srvDesc, clutView.GetAddressOf());
 pContext->Flush();
 
 if (FAILED(hr))
 {
- CLog::Log(LOGDEBUG, "%s: unable to create view for 3dlut texture cube.");
+ CLog::LogF(LOGDEBUG, "unable to create view for 3dlut texture cube.");
 return false;
 }
 
+ *ppCLUTView = clutView.Detach();
 return true;
 }
 
@@ -485,7 +442,7 @@
 
 if (FAILED(hr))
 {
- CLog::Log(LOGDEBUG, "%s: unable to create 3dlut texture cube.");
+ CLog::LogF(LOGDEBUG, "unable to create 3dlut texture cube.");
 m_useDithering = false;
 return;
 }
@@ -494,7 +451,7 @@
 hr = pDevice->CreateShaderResourceView(pDitherTex.Get(), &srvDesc, &m_pDitherView);
 if (FAILED(hr))
 {
- CLog::Log(LOGDEBUG, "%s: unable to create view for 3dlut texture cube.");
+ CLog::LogF(LOGDEBUG, "unable to create view for 3dlut texture cube.");
 m_useDithering = false;
 return;
 }
@@ -503,7 +460,7 @@
 
 //==================================================================================
 
-bool CYUV2RGBShader::Create(EBufferFormat fmt, COutputShader *pCLUT)
+bool CYUV2RGBShader::Create(EBufferFormat fmt, AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries, COutputShader *pCLUT)
 {
 m_format = fmt;
 m_pOutShader = pCLUT;
@@ -537,6 +494,9 @@
 return false;
 }
 
+ if (srcPrimaries != dstPrimaries)
+ defines["XBMC_COL_CONVERSION"] = "";
+
 if (m_pOutShader)
 m_pOutShader->GetDefines(defines);
 
@@ -544,7 +504,7 @@
 
 if(!LoadEffect(effectString, &defines))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to load shader %s.", effectString.c_str());
+ CLog::LogF(LOGERROR, "Failed to load shader %s.", effectString);
 return false;
 }
 
@@ -559,19 +519,39 @@
 
 if (!CWinShader::CreateInputLayout(layout, ARRAYSIZE(layout)))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create input layout for Input Assembler.");
+ CLog::LogF(LOGERROR, "Failed to create input layout for Input Assembler.");
 return false;
 }
+
+ m_pConvMatrix.reset(new CConvertMatrix());
+ m_pConvMatrix->SetColPrimaries(dstPrimaries, srcPrimaries);
 return true;
 }
 
-void CYUV2RGBShader::Render(CRect sourceRect, CPoint dest[], float contrast, float brightness, CRenderBuffer* videoBuffer, CD3DTexture *target)
+void CYUV2RGBShader::Render(CRect sourceRect, CPoint dest[], CRenderBuffer* videoBuffer, CD3DTexture *target)
 {
- PrepareParameters(videoBuffer, sourceRect, dest, contrast, brightness);
+ PrepareParameters(videoBuffer, sourceRect, dest);
 SetShaderParameters(videoBuffer);
 Execute({ target }, 4);
 }
 
+void CYUV2RGBShader::SetParams(float contrast, float black, bool limited)
+{
+ m_pConvMatrix->SetParams(contrast * 0.02f, black * 0.01f - 0.5f, limited);
+}
+
+void CYUV2RGBShader::SetColParams(AVColorSpace colSpace, int bits, bool limited, int textuteBits)
+{
+ if (colSpace == AVCOL_SPC_UNSPECIFIED)
+ {
+ if (m_sourceWidth > 1024 || m_sourceHeight >= 600)
+ colSpace = AVCOL_SPC_BT709;
+ else
+ colSpace = AVCOL_SPC_BT470BG;
+ }
+ m_pConvMatrix->SetColParams(colSpace, bits, limited, textuteBits);
+}
+
 CYUV2RGBShader::CYUV2RGBShader()
 : m_sourceWidth(0)
 , m_sourceHeight(0)
@@ -585,8 +565,7 @@
 {
 }
 
-void CYUV2RGBShader::PrepareParameters(CRenderBuffer* videoBuffer, CRect sourceRect, CPoint dest[],
- float contrast, float brightness)
+void CYUV2RGBShader::PrepareParameters(CRenderBuffer* videoBuffer, CRect sourceRect, CPoint dest[])
 {
 if (m_sourceRect != sourceRect
 || m_dest[0] != dest[0] || m_dest[1] != dest[1] 
@@ -645,11 +624,6 @@
 
 m_texSteps[0] = 1.0f / texWidth;
 m_texSteps[1] = 1.0f / m_sourceHeight;
-
- m_matrix.SetParameters(contrast * 0.02f,
- brightness * 0.01f - 0.5f,
- videoBuffer->flags,
- m_format);
 }
 
 void CYUV2RGBShader::SetShaderParameters(CRenderBuffer* videoBuffer)
@@ -659,9 +633,25 @@
 for (unsigned i = 0, max_i = videoBuffer->GetActivePlanes(); i < max_i; i++)
 ppSRView[i] = reinterpret_cast<ID3D11ShaderResourceView*>(videoBuffer->GetView(i));
 m_effect.SetResources("g_Texture", ppSRView, videoBuffer->GetActivePlanes());
- m_effect.SetMatrix("g_ColorMatrix", m_matrix.Matrix());
 m_effect.SetFloatArray("g_StepXY", m_texSteps, ARRAY_SIZE(m_texSteps));
 
+ float yuvMat[4][4]; 
+ m_pConvMatrix->GetYuvMat(yuvMat);
+ m_effect.SetMatrix("g_ColorMatrix", reinterpret_cast<float*>(yuvMat));
+
+ float primMat[3][3];
+ if (m_pConvMatrix->GetPrimMat(primMat))
+ {
+ // looks like FX11 doesn't like 3x3 matrix, so used 4x4 for its happiness
+ float dxMat[4][4] = { 0 };
+ dxMat[0][0] = primMat[0][0]; dxMat[0][1] = primMat[0][1]; dxMat[0][2] = primMat[0][2];
+ dxMat[1][0] = primMat[1][0]; dxMat[1][1] = primMat[1][1]; dxMat[1][2] = primMat[1][2];
+ dxMat[2][0] = primMat[2][0]; dxMat[2][1] = primMat[2][1]; dxMat[2][2] = primMat[2][2];
+ m_effect.SetMatrix("g_primMat", reinterpret_cast<float*>(dxMat));
+ m_effect.SetScalar("g_gammaSrc", m_pConvMatrix->GetGammaSrc());
+ m_effect.SetScalar("g_gammaDstInv", 1/m_pConvMatrix->GetGammaDst());
+ }
+
 UINT numPorts = 1;
 D3D11_VIEWPORT viewPort;
 DX::DeviceResources::Get()->GetD3DContext()->RSGetViewports(&numPorts, &viewPort);
@@ -736,7 +726,7 @@
 
 if (!m_HQKernelTexture.Create(kern.GetSize(), 1, 1, D3D11_USAGE_IMMUTABLE, m_KernelFormat, kernelVals, kernelValsSize))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create kernel texture.");
+ CLog::LogF(LOGERROR, "Failed to create kernel texture.");
 return false;
 }
 
@@ -764,13 +754,13 @@
 effectString = "special://xbmc/system/shaders/convolution-6x6_d3d.fx";
 break;
 default:
- CLog::Log(LOGERROR, __FUNCTION__": scaling method %d not supported.", method);
+ CLog::LogF(LOGERROR, "scaling method %d not supported.", method);
 return false;
 }
 
 if (!ChooseKernelD3DFormat())
 {
- CLog::Log(LOGERROR, __FUNCTION__": failed to find a compatible texture format for the kernel.");
+ CLog::LogF(LOGERROR, "failed to find a compatible texture format for the kernel.");
 return false;
 }
 
@@ -787,7 +777,7 @@
 
 if(!LoadEffect(effectString, &defines))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to load shader %s.", effectString.c_str());
+ CLog::LogF(LOGERROR, "Failed to load shader %s.", effectString);
 return false;
 }
 
@@ -906,19 +896,19 @@
 effectString = "special://xbmc/system/shaders/convolutionsep-6x6_d3d.fx";
 break;
 default:
- CLog::Log(LOGERROR, __FUNCTION__": scaling method %d not supported.", method);
+ CLog::LogF(LOGERROR, "scaling method %d not supported.", method);
 return false;
 }
 
 if (!ChooseIntermediateD3DFormat())
 {
- CLog::Log(LOGERROR, __FUNCTION__": failed to find a compatible texture format for the intermediate render target.");
+ CLog::LogF(LOGERROR, "failed to find a compatible texture format for the intermediate render target.");
 return false;
 }
 
 if (!ChooseKernelD3DFormat())
 {
- CLog::Log(LOGERROR, __FUNCTION__": failed to find a compatible texture format for the kernel.");
+ CLog::LogF(LOGERROR, "failed to find a compatible texture format for the kernel.");
 return false;
 }
 
@@ -935,7 +925,7 @@
 
 if(!LoadEffect(effectString, &defines))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to load shader %s.", effectString.c_str());
+ CLog::LogF(LOGERROR, "Failed to load shader %s.", effectString);
 return false;
 }
 
@@ -991,11 +981,11 @@
 else if (DX::Windowing().IsFormatSupport(DXGI_FORMAT_R32G32B32A32_FLOAT, usage)) m_IntermediateFormat = DXGI_FORMAT_R32G32B32A32_FLOAT;
 else
 {
- CLog::Log(LOGNOTICE, __FUNCTION__": no float format available for the intermediate render target");
+ CLog::LogF(LOGNOTICE, "no float format available for the intermediate render target");
 return false;
 }
 
- CLog::Log(LOGDEBUG, __FUNCTION__": format %i", m_IntermediateFormat);
+ CLog::LogF(LOGDEBUG, "format %i", m_IntermediateFormat);
 
 return true;
 }
@@ -1007,7 +997,7 @@
 
 if (!m_IntermediateTarget.Create(width, height, 1, D3D11_USAGE_DEFAULT, m_IntermediateFormat))
 {
- CLog::Log(LOGERROR, __FUNCTION__": render target creation failed.");
+ CLog::LogF(LOGERROR, "render target creation failed.");
 return false;
 }
 return true;
@@ -1174,7 +1164,7 @@
 
 if (!m_effect.Create(strShader, nullptr))
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to create test shader: %s", strShader.c_str());
+ CLog::LogF(LOGERROR, "Failed to create test shader: %s", strShader);
 return false;
 }
 return true;

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

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,35 +22,23 @@
 
 
 #include "cores/IPlayer.h"
-#include "guilib/Geometry.h"
+#include "cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h"
 #include "guilib/D3DResource.h"
+#include "utils/Geometry.h"
 
 #include <DirectXMath.h>
 #include <vector>
 #include <wrl/client.h>
 
+extern "C" {
+#include "libavutil/pixfmt.h"
+#include "libavutil/mastering_display_metadata.h"
+}
 enum EBufferFormat;
 class CRenderBuffer;
 
 using namespace DirectX;
 
-class CYUV2RGBMatrix
-{
-public:
- CYUV2RGBMatrix();
- void SetParameters(float contrast, float blacklevel, unsigned int flags, EBufferFormat format);
- XMFLOAT4X4* Matrix();
-
-private:
- bool m_NeedRecalc;
- float m_contrast;
- float m_blacklevel;
- unsigned int m_flags;
- bool m_limitedRange;
- EBufferFormat m_format;
- XMFLOAT4X4 m_mat;
-};
-
 class CWinShader
 {
 protected:
@@ -87,12 +75,14 @@
 
 void ApplyEffectParameters(CD3DEffect &effect, unsigned sourceWidth, unsigned sourceHeight);
 void GetDefines(DefinesMap &map) const;
- bool Create(bool useCLUT, bool useDithering, int ditherDepth);
+ bool Create(bool useCLUT, bool useDithering, int ditherDepth, bool toneMapping);
 void Render(CD3DTexture &sourceTexture, unsigned sourceWidth, unsigned sourceHeight, CRect sourceRect, const CPoint points[4]
 , CD3DTexture *target, unsigned range = 0, float contrast = 0.5f, float brightness = 0.5f);
 void Render(CD3DTexture &sourceTexture, unsigned sourceWidth, unsigned sourceHeight, CRect sourceRect, CRect destRect
 , CD3DTexture *target, unsigned range = 0, float contrast = 0.5f, float brightness = 0.5f);
 void SetCLUT(int clutSize, ID3D11ShaderResourceView *pCLUTView);
+ void SetDisplayMetadata(bool hasDisplayMetadata, AVMasteringDisplayMetadata displayMetadata,
+ bool hasLightMetadata, AVContentLightMetadata lightMetadata);
 
 static bool CreateCLUTView(int clutSize, uint16_t* clutData, bool isRGB, ID3D11ShaderResourceView** ppCLUTView);
 
@@ -123,6 +113,13 @@
 FLOAT x, y, z;
 FLOAT tu, tv;
 };
+
+ // tone mapping
+ bool m_toneMapping{ false };
+ bool m_hasDisplayMetadata{ false };
+ bool m_hasLightMetadata{ false };
+ AVMasteringDisplayMetadata m_displayMetadata;
+ AVContentLightMetadata m_lightMetadata;
 };
 
 class CYUV2RGBShader : public CWinShader
@@ -130,22 +127,24 @@
 public:
 CYUV2RGBShader();
 virtual ~CYUV2RGBShader();
- virtual bool Create(EBufferFormat fmt, COutputShader *pOutShader = nullptr);
- virtual void Render(CRect sourceRect, CPoint dest[], float contrast, float brightness, CRenderBuffer* videoBuffer, CD3DTexture *target);
+ bool Create(EBufferFormat fmt, AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries, COutputShader *pOutShader = nullptr);
+ void Render(CRect sourceRect, CPoint dest[], CRenderBuffer* videoBuffer, CD3DTexture *target);
+ void SetParams(float contrast, float black, bool limited);
+ void SetColParams(AVColorSpace colSpace, int bits, bool limited, int textuteBits);
 
 protected:
- void PrepareParameters(CRenderBuffer* videoBuffer, CRect sourceRect, CPoint dest[],
- float contrast, float brightness);
+ void PrepareParameters(CRenderBuffer* videoBuffer, CRect sourceRect, CPoint dest[]);
 void SetShaderParameters(CRenderBuffer* videoBuffer);
 
 private:
- CYUV2RGBMatrix m_matrix;
- unsigned int m_sourceWidth, m_sourceHeight;
- CRect m_sourceRect;
- CPoint m_dest[4];
- EBufferFormat m_format;
- float m_texSteps[2];
+ unsigned int m_sourceWidth;
+ unsigned int m_sourceHeight;
+ CRect m_sourceRect;
+ CPoint m_dest[4];
+ EBufferFormat m_format;
+ float m_texSteps[2];
 COutputShader *m_pOutShader;
+ std::shared_ptr<CConvertMatrix> m_pConvMatrix;
 
 struct CUSTOMVERTEX {
 FLOAT x, y, z;

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShaderGL.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2007 d4rk
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,9 +23,9 @@
 #include "../RenderFlags.h"
 #include "YUV2RGBShaderGL.h"
 #include "YUVMatrix.h"
+#include "ConversionMatrix.h"
 #include "ConvolutionKernels.h"
 #include "settings/AdvancedSettings.h"
-#include "guilib/TransformMatrix.h"
 #include "utils/log.h"
 #include "utils/GLUtils.h"
 
@@ -34,37 +34,18 @@
 
 using namespace Shaders;
 
-static void CalculateYUVMatrixGL(GLfloat res[4][4]
- , unsigned int flags
- , EShaderFormat format
- , float black
- , float contrast
- , bool limited)
-{
- TransformMatrix matrix;
- CalculateYUVMatrix(matrix, flags, format, black, contrast, limited);
-
- for(int row = 0; row < 3; row++)
- for(int col = 0; col < 4; col++)
- res[col][row] = matrix.m[row][col];
-
- res[0][3] = 0.0f;
- res[1][3] = 0.0f;
- res[2][3] = 0.0f;
- res[3][3] = 1.0f;
-}
-
 //////////////////////////////////////////////////////////////////////
 // BaseYUV2RGBGLSLShader - base class for GLSL YUV2RGB shaders
 //////////////////////////////////////////////////////////////////////
 
-BaseYUV2RGBGLSLShader::BaseYUV2RGBGLSLShader(bool rect, unsigned flags, EShaderFormat format, bool stretch,
+BaseYUV2RGBGLSLShader::BaseYUV2RGBGLSLShader(bool rect, EShaderFormat format, bool stretch,
+ AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries,
+ bool toneMap,
 std::shared_ptr<GLSLOutput> output)
 {
 m_width = 1;
 m_height = 1;
 m_field = 0;
- m_flags = flags;
 m_format = format;
 m_black = 0.0f;
 m_contrast = 1.0f;
@@ -72,16 +53,17 @@
 
 // get defines from the output stage if used
 m_glslOutput = output;
- if (m_glslOutput) {
+ if (m_glslOutput)
+ {
 m_defines += m_glslOutput->GetDefines();
 }
 
- if(rect)
+ if (rect)
 m_defines += "#define XBMC_texture_rectangle 1\n";
 else
 m_defines += "#define XBMC_texture_rectangle 0\n";
 
- if(g_advancedSettings.m_GLRectangleHack)
+ if (g_advancedSettings.m_GLRectangleHack)
 m_defines += "#define XBMC_texture_rectangle_hack 1\n";
 else
 m_defines += "#define XBMC_texture_rectangle_hack 0\n";
@@ -110,9 +92,23 @@
 else
 CLog::Log(LOGERROR, "GL: BaseYUV2RGBGLSLShader - unsupported format %d", m_format);
 
+ if (dstPrimaries != srcPrimaries)
+ {
+ m_defines += "#define XBMC_COL_CONVERSION\n";
+ }
+
+ if (toneMap)
+ {
+ m_toneMapping = true;
+ m_defines += "#define XBMC_TONE_MAPPING\n";
+ }
+
 VertexShader()->LoadSource("gl_yuv2rgb_vertex.glsl", m_defines);
 
 CLog::Log(LOGDEBUG, "GL: BaseYUV2RGBGLSLShader: defines:\n%s", m_defines.c_str());
+
+ m_pConvMatrix.reset(new CConvertMatrix());
+ m_pConvMatrix->SetColPrimaries(dstPrimaries, srcPrimaries);
 }
 
 BaseYUV2RGBGLSLShader::~BaseYUV2RGBGLSLShader()
@@ -126,7 +122,7 @@
 m_hYTex = glGetUniformLocation(ProgramHandle(), "m_sampY");
 m_hUTex = glGetUniformLocation(ProgramHandle(), "m_sampU");
 m_hVTex = glGetUniformLocation(ProgramHandle(), "m_sampV");
- m_hMatrix = glGetUniformLocation(ProgramHandle(), "m_yuvmat");
+ m_hYuvMat = glGetUniformLocation(ProgramHandle(), "m_yuvmat");
 m_hStretch = glGetUniformLocation(ProgramHandle(), "m_stretch");
 m_hStep = glGetUniformLocation(ProgramHandle(), "m_step");
 m_hVertex = glGetAttribLocation(ProgramHandle(), "m_attrpos");
@@ -136,6 +132,11 @@
 m_hProj = glGetUniformLocation(ProgramHandle(), "m_proj");
 m_hModel = glGetUniformLocation(ProgramHandle(), "m_model");
 m_hAlpha = glGetUniformLocation(ProgramHandle(), "m_alpha");
+ m_hPrimMat = glGetUniformLocation(ProgramHandle(), "m_primMat");
+ m_hGammaSrc = glGetUniformLocation(ProgramHandle(), "m_gammaSrc");
+ m_hGammaDstInv = glGetUniformLocation(ProgramHandle(), "m_gammaDstInv");
+ m_hCoefsDst = glGetUniformLocation(ProgramHandle(), "m_coefsDst");
+ m_hToneP1 = glGetUniformLocation(ProgramHandle(), "m_toneP1");
 VerifyGLState();
 
 if (m_glslOutput)
@@ -151,15 +152,37 @@
 glUniform1f(m_hStretch, m_stretch);
 glUniform2f(m_hStep, 1.0 / m_width, 1.0 / m_height);
 
- GLfloat matrix[4][4];
- // keep video levels
- CalculateYUVMatrixGL(matrix, m_flags, m_format, m_black, m_contrast, !m_convertFullRange);
+ GLfloat yuvMat[4][4];
+ m_pConvMatrix->SetParams(m_contrast, m_black, !m_convertFullRange);
+ m_pConvMatrix->GetYuvMat(yuvMat);
 
- glUniformMatrix4fv(m_hMatrix, 1, GL_FALSE, (GLfloat*)matrix);
+ glUniformMatrix4fv(m_hYuvMat, 1, GL_FALSE, (GLfloat*)yuvMat);
 glUniformMatrix4fv(m_hProj, 1, GL_FALSE, m_proj);
 glUniformMatrix4fv(m_hModel, 1, GL_FALSE, m_model);
 glUniform1f(m_hAlpha, m_alpha);
 
+ GLfloat primMat[3][3];
+ if (m_pConvMatrix->GetPrimMat(primMat))
+ {
+ glUniformMatrix3fv(m_hPrimMat, 1, GL_FALSE, (GLfloat*)primMat);
+ glUniform1f(m_hGammaSrc, m_pConvMatrix->GetGammaSrc());
+ glUniform1f(m_hGammaDstInv, 1/m_pConvMatrix->GetGammaDst());
+ }
+
+ if (m_toneMapping)
+ {
+ float param = 0.5;
+ if (m_hasLightMetadata)
+ param = log10(100) / log10(m_lightMetadata.MaxCLL);
+ else if (m_hasDisplayMetadata && m_displayMetadata.has_luminance)
+ param = log10(100) / log10(m_displayMetadata.max_luminance.num/m_displayMetadata.max_luminance.den);
+
+ float coefs[3];
+ CConvertMatrix::GetRGBYuvCoefs(AVColorSpace::AVCOL_SPC_BT709, coefs);
+ glUniform3f(m_hCoefsDst, coefs[0], coefs[1], coefs[2]);
+ glUniform1f(m_hToneP1, param);
+ }
+
 VerifyGLState();
 if (m_glslOutput)
 m_glslOutput->OnEnabled();
@@ -178,33 +201,63 @@
 m_glslOutput->Free();
 }
 
+void BaseYUV2RGBGLSLShader::SetColParams(AVColorSpace colSpace, int bits, bool limited,
+ int textureBits)
+{
+ if (colSpace == AVCOL_SPC_UNSPECIFIED)
+ {
+ if (m_width > 1024 || m_height >= 600)
+ colSpace = AVCOL_SPC_BT709;
+ else
+ colSpace = AVCOL_SPC_BT470BG;
+ }
+ m_pConvMatrix->SetColParams(colSpace, bits, limited, textureBits);
+}
+
+void BaseYUV2RGBGLSLShader::SetDisplayMetadata(bool hasDisplayMetadata, AVMasteringDisplayMetadata displayMetadata,
+ bool hasLightMetadata, AVContentLightMetadata lightMetadata)
+{
+ m_hasDisplayMetadata = hasDisplayMetadata;
+ m_displayMetadata = displayMetadata;
+ m_hasLightMetadata = hasLightMetadata;
+ m_lightMetadata = lightMetadata;
+}
+
 //////////////////////////////////////////////////////////////////////
 // YUV2RGBProgressiveShader - YUV2RGB with no deinterlacing
 // Use for weave deinterlacing / progressive
 //////////////////////////////////////////////////////////////////////
 
-YUV2RGBProgressiveShader::YUV2RGBProgressiveShader(bool rect, unsigned flags, EShaderFormat format, bool stretch,
+YUV2RGBProgressiveShader::YUV2RGBProgressiveShader(bool rect, EShaderFormat format, bool stretch,
+ AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries,
+ bool toneMap,
 std::shared_ptr<GLSLOutput> output)
- : BaseYUV2RGBGLSLShader(rect, flags, format, stretch, output)
+ : BaseYUV2RGBGLSLShader(rect, format, stretch, dstPrimaries, srcPrimaries, toneMap, output)
 {
 PixelShader()->LoadSource("gl_yuv2rgb_basic.glsl", m_defines);
 PixelShader()->AppendSource("gl_output.glsl");
+
+ PixelShader()->InsertSource("gl_tonemap.glsl", "vec4 process()");
 }
 
 //------------------------------------------------------------------------------
 // YUV2RGBFilterShader4
 //------------------------------------------------------------------------------
 
-YUV2RGBFilterShader4::YUV2RGBFilterShader4(bool rect, unsigned flags,
+YUV2RGBFilterShader4::YUV2RGBFilterShader4(bool rect,
 EShaderFormat format,
 bool stretch,
+ AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries,
+ bool toneMap,
 ESCALINGMETHOD method,
 std::shared_ptr<GLSLOutput> output)
-: BaseYUV2RGBGLSLShader(rect, flags, format, stretch, output)
+: BaseYUV2RGBGLSLShader(rect, format, stretch, dstPrimaries, srcPrimaries, toneMap, output)
 {
 m_scaling = method;
 PixelShader()->LoadSource("gl_yuv2rgb_filter4.glsl", m_defines);
 PixelShader()->AppendSource("gl_output.glsl");
+
+ PixelShader()->InsertSource("gl_tonemap.glsl", "vec4 process()");
 }
 
 YUV2RGBFilterShader4::~YUV2RGBFilterShader4()

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShaderGL.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -27,35 +27,41 @@
 
 #include <memory>
 
-void CalculateYUVMatrix(TransformMatrix &matrix
- , unsigned int flags
- , EShaderFormat format
- , float black
- , float contrast
- , bool limited);
+extern "C" {
+#include "libavutil/pixfmt.h"
+#include "libavutil/mastering_display_metadata.h"
+}
+
+class CConvertMatrix;
 
 namespace Shaders {
 
 class BaseYUV2RGBGLSLShader : public CGLSLShaderProgram
 {
 public:
- BaseYUV2RGBGLSLShader(bool rect, unsigned flags, EShaderFormat format, bool stretch, std::shared_ptr<GLSLOutput> output);
+ BaseYUV2RGBGLSLShader(bool rect, EShaderFormat format, bool stretch,
+ AVColorPrimaries dst, AVColorPrimaries src,
+ bool toneMap,
+ std::shared_ptr<GLSLOutput> output);
 virtual ~BaseYUV2RGBGLSLShader();
 
 void SetField(int field) { m_field = field; }
 void SetWidth(int w) { m_width = w; }
 void SetHeight(int h) { m_height = h; }
 
- void SetBlack(float black) { m_black = black; }
+ void SetColParams(AVColorSpace colSpace, int bits, bool limited, int textureBits);
+ void SetBlack(float black) { m_black = black; }
 void SetContrast(float contrast) { m_contrast = contrast; }
 void SetNonLinStretch(float stretch) { m_stretch = stretch; }
+ void SetDisplayMetadata(bool hasDisplayMetadata, AVMasteringDisplayMetadata displayMetadata,
+ bool hasLightMetadata, AVContentLightMetadata lightMetadata);
 
 void SetConvertFullColorRange(bool convertFullRange) { m_convertFullRange = convertFullRange; }
 
 GLint GetVertexLoc() { return m_hVertex; }
 GLint GetYcoordLoc() { return m_hYcoord; }
 GLint GetUcoordLoc() { return m_hUcoord; }
- GLint GetVcoordLoc() { return m_hVcoord; }
+ GLint GetVcoordLoc() { return m_hVcoord; }
 
 void SetMatrices(GLfloat *p, GLfloat *m) { m_proj = p; m_model = m; }
 void SetAlpha(GLfloat alpha) { m_alpha = alpha; }
@@ -68,11 +74,15 @@
 void Free();
 
 bool m_convertFullRange;
- unsigned m_flags;
 EShaderFormat m_format;
 int m_width;
 int m_height;
 int m_field;
+ bool m_hasDisplayMetadata = false;
+ AVMasteringDisplayMetadata m_displayMetadata;
+ bool m_hasLightMetadata = false;
+ AVContentLightMetadata m_lightMetadata;
+ bool m_toneMapping = false;
 
 float m_black;
 float m_contrast;
@@ -80,19 +90,25 @@
 
 GLfloat *m_proj = nullptr;
 GLfloat *m_model = nullptr;
- GLfloat m_alpha = 1.0f;
+ GLfloat m_alpha = 1.0f;
 
 std::string m_defines;
 
 std::shared_ptr<Shaders::GLSLOutput> m_glslOutput;
+ std::shared_ptr<CConvertMatrix> m_pConvMatrix;
 
 // pixel shader attribute handles
 GLint m_hYTex = -1;
 GLint m_hUTex = -1;
 GLint m_hVTex = -1;
- GLint m_hMatrix = -1;
+ GLint m_hYuvMat = -1;
 GLint m_hStretch = -1;
 GLint m_hStep = -1;
+ GLint m_hGammaSrc = -1;
+ GLint m_hGammaDstInv = -1;
+ GLint m_hPrimMat = -1;
+ GLint m_hToneP1 = -1;
+ GLint m_hCoefsDst = -1;
 
 // vertex shader attribute handles
 GLint m_hVertex = -1;
@@ -108,9 +124,10 @@
 {
 public:
 YUV2RGBProgressiveShader(bool rect,
- unsigned flags,
 EShaderFormat format,
 bool stretch,
+ AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries,
+ bool toneMap,
 std::shared_ptr<GLSLOutput> output);
 };
 
@@ -118,9 +135,10 @@
 {
 public:
 YUV2RGBFilterShader4(bool rect,
- unsigned flags,
 EShaderFormat format,
 bool stretch,
+ AVColorPrimaries dstPrimaries, AVColorPrimaries srcPrimaries,
+ bool toneMap,
 ESCALINGMETHOD method,
 std::shared_ptr<GLSLOutput> output);
 ~YUV2RGBFilterShader4() override;

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShaderGLES.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2007 d4rk
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -33,15 +33,14 @@
 
 using namespace Shaders;
 
-static void CalculateYUVMatrixGL(GLfloat res[4][4]
+static void CalculateYUVMatrixGLES(GLfloat res[4][4]
 , unsigned int flags
 , EShaderFormat format
 , float black
- , float contrast
- , bool limited)
+ , float contrast)
 {
 TransformMatrix matrix;
- CalculateYUVMatrix(matrix, flags, format, black, contrast, limited);
+ CalculateYUVMatrix(matrix, flags, format, black, contrast, false);
 
 for(int row = 0; row < 3; row++)
 for(int col = 0; col < 4; col++)
@@ -57,8 +56,7 @@
 // BaseYUV2RGBGLSLShader - base class for GLSL YUV2RGB shaders
 //////////////////////////////////////////////////////////////////////
 
-BaseYUV2RGBGLSLShader::BaseYUV2RGBGLSLShader(unsigned flags, EShaderFormat format, bool stretch,
- GLSLOutput *output)
+BaseYUV2RGBGLSLShader::BaseYUV2RGBGLSLShader(unsigned flags, EShaderFormat format)
 {
 m_width = 1;
 m_height = 1;
@@ -69,14 +67,11 @@
 m_black = 0.0f;
 m_contrast = 1.0f;
 
- m_stretch = 0.0f;
-
 // shader attribute handles
 m_hYTex = -1;
 m_hUTex = -1;
 m_hVTex = -1;
 m_hMatrix = -1;
- m_hStretch = -1;
 m_hStep = -1;
 
 m_hVertex = -1;
@@ -91,21 +86,6 @@
 m_model = nullptr;
 m_alpha = 1.0;
 
- // get defines from the output stage if used
- m_glslOutput = output;
- if (m_glslOutput)
- m_defines += m_glslOutput->GetDefines();
-
- // not supported on GLES 2.0
- m_defines += "#define XBMC_texture_rectangle 0\n";
- m_defines += "#define XBMC_texture_rectangle_hack 0\n";
-
- //don't compile in stretch support when it's not needed
- if (stretch)
- m_defines += "#define XBMC_STRETCH 1\n";
- else
- m_defines += "#define XBMC_STRETCH 0\n";
-
 if (m_format == SHADER_YV12 ||
 m_format == SHADER_YV12_9 ||
 m_format == SHADER_YV12_10 ||
@@ -124,17 +104,16 @@
 else if (m_format == SHADER_YV12)
 m_defines += "#define XBMC_YV12\n";
 else
- CLog::Log(LOGERROR, "GL: BaseYUV2RGBGLSLShader - unsupported format %d", m_format);
+ CLog::Log(LOGERROR, "GLES: BaseYUV2RGBGLSLShader - unsupported format %d", m_format);
 
- VertexShader()->LoadSource("yuv2rgb_vertex_gles.glsl", m_defines);
+ VertexShader()->LoadSource("gles_yuv2rgb.vert", m_defines);
 
- CLog::Log(LOGDEBUG, "GL: BaseYUV2RGBGLSLShader: defines:\n%s", m_defines.c_str());
+ CLog::Log(LOGDEBUG, "GLES: BaseYUV2RGBGLSLShader: defines:\n%s", m_defines.c_str());
 }
 
 BaseYUV2RGBGLSLShader::~BaseYUV2RGBGLSLShader()
 {
 Free();
- delete m_glslOutput;
 }
 
 void BaseYUV2RGBGLSLShader::OnCompiledAndLinked()
@@ -150,11 +129,8 @@
 m_hUTex = glGetUniformLocation(ProgramHandle(), "m_sampU");
 m_hVTex = glGetUniformLocation(ProgramHandle(), "m_sampV");
 m_hMatrix = glGetUniformLocation(ProgramHandle(), "m_yuvmat");
- m_hStretch = glGetUniformLocation(ProgramHandle(), "m_stretch");
 m_hStep = glGetUniformLocation(ProgramHandle(), "m_step");
 VerifyGLState();
-
- if (m_glslOutput) m_glslOutput->OnCompiledAndLinked(ProgramHandle());
 }
 
 bool BaseYUV2RGBGLSLShader::OnEnabled()
@@ -163,30 +139,27 @@
 glUniform1i(m_hYTex, 0);
 glUniform1i(m_hUTex, 1);
 glUniform1i(m_hVTex, 2);
- glUniform1f(m_hStretch, m_stretch);
 glUniform2f(m_hStep, 1.0 / m_width, 1.0 / m_height);
 
 GLfloat matrix[4][4];
 // keep video levels
- CalculateYUVMatrixGL(matrix, m_flags, m_format, m_black, m_contrast, !m_convertFullRange);
+ CalculateYUVMatrixGLES(matrix, m_flags, m_format, m_black, m_contrast);
 
 glUniformMatrix4fv(m_hMatrix, 1, GL_FALSE, (GLfloat*)matrix);
 glUniformMatrix4fv(m_hProj, 1, GL_FALSE, m_proj);
 glUniformMatrix4fv(m_hModel, 1, GL_FALSE, m_model);
 glUniform1f(m_hAlpha, m_alpha);
 VerifyGLState();
- if (m_glslOutput) m_glslOutput->OnEnabled();
+
 return true;
 }
 
 void BaseYUV2RGBGLSLShader::OnDisabled()
 {
- if (m_glslOutput) m_glslOutput->OnDisabled();
 }
 
 void BaseYUV2RGBGLSLShader::Free()
 {
- if (m_glslOutput) m_glslOutput->Free();
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -194,12 +167,10 @@
 // Use for weave deinterlacing / progressive
 //////////////////////////////////////////////////////////////////////
 
-YUV2RGBProgressiveShader::YUV2RGBProgressiveShader(unsigned flags, EShaderFormat format, bool stretch,
- GLSLOutput *output)
- : BaseYUV2RGBGLSLShader(flags, format, stretch, output)
+YUV2RGBProgressiveShader::YUV2RGBProgressiveShader(unsigned flags, EShaderFormat format)
+ : BaseYUV2RGBGLSLShader(flags, format)
 {
- PixelShader()->LoadSource("yuv2rgb_basic.glsl", m_defines);
- PixelShader()->AppendSource("output.glsl");
+ PixelShader()->LoadSource("gles_yuv2rgb_basic.frag", m_defines);
 }
 
 
@@ -208,13 +179,13 @@
 //////////////////////////////////////////////////////////////////////
 
 YUV2RGBBobShader::YUV2RGBBobShader(unsigned flags, EShaderFormat format)
- : BaseYUV2RGBGLSLShader(flags, format, false)
+ : BaseYUV2RGBGLSLShader(flags, format)
 {
 m_hStepX = -1;
 m_hStepY = -1;
 m_hField = -1;
 
- PixelShader()->LoadSource("yuv2rgb_bob_gles.glsl", m_defines);
+ PixelShader()->LoadSource("gles_yuv2rgb_bob.frag", m_defines);
 }
 
 void YUV2RGBBobShader::OnCompiledAndLinked()

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUV2RGBShaderGLES.h Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2007-2015 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -22,19 +22,11 @@
 #include "guilib/TransformMatrix.h"
 #include "ShaderFormats.h"
 
-void CalculateYUVMatrix(TransformMatrix &matrix
-                        , unsigned int  flags
-                        , EShaderFormat format
-                        , float         black
-                        , float         contrast
-                        , bool          limited);
-
-#include "GLSLOutputGLES.h"
-
-#ifndef __GNUC__
-#pragma warning( push )
-#pragma warning( disable : 4250 )
-#endif
+void CalculateYUVMatrixGLES(TransformMatrix &matrix
+                          , unsigned int  flags
+                          , EShaderFormat format
+                          , float         black
+                          , float         contrast);
 
 #include "guilib/Shader.h"
 
@@ -43,7 +35,7 @@
   class BaseYUV2RGBShader : virtual public CShaderProgram
   {
   public:
-    BaseYUV2RGBShader() : m_convertFullRange(false) {};
+    BaseYUV2RGBShader() {};
     ~BaseYUV2RGBShader() override = default;
     virtual void SetField(int field) {};
     virtual void SetWidth(int width) {};
@@ -51,7 +43,6 @@
 
     virtual void SetBlack(float black) {};
     virtual void SetContrast(float contrast) {};
-    virtual void SetNonLinStretch(float stretch) {};
 
     virtual GLint GetVertexLoc() { return 0; };
     virtual GLint GetYcoordLoc() { return 0; };
@@ -60,11 +51,6 @@
 
     virtual void SetMatrices(GLfloat *p, GLfloat *m) {};
     virtual void SetAlpha(GLfloat alpha) {};
-
-    void SetConvertFullColorRange(bool convertFullRange) { m_convertFullRange = convertFullRange; }
-
-  protected:
-    bool m_convertFullRange;
   };
 
 
@@ -73,7 +59,7 @@
     , public CGLSLShaderProgram
   {
   public:
-    BaseYUV2RGBGLSLShader(unsigned flags, EShaderFormat format, bool stretch, GLSLOutput *output=NULL);
+    BaseYUV2RGBGLSLShader(unsigned flags, EShaderFormat format);
    ~BaseYUV2RGBGLSLShader() override;
     void SetField(int field) override { m_field  = field; }
     void SetWidth(int w) override { m_width  = w; }
@@ -81,7 +67,6 @@
 
     void SetBlack(float black) override { m_black    = black; }
     void SetContrast(float contrast) override { m_contrast = contrast; }
-    void SetNonLinStretch(float stretch) override { m_stretch = stretch; }
 
     GLint GetVertexLoc() override { return m_hVertex; }
     GLint GetYcoordLoc() override { return m_hYcoord; }
@@ -105,18 +90,14 @@
 
     float m_black;
     float m_contrast;
-    float m_stretch;
 
     std::string m_defines;
 
-    Shaders::GLSLOutput *m_glslOutput;
-
     // shader attribute handles
     GLint m_hYTex;
     GLint m_hUTex;
     GLint m_hVTex;
     GLint m_hMatrix;
-    GLint m_hStretch;
     GLint m_hStep;
 
     GLint m_hVertex;
@@ -136,9 +117,7 @@
   {
   public:
     YUV2RGBProgressiveShader(unsigned flags=0,
-                             EShaderFormat format=SHADER_NONE,
-                             bool stretch = false,
-                             GLSLOutput *output=NULL);
+                             EShaderFormat format=SHADER_NONE);
   };
 
   class YUV2RGBBobShader : public BaseYUV2RGBGLSLShader
@@ -154,7 +133,3 @@
   };
 
 } // end namespace
-
-#ifndef __GNUC__
-#pragma warning( pop )
-#endif

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUVMatrix.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/YUVMatrix.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.cpp Changed

@@ -21,16 +21,17 @@
 #include <ppl.h>
 #include <ppltasks.h>
 
+#include "WinRenderBuffer.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
+#include "cores/VideoPlayer/VideoRenderers/WinRenderer.h"
+#include "rendering/dx/DeviceResources.h"
+#include "rendering/dx/RenderContext.h"
 #include "utils/log.h"
 #if defined(HAVE_SSE2)
 #include "utils/win32/gpu_memcpy_sse4.h"
 #endif
 #include "utils/win32/memcpy_sse2.h"
 #include "utils/CPUInfo.h"
-#include "rendering/dx/DeviceResources.h"
-#include "rendering/dx/RenderContext.h"
-#include "WinRenderer.h"
-#include "WinRenderBuffer.h"
 
 #define PLANE_Y 0
 #define PLANE_U 1
@@ -38,12 +39,17 @@
 #define PLANE_UV 1
 #define PLANE_D3D11 0
 
+using namespace Microsoft::WRL;
+
 CRenderBuffer::CRenderBuffer()
 : loaded(false)
 , frameIdx(0)
- , flags(0)
 , format(BUFFER_FMT_NONE)
 , videoBuffer(nullptr)
+ , primaries(AVCOL_PRI_UNSPECIFIED)
+ , color_space(AVCOL_SPC_BT709)
+ , full_range(false)
+ , bits(8)
 , m_locked(false)
 , m_bPending(false)
 , m_soft(false)
@@ -66,8 +72,12 @@
 void CRenderBuffer::Release()
 {
 loaded = false;
- SAFE_RELEASE(videoBuffer);
- SAFE_RELEASE(m_staging);
+ if (videoBuffer)
+ {
+ videoBuffer->Release();
+ videoBuffer = nullptr;
+ }
+ m_staging.Reset();
 for (unsigned i = 0; i < m_activePlanes; i++)
 {
 // unlock before release
@@ -323,6 +333,27 @@
 return loaded;
 }
 
+void CRenderBuffer::AppendPicture(const VideoPicture & picture)
+{
+ videoBuffer = picture.videoBuffer;
+ videoBuffer->Acquire();
+
+ primaries = static_cast<AVColorPrimaries>(picture.color_primaries);
+ color_space = static_cast<AVColorSpace>(picture.color_space);
+ color_transfer = static_cast<AVColorTransferCharacteristic>(picture.color_transfer);
+ full_range = picture.color_range == 1;
+ bits = picture.colorBits;
+
+ hasDisplayMetadata = picture.hasDisplayMetadata;
+ displayMetadata = picture.displayMetadata;
+ hasLightMetadata = picture.hasLightMetadata;
+ lightMetadata = picture.lightMetadata;
+
+ if (picture.videoBuffer->GetFormat() == AV_PIX_FMT_D3D11VA_VLD)
+ QueueCopyBuffer();
+ loaded = false;
+}
+
 ID3D11View* CRenderBuffer::GetView(unsigned idx)
 {
 switch (format)
@@ -413,7 +444,7 @@
 if (videoBuffer->GetFormat() == AV_PIX_FMT_D3D11VA_VLD && format < BUFFER_FMT_D3D11_BYPASS)
 {
 DXVA::CDXVAOutputBuffer *buf = static_cast<DXVA::CDXVAOutputBuffer*>(videoBuffer);
- CopyToStaging(reinterpret_cast<ID3D11VideoDecoderOutputView*>(buf->view));
+ CopyToStaging(buf->view);
 }
 }
 
@@ -487,27 +518,23 @@
 
 bool CRenderBuffer::CopyToStaging(ID3D11View* view)
 {
- HRESULT hr = S_OK;
-
 if (!view)
 return false;
 
 ID3D11VideoDecoderOutputView* pView = reinterpret_cast<ID3D11VideoDecoderOutputView*>(view);
 D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC vpivd;
 pView->GetDesc(&vpivd);
- ID3D11Resource* resource = nullptr;
- pView->GetResource(&resource);
+ ComPtr<ID3D11Resource> resource;
+ pView->GetResource(resource.GetAddressOf());
 
 if (!m_staging)
 {
 // create staging texture
- ID3D11Texture2D* surface = nullptr;
- hr = resource->QueryInterface(__uuidof(ID3D11Texture2D), reinterpret_cast<void**>(&surface));
- if (SUCCEEDED(hr))
+ ComPtr<ID3D11Texture2D> surface;
+ if (SUCCEEDED(resource.As(&surface)))
 {
 D3D11_TEXTURE2D_DESC tDesc;
 surface->GetDesc(&tDesc);
- SAFE_RELEASE(surface);
 
 CD3D11_TEXTURE2D_DESC sDesc(tDesc);
 sDesc.ArraySize = 1;
@@ -515,28 +542,26 @@
 sDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
 sDesc.BindFlags = 0;
 
- hr = DX::DeviceResources::Get()->GetD3DDevice()->CreateTexture2D(&sDesc, nullptr, &m_staging);
- if (SUCCEEDED(hr))
+ if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DDevice()->CreateTexture2D(&sDesc, nullptr, m_staging.GetAddressOf())))
 m_sDesc = sDesc;
 }
 }
 
 if (m_staging)
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetImmediateContext();
+ ComPtr<ID3D11DeviceContext> pContext(DX::DeviceResources::Get()->GetImmediateContext());
 // queue copying content from decoder texture to temporary texture.
 // actual data copying will be performed before rendering
- pContext->CopySubresourceRegion(m_staging,
+ pContext->CopySubresourceRegion(m_staging.Get(),
 D3D11CalcSubresource(0, 0, 1),
 0, 0, 0,
- resource,
+ resource.Get(),
 D3D11CalcSubresource(0, vpivd.Texture2D.ArraySlice, 1),
 nullptr);
 m_bPending = true;
 }
- SAFE_RELEASE(resource);
 
- return SUCCEEDED(hr);
+ return m_staging != nullptr;
 }
 
 void CRenderBuffer::CopyFromStaging() const
@@ -544,9 +569,9 @@
 if (!m_locked)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetImmediateContext();
+ ComPtr<ID3D11DeviceContext> pContext(DX::DeviceResources::Get()->GetImmediateContext());
 D3D11_MAPPED_SUBRESOURCE rectangle;
- if (SUCCEEDED(pContext->Map(m_staging, 0, D3D11_MAP_READ, 0, &rectangle)))
+ if (SUCCEEDED(pContext->Map(m_staging.Get(), 0, D3D11_MAP_READ, 0, &rectangle)))
 {
 void* (*copy_func)(void* d, const void* s, size_t size) =
 #if defined(HAVE_SSE2)
@@ -590,7 +615,7 @@
 }
 });
 }
- pContext->Unmap(m_staging, 0);
+ pContext->Unmap(m_staging.Get(), 0);
 }
 }
 
@@ -647,7 +672,13 @@
 tasks.push_back(task);
 }
 
- when_all(tasks.begin(), tasks.end()).wait();//.then([this]() { StartRender(); });
+ // event based await is required on WinRT because 
+ // blocking WinRT STA threads with task.wait() isn't allowed
+ auto sync = std::make_shared<Concurrency::event>();
+ when_all(tasks.begin(), tasks.end()).then([&sync]() {
+ sync->set();
+ });
+ sync->wait();
 return true;
 }
 return false;

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/WinRenderBuffer.h Changed

@@ -19,6 +19,7 @@
 */
 #pragma once
 #include "DVDCodecs/Video/DXVA.h"
+#include <wrl/client.h>
 
 class CVideoBuffer;
 struct VideoPicture;
@@ -50,6 +51,7 @@
 
 bool CreateBuffer(EBufferFormat format, unsigned width, unsigned height, bool software);
 bool UploadBuffer();
+ void AppendPicture(const VideoPicture &picture);
 
 unsigned int GetActivePlanes() const { return m_activePlanes; }
 ID3D11View* GetView(unsigned idx = 0);
@@ -68,9 +70,18 @@
 
 bool loaded;
 unsigned int frameIdx;
- unsigned int flags;
 EBufferFormat format;
 CVideoBuffer* videoBuffer;
+ AVColorPrimaries primaries;
+ AVColorSpace color_space;
+ AVColorTransferCharacteristic color_transfer;
+ bool full_range;
+ int bits;
+
+ bool hasDisplayMetadata = false;
+ bool hasLightMetadata = false;
+ AVMasteringDisplayMetadata displayMetadata;
+ AVContentLightMetadata lightMetadata;
 
 private:
 bool CopyToD3D11();
@@ -90,7 +101,7 @@
 unsigned int m_activePlanes;
 D3D11_MAP m_mapType;
 CD3D11_TEXTURE2D_DESC m_sDesc;
- ID3D11Texture2D* m_staging;
+ Microsoft::WRL::ComPtr<ID3D11Texture2D> m_staging;
 
 D3D11_MAPPED_SUBRESOURCE m_rects[YuvImage::MAX_PLANES];
 CD3DTexture m_textures[YuvImage::MAX_PLANES];

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -79,6 +79,7 @@
 , m_bFilterInitialized(false)
 , m_cmsOn(false)
 , m_clutLoaded(true)
+ , m_toneMapping(false)
 , m_destWidth(0)
 , m_destHeight(0)
 , m_frameIdx(0)
@@ -223,7 +224,7 @@
 CLog::Log(LOGDEBUG, "%s: selected buffer format %d", __FUNCTION__, m_bufferFormat);
 }
 
-bool CWinRenderer::Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation)
+bool CWinRenderer::Configure(const VideoPicture &picture, float fps, unsigned int orientation)
 {
 m_sourceWidth = picture.iWidth;
 m_sourceHeight = picture.iHeight;
@@ -235,7 +236,12 @@
 m_bFilterInitialized = false;
 
 m_fps = fps;
- m_iFlags = flags;
+ m_iFlags = GetFlagsChromaPosition(picture.chroma_position)
+ | GetFlagsColorMatrix(picture.color_space, picture.iWidth, picture.iHeight)
+ | GetFlagsColorPrimaries(picture.color_primaries)
+ | GetFlagsStereoMode(picture.stereoMode);
+
+ m_srcPrimaries = GetSrcPrimaries(static_cast<AVColorPrimaries>(picture.color_primaries), picture.iWidth, picture.iHeight);
 m_format = picture.videoBuffer->GetFormat();
 if (m_format == AV_PIX_FMT_D3D11VA_VLD)
 {
@@ -266,22 +272,9 @@
 
 void CWinRenderer::AddVideoPicture(const VideoPicture &picture, int index, double currentClock)
 {
- unsigned flags = RenderManager::GetFlagsChromaPosition(picture.chroma_position)
- | RenderManager::GetFlagsColorMatrix(picture.color_matrix, picture.iWidth, picture.iHeight)
- | RenderManager::GetFlagsColorPrimaries(picture.color_primaries)
- | RenderManager::GetFlagsColorTransfer(picture.color_transfer);
- if (picture.color_range == 1)
- flags |= CONF_FLAGS_YUV_FULLRANGE;
-
- m_renderBuffers[index].videoBuffer = picture.videoBuffer;
- m_renderBuffers[index].videoBuffer->Acquire();
+ m_renderBuffers[index].AppendPicture(picture);
 m_renderBuffers[index].frameIdx = m_frameIdx;
- m_renderBuffers[index].flags = flags;
 m_frameIdx += 2;
-
- if (picture.videoBuffer->GetFormat() == AV_PIX_FMT_D3D11VA_VLD)
- m_renderBuffers[index].QueueCopyBuffer();
- m_renderBuffers[index].loaded = false;
 }
 
 void CWinRenderer::Update()
@@ -316,11 +309,11 @@
 
 m_iRequestedMethod = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD);
 
- m_processor = new DXVA::CProcessorHD();
+ m_processor = std::make_unique<DXVA::CProcessorHD>();
 if (!m_processor->PreInit())
 {
 CLog::Log(LOGNOTICE, "%: - could not init DXVA processor - skipping.", __FUNCTION__);
- SAFE_DELETE(m_processor);
+ m_processor.reset();
 }
 }
 
@@ -331,8 +324,8 @@
 if (m_IntermediateTarget.Get())
 m_IntermediateTarget.Release();
 
- SAFE_DELETE(m_colorShader);
- SAFE_DELETE(m_scalerShader);
+ m_colorShader.reset();
+ m_scalerShader.reset();
 
 m_bConfigured = false;
 m_bFilterInitialized = false;
@@ -351,9 +344,9 @@
 if (m_processor)
 {
 m_processor->UnInit();
- SAFE_DELETE(m_processor);
+ m_processor.reset();
 }
- SAFE_RELEASE(m_pCLUTView);
+ m_pCLUTView = nullptr;
 m_outputShader.reset();
 }
 
@@ -372,12 +365,7 @@
 
 bool CWinRenderer::CreateIntermediateRenderTarget(unsigned int width, unsigned int height, bool dynamic)
 {
- unsigned int usage = D3D11_FORMAT_SUPPORT_RENDER_TARGET | D3D11_FORMAT_SUPPORT_SHADER_SAMPLE;
-
- DXGI_FORMAT format = DXGI_FORMAT_B8G8R8X8_UNORM;
- if (m_renderMethod == RENDER_DXVA) format = DXGI_FORMAT_B8G8R8X8_UNORM;
- else if (DX::Windowing().IsFormatSupport(DXGI_FORMAT_B8G8R8A8_UNORM, usage)) format = DXGI_FORMAT_B8G8R8A8_UNORM;
- else if (DX::Windowing().IsFormatSupport(DXGI_FORMAT_B8G8R8X8_UNORM, usage)) format = DXGI_FORMAT_B8G8R8X8_UNORM;
+ DXGI_FORMAT format = DX::Windowing().GetBackBuffer()->GetFormat();
 
 // don't create new one if it exists with requested size and format
 if ( m_IntermediateTarget.Get() && m_IntermediateTarget.GetFormat() == format
@@ -568,27 +556,27 @@
 
 void CWinRenderer::UpdatePSVideoFilter()
 {
- SAFE_DELETE(m_scalerShader);
+ m_scalerShader.reset();
 
 if (m_bUseHQScaler)
 {
 // First try the more efficient two pass convolution scaler
- m_scalerShader = new CConvolutionShaderSeparable();
+ m_scalerShader = std::make_unique<CConvolutionShaderSeparable>();
 
 if (!m_scalerShader->Create(m_scalingMethod, m_outputShader.get()))
 {
- SAFE_DELETE(m_scalerShader);
+ m_scalerShader.reset();
 CLog::Log(LOGNOTICE, "%s: two pass convolution shader init problem, falling back to one pass.", __FUNCTION__);
 }
 
 // Fallback on the one pass version
- if (m_scalerShader == nullptr)
+ if (!m_scalerShader)
 {
- m_scalerShader = new CConvolutionShader1Pass();
+ m_scalerShader = std::make_unique<CConvolutionShader1Pass>();
 
 if (!m_scalerShader->Create(m_scalingMethod, m_outputShader.get()))
 {
- SAFE_DELETE(m_scalerShader);
+ m_scalerShader.reset();
 CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(34400), g_localizeStrings.Get(34401));
 m_bUseHQScaler = false;
 }
@@ -597,11 +585,11 @@
 
 if (m_bUseHQScaler && !CreateIntermediateRenderTarget(m_sourceWidth, m_sourceHeight, false))
 {
- SAFE_DELETE(m_scalerShader);
+ m_scalerShader.reset();
 m_bUseHQScaler = false;
 }
 
- SAFE_DELETE(m_colorShader);
+ m_colorShader.reset();
 
 if (m_renderMethod == RENDER_DXVA)
 {
@@ -612,20 +600,22 @@
 return;
 }
 
- m_colorShader = new CYUV2RGBShader();
- if (!m_colorShader->Create(m_bufferFormat, m_bUseHQScaler ? nullptr : m_outputShader.get()))
+ m_colorShader = std::make_unique<CYUV2RGBShader>();
+ if (!m_colorShader->Create(m_bufferFormat, AVColorPrimaries::AVCOL_PRI_BT709, m_srcPrimaries, m_bUseHQScaler ? nullptr : m_outputShader.get()))
 {
 if (m_bUseHQScaler)
 {
 m_IntermediateTarget.Release();
- SAFE_DELETE(m_scalerShader);
+ m_scalerShader.reset();
 }
- SAFE_DELETE(m_colorShader);
+ m_colorShader.reset();
 m_bUseHQScaler = false;
 
 // we're in big trouble - fallback to sw method
 m_renderMethod = RENDER_SW;
- if (m_NumYV12Buffers)
+ EBufferFormat oldFormat = m_bufferFormat;
+ m_bufferFormat = SelectBufferFormat(m_format, m_renderMethod);
+ if (oldFormat != m_bufferFormat && m_NumYV12Buffers > 0)
 {
 m_NumYV12Buffers = 0;
 ManageTextures();
@@ -660,13 +650,13 @@
 if (cmsChanged || !m_outputShader)
 {
 m_outputShader = std::make_unique<COutputShader>();
- if (!m_outputShader->Create(m_cmsOn, m_useDithering, m_ditherDepth))
+ if (!m_outputShader->Create(m_cmsOn, m_useDithering, m_ditherDepth, m_toneMapping))
 {
 CLog::Log(LOGDEBUG, "%s: Unable to create output shader.", __FUNCTION__);
 m_outputShader.reset();
 }
 else if (m_pCLUTView && m_CLUTSize)
- m_outputShader->SetCLUT(m_CLUTSize, m_pCLUTView);
+ m_outputShader->SetCLUT(m_CLUTSize, m_pCLUTView.Get());
 }
 
 RESOLUTION_INFO res = g_graphicsContext.GetResInfo();
@@ -695,12 +685,30 @@
 
 void CWinRenderer::Render(DWORD flags, CD3DTexture* target)
 {
- if (!m_renderBuffers[m_iYV12RenderBuffer].loaded)
+ CRenderBuffer& buf = m_renderBuffers[m_iYV12RenderBuffer];
+ if (!buf.loaded)
 {
- if (!m_renderBuffers[m_iYV12RenderBuffer].UploadBuffer())
+ if (!buf.UploadBuffer())
 return;
 }
 
+ AVColorPrimaries srcPrim = GetSrcPrimaries(buf.primaries, buf.GetWidth(), buf.GetHeight());
+ if (srcPrim != m_srcPrimaries)
+ {
+ m_srcPrimaries = srcPrim;
+ m_bFilterInitialized = false;
+ }
+
+ bool toneMap = false;
+ if (buf.hasLightMetadata || (buf.hasDisplayMetadata && buf.displayMetadata.has_luminance))
+ toneMap = true;
+ if (toneMap != m_toneMapping)
+ {
+ m_outputShader.reset();
+ m_bFilterInitialized = false;
+ }
+ m_toneMapping = toneMap;
+
 UpdateVideoFilter();
 
 switch (m_renderMethod)
@@ -761,13 +769,13 @@
 m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
 SWS_FAST_BILINEAR, nullptr, nullptr, nullptr);
 
- CRenderBuffer* buf = &m_renderBuffers[m_iYV12RenderBuffer];
+ CRenderBuffer& buf = m_renderBuffers[m_iYV12RenderBuffer];
 
 uint8_t* src[YuvImage::MAX_PLANES];
 int srcStride[YuvImage::MAX_PLANES];
 
- for (unsigned int idx = 0; idx < buf->GetActivePlanes(); idx++)
- buf->MapPlane(idx, reinterpret_cast<void**>(&src[idx]), &srcStride[idx]);
+ for (unsigned int idx = 0; idx < buf.GetActivePlanes(); idx++)
+ buf.MapPlane(idx, reinterpret_cast<void**>(&src[idx]), &srcStride[idx]);
 
 D3D11_MAPPED_SUBRESOURCE destlr;
 if (!m_IntermediateTarget.LockRect(0, &destlr, D3D11_MAP_WRITE_DISCARD))
@@ -778,14 +786,15 @@
 
 sws_scale(m_sw_scale_ctx, src, srcStride, 0, m_sourceHeight, dst, dstStride);
 
- for (unsigned int idx = 0; idx < buf->GetActivePlanes(); idx++)
- buf->UnmapPlane(idx);
+ for (unsigned int idx = 0; idx < buf.GetActivePlanes(); idx++)
+ buf.UnmapPlane(idx);
 
 if (!m_IntermediateTarget.UnlockRect(0))
 CLog::Log(LOGERROR, "%s: failed to unlock swtarget texture.", __FUNCTION__);
 
 // 2. output to display
 
+ m_outputShader->SetDisplayMetadata(buf.hasDisplayMetadata, buf.displayMetadata, buf.hasLightMetadata, buf.lightMetadata);
 m_outputShader->Render(m_IntermediateTarget, m_sourceWidth, m_sourceHeight, m_sourceRect, m_rotatedDestCoords, target,
 DX::Windowing().UseLimitedColor(), m_videoSettings.m_Contrast * 0.01f, m_videoSettings.m_Brightness * 0.01f);
 }
@@ -819,11 +828,16 @@
 destPoints[3] = { destRect.x1, destRect.y2 };
 }
 
+ CRenderBuffer& buf = m_renderBuffers[m_iYV12RenderBuffer];
+
+ // set params
+ m_outputShader->SetDisplayMetadata(buf.hasDisplayMetadata, buf.displayMetadata, buf.hasLightMetadata, buf.lightMetadata);
+
+ m_colorShader->SetParams(m_videoSettings.m_Contrast, m_videoSettings.m_Brightness, DX::Windowing().UseLimitedColor());
+ m_colorShader->SetColParams(buf.color_space, buf.bits, !buf.full_range, 8 /*TODO depends on target*/);
+
 // render video frame
- m_colorShader->Render(m_sourceRect, destPoints,
- m_videoSettings.m_Contrast,
- m_videoSettings.m_Brightness,
- &m_renderBuffers[m_iYV12RenderBuffer], target);
+ m_colorShader->Render(m_sourceRect, destPoints, &buf, target);
 // Restore our view port.
 DX::Windowing().RestoreViewPort();
 }
@@ -837,14 +851,14 @@
 
 void CWinRenderer::RenderHW(DWORD flags, CD3DTexture* target)
 {
- CRenderBuffer *image = &m_renderBuffers[m_iYV12RenderBuffer];
- if ( image->format != BUFFER_FMT_D3D11_BYPASS
- && image->format != BUFFER_FMT_D3D11_NV12
- && image->format != BUFFER_FMT_D3D11_P010
- && image->format != BUFFER_FMT_D3D11_P016)
+ CRenderBuffer& buf = m_renderBuffers[m_iYV12RenderBuffer];
+ if ( buf.format != BUFFER_FMT_D3D11_BYPASS
+ && buf.format != BUFFER_FMT_D3D11_NV12
+ && buf.format != BUFFER_FMT_D3D11_P010
+ && buf.format != BUFFER_FMT_D3D11_P016)
 return;
 
- if (!image->loaded)
+ if (!buf.loaded)
 return;
 
 int past = 0;
@@ -852,7 +866,7 @@
 
 CRenderBuffer* views[8];
 memset(views, 0, 8 * sizeof(CRenderBuffer*));
- views[2] = image;
+ views[2] = &buf;
 
 // set future frames
 while (future < 2)
@@ -860,7 +874,7 @@
 bool found = false;
 for (int i = 0; i < m_NumYV12Buffers; i++)
 {
- if (m_renderBuffers[i].frameIdx == image->frameIdx + (future*2 + 2))
+ if (m_renderBuffers[i].frameIdx == buf.frameIdx + (future*2 + 2))
 {
 // a future frame may not be loaded yet
 if (m_renderBuffers[i].loaded || m_renderBuffers[i].UploadBuffer())
@@ -881,7 +895,7 @@
 bool found = false;
 for (int i = 0; i < m_NumYV12Buffers; i++)
 {
- if (m_renderBuffers[i].frameIdx == image->frameIdx - (past*2 + 2))
+ if (m_renderBuffers[i].frameIdx == buf.frameIdx - (past*2 + 2))
 {
 if (m_renderBuffers[i].loaded)
 {
@@ -925,7 +939,7 @@
 }
 CWIN32Util::CropSource(src, dst, targetRect, m_renderOrientation);
 
- m_processor->Render(src, dst, m_IntermediateTarget.Get(), views, flags, image->frameIdx, m_renderOrientation,
+ m_processor->Render(src, dst, m_IntermediateTarget.Get(), views, flags, buf.frameIdx, m_renderOrientation,
 m_videoSettings.m_Contrast, m_videoSettings.m_Brightness);
 
 if (!m_bUseHQScaler)
@@ -939,6 +953,7 @@
 }
 
 // render frame
+ m_outputShader->SetDisplayMetadata(buf.hasDisplayMetadata, buf.displayMetadata, buf.hasLightMetadata, buf.lightMetadata);
 m_outputShader->Render(m_IntermediateTarget, m_destWidth, m_destHeight, dst, dst, target);
 DX::Windowing().RestoreViewPort();
 }
@@ -1160,8 +1175,7 @@
 bool success = m_colorManager->GetVideo3dLut(m_iFlags, &m_cmsToken, CMS_DATA_FMT_RGBA, clutSize, clutData);
 if (success)
 {
- SAFE_RELEASE(m_pCLUTView);
- success = COutputShader::CreateCLUTView(clutSize, clutData, false, &m_pCLUTView);
+ success = COutputShader::CreateCLUTView(clutSize, clutData, false, m_pCLUTView.ReleaseAndGetAddressOf());
 }
 else
 CLog::Log(LOGERROR, "%s: unable to loading the 3dlut data.", __FUNCTION__);
@@ -1176,8 +1190,21 @@
 loadLutTask.then([&](int clutSize){
 m_CLUTSize = clutSize;
 if (m_outputShader)
- m_outputShader->SetCLUT(m_CLUTSize, m_pCLUTView);
+ m_outputShader->SetCLUT(m_CLUTSize, m_pCLUTView.Get());
 m_clutLoaded = true;
 });
 return true;
 }
+
+AVColorPrimaries CWinRenderer::GetSrcPrimaries(AVColorPrimaries srcPrimaries, unsigned int width, unsigned int height) const
+{
+ AVColorPrimaries ret = srcPrimaries;
+ if (ret == AVCOL_PRI_UNSPECIFIED)
+ {
+ if (width > 1024 || height >= 600)
+ ret = AVCOL_PRI_BT709;
+ else
+ ret = AVCOL_PRI_BT470BG;
+ }
+ return ret;
+}
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -27,6 +27,8 @@
 #include "RenderCapture.h"
 #include "WinRenderBuffer.h"
 
+#include <wrl/client.h>
+
 #define AUTOSOURCE -1
 
 class CYUV2RGBShader;
@@ -56,7 +58,7 @@
 bool RenderCapture(CRenderCapture* capture) override;
 
 // Player functions
- bool Configure(const VideoPicture &picture, float fps, unsigned flags, unsigned int orientation) override;
+ bool Configure(const VideoPicture &picture, float fps, unsigned int orientation) override;
 void AddVideoPicture(const VideoPicture &picture, int index, double currentClock) override;
 void UnInit() override;
 bool IsConfigured() override { return m_bConfigured; }
@@ -94,6 +96,7 @@
 void ColorManagmentUpdate();
 bool CreateIntermediateRenderTarget(unsigned int width, unsigned int height, bool dynamic);
 EBufferFormat SelectBufferFormat(AVPixelFormat format, const RenderMethod method) const;
+ AVColorPrimaries GetSrcPrimaries(AVColorPrimaries srcPrimaries, unsigned int width, unsigned int height) const;
 
 bool LoadCLUT();
 
@@ -103,6 +106,7 @@
 bool m_cmsOn;
 bool m_clutLoaded;
 bool m_useDithering;
+ bool m_toneMapping;
 
 unsigned int m_destWidth;
 unsigned int m_destHeight;
@@ -123,14 +127,15 @@
 ESCALINGMETHOD m_scalingMethodGui;
 CRenderBuffer m_renderBuffers[NUM_BUFFERS];
 
- DXVA::CProcessorHD *m_processor;
 struct SwsContext *m_sw_scale_ctx;
- CYUV2RGBShader* m_colorShader;
- CConvolutionShader* m_scalerShader;
- std::unique_ptr<COutputShader> m_outputShader;
 CRenderCapture* m_capture;
+ std::unique_ptr<DXVA::CProcessorHD> m_processor;
+ std::unique_ptr<CYUV2RGBShader> m_colorShader;
+ std::unique_ptr<CConvolutionShader> m_scalerShader;
+ std::unique_ptr<COutputShader> m_outputShader;
 std::unique_ptr<CColorManager> m_colorManager;
- ID3D11ShaderResourceView *m_pCLUTView;
+ Microsoft::WRL::ComPtr<ID3D11ShaderResourceView> m_pCLUTView;
 
 CD3DTexture m_IntermediateTarget;
+ AVColorPrimaries m_srcPrimaries;
 };

_service:download_files:master.tar.gz/xbmc/cores/VideoPlayer/VideoRenderers/yuv2rgb.neon.h Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/VideoSettings.h Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXAudio.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXAudio.h Changed

@@ -45,20 +45,20 @@
 typedef struct tGUID
 {
   DWORD Data1;
-  WORD  Data2, Data3;
-  BYTE  Data4[8];
+  unsigned short  Data2, Data3;
+  unsigned char  Data4[8];
 } __attribute__((__packed__)) GUID;
 
 // Audio stuff
 typedef struct tWAVEFORMATEX
 {
-  WORD    wFormatTag;
-  WORD    nChannels;
+  unsigned short wFormatTag;
+  unsigned short nChannels;
   DWORD   nSamplesPerSec;
   DWORD   nAvgBytesPerSec;
-  WORD    nBlockAlign;
-  WORD    wBitsPerSample;
-  WORD    cbSize;
+  unsigned short nBlockAlign;
+  unsigned short wBitsPerSample;
+  unsigned short cbSize;
  } __attribute__((__packed__)) WAVEFORMATEX, *PWAVEFORMATEX, *LPWAVEFORMATEX;
 
  #define WAVE_FORMAT_UNKNOWN           0x0000
@@ -72,9 +72,9 @@
   WAVEFORMATEX Format;
   union
   {
-    WORD wValidBitsPerSample;
-    WORD wSamplesPerBlock;
-    WORD wReserved;
+    unsigned short wValidBitsPerSample;
+    unsigned short wSamplesPerBlock;
+    unsigned short wReserved;
   } Samples;
   DWORD dwChannelMask;
   GUID SubFormat;

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXAudioCodec.h Deleted

@@ -1,115 +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/>.
- *
- */
-
-#include "system.h"
-
-#include <vector>
-#include "libavcodec/avcodec.h"
-
-struct AVStream;
-
-class COMXStreamInfo;
-
-class COMXAudioCodec
-{
-public:
-
- COMXAudioCodec() {}
- virtual ~COMXAudioCodec() {}
-
- /*
- * Open the decoder, returns true on success
- */
- virtual bool Open(COMXStreamInfo &hints) = 0;
-
- /*
- * Dispose, Free all resources
- */
- virtual void Dispose() = 0;
-
- /*
- * returns bytes used or -1 on error
- *
- */
- virtual int Decode(BYTE* pData, int iSize) = 0;
-
- /*
- * returns nr of bytes used or -1 on error
- * the data is valid until the next Decode call
- */
- virtual int GetData(BYTE** dst) = 0;
-
- /*
- * resets the decoder
- */
- virtual void Reset() = 0;
-
- /*
- * returns the nr of channels for the decoded audio stream
- */
- virtual int GetChannels() = 0;
-
- /*
- * returns the channel mapping
- */
- virtual enum PCMChannels* GetChannelMap() = 0;
-
- /*
- * returns the samplerate for the decoded audio stream
- */
- virtual int GetSampleRate() = 0;
-
- /*
- * returns the bitspersample for the decoded audio stream (eg 16 bits)
- */
- virtual int GetBitsPerSample() = 0;
-
- /*
- * returns the framesize for bitstreams
- */
- virtual int GetFrameSize() = 0;
-
- /*
- * returns the syncword for bitstreams
- */
- virtual uint32_t GetSyncWord() = 0;
-
- /*
- * should return the average input bit rate 
- */
- virtual int GetBitRate() { return 0; }
-
- /*
- * returns if the codec requests to use passthrough
- */
- virtual bool NeedPassthrough() { return false; }
-
- /*
- * should return codecs name
- */
- virtual const char* GetName() = 0;
-
- /*
- * should return amount of data decoded has buffered in preparation for next audio frame
- */
- virtual int GetBufferSize() { return 0; }
-};

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

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -147,7 +147,7 @@
 m_bGotFrame = false;
 }
 
-int COMXAudioCodecOMX::Decode(BYTE* pData, int iSize, double dts, double pts)
+int COMXAudioCodecOMX::Decode(unsigned char* pData, int iSize, double dts, double pts)
 {
 int iBytesUsed, got_frame;
 if (!m_pCodecContext) return -1;
@@ -191,7 +191,7 @@
 return iBytesUsed;
 }
 
-int COMXAudioCodecOMX::GetData(BYTE** dst, double &dts, double &pts)
+int COMXAudioCodecOMX::GetData(unsigned char** dst, double &dts, double &pts)
 {
 if (!m_bGotFrame)
 return 0;
@@ -223,7 +223,7 @@
 
 if (m_iBufferOutputAlloced < m_iBufferOutputUsed + outputSize)
 {
- m_pBufferOutput = (BYTE*)av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + FF_INPUT_BUFFER_PADDING_SIZE);
+ m_pBufferOutput = (unsigned char*)av_realloc(m_pBufferOutput, m_iBufferOutputUsed + outputSize + FF_INPUT_BUFFER_PADDING_SIZE);
 m_iBufferOutputAlloced = m_iBufferOutputUsed + outputSize;
 }

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXAudioCodecOMX.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXHelper.h Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXImage.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXImage.h Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXPlayerAudio.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXPlayerVideo.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -44,8 +44,6 @@
 
 #include "platform/linux/RBP.h"
 
-using namespace RenderManager;
-
 class COMXMsgVideoCodecChange : public CDVDMsg
 {
 public:
@@ -268,18 +266,18 @@
   {
     case RENDER_STEREO_MODE_SPLIT_VERTICAL:
       stereoMode = "left_right";
+      if (m_processInfo.GetVideoSettings().m_StereoInvert)
+        stereoMode = "right_left";
       break;
     case RENDER_STEREO_MODE_SPLIT_HORIZONTAL:
       stereoMode = "top_bottom";
+      if (m_processInfo.GetVideoSettings().m_StereoInvert)
+        stereoMode = "bottom_top";
       break;
     default:
-      stereoMode = m_processInfo.GetVideoStereoMode();
+      stereoMode = m_hints.stereo_mode;
       break;
   }
-
-  if (m_processInfo.GetVideoSettings().m_StereoInvert)
-    stereoMode = GetStereoModeInvert(stereoMode);
-
   return stereoMode;
 }
 
@@ -319,7 +317,6 @@
   time += m_av_clock->GetAbsoluteClock();
 
   VideoPicture picture = {};
-  memset(&picture, 0, sizeof(VideoPicture));
   picture.pts = time/DVD_TIME_BASE;
   MMAL::CMMALBuffer *omvb = new MMAL::CMMALBuffer(0);
   omvb->m_state = MMAL::MMALStateBypass;
@@ -670,11 +667,29 @@
 void OMXPlayerVideo::SetVideoRect(const CRect &InSrcRect, const CRect &InDestRect)
 {
   CRect SrcRect = InSrcRect, DestRect = InDestRect;
-  unsigned flags = GetStereoModeFlags(GetStereoMode());
-  RENDER_STEREO_MODE video_stereo_mode = (flags & CONF_FLAGS_STEREO_MODE_SBS) ? RENDER_STEREO_MODE_SPLIT_VERTICAL :
-                                         (flags & CONF_FLAGS_STEREO_MODE_TAB) ? RENDER_STEREO_MODE_SPLIT_HORIZONTAL : RENDER_STEREO_MODE_OFF;
-  bool stereo_invert                   = (flags & CONF_FLAGS_STEREO_CADANCE_RIGHT_LEFT) ? true : false;
+  bool stereo_invert = false;
   RENDER_STEREO_MODE display_stereo_mode = g_graphicsContext.GetStereoMode();
+  RENDER_STEREO_MODE video_stereo_mode = RENDER_STEREO_MODE_OFF;
+  std::string stereoMode = GetStereoMode();
+
+  if (stereoMode == "left_right")
+  {
+    video_stereo_mode = RENDER_STEREO_MODE_SPLIT_HORIZONTAL;
+  }
+  else if (stereoMode == "right_left")
+  {
+    video_stereo_mode = RENDER_STEREO_MODE_SPLIT_HORIZONTAL;
+    stereo_invert = true;
+  }
+  else if (stereoMode == "top_bottom")
+  {
+    video_stereo_mode = RENDER_STEREO_MODE_SPLIT_VERTICAL;
+  }
+  else if (stereoMode == "bottom_top")
+  {
+    video_stereo_mode = RENDER_STEREO_MODE_SPLIT_VERTICAL;
+    stereo_invert = true;
+  }
 
   // ignore video stereo mode when 3D display mode is disabled
   if (display_stereo_mode == RENDER_STEREO_MODE_OFF)
@@ -763,15 +778,6 @@
 
   m_processInfo.SetVideoStereoMode(m_hints.stereo_mode);
 
-  /* figure out stereomode expected based on user settings and hints */
-  unsigned flags = GetStereoModeFlags(GetStereoMode());
-
-  if(m_bAllowFullscreen)
-  {
-    flags |= CONF_FLAGS_FULLSCREEN;
-    m_bAllowFullscreen = false; // only allow on first configure
-  }
-
   unsigned int iDisplayWidth  = width;
   unsigned int iDisplayHeight = height;
 
@@ -795,12 +801,14 @@
   picture.iDisplayWidth = iDisplayWidth;
   picture.iDisplayHeight = iDisplayHeight;
 
-  if(!m_renderManager.Configure(picture, m_fFrameRate, flags, m_hints.orientation, 3))
+  if(!m_renderManager.Configure(picture, m_fFrameRate, m_bAllowFullscreen, m_hints.orientation, 3))
   {
     CLog::Log(LOGERROR, "%s - failed to configure renderer", __FUNCTION__);
     return;
   }
 
+  m_bAllowFullscreen = false; // only allow on first configure
+
   m_src_rect.SetRect(0, 0, 0, 0);
   m_dst_rect.SetRect(0, 0, 0, 0);
 }

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXVideo.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXVideo.h Changed

_service:download_files:master.tar.gz/xbmc/cores/omxplayer/OMXVideoCodec.h Deleted

@@ -1,229 +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/>.
- *
- */
-
-#include "system.h"
-
-#include <vector>
-
-// when modifying these structures, make sure you update all codecs accordingly
-#define FRAME_TYPE_UNDEF 0
-#define FRAME_TYPE_I 1
-#define FRAME_TYPE_P 2
-#define FRAME_TYPE_B 3
-#define FRAME_TYPE_D 4
-
-namespace DXVA { class CSurfaceContext; }
-namespace VAAPI { struct CHolder; }
-class CVDPAU;
-class COMXCore;
-class COMXCoreVideo;
-struct OMXCoreVideoBuffer;
-#ifdef HAVE_VIDEOTOOLBOXDECODER
- class COMXVideoCodecVideoToolBox;
- struct __CVBuffer;
-#endif
-
-// should be entirely filled by all codecs
-struct DVDVideoPicture
-{
- double pts; // timestamp in seconds, used in the CVideoPlayer class to keep track of pts
- double dts;
-
- union
- {
- struct {
- BYTE* data[4]; // [4] = alpha channel, currently not used
- int iLineSize[4]; // [4] = alpha channel, currently not used
- };
- struct {
- DXVA::CSurfaceContext* context;
- };
- struct {
- CVDPAU* vdpau;
- };
- struct {
- VAAPI::CHolder* vaapi;
- };
-
- struct {
- COMXCore *openMax;
- OMXCoreVideoBuffer *openMaxBuffer;
- };
-#ifdef HAVE_VIDEOTOOLBOXDECODER
- struct {
- COMXVideoCodecVideoToolBox *vtb;
- struct __CVBuffer *cvBufferRef;
- };
-#endif
- };
-
- unsigned int iFlags;
-
- double iRepeatPicture;
- double iDuration;
- unsigned int iFrameType : 4; // see defines above // 1->I, 2->P, 3->B, 0->Undef
- unsigned int color_matrix : 4;
- unsigned int color_range : 1; // 1 indicate if we have a full range of color
- unsigned int chroma_position;
- unsigned int color_primaries;
- unsigned int color_transfer;
- unsigned int extended_format;
- int iGroupId;
-
- int8_t* qp_table; // Quantization parameters, primarily used by filters
- int qstride;
- int qscale_type;
-
- unsigned int iWidth;
- unsigned int iHeight;
- unsigned int iDisplayWidth; // width of the picture without black bars
- unsigned int iDisplayHeight; // height of the picture without black bars
-
- enum EFormat {
- FMT_YUV420P = 0,
- FMT_VDPAU,
- FMT_NV12,
- FMT_UYVY,
- FMT_YUY2,
- FMT_DXVA,
- FMT_VAAPI,
- FMT_OMXEGL,
- FMT_CVBREF,
- } format;
-};
-
-struct DVDVideoUserData
-{
- BYTE* data;
- int size;
-};
-
-#define DVP_FLAG_TOP_FIELD_FIRST 0x00000001
-#define DVP_FLAG_REPEAT_TOP_FIELD 0x00000002 //Set to indicate that the top field should be repeated
-#define DVP_FLAG_ALLOCATED 0x00000004 //Set to indicate that this has allocated data
-#define DVP_FLAG_INTERLACED 0x00000008 //Set to indicate that this frame is interlaced
-
-#define DVP_FLAG_NOSKIP 0x00000010 // indicate this picture should never be dropped
-#define DVP_FLAG_DROPPED 0x00000020 // indicate that this picture has been dropped in decoder stage, will have no data
-
-// DVP_FLAG 0x00000100 - 0x00000f00 is in use by libmpeg2!
-
-#define DVP_QSCALE_UNKNOWN 0
-#define DVP_QSCALE_MPEG1 1
-#define DVP_QSCALE_MPEG2 2
-#define DVP_QSCALE_H264 3
-
-class COMXStreamInfo;
-class CDVDCodecOption;
-class CDVDCodecOptions;
-
-// VC_ messages, messages can be combined
-#define VC_ERROR 0x00000001 // an error occured, no other messages will be returned
-#define VC_BUFFER 0x00000002 // the decoder needs more data
-#define VC_PICTURE 0x00000004 // the decoder got a picture, call Decode(NULL, 0) again to parse the rest of the data
-#define VC_USERDATA 0x00000008 // the decoder found some userdata, call Decode(NULL, 0) again to parse the rest of the data
-#define VC_FLUSHED 0x00000010 // the decoder lost it's state, we need to restart decoding again
-class COMXVideoCodec
-{
-public:
-
- COMXVideoCodec() {}
- virtual ~COMXVideoCodec() {}
-
- /*
- * Open the decoder, returns true on success
- */
- virtual bool Open(COMXStreamInfo &hints, CDVDCodecOptions &options) = 0;
-
- /*
- * Dispose, Free all resources
- */
- virtual void Dispose() = 0;
-
- /*
- * returns one or a combination of VC_ messages
- * pData and iSize can be NULL, this means we should flush the rest of the data.
- */
- virtual int Decode(BYTE* pData, int iSize, double dts, double pts) = 0;
-
- /*
- * Reset the decoder.
- * Should be the same as calling Dispose and Open after each other
- */
- virtual void Reset() = 0;
-
- /*
- * returns true if successfull
- * the data is valid until the next Decode call
- */
- virtual bool GetPicture(DVDVideoPicture* pDvdVideoPicture) = 0;
-
-
- /*
- * returns true if successfull
- * the data is valid until the next Decode call
- * userdata can be anything, for now we use it for closed captioning
- */
- virtual bool GetUserData(DVDVideoUserData* pDvdVideoUserData)
- {
- pDvdVideoUserData->data = NULL;
- pDvdVideoUserData->size = 0;
- return false;
- }
-
- /*
- * will be called by video player indicating if a frame will eventually be dropped
- * codec can then skip actually decoding the data, just consume the data set picture headers
- */
- virtual void SetDropState(bool bDrop) = 0;
-
-
- enum EFilterFlags {
- FILTER_NONE = 0x0,
- FILTER_DEINTERLACE_YADIF = 0x1, /* use first deinterlace mode */
- FILTER_DEINTERLACE_ANY = 0xf, /* use any deinterlace mode */
- FILTER_DEINTERLACE_FLAGGED = 0x10, /* only deinterlace flagged frames */
- FILTER_DEINTERLACE_HALFED = 0x20, /* do half rate deinterlacing */
- };
-
- /*
- * set the type of filters that should be applied at decoding stage if possible
- */
- virtual unsigned int SetFilters(unsigned int filters) { return 0u; }
-
- /*
- *
- * should return codecs name
- */
- virtual const char* GetName() = 0;
-
- /*
- *
- * How many packets should player remember, so codec
- * can recover should something cause it to flush
- * outside of players control
- */
- virtual unsigned GetConvergeCount()
- {
- return 0;
- }
-};

_service:download_files:master.tar.gz/xbmc/cores/paplayer/AudioDecoder.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/paplayer/AudioDecoder.h Changed

_service:download_files:master.tar.gz/xbmc/cores/paplayer/CachingCodec.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/paplayer/CodecFactory.h Changed

_service:download_files:master.tar.gz/xbmc/cores/paplayer/ICodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.cpp Changed

@@ -385,7 +385,8 @@
 si->m_fadeOutTriggered = false;
 si->m_isSlaved = false;
 
- int64_t streamTotalTime = si->m_decoder.TotalTime();
+ si->m_decoderTotal = si->m_decoder.TotalTime();
+ int64_t streamTotalTime = si->m_decoderTotal;
 if (si->m_endOffset)
 streamTotalTime = si->m_endOffset - si->m_startOffset;
 
@@ -766,6 +767,8 @@
 {
 if (si == m_currentStream && si->m_nextFileItem)
 {
+ CloseFileCB(*si);
+
 // update current stream with info of next track
 si->m_startOffset = si->m_nextFileItem->m_lStartOffset;
 if (si->m_nextFileItem->m_lEndOffset)
@@ -1021,7 +1024,7 @@
 {
 if (!CanSeek()) return;
 
- __int64 seek;
+ long long seek;
 if (g_advancedSettings.m_musicUseTimeSeeking && m_playerGUIData.m_totalTime > 2 * g_advancedSettings.m_musicTimeSeekForwardBig)
 {
 if (bLargeStep)
@@ -1038,7 +1041,7 @@
 percent = bPlus ? (float)g_advancedSettings.m_musicPercentSeekForwardBig : (float)g_advancedSettings.m_musicPercentSeekBackwardBig;
 else
 percent = bPlus ? (float)g_advancedSettings.m_musicPercentSeekForward : (float)g_advancedSettings.m_musicPercentSeekBackward;
- seek = (__int64)(GetTotalTime64() * (GetPercentage() + percent) / 100);
+ seek = static_cast<long long>(GetTotalTime64() * (GetPercentage() + percent) / 100);
 }
 
 SeekTime(seek);
@@ -1116,7 +1119,7 @@
 IPlayerCallback *cb = &m_callback;
 CFileItem fileItem(si.m_fileItem);
 CBookmark bookmark;
- double total = si.m_decoder.TotalTime();
+ double total = si.m_decoderTotal;
 if (si.m_endOffset)
 total = si.m_endOffset;
 total -= si.m_startOffset;

_service:download_files:master.tar.gz/xbmc/cores/paplayer/PAPlayer.h Changed

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

_service:download_files:master.tar.gz/xbmc/cores/paplayer/VideoPlayerCodec.h Changed

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerCoreConfig.h Changed

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,11 +22,14 @@
 #include "threads/SingleLock.h"
 #include "cores/VideoPlayer/VideoPlayer.h"
 #include "cores/paplayer/PAPlayer.h"
+#include "cores/IPlayerCallback.h"
 #include "dialogs/GUIDialogContextMenu.h"
 #include "URL.h"
 #include "FileItem.h"
 #include "profiles/ProfilesManager.h"
+#include "settings/lib/SettingsManager.h"
 #include "settings/AdvancedSettings.h"
+#include "settings/Settings.h"
 #include "PlayerCoreConfig.h"
 #include "PlayerSelectionRule.h"
 #include "guilib/LocalizeStrings.h"
@@ -36,26 +39,31 @@
 
 #define PLAYERCOREFACTORY_XML "playercorefactory.xml"
 
-CPlayerCoreFactory::CPlayerCoreFactory() = default;
+CPlayerCoreFactory::CPlayerCoreFactory(CSettings &settings,
+ const CProfilesManager &profileManager) :
+ m_settings(settings),
+ m_profileManager(profileManager)
+{
+ if (m_settings.IsLoaded())
+ OnSettingsLoaded();
+
+ m_settings.GetSettingsManager()->RegisterSettingsHandler(this);
+}
 
 CPlayerCoreFactory::~CPlayerCoreFactory()
 {
+ m_settings.GetSettingsManager()->UnregisterSettingsHandler(this);
+
 for(std::vector<CPlayerCoreConfig *>::iterator it = m_vecPlayerConfigs.begin(); it != m_vecPlayerConfigs.end(); ++it)
 delete *it;
 for(std::vector<CPlayerSelectionRule *>::iterator it = m_vecCoreSelectionRules.begin(); it != m_vecCoreSelectionRules.end(); ++it)
 delete *it;
 }
 
-CPlayerCoreFactory& CPlayerCoreFactory::GetInstance()
-{
- static CPlayerCoreFactory sPlayerCoreFactory;
- return sPlayerCoreFactory;
-}
-
 void CPlayerCoreFactory::OnSettingsLoaded()
 {
 LoadConfiguration("special://xbmc/system/" PLAYERCOREFACTORY_XML, true);
- LoadConfiguration(CProfilesManager::GetInstance().GetUserDataItem(PLAYERCOREFACTORY_XML), false);
+ LoadConfiguration(m_profileManager.GetUserDataItem(PLAYERCOREFACTORY_XML), false);
 }
 
 IPlayer* CPlayerCoreFactory::CreatePlayer(const std::string& nameId, IPlayerCallback& callback) const

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerCoreFactory.h Changed

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include "system.h"
-#include "cores/IPlayerCallback.h"
 #include "settings/lib/ISettingsHandler.h"
 #include "threads/CriticalSection.h"
 #include <string>
@@ -34,12 +33,19 @@
 class CFileItem;
 class CPlayerCoreConfig;
 class CPlayerSelectionRule;
+class CProfilesManager;
+class CSettings;
 class IPlayer;
+class IPlayerCallback;
 
 class CPlayerCoreFactory : public ISettingsHandler
 {
 public:
- static CPlayerCoreFactory& GetInstance();
+ CPlayerCoreFactory(CSettings &settings,
+ const CProfilesManager &profileManager);
+ CPlayerCoreFactory(const CPlayerCoreFactory&) = delete;
+ CPlayerCoreFactory& operator=(CPlayerCoreFactory const&) = delete;
+ ~CPlayerCoreFactory() override;
 
 void OnSettingsLoaded() override;
 
@@ -59,11 +65,11 @@
 void OnPlayerDiscovered(const std::string& id, const std::string& name);
 void OnPlayerRemoved(const std::string& id);
 
-protected:
- CPlayerCoreFactory();
- CPlayerCoreFactory(const CPlayerCoreFactory&) = delete;
- CPlayerCoreFactory& operator=(CPlayerCoreFactory const&) = delete;
- ~CPlayerCoreFactory() override;
+private:
+ // Construction parameters
+ CSettings &m_settings;
+ const CProfilesManager &m_profileManager;
+
 int GetPlayerIndex(const std::string& strCoreName) const;
 std::string GetPlayerName(size_t idx) const;

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp Changed

_service:download_files:master.tar.gz/xbmc/cores/playercorefactory/PlayerSelectionRule.h Changed

_service:download_files:master.tar.gz/xbmc/dbwrappers/CMakeLists.txt Changed

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

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -29,8 +29,9 @@
 #include "sqlitedataset.h"
 #include "DatabaseManager.h"
 #include "DbUrl.h"
+#include "ServiceBroker.h"
 
-#ifdef HAS_MYSQL
+#if defined(HAS_MYSQL) || defined(HAS_MARIADB) 
 #include "mysqldataset.h"
 #endif
 
@@ -149,7 +150,8 @@
   return true;
 }
 
-CDatabase::CDatabase(void)
+CDatabase::CDatabase() :
+  m_profileManager(CServiceBroker::GetProfileManager())
 {
   m_openCount = 0;
   m_sqlite = true;
@@ -363,7 +365,7 @@
   }
 
   // check our database manager to see if this database can be opened
-  if (!CDatabaseManager::GetInstance().CanOpen(GetBaseDBName()))
+  if (!CServiceBroker::GetDatabaseManager().CanOpen(GetBaseDBName()))
     return false;
 
   DatabaseSettings dbSettings = settings;
@@ -378,7 +380,7 @@
 {
   m_sqlite = true;
 
-#ifdef HAS_MYSQL
+#if defined(HAS_MYSQL) || defined(HAS_MARIADB)
   if (dbSettings.type == "mysql")
   {
     // check we have all information before we cancel the fallback
@@ -396,7 +398,7 @@
   {
     dbSettings.type = "sqlite3";
     if (dbSettings.host.empty())
-      dbSettings.host = CSpecialProtocol::TranslatePath(CProfilesManager::GetInstance().GetDatabaseFolder());
+      dbSettings.host = CSpecialProtocol::TranslatePath(m_profileManager.GetDatabaseFolder());
   }
 
   // use separate, versioned database
@@ -421,7 +423,7 @@
   {
     m_pDB.reset( new SqliteDatabase() ) ;
   }
-#ifdef HAS_MYSQL
+#if defined(HAS_MYSQL) || defined(HAS_MARIADB)
   else if (dbSettings.type == "mysql")
   {
     m_pDB.reset( new MysqlDatabase() ) ;

_service:download_files:master.tar.gz/xbmc/dbwrappers/Database.h Changed

_service:download_files:master.tar.gz/xbmc/dbwrappers/DatabaseQuery.cpp Changed

_service:download_files:master.tar.gz/xbmc/dbwrappers/DatabaseQuery.h Changed

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

_service:download_files:master.tar.gz/xbmc/dbwrappers/mysqldataset.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogBoxBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogBoxBase.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogBusy.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogBusy.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogButtonMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogButtonMenu.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogCache.h Changed

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

@@ -222,7 +222,7 @@
   // Next, Add buttons to the ContextMenu that should ONLY be visible for sources and not autosourced items
   CMediaSource *share = GetShare(type, item.get());
 
-  if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() || g_passwordManager.bMasterUser)
+  if (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() || g_passwordManager.bMasterUser)
   {
     if (share)
     {
@@ -244,9 +244,9 @@
     if (!GetDefaultShareNameByType(type).empty())
       buttons.Add(CONTEXT_BUTTON_CLEAR_DEFAULT, 13403); // Clear Default
   }
-  if (share && LOCK_MODE_EVERYONE != CProfilesManager::GetInstance().GetMasterProfile().getLockMode())
+  if (share && LOCK_MODE_EVERYONE != CServiceBroker::GetProfileManager().GetMasterProfile().getLockMode())
   {
-    if (share->m_iHasLock == 0 && (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() || g_passwordManager.bMasterUser))
+    if (share->m_iHasLock == 0 && (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() || g_passwordManager.bMasterUser))
       buttons.Add(CONTEXT_BUTTON_ADD_LOCK, 12332);
     else if (share->m_iHasLock == 1)
       buttons.Add(CONTEXT_BUTTON_REMOVE_LOCK, 12335);
@@ -279,7 +279,7 @@
   switch (button)
   {
   case CONTEXT_BUTTON_EDIT_SOURCE:
-    if (CProfilesManager::GetInstance().IsMasterProfile())
+    if (CServiceBroker::GetProfileManager().IsMasterProfile())
     {
       if (!g_passwordManager.IsMasterLockUnlocked(true))
         return false;
@@ -291,16 +291,16 @@
 
   case CONTEXT_BUTTON_REMOVE_SOURCE:
   {
-    if (CProfilesManager::GetInstance().IsMasterProfile())
+    if (CServiceBroker::GetProfileManager().IsMasterProfile())
     {
       if (!g_passwordManager.IsMasterLockUnlocked(true))
         return false;
     }
     else
     {
-      if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsMasterLockUnlocked(false))
+      if (!CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsMasterLockUnlocked(false))
         return false;
-      if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
+      if (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
         return false;
     }
     // prompt user if they want to really delete the source
@@ -318,7 +318,7 @@
     return true;
   }
   case CONTEXT_BUTTON_SET_DEFAULT:
-    if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
+    if (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
       return false;
     else if (!g_passwordManager.IsMasterLockUnlocked(true))
       return false;
@@ -328,7 +328,7 @@
     return true;
 
   case CONTEXT_BUTTON_CLEAR_DEFAULT:
-    if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
+    if (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
       return false;
     else if (!g_passwordManager.IsMasterLockUnlocked(true))
       return false;
@@ -338,7 +338,7 @@
 
   case CONTEXT_BUTTON_SET_THUMB:
     {
-      if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
+      if (CServiceBroker::GetProfileManager().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
         return false;
       else if (!g_passwordManager.IsMasterLockUnlocked(true))
         return false;
@@ -644,7 +644,7 @@
 
 void CGUIDialogContextMenu::PositionAtCurrentFocus()
 {
-  CGUIWindow *window = g_windowManager.GetWindow(g_windowManager.GetFocusedWindow());
+  CGUIWindow *window = g_windowManager.GetWindow(g_windowManager.GetActiveWindowOrDialog());
   if (window)
   {
     const CGUIControl *focusedControl = window->GetFocusedControl();

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

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogExtendedProgressBar.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogFileBrowser.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogFileBrowser.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogGamepad.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogGamepad.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogKaiToast.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogKaiToast.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp Changed

@@ -194,22 +194,24 @@
 
 bool CGUIDialogKeyboardGeneric::OnAction(const CAction &action)
 {
+ int actionId = action.GetID();
 bool handled = true;
- if (action.GetID() == (KEY_VKEY | XBMCVK_BACK))
+ if (actionId == (KEY_VKEY | XBMCVK_BACK))
 Backspace();
- else if (action.GetID() == ACTION_ENTER || (m_isKeyboardNavigationMode && action.GetID() == ACTION_SELECT_ITEM))
+ else if (actionId == ACTION_ENTER ||
+ (actionId == ACTION_SELECT_ITEM && (m_isKeyboardNavigationMode || GetFocusedControlID() == CTL_EDIT)))
 OnOK();
- else if (action.GetID() == ACTION_SHIFT)
+ else if (actionId == ACTION_SHIFT)
 OnShift();
- else if (action.GetID() == ACTION_SYMBOLS)
+ else if (actionId == ACTION_SYMBOLS)
 OnSymbols();
 // don't handle move left/right and select in the edit control
 else if (!m_isKeyboardNavigationMode &&
- (action.GetID() == ACTION_MOVE_LEFT ||
- action.GetID() == ACTION_MOVE_RIGHT ||
- action.GetID() == ACTION_SELECT_ITEM))
+ (actionId == ACTION_MOVE_LEFT ||
+ actionId == ACTION_MOVE_RIGHT ||
+ actionId == ACTION_SELECT_ITEM))
 handled = false;
- else if (action.GetID() == ACTION_VOICE_RECOGNIZE)
+ else if (actionId == ACTION_VOICE_RECOGNIZE)
 OnVoiceRecognition();
 else
 {
@@ -224,9 +226,9 @@
 CGUIControl *edit = GetControl(CTL_EDIT);
 if (edit)
 handled = edit->OnAction(action);
- if (!handled && action.GetID() >= KEY_VKEY && action.GetID() < KEY_ASCII)
+ if (!handled && actionId >= KEY_VKEY && actionId < KEY_ASCII)
 {
- BYTE b = action.GetID() & 0xFF;
+ unsigned char b = actionId & 0xFF;
 if (b == XBMCVK_TAB)
 {
 // Toggle left/right key mode

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogKeyboardTouch.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogMediaFilter.h Changed

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

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogMediaSource.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogNumeric.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogNumeric.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogOK.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogOK.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogPlayEject.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogPlayEject.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogPlayerControls.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogPlayerControls.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogProgress.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogProgress.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSeekBar.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -26,7 +26,6 @@
 #include "SeekHandler.h"
 
 #define POPUP_SEEK_PROGRESS     401
-#define POPUP_SEEK_LABEL        402
 
 CGUIDialogSeekBar::CGUIDialogSeekBar(void)
   : CGUIDialog(WINDOW_DIALOG_SEEK_BAR, "DialogSeekBar.xml", DialogModalityType::MODELESS)
@@ -43,12 +42,6 @@
   case GUI_MSG_WINDOW_INIT:
   case GUI_MSG_WINDOW_DEINIT:
     return CGUIDialog::OnMessage(message);
-
-  case GUI_MSG_LABEL_SET:
-    if (message.GetSenderId() == GetID() && message.GetControlId() == POPUP_SEEK_LABEL)
-      return CGUIDialog::OnMessage(message);
-    break;
-
   case GUI_MSG_ITEM_SELECT:
     if (message.GetSenderId() == GetID() && message.GetControlId() == POPUP_SEEK_PROGRESS)
       return CGUIDialog::OnMessage(message);
@@ -67,9 +60,9 @@
     return;
   }
 
-  unsigned int percent((!g_application.GetAppPlayer().GetSeekHandler().InProgress() && g_infoManager.GetTotalPlayTime())
-    ? lrintf(g_application.GetPercentage())
-    : (unsigned int)g_infoManager.GetSeekPercent());
+  unsigned int percent = g_application.GetAppPlayer().GetSeekHandler().InProgress()
+    ? lrintf(g_infoManager.GetSeekPercent())
+    : lrintf(g_application.GetPercentage());
 
   if (percent != m_lastPercent)
     CONTROL_SELECT_ITEM(POPUP_SEEK_PROGRESS, m_lastPercent = percent);

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSeekBar.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSelect.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSelect.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSimpleMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSimpleMenu.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSlider.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSlider.h Changed

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

@@ -156,9 +156,9 @@
       if (!startupList.empty())
       {
         int party = 0;
-        if (URIUtils::PathEquals(startupList, CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp")))
+        if (URIUtils::PathEquals(startupList, CServiceBroker::GetProfileManager().GetUserDataItem("PartyMode.xsp")))
           party = 1;
-        else if (URIUtils::PathEquals(startupList, CProfilesManager::GetInstance().GetUserDataItem("PartyMode-Video.xsp")))
+        else if (URIUtils::PathEquals(startupList, CServiceBroker::GetProfileManager().GetUserDataItem("PartyMode-Video.xsp")))
           party = 2;
 
         if ((party && !XFILE::CFile::Exists(startupList)) ||
@@ -626,9 +626,9 @@
   if (!editor) return false;
 
   editor->m_mode = type;
-  if (URIUtils::PathEquals(path, CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp")))
+  if (URIUtils::PathEquals(path, CServiceBroker::GetProfileManager().GetUserDataItem("PartyMode.xsp")))
     editor->m_mode = "partymusic";
-  if (URIUtils::PathEquals(path, CProfilesManager::GetInstance().GetUserDataItem("PartyMode-Video.xsp")))
+  if (URIUtils::PathEquals(path, CServiceBroker::GetProfileManager().GetUserDataItem("PartyMode-Video.xsp")))
     editor->m_mode = "partyvideo";
 
   CSmartPlaylist playlist;

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

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSmartPlaylistRule.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSubMenu.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogSubMenu.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogTextViewer.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogTextViewer.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogVolumeBar.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogVolumeBar.h Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogYesNo.cpp Changed

_service:download_files:master.tar.gz/xbmc/dialogs/GUIDialogYesNo.h Changed

_service:download_files:master.tar.gz/xbmc/events/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/events/EventLog.cpp Changed

@@ -32,9 +32,6 @@
 
 #include <utility>
 
-std::map<int, std::unique_ptr<CEventLog> > CEventLog::s_eventLogs;
-CCriticalSection CEventLog::s_critical;
-
 std::string CEventLog::EventLevelToString(EventLevel level)
 {
 switch (level)
@@ -68,21 +65,6 @@
 return EventLevel::Information;
 }
 
-CEventLog& CEventLog::GetInstance()
-{
- int currentProfileId = CProfilesManager::GetInstance().GetCurrentProfileId();
-
- CSingleLock lock(s_critical);
- auto eventLog = s_eventLogs.find(currentProfileId);
- if (eventLog == s_eventLogs.end())
- {
- s_eventLogs.insert(std::make_pair(currentProfileId, std::unique_ptr<CEventLog>(new CEventLog())));
- eventLog = s_eventLogs.find(currentProfileId);
- }
-
- return *eventLog->second;
-}
-
 Events CEventLog::Get() const
 {
 return m_events;
@@ -249,16 +231,6 @@
 g_windowManager.ActivateWindow(WINDOW_EVENT_LOG, params);
 }
 
-void CEventLog::OnSettingAction(std::shared_ptr<const CSetting> setting)
-{
- if (setting == nullptr)
- return;
-
- const std::string& settingId = setting->GetId();
- if (settingId == CSettings::SETTING_EVENTLOG_SHOW)
- ShowFullEventLog();
-}
-
 void CEventLog::SendMessage(const EventPtr& eventPtr, int message)
 {
 CGUIMessage msg(GUI_MSG_NOTIFY_ALL, 0, 0, message, 0, XFILE::CEventsDirectory::EventToFileItem(eventPtr));

_service:download_files:master.tar.gz/xbmc/events/EventLog.h Changed

@@ -24,7 +24,6 @@
 #include <vector>
 
 #include "events/IEvent.h"
-#include "settings/lib/ISettingCallback.h"
 #include "threads/CriticalSection.h"
 
 #define NOTIFICATION_DISPLAY_TIME 5000
@@ -32,12 +31,13 @@
 
 typedef std::vector<EventPtr> Events;
 
-class CEventLog : public ISettingCallback
+class CEventLog
 {
 public:
- ~CEventLog() override = default;
-
- static CEventLog& GetInstance();
+ CEventLog() = default;
+ CEventLog(const CEventLog&) = delete;
+ CEventLog& operator=(CEventLog const&) = delete;
+ ~CEventLog() = default;
 
 Events Get() const;
 Events Get(EventLevel level, bool includeHigherLevels = false) const;
@@ -57,19 +57,11 @@
 
 bool Execute(const std::string& eventIdentifier);
 
- std::string EventLevelToString(EventLevel level);
- EventLevel EventLevelFromString(const std::string& level);
+ static std::string EventLevelToString(EventLevel level);
+ static EventLevel EventLevelFromString(const std::string& level);
 
 void ShowFullEventLog(EventLevel level = EventLevel::Basic, bool includeHigherLevels = true);
 
-protected:
- CEventLog() = default;
- CEventLog(const CEventLog&) = delete;
- CEventLog& operator=(CEventLog const&) = delete;
-
- // implementation of ISettingCallback
- void OnSettingAction(std::shared_ptr<const CSetting> setting) override;
-
 private:
 void SendMessage(const EventPtr& event, int message);
 
@@ -78,7 +70,4 @@
 EventsList m_events;
 EventsMap m_eventsMap;
 CCriticalSection m_critical;
-
- static std::map<int, std::unique_ptr<CEventLog> > s_eventLogs;
- static CCriticalSection s_critical;
 };

_service:download_files:master.tar.gz/xbmc/events/EventLogManager.cpp Added

@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 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 "EventLogManager.h"
+#include "EventLog.h"
+#include "threads/SingleLock.h"
+
+#include <utility>
+
+CEventLog& CEventLogManager::GetEventLog(unsigned int profileId)
+{
+ CSingleLock lock(m_eventMutex);
+
+ auto eventLog = m_eventLogs.find(profileId);
+ if (eventLog == m_eventLogs.end())
+ {
+ m_eventLogs.insert(std::make_pair(profileId, std::unique_ptr<CEventLog>(new CEventLog)));
+ eventLog = m_eventLogs.find(profileId);
+ }
+
+ return *eventLog->second;
+}

_service:download_files:master.tar.gz/xbmc/events/EventLogManager.h Added

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2018 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 "threads/CriticalSection.h"
+
+#include <map>
+#include <memory>
+
+class CEventLog;
+
+class CEventLogManager
+{
+public:
+ CEventLog &GetEventLog(unsigned int profileId);
+
+private:
+ std::map<unsigned int, std::unique_ptr<CEventLog>> m_eventLogs;
+ CCriticalSection m_eventMutex;
+};

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

@@ -55,7 +55,7 @@
     // check if we should clear all items
     if (iControl == CONTROL_BUTTON_CLEAR)
     {
-      CEventLog::GetInstance().Clear(CViewStateSettings::GetInstance().GetEventLevel(), CViewStateSettings::GetInstance().ShowHigherEventLevels());
+      CServiceBroker::GetEventLog().Clear(CViewStateSettings::GetInstance().GetEventLevel(), CViewStateSettings::GetInstance().ShowHigherEventLevels());
 
       // refresh the list
       Refresh(true);
@@ -153,7 +153,7 @@
   if (eventIdentifier.empty())
     return;
 
-  EventPtr eventPtr = CEventLog::GetInstance().Get(eventIdentifier);
+  EventPtr eventPtr = CServiceBroker::GetEventLog().Get(eventIdentifier);
   if (eventPtr == nullptr)
     return;
 
@@ -218,7 +218,7 @@
     if (!item->HasProperty(PROPERTY_EVENT_LEVEL))
       continue;
 
-    EventLevel level = CEventLog::GetInstance().EventLevelFromString(item->GetProperty(PROPERTY_EVENT_LEVEL).asString());
+    EventLevel level = CEventLog::EventLevelFromString(item->GetProperty(PROPERTY_EVENT_LEVEL).asString());
     if (level == currentLevel ||
       (level > currentLevel && showHigherLevels))
       filteredItems.Add(item);
@@ -248,7 +248,7 @@
   if (eventIdentifier.empty())
     return false;
 
-  CEventLog::GetInstance().Remove(eventIdentifier);
+  CServiceBroker::GetEventLog().Remove(eventIdentifier);
   return true;
 }
 
@@ -261,7 +261,7 @@
   if (eventIdentifier.empty())
     return false;
 
-  const EventPtr eventPtr = CEventLog::GetInstance().Get(eventIdentifier);
+  const EventPtr eventPtr = CServiceBroker::GetEventLog().Get(eventIdentifier);
   if (eventPtr == nullptr)
     return false;

_service:download_files:master.tar.gz/xbmc/favourites/GUIDialogFavourites.cpp Changed

_service:download_files:master.tar.gz/xbmc/favourites/GUIDialogFavourites.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/APKDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/APKDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/APKFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/APKFile.h Changed

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

_service:download_files:master.tar.gz/xbmc/filesystem/AddonsDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/AndroidAppDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/AndroidAppDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/AndroidAppFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/AndroidAppFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/BlurayDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/BlurayDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/BlurayFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/BlurayFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CDDADirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CDDADirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CDDAFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CDDAFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CacheStrategy.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CacheStrategy.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CircularCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/CircularCache.h Changed

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

@@ -156,6 +156,9 @@
     return ptr2;
 }
 
+static constexpr int CURL_OFF = 0L;
+static constexpr int CURL_ON = 1L;
+
 size_t CCurlFile::CReadState::HeaderCallback(void *ptr, size_t size, size_t nmemb)
 {
   std::string inString;
@@ -409,7 +412,6 @@
   Close();
   delete m_state;
   delete m_oldState;
-  g_curlInterface.Unload();
 }
 
 CCurlFile::CCurlFile()
@@ -419,7 +421,6 @@
  , m_overflowBuffer(NULL)
  , m_overflowSize(0)
 {
-  g_curlInterface.Load(); // loads the curl dll and resolves exports etc.
   m_opened = false;
   m_forWrite = false;
   m_inError = false;
@@ -480,9 +481,9 @@
   g_curlInterface.easy_setopt(h, CURLOPT_DEBUGFUNCTION, debug_callback);
 
   if( g_advancedSettings.m_logLevel >= LOG_LEVEL_DEBUG )
-    g_curlInterface.easy_setopt(h, CURLOPT_VERBOSE, TRUE);
+    g_curlInterface.easy_setopt(h, CURLOPT_VERBOSE, CURL_ON);
   else
-    g_curlInterface.easy_setopt(h, CURLOPT_VERBOSE, FALSE);
+    g_curlInterface.easy_setopt(h, CURLOPT_VERBOSE, CURL_OFF);
 
   g_curlInterface.easy_setopt(h, CURLOPT_WRITEDATA, state);
   g_curlInterface.easy_setopt(h, CURLOPT_WRITEFUNCTION, write_callback);
@@ -500,7 +501,7 @@
   // make sure headers are separated from the data stream
   g_curlInterface.easy_setopt(h, CURLOPT_WRITEHEADER, state);
   g_curlInterface.easy_setopt(h, CURLOPT_HEADERFUNCTION, header_callback);
-  g_curlInterface.easy_setopt(h, CURLOPT_HEADER, FALSE);
+  g_curlInterface.easy_setopt(h, CURLOPT_HEADER, CURL_OFF);
 
   g_curlInterface.easy_setopt(h, CURLOPT_FTP_USE_EPSV, 0); // turn off epsv
 
@@ -522,7 +523,7 @@
   // honored during the DNS lookup - which you can work around by building libcurl
   // with c-ares support. c-ares is a library that provides asynchronous name
   // resolves. Unfortunately, c-ares does not yet support IPv6.
-  g_curlInterface.easy_setopt(h, CURLOPT_NOSIGNAL, TRUE);
+  g_curlInterface.easy_setopt(h, CURLOPT_NOSIGNAL, CURL_ON);
 
   // not interested in failed requests
   g_curlInterface.easy_setopt(h, CURLOPT_FAILONERROR, 1);
@@ -539,7 +540,7 @@
   g_curlInterface.easy_setopt(h, CURLOPT_SSL_VERIFYHOST, 0);
 
   g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_URL, m_url.c_str());
-  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TRANSFERTEXT, FALSE);
+  g_curlInterface.easy_setopt(m_state->m_easyHandle, CURLOPT_TRANSFERTEXT, CURL_OFF);
 
   // setup POST data if it is set (and it may be empty)
   if (m_postdataset)
@@ -555,7 +556,7 @@
   else
   {
     g_curlInterface.easy_setopt(h, CURLOPT_REFERER, NULL);
-    g_curlInterface.easy_setopt(h, CURLOPT_AUTOREFERER, TRUE);
+    g_curlInterface.easy_setopt(h, CURLOPT_AUTOREFERER, CURL_ON);
   }
 
   // setup any requested authentication
@@ -912,7 +913,7 @@
   return true;
 }
 
-bool CCurlFile::Download(const std::string& strURL, const std::string& strFileName, LPDWORD pdwSize)
+bool CCurlFile::Download(const std::string& strURL, const std::string& strFileName, unsigned int* pdwSize)
 {
   CLog::Log(LOGINFO, "CCurlFile::Download - %s->%s", strURL.c_str(), strFileName.c_str());
 
@@ -990,12 +991,6 @@
 
 bool CCurlFile::Open(const CURL& url)
 {
-  if (!g_curlInterface.IsLoaded())
-  {
-    CLog::Log(LOGERROR, "CurlFile::Open: curl interface not loaded");
-    return false;
-  }
-
   m_opened = true;
   m_seekable = true;

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

_service:download_files:master.tar.gz/xbmc/filesystem/DAVCommon.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DAVCommon.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DAVDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DAVDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DAVFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DAVFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/Directorization.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/Directory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/Directory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryCache.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryFactory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryHistory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DirectoryHistory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/DllLibCurl.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -18,17 +18,18 @@
 *
 */
 
-#include "threads/SystemClock.h"
-#include "system.h"
 #include "DllLibCurl.h"
+
+#include "system.h"
 #include "threads/SingleLock.h"
+#include "threads/SystemClock.h"
 #include "utils/log.h"
 
 #include <assert.h>
 
 #ifdef HAVE_OPENSSL
-#include "threads/Thread.h"
 #include "openssl/crypto.h"
+#include "threads/Thread.h"
 
 static CCriticalSection** m_sslLockArray = NULL;
 
@@ -37,170 +38,228 @@
 {
 #endif
 
-void ssl_lock_callback(int mode, int type, char *file, int line)
+ void ssl_lock_callback(int mode, int type, char* file, int line)
+ {
+ if (!m_sslLockArray)
+ return;
+
+ if (mode & CRYPTO_LOCK)
+ m_sslLockArray[type]->lock();
+ else
+ m_sslLockArray[type]->unlock();
+ }
+
+ unsigned long ssl_thread_id() { return (unsigned long) CThread::GetCurrentThreadId(); }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // HAVE_OPENSSL
+
+namespace XCURL
+{
+CURLcode DllLibCurl::global_init(long flags)
 {
- if (!m_sslLockArray)
- return;
+ return curl_global_init(flags);
+}
 
- if (mode & CRYPTO_LOCK)
- m_sslLockArray[type]->lock();
- else
- m_sslLockArray[type]->unlock();
+void DllLibCurl::global_cleanup()
+{
+ curl_global_cleanup();
 }
 
-unsigned long ssl_thread_id(void)
+CURL_HANDLE* DllLibCurl::easy_init()
 {
- return (unsigned long)CThread::GetCurrentThreadId();
+ return curl_easy_init();
 }
 
-#ifdef __cplusplus
+CURLcode DllLibCurl::easy_perform(CURL_HANDLE* handle)
+{
+ return curl_easy_perform(handle);
 }
-#endif
 
-#endif // HAVE_OPENSSL
+CURLcode DllLibCurl::easy_pause(CURL_HANDLE* handle, int bitmask)
+{
+ return curl_easy_pause(handle, bitmask);
+}
 
-using namespace XCURL;
+void DllLibCurl::easy_reset(CURL_HANDLE* handle)
+{
+ curl_easy_reset(handle);
+}
 
-/* okey this is damn ugly. our dll loader doesn't allow for postload, preunload functions */
-static long g_curlReferences = 0;
-#if(0)
-static unsigned int g_curlTimeout = 0;
-#endif
+void DllLibCurl::easy_cleanup(CURL_HANDLE* handle)
+{
+ curl_easy_cleanup(handle);
+}
 
-bool DllLibCurlGlobal::Load()
+CURL_HANDLE* DllLibCurl::easy_duphandle(CURL_HANDLE* handle)
 {
- CSingleLock lock(m_critSection);
- if(g_curlReferences > 0)
- {
- g_curlReferences++;
- return true;
- }
+ return curl_easy_duphandle(handle);
+}
 
- /* we handle this ourself */
- DllDynamic::EnableDelayedUnload(false);
- if (!DllDynamic::Load())
- return false;
+CURLM* DllLibCurl::multi_init()
+{
+ return curl_multi_init();
+}
+
+CURLMcode DllLibCurl::multi_add_handle(CURLM* multi_handle, CURL_HANDLE* easy_handle)
+{
+ return curl_multi_add_handle(multi_handle, easy_handle);
+}
+
+CURLMcode DllLibCurl::multi_perform(CURLM* multi_handle, int* running_handles)
+{
+ return curl_multi_perform(multi_handle, running_handles);
+}
 
- if (global_init(CURL_GLOBAL_ALL))
+CURLMcode DllLibCurl::multi_remove_handle(CURLM* multi_handle, CURL_HANDLE* easy_handle)
+{
+ return curl_multi_remove_handle(multi_handle, easy_handle);
+}
+
+CURLMcode DllLibCurl::multi_fdset(
+ CURLM* multi_handle, fd_set* read_fd_set, fd_set* write_fd_set, fd_set* exc_fd_set, int* max_fd)
+{
+ return curl_multi_fdset(multi_handle, read_fd_set, write_fd_set, exc_fd_set, max_fd);
+}
+
+CURLMcode DllLibCurl::multi_timeout(CURLM* multi_handle, long* timeout)
+{
+ return curl_multi_timeout(multi_handle, timeout);
+}
+
+CURLMsg* DllLibCurl::multi_info_read(CURLM* multi_handle, int* msgs_in_queue)
+{
+ return curl_multi_info_read(multi_handle, msgs_in_queue);
+}
+
+CURLMcode DllLibCurl::multi_cleanup(CURLM* handle)
+{
+ return curl_multi_cleanup(handle);
+}
+
+curl_slist* DllLibCurl::slist_append(curl_slist* list, const char* to_append)
+{
+ return curl_slist_append(list, to_append);
+}
+
+void DllLibCurl::slist_free_all(curl_slist* list)
+{
+ curl_slist_free_all(list);
+}
+
+const char* DllLibCurl::easy_strerror(CURLcode code)
+{
+ return curl_easy_strerror(code);
+}
+
+#if defined(HAS_CURL_STATIC)
+void DllLibCurl::crypto_set_id_callback(unsigned long (*cb)())
+{
+ CRYPTO_set_id_callback(cb);
+}
+void DllLibCurl::crypto_set_locking_callback(void (*cb)(int, int, const char*, int))
+{
+ CRYPTO_set_locking_callback(cb);
+}
+#endif
+
+DllLibCurlGlobal::DllLibCurlGlobal()
+{
+ /* we handle this ourself */
+ if (curl_global_init(CURL_GLOBAL_ALL))
 {
- DllDynamic::Unload();
 CLog::Log(LOGERROR, "Error initializing libcurl");
- return false;
 }
 
- /* check idle will clean up the last one */
- g_curlReferences = 2;
-
 #if defined(HAS_CURL_STATIC)
 // Initialize ssl locking array
 m_sslLockArray = new CCriticalSection*[CRYPTO_num_locks()];
- for (int i=0; i<CRYPTO_num_locks(); i++)
- m_sslLockArray[i] = new CCriticalSection; 
- 
+ for (int i = 0; i < CRYPTO_num_locks(); i++)
+ m_sslLockArray[i] = new CCriticalSection;
+
 crypto_set_id_callback((unsigned long (*)())ssl_thread_id);
 crypto_set_locking_callback((void (*)(int, int, const char*, int))ssl_lock_callback);
 #endif
-
- return true;
 }
 
-void DllLibCurlGlobal::Unload()
+DllLibCurlGlobal::~DllLibCurlGlobal()
 {
- CSingleLock lock(m_critSection);
- if (--g_curlReferences == 0)
- {
- if (!IsLoaded())
- return;
-
- // close libcurl
- global_cleanup();
+ // close libcurl
+ curl_global_cleanup();
 
 #if defined(HAS_CURL_STATIC)
- // Cleanup ssl locking array
- crypto_set_id_callback(NULL);
- crypto_set_locking_callback(NULL);
- for (int i=0; i<CRYPTO_num_locks(); i++)
- delete m_sslLockArray[i];
- 
- delete[] m_sslLockArray;
-#endif
- 
- DllDynamic::Unload();
- }
+ // Cleanup ssl locking array
+ crypto_set_id_callback(NULL);
+ crypto_set_locking_callback(NULL);
+ for (int i = 0; i < CRYPTO_num_locks(); i++)
+ delete m_sslLockArray[i];
 
- /* CheckIdle will clear this one up */
-#if(0)
- if(g_curlReferences == 1)
- g_curlTimeout = XbmcThreads::SystemClockMillis();
+ delete[] m_sslLockArray;
 #endif
 }
 
 void DllLibCurlGlobal::CheckIdle()
 {
- /* avoid locking section here, to avoid stalling gfx thread on loads*/
- if(g_curlReferences == 0)
- return;
-
 CSingleLock lock(m_critSection);
 /* 20 seconds idle time before closing handle */
 const unsigned int idletime = 30000;
 
 VEC_CURLSESSIONS::iterator it = m_sessions.begin();
- while(it != m_sessions.end())
+ while (it != m_sessions.end())
 {
- if( !it->m_busy && (XbmcThreads::SystemClockMillis() - it->m_idletimestamp) > idletime )
+ if (!it->m_busy && (XbmcThreads::SystemClockMillis() - it->m_idletimestamp) > idletime)
 {
- CLog::Log(LOGINFO, "%s - Closing session to %s://%s (easy=%p, multi=%p)\n", __FUNCTION__, it->m_protocol.c_str(), it->m_hostname.c_str(), (void*)it->m_easy, (void*)it->m_multi);
+ CLog::Log(LOGINFO, "%s - Closing session to %s://%s (easy=%p, multi=%p)\n", __FUNCTION__,
+ it->m_protocol.c_str(), it->m_hostname.c_str(), static_cast<void*>(it->m_easy),
+ static_cast<void*>(it->m_multi));
 
- if(it->m_multi && it->m_easy)
+ if (it->m_multi && it->m_easy)
 multi_remove_handle(it->m_multi, it->m_easy);
- if(it->m_easy)
+ if (it->m_easy)
 easy_cleanup(it->m_easy);
- if(it->m_multi)
+ if (it->m_multi)
 multi_cleanup(it->m_multi);
 
- Unload();
-
 it = m_sessions.erase(it);
 continue;
 }
 ++it;
 }
-
- /* check if we should unload the dll */
-#if(0) // we never unload libcurl, since libssl can break when python unloads then
- if(g_curlReferences == 1 && XbmcThreads::SystemClockMillis() - g_curlTimeout > idletime)
- Unload();
-#endif
 }
 
-void DllLibCurlGlobal::easy_acquire(const char *protocol, const char *hostname, CURL_HANDLE** easy_handle, CURLM** multi_handle)
+void DllLibCurlGlobal::easy_acquire(const char* protocol,
+ const char* hostname,
+ CURL_HANDLE** easy_handle,
+ CURLM** multi_handle)
 {
 assert(easy_handle != NULL);
 
 CSingleLock lock(m_critSection);
 
 VEC_CURLSESSIONS::iterator it;
- for(it = m_sessions.begin(); it != m_sessions.end(); ++it)
+ for (it = m_sessions.begin(); it != m_sessions.end(); ++it)
 {
- if( !it->m_busy )
+ if (!it->m_busy)
 {
 /* allow reuse of requester is trying to connect to same host */
 /* curl will take care of any differences in username/password */
- if( it->m_protocol.compare(protocol) == 0 && it->m_hostname.compare(hostname) == 0)
+ if (it->m_protocol.compare(protocol) == 0 && it->m_hostname.compare(hostname) == 0)
 {
 it->m_busy = true;
- if(easy_handle)
+ if (easy_handle)
 {
- if(!it->m_easy)
+ if (!it->m_easy)
 it->m_easy = easy_init();
 
 *easy_handle = it->m_easy;
 }
 
- if(multi_handle)
+ if (multi_handle)
 {
- if(!it->m_multi)
+ if (!it->m_multi)
 it->m_multi = multi_init();
 
 *multi_handle = it->m_multi;
@@ -216,16 +275,13 @@
 session.m_protocol = protocol;
 session.m_hostname = hostname;
 
- /* count up global interface counter */
- Load();
-
- if(easy_handle)
+ if (easy_handle)
 {
 session.m_easy = easy_init();
 *easy_handle = session.m_easy;
 }
 
- if(multi_handle)
+ if (multi_handle)
 {
 session.m_multi = multi_init();
 *multi_handle = session.m_multi;
@@ -233,11 +289,9 @@
 
 m_sessions.push_back(session);
 
-
 CLog::Log(LOGINFO, "%s - Created session to %s://%s\n", __FUNCTION__, protocol, hostname);
 
 return;
-
 }
 
 void DllLibCurlGlobal::easy_release(CURL_HANDLE** easy_handle, CURLM** multi_handle)
@@ -245,24 +299,24 @@
 CSingleLock lock(m_critSection);
 
 CURL_HANDLE* easy = NULL;
- CURLM* multi = NULL;
+ CURLM* multi = NULL;
 
- if(easy_handle)
+ if (easy_handle)
 {
 easy = *easy_handle;
 *easy_handle = NULL;
 }
 
- if(multi_handle)
+ if (multi_handle)
 {
 multi = *multi_handle;
 *multi_handle = NULL;
 }
 
 VEC_CURLSESSIONS::iterator it;
- for(it = m_sessions.begin(); it != m_sessions.end(); ++it)
+ for (it = m_sessions.begin(); it != m_sessions.end(); ++it)
 {
- if( it->m_easy == easy && (multi == NULL || it->m_multi == multi) )
+ if (it->m_easy == easy && (multi == NULL || it->m_multi == multi))
 {
 /* reset session so next caller doesn't reuse options, only connections */
 /* will reset verbose too so it won't print that it closed connections on cleanup*/
@@ -279,13 +333,12 @@
 CSingleLock lock(m_critSection);
 
 VEC_CURLSESSIONS::iterator it;
- for(it = m_sessions.begin(); it != m_sessions.end(); ++it)
+ for (it = m_sessions.begin(); it != m_sessions.end(); ++it)
 {
- if( it->m_easy == easy_handle )
+ if (it->m_easy == easy_handle)
 {
 SSession session = *it;
 session.m_easy = DllLibCurl::easy_duphandle(easy_handle);
- Load();
 m_sessions.push_back(session);
 return session.m_easy;
 }
@@ -293,36 +346,39 @@
 return DllLibCurl::easy_duphandle(easy_handle);
 }
 
-void DllLibCurlGlobal::easy_duplicate(CURL_HANDLE* easy, CURLM* multi, CURL_HANDLE** easy_out, CURLM** multi_out)
+void DllLibCurlGlobal::easy_duplicate(CURL_HANDLE* easy,
+ CURLM* multi,
+ CURL_HANDLE** easy_out,
+ CURLM** multi_out)
 {
 CSingleLock lock(m_critSection);
 
- if(easy_out && easy)
+ if (easy_out && easy)
 *easy_out = DllLibCurl::easy_duphandle(easy);
 
- if(multi_out && multi)
+ if (multi_out && multi)
 *multi_out = DllLibCurl::multi_init();
 
 VEC_CURLSESSIONS::iterator it;
- for(it = m_sessions.begin(); it != m_sessions.end(); ++it)
+ for (it = m_sessions.begin(); it != m_sessions.end(); ++it)
 {
- if( it->m_easy == easy )
+ if (it->m_easy == easy)
 {
 SSession session = *it;
- if(easy_out && easy)
+ if (easy_out && easy)
 session.m_easy = *easy_out;
 else
 session.m_easy = NULL;
 
- if(multi_out && multi)
+ if (multi_out && multi)
 session.m_multi = *multi_out;
 else
 session.m_multi = NULL;
 
- Load();
 m_sessions.push_back(session);
 return;
 }
 }
 return;
 }
+} // namespace XCURL

_service:download_files:master.tar.gz/xbmc/filesystem/DllLibCurl.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,137 +19,97 @@
 *
 */
 
-#include "DynamicDll.h"
 #include "threads/CriticalSection.h"
+
 #include <stdio.h>
+#include <string>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <type_traits>
 #include <vector>
 
 /* put types of curl in namespace to avoid namespace pollution */
 namespace XCURL
 {
- #define CURL CURL_HANDLE
- #include <curl/curl.h>
- #undef CURL
+#define CURL CURL_HANDLE
+#include <curl/curl.h>
+#undef CURL
 
- class DllLibCurlInterface
+class DllLibCurl
+{
+public:
+ CURLcode global_init(long flags);
+ void global_cleanup();
+ CURL_HANDLE* easy_init();
+ template<typename... Args>
+ CURLcode easy_setopt(CURL_HANDLE* handle, CURLoption option, Args... args)
 {
- public:
- virtual ~DllLibCurlInterface() = default;
- virtual CURLcode global_init(long flags)=0;
- virtual void global_cleanup(void)=0;
- virtual CURL_HANDLE * easy_init(void)=0;
- //virtual CURLcode easy_setopt(CURL_HANDLE *handle, CURLoption option, ...)=0;
- virtual CURLcode easy_perform(CURL_HANDLE * handle )=0;
- virtual CURLcode easy_pause(CURL_HANDLE * handle, int bitmask )=0;
- virtual void easy_reset(CURL_HANDLE * handle)=0;
- //virtual CURLcode easy_getinfo(CURL_HANDLE *curl, CURLINFO info, ... )=0;
- virtual void easy_cleanup(CURL_HANDLE * handle )=0;
- virtual CURL_HANDLE *easy_duphandle(CURL_HANDLE *handle )=0;
- virtual CURLM * multi_init(void)=0;
- virtual CURLMcode multi_add_handle(CURLM *multi_handle, CURL_HANDLE *easy_handle)=0;
- virtual CURLMcode multi_perform(CURLM *multi_handle, int *running_handles)=0;
- virtual CURLMcode multi_remove_handle(CURLM *multi_handle, CURL_HANDLE *easy_handle)=0;
- virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0;
- virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0;
- virtual CURLMsg* multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0;
- virtual CURLMcode multi_cleanup(CURLM * handle )=0;
- virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0;
- virtual void slist_free_all(struct curl_slist *)=0;
- virtual const char* easy_strerror(CURLcode)=0;
-#if defined(HAS_CURL_STATIC)
- virtual void crypto_set_id_callback(unsigned long (*)(void))=0;
- virtual void crypto_set_locking_callback(void (*)(int, int, const char*, int))=0;
-#endif
- };
-
- class DllLibCurl : public DllDynamic, DllLibCurlInterface
+ return curl_easy_setopt(handle, option, std::forward<Args>(args)...);
+ }
+ CURLcode easy_perform(CURL_HANDLE* handle);
+ CURLcode easy_pause(CURL_HANDLE* handle, int bitmask);
+ void easy_reset(CURL_HANDLE* handle);
+ template<typename... Args>
+ CURLcode easy_getinfo(CURL_HANDLE* curl, CURLINFO info, Args... args)
 {
- DECLARE_DLL_WRAPPER(DllLibCurl, DLL_PATH_LIBCURL)
- DEFINE_METHOD1(CURLcode, global_init, (long p1))
- DEFINE_METHOD0(void, global_cleanup)
- DEFINE_METHOD0(CURL_HANDLE *, easy_init)
- DEFINE_METHOD_FP(CURLcode, easy_setopt, (CURL_HANDLE *p1, CURLoption p2, ...))
- DEFINE_METHOD1(CURLcode, easy_perform, (CURL_HANDLE * p1 ))
- DEFINE_METHOD2(CURLcode, easy_pause, (CURL_HANDLE * p1, int p2 ))
- DEFINE_METHOD1(void, easy_reset, (CURL_HANDLE * p1 ))
- DEFINE_METHOD_FP(CURLcode, easy_getinfo, (CURL_HANDLE *p1, CURLINFO p2, ... ))
- DEFINE_METHOD1(void, easy_cleanup, (CURL_HANDLE * p1))
- DEFINE_METHOD1(CURL_HANDLE *, easy_duphandle, (CURL_HANDLE * p1))
- DEFINE_METHOD0(CURLM *, multi_init)
- DEFINE_METHOD2(CURLMcode, multi_add_handle, (CURLM *p1, CURL_HANDLE *p2))
- DEFINE_METHOD2(CURLMcode, multi_perform, (CURLM *p1, int *p2))
- DEFINE_METHOD2(CURLMcode, multi_remove_handle, (CURLM *p1, CURL_HANDLE *p2))
- DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5))
- DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2))
- DEFINE_METHOD2(CURLMsg*, multi_info_read, (CURLM *p1, int *p2))
- DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1))
- DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2))
- DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1))
- DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1))
+ return curl_easy_getinfo(curl, info, std::forward<Args>(args)...);
+ }
+ void easy_cleanup(CURL_HANDLE* handle);
+ virtual CURL_HANDLE* easy_duphandle(CURL_HANDLE* handle);
+ CURLM* multi_init(void);
+ CURLMcode multi_add_handle(CURLM* multi_handle, CURL_HANDLE* easy_handle);
+ CURLMcode multi_perform(CURLM* multi_handle, int* running_handles);
+ CURLMcode multi_remove_handle(CURLM* multi_handle, CURL_HANDLE* easy_handle);
+ CURLMcode multi_fdset(CURLM* multi_handle,
+ fd_set* read_fd_set,
+ fd_set* write_fd_set,
+ fd_set* exc_fd_set,
+ int* max_fd);
+ CURLMcode multi_timeout(CURLM* multi_handle, long* timeout);
+ CURLMsg* multi_info_read(CURLM* multi_handle, int* msgs_in_queue);
+ CURLMcode multi_cleanup(CURLM* handle);
+ struct curl_slist* slist_append(struct curl_slist* list, const char* to_append);
+ void slist_free_all(struct curl_slist* list);
+ const char* easy_strerror(CURLcode code);
 #if defined(HAS_CURL_STATIC)
- DEFINE_METHOD1(void, crypto_set_id_callback, (unsigned long (*p1)(void)))
- DEFINE_METHOD1(void, crypto_set_locking_callback, (void (*p1)(int, int, const char *, int)))
+ void crypto_set_id_callback(unsigned long (*cb)(void));
+ void crypto_set_locking_callback(void (*cb)(int, int, const char*, int));
 #endif
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(curl_global_init, global_init)
- RESOLVE_METHOD_RENAME(curl_global_cleanup, global_cleanup)
- RESOLVE_METHOD_RENAME(curl_easy_init, easy_init)
- RESOLVE_METHOD_RENAME(curl_easy_strerror, easy_strerror)
- RESOLVE_METHOD_RENAME_FP(curl_easy_setopt, easy_setopt)
- RESOLVE_METHOD_RENAME(curl_easy_perform, easy_perform)
- RESOLVE_METHOD_RENAME(curl_easy_pause, easy_pause)
- RESOLVE_METHOD_RENAME(curl_easy_reset, easy_reset)
- RESOLVE_METHOD_RENAME_FP(curl_easy_getinfo, easy_getinfo)
- RESOLVE_METHOD_RENAME(curl_easy_cleanup, easy_cleanup)
- RESOLVE_METHOD_RENAME(curl_easy_duphandle, easy_duphandle)
- RESOLVE_METHOD_RENAME(curl_multi_init, multi_init)
- RESOLVE_METHOD_RENAME(curl_multi_add_handle, multi_add_handle)
- RESOLVE_METHOD_RENAME(curl_multi_perform, multi_perform)
- RESOLVE_METHOD_RENAME(curl_multi_remove_handle, multi_remove_handle)
- RESOLVE_METHOD_RENAME(curl_multi_fdset, multi_fdset)
- RESOLVE_METHOD_RENAME(curl_multi_timeout, multi_timeout)
- RESOLVE_METHOD_RENAME(curl_multi_info_read, multi_info_read)
- RESOLVE_METHOD_RENAME(curl_multi_cleanup, multi_cleanup)
- RESOLVE_METHOD_RENAME(curl_slist_append, slist_append)
- RESOLVE_METHOD_RENAME(curl_slist_free_all, slist_free_all)
-#if defined(HAS_CURL_STATIC)
- RESOLVE_METHOD_RENAME(CRYPTO_set_id_callback, crypto_set_id_callback)
- RESOLVE_METHOD_RENAME(CRYPTO_set_locking_callback, crypto_set_locking_callback)
-#endif
- END_METHOD_RESOLVE()
-
- };
+};
 
- class DllLibCurlGlobal : public DllLibCurl
- {
- public:
- /* extend interface with buffered functions */
- void easy_acquire(const char *protocol, const char *hostname, CURL_HANDLE** easy_handle, CURLM** multi_handle);
- void easy_release(CURL_HANDLE** easy_handle, CURLM** multi_handle);
- void easy_duplicate(CURL_HANDLE* easy, CURLM* multi, CURL_HANDLE** easy_out, CURLM** multi_out);
- CURL_HANDLE* easy_duphandle(CURL_HANDLE* easy_handle) override;
- void CheckIdle();
+class DllLibCurlGlobal : public DllLibCurl
+{
+public:
+ DllLibCurlGlobal();
+ ~DllLibCurlGlobal();
+ /* extend interface with buffered functions */
+ void easy_acquire(const char* protocol,
+ const char* hostname,
+ CURL_HANDLE** easy_handle,
+ CURLM** multi_handle);
+ void easy_release(CURL_HANDLE** easy_handle, CURLM** multi_handle);
+ void easy_duplicate(CURL_HANDLE* easy, CURLM* multi, CURL_HANDLE** easy_out, CURLM** multi_out);
+ CURL_HANDLE* easy_duphandle(CURL_HANDLE* easy_handle) override;
+ void CheckIdle();
 
- /* overloaded load and unload with reference counter */
- bool Load() override;
- void Unload() override;
+ /* overloaded load and unload with reference counter */
 
- /* structure holding a session info */
- typedef struct SSession
- {
- unsigned int m_idletimestamp; // timestamp of when this object when idle
- std::string m_protocol;
- std::string m_hostname;
- bool m_busy;
- CURL_HANDLE* m_easy;
- CURLM* m_multi;
- } SSession;
+ /* structure holding a session info */
+ typedef struct SSession
+ {
+ unsigned int m_idletimestamp; // timestamp of when this object when idle
+ std::string m_protocol;
+ std::string m_hostname;
+ bool m_busy;
+ CURL_HANDLE* m_easy;
+ CURLM* m_multi;
+ } SSession;
 
- typedef std::vector<SSession> VEC_CURLSESSIONS;
+ typedef std::vector<SSession> VEC_CURLSESSIONS;
 
- VEC_CURLSESSIONS m_sessions;
- CCriticalSection m_critSection;
- };
-}
+ VEC_CURLSESSIONS m_sessions;
+ CCriticalSection m_critSection;
+};
+} // namespace XCURL
 
 extern XCURL::DllLibCurlGlobal g_curlInterface;

_service:download_files:master.tar.gz/xbmc/filesystem/DllLibNfs.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/EventsDirectory.cpp Changed

@@ -23,6 +23,7 @@
 #include "URL.h"
 #include "events/EventLog.h"
 #include "utils/StringUtils.h"
+#include "ServiceBroker.h"
 
 using namespace XFILE;
 
@@ -31,7 +32,7 @@
   items.ClearProperties();
   items.SetContent("events");
 
-  CEventLog& log = CEventLog::GetInstance();
+  CEventLog& log = CServiceBroker::GetEventLog();
   Events events;
 
   std::string hostname = url.GetHostName();
@@ -50,7 +51,7 @@
       hostname = hostname.substr(0, hostname.size() - 1);
     }
 
-    EventLevel level = CEventLog::GetInstance().EventLevelFromString(hostname);
+    EventLevel level = CEventLog::EventLevelFromString(hostname);
 
     // get the events of the specified level(s)
     events = log.Get(level, includeHigherLevels);
@@ -70,7 +71,7 @@
   CFileItemPtr item(new CFileItem(eventItem));
 
   item->SetProperty(PROPERTY_EVENT_IDENTIFIER, eventItem->GetIdentifier());
-  item->SetProperty(PROPERTY_EVENT_LEVEL, CEventLog::GetInstance().EventLevelToString(eventItem->GetLevel()));
+  item->SetProperty(PROPERTY_EVENT_LEVEL, CEventLog::EventLevelToString(eventItem->GetLevel()));
   item->SetProperty(PROPERTY_EVENT_DESCRIPTION, eventItem->GetDescription());
 
   return item;

_service:download_files:master.tar.gz/xbmc/filesystem/FTPDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FTPDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FTPParse.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FTPParse.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FavouritesDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FavouritesDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/File.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/File.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FileCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/FileCache.h Changed

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

_service:download_files:master.tar.gz/xbmc/filesystem/FileDirectoryFactory.h Changed

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

_service:download_files:master.tar.gz/xbmc/filesystem/FileFactory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/HTTPDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/HTTPDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IFileDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/IFileTypes.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ISO9660Directory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ISO9660Directory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ISOFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ISOFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ImageFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ImageFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/LibraryDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/LibraryDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MultiPathDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MultiPathFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MultiPathFile.h Changed

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

_service:download_files:master.tar.gz/xbmc/filesystem/MusicDatabaseFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MusicDatabaseFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MusicFileDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MusicFileDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MusicSearchDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/MusicSearchDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/NFSDirectory.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2011-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -158,9 +158,9 @@
 dirent->inode = tmpBuffer.st_ino;
 dirent->mode = tmpBuffer.st_mode;
 dirent->size = tmpBuffer.st_size;
- dirent->atime.tv_sec = tmpBuffer.st_atime;
- dirent->mtime.tv_sec = tmpBuffer.st_mtime;
- dirent->ctime.tv_sec = tmpBuffer.st_ctime;
+ dirent->atime.tv_sec = static_cast<long>(tmpBuffer.st_atime);
+ dirent->mtime.tv_sec = static_cast<long>(tmpBuffer.st_mtime);
+ dirent->ctime.tv_sec = static_cast<long>(tmpBuffer.st_ctime);
 
 //map stat mode to nf3type
 if(S_ISBLK(tmpBuffer.st_mode)){ dirent->type = NF3BLK; }
@@ -256,7 +256,9 @@
 lTimeDate = tmpDirent.ctime.tv_sec;
 }
 
- LONGLONG ll = Int32x32To64(lTimeDate & 0xffffffff, 10000000) + 116444736000000000ll;
+ long long ll = lTimeDate & 0xffffffff;
+ ll *= 10000000ll;
+ ll += 116444736000000000ll;
 fileTime.dwLowDateTime = (DWORD) (ll & 0xffffffff);
 fileTime.dwHighDateTime = (DWORD)(ll >> 32);
 FileTimeToLocalFileTime(&fileTime, &localTime);

_service:download_files:master.tar.gz/xbmc/filesystem/NFSDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/NFSFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/NFSFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/OverrideDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/OverrideDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/OverrideFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/OverrideFile.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/filesystem/PipeFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PipeFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PipesManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PlaylistDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PlaylistDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PlaylistFileDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PlaylistFileDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PluginDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/PluginDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/RSSDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/RSSDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ResourceDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ResourceDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ResourceFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ResourceFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SFTPDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SFTPDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SFTPFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SFTPFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SMBDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SMBDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SMBFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SMBFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ShoutcastFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ShoutcastFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SmartPlaylistDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SmartPlaylistDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SourcesDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SourcesDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocol.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -35,6 +35,18 @@
 #include "utils/StringUtils.h"
 #endif
 
+const CProfilesManager *CSpecialProtocol::m_profileManager = nullptr;
+
+void CSpecialProtocol::RegisterProfileManager(const CProfilesManager &profileManager)
+{
+  m_profileManager = &profileManager;
+}
+
+void CSpecialProtocol::UnregisterProfileManager()
+{
+  m_profileManager = nullptr;
+}
+
 void CSpecialProtocol::SetProfilePath(const std::string &dir)
 {
   SetPath("profile", dir);
@@ -149,12 +161,12 @@
 
   if (RootDir == "subtitles")
     translatedPath = URIUtils::AddFileToFolder(CServiceBroker::GetSettings().GetString(CSettings::SETTING_SUBTITLES_CUSTOMPATH), FileName);
-  else if (RootDir == "userdata")
-    translatedPath = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetUserDataFolder(), FileName);
-  else if (RootDir == "database")
-    translatedPath = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetDatabaseFolder(), FileName);
-  else if (RootDir == "thumbnails")
-    translatedPath = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetThumbnailsFolder(), FileName);
+  else if (RootDir == "userdata" && m_profileManager)
+    translatedPath = URIUtils::AddFileToFolder(m_profileManager->GetUserDataFolder(), FileName);
+  else if (RootDir == "database" && m_profileManager)
+    translatedPath = URIUtils::AddFileToFolder(m_profileManager->GetDatabaseFolder(), FileName);
+  else if (RootDir == "thumbnails" && m_profileManager)
+    translatedPath = URIUtils::AddFileToFolder(m_profileManager->GetThumbnailsFolder(), FileName);
   else if (RootDir == "recordings" || RootDir == "cdrips")
     translatedPath = URIUtils::AddFileToFolder(CServiceBroker::GetSettings().GetString(CSettings::SETTING_AUDIOCDS_RECORDINGPATH), FileName);
   else if (RootDir == "screenshots")

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocol.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,6 +22,8 @@
 #include <map>
 #include <string>
 
+class CProfilesManager;
+
 // static class for path translation from our special:// URLs.
 
 /* paths are as follows:
@@ -53,6 +55,9 @@
 class CSpecialProtocol
 {
 public:
+ static void RegisterProfileManager(const CProfilesManager &profileManager);
+ static void UnregisterProfileManager();
+
 static void SetProfilePath(const std::string &path);
 static void SetXBMCPath(const std::string &path);
 static void SetXBMCBinPath(const std::string &path);
@@ -74,6 +79,8 @@
 static std::string TranslatePathConvertCase(const std::string& path);
 
 private:
+ static const CProfilesManager *m_profileManager;
+
 static void SetPath(const std::string &key, const std::string &path);
 static std::string GetPath(const std::string &key);

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocolDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocolDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocolFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/SpecialProtocolFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/StackDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/StackDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UDFDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UDFDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UDFFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UPnPDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UPnPDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UPnPFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/UPnPFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VideoDatabaseDirectory/QueryParams.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VirtualDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/VirtualDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/XbtManager.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZeroconfDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZeroconfDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZipDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZipDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZipFile.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -372,76 +372,6 @@
 
 mFile.Close();
 }
-/* CHANGED: JM - moved to CFile
-bool CZipFile::ReadString(char* szLine, int iLineLength)
-{
- if (!m_szStringBuffer)
- {
- m_szStringBuffer = new char[1024]; // 1024 byte long strings per read
- m_szStartOfStringBuffer = m_szStringBuffer;
- m_iDataInStringBuffer = 0;
- m_iRead = 0;
- }
-
- bool bEof = m_iDataInStringBuffer==0;
- while ((iLineLength > 1) && (m_iRead > -1))
- {
- if (m_iDataInStringBuffer > 0)
- {
- bEof = false;
- m_iRead = 1;
- int iMax = (iLineLength<m_iDataInStringBuffer?iLineLength-1:m_iDataInStringBuffer-1);
- for( int i=0;i<iMax;++i )
- {
- if (m_szStartOfStringBuffer[i] == '\r') // mac or win32 endings
- {
- strncpy(szLine,m_szStartOfStringBuffer,i);
- szLine[i] = '\0';
- m_iDataInStringBuffer -= i+1;
- m_szStartOfStringBuffer += i+1;
- if( m_szStartOfStringBuffer[0] == '\n') // win32 endings
- {
- m_szStartOfStringBuffer++;
- m_iDataInStringBuffer--;
- }
- return true;
- }
- else if (m_szStartOfStringBuffer[i] == '\n') // unix or fucked up win32 endings
- {
- strncpy(szLine,m_szStartOfStringBuffer,i);
- szLine[i] = '\0';
- m_iDataInStringBuffer -= i+1;
- m_szStartOfStringBuffer += i+1;
- if (m_szStartOfStringBuffer[0] == '\r')
- {
- m_szStartOfStringBuffer++;
- m_iDataInStringBuffer--;
- }
- return true;
- }
- }
- strncpy(szLine,m_szStartOfStringBuffer,iMax);
- szLine += iMax;
- iLineLength -= iMax;
- m_iDataInStringBuffer -= iMax;
- }
-
- if (m_iRead == 1 && (m_iDataInStringBuffer == 1))
- {
- m_szStringBuffer[0] = m_szStringBuffer[1023]; // need to make sure we don't loose any '\r\n' between buffers
- m_iDataInStringBuffer = Read(m_szStringBuffer+1,1023);
- }
- else
- m_iDataInStringBuffer = Read(m_szStringBuffer,1024);
- m_szStartOfStringBuffer = m_szStringBuffer;
- if (m_iDataInStringBuffer)
- m_iRead = 1;
- else
- m_iRead = -1;
- }
- szLine[0] = '\0';
- return !bEof;
-}*/
 
 bool CZipFile::FillBuffer()
 {

_service:download_files:master.tar.gz/xbmc/filesystem/ZipFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZipManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/ZipManager.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/iso9660.cpp Changed

@@ -1,7 +1,7 @@
 /*
 * Copyright (C) 2003 by The Joker / Avalaunch team
 * Copyright (C) 2003-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -141,7 +141,7 @@
 DWORD iso9660searchpointer;
 struct iso9660_Directory isodir;
 struct iso9660_Directory curr_dir;
- WORD wSectorSize = from_723(m_info.iso.logical_block_size);
+ unsigned short wSectorSize = from_723(m_info.iso.logical_block_size);
 
 
 struct iso_directories *point = m_lastpath;
@@ -489,7 +489,7 @@
 m_info.HeaderPos = 0x8000;
 int current = 0x8000;
 
- WORD wSectorSize = from_723(m_info.iso.logical_block_size);
+ unsigned short wSectorSize = from_723(m_info.iso.logical_block_size);
 
 // first check if first file in the current VD has a rock-ridge NM. if it has, disable joliet
 iso9660_Directory *dirPointer = reinterpret_cast<iso9660_Directory*>(&m_info.iso.szRootDir);
@@ -708,7 +708,7 @@
 
 
 //******************************************************************************************************************
-std::string iso9660::GetThinText(BYTE* strTxt, int iLen )
+std::string iso9660::GetThinText(unsigned char* strTxt, int iLen )
 {
 // convert from "fat" text (UTF-16BE) to "thin" text (UTF-8)
 std::u16string strTxtUnicode((char16_t*)strTxt, iLen / 2);
@@ -1059,8 +1059,7 @@
 //************************************************************************************
 void iso9660::IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, FILETIME* filetime)
 {
- tm t;
- ZeroMemory(&t, sizeof(tm));
+ tm t = { 0 };
 t.tm_year=isoDateTime->year;
 t.tm_mon=isoDateTime->month-1;
 t.tm_mday=isoDateTime->day;

_service:download_files:master.tar.gz/xbmc/filesystem/iso9660.h Changed

@@ -1,7 +1,7 @@
 /*
  *      Copyright (C) 2003 by The Joker / Avalaunch team
  *      Copyright (C) 2003-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -47,10 +47,10 @@
   DWORD dwTotalSectorsLE;       //80-83
   DWORD dwTotalSectorsBE;       //84-87
   unsigned char byZero3[32];         //88-119
-  WORD wVolumeSetSizeLE;       //120-121
-  WORD wVolumeSetSizeBE;       //122-123
-  WORD wVolumeSequenceNumberLE;   //124-125
-  WORD wVolumeSequenceNumberBE;   //126-127
+  unsigned short wVolumeSetSizeLE;       //120-121
+  unsigned short wVolumeSetSizeBE;       //122-123
+  unsigned short wVolumeSequenceNumberLE;   //124-125
+  unsigned short wVolumeSequenceNumberBE;   //126-127
   iso723_t logical_block_size;    // sector size, e.g. 2048 (128-129 LE - 130-131 BE)
   DWORD dwPathTableLengthLE;     //132-135
   DWORD dwPathTableLengthBE;     //136-139
@@ -78,13 +78,13 @@
 
 
 struct  iso9660_Datetime {
-  BYTE year;   /* Number of years since 1900 */
-  BYTE month;  /* Has value in range 1..12. Note starts
+  unsigned char year;   /* Number of years since 1900 */
+  unsigned char month;  /* Has value in range 1..12. Note starts
                               at 1, not 0 like a tm struct. */
-  BYTE day;    /* Day of the month from 1 to 31 */
-  BYTE hour;   /* Hour of the day from 0 to 23 */
-  BYTE minute; /* Minute of the hour from 0 to 59 */
-  BYTE second; /* Second of the minute from 0 to 59 */
+  unsigned char day;    /* Day of the month from 1 to 31 */
+  unsigned char hour;   /* Hour of the day from 0 to 23 */
+  unsigned char minute; /* Minute of the hour from 0 to 59 */
+  unsigned char second; /* Second of the minute from 0 to 59 */
   char gmtoff; /* GMT values -48 .. + 52 in 15 minute intervals */
 };
 
@@ -97,18 +97,18 @@
  #define Flag_Protection 0x04     /* 0-normal access */
  #define Flag_Multi   0x07     /* 0-final Directory Record for the file */
 
-  BYTE ucRecordLength;      //0      the number of bytes in the record (which must be even)
-  BYTE ucExtendAttributeSectors; //1      [number of sectors in extended attribute record]
+  unsigned char ucRecordLength;      //0      the number of bytes in the record (which must be even)
+  unsigned char ucExtendAttributeSectors; //1      [number of sectors in extended attribute record]
   iso733_t extent;        // LBA of first local block allocated to the extent (2..5 LE - 6..9 BE)
   iso733_t size;          // data length of File Section.  This does not include the length of any XA Records. (10..13 LE - 14..17 BE)
   iso9660_Datetime DateTime;      //18..24 date
-  BYTE byFlags;         //25     flags
-  BYTE UnitSize;         //26     file unit size for an interleaved file
-  BYTE InterleaveGapSize;    //27     interleave gap size for an interleaved file
-  WORD VolSequenceLE;      //28..29 volume sequence number
-  WORD VolSequenceBE;            //30..31
-  BYTE Len_Fi;          //32     N, the identifier length
-  BYTE FileName[512];      //33     identifier
+  unsigned char byFlags;         //25     flags
+  unsigned char UnitSize;         //26     file unit size for an interleaved file
+  unsigned char InterleaveGapSize;    //27     interleave gap size for an interleaved file
+  unsigned short VolSequenceLE;      //28..29 volume sequence number
+  unsigned short VolSequenceBE;            //30..31
+  unsigned char Len_Fi;          //32     N, the identifier length
+  unsigned char FileName[512];      //33     identifier
 
 };
 #pragma pack()
@@ -172,7 +172,7 @@
     DWORD m_dwStartBlock;
     DWORD m_dwCurrentBlock;    // Current being read Block
     int64_t m_dwFilePos;
-    BYTE* m_pBuffer;
+    unsigned char* m_pBuffer;
     int64_t m_dwFileSize;
   };
   iso9660( );
@@ -181,7 +181,7 @@
   HANDLE FindFirstFile9660( char *szLocalFolder, WIN32_FIND_DATA *wfdFile );
   int FindNextFile( HANDLE szLocalFolder, WIN32_FIND_DATA *wfdFile );
   bool FindClose( HANDLE szLocalFolder );
-  DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod );
+  DWORD SetFilePointer(HANDLE hFile, long lDistanceToMove, long* lpDistanceToMoveHigh, DWORD dwMoveMethod );
   int64_t GetFileSize(HANDLE hFile);
   int64_t GetFilePosition(HANDLE hFile);
   int64_t Seek(HANDLE hFile, int64_t lOffset, int whence);
@@ -196,7 +196,7 @@
   void IsoDateTimeToFileTime(iso9660_Datetime* isoDateTime, FILETIME* filetime);
   struct iso_dirtree* ReadRecursiveDirFromSector( DWORD sector, const char * );
   struct iso_dirtree* FindFolder( char *Folder );
-  std::string GetThinText(BYTE* strTxt, int iLen );
+  std::string GetThinText(unsigned char* strTxt, int iLen );
   bool ReadSectorFromCache(iso9660::isofile* pContext, DWORD sector, uint8_t** ppBuffer);
   void ReleaseSectorFromCache(iso9660::isofile* pContext, DWORD sector);
   const std::string ParseName(struct iso9660_Directory& isodir);
@@ -226,7 +226,7 @@
    DWORD    m_dwStartBlock;
    DWORD    m_dwCurrentBlock;    // Current being read Block
    int64_t   m_dwFilePos;
-   BYTE*       m_pBuffer;
+   unsigned char*  m_pBuffer;
    int64_t   m_dwFileSize;
   */

_service:download_files:master.tar.gz/xbmc/filesystem/posix/PosixDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/posix/PosixDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/posix/PosixFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/posix/PosixFile.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestFileFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestNfsFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestZipFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/test/TestZipManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/udf25.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/udf25.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win10/WinLibraryDirectory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win10/WinLibraryDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win10/WinLibraryFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win10/WinLibraryFile.h Changed

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

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32Directory.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32Directory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32File.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2014 Team XBMC
-* http://xbmc.org
+* 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
@@ -21,13 +21,11 @@
 #ifdef TARGET_WINDOWS
 #include "Win32File.h"
 #include "platform/win32/WIN32Util.h"
-#include "utils/win32/Win32Log.h"
+#include "platform/win32/CharsetConverter.h"
+#include "utils/log.h"
 #include "utils/SystemInfo.h"
 #include "utils/auto_buffer.h"
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif // WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 #include <sys/stat.h>
@@ -157,7 +155,10 @@
 }
 }
 if (!hiddenSet)
- CLog::LogFW(LOGWARNING, L"Can't set hidden attribute for file \"%ls\"", pathnameW.c_str());
+ {
+ CLog::LogF(LOGWARNING, "Can't set hidden attribute for file \"%ls\"",
+ KODI::PLATFORM::WINDOWS::FromW(pathnameW));
+ }
 }
 }

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32File.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32SMBDirectory.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2014 Team XBMC
-* http://xbmc.org
+* 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
@@ -18,21 +18,17 @@
 *
 */
 
-#ifdef TARGET_WINDOWS_DESKTOP
-
 #include "Win32SMBDirectory.h"
 #include "FileItem.h"
 #include "platform/win32/WIN32Util.h"
+#include "platform/win32/CharsetConverter.h"
 #include "utils/SystemInfo.h"
 #include "utils/CharsetConverter.h"
 #include "URL.h"
-#include "utils/win32/Win32Log.h"
+#include "utils/log.h"
 #include "PasswordManager.h"
 #include "utils/auto_buffer.h"
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif // WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
 #include <Winnetwk.h>
@@ -45,6 +41,8 @@
 
 using namespace XFILE;
 
+using KODI::PLATFORM::WINDOWS::FromW;
+
 // local helper
 static inline bool worthTryToConnect(const DWORD lastErr)
 {
@@ -402,7 +400,7 @@
 if (localGetShares(basePathToScanPtr->lpRemoteName, urlPrefixForItems, items))
 return true;
 
- CLog::LogFW(LOGNOTICE, L"Can't read shares for \"%ls\" by localGetShares(), fallback to standard method", basePathToScanPtr->lpRemoteName);
+ CLog::LogF(LOGNOTICE, "Can't read shares for \"%ls\" by localGetShares(), fallback to standard method", FromW(basePathToScanPtr->lpRemoteName));
 }
 
 HANDLE netEnum;
@@ -415,10 +413,11 @@
 std::wstring providerName;
 if (basePathToScanPtr->lpProvider && basePathToScanPtr->lpProvider[0] != 0)
 providerName.assign(L" (provider \"").append(basePathToScanPtr->lpProvider).append(L"\")");
- CLog::LogFW(LOGNOTICE, L"Can't open network enumeration for \"%ls\"%ls. Error: %lu", basePathToScanPtr->lpRemoteName, providerName.c_str(), (unsigned long)result);
+ CLog::LogF(LOGNOTICE, "Can't open network enumeration for \"%ls\"%ls. Error: %lu",
+ FromW(basePathToScanPtr->lpRemoteName), FromW(providerName), static_cast<unsigned long>(result));
 }
 else
- CLog::LogF(LOGERROR, "Can't open network enumeration for network root. Error: %lu", (unsigned long)result);
+ CLog::LogF(LOGERROR, "Can't open network enumeration for network root. Error: %lu", static_cast<unsigned long>(result));
 
 return false;
 }
@@ -462,10 +461,12 @@
 items.Add(pItem);
 }
 else
- CLog::LogFW(LOGERROR, L"Can't convert server wide string name \"%ls\" to UTF-8 encoding", remoteName.substr(2).c_str());
+ CLog::LogF(LOGERROR,
+ "Can't convert server wide string name \"%ls\" to UTF-8 encoding",
+ FromW(remoteName.substr(2)));
 }
 else
- CLog::LogFW(LOGERROR, L"Skipping server name \"%ls\" without '\\' prefix", remoteName.c_str());
+ CLog::LogF(LOGERROR, "Skipping server name \"%ls\" without '\\' prefix", FromW(remoteName));
 }
 else
 CLog::LogF(LOGERROR, "Skipping server with empty remote name");
@@ -496,13 +497,24 @@
 items.Add(pItem);
 }
 else
- CLog::LogFW(LOGERROR, L"Can't convert server and share wide string name \"%ls\" to UTF-8 encoding", serverShareName.substr(slashPos + 1).c_str());
+ {
+ CLog::LogF(
+ LOGERROR,
+ "Can't convert server and share wide string name \"%ls\" to UTF-8 encoding",
+ FromW(serverShareName.substr(slashPos + 1)));
+ }
 }
 else
- CLog::LogFW(LOGERROR, L"Can't find name of share in remote name \"%ls\"", serverShareName.c_str());
+ {
+ CLog::LogF(LOGERROR, "Can't find name of share in remote name \"%ls\"",
+ FromW(serverShareName));
+ }
 }
 else
- CLog::LogFW(LOGERROR, L"Skipping name \"%ls\" without '\\' prefix", serverShareName.c_str());
+ {
+ CLog::LogF(LOGERROR, "Skipping name \"%ls\" without '\\' prefix",
+ FromW(serverShareName));
+ }
 }
 else
 CLog::LogF(LOGERROR, "Skipping share with empty remote name");
@@ -515,7 +527,10 @@
 if (curResource.lpRemoteName != NULL && curResource.lpRemoteName[0] != 0)
 {
 if (!localGetNetworkResources(&curResource, urlPrefixForItems, items, false))
- CLog::LogFW(LOGNOTICE, L"Can't get servers from \"%ls\", skipping", curResource.lpRemoteName);
+ {
+ CLog::LogF(LOGNOTICE, "Can't get servers from \"%ls\", skipping",
+ FromW(curResource.lpRemoteName));
+ }
 }
 else
 CLog::Log(LOGERROR, "%s: Skipping container with empty remote name", __FUNCTION__);
@@ -531,9 +546,15 @@
 if (basePathToScanPtr && basePathToScanPtr->lpRemoteName)
 {
 if (errorFlag)
- CLog::LogFW(LOGERROR, L"Error loading content for \"%ls\"", basePathToScanPtr->lpRemoteName);
+ {
+ CLog::LogF(LOGERROR, "Error loading content for \"%ls\"",
+ FromW(basePathToScanPtr->lpRemoteName));
+ }
 else
- CLog::LogFW(LOGERROR, L"Error (%lu) loading content for \"%ls\"", (unsigned long)result, basePathToScanPtr->lpRemoteName);
+ {
+ CLog::LogF(LOGERROR, "Error (%lu) loading content for \"%ls\"",
+ static_cast<unsigned long>(result), FromW(basePathToScanPtr->lpRemoteName));
+ }
 }
 else
 {
@@ -711,5 +732,3 @@
 CLog::LogF(LOGWARNING, "Can't connect to \"%s\" %s. Error code: %lu", serverShareName.c_str(), loginDescr.c_str(), (unsigned long)connRes);
 return false;
 }
-
-#endif // TARGET_WINDOWS

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32SMBDirectory.h Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32SMBFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/filesystem/win32/Win32SMBFile.h Changed

_service:download_files:master.tar.gz/xbmc/freebsd/FreeBSDGNUReplacements.c Changed

@@ -1,146 +1,6 @@
 
 #include "FreeBSDGNUReplacements.h"
 
-#if __FreeBSD_version < 800067
-
-/*-
- * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-size_t
-strnlen(const char *s, size_t maxlen)
-{
-	size_t len;
-
-	for (len = 0; len < maxlen; len++, s++) {
-		if (!*s)
-			break;
-	} 
-	return (len);
-}
-
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <errno.h>
-
-/* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
- (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
- NULL), pointing to *N characters of space. It is realloc'd as
- necessary. Returns the number of characters read (not including the
- null terminator), or -1 on error or EOF. */
-
-ssize_t
-getdelim(char **lineptr, size_t *n, int terminator, FILE *stream)
-{
- char *line, *p;
- size_t size, copy;
-
- if (stream == NULL || lineptr == NULL || n == NULL)
- {
- errno = EINVAL;
- return -1;
- }
-
- if (ferror (stream))
- return -1;
-
- /* Make sure we have a line buffer to start with. */
- if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars. */
- {
-#ifndef	MAX_CANON
-#define	MAX_CANON	256
-#endif
- line = (char *)realloc (*lineptr, MAX_CANON);
- if (line == NULL)
-	return -1;
- *lineptr = line;
- *n = MAX_CANON;
- }
-
- line = *lineptr;
- size = *n;
-
- copy = size;
- p = line;
-
- while (1)
-	{
-	 size_t len;
-
-	 while (--copy > 0)
-	 {
-	 register int c = getc (stream);
-	 if (c == EOF)
-		goto lose;
-	 else if ((*p++ = c) == terminator)
-		goto win;
-	 }
-
-	 /* Need to enlarge the line buffer. */
-	 len = p - line;
-	 size *= 2;
-	 line = (char *)realloc (line, size);
-	 if (line == NULL)
-	 goto lose;
-	 *lineptr = line;
-	 *n = size;
-	 p = line + len;
-	 copy = size - len;
-	}
-
- lose:
- if (p == *lineptr)
- return -1;
- /* Return a partial line since we got an error in the middle. */
- win:
- *p = '\0';
- return p - *lineptr;
-}
-
-#endif
-
 /* Compare strings while treating digits characters numerically.
 Copyright (C) 1997, 2002, 2005 Free Software Foundation, Inc.
 This file is part of the libiberty library.

_service:download_files:master.tar.gz/xbmc/freebsd/FreeBSDGNUReplacements.h Changed

_service:download_files:master.tar.gz/xbmc/games/GameServices.cpp Changed

@@ -21,8 +21,8 @@
 #include "GameServices.h"
 #include "controllers/Controller.h"
 #include "controllers/ControllerManager.h"
-#include "games/ports/PortManager.h"
 #include "games/GameSettings.h"
+#include "profiles/ProfilesManager.h"
 
 using namespace KODI;
 using namespace GAME;
@@ -30,11 +30,12 @@
 CGameServices::CGameServices(CControllerManager &controllerManager,
                              RETRO:: CGUIGameRenderManager &renderManager,
                              CSettings &settings,
-                             PERIPHERALS::CPeripherals &peripheralManager) :
+                             PERIPHERALS::CPeripherals &peripheralManager,
+                             const CProfilesManager &profileManager) :
   m_controllerManager(controllerManager),
   m_gameRenderManager(renderManager),
-  m_gameSettings(new CGameSettings(settings)),
-  m_portManager(new CPortManager(peripheralManager))
+  m_profileManager(profileManager),
+  m_gameSettings(new CGameSettings(settings))
 {
 }
 
@@ -50,12 +51,22 @@
   return m_controllerManager.GetDefaultController();
 }
 
+ControllerPtr CGameServices::GetDefaultKeyboard()
+{
+  return m_controllerManager.GetDefaultKeyboard();
+}
+
+ControllerPtr CGameServices::GetDefaultMouse()
+{
+  return m_controllerManager.GetDefaultMouse();
+}
+
 ControllerVector CGameServices::GetControllers()
 {
   return m_controllerManager.GetControllers();
 }
 
-CPortManager& CGameServices::PortManager()
+std::string CGameServices::GetSavestatesFolder() const
 {
-  return *m_portManager;
+  return m_profileManager.GetSavestatesFolder();
 }

_service:download_files:master.tar.gz/xbmc/games/GameServices.h Changed

@@ -24,6 +24,7 @@
 #include <memory>
 #include <string>
 
+class CProfilesManager;
 class CSettings;
 
 namespace PERIPHERALS
@@ -42,7 +43,6 @@
 {
 class CControllerManager;
 class CGameSettings;
- class CPortManager;
 
 class CGameServices
 {
@@ -50,15 +50,19 @@
 CGameServices(CControllerManager &controllerManager,
 RETRO::CGUIGameRenderManager &renderManager,
 CSettings &settings,
- PERIPHERALS::CPeripherals &peripheralManager);
+ PERIPHERALS::CPeripherals &peripheralManager,
+ const CProfilesManager &profileManager);
 ~CGameServices();
 
 ControllerPtr GetController(const std::string& controllerId);
 ControllerPtr GetDefaultController();
+ ControllerPtr GetDefaultKeyboard();
+ ControllerPtr GetDefaultMouse();
 ControllerVector GetControllers();
 
+ std::string GetSavestatesFolder() const;
+
 CGameSettings& GameSettings() { return *m_gameSettings; }
- CPortManager& PortManager();
 
 RETRO::CGUIGameRenderManager &GameRenderManager() { return m_gameRenderManager; }
 
@@ -66,10 +70,10 @@
 // Construction parameters
 CControllerManager &m_controllerManager;
 RETRO::CGUIGameRenderManager &m_gameRenderManager;
+ const CProfilesManager &m_profileManager;
 
 // Game services
 std::unique_ptr<CGameSettings> m_gameSettings;
- std::unique_ptr<CPortManager> m_portManager;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/games/GameSettings.cpp Changed

@@ -19,34 +19,16 @@
 */
 
 #include "GameSettings.h"
-#include "guilib/GUIWindowManager.h"
-#include "guilib/WindowIDs.h"
-#include "peripherals/Peripherals.h"
 #include "settings/lib/Setting.h"
 #include "settings/Settings.h"
-#include "utils/StringUtils.h"
-#include "ServiceBroker.h"
-
-#include <cstring>
 
 using namespace KODI;
 using namespace GAME;
 
-#define SETTING_GAMES_KEYBOARD_PLAYERCONFIG_PREFIX "gameskeyboard.keyboardplayerconfig" //! @todo
-
 CGameSettings::CGameSettings(CSettings &settings) :
 m_settings(settings)
 {
 m_settings.RegisterCallback(this, {
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERS,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_1,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_2,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_3,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_4,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_5,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_6,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_7,
- CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_8,
 CSettings::SETTING_GAMES_ENABLEREWIND,
 CSettings::SETTING_GAMES_REWINDTIME,
 });
@@ -63,27 +45,11 @@
 return;
 
 const std::string& settingId = setting->GetId();
- if (settingId == CSettings::SETTING_GAMES_KEYBOARD_PLAYERS)
- {
- CServiceBroker::GetPeripherals().TriggerDeviceScan(PERIPHERALS::PERIPHERAL_BUS_APPLICATION);
- }
- else if (settingId == CSettings::SETTING_GAMES_ENABLEREWIND ||
- settingId == CSettings::SETTING_GAMES_REWINDTIME)
+
+ if (settingId == CSettings::SETTING_GAMES_ENABLEREWIND ||
+ settingId == CSettings::SETTING_GAMES_REWINDTIME)
 {
 SetChanged();
 NotifyObservers(ObservableMessageSettingsChanged);
 }
 }
-
-void CGameSettings::OnSettingAction(std::shared_ptr<const CSetting> setting)
-{
- if (setting == nullptr)
- return;
-
- const std::string& settingId = setting->GetId();
- if (StringUtils::StartsWith(settingId, SETTING_GAMES_KEYBOARD_PLAYERCONFIG_PREFIX))
- {
- std::string strControllerIndex = settingId.substr(std::strlen(SETTING_GAMES_KEYBOARD_PLAYERCONFIG_PREFIX));
- g_windowManager.ActivateWindow(WINDOW_DIALOG_GAME_CONTROLLERS, strControllerIndex);
- }
-}

_service:download_files:master.tar.gz/xbmc/games/GameSettings.h Changed

_service:download_files:master.tar.gz/xbmc/games/GameTypes.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClient.cpp Changed

@@ -21,6 +21,7 @@
 #include "GameClient.h"
 #include "GameClientCallbacks.h"
 #include "GameClientInGameSaves.h"
+#include "GameClientProperties.h"
 #include "GameClientTranslator.h"
 #include "addons/AddonManager.h"
 #include "addons/BinaryAddonCache.h"
@@ -31,15 +32,14 @@
 #include "games/addons/input/GameClientInput.h"
 #include "games/addons/playback/GameClientRealtimePlayback.h"
 #include "games/addons/playback/GameClientReversiblePlayback.h"
-#include "games/controllers/Controller.h"
-#include "games/ports/PortManager.h"
 #include "games/GameServices.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/LocalizeStrings.h"
 #include "guilib/WindowIDs.h"
+#include "input/Action.h"
+#include "input/ActionIDs.h"
 #include "messaging/ApplicationMessenger.h"
 #include "messaging/helpers/DialogOKHelper.h"
-#include "profiles/ProfilesManager.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
@@ -64,8 +64,6 @@
 #define GAME_PROPERTY_EXTENSIONS "extensions"
 #define GAME_PROPERTY_SUPPORTS_VFS "supports_vfs"
 #define GAME_PROPERTY_SUPPORTS_STANDALONE "supports_standalone"
-#define GAME_PROPERTY_SUPPORTS_KEYBOARD "supports_keyboard"
-#define GAME_PROPERTY_SUPPORTS_MOUSE "supports_mouse"
 
 // --- NormalizeExtension ------------------------------------------------------
 
@@ -100,8 +98,6 @@
 GAME_PROPERTY_EXTENSIONS,
 GAME_PROPERTY_SUPPORTS_VFS,
 GAME_PROPERTY_SUPPORTS_STANDALONE,
- GAME_PROPERTY_SUPPORTS_KEYBOARD,
- GAME_PROPERTY_SUPPORTS_MOUSE,
 };
 
 for (const auto& property : properties)
@@ -116,12 +112,9 @@
 
 CGameClient::CGameClient(ADDON::CAddonInfo addonInfo) :
 CAddonDll(std::move(addonInfo)),
- m_subsystems(CreateSubsystems(*this, m_struct, m_critSection)),
- m_libraryProps(this, m_struct.props),
+ m_subsystems(CGameClientSubsystem::CreateSubsystems(*this, m_struct, m_critSection)),
 m_bSupportsVFS(false),
 m_bSupportsStandalone(false),
- m_bSupportsKeyboard(false),
- m_bSupportsMouse(false),
 m_bSupportsAllExtensions(false),
 m_bIsPlaying(false),
 m_serializeSize(0),
@@ -155,35 +148,13 @@
 if (it != extraInfo.end())
 m_bSupportsStandalone = (it->second == "true");
 
- it = extraInfo.find(GAME_PROPERTY_SUPPORTS_KEYBOARD);
- if (it != extraInfo.end())
- m_bSupportsKeyboard = (it->second == "true");
-
- it = extraInfo.find(GAME_PROPERTY_SUPPORTS_MOUSE);
- if (it != extraInfo.end())
- m_bSupportsMouse = (it->second == "true");
-
 ResetPlayback();
 }
 
 CGameClient::~CGameClient(void)
 {
 CloseFile();
- DestroySubsystems(m_subsystems);
-}
-
-GameClientSubsystems CGameClient::CreateSubsystems(CGameClient &gameClient, AddonInstance_Game &gameStruct, CCriticalSection &clientAccess)
-{
- GameClientSubsystems subsystems = { };
-
- subsystems.Input.reset(new CGameClientInput(gameClient, gameStruct, clientAccess));
-
- return subsystems;
-}
-
-void CGameClient::DestroySubsystems(GameClientSubsystems &subsystems)
-{
- subsystems.Input.reset();
+ CGameClientSubsystem::DestroySubsystems(m_subsystems);
 }
 
 std::string CGameClient::LibPath() const
@@ -228,11 +199,12 @@
 CDirectory::Create(Profile());
 
 // Ensure directory exists for savestates
- std::string savestatesDir = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetSavestatesFolder(), ID());
+ const CGameServices &gameServices = CServiceBroker::GetGameServices();
+ std::string savestatesDir = URIUtils::AddFileToFolder(gameServices.GetSavestatesFolder(), ID());
 if (!CDirectory::Exists(savestatesDir))
 CDirectory::Create(savestatesDir);
 
- m_libraryProps.InitializeProperties();
+ AddonProperties().InitializeProperties();
 
 m_struct.toKodi.kodiInstance = this;
 m_struct.toKodi.CloseGame = cb_close_game;
@@ -246,12 +218,11 @@
 m_struct.toKodi.HwGetCurrentFramebuffer = cb_hw_get_current_framebuffer;
 m_struct.toKodi.HwGetProcAddress = cb_hw_get_proc_address;
 m_struct.toKodi.RenderFrame = cb_render_frame;
- m_struct.toKodi.OpenPort = cb_open_port;
- m_struct.toKodi.ClosePort = cb_close_port;
 m_struct.toKodi.InputEvent = cb_input_event;
 
 if (Create(ADDON_INSTANCE_GAME, &m_struct, &m_struct.props) == ADDON_STATUS_OK)
 {
+ Input().Initialize();
 LogAddonProperties();
 return true;
 }
@@ -261,6 +232,8 @@
 
 void CGameClient::Unload()
 {
+ Input().Deinitialize();
+
 Destroy();
 }
 
@@ -359,8 +332,6 @@
 m_video = video;
 m_input = input;
 
- Input().Initialize();
-
 m_inGameSaves.reset(new CGameClientInGameSaves(this, &m_struct.toAddon));
 m_inGameSaves->Load();
 
@@ -462,10 +433,10 @@
 
 std::string strAddonId;
 
- const ADDONDEPS& dependencies = GetDeps();
- for (ADDONDEPS::const_iterator it = dependencies.begin(); it != dependencies.end(); ++it)
+ const auto& dependencies = GetDependencies();
+ for (auto it = dependencies.begin(); it != dependencies.end(); ++it)
 {
- const std::string& strDependencyId = it->first;
+ const std::string& strDependencyId = it->id;
 if (StringUtils::StartsWith(strDependencyId, "resource.games"))
 {
 AddonPtr addon;
@@ -503,7 +474,7 @@
 m_playback.reset(new CGameClientRealtimePlayback);
 }
 
-void CGameClient::Reset(unsigned int port)
+void CGameClient::Reset()
 {
 ResetPlayback();
 
@@ -533,8 +504,6 @@
 catch (...) { LogException("UnloadGame()"); }
 }
 
- Input().Deinitialize();
-
 m_bIsPlaying = false;
 m_gamePath.clear();
 m_serializeSize = 0;
@@ -764,8 +733,6 @@
 CLog::Log(LOGINFO, "GAME: Valid extensions: %s", StringUtils::Join(m_extensions, " ").c_str());
 CLog::Log(LOGINFO, "GAME: Supports VFS: %s", m_bSupportsVFS ? "yes" : "no");
 CLog::Log(LOGINFO, "GAME: Supports standalone execution: %s", m_bSupportsStandalone ? "yes" : "no");
- CLog::Log(LOGINFO, "GAME: Supports keyboard: %s", m_bSupportsKeyboard ? "yes" : "no");
- CLog::Log(LOGINFO, "GAME: Supports mouse: %s", m_bSupportsMouse ? "yes" : "no");
 CLog::Log(LOGINFO, "GAME: ------------------------------------");
 }
 
@@ -887,24 +854,6 @@
 //! @todo
 }
 
-bool CGameClient::cb_open_port(void* kodiInstance, unsigned int port)
-{
- CGameClient *gameClient = static_cast<CGameClient*>(kodiInstance);
- if (!gameClient)
- return false;
-
- return gameClient->Input().OpenPort(port);
-}
-
-void CGameClient::cb_close_port(void* kodiInstance, unsigned int port)
-{
- CGameClient *gameClient = static_cast<CGameClient*>(kodiInstance);
- if (!gameClient)
- return;
-
- gameClient->Input().ClosePort(port);
-}
-
 bool CGameClient::cb_input_event(void* kodiInstance, const game_input_event* event)
 {
 CGameClient *gameClient = static_cast<CGameClient*>(kodiInstance);

_service:download_files:master.tar.gz/xbmc/games/addons/GameClient.h Changed

@@ -19,7 +19,7 @@
 */
 #pragma once
 
-#include "GameClientProperties.h"
+#include "GameClientSubsystem.h"
 #include "GameClientTiming.h"
 #include "addons/binary-addons/AddonDll.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
@@ -42,16 +42,12 @@
 
 class CGameClientInGameSaves;
 class CGameClientInput;
+class CGameClientProperties;
 class IGameAudioCallback;
 class IGameClientPlayback;
 class IGameInputCallback;
 class IGameVideoCallback;
 
-struct GameClientSubsystems
-{
- std::unique_ptr<CGameClientInput> Input;
-};
-
 /*!
 * \ingroup games
 * \brief Interface between Kodi and Game add-ons.
@@ -65,11 +61,13 @@
 
 virtual ~CGameClient(void);
 
- // Game subsystems (immutable)
+ // Game subsystems (const)
 const CGameClientInput &Input() const { return *m_subsystems.Input; }
+ const CGameClientProperties &AddonProperties() const { return *m_subsystems.AddonProperties; }
 
 // Game subsystems (mutable)
 CGameClientInput &Input() { return *m_subsystems.Input; }
+ CGameClientProperties &AddonProperties() { return *m_subsystems.AddonProperties; }
 
 // Implementation of IAddon via CAddonDll
 virtual std::string LibPath() const override;
@@ -79,8 +77,6 @@
 bool SupportsStandalone() const { return m_bSupportsStandalone; }
 bool SupportsPath() const;
 bool SupportsVFS() const { return m_bSupportsVFS; }
- bool SupportsKeyboard() const { return m_bSupportsKeyboard; }
- bool SupportsMouse() const { return m_bSupportsMouse; }
 const std::set<std::string>& GetExtensions() const { return m_extensions; }
 bool SupportsAllExtensions() const { return m_bSupportsAllExtensions; }
 bool IsExtensionValid(const std::string& strExtension) const;
@@ -90,7 +86,7 @@
 void Unload();
 bool OpenFile(const CFileItem& file, IGameAudioCallback* audio, IGameVideoCallback* video, IGameInputCallback *input);
 bool OpenStandalone(IGameAudioCallback* audio, IGameVideoCallback* video, IGameInputCallback *input);
- void Reset(unsigned int port);
+ void Reset();
 void CloseFile();
 const std::string& GetGamePath() const { return m_gamePath; }
 
@@ -125,24 +121,6 @@
 void LogException(const char* strFunctionName) const;
 
 private:
- /*!
- * \brief Create a struct with the allocated subsystems
- *
- * \param gameClient The owner of the subsystems
- * \param gameStruct The game client's add-on function table
- * \param clientAccess Mutex guarding client function access
- *
- * \return A fully-allocated GameClientSubsystems struct
- */
- static GameClientSubsystems CreateSubsystems(CGameClient &gameClient, AddonInstance_Game &gameStruct, CCriticalSection &clientAccess);
-
- /*!
- * \brief Deallocate subsystems
- *
- * \param subsystems The subsystems created by CreateSubsystems()
- */
- static void DestroySubsystems(GameClientSubsystems &subsystems);
-
 // Private gameplay functions
 bool InitializeGameplay(const std::string& gamePath, IGameAudioCallback* audio, IGameVideoCallback* video, IGameInputCallback *input);
 bool LoadGameInfo();
@@ -173,22 +151,15 @@
 static uintptr_t cb_hw_get_current_framebuffer(void* kodiInstance);
 static game_proc_address_t cb_hw_get_proc_address(void* kodiInstance, const char* sym);
 static void cb_render_frame(void* kodiInstance);
- static bool cb_open_port(void* kodiInstance, unsigned int port);
- static void cb_close_port(void* kodiInstance, unsigned int port);
 static bool cb_input_event(void* kodiInstance, const game_input_event* event);
 //@}
 
 // Game subsystems
 GameClientSubsystems m_subsystems;
 
- // Add-on properties
- CGameClientProperties m_libraryProps; // Properties to pass to the DLL
-
 // Game API xml parameters
 bool m_bSupportsVFS;
 bool m_bSupportsStandalone;
- bool m_bSupportsKeyboard;
- bool m_bSupportsMouse;
 std::set<std::string> m_extensions;
 bool m_bSupportsAllExtensions;
 //GamePlatforms m_platforms;

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientInGameSaves.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientProperties.cpp Changed

@@ -40,7 +40,7 @@
 
 #define GAME_CLIENT_RESOURCES_DIRECTORY "resources"
 
-CGameClientProperties::CGameClientProperties(const CGameClient* parent, AddonProps_Game& props)
+CGameClientProperties::CGameClientProperties(const CGameClient& parent, AddonProps_Game& props)
 : m_parent(parent),
 m_properties(props)
 {
@@ -71,7 +71,7 @@
 m_properties.resource_directories = GetResourceDirectories();
 m_properties.resource_directory_count = GetResourceDirectoryCount();
 m_properties.profile_directory = GetProfileDirectory();
- m_properties.supports_vfs = m_parent->SupportsVFS();
+ m_properties.supports_vfs = m_parent.SupportsVFS();
 m_properties.extensions = GetExtensions();
 m_properties.extension_count = GetExtensionCount();
 }
@@ -81,7 +81,7 @@
 if (m_strLibraryPath.empty())
 {
 // Get the parent add-on's real path
- std::string strLibPath = m_parent->CAddonDll::LibPath();
+ std::string strLibPath = m_parent.CAddonDll::LibPath();
 m_strLibraryPath = CSpecialProtocol::TranslatePath(strLibPath);
 }
 return m_strLibraryPath.c_str();
@@ -93,10 +93,10 @@
 {
 // Add all game client dependencies
 //! @todo Compare helper version with required dependency
- const ADDONDEPS& dependencies = m_parent->GetDeps();
- for (ADDONDEPS::const_iterator it = dependencies.begin(); it != dependencies.end(); ++it)
+ const auto& dependencies = m_parent.GetDependencies();
+ for (auto it = dependencies.begin(); it != dependencies.end(); ++it)
 {
- const std::string& strAddonId = it->first;
+ const std::string& strAddonId = it->id;
 AddonPtr addon;
 if (CServiceBroker::GetAddonMgr().GetAddon(strAddonId, addon, ADDON_GAMEDLL, false))
 {
@@ -123,15 +123,20 @@
 return nullptr;
 }
 
+unsigned int CGameClientProperties::GetProxyDllCount(void) const
+{
+ return static_cast<unsigned int>(m_proxyDllPaths.size());
+}
+
 const char** CGameClientProperties::GetResourceDirectories(void)
 {
 if (m_resourceDirectories.empty())
 {
 // Add all other game resources
- const ADDONDEPS& dependencies = m_parent->GetDeps();
- for (ADDONDEPS::const_iterator it = dependencies.begin(); it != dependencies.end(); ++it)
+ const auto& dependencies = m_parent.GetDependencies();
+ for (auto it = dependencies.begin(); it != dependencies.end(); ++it)
 {
- const std::string& strAddonId = it->first;
+ const std::string& strAddonId = it->id;
 AddonPtr addon;
 if (CServiceBroker::GetAddonMgr().GetAddon(strAddonId, addon, ADDON_RESOURCE_GAMES))
 {
@@ -146,8 +151,8 @@
 }
 
 // Add resource directories for profile and path
- std::string addonProfile = CSpecialProtocol::TranslatePath(m_parent->Profile());
- std::string addonPath = m_parent->Path();
+ std::string addonProfile = CSpecialProtocol::TranslatePath(m_parent.Profile());
+ std::string addonPath = m_parent.Path();
 
 addonProfile = URIUtils::AddFileToFolder(addonProfile, GAME_CLIENT_RESOURCES_DIRECTORY);
 addonPath = URIUtils::AddFileToFolder(addonPath, GAME_CLIENT_RESOURCES_DIRECTORY);
@@ -173,17 +178,22 @@
 return nullptr;
 }
 
+unsigned int CGameClientProperties::GetResourceDirectoryCount(void) const
+{
+ return static_cast<unsigned int>(m_resourceDirectories.size());
+}
+
 const char* CGameClientProperties::GetProfileDirectory(void)
 {
 if (m_strProfileDirectory.empty())
- m_strProfileDirectory = CSpecialProtocol::TranslatePath(m_parent->Profile());
+ m_strProfileDirectory = CSpecialProtocol::TranslatePath(m_parent.Profile());
 
 return m_strProfileDirectory.c_str();
 }
 
 const char** CGameClientProperties::GetExtensions(void)
 {
- for (auto& extension : m_parent->GetExtensions())
+ for (auto& extension : m_parent.GetExtensions())
 {
 char* ext = new char[extension.length() + 1];
 std::strcpy(ext, extension.c_str());
@@ -193,6 +203,11 @@
 return !m_extensions.empty() ? const_cast<const char**>(m_extensions.data()) : nullptr;
 }
 
+unsigned int CGameClientProperties::GetExtensionCount(void) const
+{
+ return static_cast<unsigned int>(m_extensions.size());
+}
+
 void CGameClientProperties::AddProxyDll(const GameClientPtr& gameClient)
 {
 // Get the add-on's real path

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientProperties.h Changed

@@ -36,12 +36,14 @@
 
 /**
 * \ingroup games
- * \brief C++ wrapper for game client properties declared in kodi_game_types.h
+ * \brief C++ wrapper for properties to pass to the DLL
+ *
+ * Game client properties declared in kodi_game_types.h.
 */
 class CGameClientProperties
 {
 public:
- CGameClientProperties(const CGameClient* parent, AddonProps_Game& props);
+ CGameClientProperties(const CGameClient& parent, AddonProps_Game& props);
 ~CGameClientProperties(void) { ReleaseResources(); }
 
 void InitializeProperties(void);
@@ -57,13 +59,13 @@
 const char** GetProxyDllPaths(void);
 
 // Number of proxy DLLs needed to load the game client
- unsigned int GetProxyDllCount(void) const { return m_proxyDllPaths.size(); }
+ unsigned int GetProxyDllCount(void) const;
 
 // Paths to game resources
 const char** GetResourceDirectories(void);
 
 // Number of resource directories
- unsigned int GetResourceDirectoryCount(void) const { return m_resourceDirectories.size(); }
+ unsigned int GetResourceDirectoryCount(void) const;
 
 // Equal to special://profile/addon_data/<parent's id>
 const char* GetProfileDirectory(void);
@@ -72,14 +74,15 @@
 const char** GetExtensions(void);
 
 // Number of extensions
- unsigned int GetExtensionCount(void) const { return m_extensions.size(); }
+ unsigned int GetExtensionCount(void) const;
 
 // Helper functions
 void AddProxyDll(const GameClientPtr& gameClient);
 bool HasProxyDll(const std::string& strLibPath) const;
 
- const CGameClient* const m_parent;
- AddonProps_Game& m_properties;
+ // Construction parameters
+ const CGameClient& m_parent;
+ AddonProps_Game& m_properties;
 
 // Buffers to hold the strings
 std::string m_strLibraryPath;

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientSubsystem.cpp Changed

@@ -20,6 +20,9 @@
 
 #include "GameClientSubsystem.h"
 #include "GameClient.h"
+#include "GameClientProperties.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
+#include "games/addons/input/GameClientInput.h"
 
 using namespace KODI;
 using namespace GAME;
@@ -33,4 +36,30 @@
 {
 }
 
-CGameClientInput &CGameClientSubsystem::Input() const { return m_gameClient.Input(); }
+CGameClientSubsystem::~CGameClientSubsystem() = default;
+
+GameClientSubsystems CGameClientSubsystem::CreateSubsystems(CGameClient &gameClient, AddonInstance_Game &gameStruct, CCriticalSection &clientAccess)
+{
+  GameClientSubsystems subsystems = {};
+
+  subsystems.Input.reset(new CGameClientInput(gameClient, gameStruct, clientAccess));
+  subsystems.AddonProperties.reset(new CGameClientProperties(gameClient, gameStruct.props));
+
+  return subsystems;
+}
+
+void CGameClientSubsystem::DestroySubsystems(GameClientSubsystems &subsystems)
+{
+  subsystems.Input.reset();
+  subsystems.AddonProperties.reset();
+}
+
+CGameClientInput &CGameClientSubsystem::Input() const
+{
+  return m_gameClient.Input();
+}
+
+CGameClientProperties &CGameClientSubsystem::AddonProperties() const
+{
+  return m_gameClient.AddonProperties();
+}

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientSubsystem.h Changed

@@ -19,6 +19,8 @@
 */
 #pragma once
 
+#include <memory>
+
 struct AddonInstance_Game;
 class CCriticalSection;
 
@@ -28,6 +30,13 @@
 {
 class CGameClient;
 class CGameClientInput;
+ class CGameClientProperties;
+
+ struct GameClientSubsystems
+ {
+ std::unique_ptr<CGameClientInput> Input;
+ std::unique_ptr<CGameClientProperties> AddonProperties;
+ };
 
 /*!
 * \brief Base class for game client subsystems
@@ -39,11 +48,33 @@
 AddonInstance_Game &addonStruct,
 CCriticalSection &clientAccess);
 
- virtual ~CGameClientSubsystem() = default;
+ virtual ~CGameClientSubsystem();
+
+ public:
+ /*!
+ * \brief Create a struct with the allocated subsystems
+ *
+ * \param gameClient The owner of the subsystems
+ * \param gameStruct The game client's add-on function table
+ * \param clientAccess Mutex guarding client function access
+ *
+ * \return A fully-allocated GameClientSubsystems struct
+ */
+ static GameClientSubsystems CreateSubsystems(CGameClient &gameClient, AddonInstance_Game &gameStruct, CCriticalSection &clientAccess);
+
+ /*!
+ * \brief Deallocate subsystems
+ *
+ * \param subsystems The subsystems created by CreateSubsystems()
+ */
+ static void DestroySubsystems(GameClientSubsystems &subsystems);
 
- CGameClientInput &Input() const;
- 
 protected:
+ // Subsystems
+ CGameClientInput &Input() const;
+ CGameClientProperties &AddonProperties() const;
+
+ // Construction parameters
 CGameClient &m_gameClient;
 AddonInstance_Game &m_struct;
 CCriticalSection &m_clientAccess;

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientTiming.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientTiming.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientTranslator.cpp Changed

@@ -136,15 +136,21 @@
 return AV_CODEC_ID_NONE;
 }
 
-GAME_KEY_MOD CGameClientTranslator::GetModifiers(CKey::Modifier modifier)
+GAME_KEY_MOD CGameClientTranslator::GetModifiers(KEYBOARD::Modifier modifier)
 {
+ using namespace KEYBOARD;
+
 unsigned int mods = GAME_KEY_MOD_NONE;
 
- if (modifier & CKey::MODIFIER_CTRL) mods |= GAME_KEY_MOD_CTRL;
- if (modifier & CKey::MODIFIER_SHIFT) mods |= GAME_KEY_MOD_SHIFT;
- if (modifier & CKey::MODIFIER_ALT) mods |= GAME_KEY_MOD_ALT;
- if (modifier & CKey::MODIFIER_RALT) mods |= GAME_KEY_MOD_RALT;
- if (modifier & CKey::MODIFIER_META) mods |= GAME_KEY_MOD_META;
+ if (modifier & Modifier::MODIFIER_CTRL) mods |= GAME_KEY_MOD_CTRL;
+ if (modifier & Modifier::MODIFIER_SHIFT) mods |= GAME_KEY_MOD_SHIFT;
+ if (modifier & Modifier::MODIFIER_ALT) mods |= GAME_KEY_MOD_ALT;
+ if (modifier & Modifier::MODIFIER_RALT) mods |= GAME_KEY_MOD_ALT;
+ if (modifier & Modifier::MODIFIER_META) mods |= GAME_KEY_MOD_META;
+ if (modifier & Modifier::MODIFIER_SUPER) mods |= GAME_KEY_MOD_SUPER;
+ if (modifier & Modifier::MODIFIER_NUMLOCK) mods |= GAME_KEY_MOD_NUMLOCK;
+ if (modifier & Modifier::MODIFIER_CAPSLOCK) mods |= GAME_KEY_MOD_CAPSLOCK;
+ if (modifier & Modifier::MODIFIER_SCROLLLOCK) mods |= GAME_KEY_MOD_SCROLLOCK;
 
 return static_cast<GAME_KEY_MOD>(mods);
 }
@@ -160,3 +166,17 @@
 }
 return "Unknown";
 }
+
+PORT_TYPE CGameClientTranslator::TranslatePortType(GAME_PORT_TYPE portType)
+{
+ switch (portType)
+ {
+ case GAME_PORT_KEYBOARD: return PORT_TYPE::KEYBOARD;
+ case GAME_PORT_MOUSE: return PORT_TYPE::MOUSE;
+ case GAME_PORT_CONTROLLER: return PORT_TYPE::CONTROLLER;
+ default:
+ break;
+ }
+
+ return PORT_TYPE::UNKNOWN;
+}

_service:download_files:master.tar.gz/xbmc/games/addons/GameClientTranslator.h Changed

@@ -21,7 +21,8 @@
 
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
 #include "cores/AudioEngine/Utils/AEChannelData.h"
-#include "input/Key.h"
+#include "games/controllers/ControllerTypes.h"
+#include "input/keyboard/KeyboardTypes.h"
 
 #include "libavcodec/avcodec.h"
 #include "libavutil/pixfmt.h"
@@ -95,7 +96,7 @@
      * \param modifiers The key modifiers to translate (e.g. Shift, Ctrl).
      * \return Translated key modifiers.
      */
-    static GAME_KEY_MOD  GetModifiers(CKey::Modifier modifier);
+    static GAME_KEY_MOD GetModifiers(KEYBOARD::Modifier modifier);
 
     /*!
      * \brief Translate region to string representation (e.g. for logging).
@@ -103,6 +104,13 @@
      * \return Translated region.
      */
     static const char* TranslateRegion(GAME_REGION region);
+
+    /*!
+     * \brief Translate port type (Game API to Kodi)
+     * \param portType  The port type to translate
+     * \return Translated port type
+     */
+    static PORT_TYPE TranslatePortType(GAME_PORT_TYPE portType);
   };
 }
 }

_service:download_files:master.tar.gz/xbmc/games/addons/input/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientDevice.cpp Added

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 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 "GameClientPort.h"
+#include "GameClientDevice.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/ControllerTopology.h"
+#include "games/controllers/ControllerTranslator.h"
+#include "games/GameServices.h"
+#include "utils/StringUtils.h"
+#include "ServiceBroker.h"
+
+#include <algorithm>
+
+using namespace KODI;
+using namespace GAME;
+
+CGameClientDevice::CGameClientDevice(const game_input_device &device) :
+ m_controller(GetController(device.controller_id))
+{
+ if (m_controller && device.available_ports != nullptr)
+ {
+ // Look for matching ports. We enumerate in physical order because logical
+ // order can change per emulator.
+ for (const auto &physicalPort : m_controller->Topology().Ports())
+ {
+ for (unsigned int i = 0; i < device.port_count; i++)
+ {
+ const auto &logicalPort = device.available_ports[i];
+ if (logicalPort.port_id != nullptr && logicalPort.port_id == physicalPort.ID())
+ {
+ // Handle matching ports
+ AddPort(logicalPort, physicalPort);
+ break;
+ }
+ }
+ }
+ }
+}
+
+CGameClientDevice::CGameClientDevice(const ControllerPtr &controller) :
+ m_controller(controller)
+{
+}
+
+CGameClientDevice::~CGameClientDevice() = default;
+
+void CGameClientDevice::AddPort(const game_input_port &logicalPort, const CControllerPort &physicalPort)
+{
+ std::unique_ptr<CGameClientPort> port(new CGameClientPort(logicalPort, physicalPort));
+ m_ports.emplace_back(std::move(port));
+}
+
+ControllerPtr CGameClientDevice::GetController(const char *controllerId)
+{
+ ControllerPtr controller;
+
+ if (controllerId != nullptr)
+ controller = CServiceBroker::GetGameServices().GetController(controllerId);
+
+ return controller;
+}

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientDevice.h Added

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 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 "games/GameTypes.h"
+
+#include <string>
+
+struct game_input_device;
+struct game_input_port;
+
+namespace KODI
+{
+namespace GAME
+{
+ class CControllerPort;
+
+ /*!
+ * \ingroup games
+ * \brief Represents a device connected to a port
+ */
+ class CGameClientDevice
+ {
+ public:
+ /*!
+ * \brief Construct a device
+ *
+ * \param device The device Game API struct
+ */
+ CGameClientDevice(const game_input_device &device);
+
+ /*!
+ * \brief Construct a device from a controller add-on
+ *
+ * \param controller The controller add-on
+ */
+ CGameClientDevice(const ControllerPtr &controller);
+
+ /*!
+ * \brief Destructor
+ */
+ ~CGameClientDevice();
+
+ /*!
+ * \brief The controller profile
+ */
+ const ControllerPtr &Controller() const { return m_controller; }
+
+ /*!
+ * \brief The ports on this device
+ */
+ const GameClientPortVec &Ports() const { return m_ports; }
+
+ private:
+ /*!
+ * \brief Add a controller port
+ *
+ * \param logicalPort The logical port Game API struct
+ * \param physicalPort The physical port definition
+ */
+ void AddPort(const game_input_port &logicalPort, const CControllerPort &physicalPort);
+
+ // Helper function
+ static ControllerPtr GetController(const char *controllerId);
+
+ ControllerPtr m_controller;
+ GameClientPortVec m_ports;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientHardware.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientHardware.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientInput.cpp Changed

@@ -23,20 +23,23 @@
 #include "GameClientJoystick.h"
 #include "GameClientKeyboard.h"
 #include "GameClientMouse.h"
+#include "GameClientPort.h"
+#include "GameClientTopology.h"
 #include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
 #include "games/addons/GameClient.h"
 #include "games/controllers/Controller.h"
-#include "games/ports/PortManager.h"
+#include "games/controllers/ControllerTopology.h"
 #include "games/GameServices.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/WindowIDs.h"
 #include "input/joysticks/JoystickTypes.h"
-#include "input/InputManager.h"
 #include "peripherals/Peripherals.h"
-//#include "threads/SingleLock.h"
+#include "threads/SingleLock.h"
 #include "utils/log.h"
 #include "ServiceBroker.h"
 
+#include <algorithm>
+
 using namespace KODI;
 using namespace GAME;
 
@@ -54,180 +57,490 @@
 
 void CGameClientInput::Initialize()
 {
- if (m_gameClient.SupportsKeyboard())
- OpenKeyboard();
+ LoadTopology();
+
+ // Open keyboard
+ //! @todo Move to player manager
+ if (SupportsKeyboard())
+ {
+ auto it = std::find_if(m_controllers.Ports().begin(), m_controllers.Ports().end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::KEYBOARD;
+ });
+
+ OpenKeyboard(it->CompatibleControllers().at(0).Controller());
+ }
+
+ // Open mouse
+ //! @todo Move to player manager
+ if (SupportsMouse())
+ {
+ auto it = std::find_if(m_controllers.Ports().begin(), m_controllers.Ports().end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::MOUSE;
+ });
+
+ OpenMouse(it->CompatibleControllers().at(0).Controller());
+ }
 
- if (m_gameClient.SupportsMouse())
- OpenMouse();
+ // Open joysticks
+ //! @todo Move to player manager
+ for (const auto &port : m_controllers.Ports())
+ {
+ if (port.PortType() == PORT_TYPE::CONTROLLER && !port.CompatibleControllers().empty())
+ {
+ ControllerPtr controller = port.CompatibleControllers().at(0).Controller();
+ OpenJoystick(port.Address(), controller);
+ }
+ }
+
+ // Ensure hardware is open to receive events
+ m_hardware.reset(new CGameClientHardware(m_gameClient));
 }
 
 void CGameClientInput::Deinitialize()
 {
- while (!m_joysticks.empty())
- ClosePort(m_joysticks.begin()->first);
-
 m_hardware.reset();
 
- CloseKeyboard();
+ std::vector<std::string> ports;
+ for (const auto &it : m_joysticks)
+ ports.emplace_back(it.first);
+
+ for (const std::string &port : ports)
+ CloseJoystick(port);
+ m_portMap.clear();
 
 CloseMouse();
+
+ CloseKeyboard();
 }
 
 bool CGameClientInput::AcceptsInput() const
 {
- return g_windowManager.GetActiveWindowID() == WINDOW_FULLSCREEN_GAME;
+ return g_windowManager.GetActiveWindowOrDialog() == WINDOW_FULLSCREEN_GAME;
 }
 
-bool CGameClientInput::OpenPort(unsigned int port)
+void CGameClientInput::LoadTopology()
 {
- // Fail if port is already open
- if (m_joysticks.find(port) != m_joysticks.end())
- return false;
-
- // Ensure hardware is open to receive events from the port
- if (!m_hardware)
- m_hardware.reset(new CGameClientHardware(m_gameClient));
+ game_input_topology *topologyStruct = nullptr;
 
- ControllerVector controllers = GetControllers(m_gameClient);
- if (!controllers.empty())
+ if (m_gameClient.Initialized())
 {
- //! @todo Choose controller
- ControllerPtr& controller = controllers[0];
+ try { topologyStruct = m_struct.toAddon.GetTopology(); }
+ catch (...) { m_gameClient.LogException("GetTopology()"); }
+ }
 
- m_joysticks[port].reset(new CGameClientJoystick(m_gameClient, port, controller, m_struct.toAddon));
+ GameClientPortVec hardwarePorts;
 
- // If keyboard input is being captured by this add-on, force the port type to PERIPHERAL_JOYSTICK
- PERIPHERALS::PeripheralType device = PERIPHERALS::PERIPHERAL_UNKNOWN;
- if (m_gameClient.SupportsKeyboard())
- device = PERIPHERALS::PERIPHERAL_JOYSTICK;
+ if (topologyStruct != nullptr)
+ {
+ //! @todo Guard against infinite loops provided by the game client
 
- CServiceBroker::GetGameServices().PortManager().OpenPort(m_joysticks[port].get(), m_hardware.get(), &m_gameClient, port, device);
+ game_input_port *ports = topologyStruct->ports;
+ if (ports != nullptr)
+ {
+ for (unsigned int i = 0; i < topologyStruct->port_count; i++)
+ hardwarePorts.emplace_back(new CGameClientPort(ports[i]));
+ }
 
- UpdatePort(port, controller);
+ m_playerLimit = topologyStruct->player_limit;
 
- return true;
+ try { m_struct.toAddon.FreeTopology(topologyStruct); }
+ catch (...) { m_gameClient.LogException("FreeTopology()"); }
 }
 
- return false;
+ // If no topology is available, create a default one with a single port that
+ // accepts all controllers imported by addon.xml
+ if (hardwarePorts.empty())
+ hardwarePorts.emplace_back(new CGameClientPort(GetControllers(m_gameClient)));
+
+ CGameClientTopology topology(std::move(hardwarePorts));
+ m_controllers = topology.GetControllerTree();
 }
 
-void CGameClientInput::ClosePort(unsigned int port)
+bool CGameClientInput::SupportsKeyboard() const
 {
- // Can't close port if it doesn't exist
- if (m_joysticks.find(port) == m_joysticks.end())
- return;
+ auto it = std::find_if(m_controllers.Ports().begin(), m_controllers.Ports().end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::KEYBOARD;
+ });
 
- CServiceBroker::GetGameServices().PortManager().ClosePort(m_joysticks[port].get());
+ return it != m_controllers.Ports().end() && !it->CompatibleControllers().empty();
+}
 
- m_joysticks.erase(port);
+bool CGameClientInput::SupportsMouse() const
+{
+ auto it = std::find_if(m_controllers.Ports().begin(), m_controllers.Ports().end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::MOUSE;
+ });
 
- UpdatePort(port, CController::EmptyPtr);
+ return it != m_controllers.Ports().end() && !it->CompatibleControllers().empty();
 }
 
-bool CGameClientInput::ReceiveInputEvent(const game_input_event& event)
+bool CGameClientInput::OpenKeyboard(const ControllerPtr &controller)
 {
- bool bHandled = false;
+ using namespace JOYSTICK;
 
- switch (event.type)
+ if (!controller)
 {
- case GAME_INPUT_EVENT_MOTOR:
- if (event.feature_name)
- bHandled = SetRumble(event.port, event.feature_name, event.motor.magnitude);
- break;
- default:
- break;
+ CLog::Log(LOGERROR, "Failed to open keyboard, no controller given");
+ return false;
 }
 
- return bHandled;
-}
+ //! @todo Move to player manager
+ PERIPHERALS::PeripheralVector keyboards;
+ CServiceBroker::GetPeripherals().GetPeripheralsWithFeature(keyboards, PERIPHERALS::FEATURE_KEYBOARD);
+ if (keyboards.empty())
+ return false;
 
-void CGameClientInput::UpdatePort(unsigned int port, const ControllerPtr& controller)
-{
- using namespace JOYSTICK;
+ std::string controllerId = controller->ID();
 
- CSingleLock lock(m_clientAccess);
+ game_controller controllerStruct{};
+
+ controllerStruct.controller_id = controllerId.c_str();
+ controllerStruct.digital_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::DIGITAL);
+ controllerStruct.analog_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::ANALOG);
+ controllerStruct.analog_stick_count = controller->FeatureCount(FEATURE_TYPE::ANALOG_STICK);
+ controllerStruct.accelerometer_count = controller->FeatureCount(FEATURE_TYPE::ACCELEROMETER);
+ controllerStruct.key_count = controller->FeatureCount(FEATURE_TYPE::KEY);
+ controllerStruct.rel_pointer_count = controller->FeatureCount(FEATURE_TYPE::RELPOINTER);
+ controllerStruct.abs_pointer_count = controller->FeatureCount(FEATURE_TYPE::ABSPOINTER);
+ controllerStruct.motor_count = controller->FeatureCount(FEATURE_TYPE::MOTOR);
+
+ bool bSuccess = false;
 
- if (m_gameClient.Initialized())
 {
- if (controller != CController::EmptyPtr)
+ CSingleLock lock(m_clientAccess);
+
+ if (m_gameClient.Initialized())
 {
- std::string strId = controller->ID();
-
- game_controller controllerStruct;
-
- controllerStruct.controller_id = strId.c_str();
- controllerStruct.digital_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::DIGITAL);
- controllerStruct.analog_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::ANALOG);
- controllerStruct.analog_stick_count = controller->FeatureCount(FEATURE_TYPE::ANALOG_STICK);
- controllerStruct.accelerometer_count = controller->FeatureCount(FEATURE_TYPE::ACCELEROMETER);
- controllerStruct.key_count = 0; //! @todo
- controllerStruct.rel_pointer_count = controller->FeatureCount(FEATURE_TYPE::RELPOINTER);
- controllerStruct.abs_pointer_count = controller->FeatureCount(FEATURE_TYPE::ABSPOINTER);
- controllerStruct.motor_count = controller->FeatureCount(FEATURE_TYPE::MOTOR);
-
- try { m_struct.toAddon.UpdatePort(port, true, &controllerStruct); }
- catch (...) { m_gameClient.LogException("UpdatePort()"); }
+ try
+ {
+ bSuccess = m_struct.toAddon.EnableKeyboard(true, &controllerStruct);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("EnableKeyboard()");
+ }
 }
- else
+ }
+
+ if (bSuccess)
+ {
+ m_keyboard.reset(new CGameClientKeyboard(m_gameClient, controllerId, m_struct.toAddon, keyboards.at(0).get()));
+ return true;
+ }
+
+ return false;
+}
+
+void CGameClientInput::CloseKeyboard()
+{
+ m_keyboard.reset();
+
+ {
+ CSingleLock lock(m_clientAccess);
+
+ if (m_gameClient.Initialized())
 {
- try { m_struct.toAddon.UpdatePort(port, false, nullptr); }
- catch (...) { m_gameClient.LogException("UpdatePort()"); }
+ try
+ {
+ m_struct.toAddon.EnableKeyboard(false, nullptr);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("EnableKeyboard()");
+ }
 }
 }
 }
 
-void CGameClientInput::OpenKeyboard()
+bool CGameClientInput::OpenMouse(const ControllerPtr &controller)
 {
- m_keyboard.reset(new CGameClientKeyboard(m_gameClient, m_struct.toAddon, &CServiceBroker::GetInputManager()));
+ using namespace JOYSTICK;
+
+ if (!controller)
+ {
+ CLog::Log(LOGERROR, "Failed to open mouse, no controller given");
+ return false;
+ }
+
+ //! @todo Move to player manager
+ PERIPHERALS::PeripheralVector mice;
+ CServiceBroker::GetPeripherals().GetPeripheralsWithFeature(mice, PERIPHERALS::FEATURE_MOUSE);
+ if (mice.empty())
+ return false;
+
+ std::string controllerId = controller->ID();
+
+ game_controller controllerStruct{};
+
+ controllerStruct.controller_id = controllerId.c_str();
+ controllerStruct.digital_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::DIGITAL);
+ controllerStruct.analog_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::ANALOG);
+ controllerStruct.analog_stick_count = controller->FeatureCount(FEATURE_TYPE::ANALOG_STICK);
+ controllerStruct.accelerometer_count = controller->FeatureCount(FEATURE_TYPE::ACCELEROMETER);
+ controllerStruct.key_count = controller->FeatureCount(FEATURE_TYPE::KEY);
+ controllerStruct.rel_pointer_count = controller->FeatureCount(FEATURE_TYPE::RELPOINTER);
+ controllerStruct.abs_pointer_count = controller->FeatureCount(FEATURE_TYPE::ABSPOINTER);
+ controllerStruct.motor_count = controller->FeatureCount(FEATURE_TYPE::MOTOR);
+
+ bool bSuccess = false;
+
+ {
+ CSingleLock lock(m_clientAccess);
+
+ if (m_gameClient.Initialized())
+ {
+ try
+ {
+ bSuccess = m_struct.toAddon.EnableMouse(true, &controllerStruct);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("EnableMouse()");
+ }
+ }
+ }
+
+ if (bSuccess)
+ {
+ m_mouse.reset(new CGameClientMouse(m_gameClient, controllerId, m_struct.toAddon, mice.at(0).get()));
+ return true;
+ }
+
+ return false;
 }
 
-void CGameClientInput::CloseKeyboard()
+void CGameClientInput::CloseMouse()
 {
- m_keyboard.reset();
+ m_mouse.reset();
+
+ {
+ CSingleLock lock(m_clientAccess);
+
+ if (m_gameClient.Initialized())
+ {
+ try
+ {
+ m_struct.toAddon.EnableMouse(false, nullptr);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("EnableMouse()");
+ }
+ }
+ }
 }
 
-void CGameClientInput::OpenMouse()
+bool CGameClientInput::OpenJoystick(const std::string &portAddress, const ControllerPtr &controller)
 {
- m_mouse.reset(new CGameClientMouse(m_gameClient, m_struct.toAddon, &CServiceBroker::GetInputManager()));
+ using namespace JOYSTICK;
 
- CSingleLock lock(m_clientAccess);
+ if (!controller)
+ {
+ CLog::Log(LOGERROR, "Failed to open port \"%s\", no controller given", portAddress.c_str());
+ return false;
+ }
+
+ const CControllerPortNode &port = m_controllers.GetPort(portAddress);
+ if (!port.IsControllerAccepted(portAddress, controller->ID()))
+ {
+ CLog::Log(LOGERROR, "Failed to open port: Invalid controller \"%s\" on port \"%s\"",
+ controller->ID().c_str(), portAddress.c_str());
+ return false;
+ }
+
+ std::string strId = controller->ID();
+
+ game_controller controllerStruct{};
+
+ controllerStruct.controller_id = strId.c_str();
+ controllerStruct.provides_input = controller->Topology().ProvidesInput();
+ controllerStruct.digital_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::DIGITAL);
+ controllerStruct.analog_button_count = controller->FeatureCount(FEATURE_TYPE::SCALAR, INPUT_TYPE::ANALOG);
+ controllerStruct.analog_stick_count = controller->FeatureCount(FEATURE_TYPE::ANALOG_STICK);
+ controllerStruct.accelerometer_count = controller->FeatureCount(FEATURE_TYPE::ACCELEROMETER);
+ controllerStruct.key_count = controller->FeatureCount(FEATURE_TYPE::KEY);
+ controllerStruct.rel_pointer_count = controller->FeatureCount(FEATURE_TYPE::RELPOINTER);
+ controllerStruct.abs_pointer_count = controller->FeatureCount(FEATURE_TYPE::ABSPOINTER);
+ controllerStruct.motor_count = controller->FeatureCount(FEATURE_TYPE::MOTOR);
+
+ bool bSuccess = false;
 
- if (m_gameClient.Initialized())
 {
- std::string strId = m_mouse->ControllerID();
+ CSingleLock lock(m_clientAccess);
 
- game_controller controllerStruct = { strId.c_str() };
+ if (m_gameClient.Initialized())
+ {
+ try
+ {
+ bSuccess = m_struct.toAddon.ConnectController(true, portAddress.c_str(), &controllerStruct);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("ConnectController()");
+ }
+ }
+ }
 
- try { m_struct.toAddon.UpdatePort(GAME_INPUT_PORT_MOUSE, true, &controllerStruct); }
- catch (...) { m_gameClient.LogException("UpdatePort()"); }
+ if (bSuccess)
+ {
+ m_joysticks[portAddress].reset(new CGameClientJoystick(m_gameClient, portAddress, controller, m_struct.toAddon));
+ ProcessJoysticks();
+ return true;
 }
+
+ return false;
 }
 
-void CGameClientInput::CloseMouse()
+void CGameClientInput::CloseJoystick(const std::string &portAddress)
 {
+ auto it = m_joysticks.find(portAddress);
+ if (it != m_joysticks.end())
+ {
+ std::unique_ptr<CGameClientJoystick> joystick = std::move(it->second);
+ m_joysticks.erase(it);
+ ProcessJoysticks();
+ }
+
 {
 CSingleLock lock(m_clientAccess);
 
 if (m_gameClient.Initialized())
 {
- try { m_struct.toAddon.UpdatePort(GAME_INPUT_PORT_MOUSE, false, nullptr); }
- catch (...) { m_gameClient.LogException("UpdatePort()"); }
+ try
+ {
+ m_struct.toAddon.ConnectController(false, portAddress.c_str(), nullptr);
+ }
+ catch (...)
+ {
+ m_gameClient.LogException("ConnectController()");
+ }
 }
 }
+}
 
- m_mouse.reset();
+void CGameClientInput::HardwareReset()
+{
+ if (m_hardware)
+ m_hardware->OnResetButton();
 }
 
-bool CGameClientInput::SetRumble(unsigned int port, const std::string& feature, float magnitude)
+bool CGameClientInput::ReceiveInputEvent(const game_input_event& event)
 {
 bool bHandled = false;
 
- if (m_joysticks.find(port) != m_joysticks.end())
- bHandled = m_joysticks[port]->SetRumble(feature, magnitude);
+ switch (event.type)
+ {
+ case GAME_INPUT_EVENT_MOTOR:
+ if (event.port_address != nullptr && event.feature_name != nullptr)
+ bHandled = SetRumble(event.port_address, event.feature_name, event.motor.magnitude);
+ break;
+ default:
+ break;
+ }
 
 return bHandled;
 }
 
+bool CGameClientInput::SetRumble(const std::string &portAddress, const std::string& feature, float magnitude)
+{
+ bool bHandled = false;
+
+ auto it = m_joysticks.find(portAddress);
+ if (it != m_joysticks.end())
+ bHandled = it->second->SetRumble(feature, magnitude);
+
+ return bHandled;
+}
+
+void CGameClientInput::Notify(const Observable& obs, const ObservableMessage msg)
+{
+ switch (msg)
+ {
+ case ObservableMessagePeripheralsChanged:
+ {
+ ProcessJoysticks();
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+void CGameClientInput::ProcessJoysticks()
+{
+ PERIPHERALS::PeripheralVector joysticks;
+ CServiceBroker::GetPeripherals().GetPeripheralsWithFeature(joysticks, PERIPHERALS::FEATURE_JOYSTICK);
+
+ // Perform the port mapping
+ PortMap newPortMap = MapJoysticks(joysticks, m_joysticks);
+
+ // Update each joystick
+ for (auto& peripheralJoystick : joysticks)
+ {
+ // Upcast to input interface
+ JOYSTICK::IInputProvider *inputProvider = peripheralJoystick.get();
+
+ auto itConnectedPort = newPortMap.find(inputProvider);
+ auto itDisconnectedPort = m_portMap.find(inputProvider);
+
+ CGameClientJoystick* newJoystick = itConnectedPort != newPortMap.end() ? itConnectedPort->second : nullptr;
+ CGameClientJoystick* oldJoystick = itDisconnectedPort != m_portMap.end() ? itDisconnectedPort->second : nullptr;
+
+ if (oldJoystick != newJoystick)
+ {
+ // Unregister old input handler
+ if (oldJoystick != nullptr)
+ {
+ oldJoystick->UnregisterInput(inputProvider);
+ m_portMap.erase(itDisconnectedPort);
+ }
+
+ // Register new handler
+ if (newJoystick != nullptr)
+ {
+ newJoystick->RegisterInput(inputProvider);
+ m_portMap[inputProvider] = newJoystick;
+ }
+ }
+ }
+}
+
+CGameClientInput::PortMap CGameClientInput::MapJoysticks(const PERIPHERALS::PeripheralVector &peripheralJoysticks,
+ const JoystickMap &gameClientjoysticks) const
+{
+ PortMap result;
+
+ //! @todo Preserve existing joystick ports
+
+ unsigned int i = 0;
+ for (const auto &it : gameClientjoysticks)
+ {
+ if (i >= peripheralJoysticks.size())
+ break;
+
+ // Check topology player limit
+ if (m_playerLimit >= 0 && static_cast<int>(i) >= m_playerLimit)
+ break;
+
+ // Dereference iterators
+ const PERIPHERALS::PeripheralPtr &peripheralJoystick = peripheralJoysticks[i++];
+ const std::unique_ptr<CGameClientJoystick> &gameClientJoystick = it.second;
+
+ // Map input provider to input handler
+ result[peripheralJoystick.get()] = gameClientJoystick.get();
+ }
+
+ return result;
+}
+
 ControllerVector CGameClientInput::GetControllers(const CGameClient &gameClient)
 {
 using namespace ADDON;
@@ -236,10 +549,10 @@
 
 CGameServices& gameServices = CServiceBroker::GetGameServices();
 
- const ADDONDEPS& dependencies = gameClient.GetDeps();
- for (ADDONDEPS::const_iterator it = dependencies.begin(); it != dependencies.end(); ++it)
+ const auto& dependencies = gameClient.GetDependencies();
+ for (auto it = dependencies.begin(); it != dependencies.end(); ++it)
 {
- ControllerPtr controller = gameServices.GetController(it->first);
+ ControllerPtr controller = gameServices.GetController(it->id);
 if (controller)
 controllers.push_back(controller);
 }

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientInput.h Changed

@@ -20,7 +20,10 @@
 #pragma once
 
 #include "games/addons/GameClientSubsystem.h"
+#include "games/controllers/types/ControllerTree.h"
 #include "games/controllers/ControllerTypes.h"
+#include "peripherals/PeripheralTypes.h"
+#include "utils/Observer.h"
 
 #include <map>
 #include <memory>
@@ -31,6 +34,11 @@
 
 namespace KODI
 {
+namespace JOYSTICK
+{
+ class IInputProvider;
+}
+
 namespace GAME
 {
 class CGameClient;
@@ -39,7 +47,8 @@
 class CGameClientKeyboard;
 class CGameClientMouse;
 
- class CGameClientInput : protected CGameClientSubsystem
+ class CGameClientInput : protected CGameClientSubsystem,
+ public Observer
 {
 public:
 CGameClientInput(CGameClient &gameClient,
@@ -53,30 +62,57 @@
 // Input functions
 bool AcceptsInput() const;
 
+ // Topology functions
+ const CControllerTree &GetControllerTree() const { return m_controllers; }
+ bool SupportsKeyboard() const;
+ bool SupportsMouse() const;
+
+ // Keyboard functions
+ bool OpenKeyboard(const ControllerPtr &controller);
+ void CloseKeyboard();
+
+ // Mouse functions
+ bool OpenMouse(const ControllerPtr &controller);
+ void CloseMouse();
+
+ // Joystick functions
+ bool OpenJoystick(const std::string &portAddress, const ControllerPtr &controller);
+ void CloseJoystick(const std::string &portAddress);
+
+ // Hardware input functions
+ void HardwareReset();
+
 // Input callbacks
- bool OpenPort(unsigned int port);
- void ClosePort(unsigned int port);
 bool ReceiveInputEvent(const game_input_event& eventStruct);
 
+ // Implementation of Observer
+ void Notify(const Observable& obs, const ObservableMessage msg) override;
+
 private:
+ using PortAddress = std::string;
+ using JoystickMap = std::map<PortAddress, std::unique_ptr<CGameClientJoystick>>;
+ using PortMap = std::map<JOYSTICK::IInputProvider*, CGameClientJoystick*>;
+
 // Private input helpers
- void UpdatePort(unsigned int port, const ControllerPtr& controller);
- void OpenKeyboard();
- void CloseKeyboard();
- void OpenMouse();
- void CloseMouse();
+ void LoadTopology();
+ void ProcessJoysticks();
+ PortMap MapJoysticks(const PERIPHERALS::PeripheralVector &peripheralJoysticks,
+ const JoystickMap &gameClientjoysticks) const;
 
 // Private callback helpers
- bool SetRumble(unsigned int port, const std::string& feature, float magnitude);
+ bool SetRumble(const std::string &portAddress, const std::string& feature, float magnitude);
 
 // Helper functions
 static ControllerVector GetControllers(const CGameClient &gameClient);
 
 // Input properties
- std::map<int, std::unique_ptr<CGameClientJoystick>> m_joysticks;
+ CControllerTree m_controllers;
+ JoystickMap m_joysticks;
+ PortMap m_portMap;
 std::unique_ptr<CGameClientKeyboard> m_keyboard;
 std::unique_ptr<CGameClientMouse> m_mouse;
 std::unique_ptr<CGameClientHardware> m_hardware;
+ int m_playerLimit = -1; // No limit
 };
 } // namespace GAME
 } // namespace KODI

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientJoystick.cpp Changed

@@ -22,6 +22,7 @@
 #include "GameClientInput.h"
 #include "games/addons/GameClient.h"
 #include "games/controllers/Controller.h"
+#include "games/ports/Port.h"
 #include "input/joysticks/interfaces/IInputReceiver.h"
 #include "utils/log.h"
 
@@ -31,17 +32,30 @@
 using namespace GAME;
 
 CGameClientJoystick::CGameClientJoystick(const CGameClient &gameClient,
-                                         int port,
+                                         const std::string &portAddress,
                                          const ControllerPtr& controller,
                                          const KodiToAddonFuncTable_Game &dllStruct) :
   m_gameClient(gameClient),
-  m_port(port),
+  m_portAddress(portAddress),
   m_controller(controller),
-  m_dllStruct(dllStruct)
+  m_dllStruct(dllStruct),
+  m_port(new CPort(this))
 {
   assert(m_controller.get() != NULL);
 }
 
+CGameClientJoystick::~CGameClientJoystick() = default;
+
+void CGameClientJoystick::RegisterInput(JOYSTICK::IInputProvider *inputProvider)
+{
+  m_port->RegisterInput(inputProvider);
+}
+
+void CGameClientJoystick::UnregisterInput(JOYSTICK::IInputProvider *inputProvider)
+{
+  m_port->UnregisterInput(inputProvider);
+}
+
 std::string CGameClientJoystick::ControllerID(void) const
 {
   return m_controller->ID();
@@ -75,8 +89,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type                   = GAME_INPUT_EVENT_DIGITAL_BUTTON;
-  event.port                   = m_port;
   event.controller_id          = controllerId.c_str();
+  event.port_type              = GAME_PORT_CONTROLLER;
+  event.port_address           = m_portAddress.c_str();
   event.feature_name           = feature.c_str();
   event.digital_button.pressed = bPressed;
 
@@ -101,8 +116,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type                    = GAME_INPUT_EVENT_ANALOG_BUTTON;
-  event.port                    = m_port;
   event.controller_id           = controllerId.c_str();
+  event.port_type               = GAME_PORT_CONTROLLER;
+  event.port_address            = m_portAddress.c_str();
   event.feature_name            = feature.c_str();
   event.analog_button.magnitude = magnitude;
 
@@ -127,8 +143,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type           = GAME_INPUT_EVENT_ANALOG_STICK;
-  event.port           = m_port;
   event.controller_id  = controllerId.c_str();
+  event.port_type      = GAME_PORT_CONTROLLER;
+  event.port_address   = m_portAddress.c_str();
   event.feature_name   = feature.c_str();
   event.analog_stick.x = x;
   event.analog_stick.y = y;
@@ -154,8 +171,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type            = GAME_INPUT_EVENT_ACCELEROMETER;
-  event.port            = m_port;
   event.controller_id   = controllerId.c_str();
+  event.port_type       = GAME_PORT_CONTROLLER;
+  event.port_address    = m_portAddress.c_str();
   event.feature_name    = feature.c_str();
   event.accelerometer.x = x;
   event.accelerometer.y = y;
@@ -182,8 +200,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type                    = GAME_INPUT_EVENT_AXIS;
-  event.port                    = m_port;
   event.controller_id           = controllerId.c_str();
+  event.port_type               = GAME_PORT_CONTROLLER;
+  event.port_address            = m_portAddress.c_str();
   event.feature_name            = feature.c_str();
   event.axis.position           = position;
 
@@ -209,8 +228,9 @@
   std::string controllerId = m_controller->ID();
 
   event.type                    = GAME_INPUT_EVENT_AXIS;
-  event.port                    = m_port;
   event.controller_id           = controllerId.c_str();
+  event.port_type               = GAME_PORT_CONTROLLER;
+  event.port_address            = m_portAddress.c_str();
   event.feature_name            = feature.c_str();
   event.axis.position           = position;

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientJoystick.h Changed

@@ -22,13 +22,21 @@
 #include "games/controllers/ControllerTypes.h"
 #include "input/joysticks/interfaces/IInputHandler.h"
 
+#include <memory>
+
 struct KodiToAddonFuncTable_Game;
 
 namespace KODI
 {
+namespace JOYSTICK
+{
+ class IInputProvider;
+}
+
 namespace GAME
 {
 class CGameClient;
+ class CPort;
 
 /*!
 * \ingroup games
@@ -47,11 +55,14 @@
 * \param dllStruct The emulator or game to which the events are sent.
 */
 CGameClientJoystick(const CGameClient &addon,
- int port,
+ const std::string &portAddress,
 const ControllerPtr& controller,
 const KodiToAddonFuncTable_Game &dllStruct);
 
- virtual ~CGameClientJoystick() = default;
+ ~CGameClientJoystick() override;
+
+ void RegisterInput(JOYSTICK::IInputProvider *inputProvider);
+ void UnregisterInput(JOYSTICK::IInputProvider *inputProvider);
 
 // Implementation of IInputHandler
 virtual std::string ControllerID(void) const override;
@@ -68,10 +79,14 @@
 bool SetRumble(const std::string& feature, float magnitude);
 
 private:
+ // Construction parameters
 const CGameClient &m_gameClient;
- const int m_port;
+ const std::string m_portAddress;
 const ControllerPtr m_controller;
 const KodiToAddonFuncTable_Game &m_dllStruct;
+
+ // Input parameters
+ std::unique_ptr<CPort> m_port;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientKeyboard.cpp Changed

@@ -27,19 +27,23 @@
 #include "input/Key.h"
 #include "utils/log.h"
 
+#include <utility>
+
 using namespace KODI;
 using namespace GAME;
 
 #define BUTTON_INDEX_MASK 0x01ff
 
 CGameClientKeyboard::CGameClientKeyboard(const CGameClient &gameClient,
+ std::string controllerId,
 const KodiToAddonFuncTable_Game &dllStruct,
 KEYBOARD::IKeyboardInputProvider *inputProvider) :
 m_gameClient(gameClient),
+ m_controllerId(std::move(controllerId)),
 m_dllStruct(dllStruct),
 m_inputProvider(inputProvider)
 {
- m_inputProvider->RegisterKeyboardHandler(this);
+ m_inputProvider->RegisterKeyboardHandler(this, false);
 }
 
 CGameClientKeyboard::~CGameClientKeyboard()
@@ -47,7 +51,26 @@
 m_inputProvider->UnregisterKeyboardHandler(this);
 }
 
-bool CGameClientKeyboard::OnKeyPress(const CKey& key)
+std::string CGameClientKeyboard::ControllerID() const
+{
+ return m_controllerId;
+}
+
+bool CGameClientKeyboard::HasKey(const KEYBOARD::KeyName &key) const
+{
+ try
+ {
+ return m_dllStruct.HasFeature(ControllerID().c_str(), key.c_str());
+ }
+ catch (...)
+ {
+ CLog::Log(LOGERROR, "GAME: %s: exception caught in HasFeature()", m_gameClient.ID().c_str());
+ }
+
+ return false;
+}
+
+bool CGameClientKeyboard::OnKeyPress(const KEYBOARD::KeyName &key, KEYBOARD::Modifier mod, uint32_t unicode)
 {
 // Only allow activated input in fullscreen game
 if (!m_gameClient.Input().AcceptsInput())
@@ -61,49 +84,45 @@
 game_input_event event;
 
 event.type = GAME_INPUT_EVENT_KEY;
- event.port = GAME_INPUT_PORT_KEYBOARD;
- event.controller_id = ""; //! @todo
- event.feature_name = ""; //! @todo
+ event.controller_id = m_controllerId.c_str();
+ event.port_type = GAME_PORT_KEYBOARD;
+ event.port_address = ""; // Not used
+ event.feature_name = key.c_str();
 event.key.pressed = true;
- event.key.character = static_cast<XBMCVKey>(key.GetButtonCode() & BUTTON_INDEX_MASK);
- event.key.modifiers = CGameClientTranslator::GetModifiers(static_cast<CKey::Modifier>(key.GetModifiers()));
+ event.key.unicode = unicode;
+ event.key.modifiers = CGameClientTranslator::GetModifiers(mod);
 
- if (event.key.character != 0)
+ try
 {
- try
- {
- bHandled = m_dllStruct.InputEvent(&event);
- }
- catch (...)
- {
- CLog::Log(LOGERROR, "GAME: %s: exception caught in InputEvent()", m_gameClient.ID().c_str());
- }
+ bHandled = m_dllStruct.InputEvent(&event);
+ }
+ catch (...)
+ {
+ CLog::Log(LOGERROR, "GAME: %s: exception caught in InputEvent()", m_gameClient.ID().c_str());
 }
 
 return bHandled;
 }
 
-void CGameClientKeyboard::OnKeyRelease(const CKey& key)
+void CGameClientKeyboard::OnKeyRelease(const KEYBOARD::KeyName &key, KEYBOARD::Modifier mod, uint32_t unicode)
 {
 game_input_event event;
 
 event.type = GAME_INPUT_EVENT_KEY;
- event.port = GAME_INPUT_PORT_KEYBOARD;
- event.controller_id = ""; //! @todo
- event.feature_name = ""; //! @todo
+ event.controller_id = m_controllerId.c_str();
+ event.port_type = GAME_PORT_KEYBOARD;
+ event.port_address = ""; // Not used
+ event.feature_name = key.c_str();
 event.key.pressed = false;
- event.key.character = static_cast<XBMCVKey>(key.GetButtonCode() & BUTTON_INDEX_MASK);
- event.key.modifiers = CGameClientTranslator::GetModifiers(static_cast<CKey::Modifier>(key.GetModifiers()));
+ event.key.unicode = unicode;
+ event.key.modifiers = CGameClientTranslator::GetModifiers(mod);
 
- if (event.key.character != 0)
+ try
+ {
+ m_dllStruct.InputEvent(&event);
+ }
+ catch (...)
 {
- try
- {
- m_dllStruct.InputEvent(&event);
- }
- catch (...)
- {
- CLog::Log(LOGERROR, "GAME: %s: exception caught in InputEvent()", m_gameClient.ID().c_str());
- }
+ CLog::Log(LOGERROR, "GAME: %s: exception caught in InputEvent()", m_gameClient.ID().c_str());
 }
 }

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientKeyboard.h Changed

@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "input/keyboard/interfaces/IKeyboardHandler.h"
+#include "input/keyboard/interfaces/IKeyboardInputHandler.h"
 
 struct KodiToAddonFuncTable_Game;
 
@@ -40,16 +40,18 @@
    *
    * Listens to keyboard events and forwards them to the games (as game_input_event).
    */
-  class CGameClientKeyboard : public KEYBOARD::IKeyboardHandler
+  class CGameClientKeyboard : public KEYBOARD::IKeyboardInputHandler
   {
   public:
     /*!
      * \brief Constructor registers for keyboard events at CInputManager.
      * \param gameClient The game client implementation.
+     * \param controllerId The controller profile used for input
      * \param dllStruct The emulator or game to which the events are sent.
      * \param inputProvider The interface providing us with keyboard input.
      */
     CGameClientKeyboard(const CGameClient &gameClient,
+                        std::string controllerId,
                         const KodiToAddonFuncTable_Game &dllStruct,
                         KEYBOARD::IKeyboardInputProvider *inputProvider);
 
@@ -58,13 +60,16 @@
      */
     virtual ~CGameClientKeyboard();
 
-    // implementation of IKeyboardHandler
-    virtual bool OnKeyPress(const CKey& key) override;
-    virtual void OnKeyRelease(const CKey& key) override;
+    // implementation of IKeyboardInputHandler
+    std::string ControllerID() const override;
+    bool HasKey(const KEYBOARD::KeyName &key) const override;
+    bool OnKeyPress(const KEYBOARD::KeyName &key, KEYBOARD::Modifier mod, uint32_t unicode) override;
+    void OnKeyRelease(const KEYBOARD::KeyName &key, KEYBOARD::Modifier mod, uint32_t unicode) override;
 
   private:
     // Construction parameters
     const CGameClient &m_gameClient;
+    const std::string m_controllerId;
     const KodiToAddonFuncTable_Game &m_dllStruct;
     KEYBOARD::IKeyboardInputProvider *const m_inputProvider;
   };

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientMouse.cpp Changed

@@ -26,17 +26,21 @@
 #include "input/Key.h"
 #include "utils/log.h"
 
+#include <utility>
+
 using namespace KODI;
 using namespace GAME;
 
 CGameClientMouse::CGameClientMouse(const CGameClient &gameClient,
+ std::string controllerId,
 const KodiToAddonFuncTable_Game &dllStruct,
 MOUSE::IMouseInputProvider *inputProvider) :
 m_gameClient(gameClient),
+ m_controllerId(std::move(controllerId)),
 m_dllStruct(dllStruct),
- m_inputProvider(inputProvider),
- m_controllerId(inputProvider->RegisterMouseHandler(this))
+ m_inputProvider(inputProvider)
 {
+ inputProvider->RegisterMouseHandler(this, false);
 }
 
 CGameClientMouse::~CGameClientMouse()
@@ -59,11 +63,14 @@
 
 bool bHandled = false;
 
+ const std::string controllerId = ControllerID();
+
 game_input_event event;
 
 event.type = GAME_INPUT_EVENT_RELATIVE_POINTER;
- event.port = GAME_INPUT_PORT_MOUSE;
 event.controller_id = m_controllerId.c_str();
+ event.port_type = GAME_PORT_MOUSE;
+ event.port_address = ""; // Not used
 event.feature_name = relpointer.c_str();
 event.rel_pointer.x = dx;
 event.rel_pointer.y = dy;
@@ -93,8 +100,9 @@
 game_input_event event;
 
 event.type = GAME_INPUT_EVENT_DIGITAL_BUTTON;
- event.port = GAME_INPUT_PORT_MOUSE;
 event.controller_id = m_controllerId.c_str();
+ event.port_type = GAME_PORT_MOUSE;
+ event.port_address = ""; // Not used
 event.feature_name = button.c_str();
 event.digital_button.pressed = true;
 
@@ -115,8 +123,9 @@
 game_input_event event;
 
 event.type = GAME_INPUT_EVENT_DIGITAL_BUTTON;
- event.port = GAME_INPUT_PORT_MOUSE;
 event.controller_id = m_controllerId.c_str();
+ event.port_type = GAME_PORT_MOUSE;
+ event.port_address = ""; // Not used
 event.feature_name = button.c_str();
 event.digital_button.pressed = false;

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientMouse.h Changed

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientPort.cpp Added

@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 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 "GameClientPort.h"
+#include "GameClientDevice.h"
+#include "addons/kodi-addon-dev-kit/include/kodi/kodi_game_types.h"
+#include "games/addons/GameClientTranslator.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/ControllerTopology.h"
+#include "games/controllers/ControllerTranslator.h"
+#include "utils/StringUtils.h"
+
+#include <algorithm>
+
+using namespace KODI;
+using namespace GAME;
+
+CGameClientPort::CGameClientPort(const game_input_port &port) :
+ m_type(CGameClientTranslator::TranslatePortType(port.type)),
+ m_portId(port.port_id ? port.port_id : "")
+{
+ if (port.accepted_devices != nullptr)
+ {
+ for (unsigned int i = 0; i < port.device_count; i++)
+ {
+ std::unique_ptr<CGameClientDevice> device(new CGameClientDevice(port.accepted_devices[i]));
+
+ if (device->Controller() != CController::EmptyPtr)
+ m_acceptedDevices.emplace_back(std::move(device));
+ }
+ }
+}
+
+CGameClientPort::CGameClientPort(const ControllerVector &controllers) :
+ m_type(PORT_TYPE::CONTROLLER),
+ m_portId(DEFAULT_PORT_ID)
+{
+ for (const auto &controller : controllers)
+ m_acceptedDevices.emplace_back(new CGameClientDevice(controller));
+}
+
+CGameClientPort::CGameClientPort(const game_input_port &logicalPort, const CControllerPort &physicalPort) :
+ m_type(PORT_TYPE::CONTROLLER),
+ m_portId(physicalPort.ID())
+{
+ if (logicalPort.accepted_devices != nullptr)
+ {
+ for (unsigned int i = 0; i < logicalPort.device_count; i++)
+ {
+ // Ensure device is physically compatible
+ const game_input_device &deviceStruct = logicalPort.accepted_devices[i];
+ std::string controllerId = deviceStruct.controller_id ? deviceStruct.controller_id : "";
+
+ if (physicalPort.IsCompatible(controllerId))
+ {
+ std::unique_ptr<CGameClientDevice> device(new CGameClientDevice(deviceStruct));
+
+ if (device->Controller() != CController::EmptyPtr)
+ m_acceptedDevices.emplace_back(std::move(device));
+ }
+ }
+ }
+}
+
+CGameClientPort::~CGameClientPort() = default;

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientPort.h Added

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2017 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 "games/GameTypes.h"
+
+#include <string>
+
+struct game_input_device;
+struct game_input_port;
+
+namespace KODI
+{
+namespace GAME
+{
+ class CControllerPort;
+
+ /*!
+ * \ingroup games
+ * \brief Represents a port that devices can connect to
+ */
+ class CGameClientPort
+ {
+ public:
+ /*!
+ * \brief Construct a hardware port
+ *
+ * \param port The hardware port Game API struct
+ */
+ CGameClientPort(const game_input_port &port);
+
+ /*!
+ * \brief Construct a hardware port that accepts the given controllers
+ *
+ * \param controllers List of accepted controller profiles
+ *
+ * The port is given the ID specified by DEFAULT_PORT_ID.
+ */
+ CGameClientPort(const ControllerVector &controllers);
+
+ /*!
+ * \brief Construct a controller port
+ *
+ * \param logicalPort The logical port Game API struct
+ * \param physicalPort The physical port definition
+ *
+ * The physical port is defined by the controller profile. This definition
+ * specifies which controllers the port is physically compatible with.
+ *
+ * The logical port is defined by the emulator's input topology. This
+ * definition specifies which controllers the emulator's logic can handle.
+ *
+ * Obviously, the controllers specified by the logical port must be a subset
+ * of the controllers supported by the physical port.
+ */
+ CGameClientPort(const game_input_port &logicalPort, const CControllerPort &physicalPort);
+
+ /*!
+ * \brief Destructor
+ */
+ ~CGameClientPort();
+
+ /*!
+ * \brief Get the port type
+ *
+ * The port type identifies if this port is for a keyboard, mouse, or
+ * controller.
+ */
+ PORT_TYPE PortType() const { return m_type; }
+
+ /*!
+ * \brief Get the ID of the port
+ *
+ * The ID is used when creating a toplogical address for the port.
+ */
+ const std::string &ID() const { return m_portId; }
+
+ /*!
+ * \brief Get the list of devices accepted by this port
+ */
+ const GameClientDeviceVec &Devices() const { return m_acceptedDevices; }
+
+ private:
+ PORT_TYPE m_type;
+ std::string m_portId;
+ GameClientDeviceVec m_acceptedDevices;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientTopology.cpp Added

@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2017 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 "GameClientTopology.h"
+#include "GameClientDevice.h"
+#include "GameClientPort.h"
+#include "games/controllers/Controller.h"
+
+#include <sstream>
+#include <utility>
+
+using namespace KODI;
+using namespace GAME;
+
+#define CONTROLLER_ADDRESS_SEPARATOR "/"
+
+CGameClientTopology::CGameClientTopology(GameClientPortVec ports) :
+ m_ports(std::move(ports))
+{
+}
+
+CControllerTree CGameClientTopology::GetControllerTree() const
+{
+ return GetControllerTree(m_ports);
+}
+
+CControllerTree CGameClientTopology::GetControllerTree(const GameClientPortVec &ports)
+{
+ CControllerTree tree;
+
+ ControllerPortVec controllerPorts;
+ for (const GameClientPortPtr &port : ports)
+ {
+ CControllerPortNode portNode = GetPortNode(port, "");
+ controllerPorts.emplace_back(std::move(portNode));
+ }
+
+ tree.SetPorts(std::move(controllerPorts));
+
+ return tree;
+}
+
+CControllerPortNode CGameClientTopology::GetPortNode(const GameClientPortPtr &port, const std::string &address)
+{
+ CControllerPortNode portNode;
+
+ std::string portAddress = MakeAddress(address, port->ID());
+
+ portNode.SetConnected(false);
+ portNode.SetPortType(port->PortType());
+ portNode.SetPortID(port->ID());
+ portNode.SetAddress(portAddress);
+
+ ControllerNodeVec nodes;
+ for (const GameClientDevicePtr &device : port->Devices())
+ {
+ CControllerNode controllerNode = GetControllerNode(device, portAddress);
+ nodes.emplace_back(std::move(controllerNode));
+ }
+ portNode.SetCompatibleControllers(std::move(nodes));
+
+ return portNode;
+}
+
+CControllerNode CGameClientTopology::GetControllerNode(const GameClientDevicePtr &device, const std::string &address)
+{
+ CControllerNode controllerNode;
+
+ std::string controllerAddress = MakeAddress(address, device->Controller()->ID());
+
+ controllerNode.SetController(device->Controller());
+ controllerNode.SetAddress(controllerAddress);
+
+ ControllerPortVec ports;
+ for (const GameClientPortPtr &port : device->Ports())
+ {
+ CControllerPortNode portNode = GetPortNode(port, controllerAddress);
+ ports.emplace_back(std::move(portNode));
+ }
+
+ CControllerHub controllerHub;
+ controllerHub.SetPorts(std::move(ports));
+ controllerNode.SetHub(std::move(controllerHub));
+
+ return controllerNode;
+}
+
+std::string CGameClientTopology::MakeAddress(const std::string &baseAddress, const std::string &nodeId)
+{
+ std::ostringstream address;
+
+ if (!baseAddress.empty())
+ address << baseAddress << CONTROLLER_ADDRESS_SEPARATOR;
+
+ address << nodeId;
+
+ return address.str();
+}

_service:download_files:master.tar.gz/xbmc/games/addons/input/GameClientTopology.h Added

@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2017 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/types/ControllerTree.h"
+#include "games/GameTypes.h"
+
+#include <memory>
+
+namespace KODI
+{
+namespace GAME
+{
+ class CGameClientTopology
+ {
+ public:
+ CGameClientTopology(GameClientPortVec ports);
+
+ CControllerTree GetControllerTree() const;
+
+ private:
+ static CControllerTree GetControllerTree(const GameClientPortVec &ports);
+ static CControllerPortNode GetPortNode(const GameClientPortPtr &port, const std::string &address);
+ static CControllerNode GetControllerNode(const GameClientDevicePtr &device, const std::string &portAddress);
+
+ // Utility function
+ static std::string MakeAddress(const std::string &baseAddress, const std::string &nodeId);
+
+ GameClientPortVec m_ports;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/Controller.cpp Changed

@@ -21,6 +21,7 @@
 #include "Controller.h"
 #include "ControllerDefinitions.h"
 #include "ControllerLayout.h"
+#include "ControllerTopology.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
 #include "utils/XBMCTinyXML.h"
@@ -79,6 +80,21 @@
 
 CController::~CController() = default;
 
+const CControllerFeature& CController::GetFeature(const std::string &name) const
+{
+  auto it = std::find_if(m_features.begin(), m_features.end(),
+    [&name](const CControllerFeature &feature)
+    {
+      return name == feature.Name();
+    });
+
+  if (it != m_features.end())
+    return *it;
+
+  static const CControllerFeature invalid{};
+  return invalid;
+}
+
 unsigned int CController::FeatureCount(FEATURE_TYPE type /* = FEATURE_TYPE::UNKNOWN */,
                                        JOYSTICK::INPUT_TYPE inputType /* = JOYSTICK::INPUT_TYPE::UNKNOWN */) const
 {
@@ -150,3 +166,8 @@
 
   return m_bLoaded;
 }
+
+const CControllerTopology& CController::Topology() const
+{
+  return m_layout->Topology();
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/Controller.h Changed

@@ -34,6 +34,7 @@
 namespace GAME
 {
 class CControllerLayout;
+class CControllerTopology;
 
 using JOYSTICK::FEATURE_TYPE;
 
@@ -56,6 +57,15 @@
 const std::vector<CControllerFeature>& Features(void) const { return m_features; }
 
 /*!
+ * \brief Get a feature by its name
+ *
+ * \param name The feature name
+ *
+ * \return The feature, or a feature of type FEATURE_TYPE::UNKNOWN if the name is invalid
+ */
+ const CControllerFeature& GetFeature(const std::string &name) const;
+
+ /*!
 * \brief Get the count of controller features matching the specified types
 *
 * \param type The feature type, or FEATURE_TYPE::UNKNOWN to match all feature types
@@ -103,6 +113,15 @@
 */
 const CControllerLayout& Layout(void) const { return *m_layout; }
 
+ /*!
+ * \brief Get the controller's physical topology
+ *
+ * This defines how controllers physically connect to each other.
+ *
+ * \return The physical topology of the controller
+ */
+ const CControllerTopology& Topology() const;
+
 private:
 std::unique_ptr<CControllerLayout> m_layout;
 std::vector<CControllerFeature> m_features;

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerDefinitions.h Changed

@@ -19,6 +19,7 @@
  */
 #pragma once
 
+// XML definitions
 #define LAYOUT_XML_ROOT                    "layout"
 #define LAYOUT_XML_ELM_CATEGORY            "category"
 #define LAYOUT_XML_ELM_BUTTON              "button"
@@ -29,6 +30,10 @@
 #define LAYOUT_XML_ELM_ABSPOINTER          "abspointer"
 #define LAYOUT_XML_ELM_WHEEL               "wheel"
 #define LAYOUT_XML_ELM_THROTTLE            "throttle"
+#define LAYOUT_XML_ELM_KEY                 "key"
+#define LAYOUT_XML_ELM_TOPOLOGY            "physicaltopology"
+#define LAYOUT_XML_ELM_PORT                "port"
+#define LAYOUT_XML_ELM_ACCEPTS             "accepts"
 #define LAYOUT_XML_ATTR_LAYOUT_LABEL       "label"
 #define LAYOUT_XML_ATTR_LAYOUT_ICON        "icon"
 #define LAYOUT_XML_ATTR_LAYOUT_IMAGE       "image"
@@ -37,7 +42,12 @@
 #define LAYOUT_XML_ATTR_FEATURE_NAME       "name"
 #define LAYOUT_XML_ATTR_FEATURE_LABEL      "label"
 #define LAYOUT_XML_ATTR_INPUT_TYPE         "type"
+#define LAYOUT_XML_ATTR_KEY_SYMBOL         "symbol"
+#define LAYOUT_XML_ATTR_PROVIDES_INPUT     "providesinput"
+#define LAYOUT_XML_ATTR_PORT_ID            "id"
+#define LAYOUT_XML_ATTR_CONTROLLER         "controller"
 
+// Controller definitions
 #define FEATURE_CATEGORY_FACE              "face"
 #define FEATURE_CATEGORY_SHOULDER          "shoulder"
 #define FEATURE_CATEGORY_TRIGGER           "triggers"

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerFeature.cpp Changed

@@ -32,6 +32,12 @@
 using namespace GAME;
 using namespace JOYSTICK;
 
+CControllerFeature::CControllerFeature(int labelId)
+{
+ Reset();
+ m_labelId = labelId;
+}
+
 void CControllerFeature::Reset(void)
 {
 *this = CControllerFeature();
@@ -48,6 +54,7 @@
 m_strName = rhs.m_strName;
 m_labelId = rhs.m_labelId;
 m_inputType = rhs.m_inputType;
+ m_keycode = rhs.m_keycode;
 }
 return *this;
 }
@@ -72,6 +79,9 @@
 if (m_labelId >= 0 && m_controller != nullptr)
 label = g_localizeStrings.GetAddonString(m_controller->ID(), m_labelId);
 
+ if (label.empty())
+ label = g_localizeStrings.Get(m_labelId);
+
 return label;
 }
 
@@ -135,6 +145,27 @@
 }
 }
 
+ // Keycode
+ if (m_type == FEATURE_TYPE::KEY)
+ {
+ std::string strSymbol = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_KEY_SYMBOL);
+ if (strSymbol.empty())
+ {
+ CLog::Log(LOGERROR, "<%s> tag has no \"%s\" attribute", strType.c_str(), LAYOUT_XML_ATTR_KEY_SYMBOL);
+ return false;
+ }
+ else
+ {
+ m_keycode = CControllerTranslator::TranslateKeysym(strSymbol);
+ if (m_keycode == XBMCK_UNKNOWN)
+ {
+ CLog::Log(LOGERROR, "<%s> tag - attribute \"%s\" is invalid: \"%s\"",
+ strType.c_str(), LAYOUT_XML_ATTR_KEY_SYMBOL, strSymbol.c_str());
+ return false;
+ }
+ }
+ }
+
 // Save controller for string translation
 m_controller = controller;

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerFeature.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerIDs.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerLayout.cpp Changed

@@ -21,6 +21,7 @@
 #include "ControllerLayout.h"
 #include "Controller.h"
 #include "ControllerDefinitions.h"
+#include "ControllerTopology.h"
 #include "ControllerTranslator.h"
 #include "guilib/LocalizeStrings.h"
 #include "utils/log.h"
@@ -32,12 +33,29 @@
 using namespace KODI;
 using namespace GAME;
 
+CControllerLayout::CControllerLayout() :
+ m_topology(new CControllerTopology)
+{
+}
+
+CControllerLayout::CControllerLayout(const CControllerLayout &other) :
+ m_controller(other.m_controller),
+ m_labelId(other.m_labelId),
+ m_icon(other.m_icon),
+ m_strImage(other.m_strImage),
+ m_topology(new CControllerTopology(*other.m_topology))
+{
+}
+
+CControllerLayout::~CControllerLayout() = default;
+
 void CControllerLayout::Reset(void)
 {
 m_controller = nullptr;
 m_labelId = -1;
 m_icon.clear();
 m_strImage.clear();
+ m_topology->Reset();
 }
 
 bool CControllerLayout::IsValid(bool bLog) const
@@ -106,7 +124,6 @@
 if (!image.empty())
 m_strImage = image;
 
- // Features
 for (const TiXmlElement* pChild = pElement->FirstChildElement(); pChild != nullptr; pChild = pChild->NextSiblingElement())
 {
 if (pChild->ValueStr() == LAYOUT_XML_ELM_CATEGORY)
@@ -122,6 +139,7 @@
 if (!strCategoryLabelId.empty())
 std::istringstream(strCategoryLabelId) >> categoryLabelId;
 
+ // Features
 for (const TiXmlElement* pFeature = pChild->FirstChildElement(); pFeature != nullptr; pFeature = pFeature->NextSiblingElement())
 {
 CControllerFeature feature;
@@ -130,6 +148,13 @@
 features.push_back(feature);
 }
 }
+ else if (pChild->ValueStr() == LAYOUT_XML_ELM_TOPOLOGY)
+ {
+ // Topology
+ CControllerTopology topology;
+ if (topology.Deserialize(pChild))
+ *m_topology = std::move(topology);
+ }
 else
 {
 CLog::Log(LOGDEBUG, "Ignoring <%s> tag", pChild->ValueStr().c_str());

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerLayout.h Changed

@@ -19,6 +19,7 @@
 */
 #pragma once
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -30,11 +31,14 @@
 {
 class CController;
 class CControllerFeature;
+class CControllerTopology;
 
 class CControllerLayout
 {
 public:
- CControllerLayout() = default;
+ CControllerLayout();
+ CControllerLayout(const CControllerLayout &other);
+ ~CControllerLayout();
 
 void Reset(void);
 
@@ -66,6 +70,17 @@
 std::string ImagePath(void) const;
 
 /*!
+ * \brief Get the physical topology of this controller
+ *
+ * The topology of a controller defines its ports and which controllers can
+ * physically be connected to them. Also, the topology defines if the
+ * controller can provide player input, which is false in the case of hubs.
+ *
+ * \return The physical topology of the controller
+ */
+ const CControllerTopology &Topology(void) const { return *m_topology; }
+
+ /*!
 * \brief Deserialize the specified XML element
 *
 * \param pLayoutElement The XML element
@@ -78,7 +93,8 @@
 const CController *m_controller = nullptr;
 int m_labelId = -1;
 std::string m_icon;
- std::string m_strImage;
+ std::string m_strImage;
+ std::unique_ptr<CControllerTopology> m_topology;
 };
 
 }

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerManager.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTopology.cpp Added

@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2017 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 "ControllerTopology.h"
+#include "ControllerDefinitions.h"
+#include "games/controllers/Controller.h"
+#include "games/GameServices.h"
+#include "utils/log.h"
+#include "utils/XMLUtils.h"
+#include "ServiceManager.h"
+#include <algorithm>
+
+using namespace KODI;
+using namespace GAME;
+
+// --- CControllerPort ---------------------------------------------------------
+
+CControllerPort::CControllerPort(std::string portId, std::vector<std::string> accepts) :
+ m_portId(std::move(portId)),
+ m_accepts(std::move(accepts))
+{
+}
+
+void CControllerPort::Reset(void)
+{
+ CControllerPort defaultPort;
+ *this = std::move(defaultPort);
+}
+
+bool CControllerPort::IsCompatible(const std::string &controllerId) const
+{
+ return std::find(m_accepts.begin(), m_accepts.end(), controllerId) != m_accepts.end();
+}
+
+bool CControllerPort::Deserialize(const TiXmlElement* pElement)
+{
+ Reset();
+
+ if (pElement == nullptr)
+ return false;
+
+ m_portId = XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_PORT_ID);
+
+ for (const TiXmlElement* pChild = pElement->FirstChildElement(); pChild != nullptr; pChild = pChild->NextSiblingElement())
+ {
+ if (pChild->ValueStr() == LAYOUT_XML_ELM_ACCEPTS)
+ {
+ std::string controller = XMLUtils::GetAttribute(pChild, LAYOUT_XML_ATTR_CONTROLLER);
+
+ if (!controller.empty())
+ m_accepts.emplace_back(std::move(controller));
+ else
+ CLog::Log(LOGWARNING, "<%s> tag is missing \"%s\" attribute", LAYOUT_XML_ELM_ACCEPTS, LAYOUT_XML_ATTR_CONTROLLER);
+ }
+ else
+ {
+ CLog::Log(LOGDEBUG, "Unknown physical topology port tag: <%s>", pChild->ValueStr().c_str());
+ }
+ }
+
+ return true;
+}
+
+// --- CControllerTopology -----------------------------------------------------
+
+CControllerTopology::CControllerTopology(bool bProvidesInput, std::vector<CControllerPort> ports) :
+ m_bProvidesInput(bProvidesInput),
+ m_ports(std::move(ports))
+{
+}
+
+void CControllerTopology::Reset()
+{
+ CControllerTopology defaultTopology;
+ *this = std::move(defaultTopology);
+}
+
+bool CControllerTopology::Deserialize(const TiXmlElement* pElement)
+{
+ Reset();
+
+ if (pElement == nullptr)
+ return false;
+
+ m_bProvidesInput = (XMLUtils::GetAttribute(pElement, LAYOUT_XML_ATTR_PROVIDES_INPUT) != "false");
+
+ for (const TiXmlElement* pChild = pElement->FirstChildElement(); pChild != nullptr; pChild = pChild->NextSiblingElement())
+ {
+ if (pChild->ValueStr() == LAYOUT_XML_ELM_PORT)
+ {
+ CControllerPort port;
+ if (port.Deserialize(pChild))
+ m_ports.emplace_back(std::move(port));
+ }
+ else
+ {
+ CLog::Log(LOGDEBUG, "Unknown physical topology tag: <%s>", pChild->ValueStr().c_str());
+ }
+ }
+
+ return true;
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTopology.h Added

@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2017 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/GameTypes.h"
+
+#include <string>
+#include <vector>
+
+class TiXmlElement;
+
+namespace KODI
+{
+namespace GAME
+{
+
+class CControllerPort
+{
+public:
+ CControllerPort() = default;
+
+ /*!
+ * \brief Create a controller port
+ *
+ * \param portId The port's ID
+ * \param accepts A list of controller IDs that this port accepts
+ */
+ CControllerPort(std::string portId, std::vector<std::string> accepts);
+
+ void Reset();
+
+ /*!
+ * \brief Get the ID of the port
+ *
+ * \return The port's ID, e.g. "1", as a string
+ */
+ const std::string &ID() const { return m_portId; }
+
+ /*!
+ * \brief Get the controllers that can connect to this port
+ *
+ * \return A list of controllers that are physically compatible with this port
+ */
+ const std::vector<std::string> &Accepts() const { return m_accepts; }
+
+ /*!
+ * \brief Check if the controller is compatible with this port
+ *
+ * \return True if the controller is accepted, false otherwise
+ */
+ bool IsCompatible(const std::string &controllerId) const;
+
+ bool Deserialize(const TiXmlElement* pElement);
+
+private:
+ std::string m_portId;
+ std::vector<std::string> m_accepts;
+};
+
+/*!
+ * \brief Represents the physical topology of controller add-ons
+ *
+ * The physical topology of a controller defines how many ports it has and
+ * whether it can provide player input (hubs like the Super Multitap don't
+ * provide input).
+ */
+class CControllerTopology
+{
+public:
+ CControllerTopology() = default;
+ CControllerTopology(bool bProvidesInput, std::vector<CControllerPort> ports);
+
+ void Reset();
+
+ /*!
+ * \brief Check if the controller can provide player input
+ *
+ * This allows hubs to specify that they provide no input
+ *
+ * \return True if the controller can provide player input, false otherwise
+ */
+ bool ProvidesInput() const { return m_bProvidesInput; }
+
+ /*!
+ * \brief Get a list of ports provided by this controller
+ *
+ * \return The ports
+ */
+ const std::vector<CControllerPort> &Ports() const { return m_ports; }
+
+ bool Deserialize(const TiXmlElement* pElement);
+
+private:
+ bool m_bProvidesInput = true;
+ std::vector<CControllerPort> m_ports;
+};
+
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTranslator.cpp Changed

@@ -37,6 +37,7 @@
     case FEATURE_TYPE::ABSPOINTER:       return LAYOUT_XML_ELM_ABSPOINTER;
     case FEATURE_TYPE::WHEEL:            return LAYOUT_XML_ELM_WHEEL;
     case FEATURE_TYPE::THROTTLE:         return LAYOUT_XML_ELM_THROTTLE;
+    case FEATURE_TYPE::KEY:              return LAYOUT_XML_ELM_KEY;
     default:
       break;
   }
@@ -53,6 +54,7 @@
   if (strType == LAYOUT_XML_ELM_ABSPOINTER)       return FEATURE_TYPE::ABSPOINTER;
   if (strType == LAYOUT_XML_ELM_WHEEL)            return FEATURE_TYPE::WHEEL;
   if (strType == LAYOUT_XML_ELM_THROTTLE)         return FEATURE_TYPE::THROTTLE;
+  if (strType == LAYOUT_XML_ELM_KEY)              return FEATURE_TYPE::KEY;
 
   return FEATURE_TYPE::UNKNOWN;
 }
@@ -124,3 +126,298 @@
 
   return INPUT_TYPE::UNKNOWN;
 }
+
+XBMCKey CControllerTranslator::TranslateKeysym(const std::string &symbol)
+{
+  if (symbol == "backspace") return XBMCK_BACKSPACE;
+  if (symbol == "tab") return XBMCK_TAB;
+  if (symbol == "clear") return XBMCK_CLEAR;
+  if (symbol == "enter") return XBMCK_RETURN;
+  if (symbol == "pause") return XBMCK_PAUSE;
+  if (symbol == "escape") return XBMCK_ESCAPE;
+  if (symbol == "space") return XBMCK_SPACE;
+  if (symbol == "exclaim") return XBMCK_EXCLAIM;
+  if (symbol == "doublequote") return XBMCK_QUOTEDBL;
+  if (symbol == "hash") return XBMCK_HASH;
+  if (symbol == "dollar") return XBMCK_DOLLAR;
+  if (symbol == "ampersand") return XBMCK_AMPERSAND;
+  if (symbol == "quote") return XBMCK_QUOTE;
+  if (symbol == "leftparen") return XBMCK_LEFTPAREN;
+  if (symbol == "rightparen") return XBMCK_RIGHTPAREN;
+  if (symbol == "asterisk") return XBMCK_ASTERISK;
+  if (symbol == "plus") return XBMCK_PLUS;
+  if (symbol == "comma") return XBMCK_COMMA;
+  if (symbol == "minus") return XBMCK_MINUS;
+  if (symbol == "period") return XBMCK_PERIOD;
+  if (symbol == "slash") return XBMCK_SLASH;
+  if (symbol == "0") return XBMCK_0;
+  if (symbol == "1") return XBMCK_1;
+  if (symbol == "2") return XBMCK_2;
+  if (symbol == "3") return XBMCK_3;
+  if (symbol == "4") return XBMCK_4;
+  if (symbol == "5") return XBMCK_5;
+  if (symbol == "6") return XBMCK_6;
+  if (symbol == "7") return XBMCK_7;
+  if (symbol == "8") return XBMCK_8;
+  if (symbol == "9") return XBMCK_9;
+  if (symbol == "colon") return XBMCK_COLON;
+  if (symbol == "semicolon") return XBMCK_SEMICOLON;
+  if (symbol == "less") return XBMCK_LESS;
+  if (symbol == "equals") return XBMCK_EQUALS;
+  if (symbol == "greater") return XBMCK_GREATER;
+  if (symbol == "question") return XBMCK_QUESTION;
+  if (symbol == "at") return XBMCK_AT;
+  if (symbol == "leftbracket") return XBMCK_LEFTBRACKET;
+  if (symbol == "backslash") return XBMCK_BACKSLASH;
+  if (symbol == "rightbracket") return XBMCK_RIGHTBRACKET;
+  if (symbol == "caret") return XBMCK_CARET;
+  if (symbol == "underscore") return XBMCK_UNDERSCORE;
+  if (symbol == "grave") return XBMCK_BACKQUOTE;
+  if (symbol == "a") return XBMCK_a;
+  if (symbol == "b") return XBMCK_b;
+  if (symbol == "c") return XBMCK_c;
+  if (symbol == "d") return XBMCK_d;
+  if (symbol == "e") return XBMCK_e;
+  if (symbol == "f") return XBMCK_f;
+  if (symbol == "g") return XBMCK_g;
+  if (symbol == "h") return XBMCK_h;
+  if (symbol == "i") return XBMCK_i;
+  if (symbol == "j") return XBMCK_j;
+  if (symbol == "k") return XBMCK_k;
+  if (symbol == "l") return XBMCK_l;
+  if (symbol == "m") return XBMCK_m;
+  if (symbol == "n") return XBMCK_n;
+  if (symbol == "o") return XBMCK_o;
+  if (symbol == "p") return XBMCK_p;
+  if (symbol == "q") return XBMCK_q;
+  if (symbol == "r") return XBMCK_r;
+  if (symbol == "s") return XBMCK_s;
+  if (symbol == "t") return XBMCK_t;
+  if (symbol == "u") return XBMCK_u;
+  if (symbol == "v") return XBMCK_v;
+  if (symbol == "w") return XBMCK_w;
+  if (symbol == "x") return XBMCK_x;
+  if (symbol == "y") return XBMCK_y;
+  if (symbol == "z") return XBMCK_z;
+  if (symbol == "leftbrace") return XBMCK_LEFTBRACE;
+  if (symbol == "bar") return XBMCK_PIPE;
+  if (symbol == "rightbrace") return XBMCK_RIGHTBRACE;
+  if (symbol == "tilde") return XBMCK_TILDE;
+  if (symbol == "delete") return XBMCK_DELETE;
+  if (symbol == "kp0") return XBMCK_KP0;
+  if (symbol == "kp1") return XBMCK_KP1;
+  if (symbol == "kp2") return XBMCK_KP2;
+  if (symbol == "kp3") return XBMCK_KP3;
+  if (symbol == "kp4") return XBMCK_KP4;
+  if (symbol == "kp5") return XBMCK_KP5;
+  if (symbol == "kp6") return XBMCK_KP6;
+  if (symbol == "kp7") return XBMCK_KP7;
+  if (symbol == "kp8") return XBMCK_KP8;
+  if (symbol == "kp9") return XBMCK_KP9;
+  if (symbol == "kpperiod") return XBMCK_KP_PERIOD;
+  if (symbol == "kpdivide") return XBMCK_KP_DIVIDE;
+  if (symbol == "kpmultiply") return XBMCK_KP_MULTIPLY;
+  if (symbol == "kpminus") return XBMCK_KP_MINUS;
+  if (symbol == "kpplus") return XBMCK_KP_PLUS;
+  if (symbol == "kpenter") return XBMCK_KP_ENTER;
+  if (symbol == "kpequals") return XBMCK_KP_EQUALS;
+  if (symbol == "up") return XBMCK_UP;
+  if (symbol == "down") return XBMCK_DOWN;
+  if (symbol == "right") return XBMCK_RIGHT;
+  if (symbol == "left") return XBMCK_LEFT;
+  if (symbol == "insert") return XBMCK_INSERT;
+  if (symbol == "home") return XBMCK_HOME;
+  if (symbol == "end") return XBMCK_END;
+  if (symbol == "pageup") return XBMCK_PAGEUP;
+  if (symbol == "pagedown") return XBMCK_PAGEDOWN;
+  if (symbol == "f1") return XBMCK_F1;
+  if (symbol == "f2") return XBMCK_F2;
+  if (symbol == "f3") return XBMCK_F3;
+  if (symbol == "f4") return XBMCK_F4;
+  if (symbol == "f5") return XBMCK_F5;
+  if (symbol == "f6") return XBMCK_F6;
+  if (symbol == "f7") return XBMCK_F7;
+  if (symbol == "f8") return XBMCK_F8;
+  if (symbol == "f9") return XBMCK_F9;
+  if (symbol == "f10") return XBMCK_F10;
+  if (symbol == "f11") return XBMCK_F11;
+  if (symbol == "f12") return XBMCK_F12;
+  if (symbol == "f13") return XBMCK_F13;
+  if (symbol == "f14") return XBMCK_F14;
+  if (symbol == "f15") return XBMCK_F15;
+  if (symbol == "numlock") return XBMCK_NUMLOCK;
+  if (symbol == "capslock") return XBMCK_CAPSLOCK;
+  if (symbol == "scrolllock") return XBMCK_SCROLLOCK;
+  if (symbol == "leftshift") return XBMCK_LSHIFT;
+  if (symbol == "rightshift") return XBMCK_RSHIFT;
+  if (symbol == "leftctrl") return XBMCK_LCTRL;
+  if (symbol == "rightctrl") return XBMCK_RCTRL;
+  if (symbol == "leftalt") return XBMCK_LALT;
+  if (symbol == "rightalt") return XBMCK_RALT;
+  if (symbol == "leftmeta") return XBMCK_LMETA;
+  if (symbol == "rightmeta") return XBMCK_RMETA;
+  if (symbol == "leftsuper") return XBMCK_LSUPER;
+  if (symbol == "rightsuper") return XBMCK_RSUPER;
+  if (symbol == "mode") return XBMCK_MODE;
+  if (symbol == "compose") return XBMCK_COMPOSE;
+  if (symbol == "help") return XBMCK_HELP;
+  if (symbol == "printscreen") return XBMCK_PRINT;
+  if (symbol == "sysreq") return XBMCK_SYSREQ;
+  if (symbol == "break") return XBMCK_BREAK;
+  if (symbol == "menu") return XBMCK_MENU;
+  if (symbol == "power") return XBMCK_POWER;
+  if (symbol == "euro") return XBMCK_EURO;
+  if (symbol == "undo") return XBMCK_UNDO;
+
+  return XBMCK_UNKNOWN;
+}
+
+const char *CControllerTranslator::TranslateKeycode(XBMCKey keycode)
+{
+  switch (keycode)
+  {
+    case XBMCK_BACKSPACE: return "backspace";
+    case XBMCK_TAB: return "tab";
+    case XBMCK_CLEAR: return "clear";
+    case XBMCK_RETURN: return "enter";
+    case XBMCK_PAUSE: return "pause";
+    case XBMCK_ESCAPE: return "escape";
+    case XBMCK_SPACE: return "space";
+    case XBMCK_EXCLAIM: return "exclaim";
+    case XBMCK_QUOTEDBL: return "doublequote";
+    case XBMCK_HASH: return "hash";
+    case XBMCK_DOLLAR: return "dollar";
+    case XBMCK_AMPERSAND: return "ampersand";
+    case XBMCK_QUOTE: return "quote";
+    case XBMCK_LEFTPAREN: return "leftparen";
+    case XBMCK_RIGHTPAREN: return "rightparen";
+    case XBMCK_ASTERISK: return "asterisk";
+    case XBMCK_PLUS: return "plus";
+    case XBMCK_COMMA: return "comma";
+    case XBMCK_MINUS: return "minus";
+    case XBMCK_PERIOD: return "period";
+    case XBMCK_SLASH: return "slash";
+    case XBMCK_0: return "0";
+    case XBMCK_1: return "1";
+    case XBMCK_2: return "2";
+    case XBMCK_3: return "3";
+    case XBMCK_4: return "4";
+    case XBMCK_5: return "5";
+    case XBMCK_6: return "6";
+    case XBMCK_7: return "7";
+    case XBMCK_8: return "8";
+    case XBMCK_9: return "9";
+    case XBMCK_COLON: return "colon";
+    case XBMCK_SEMICOLON: return "semicolon";
+    case XBMCK_LESS: return "less";
+    case XBMCK_EQUALS: return "equals";
+    case XBMCK_GREATER: return "greater";
+    case XBMCK_QUESTION: return "question";
+    case XBMCK_AT: return "at";
+    case XBMCK_LEFTBRACKET: return "leftbracket";
+    case XBMCK_BACKSLASH: return "backslash";
+    case XBMCK_RIGHTBRACKET: return "rightbracket";
+    case XBMCK_CARET: return "caret";
+    case XBMCK_UNDERSCORE: return "underscore";
+    case XBMCK_BACKQUOTE: return "grave";
+    case XBMCK_a: return "a";
+    case XBMCK_b: return "b";
+    case XBMCK_c: return "c";
+    case XBMCK_d: return "d";
+    case XBMCK_e: return "e";
+    case XBMCK_f: return "f";
+    case XBMCK_g: return "g";
+    case XBMCK_h: return "h";
+    case XBMCK_i: return "i";
+    case XBMCK_j: return "j";
+    case XBMCK_k: return "k";
+    case XBMCK_l: return "l";
+    case XBMCK_m: return "m";
+    case XBMCK_n: return "n";
+    case XBMCK_o: return "o";
+    case XBMCK_p: return "p";
+    case XBMCK_q: return "q";
+    case XBMCK_r: return "r";
+    case XBMCK_s: return "s";
+    case XBMCK_t: return "t";
+    case XBMCK_u: return "u";
+    case XBMCK_v: return "v";
+    case XBMCK_w: return "w";
+    case XBMCK_x: return "x";
+    case XBMCK_y: return "y";
+    case XBMCK_z: return "z";
+    case XBMCK_LEFTBRACE: return "leftbrace";
+    case XBMCK_PIPE: return "bar";
+    case XBMCK_RIGHTBRACE: return "rightbrace";
+    case XBMCK_TILDE: return "tilde";
+    case XBMCK_DELETE: return "delete";
+    case XBMCK_KP0: return "kp0";
+    case XBMCK_KP1: return "kp1";
+    case XBMCK_KP2: return "kp2";
+    case XBMCK_KP3: return "kp3";
+    case XBMCK_KP4: return "kp4";
+    case XBMCK_KP5: return "kp5";
+    case XBMCK_KP6: return "kp6";
+    case XBMCK_KP7: return "kp7";
+    case XBMCK_KP8: return "kp8";
+    case XBMCK_KP9: return "kp9";
+    case XBMCK_KP_PERIOD: return "kpperiod";
+    case XBMCK_KP_DIVIDE: return "kpdivide";
+    case XBMCK_KP_MULTIPLY: return "kpmultiply";
+    case XBMCK_KP_MINUS: return "kpminus";
+    case XBMCK_KP_PLUS: return "kpplus";
+    case XBMCK_KP_ENTER: return "kpenter";
+    case XBMCK_KP_EQUALS: return "kpequals";
+    case XBMCK_UP: return "up";
+    case XBMCK_DOWN: return "down";
+    case XBMCK_RIGHT: return "right";
+    case XBMCK_LEFT: return "left";
+    case XBMCK_INSERT: return "insert";
+    case XBMCK_HOME: return "home";
+    case XBMCK_END: return "end";
+    case XBMCK_PAGEUP: return "pageup";
+    case XBMCK_PAGEDOWN: return "pagedown";
+    case XBMCK_F1: return "f1";
+    case XBMCK_F2: return "f2";
+    case XBMCK_F3: return "f3";
+    case XBMCK_F4: return "f4";
+    case XBMCK_F5: return "f5";
+    case XBMCK_F6: return "f6";
+    case XBMCK_F7: return "f7";
+    case XBMCK_F8: return "f8";
+    case XBMCK_F9: return "f9";
+    case XBMCK_F10: return "f10";
+    case XBMCK_F11: return "f11";
+    case XBMCK_F12: return "f12";
+    case XBMCK_F13: return "f13";
+    case XBMCK_F14: return "f14";
+    case XBMCK_F15: return "f15";
+    case XBMCK_NUMLOCK: return "numlock";
+    case XBMCK_CAPSLOCK: return "capslock";
+    case XBMCK_SCROLLOCK: return "scrolllock";
+    case XBMCK_LSHIFT: return "leftshift";
+    case XBMCK_RSHIFT: return "rightshift";
+    case XBMCK_LCTRL: return "leftctrl";
+    case XBMCK_RCTRL: return "rightctrl";
+    case XBMCK_LALT: return "leftalt";
+    case XBMCK_RALT: return "rightalt";
+    case XBMCK_LMETA: return "leftmeta";
+    case XBMCK_RMETA: return "rightmeta";
+    case XBMCK_LSUPER: return "leftsuper";
+    case XBMCK_RSUPER: return "rightsuper";
+    case XBMCK_MODE: return "mode";
+    case XBMCK_COMPOSE: return "compose";
+    case XBMCK_HELP: return "help";
+    case XBMCK_PRINT: return "printscreen";
+    case XBMCK_SYSREQ: return "sysreq";
+    case XBMCK_BREAK: return "break";
+    case XBMCK_MENU: return "menu";
+    case XBMCK_POWER: return "power";
+    case XBMCK_EURO: return "euro";
+    case XBMCK_UNDO: return "undo";
+    default:
+      break;
+  }
+
+  return "";
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/ControllerTypes.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/dialogs/GUIDialogButtonCapture.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIAnalogStickButton.cpp Deleted

@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 KODI;
-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::ANALOG_STICK_DIRECTION CGUIAnalogStickButton::GetAnalogStickDirection(void) const
-{
- using namespace JOYSTICK;
-
- switch (m_state)
- {
- case STATE::ANALOG_STICK_UP: return ANALOG_STICK_DIRECTION::UP;
- case STATE::ANALOG_STICK_RIGHT: return ANALOG_STICK_DIRECTION::RIGHT;
- case STATE::ANALOG_STICK_DOWN: return ANALOG_STICK_DIRECTION::DOWN;
- case STATE::ANALOG_STICK_LEFT: return ANALOG_STICK_DIRECTION::LEFT;
- default:
- break;
- }
-
- return ANALOG_STICK_DIRECTION::UNKNOWN;
-}
-
-void CGUIAnalogStickButton::Reset(void)
-{
- m_state = STATE::ANALOG_STICK_UP;
-}

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIAnalogStickButton.h Deleted

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 KODI
-{
-namespace GAME
-{
- class CGUIAnalogStickButton : public CGUIFeatureButton
- {
- public:
- CGUIAnalogStickButton(const CGUIButtonControl& buttonTemplate,
- IConfigurationWizard* wizard,
- const CControllerFeature& feature,
- unsigned int index);
-
- virtual ~CGUIAnalogStickButton() = default;
-
- // implementation of IFeatureButton
- virtual bool PromptForInput(CEvent& waitEvent) override;
- virtual bool IsFinished(void) const override;
- virtual JOYSTICK::ANALOG_STICK_DIRECTION GetAnalogStickDirection(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_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUICardinalFeatureButton.cpp Added

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016-2017 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 "GUICardinalFeatureButton.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/StringUtils.h"
+
+#include <string>
+
+using namespace KODI;
+using namespace GAME;
+
+CGUICardinalFeatureButton::CGUICardinalFeatureButton(const CGUIButtonControl& buttonTemplate,
+ IConfigurationWizard* wizard,
+ const CControllerFeature& feature,
+ unsigned int index) :
+ CGUIFeatureButton(buttonTemplate, wizard, feature, index)
+{
+ Reset();
+}
+
+bool CGUICardinalFeatureButton::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::CARDINAL_DIRECTION_UP:
+ strPrompt = g_localizeStrings.Get(35092); // "Move %s up"
+ strWarn = g_localizeStrings.Get(35093); // "Move %s up (%d)"
+ break;
+ case STATE::CARDINAL_DIRECTION_RIGHT:
+ strPrompt = g_localizeStrings.Get(35096); // "Move %s right"
+ strWarn = g_localizeStrings.Get(35097); // "Move %s right (%d)"
+ break;
+ case STATE::CARDINAL_DIRECTION_DOWN:
+ strPrompt = g_localizeStrings.Get(35094); // "Move %s down"
+ strWarn = g_localizeStrings.Get(35095); // "Move %s down (%d)"
+ break;
+ case STATE::CARDINAL_DIRECTION_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 CGUICardinalFeatureButton::IsFinished(void) const
+{
+ return m_state >= STATE::FINISHED;
+}
+
+KODI::INPUT::CARDINAL_DIRECTION CGUICardinalFeatureButton::GetCardinalDirection(void) const
+{
+ using namespace INPUT;
+
+ switch (m_state)
+ {
+ case STATE::CARDINAL_DIRECTION_UP: return CARDINAL_DIRECTION::UP;
+ case STATE::CARDINAL_DIRECTION_RIGHT: return CARDINAL_DIRECTION::RIGHT;
+ case STATE::CARDINAL_DIRECTION_DOWN: return CARDINAL_DIRECTION::DOWN;
+ case STATE::CARDINAL_DIRECTION_LEFT: return CARDINAL_DIRECTION::LEFT;
+ default:
+ break;
+ }
+
+ return CARDINAL_DIRECTION::NONE;
+}
+
+void CGUICardinalFeatureButton::Reset(void)
+{
+ m_state = STATE::CARDINAL_DIRECTION_UP;
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUICardinalFeatureButton.h Added

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2016-2017 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 KODI
+{
+namespace GAME
+{
+ class CGUICardinalFeatureButton : public CGUIFeatureButton
+ {
+ public:
+ CGUICardinalFeatureButton(const CGUIButtonControl& buttonTemplate,
+ IConfigurationWizard* wizard,
+ const CControllerFeature& feature,
+ unsigned int index);
+
+ virtual ~CGUICardinalFeatureButton() = default;
+
+ // implementation of IFeatureButton
+ virtual bool PromptForInput(CEvent& waitEvent) override;
+ virtual bool IsFinished(void) const override;
+ virtual INPUT::CARDINAL_DIRECTION GetCardinalDirection(void) const override;
+ virtual void Reset(void) override;
+
+ private:
+ enum class STATE
+ {
+ CARDINAL_DIRECTION_UP,
+ CARDINAL_DIRECTION_RIGHT,
+ CARDINAL_DIRECTION_DOWN,
+ CARDINAL_DIRECTION_LEFT,
+ FINISHED,
+ };
+
+ STATE m_state;
+ };
+
+ using CGUIAnalogStickButton = CGUICardinalFeatureButton;
+ using CGUIRelativePointerButton = CGUICardinalFeatureButton;
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIControlTypes.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureButton.h Changed

@@ -45,9 +45,9 @@
 
     // partial implementation of IFeatureButton
     virtual const CControllerFeature& Feature(void) const override { return m_feature; }
-    virtual JOYSTICK::ANALOG_STICK_DIRECTION GetAnalogStickDirection(void) const override { return JOYSTICK::ANALOG_STICK_DIRECTION::UNKNOWN; }
-    virtual JOYSTICK::WHEEL_DIRECTION GetWheelDirection(void) const override { return JOYSTICK::WHEEL_DIRECTION::UNKNOWN; }
-    virtual JOYSTICK::THROTTLE_DIRECTION GetThrottleDirection(void) const override { return JOYSTICK::THROTTLE_DIRECTION::UNKNOWN; }
+    virtual INPUT::CARDINAL_DIRECTION GetCardinalDirection(void) const override { return INPUT::CARDINAL_DIRECTION::NONE; }
+    virtual JOYSTICK::WHEEL_DIRECTION GetWheelDirection(void) const override { return JOYSTICK::WHEEL_DIRECTION::NONE; }
+    virtual JOYSTICK::THROTTLE_DIRECTION GetThrottleDirection(void) const override { return JOYSTICK::THROTTLE_DIRECTION::NONE; }
 
   protected:
     bool DoPrompt(const std::string& strPrompt, const std::string& strWarn, const std::string& strFeature, CEvent& waitEvent);

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIFeatureTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUISelectKeyButton.cpp Added

@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2017 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 "GUISelectKeyButton.h"
+#include "guilib/LocalizeStrings.h"
+#include "utils/StringUtils.h"
+
+#include <string>
+
+using namespace KODI;
+using namespace GAME;
+
+CGUISelectKeyButton::CGUISelectKeyButton(const CGUIButtonControl& buttonTemplate,
+ IConfigurationWizard* wizard,
+ unsigned int index) :
+ CGUIFeatureButton(buttonTemplate, wizard, GetFeature(), index)
+{
+}
+
+const CControllerFeature& CGUISelectKeyButton::Feature(void) const
+{
+ if (m_state == STATE::NEED_INPUT)
+ return m_selectedKey;
+
+ return CGUIFeatureButton::Feature();
+}
+
+bool CGUISelectKeyButton::PromptForInput(CEvent& waitEvent)
+{
+ bool bInterrupted = false;
+
+ switch (m_state)
+ {
+ case STATE::NEED_KEY:
+ {
+ std::string strPrompt = g_localizeStrings.Get(35169); // "Press a key"
+ std::string strWarn = g_localizeStrings.Get(35170); // "Press a key ({1:d})"
+
+ bInterrupted = DoPrompt(strPrompt, strWarn, "", waitEvent);
+
+ m_state = GetNextState(m_state);
+
+ break;
+ }
+ case STATE::NEED_INPUT:
+ {
+ std::string strPrompt = g_localizeStrings.Get(35090); // "Press {0:s}"
+ std::string strWarn = g_localizeStrings.Get(35091); // "Press {0:s} ({1:d})"
+
+ bInterrupted = DoPrompt(strPrompt, strWarn, m_selectedKey.Label(), waitEvent);
+
+ m_state = GetNextState(m_state);
+
+ break;
+ }
+ default:
+ break;
+ }
+
+ return bInterrupted;
+}
+
+bool CGUISelectKeyButton::IsFinished(void) const
+{
+ return m_state >= STATE::FINISHED;
+}
+
+void CGUISelectKeyButton::SetKey(const CControllerFeature &key)
+{
+ m_selectedKey = key;
+}
+
+void CGUISelectKeyButton::Reset(void)
+{
+ m_state = STATE::NEED_KEY;
+ m_selectedKey.Reset();
+}
+
+CControllerFeature CGUISelectKeyButton::GetFeature()
+{
+ return CControllerFeature(35168); // "Select key"
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUISelectKeyButton.h Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 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"
+#include "games/controllers/ControllerFeature.h"
+
+namespace KODI
+{
+namespace GAME
+{
+ class CGUISelectKeyButton : public CGUIFeatureButton
+ {
+ public:
+ CGUISelectKeyButton(const CGUIButtonControl& buttonTemplate,
+ IConfigurationWizard* wizard,
+ unsigned int index);
+
+ virtual ~CGUISelectKeyButton() = default;
+
+ // implementation of IFeatureButton
+ const CControllerFeature& Feature(void) const override;
+ bool AllowWizard() const override { return false; }
+ virtual bool PromptForInput(CEvent& waitEvent) override;
+ virtual bool IsFinished(void) const override;
+ bool NeedsKey() const override { return m_state == STATE::NEED_KEY; }
+ void SetKey(const CControllerFeature &key) override;
+ virtual void Reset(void) override;
+
+ private:
+ static CControllerFeature GetFeature();
+
+ enum class STATE
+ {
+ NEED_KEY,
+ NEED_INPUT,
+ FINISHED,
+ };
+
+ STATE m_state = STATE::NEED_KEY;
+
+ CControllerFeature m_selectedKey;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIThrottleButton.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/guicontrols/GUIWheelButton.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/types Added

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

_service:download_files:master.tar.gz/xbmc/games/controllers/types/ControllerGrid.cpp Added

@@ -0,0 +1,255 @@
+/*
+ * Copyright (C) 2017 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 "ControllerGrid.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/ControllerTranslator.h"
+#include "utils/log.h"
+
+#include <algorithm>
+#include <utility>
+
+using namespace KODI;
+using namespace GAME;
+
+CControllerGrid::CControllerGrid()
+{
+}
+
+CControllerGrid::CControllerGrid(const CControllerGrid &other) :
+ m_grid(other.m_grid),
+ m_height(other.m_height)
+{
+}
+
+CControllerGrid::~CControllerGrid() = default;
+
+void CControllerGrid::SetControllerTree(const CControllerTree &controllerTree)
+{
+ // Clear the result
+ m_grid.clear();
+
+ m_height = AddPorts(controllerTree.Ports(), m_grid);
+ SetHeight(m_height, m_grid);
+}
+
+ControllerVector CControllerGrid::GetControllers(unsigned int playerIndex) const
+{
+ ControllerVector controllers;
+
+ if (playerIndex < m_grid.size())
+ {
+ for (const auto &controllerVertex : m_grid[playerIndex].vertices)
+ {
+ if (controllerVertex.controller)
+ controllers.emplace_back(controllerVertex.controller);
+ }
+ }
+
+ return controllers;
+}
+
+unsigned int CControllerGrid::AddPorts(const ControllerPortVec &ports, ControllerGrid &grid)
+{
+ unsigned int height = 0;
+
+ auto itKeyboard = std::find_if(ports.begin(), ports.end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::KEYBOARD;
+ });
+
+ auto itMouse = std::find_if(ports.begin(), ports.end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::MOUSE;
+ });
+
+ auto itController = std::find_if(ports.begin(), ports.end(),
+ [](const CControllerPortNode &port)
+ {
+ return port.PortType() == PORT_TYPE::CONTROLLER;
+ });
+
+ // Keyboard and mouse are not allowed to have ports because they might
+ // overlap with controllers
+ if (itKeyboard != ports.end() && itKeyboard->ActiveController().Hub().HasPorts())
+ {
+ CLog::Log(LOGERROR, "Found keyboard with controller ports, skipping");
+ itKeyboard = ports.end();
+ }
+ if (itMouse != ports.end() && itMouse->ActiveController().Hub().HasPorts())
+ {
+ CLog::Log(LOGERROR, "Found mouse with controller ports, skipping");
+ itMouse = ports.end();
+ }
+
+ if (itController != ports.end())
+ {
+ // Add controller ports
+ bool bFirstPlayer = true;
+ for (const CControllerPortNode &port : ports)
+ {
+ ControllerColumn column;
+
+ if (port.PortType() == PORT_TYPE::CONTROLLER)
+ {
+ // Add controller
+ height = std::max(height, AddController(port, column.vertices.size(), column.vertices, grid));
+
+ if (bFirstPlayer == true)
+ {
+ bFirstPlayer = false;
+
+ // Keyboard and mouse are added below the first controller
+ if (itKeyboard != ports.end())
+ height = std::max(height, AddController(*itKeyboard, column.vertices.size(), column.vertices, grid));
+ if (itMouse != ports.end())
+ height = std::max(height, AddController(*itMouse, column.vertices.size(), column.vertices, grid));
+ }
+ }
+
+ if (!column.vertices.empty())
+ grid.emplace_back(std::move(column));
+ }
+ }
+ else
+ {
+ // No controllers, add keyboard and mouse
+ ControllerColumn column;
+
+ if (itKeyboard != ports.end())
+ height = std::max(height, AddController(*itKeyboard, column.vertices.size(), column.vertices, grid));
+ if (itMouse != ports.end())
+ height = std::max(height, AddController(*itMouse, column.vertices.size(), column.vertices, grid));
+
+ if (!column.vertices.empty())
+ grid.emplace_back(std::move(column));
+ }
+
+ return height;
+}
+
+unsigned int CControllerGrid::AddController(const CControllerPortNode &port, unsigned int height,
+ std::vector<ControllerVertex> &column, ControllerGrid &grid)
+{
+ // Add spacers
+ while (column.size() < height)
+ AddInvisible(column);
+
+ const CControllerNode &activeController = port.ActiveController();
+
+ // Add vertex
+ ControllerVertex vertex;
+ vertex.bVisible = true;
+ vertex.bConnected = port.Connected();
+ vertex.portType = port.PortType();
+ vertex.controller = activeController.Controller();
+ vertex.address = activeController.Address();
+ for (const CControllerNode &node : port.CompatibleControllers())
+ vertex.compatible.emplace_back(node.Controller());
+ column.emplace_back(std::move(vertex));
+
+ height++;
+
+ // Process ports
+ const ControllerPortVec &ports = activeController.Hub().Ports();
+ if (!ports.empty())
+ {
+ switch (GetDirection(activeController))
+ {
+ case GRID_DIRECTION::RIGHT:
+ {
+ height = std::max(height, AddHub(ports, height - 1, false, grid));
+ break;
+ }
+ case GRID_DIRECTION::DOWN:
+ {
+ const unsigned int row = height;
+
+ // Add the first controller to the column
+ const CControllerPortNode &firstController = ports.at(0);
+ height = std::max(height, AddController(firstController, row, column, grid));
+
+ // Add the remaining controllers on the same row
+ height = std::max(height, AddHub(ports, row, true, grid));
+
+ break;
+ }
+ }
+ }
+
+ return height;
+}
+
+unsigned int CControllerGrid::AddHub(const ControllerPortVec &ports, unsigned int height, bool bSkipFirst,
+ ControllerGrid &grid)
+{
+ const unsigned int row = height;
+
+ unsigned int port = 0;
+ for (const auto &controllerPort : ports)
+ {
+ // If controller has no player, it has already added the hub's first controller
+ if (bSkipFirst && port == 0)
+ continue;
+
+ // Add a column for this controller
+ grid.emplace_back();
+ ControllerColumn &column = grid.back();
+
+ height = std::max(height, AddController(controllerPort, row, column.vertices, grid));
+
+ port++;
+ }
+
+ return height;
+}
+
+void CControllerGrid::AddInvisible(std::vector<ControllerVertex> &column)
+{
+ ControllerVertex vertex;
+ vertex.bVisible = false;
+ column.emplace_back(std::move(vertex));
+}
+
+void CControllerGrid::SetHeight(unsigned int height, ControllerGrid &grid)
+{
+ for (auto &column : grid)
+ {
+ while (column.vertices.size() < height)
+ AddInvisible(column.vertices);
+ }
+}
+
+CControllerGrid::GRID_DIRECTION CControllerGrid::GetDirection(const CControllerNode &node)
+{
+ // Hub controllers are added horizontally, one per row.
+ //
+ // If the current controller offers a player spot, the row starts to the
+ // right at the same hight as the controller.
+ //
+ // Otherwise, to row starts below the current controller in the same
+ // column.
+ if (node.ProvidesInput())
+ return GRID_DIRECTION::RIGHT;
+ else
+ return GRID_DIRECTION::DOWN;
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/types/ControllerGrid.h Added

@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2017 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 "ControllerTree.h"
+#include "games/controllers/ControllerTypes.h"
+
+#include <string>
+#include <vector>
+
+namespace KODI
+{
+namespace GAME
+{
+ /*!
+ * \brief Vertex in the grid of controllers
+ */
+ struct ControllerVertex
+ {
+ bool bVisible = true;
+ bool bConnected = false;
+ ControllerPtr controller; // Mandatory if connected
+ PORT_TYPE portType = PORT_TYPE::UNKNOWN; // Optional
+ std::string address; // Optional
+ ControllerVector compatible; // Compatible controllers
+ };
+
+ /*!
+ * \brief Column of controllers in the grid
+ */
+ struct ControllerColumn
+ {
+ std::vector<ControllerVertex> vertices;
+ };
+
+ /*!
+ * \brief Collection of controllers in a grid layout
+ */
+ using ControllerGrid = std::vector<ControllerColumn>;
+
+ /*!
+ * \brief Class to encapsulate grid operations
+ */
+ class CControllerGrid
+ {
+ public:
+ CControllerGrid();
+ CControllerGrid(const CControllerGrid &other);
+ ~CControllerGrid();
+
+ /*!
+ * \brief Create a grid from a controller tree
+ */
+ void SetControllerTree(const CControllerTree &controllerTree);
+
+ /*!
+ * \brief Get the width of the controller grid
+ */
+ unsigned int Width() const { return m_grid.size(); }
+
+ /*!
+ * \brief Get the height (deepest controller) of the controller grid
+ *
+ * The height is cached when the controller grid is created to avoid
+ * iterating the grid
+ */
+ unsigned int Height() const { return m_height; }
+
+ /*!
+ * \brief Access the controller grid
+ */
+ const ControllerGrid &Grid() const { return m_grid; }
+
+ /*!
+ * \brief Get the controllers in use by the specified player
+ *
+ * \param playerIndex The column in the grid to get controllers from
+ */
+ ControllerVector GetControllers(unsigned int playerIndex) const;
+
+ private:
+ /*!
+ * \brief Directions of vertex traversal
+ */
+ enum class GRID_DIRECTION
+ {
+ RIGHT,
+ DOWN,
+ };
+
+ /*!
+ * \brief Add ports to the grid
+ *
+ * \param ports The ports on a console or controller
+ * \param[out] grid The controller grid being created
+ *
+ * \return The height of the grid determined by the maximum column height
+ */
+ static unsigned int AddPorts(const ControllerPortVec &ports, ControllerGrid &grid);
+
+ /*!
+ * \brief Draw a controller to the column at the specified height
+ *
+ * \param port The controller's port node
+ * \param height The hight to draw the controller at
+ * \param column[in/out] The column to draw to
+ * \param grid[in/out] The grid to add additional columns to
+ *
+ * \return The height of the grid
+ */
+ static unsigned int AddController(const CControllerPortNode &port, unsigned int height,
+ std::vector<ControllerVertex> &column, ControllerGrid &grid);
+
+ /*!
+ * \brief Draw a series of controllers to the grid at the specified height
+ *
+ * \param ports The ports of the controllers to draw
+ * \param height The height to start drawing the controllers at
+ * \param bSkipFirst True if the first controller has already been drawn to
+ * a column, false to start drawing at the first controller
+ * \param grid[in/out] The grid to add columns to
+ *
+ * \return The height of the grid
+ */
+ static unsigned int AddHub(const ControllerPortVec &ports, unsigned int height, bool bSkipFirst,
+ ControllerGrid &grid);
+
+ /*!
+ * \brief Draw an invisible vertex to the column
+ *
+ * \param[in/out] column The column in a controller grid
+ */
+ static void AddInvisible(std::vector<ControllerVertex> &column);
+
+ /*!
+ * \brief Fill all columns with invisible vertices until the specified height
+ *
+ * \param height The height to make all columns
+ * \param[in/out] grid The grid to update
+ */
+ static void SetHeight(unsigned int height, ControllerGrid &grid);
+
+ /*!
+ * \brief Get the direction of traversal for the next vertex
+ *
+ * \param node The node in the controller tree being visited
+ *
+ * \return The direction of the next vertex, or GRID_DIRECTION::UNKNOWN if
+ * unknown
+ */
+ static GRID_DIRECTION GetDirection(const CControllerNode &node);
+
+ ControllerGrid m_grid;
+ unsigned int m_height = 0;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/types/ControllerTree.cpp Added

@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2017 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 "ControllerTree.h"
+#include "games/controllers/Controller.h"
+#include "games/controllers/ControllerTopology.h"
+
+#include <utility>
+
+using namespace KODI;
+using namespace GAME;
+
+// --- CControllerNode ---------------------------------------------------------
+
+CControllerNode::CControllerNode() :
+ m_hub(new CControllerHub)
+{
+}
+
+CControllerNode::~CControllerNode() = default;
+
+CControllerNode &CControllerNode::operator=(const CControllerNode &rhs)
+{
+ if (this != &rhs)
+ {
+ m_controller = rhs.m_controller;
+ m_address = rhs.m_address;
+ m_hub.reset(new CControllerHub(*rhs.m_hub));
+ }
+
+ return *this;
+}
+
+void CControllerNode::SetController(ControllerPtr controller)
+{
+ m_controller = std::move(controller);
+}
+
+void CControllerNode::SetAddress(std::string address)
+{
+ m_address = std::move(address);
+}
+
+void CControllerNode::SetHub(CControllerHub hub)
+{
+ m_hub.reset(new CControllerHub(std::move(hub)));
+}
+
+bool CControllerNode::IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const
+{
+ bool bAccepted = false;
+
+ for (const auto &port : m_hub->Ports())
+ {
+ if (port.IsControllerAccepted(portAddress, controllerId))
+ {
+ bAccepted = true;
+ break;
+ }
+ }
+
+ return bAccepted;
+}
+
+bool CControllerNode::ProvidesInput() const
+{
+ return m_controller && m_controller->Topology().ProvidesInput();
+}
+
+// --- CControllerPortNode -----------------------------------------------------
+
+CControllerPortNode::~CControllerPortNode() = default;
+
+CControllerPortNode &CControllerPortNode::operator=(const CControllerPortNode &rhs)
+{
+ if (this != &rhs)
+ {
+ m_bConnected = rhs.m_bConnected;
+ m_portType = rhs.m_portType;
+ m_portId = rhs.m_portId;
+ m_controllers = rhs.m_controllers;
+ m_address = rhs.m_address;
+ m_active = rhs.m_active;
+ }
+
+ return *this;
+}
+
+const CControllerNode &CControllerPortNode::ActiveController() const
+{
+ if (m_bConnected && m_active < m_controllers.size())
+ return m_controllers[m_active];
+
+ static const CControllerNode invalid{};
+ return invalid;
+}
+
+void CControllerPortNode::SetPortID(std::string portId)
+{
+ m_portId = std::move(portId);
+}
+
+void CControllerPortNode::SetAddress(std::string address)
+{
+ m_address = std::move(address);
+}
+
+void CControllerPortNode::SetCompatibleControllers(ControllerNodeVec controllers)
+{
+ m_controllers = std::move(controllers);
+}
+
+bool CControllerPortNode::IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const
+{
+ bool bAccepted = false;
+
+ if (m_address == portAddress)
+ {
+ // Base case
+ CControllerPort port;
+ GetControllerPort(port);
+ if (port.IsCompatible(controllerId))
+ bAccepted = true;
+ }
+ else
+ {
+ for (const auto &node : m_controllers)
+ {
+ if (node.IsControllerAccepted(portAddress, controllerId))
+ {
+ bAccepted = true;
+ break;
+ }
+ }
+ }
+
+ return bAccepted;
+}
+
+void CControllerPortNode::GetControllerPort(CControllerPort &port) const
+{
+ std::vector<std::string> accepts;
+ for (const CControllerNode &node : m_controllers)
+ accepts.emplace_back(node.Controller()->ID());
+
+ port = CControllerPort(m_portId, std::move(accepts));
+}
+
+// --- CControllerHub ----------------------------------------------------------
+
+CControllerHub::~CControllerHub() = default;
+
+CControllerHub &CControllerHub::operator=(const CControllerHub &rhs)
+{
+ if (this != &rhs)
+ {
+ m_ports = rhs.m_ports;
+ }
+
+ return *this;
+}
+
+void CControllerHub::SetPorts(ControllerPortVec ports)
+{
+ m_ports = std::move(ports);
+}
+
+bool CControllerHub::IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const
+{
+ bool bAccepted = false;
+
+ for (const CControllerPortNode &port : m_ports)
+ {
+ if (port.IsControllerAccepted(portAddress, controllerId))
+ {
+ bAccepted = true;
+ break;
+ }
+ }
+
+ return bAccepted;
+}
+
+const CControllerPortNode &CControllerHub::GetPort(const std::string &address) const
+{
+ return GetPort(m_ports, address);
+}
+
+const CControllerPortNode &CControllerHub::GetPort(const ControllerPortVec &ports, const std::string &address)
+{
+ for (const CControllerPortNode &port : ports)
+ {
+ if (port.Address() == address)
+ return port;
+
+ for (const CControllerNode &controller : port.CompatibleControllers())
+ {
+ for (const CControllerPortNode &controllerPort : controller.Hub().Ports())
+ {
+ if (port.Address() == address)
+ return controllerPort;
+ }
+ }
+ }
+
+ static const CControllerPortNode empty{};
+ return empty;
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/types/ControllerTree.h Added

@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2017 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 <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace KODI
+{
+namespace GAME
+{
+ class CControllerHub;
+ class CControllerPort;
+
+ /*!
+ * \brief Node in the controller tree
+ *
+ * The node identies the controller profile, and optionally the available
+ * controller ports.
+ */
+ class CControllerNode
+ {
+ public:
+ CControllerNode();
+ CControllerNode(const CControllerNode &other) { *this = other; }
+ CControllerNode(CControllerNode &&other) = default;
+ CControllerNode &operator=(const CControllerNode &rhs);
+ ~CControllerNode();
+
+ /*!
+ * \brief Controller profile of this code
+ *
+ * \return Controller profile, or empty if this node is invalid
+ *
+ * \sa IsValid()
+ */
+ const ControllerPtr &Controller() const { return m_controller; }
+ void SetController(ControllerPtr controller);
+
+ /*!
+ * \brief Address given to the node by the implementation
+ */
+ const std::string &Address() const { return m_address; }
+ void SetAddress(std::string address);
+
+ /*!
+ * \brief Collection of ports on this controller
+ *
+ * \return A hub with controller ports, or an empty hub if this controller
+ * has no available ports
+ */
+ const CControllerHub &Hub() const { return *m_hub; }
+ void SetHub(CControllerHub hub);
+
+ /*!
+ * \brief Check if this node has a valid controller profile
+ */
+ bool IsValid() const { return m_controller.get() != nullptr; }
+
+ /*!
+ * \brief Check to see if a controller is compatible with a controller port
+ *
+ * \param portAddress The port address
+ * \param controllerId The ID of the controller
+ *
+ * \return True if the controller is compatible with a port, false otherwise
+ */
+ bool IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const;
+
+ /*!
+ * \brief Check if this node provides input
+ */
+ bool ProvidesInput() const;
+
+ private:
+ ControllerPtr m_controller;
+ std::string m_address;
+ std::unique_ptr<CControllerHub> m_hub;
+ };
+
+ using ControllerNodeVec = std::vector<CControllerNode>;
+
+ /*!
+ * \brief Collection of nodes that can be connected to this port
+ */
+ class CControllerPortNode
+ {
+ public:
+ CControllerPortNode() = default;
+ CControllerPortNode(const CControllerPortNode &other) { *this = other; }
+ CControllerPortNode(CControllerPortNode &&other) = default;
+ CControllerPortNode &operator=(const CControllerPortNode &rhs);
+ ~CControllerPortNode();
+
+ /*!
+ * \brief Connection state of the port
+ *
+ * \return True if a controller is connected, false otherwise
+ */
+ bool Connected() const { return m_bConnected; }
+ void SetConnected(bool bConnected) { m_bConnected = bConnected; }
+
+ /*!
+ * \brief The controller that is active on this port
+ *
+ * \return The active controller, or invalid if port is disconnected
+ */
+ const CControllerNode &ActiveController() const;
+ void SetActiveController(unsigned int controllerIndex) { m_active = controllerIndex; }
+
+ /*!
+ * \brief The port type
+ *
+ * \return The port type, if known
+ */
+ PORT_TYPE PortType() const { return m_portType; }
+ void SetPortType(PORT_TYPE type) { m_portType = type; }
+
+ /*!
+ * \brief The hardware or controller port ID
+ *
+ * \return The port ID of the hardware port or controller port, or empty if
+ * the port is only identified by its type
+ */
+ const std::string &PortID() const { return m_portId; }
+ void SetPortID(std::string portId);
+
+ /*!
+ * \brief Address given to the node by the implementation
+ */
+ const std::string &Address() const { return m_address; }
+ void SetAddress(std::string address);
+
+ /*!
+ * \brief Return the controller profiles that are compatible with this port
+ *
+ * \return The controller profiles, or empty if this port doesn't support
+ * any controller profiles
+ */
+ const ControllerNodeVec &CompatibleControllers() const { return m_controllers; }
+ void SetCompatibleControllers(ControllerNodeVec controllers);
+
+ /*!
+ * \brief Check to see if a controller is compatible with this tree
+ *
+ * \param portAddress The port address
+ * \param controllerId The ID of the controller
+ *
+ * \return True if the controller is compatible with the tree, false otherwise
+ */
+ bool IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const;
+
+ private:
+ void GetControllerPort(CControllerPort &port) const;
+
+ bool m_bConnected = false;
+ unsigned int m_active = 0;
+ PORT_TYPE m_portType = PORT_TYPE::UNKNOWN;
+ std::string m_portId;
+ std::string m_address;
+ ControllerNodeVec m_controllers;
+ };
+
+ /*!
+ * \brief Collection of port nodes
+ */
+ using ControllerPortVec = std::vector<CControllerPortNode>;
+
+ /*!
+ * \brief A branch in the controller tree
+ */
+ class CControllerHub
+ {
+ public:
+ CControllerHub() = default;
+ CControllerHub(const CControllerHub &other) { *this = other; }
+ CControllerHub(CControllerHub &&other) = default;
+ CControllerHub &operator=(const CControllerHub &rhs);
+ ~CControllerHub();
+
+ bool HasPorts() const { return !m_ports.empty(); }
+ const ControllerPortVec &Ports() const { return m_ports; }
+ void SetPorts(ControllerPortVec ports);
+
+ bool IsControllerAccepted(const std::string &portAddress,
+ const std::string &controllerId) const;
+
+ const CControllerPortNode &GetPort(const std::string &address) const;
+
+ private:
+ static const CControllerPortNode &GetPort(const ControllerPortVec &ports, const std::string &address);
+
+ ControllerPortVec m_ports;
+ };
+
+ /*!
+ * \brief Collection of ports on a console
+ */
+ using CControllerTree = CControllerHub;
+}
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp Changed

@@ -23,6 +23,7 @@
 #include "games/controllers/guicontrols/GUIFeatureButton.h"
 #include "games/controllers/Controller.h"
 #include "games/controllers/ControllerFeature.h"
+#include "games/controllers/ControllerTranslator.h"
 #include "input/joysticks/interfaces/IButtonMap.h"
 #include "input/joysticks/interfaces/IButtonMapCallback.h"
 #include "input/joysticks/JoystickUtils.h"
@@ -43,10 +44,8 @@
 // Duration to wait for axes to neutralize after mapping is finished
 #define POST_MAPPING_WAIT_TIME_MS  (5 * 1000)
 
-CGUIConfigurationWizard::CGUIConfigurationWizard(bool bEmulation, unsigned int controllerNumber /* = 0 */) :
+CGUIConfigurationWizard::CGUIConfigurationWizard() :
   CThread("GUIConfigurationWizard"),
-  m_bEmulation(bEmulation),
-  m_controllerNumber(controllerNumber),
   m_actionMap(new KEYBOARD::CKeymapActionMap)
 {
   InitializeState();
@@ -57,9 +56,9 @@
 void CGUIConfigurationWizard::InitializeState(void)
 {
   m_currentButton = nullptr;
-  m_analogStickDirection = JOYSTICK::ANALOG_STICK_DIRECTION::UNKNOWN;
-  m_wheelDirection = JOYSTICK::WHEEL_DIRECTION::UNKNOWN;
-  m_throttleDirection = JOYSTICK::THROTTLE_DIRECTION::UNKNOWN;
+  m_cardinalDirection = INPUT::CARDINAL_DIRECTION::NONE;
+  m_wheelDirection = JOYSTICK::WHEEL_DIRECTION::NONE;
+  m_throttleDirection = JOYSTICK::THROTTLE_DIRECTION::NONE;
   m_history.clear();
   m_lateAxisDetected = false;
   m_deviceName.clear();
@@ -111,6 +110,17 @@
   return bWasRunning;
 }
 
+void CGUIConfigurationWizard::RegisterKey(const CControllerFeature &key)
+{
+  if (key.Keycode() != XBMCK_UNKNOWN)
+    m_keyMap[key.Keycode()] = key;
+}
+
+void CGUIConfigurationWizard::UnregisterKeys()
+{
+  m_keyMap.clear();
+}
+
 void CGUIConfigurationWizard::Process(void)
 {
   CLog::Log(LOGDEBUG, "Starting configuration wizard");
@@ -129,15 +139,20 @@
       while (!button->IsFinished())
       {
         // Allow other threads to access which direction the prompt is on
-        m_analogStickDirection = button->GetAnalogStickDirection();
+        m_cardinalDirection = button->GetCardinalDirection();
         m_wheelDirection = button->GetWheelDirection();
         m_throttleDirection = button->GetThrottleDirection();
 
         // Wait for input
         {
+          using namespace JOYSTICK;
+
           CSingleExit exit(m_stateMutex);
 
-          CLog::Log(LOGDEBUG, "%s: Waiting for input for feature \"%s\"", m_strControllerId.c_str(), button->Feature().Name().c_str());
+          if (button->Feature().Type() == FEATURE_TYPE::UNKNOWN)
+            CLog::Log(LOGDEBUG, "%s: Waiting for input", m_strControllerId.c_str());
+          else
+            CLog::Log(LOGDEBUG, "%s: Waiting for input for feature \"%s\"", m_strControllerId.c_str(), button->Feature().Name().c_str());
 
           if (!button->PromptForInput(m_inputEvent))
             Abort(false);
@@ -194,6 +209,7 @@
                                            IKeymap* keymap,
                                            const JOYSTICK::CDriverPrimitive& primitive)
 {
+  using namespace INPUT;
   using namespace JOYSTICK;
 
   bool bHandled = false;
@@ -201,8 +217,6 @@
   // Abort if another controller cancels the prompt
   if (IsMapping() && !IsMapping(buttonMap->DeviceName()))
   {
-    bool bIsCancelAction = false;
-
     //! @todo This only succeeds for game.controller.default; no actions are
     //        currently defined for other controllers
     if (keymap)
@@ -214,36 +228,14 @@
         if (!actions.empty())
         {
           //! @todo Handle multiple actions mapped to the same key
-          switch (actions.begin()->actionId)
-          {
-          case ACTION_NAV_BACK:
-          case ACTION_PREVIOUS_MENU:
-            bIsCancelAction = true;
-            break;
-          default:
-            break;
-          }
+          OnAction(actions.begin()->actionId);
         }
       }
     }
 
-    if (bIsCancelAction)
-    {
-      CLog::Log(LOGDEBUG, "%s: device \"%s\" is cancelling prompt", buttonMap->ControllerID().c_str(), buttonMap->DeviceName().c_str());
-      Abort(false);
-    }
-    else
-      CLog::Log(LOGDEBUG, "%s: ignoring input for device \"%s\"", buttonMap->ControllerID().c_str(), buttonMap->DeviceName().c_str());
-
     // Discard input
     bHandled = true;
   }
-  else if (primitive.Type() == PRIMITIVE_TYPE::BUTTON &&
-           primitive.Index() == ESC_KEY_CODE)
-  {
-    // Handle esc key
-    bHandled = Abort(false);
-  }
   else if (m_history.find(primitive) != m_history.end())
   {
     // Primitive has already been mapped this round, ignore it
@@ -257,76 +249,110 @@
   {
     // Get the current state of the thread
     IFeatureButton* currentButton;
-    ANALOG_STICK_DIRECTION analogStickDirection;
+    CARDINAL_DIRECTION cardinalDirection;
     WHEEL_DIRECTION wheelDirection;
     THROTTLE_DIRECTION throttleDirection;
     {
       CSingleLock lock(m_stateMutex);
       currentButton = m_currentButton;
-      analogStickDirection = m_analogStickDirection;
+      cardinalDirection = m_cardinalDirection;
       wheelDirection = m_wheelDirection;
       throttleDirection = m_throttleDirection;
     }
 
     if (currentButton)
     {
-      const CControllerFeature& feature = currentButton->Feature();
-
-      if (feature.Type() == JOYSTICK::FEATURE_TYPE::UNKNOWN)
+      // Check if we were expecting a keyboard key
+      if (currentButton->NeedsKey())
       {
-        // Unknown feature, absorb input
+        if (primitive.Type() == PRIMITIVE_TYPE::KEY)
+        {
+          auto it = m_keyMap.find(primitive.Keycode());
+          if (it != m_keyMap.end())
+          {
+            const CControllerFeature &key = it->second;
+            currentButton->SetKey(key);
+            m_inputEvent.Set();
+          }
+        }
+        else
+        {
+          //! @todo Check if primitive is a cancel or motion action
+        }
         bHandled = true;
       }
       else
       {
-        CLog::Log(LOGDEBUG, "%s: mapping feature \"%s\" for device %s",
-          m_strControllerId.c_str(), feature.Name().c_str(), buttonMap->DeviceName().c_str());
+        const CControllerFeature& feature = currentButton->Feature();
 
-        switch (feature.Type())
+        if (primitive.Type() == PRIMITIVE_TYPE::RELATIVE_POINTER &&
+            feature.Type() != FEATURE_TYPE::RELPOINTER)
         {
-          case FEATURE_TYPE::SCALAR:
-          {
-            buttonMap->AddScalar(feature.Name(), primitive);
-            bHandled = true;
-            break;
-          }
-          case FEATURE_TYPE::ANALOG_STICK:
-          {
-            buttonMap->AddAnalogStick(feature.Name(), analogStickDirection, primitive);
-            bHandled = true;
-            break;
-          }
-          case FEATURE_TYPE::RELPOINTER:
-          {
-            buttonMap->AddRelativePointer(feature.Name(), analogStickDirection, primitive);
-            bHandled = true;
-            break;
-          }
-          case FEATURE_TYPE::WHEEL:
-          {
-            buttonMap->AddWheel(feature.Name(), wheelDirection, primitive);
-            bHandled = true;
-            break;
-          }
-          case FEATURE_TYPE::THROTTLE:
+          // Don't allow relative pointers to map to other features
+        }
+        else
+        {
+          CLog::Log(LOGDEBUG, "%s: mapping feature \"%s\" for device %s",
+            m_strControllerId.c_str(), feature.Name().c_str(), buttonMap->DeviceName().c_str());
+
+          switch (feature.Type())
           {
-            buttonMap->AddThrottle(feature.Name(), throttleDirection, primitive);
-            bHandled = true;
-            break;
+            case FEATURE_TYPE::SCALAR:
+            {
+              buttonMap->AddScalar(feature.Name(), primitive);
+              bHandled = true;
+              break;
+            }
+            case FEATURE_TYPE::ANALOG_STICK:
+            {
+              buttonMap->AddAnalogStick(feature.Name(), cardinalDirection, primitive);
+              bHandled = true;
+              break;
+            }
+            case FEATURE_TYPE::RELPOINTER:
+            {
+              buttonMap->AddRelativePointer(feature.Name(), cardinalDirection, primitive);
+              bHandled = true;
+              break;
+            }
+            case FEATURE_TYPE::WHEEL:
+            {
+              buttonMap->AddWheel(feature.Name(), wheelDirection, primitive);
+              bHandled = true;
+              break;
+            }
+            case FEATURE_TYPE::THROTTLE:
+            {
+              buttonMap->AddThrottle(feature.Name(), throttleDirection, primitive);
+              bHandled = true;
+              break;
+            }
+            case FEATURE_TYPE::KEY:
+            {
+              buttonMap->AddKey(feature.Name(), primitive);
+              bHandled = true;
+              break;
+            }
+            default:
+              break;
           }
-          default:
-            break;
         }
 
         if (bHandled)
         {
           m_history.insert(primitive);
 
-          OnMotion(buttonMap);
+          // Don't record motion for relative pointers
+          if (primitive.Type() != PRIMITIVE_TYPE::RELATIVE_POINTER)
+            OnMotion(buttonMap);
+
           m_inputEvent.Set();
 
           if (m_deviceName.empty())
+          {
             m_deviceName = buttonMap->DeviceName();
+            m_bIsKeyboard = (primitive.Type() == PRIMITIVE_TYPE::KEY);
+          }
         }
       }
     }
@@ -371,12 +397,25 @@
   bool bHandled = false;
 
   if (!m_bStop)
-    bHandled = OnKeyAction(m_actionMap->GetActionID(key));
+  {
+    // Only allow key to abort the prompt if we know for sure that we're mapping
+    // a controller
+    const bool bIsMappingController = (IsMapping() && !m_bIsKeyboard);
+
+    if (bIsMappingController)
+    {
+      bHandled = OnAction(m_actionMap->GetActionID(key));
+    }
+    else
+    {
+      // Allow key press to fall through to the button mapper
+    }
+  }
 
   return bHandled;
 }
 
-bool CGUIConfigurationWizard::OnKeyAction(unsigned int actionId)
+bool CGUIConfigurationWizard::OnAction(unsigned int actionId)
 {
   bool bHandled = false;
 
@@ -396,6 +435,7 @@
     case ACTION_PARENT_DIR:
     case ACTION_PREVIOUS_MENU:
     case ACTION_STOP:
+    case ACTION_NAV_BACK:
       // Abort and prevent action
       Abort(false);
       bHandled = true;
@@ -410,11 +450,6 @@
   return bHandled;
 }
 
-bool CGUIConfigurationWizard::OnButtonPress(const std::string& button)
-{
-  return Abort(false);
-}
-
 bool CGUIConfigurationWizard::IsMapping() const
 {
   return !m_deviceName.empty();
@@ -427,23 +462,19 @@
 
 void CGUIConfigurationWizard::InstallHooks(void)
 {
+  // Install button mapper with lowest priority
   CServiceBroker::GetPeripherals().RegisterJoystickButtonMapper(this);
-  CServiceBroker::GetPeripherals().RegisterObserver(this);
 
-  // If we're not using emulation, allow keyboard input to abort prompt
-  if (!m_bEmulation)
-    CServiceBroker::GetInputManager().RegisterKeyboardHandler(this);
+  // Install hook to reattach button mapper when peripherals change
+  CServiceBroker::GetPeripherals().RegisterObserver(this);
 
-  CServiceBroker::GetInputManager().RegisterMouseHandler(this);
+  // Install hook to cancel the button mapper
+  CServiceBroker::GetInputManager().RegisterKeyboardDriverHandler(this);
 }
 
 void CGUIConfigurationWizard::RemoveHooks(void)
 {
-  CServiceBroker::GetInputManager().UnregisterMouseHandler(this);
-
-  if (!m_bEmulation)
-    CServiceBroker::GetInputManager().UnregisterKeyboardHandler(this);
-
+  CServiceBroker::GetInputManager().UnregisterKeyboardDriverHandler(this);
   CServiceBroker::GetPeripherals().UnregisterObserver(this);
   CServiceBroker::GetPeripherals().UnregisterJoystickButtonMapper(this);
 }

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIConfigurationWizard.h Changed

@@ -20,15 +20,17 @@
 #pragma once
 
 #include "IConfigurationWindow.h"
+#include "games/controllers/ControllerFeature.h"
 #include "input/joysticks/DriverPrimitive.h"
 #include "input/joysticks/interfaces/IButtonMapper.h"
-#include "input/keyboard/interfaces/IKeyboardHandler.h"
-#include "input/mouse/interfaces/IMouseInputHandler.h"
+#include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
+#include "input/XBMC_keysym.h"
 #include "threads/CriticalSection.h"
 #include "threads/Event.h"
 #include "threads/Thread.h"
 #include "utils/Observer.h"
 
+#include <map>
 #include <memory>
 #include <set>
 #include <string>
@@ -45,13 +47,12 @@
 {
 class CGUIConfigurationWizard : public IConfigurationWizard,
 public JOYSTICK::IButtonMapper,
- public KEYBOARD::IKeyboardHandler,
- public MOUSE::IMouseInputHandler,
+ public KEYBOARD::IKeyboardDriverHandler,
 public Observer,
 protected CThread
 {
 public:
- CGUIConfigurationWizard(bool bEmulation, unsigned int controllerNumber = 0);
+ CGUIConfigurationWizard();
 
 virtual ~CGUIConfigurationWizard(void);
 
@@ -59,27 +60,22 @@
 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;
+ void RegisterKey(const CControllerFeature &key) override;
+ void UnregisterKeys() override;
 
 // implementation of IButtonMapper
 virtual std::string ControllerID(void) const override { return m_strControllerId; }
 virtual bool NeedsCooldown(void) const override { return true; }
- virtual bool Emulation(void) const override { return m_bEmulation; }
- virtual unsigned int ControllerNumber(void) const override { return m_controllerNumber; }
 virtual bool MapPrimitive(JOYSTICK::IButtonMap* buttonMap,
 IKeymap* keymap,
 const JOYSTICK::CDriverPrimitive& primitive) override;
 virtual void OnEventFrame(const JOYSTICK::IButtonMap* buttonMap, bool bMotion) override;
 virtual void OnLateAxis(const JOYSTICK::IButtonMap* buttonMap, unsigned int axisIndex) override;
 
- // implementation of IKeyboardHandler
+ // implementation of IKeyboardDriverHandler
 virtual bool OnKeyPress(const CKey& key) override;
 virtual void OnKeyRelease(const CKey& key) override { }
 
- // implementation of IMouseInputHandler
- virtual bool OnMotion(const std::string& relpointer, int dx, int dy) override { return false; }
- virtual bool OnButtonPress(const std::string& button) override;
- virtual void OnButtonRelease(const std::string& button) override { }
-
 // implementation of Observer
 virtual void Notify(const Observable& obs, const ObservableMessage msg) override;
 
@@ -99,11 +95,7 @@
 void OnMotion(const JOYSTICK::IButtonMap* buttonMap);
 void OnMotionless(const JOYSTICK::IButtonMap* buttonMap);
 
- bool OnKeyAction(unsigned int actionId);
-
- // Construction parameters
- const bool m_bEmulation;
- const unsigned int m_controllerNumber;
+ bool OnAction(unsigned int actionId);
 
 // Run() parameters
 std::string m_strControllerId;
@@ -111,12 +103,13 @@
 
 // State variables and mutex
 IFeatureButton* m_currentButton;
- JOYSTICK::ANALOG_STICK_DIRECTION m_analogStickDirection;
+ INPUT::CARDINAL_DIRECTION m_cardinalDirection;
 JOYSTICK::WHEEL_DIRECTION m_wheelDirection;
 JOYSTICK::THROTTLE_DIRECTION m_throttleDirection;
 std::set<JOYSTICK::CDriverPrimitive> m_history; // History to avoid repeated features
 bool m_lateAxisDetected; // Set to true if an axis is detected during button mapping
- std::string m_deviceName;
+ std::string m_deviceName; // Name of device that we're mapping
+ bool m_bIsKeyboard = false; // True if we're mapping keyboard keys
 CCriticalSection m_stateMutex;
 
 // Synchronization events
@@ -127,6 +120,7 @@
 
 // Keyboard handling
 std::unique_ptr<KEYBOARD::IActionMap> m_actionMap;
+ std::map<XBMCKey, CControllerFeature> m_keyMap; // Keycode -> feature
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIControllerDefines.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIControllerWindow.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIControllerWindow.h Changed

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.cpp Changed

@@ -33,32 +33,20 @@
 #include "guilib/GUILabelControl.h"
 #include "guilib/GUIMessage.h"
 #include "guilib/GUIWindow.h"
+#include "guilib/LocalizeStrings.h"
 #include "messaging/ApplicationMessenger.h"
 
 using namespace KODI;
 using namespace GAME;
 
-CGUIFeatureList::CGUIFeatureList(CGUIWindow* window, const std::string& windowParam) :
+CGUIFeatureList::CGUIFeatureList(CGUIWindow* window) :
 m_window(window),
 m_guiList(nullptr),
 m_guiButtonTemplate(nullptr),
 m_guiGroupTitle(nullptr),
 m_guiFeatureSeparator(nullptr),
- m_wizard(nullptr)
+ m_wizard(new CGUIConfigurationWizard)
 {
- if (windowParam.empty())
- {
- // Run wizard for all physical controllers
- m_wizard = new CGUIConfigurationWizard(false);
- }
- else
- {
- // Run wizard for specified emulated controller
- unsigned int number;
- std::istringstream str(windowParam);
- str >> number;
- m_wizard = new CGUIConfigurationWizard(true, number);
- }
 }
 
 CGUIFeatureList::~CGUIFeatureList(void)
@@ -117,9 +105,22 @@
 for (auto itGroup = featureGroups.begin(); itGroup != featureGroups.end(); ++itGroup)
 {
 const std::string& groupName = itGroup->groupName;
+ const bool bIsVirtualKey = itGroup->bIsVirtualKey;
+
+ std::vector<CGUIButtonControl*> buttons;
 
 // Create buttons
- std::vector<CGUIButtonControl*> buttons = GetButtons(itGroup->features, m_buttonCount);
+ if (bIsVirtualKey)
+ {
+ CGUIButtonControl* button = GetSelectKeyButton(itGroup->features, m_buttonCount);
+ if (button != nullptr)
+ buttons.push_back(button);
+ }
+ else
+ {
+ buttons = GetButtons(itGroup->features, m_buttonCount);
+ }
+
 if (!buttons.empty())
 {
 // Just in case
@@ -156,8 +157,18 @@
 for ( ; buttonIndex < m_buttonCount; buttonIndex++)
 {
 IFeatureButton* control = GetButtonControl(buttonIndex);
- if (control)
+ if (control == nullptr)
+ continue;
+
+ if (control->AllowWizard())
 buttons.push_back(control);
+ else
+ {
+ // Only map this button if it's the only one
+ if (buttons.empty())
+ buttons.push_back(control);
+ break;
+ }
 }
 
 m_wizard->Run(m_controller->ID(), buttons);
@@ -175,6 +186,7 @@
 m_buttonCount = 0;
 
 m_wizard->Abort(true);
+ m_wizard->UnregisterKeys();
 
 if (m_guiList)
 m_guiList->ClearAll();
@@ -198,15 +210,33 @@
 // Add feature to previous group
 previousGroup.features.emplace_back(feature);
 bAdded = true;
+
+ // If feature is a key, add it to the preceding virtual group as well
+ if (feature.Category() == JOYSTICK::FEATURE_CATEGORY::KEY && groups.size() >= 2)
+ {
+ FeatureGroup &virtualGroup = *(groups.rbegin() + 1);
+ if (virtualGroup.bIsVirtualKey)
+ virtualGroup.features.emplace_back(feature);
+ }
 }
 }
 
 if (!bAdded)
 {
+ // If feature is a key, create a virtual group that allows the user to
+ // select which key to map
+ if (feature.Category() == JOYSTICK::FEATURE_CATEGORY::KEY)
+ {
+ FeatureGroup virtualGroup;
+ virtualGroup.groupName = g_localizeStrings.Get(35166); // "All keys"
+ virtualGroup.bIsVirtualKey = true;
+ virtualGroup.features.emplace_back(feature);
+ groups.emplace_back(std::move(virtualGroup));
+ }
+
 // Create new group and add feature
 FeatureGroup group;
 group.groupName = feature.CategoryLabel();
- group.category = feature.Category();
 group.features.emplace_back(feature);
 groups.emplace_back(std::move(group));
 }
@@ -242,3 +272,15 @@
 
 return buttons;
 }
+
+CGUIButtonControl* CGUIFeatureList::GetSelectKeyButton(const std::vector<CControllerFeature>& features, unsigned int buttonIndex)
+{
+ // Expose keycodes to the wizard
+ for (const CControllerFeature& feature : features)
+ {
+ if (feature.Type() == JOYSTICK::FEATURE_TYPE::KEY)
+ m_wizard->RegisterKey(feature);
+ }
+
+ return CGUIFeatureFactory::CreateButton(BUTTON_TYPE::SELECT_KEY, *m_guiButtonTemplate, m_wizard, CControllerFeature(), buttonIndex);
+}

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/GUIFeatureList.h Changed

@@ -37,7 +37,7 @@
 class CGUIFeatureList : public IFeatureList
 {
 public:
- CGUIFeatureList(CGUIWindow* window, const std::string& windowParam);
+ CGUIFeatureList(CGUIWindow* window);
 virtual ~CGUIFeatureList(void);
 
 // implementation of IFeatureList
@@ -57,11 +57,16 @@
 struct FeatureGroup
 {
 std::string groupName;
- JOYSTICK::FEATURE_CATEGORY category = JOYSTICK::FEATURE_CATEGORY::UNKNOWN;
 std::vector<CControllerFeature> features;
+ /*!
+ * True if this group is a button that allows the user to map a key of
+ * their choosing.
+ */
+ bool bIsVirtualKey = false;
 };
 static std::vector<FeatureGroup> GetFeatureGroups(const std::vector<CControllerFeature>& features);
 std::vector<CGUIButtonControl*> GetButtons(const std::vector<CControllerFeature>& features, unsigned int startIndex);
+ CGUIButtonControl* GetSelectKeyButton(const std::vector<CControllerFeature>& features, unsigned int buttonIndex);
 
 // GUI stuff
 CGUIWindow* const m_window;

_service:download_files:master.tar.gz/xbmc/games/controllers/windows/IConfigurationWindow.h Changed

@@ -21,6 +21,7 @@
 
 #include "games/controllers/ControllerTypes.h"
 #include "input/joysticks/JoystickTypes.h"
+#include "input/InputTypes.h"
 
 #include <string>
 #include <vector>
@@ -165,6 +166,12 @@
 virtual const CControllerFeature& Feature(void) const = 0;
 
 /*!
+ * \brief Allow the wizard to include this feature in a list of buttons
+ * to map
+ */
+ virtual bool AllowWizard() const { return true; }
+
+ /*!
 * \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
@@ -181,11 +188,12 @@
 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
+ * \brief Get the direction of the next analog stick or relative pointer
+ * prompt
+ * \return The next direction to be prompted, or UNKNOWN if this isn't a
+ * cardinal feature or the prompt is finished
 */
- virtual JOYSTICK::ANALOG_STICK_DIRECTION GetAnalogStickDirection(void) const = 0;
+ virtual INPUT::CARDINAL_DIRECTION GetCardinalDirection(void) const = 0;
 
 /*!
 * \brief Get the direction of the next wheel prompt
@@ -202,6 +210,18 @@
 virtual JOYSTICK::THROTTLE_DIRECTION GetThrottleDirection(void) const = 0;
 
 /*!
+ * \brief True if the button is waiting for a key press
+ */
+ virtual bool NeedsKey() const { return false; }
+
+ /*!
+ * \brief Set the pressed key that the user will be prompted to map
+ *
+ * \param key The key that was pressed
+ */
+ virtual void SetKey(const CControllerFeature &key) { }
+
+ /*!
 * \brief Reset button after prompting for input has finished
 */
 virtual void Reset(void) = 0;
@@ -234,6 +254,20 @@
 * \return true if aborted, or false if the wizard wasn't running
 */
 virtual bool Abort(bool bWait = true) = 0;
+
+ /*!
+ * \brief Register a key by its keycode
+ * \param key A key with a valid keycode
+ *
+ * This should be called before Run(). It allows the user to choose a key
+ * to map instead of scrolling through a long list.
+ */
+ virtual void RegisterKey(const CControllerFeature &key) = 0;
+
+ /*!
+ * \brief Unregister all registered keys
+ */
+ virtual void UnregisterKeys() = 0;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/games/dialogs/osd/DialogGameVideoFilter.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/dialogs/osd/DialogGameVideoSelect.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/dialogs/osd/DialogGameViewMode.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/ports/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/games/ports/InputSink.cpp Changed

_service:download_files:master.tar.gz/xbmc/games/ports/InputSink.h Changed

_service:download_files:master.tar.gz/xbmc/games/ports/Port.cpp Changed

@@ -29,10 +29,9 @@
 using namespace KODI;
 using namespace GAME;
 
-CPort::CPort(JOYSTICK::IInputHandler *gameInput, CGameClient &gameClient) :
+CPort::CPort(JOYSTICK::IInputHandler *gameInput) :
   m_gameInput(gameInput),
-  m_gameClient(gameClient),
-  m_inputSink(new CInputSink(gameClient))
+  m_inputSink(new CInputSink(gameInput))
 {
 }
 
@@ -66,12 +65,12 @@
 
 bool CPort::AcceptsInput(const std::string& feature) const
 {
-  return m_gameClient.Input().AcceptsInput();
+  return m_gameInput->AcceptsInput(feature);
 }
 
 bool CPort::OnButtonPress(const std::string& feature, bool bPressed)
 {
-  if (bPressed && !m_gameClient.Input().AcceptsInput())
+  if (bPressed && !m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnButtonPress(feature, bPressed);
@@ -84,7 +83,7 @@
 
 bool CPort::OnButtonMotion(const std::string& feature, float magnitude, unsigned int motionTimeMs)
 {
-  if (magnitude > 0.0f && !m_gameClient.Input().AcceptsInput())
+  if (magnitude > 0.0f && !m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnButtonMotion(feature, magnitude, motionTimeMs);
@@ -92,7 +91,7 @@
 
 bool CPort::OnAnalogStickMotion(const std::string& feature, float x, float y, unsigned int motionTimeMs)
 {
-  if ((x != 0.0f || y != 0.0f) && !m_gameClient.Input().AcceptsInput())
+  if ((x != 0.0f || y != 0.0f) && !m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnAnalogStickMotion(feature, x, y, motionTimeMs);
@@ -100,7 +99,7 @@
 
 bool CPort::OnAccelerometerMotion(const std::string& feature, float x, float y, float z)
 {
-  if (!m_gameClient.Input().AcceptsInput())
+  if (!m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnAccelerometerMotion(feature, x, y, z);
@@ -108,7 +107,7 @@
 
 bool CPort::OnWheelMotion(const std::string& feature, float position, unsigned int motionTimeMs)
 {
-  if ((position != 0.0f) && !m_gameClient.Input().AcceptsInput())
+  if ((position != 0.0f) && !m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnWheelMotion(feature, position, motionTimeMs);
@@ -116,7 +115,7 @@
 
 bool CPort::OnThrottleMotion(const std::string& feature, float position, unsigned int motionTimeMs)
 {
-  if ((position != 0.0f) && !m_gameClient.Input().AcceptsInput())
+  if ((position != 0.0f) && !m_gameInput->AcceptsInput(feature))
     return false;
 
   return m_gameInput->OnThrottleMotion(feature, position, motionTimeMs);

_service:download_files:master.tar.gz/xbmc/games/ports/Port.h Changed

_service:download_files:master.tar.gz/xbmc/games/ports/PortManager.cpp Deleted

@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "PortManager.h"
-#include "PortMapper.h"
-#include "input/hardware/IHardwareInput.h"
-#include "input/joysticks/interfaces/IInputHandler.h"
-#include "peripherals/devices/Peripheral.h"
-#include "peripherals/devices/PeripheralJoystick.h"
-#include "peripherals/devices/PeripheralJoystickEmulation.h"
-#include "peripherals/Peripherals.h"
-#include "utils/log.h"
-
-#include <algorithm>
-
-using namespace KODI;
-using namespace GAME;
-using namespace JOYSTICK;
-using namespace PERIPHERALS;
-
-// --- GetRequestedPort() -----------------------------------------------------
-
-namespace
-{
- int GetRequestedPort(const PERIPHERALS::PeripheralPtr& device)
- {
- if (device->Type() == PERIPHERAL_JOYSTICK)
- return std::static_pointer_cast<CPeripheralJoystick>(device)->RequestedPort();
- return JOYSTICK_PORT_UNKNOWN;
- }
-}
-
-// --- CPortManager -----------------------------------------------------------
-
-CPortManager::CPortManager(PERIPHERALS::CPeripherals& peripheralManager) :
- m_portMapper(new CPortMapper(peripheralManager, *this))
-{
-}
-
-CPortManager::~CPortManager() = default;
-
-void CPortManager::OpenPort(IInputHandler* handler,
- HARDWARE::IHardwareInput *hardwareInput,
- CGameClient* gameClient,
- unsigned int port,
- PERIPHERALS::PeripheralType requiredType /* = PERIPHERALS::PERIPHERAL_UNKNOWN) */)
-{
- CExclusiveLock lock(m_mutex);
-
- SPort newPort = { };
- newPort.handler = handler;
- newPort.hardwareInput = hardwareInput;
- newPort.port = port;
- newPort.requiredType = requiredType;
- newPort.gameClient = gameClient;
- m_ports.push_back(newPort);
-
- SetChanged();
- NotifyObservers(ObservableMessagePortsChanged);
-}
-
-void CPortManager::ClosePort(IInputHandler* handler)
-{
- CExclusiveLock lock(m_mutex);
-
- m_ports.erase(std::remove_if(m_ports.begin(), m_ports.end(),
- [handler](const SPort& port)
- {
- return port.handler == handler;
- }), m_ports.end());
-
- SetChanged();
- NotifyObservers(ObservableMessagePortsChanged);
-}
-
-void CPortManager::MapDevices(const PeripheralVector& devices,
- std::map<CPeripheral*, IInputHandler*>& deviceToPortMap)
-{
- CSharedLock lock(m_mutex);
-
- if (m_ports.empty())
- return; // Nothing to do
-
- // Clear all ports
- for (SPort& port : m_ports)
- port.device = nullptr;
-
- // Prioritize devices by several criteria
- PeripheralVector devicesCopy = devices;
- std::sort(devicesCopy.begin(), devicesCopy.end(),
- [](const PeripheralPtr& lhs, const PeripheralPtr& rhs)
- {
- // Prioritize physical joysticks over emulated ones
- if (lhs->Type() == PERIPHERAL_JOYSTICK && rhs->Type() != PERIPHERAL_JOYSTICK)
- return true;
- if (lhs->Type() != PERIPHERAL_JOYSTICK && rhs->Type() == PERIPHERAL_JOYSTICK)
- return false;
-
- if (lhs->Type() == PERIPHERAL_JOYSTICK && rhs->Type() == PERIPHERAL_JOYSTICK)
- {
- std::shared_ptr<CPeripheralJoystick> i = std::static_pointer_cast<CPeripheralJoystick>(lhs);
- std::shared_ptr<CPeripheralJoystick> j = std::static_pointer_cast<CPeripheralJoystick>(rhs);
-
- // Prioritize requested a port over no port requested
- if (i->RequestedPort() != JOYSTICK_PORT_UNKNOWN && j->RequestedPort() == JOYSTICK_PORT_UNKNOWN)
- return true;
- if (i->RequestedPort() == JOYSTICK_PORT_UNKNOWN && j->RequestedPort() != JOYSTICK_PORT_UNKNOWN)
- return false;
-
- // Sort joystick by requested port
- return i->RequestedPort() < j->RequestedPort();
- }
-
- if (lhs->Type() == PERIPHERAL_JOYSTICK_EMULATION && rhs->Type() == PERIPHERAL_JOYSTICK_EMULATION)
- {
- std::shared_ptr<CPeripheralJoystickEmulation> i = std::static_pointer_cast<CPeripheralJoystickEmulation>(lhs);
- std::shared_ptr<CPeripheralJoystickEmulation> j = std::static_pointer_cast<CPeripheralJoystickEmulation>(rhs);
-
- // Sort emulated joysticks by player number
- return i->ControllerNumber() < j->ControllerNumber();
- }
-
- return false;
- });
-
- // Record mapped devices in output variable
- for (auto& device : devicesCopy)
- {
- IInputHandler* handler = AssignToPort(device);
- if (handler)
- deviceToPortMap[device.get()] = handler;
- }
-}
-
-CGameClient* CPortManager::GameClient(JOYSTICK::IInputHandler* handler)
-{
- CSharedLock lock(m_mutex);
-
- for (const SPort& port : m_ports)
- {
- if (port.handler == handler)
- return port.gameClient;
- }
-
- return nullptr;
-}
-
-void CPortManager::HardwareReset(JOYSTICK::IInputHandler *handler /* = nullptr */)
-{
- CSharedLock lock(m_mutex);
-
- // Find the port to reset
- auto itPort = m_ports.end();
-
- if (handler != nullptr)
- {
- auto FindByHandler = [handler](const SPort& portStruct)
- {
- return portStruct.handler == handler;
- };
-
- itPort = std::find_if(m_ports.begin(), m_ports.end(), FindByHandler);
- }
- else
- {
- auto FindDefaultPort = [](const SPort& portStruct)
- {
- return portStruct.port == 0;
- };
-
- itPort = std::find_if(m_ports.begin(), m_ports.end(), FindDefaultPort);
- }
-
- if (itPort != m_ports.end())
- itPort->hardwareInput->OnResetButton(itPort->port);
- else
- {
- if (handler != nullptr)
- CLog::Log(LOGERROR, "Can't find hardware to reset for controller %s (total ports = %u)", handler->ControllerID().c_str(), m_ports.size());
- else
- CLog::Log(LOGERROR, "Can't find hardware to reset for default port (total ports = %u)", m_ports.size());
- }
-}
-
-IInputHandler* CPortManager::AssignToPort(const PeripheralPtr& device, bool checkPortNumber /* = true */)
-{
- const int requestedPort = GetRequestedPort(device);
- const bool bPortRequested = (requestedPort != JOYSTICK_PORT_UNKNOWN);
-
- for (SPort& port : m_ports)
- {
- // Skip occupied ports
- if (port.device != nullptr)
- continue;
-
- // If specified, check port numbers
- if (checkPortNumber)
- {
- if (bPortRequested && requestedPort != static_cast<int>(port.port))
- continue;
- }
-
- // If required, filter by type 
- const bool bTypeRequired = (port.requiredType != PERIPHERAL_UNKNOWN);
- if (bTypeRequired && port.requiredType != device->Type())
- continue;
-
- // Success
- port.device = device.get();
- return port.handler;
- }
-
- // If joystick requested a port but wasn't mapped, try again without checking port numbers
- if (checkPortNumber && bPortRequested)
- return AssignToPort(device, false);
-
- return nullptr;
-}

_service:download_files:master.tar.gz/xbmc/games/ports/PortManager.h Deleted

@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "peripherals/PeripheralTypes.h"
-#include "threads/SharedSection.h"
-#include "utils/Observer.h"
-
-#include <map>
-#include <vector>
-
-namespace PERIPHERALS
-{
- class CPeripheral;
- class CPeripherals;
-}
-
-namespace KODI
-{
-namespace HARDWARE
-{
- class IHardwareInput;
-}
-
-namespace JOYSTICK
-{
- class IInputHandler;
-}
-
-namespace GAME
-{
- class CGameClient;
- class CPortMapper;
-
- /*!
- * \brief Class to manage ports opened by game clients
- */
- class CPortManager : public Observable
- {
- public:
- explicit CPortManager(PERIPHERALS::CPeripherals& peripheralManager);
- virtual ~CPortManager();
-
- /*!
- * \brief Request a new port be opened with input on that port sent to the
- * specified handler.
- *
- * \param handler The instance accepting all input delivered to the port
- * \param gameClient The game client opening the port
- * \param port The port number belonging to the game client
- * \param requiredType Used to restrict port to devices of only a certain type
- */
- void OpenPort(JOYSTICK::IInputHandler* handler,
- HARDWARE::IHardwareInput *hardwareInput,
- CGameClient* gameClient,
- unsigned int port,
- PERIPHERALS::PeripheralType requiredType = PERIPHERALS::PERIPHERAL_UNKNOWN);
-
- /*!
- * \brief Close an opened port
- *
- * \param handler The handler used to open the port
- */
- void ClosePort(JOYSTICK::IInputHandler* handler);
-
- /*!
- * \brief Map a list of devices to the available ports
- *
- * \param devices The devices capable of providing input to the ports
- * \param portMap The resulting map of devices to ports
- *
- * If there are more devices than open ports, multiple devices may be assigned
- * to the same port. If a device requests a specific port, this function will
- * attempt to honor that request.
- */
- void MapDevices(const PERIPHERALS::PeripheralVector& devices,
- std::map<PERIPHERALS::CPeripheral*, JOYSTICK::IInputHandler*>& deviceToPortMap);
-
- //! @todo Return game client from MapDevices()
- CGameClient* GameClient(JOYSTICK::IInputHandler* handler);
-
- /*!
- * \brief Send a hardware reset command for the specified input handler
- *
- * \param handler The handler associated the user who pressed reset, or
- * nullptr if it's unknown who presesd reset
- */
- void HardwareReset(JOYSTICK::IInputHandler *handler = nullptr);
-
- private:
- JOYSTICK::IInputHandler* AssignToPort(const PERIPHERALS::PeripheralPtr& device, bool checkPortNumber = true);
-
- std::unique_ptr<CPortMapper> m_portMapper;
-
- struct SPort
- {
- JOYSTICK::IInputHandler* handler; // Input handler for this port
- HARDWARE::IHardwareInput *hardwareInput; // Callbacks for hardware input
- unsigned int port; // Port number belonging to the game client
- PERIPHERALS::PeripheralType requiredType;
- void* device;
- CGameClient* gameClient;
- };
-
- std::vector<SPort> m_ports;
- CSharedSection m_mutex;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/games/ports/PortMapper.cpp Deleted

@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "PortMapper.h"
-#include "Port.h"
-#include "PortManager.h"
-#include "peripherals/devices/Peripheral.h"
-#include "peripherals/Peripherals.h"
-
-using namespace KODI;
-using namespace GAME;
-using namespace JOYSTICK;
-using namespace PERIPHERALS;
-
-CPortMapper::CPortMapper(PERIPHERALS::CPeripherals& peripheralManager, CPortManager& portManager) :
- m_peripheralManager(peripheralManager),
- m_portManager(portManager)
-{
- m_peripheralManager.RegisterObserver(this);
- m_portManager.RegisterObserver(this);
-}
-
-CPortMapper::~CPortMapper()
-{
- m_portManager.UnregisterObserver(this);
- m_peripheralManager.UnregisterObserver(this);
-}
-
-void CPortMapper::Notify(const Observable &obs, const ObservableMessage msg)
-{
- switch (msg)
- {
- case ObservableMessagePeripheralsChanged:
- case ObservableMessagePortsChanged:
- ProcessPeripherals();
- break;
- default:
- break;
- }
-}
-
-void CPortMapper::ProcessPeripherals()
-{
- PeripheralVector joysticks;
- m_peripheralManager.GetPeripheralsWithFeature(joysticks, FEATURE_JOYSTICK);
-
- // Perform the port mapping
- std::map<CPeripheral*, IInputHandler*> newPortMap;
- m_portManager.MapDevices(joysticks, newPortMap);
-
- // Update each joystick
- for (auto& joystick : joysticks)
- {
- auto itConnectedPort = newPortMap.find(joystick.get());
- auto itDisconnectedPort = m_portMap.find(joystick);
-
- IInputHandler* newHandler = itConnectedPort != newPortMap.end() ? itConnectedPort->second : nullptr;
- IInputHandler* oldHandler = itDisconnectedPort != m_portMap.end() ? itDisconnectedPort->second->InputHandler() : nullptr;
-
- if (oldHandler != newHandler)
- {
- // Unregister old handler
- if (oldHandler != nullptr)
- {
- PortPtr& oldPort = itDisconnectedPort->second;
-
- oldPort->UnregisterInput(joystick.get());
-
- m_portMap.erase(itDisconnectedPort);
- }
-
- // Register new handler
- if (newHandler != nullptr)
- {
- CGameClient *gameClient = m_portManager.GameClient(newHandler);
- if (gameClient)
- {
- PortPtr newPort(new CPort(newHandler, *gameClient));
-
- newPort->RegisterInput(joystick.get());
-
- m_portMap.insert(std::make_pair(std::move(joystick), std::move(newPort)));
- }
- }
- }
- }
-}

_service:download_files:master.tar.gz/xbmc/games/ports/PortMapper.h Deleted

@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "PortTypes.h"
-#include "peripherals/PeripheralTypes.h"
-#include "utils/Observer.h"
-
-#include <map>
-
-namespace PERIPHERALS
-{
- class CPeripherals;
-}
-
-namespace KODI
-{
-namespace GAME
-{
- class CPortManager;
-
- class CPortMapper : public Observer
- {
- public:
- CPortMapper(PERIPHERALS::CPeripherals& peripheralManager, CPortManager& portManager);
-
- virtual ~CPortMapper();
-
- virtual void Notify(const Observable& obs, const ObservableMessage msg) override;
-
- private:
- void ProcessPeripherals();
-
- // Construction parameters
- PERIPHERALS::CPeripherals &m_peripheralManager;
- CPortManager &m_portManager;
-
- // Port paremters
- std::map<PERIPHERALS::PeripheralPtr, PortPtr> m_portMap;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/games/ports/PortTypes.h Deleted

_service:download_files:master.tar.gz/xbmc/guiinfo/GUIInfoLabels.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/guilib/D3DResource.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -26,6 +26,11 @@
 #include "rendering/dx/DeviceResources.h"
 #include "rendering/dx/RenderContext.h"
 
+#include <d3dcompiler.h>
+
+using namespace DirectX;
+using namespace Microsoft::WRL;
+
 #ifdef TARGET_WINDOWS_DESKTOP
 #pragma comment(lib, "d3dcompiler.lib")
 #endif
@@ -194,7 +199,7 @@
 
 if (!DX::Windowing().IsFormatSupport(format, D3D11_FORMAT_SUPPORT_TEXTURE2D))
 {
- CLog::Log(LOGERROR, __FUNCTION__" - unsupported texture format %d", format);
+ CLog::LogF(LOGERROR, "unsupported texture format %d", format);
 return false;
 }
 
@@ -227,7 +232,7 @@
 
 if (!CreateInternal(pixels, srcPitch))
 {
- CLog::Log(LOGERROR, "%s - failed to create texture.", __FUNCTION__);
+ CLog::LogF(LOGERROR, "failed to create texture.");
 return false;
 }
 
@@ -237,8 +242,8 @@
 
 bool CD3DTexture::CreateInternal(const void* pixels /* nullptr */, unsigned int srcPitch /* 0 */)
 {
- ID3D11Device* pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext* pD3D11Context = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11Device> pD3DDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11DeviceContext> pD3D11Context = DX::DeviceResources::Get()->GetD3DContext();
 
 UINT miscFlags = 0;
 bool autogenmm = false;
@@ -256,10 +261,10 @@
 initData.SysMemPitch = srcPitch ? srcPitch : CD3DHelper::BitsPerPixel(m_format) * m_width / 8;
 initData.SysMemSlicePitch = 0;
 
- HRESULT hr = pD3DDevice->CreateTexture2D(&textureDesc, (!autogenmm && pixels) ? &initData : nullptr, &m_texture);
+ HRESULT hr = pD3DDevice->CreateTexture2D(&textureDesc, (!autogenmm && pixels) ? &initData : nullptr, m_texture.ReleaseAndGetAddressOf());
 if (SUCCEEDED(hr) && autogenmm)
 {
- pD3D11Context->UpdateSubresource(m_texture, 0, nullptr, pixels,
+ pD3D11Context->UpdateSubresource(m_texture.Get(), 0, nullptr, pixels,
 (srcPitch ? srcPitch : CD3DHelper::BitsPerPixel(m_format) * m_width / 8), 0);
 }
 
@@ -283,21 +288,16 @@
 
 if (!m_views[format])
 {
- ID3D11ShaderResourceView* pView = nullptr;
+ ComPtr<ID3D11ShaderResourceView> view;
 CD3D11_SHADER_RESOURCE_VIEW_DESC cSRVDesc(D3D11_SRV_DIMENSION_TEXTURE2D, format);
- HRESULT hr = DX::DeviceResources::Get()->GetD3DDevice()->CreateShaderResourceView(m_texture, &cSRVDesc, &pView);
- if (FAILED(hr))
- {
- CLog::Log(LOGWARNING, __FUNCTION__ " - cannot create texture view.");
- SAFE_RELEASE(pView);
- }
+ HRESULT hr = DX::DeviceResources::Get()->GetD3DDevice()->CreateShaderResourceView(m_texture.Get(), &cSRVDesc, view.GetAddressOf());
+ if (SUCCEEDED(hr))
+ m_views.insert_or_assign(format, view);
 else
- {
- m_views.insert_or_assign(format, pView);
- }
+ CLog::LogF(LOGWARNING, "cannot create texture view.");
 }
 
- return m_views[format];
+ return m_views[format].Get();
 }
 
 ID3D11ShaderResourceView** CD3DTexture::GetAddressOfSRV(DXGI_FORMAT format)
@@ -308,7 +308,7 @@
 if (!m_views[format])
 GetShaderResource(format);
 
- return &m_views[format];
+ return m_views[format].GetAddressOf();
 }
 
 ID3D11RenderTargetView* CD3DTexture::GetRenderTarget()
@@ -320,7 +320,7 @@
 {
 if (!m_renderTargets[m_viewIdx])
 GetRenderTargetInternal(m_viewIdx);
- return &m_renderTargets[0];
+ return m_renderTargets[0].GetAddressOf();
 }
 
 void CD3DTexture::Release()
@@ -328,12 +328,10 @@
 if (m_texture)
 DX::Windowing().Unregister(this);
 
- for (auto it : m_views)
- SAFE_RELEASE(it.second);
- SAFE_RELEASE(m_renderTargets[0]);
- SAFE_RELEASE(m_renderTargets[1]);
- SAFE_RELEASE(m_texture);
 m_views.clear();
+ m_renderTargets[0] = nullptr;
+ m_renderTargets[1] = nullptr;
+ m_texture = nullptr;
 }
 
 bool CD3DTexture::GetDesc(D3D11_TEXTURE2D_DESC *desc) const
@@ -355,7 +353,7 @@
 if ((mapType == D3D11_MAP_READ || mapType == D3D11_MAP_READ_WRITE) && m_usage == D3D11_USAGE_DYNAMIC)
 return false;
 
- return (S_OK == DX::DeviceResources::Get()->GetImmediateContext()->Map(m_texture, subresource, mapType, 0, res));
+ return (S_OK == DX::DeviceResources::Get()->GetImmediateContext()->Map(m_texture.Get(), subresource, mapType, 0, res));
 }
 return false;
 }
@@ -364,7 +362,7 @@
 {
 if (m_texture)
 {
- DX::DeviceResources::Get()->GetImmediateContext()->Unmap(m_texture, subresource);
+ DX::DeviceResources::Get()->GetImmediateContext()->Unmap(m_texture.Get(), subresource);
 return true;
 }
 return false;
@@ -382,7 +380,7 @@
 D3D11_TEXTURE2D_DESC textureDesc;
 m_texture->GetDesc(&textureDesc);
 
- ID3D11Texture2D* texture = nullptr;
+ ComPtr<ID3D11Texture2D> texture = nullptr;
 if (textureDesc.Usage != D3D11_USAGE_STAGING || 0 == (textureDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ))
 {
 // create texture which can be readed by CPU - D3D11_USAGE_STAGING
@@ -395,26 +393,23 @@
 return;
 
 // copy contents to new texture
- pContext->CopyResource(texture, m_texture);
+ pContext->CopyResource(texture.Get(), m_texture.Get());
 }
 else 
 texture = m_texture;
 
 // read data from texture
 D3D11_MAPPED_SUBRESOURCE res;
- if (SUCCEEDED(pContext->Map(texture, 0, D3D11_MAP_READ, 0, &res)))
+ if (SUCCEEDED(pContext->Map(texture.Get(), 0, D3D11_MAP_READ, 0, &res)))
 {
 m_pitch = res.RowPitch;
 unsigned int memUsage = GetMemoryUsage(res.RowPitch);
 m_data = new unsigned char[memUsage];
 memcpy(m_data, res.pData, memUsage);
- pContext->Unmap(texture, 0);
+ pContext->Unmap(texture.Get(), 0);
 }
 else
- CLog::Log(LOGERROR, "%s - Failed to store resource.", __FUNCTION__);
-
- if (texture != m_texture)
- SAFE_RELEASE(texture);
+ CLog::LogF(LOGERROR, "Failed to store resource.");
 }
 }
 
@@ -422,12 +417,10 @@
 {
 if (!fatal)
 SaveTexture();
- for (auto it = m_views.begin(); it != m_views.end(); ++it)
- SAFE_RELEASE(it->second);
- SAFE_RELEASE(m_renderTargets[0]);
- SAFE_RELEASE(m_renderTargets[1]);
- SAFE_RELEASE(m_texture);
 m_views.clear();
+ m_renderTargets[0] = nullptr;
+ m_renderTargets[1] = nullptr;
+ m_texture = nullptr;
 }
 
 void CD3DTexture::RestoreTexture()
@@ -437,7 +430,7 @@
 {
 if (!CreateInternal(m_data, m_pitch))
 {
- CLog::Log(LOGERROR, "%s: failed restore texture", __FUNCTION__);
+ CLog::LogF(LOGERROR, "failed restore texture");
 }
 
 delete[] m_data;
@@ -465,13 +458,13 @@
 if (!m_renderTargets[idx])
 {
 CD3D11_RENDER_TARGET_VIEW_DESC cRTVDesc(D3D11_RTV_DIMENSION_TEXTURE2DARRAY, DXGI_FORMAT_UNKNOWN, 0, idx, 1);
- if (FAILED(DX::DeviceResources::Get()->GetD3DDevice()->CreateRenderTargetView(m_texture, &cRTVDesc, &m_renderTargets[idx])))
+ if (FAILED(DX::DeviceResources::Get()->GetD3DDevice()->CreateRenderTargetView(m_texture.Get(), &cRTVDesc, m_renderTargets[idx].ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGWARNING, __FUNCTION__ " - cannot create texture view.");
+ CLog::LogF(LOGWARNING, "cannot create texture view.");
 }
 }
 
- return m_renderTargets[idx];
+ return m_renderTargets[idx].Get();
 }
 
 unsigned int CD3DTexture::GetMemoryUsage(unsigned int pitch) const
@@ -592,7 +585,7 @@
 
 void CD3DEffect::OnDestroyDevice(bool fatal)
 {
- SAFE_RELEASE(m_effect);
+ m_effect = nullptr;
 m_techniquie = nullptr;
 m_currentPass = nullptr;
 }
@@ -611,7 +604,7 @@
 
 if (!includeFile.Open(fileName))
 {
- CLog::Log(LOGERROR, "%s: Could not open 3DLUT file: %s", __FUNCTION__, fileName.c_str());
+ CLog::LogF(LOGERROR, "Could not open 3DLUT file: %s", fileName);
 return E_FAIL;
 }
 
@@ -643,11 +636,11 @@
 return false;
 }
 
-bool CD3DEffect::SetMatrix(LPCSTR handle, const XMFLOAT4X4* mat)
+bool CD3DEffect::SetMatrix(LPCSTR handle, const float* mat)
 {
 if (m_effect)
 {
- return S_OK == m_effect->GetVariableByName(handle)->AsMatrix()->SetMatrix((float *)mat);
+ return S_OK == m_effect->GetVariableByName(handle)->AsMatrix()->SetMatrix(mat);
 }
 return false;
 }
@@ -788,7 +781,7 @@
 #endif
 
 hr = D3DX11CompileEffectFromMemory(m_effectString.c_str(), m_effectString.length(), "", &definemacros[0], this,
- dwShaderFlags, 0, DX::DeviceResources::Get()->GetD3DDevice(), &m_effect, &pError);
+ dwShaderFlags, 0, DX::DeviceResources::Get()->GetD3DDevice(), m_effect.ReleaseAndGetAddressOf(), &pError);
 
 if(hr == S_OK)
 return true;
@@ -849,7 +842,7 @@
 void CD3DBuffer::Release()
 {
 DX::Windowing().Unregister(this);
- SAFE_RELEASE(m_buffer);
+ m_buffer = nullptr;
 }
 
 bool CD3DBuffer::Map(void **data)
@@ -857,7 +850,7 @@
 if (m_buffer)
 {
 D3D11_MAPPED_SUBRESOURCE resource;
- if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DContext()->Map(m_buffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
+ if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DContext()->Map(m_buffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
 {
 *data = resource.pData;
 return true;
@@ -870,7 +863,7 @@
 {
 if (m_buffer)
 {
- DX::DeviceResources::Get()->GetD3DContext()->Unmap(m_buffer, 0);
+ DX::DeviceResources::Get()->GetD3DContext()->Unmap(m_buffer.Get(), 0);
 return true;
 }
 return false;
@@ -880,12 +873,12 @@
 {
 if (fatal)
 {
- SAFE_RELEASE(m_buffer);
+ m_buffer = nullptr;
 return;
 }
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetImmediateContext();
 
 if (!pDevice || !pContext || !m_buffer)
 return;
@@ -893,7 +886,7 @@
 D3D11_BUFFER_DESC srcDesc;
 m_buffer->GetDesc(&srcDesc);
 
- ID3D11Buffer *buffer = nullptr;
+ ComPtr<ID3D11Buffer> buffer;
 if (srcDesc.Usage != D3D11_USAGE_STAGING || 0 == (srcDesc.CPUAccessFlags & D3D11_CPU_ACCESS_READ))
 {
 CD3D11_BUFFER_DESC trgDesc(srcDesc);
@@ -902,7 +895,7 @@
 trgDesc.BindFlags = 0;
 
 if (SUCCEEDED(pDevice->CreateBuffer(&trgDesc, NULL, &buffer)))
- pContext->CopyResource(buffer, m_buffer);
+ pContext->CopyResource(buffer.Get(), m_buffer.Get());
 }
 else
 buffer = m_buffer;
@@ -910,16 +903,14 @@
 if (buffer != nullptr)
 {
 D3D11_MAPPED_SUBRESOURCE res;
- if (SUCCEEDED(pContext->Map(buffer, 0, D3D11_MAP_READ, 0, &res)))
+ if (SUCCEEDED(pContext->Map(buffer.Get(), 0, D3D11_MAP_READ, 0, &res)))
 {
 m_data = new unsigned char[srcDesc.ByteWidth];
 memcpy(m_data, res.pData, srcDesc.ByteWidth);
- pContext->Unmap(buffer, 0);
+ pContext->Unmap(buffer.Get(), 0);
 }
 }
- if (buffer != m_buffer)
- SAFE_RELEASE(buffer);
- SAFE_RELEASE(m_buffer);
+ m_buffer = nullptr;
 }
 
 void CD3DBuffer::OnCreateDevice()
@@ -938,7 +929,7 @@
 CD3D11_BUFFER_DESC bDesc(m_length, m_type, m_usage, m_cpuFlags);
 D3D11_SUBRESOURCE_DATA initData;
 initData.pSysMem = pData;
- return (S_OK == DX::DeviceResources::Get()->GetD3DDevice()->CreateBuffer(&bDesc, (pData ? &initData : nullptr), &m_buffer));
+ return (S_OK == DX::DeviceResources::Get()->GetD3DDevice()->CreateBuffer(&bDesc, (pData ? &initData : nullptr), m_buffer.ReleaseAndGetAddressOf()));
 }
 
 /****************************************************/
@@ -963,16 +954,20 @@
 {
 DX::Windowing().Unregister(this);
 ReleaseShader();
- SAFE_RELEASE(m_VSBuffer);
- SAFE_DELETE_ARRAY(m_vertexLayout);
+ m_VSBuffer = nullptr;
+ if (m_vertexLayout)
+ {
+ delete[] m_vertexLayout;
+ m_vertexLayout = nullptr;
+ }
 }
 
 void CD3DVertexShader::ReleaseShader()
 {
 UnbindShader();
 
- SAFE_RELEASE(m_VS);
- SAFE_RELEASE(m_inputLayout);
+ m_VS = nullptr;
+ m_inputLayout = nullptr;
 m_inited = false;
 }
 
@@ -980,14 +975,14 @@
 {
 ReleaseShader();
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
 if (!pDevice)
 return false;
 
- if (FAILED(D3DReadFileToBlob(vertexFile.c_str(), &m_VSBuffer)))
+ if (FAILED(D3DReadFileToBlob(vertexFile.c_str(), m_VSBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to load the vertex shader.");
+ CLog::LogF(LOGERROR, "failed to load the vertex shader.");
 return false;
 }
 
@@ -1013,15 +1008,15 @@
 {
 ReleaseShader();
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
 if (!pDevice)
 return false;
 
 // trick to load bytecode into ID3DBlob
- if (FAILED(D3DStripShader(code, codeLength, D3DCOMPILER_STRIP_REFLECTION_DATA, &m_VSBuffer)))
+ if (FAILED(D3DStripShader(code, codeLength, D3DCOMPILER_STRIP_REFLECTION_DATA, m_VSBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to load the vertex shader.");
+ CLog::LogF(LOGERROR, "failed to load the vertex shader.");
 return false;
 }
 
@@ -1045,23 +1040,23 @@
 
 bool CD3DVertexShader::CreateInternal()
 {
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
- CLog::Log(LOGDEBUG, __FUNCTION__ " - Create the vertex shader.");
+ CLog::LogF(LOGDEBUG, "creating vertex shader.");
 
 // Create the vertex shader
- if (FAILED(pDevice->CreateVertexShader(m_VSBuffer->GetBufferPointer(), m_VSBuffer->GetBufferSize(), nullptr, &m_VS)))
+ if (FAILED(pDevice->CreateVertexShader(m_VSBuffer->GetBufferPointer(), m_VSBuffer->GetBufferSize(), nullptr, m_VS.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to Create the vertex shader.");
- SAFE_RELEASE(m_VSBuffer);
+ CLog::LogF(LOGERROR, "failed to Create the vertex shader.");
+ m_VSBuffer = nullptr;
 return false;
 }
 
- CLog::Log(LOGDEBUG, __FUNCTION__ " - create the input layout.");
+ CLog::LogF(LOGDEBUG, "creating input layout.");
 
- if (FAILED(pDevice->CreateInputLayout(m_vertexLayout, m_vertexLayoutSize, m_VSBuffer->GetBufferPointer(), m_VSBuffer->GetBufferSize(), &m_inputLayout)))
+ if (FAILED(pDevice->CreateInputLayout(m_vertexLayout, m_vertexLayoutSize, m_VSBuffer->GetBufferPointer(), m_VSBuffer->GetBufferSize(), m_inputLayout.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to create the input layout.");
+ CLog::LogF(LOGERROR, "failed to create the input layout.");
 return false;
 }
 
@@ -1073,12 +1068,12 @@
 if (!m_inited)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 if (!pContext)
 return;
 
- pContext->IASetInputLayout(m_inputLayout);
- pContext->VSSetShader(m_VS, nullptr, 0);
+ pContext->IASetInputLayout(m_inputLayout.Get());
+ pContext->VSSetShader(m_VS.Get(), nullptr, 0);
 }
 
 void CD3DVertexShader::UnbindShader()
@@ -1086,7 +1081,7 @@
 if (!m_inited)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 pContext->IASetInputLayout(nullptr);
 pContext->VSSetShader(nullptr, nullptr, 0);
 }
@@ -1121,27 +1116,27 @@
 {
 DX::Windowing().Unregister(this);
 ReleaseShader();
- SAFE_RELEASE(m_PSBuffer);
+ m_PSBuffer = nullptr;
 }
 
 void CD3DPixelShader::ReleaseShader()
 {
- SAFE_RELEASE(m_PS);
 m_inited = false;
+ m_PS = nullptr;
 }
 
 bool CD3DPixelShader::Create(const std::wstring& wstrFile)
 {
 ReleaseShader();
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
 if (!pDevice)
 return false;
 
- if (FAILED(D3DReadFileToBlob(wstrFile.c_str(), &m_PSBuffer)))
+ if (FAILED(D3DReadFileToBlob(wstrFile.c_str(), m_PSBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to load the vertex shader.");
+ CLog::LogF(LOGERROR, "Failed to load the vertex shader.");
 return false;
 }
 
@@ -1157,15 +1152,15 @@
 {
 ReleaseShader();
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
 if (!pDevice)
 return false;
 
 // trick to load bytecode into ID3DBlob
- if (FAILED(D3DStripShader(code, codeLength, D3DCOMPILER_STRIP_REFLECTION_DATA, &m_PSBuffer)))
+ if (FAILED(D3DStripShader(code, codeLength, D3DCOMPILER_STRIP_REFLECTION_DATA, m_PSBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to load the vertex shader.");
+ CLog::LogF(LOGERROR, "Failed to load the vertex shader.");
 return false;
 }
 
@@ -1179,15 +1174,15 @@
 
 bool CD3DPixelShader::CreateInternal()
 {
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
- CLog::Log(LOGDEBUG, __FUNCTION__ " - Create the pixel shader.");
+ CLog::LogF(LOGDEBUG, "Create the pixel shader.");
 
 // Create the vertex shader
- if (FAILED(pDevice->CreatePixelShader(m_PSBuffer->GetBufferPointer(), m_PSBuffer->GetBufferSize(), nullptr, &m_PS)))
+ if (FAILED(pDevice->CreatePixelShader(m_PSBuffer->GetBufferPointer(), m_PSBuffer->GetBufferSize(), nullptr, m_PS.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to Create the pixel shader.");
- SAFE_RELEASE(m_PSBuffer);
+ CLog::LogF(LOGERROR, "Failed to Create the pixel shader.");
+ m_PSBuffer = nullptr;
 return false;
 }
 
@@ -1199,11 +1194,11 @@
 if (!m_inited)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 if (!pContext)
 return;
 
- pContext->PSSetShader(m_PS, nullptr, 0);
+ pContext->PSSetShader(m_PS.Get(), nullptr, 0);
 }
 
 void CD3DPixelShader::UnbindShader()
@@ -1211,7 +1206,7 @@
 if (!m_inited)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 pContext->IASetInputLayout(nullptr);
 pContext->VSSetShader(nullptr, nullptr, 0);
 }

_service:download_files:master.tar.gz/xbmc/guilib/D3DResource.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,13 +20,13 @@
 
 #pragma once
 
+#include "utils/Geometry.h"
+#include "GUIColorManager.h"
+
 #include <map>
 #include <d3dx11effect.h>
 #include <DirectXMath.h>
-#include "Geometry.h"
-#include "GUIColorManager.h"
-
-using namespace DirectX;
+#include <wrl/client.h>
 
 #define KODI_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT 4
 
@@ -63,7 +63,7 @@
 floats[3] = float((dword >> 24) & 0xFF) * (1.0f / 255.0f); // a
 }
 
- static inline void XMStoreColor(XMFLOAT4* floats, DWORD dword)
+ static inline void XMStoreColor(DirectX::XMFLOAT4* floats, DWORD dword)
 {
 XMStoreColor(reinterpret_cast<float*>(floats), dword);
 }
@@ -76,7 +76,7 @@
 floats[3] = a * (1.0f / 255.0f);
 }
 
- static inline void XMStoreColor(XMFLOAT4* floats, unsigned char a, unsigned char r, unsigned char g, unsigned char b)
+ static inline void XMStoreColor(DirectX::XMFLOAT4* floats, unsigned char a, unsigned char r, unsigned char g, unsigned char b)
 {
 XMStoreColor(reinterpret_cast<float*>(floats), a, r, g, b);
 }
@@ -105,7 +105,7 @@
 bool UnlockRect(UINT subresource) const;
 
 // Accessors
- ID3D11Texture2D* Get() const { return m_texture; };
+ ID3D11Texture2D* Get() const { return m_texture.Get(); };
 ID3D11ShaderResourceView* GetShaderResource(DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN);
 ID3D11ShaderResourceView** GetAddressOfSRV(DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN);
 ID3D11RenderTargetView* GetRenderTarget();
@@ -139,25 +139,24 @@
 void SaveTexture();
 void RestoreTexture();
 
+ // saved data
+ BYTE* m_data;
 // creation parameters
- UINT m_width;
- UINT m_height;
- UINT m_mipLevels;
+ UINT m_width;
+ UINT m_height;
+ UINT m_mipLevels;
+ UINT m_pitch;
+ UINT m_bindFlags;
+ UINT m_cpuFlags;
+ UINT m_viewIdx;
 D3D11_USAGE m_usage;
 DXGI_FORMAT m_format;
- UINT m_pitch;
- UINT m_bindFlags;
- UINT m_cpuFlags;
- UINT m_viewIdx;
 
 // created texture
- ID3D11Texture2D* m_texture;
- ID3D11RenderTargetView* m_renderTargets[2];
+ Microsoft::WRL::ComPtr<ID3D11Texture2D> m_texture;
+ Microsoft::WRL::ComPtr<ID3D11RenderTargetView> m_renderTargets[2];
 // store views in different formats
- std::map<DXGI_FORMAT, ID3D11ShaderResourceView*> m_views;
-
- // saved data
- BYTE* m_data;
+ std::map<DXGI_FORMAT, Microsoft::WRL::ComPtr<ID3D11ShaderResourceView>> m_views;
 };
 
 typedef std::map<std::string, std::string> DefinesMap;
@@ -170,7 +169,7 @@
 bool Create(const std::string &effectString, DefinesMap* defines);
 void Release();
 bool SetFloatArray(LPCSTR handle, const float* val, unsigned int count);
- bool SetMatrix(LPCSTR handle, const XMFLOAT4X4* mat);
+ bool SetMatrix(LPCSTR handle, const float* mat);
 bool SetTechnique(LPCSTR handle);
 bool SetTexture(LPCSTR handle, CD3DTexture &texture);
 bool SetResources(LPCSTR handle, ID3D11ShaderResourceView** ppSRViews, size_t count);
@@ -181,7 +180,7 @@
 bool EndPass();
 bool End();
 
- ID3DX11Effect *Get() const { return m_effect; };
+ ID3DX11Effect *Get() const { return m_effect.Get(); };
 
 void OnDestroyDevice(bool fatal) override;
 void OnCreateDevice() override;
@@ -191,13 +190,13 @@
 __declspec(nothrow) HRESULT __stdcall Close(LPCVOID pData) override;
 
 private:
- bool CreateEffect();
+ bool CreateEffect();
 
- std::string m_effectString;
- ID3DX11Effect* m_effect;
- ID3DX11EffectTechnique* m_techniquie;
- ID3DX11EffectPass* m_currentPass;
- DefinesMap m_defines;
+ std::string m_effectString;
+ DefinesMap m_defines;
+ Microsoft::WRL::ComPtr<ID3DX11Effect> m_effect;
+ Microsoft::WRL::ComPtr<ID3DX11EffectTechnique> m_techniquie;
+ Microsoft::WRL::ComPtr<ID3DX11EffectPass> m_currentPass;
 };
 
 class CD3DBuffer : public ID3DResource
@@ -209,24 +208,25 @@
 bool Map(void** resource);
 bool Unmap();
 void Release();
- bool Update(UINT offset, UINT size, void *data);
 unsigned int GetStride() { return m_stride; }
 DXGI_FORMAT GetFormat() { return m_format; }
- ID3D11Buffer* Get() const { return m_buffer; };
+ ID3D11Buffer* Get() const { return m_buffer.Get(); };
 
 void OnDestroyDevice(bool fatal) override;
 void OnCreateDevice() override;
+
 private:
 bool CreateBuffer(const void *pData);
- D3D11_BIND_FLAG m_type;
- UINT m_length;
- UINT m_stride;
- DXGI_FORMAT m_format;
- D3D11_USAGE m_usage;
- ID3D11Buffer* m_buffer;
- UINT m_cpuFlags;
+
 // saved data
- BYTE* m_data;
+ BYTE* m_data;
+ UINT m_length;
+ UINT m_stride;
+ UINT m_cpuFlags;
+ DXGI_FORMAT m_format;
+ D3D11_USAGE m_usage;
+ D3D11_BIND_FLAG m_type;
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_buffer;
 };
 
 class CD3DVertexShader : public ID3DResource
@@ -249,12 +249,12 @@
 private:
 bool CreateInternal();
 
- ID3DBlob* m_VSBuffer;
+ bool m_inited;
+ unsigned int m_vertexLayoutSize;
 D3D11_INPUT_ELEMENT_DESC* m_vertexLayout;
- ID3D11VertexShader* m_VS;
- ID3D11InputLayout* m_inputLayout;
- unsigned int m_vertexLayoutSize;
- bool m_inited;
+ Microsoft::WRL::ComPtr<ID3DBlob> m_VSBuffer;
+ Microsoft::WRL::ComPtr<ID3D11VertexShader> m_VS;
+ Microsoft::WRL::ComPtr<ID3D11InputLayout> m_inputLayout;
 };
 
 class CD3DPixelShader : public ID3DResource
@@ -277,7 +277,7 @@
 private:
 bool CreateInternal();
 
- ID3DBlob* m_PSBuffer;
- ID3D11PixelShader* m_PS;
- bool m_inited;
+ bool m_inited;
+ Microsoft::WRL::ComPtr<ID3DBlob> m_PSBuffer;
+ Microsoft::WRL::ComPtr<ID3D11PixelShader> m_PS;
 };

_service:download_files:master.tar.gz/xbmc/guilib/DDSImage.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/DDSImage.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirectXGraphics.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirectXGraphics.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirtyRegion.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirtyRegionSolvers.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirtyRegionTracker.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/DirtyRegionTracker.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/DispResource.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIAction.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIAudioManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIAudioManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIBaseContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIBaseContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIBorderedImage.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIBorderedImage.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIButtonControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIButtonControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUICallback.h Changed

@@ -3,7 +3,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -96,7 +96,7 @@
 
 GUIEventHandler(Class* pInstance, MethodPtr aMethodPtr)
 {
- GUIEvent<Cookie>::m_pInstance = (GUIEvent<Cookie>*) ((LPVOID) pInstance);
+ GUIEvent<Cookie>::m_pInstance = (GUIEvent<Cookie>*) static_cast<void*>(pInstance);
 
 #ifndef TARGET_POSIX
 // Its dirty but it works!
@@ -172,7 +172,7 @@
 
 CallbackHandler (Class* pInstance, MethodPtr aMethodPtr)
 {
- Callback<Result, Cookie>::m_pInstance = (Callback<Result, Cookie>*) ((LPVOID) pInstance);
+ Callback<Result, Cookie>::m_pInstance = (Callback<Result, Cookie>*) static_cast<void*>(pInstance);
 // Its dirty but it works!
 memcpy(&Callback<Result, Cookie>::m_pMethod, &aMethodPtr, sizeof(Callback<Result, Cookie>::m_pMethod));
 }

_service:download_files:master.tar.gz/xbmc/guilib/GUIColorManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIColorManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlFactory.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlGroup.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlGroup.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlGroupList.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlGroupList.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlLookup.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlLookup.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlProfiler.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIControlProfiler.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIDialog.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIDialog.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIEditControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIEditControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFadeLabelControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFixedListContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFixedListContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFont.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFont.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontCache.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,6 +22,8 @@
 #include "GraphicContext.h"
 #include "GUIWindowManager.h"
 #include "addons/Skin.h"
+#include "addons/AddonManager.h"
+#include "addons/FontResource.h"
 #include "GUIFontTTF.h"
 #include "GUIFont.h"
 #include "utils/XMLUtils.h"
@@ -34,11 +36,14 @@
 #include "utils/StringUtils.h"
 #include "FileItem.h"
 #include "URL.h"
+#include "ServiceBroker.h"
 
 #ifdef TARGET_POSIX
 #include "filesystem/SpecialProtocol.h"
 #endif
 
+using namespace ADDON;
+
 GUIFontManager::GUIFontManager(void)
 {
 m_canReload = true;
@@ -120,8 +125,18 @@
 
 // Check if the file exists, otherwise try loading it from the global media dir
 std::string file = URIUtils::GetFileName(strFilename);
- if (!CheckFont(strPath,"special://home/media/Fonts",file))
- CheckFont(strPath,"special://xbmc/media/Fonts",file);
+ if (!CheckFont(strPath, "special://home/media/Fonts", file) &&
+ !CheckFont(strPath, "special://xbmc/media/Fonts", file))
+ {
+ VECADDONS addons;
+ CServiceBroker::GetAddonMgr().GetAddons(addons, ADDON_RESOURCE_FONT);
+ for (auto& it : addons)
+ {
+ std::shared_ptr<CFontResource> font(std::static_pointer_cast<CFontResource>(it));
+ if (font->GetFont(file, strPath))
+ break;
+ }
+ }
 
 // check if we already have this font file loaded (font object could differ only by color or style)
 std::string TTFfontName = StringUtils::Format("%s_%f_%f%s", strFilename.c_str(), newSize, aspect, border ? "_border" : "");

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTF.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -703,7 +703,7 @@
 FT_Glyph glyph = NULL;
 if (FT_Load_Glyph( m_face, glyph_index, FT_LOAD_TARGET_LIGHT ))
 {
- CLog::Log(LOGDEBUG, "%s Failed to load glyph %x", __FUNCTION__, letter);
+ CLog::Log(LOGDEBUG, "%s Failed to load glyph %x", __FUNCTION__, static_cast<uint32_t>(letter));
 return false;
 }
 // make bold if applicable
@@ -718,7 +718,7 @@
 // grab the glyph
 if (FT_Get_Glyph(m_face->glyph, &glyph))
 {
- CLog::Log(LOGDEBUG, "%s Failed to get glyph %x", __FUNCTION__, letter);
+ CLog::Log(LOGDEBUG, "%s Failed to get glyph %x", __FUNCTION__, static_cast<uint32_t>(letter));
 return false;
 }
 if (m_stroker)
@@ -726,7 +726,7 @@
 // render the glyph
 if (FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_NORMAL, NULL, 1))
 {
- CLog::Log(LOGDEBUG, "%s Failed to render glyph %x to a bitmap", __FUNCTION__, letter);
+ CLog::Log(LOGDEBUG, "%s Failed to render glyph %x to a bitmap", __FUNCTION__, static_cast<uint32_t>(letter));
 return false;
 }
 FT_BitmapGlyph bitGlyph = (FT_BitmapGlyph)glyph;

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTF.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTFDX.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -29,6 +29,8 @@
 // stuff for freetype
 #include <ft2build.h>
 
+using namespace Microsoft::WRL;
+
 #ifdef TARGET_WINDOWS_STORE
 #define generic GenericFromFreeTypeLibrary
 #endif
@@ -50,13 +52,18 @@
 {
 DX::Windowing().Unregister(this);
 
- SAFE_DELETE(m_speedupTexture);
- SAFE_RELEASE(m_vertexBuffer);
- SAFE_RELEASE(m_staticIndexBuffer);
+ if (m_speedupTexture)
+ {
+ delete m_speedupTexture;
+ m_speedupTexture = nullptr;
+ }
+ m_vertexBuffer = nullptr;
+ m_staticIndexBuffer = nullptr;
 if (!m_buffers.empty())
 {
- for (std::list<CD3DBuffer*>::iterator it = m_buffers.begin(); it != m_buffers.end(); ++it)
- SAFE_DELETE((*it));
+ std::for_each(m_buffers.begin(), m_buffers.end(), [](CD3DBuffer* buf) {
+ if (buf) delete buf;
+ });
 }
 m_buffers.clear();
 m_staticIndexBufferCreated = false;
@@ -65,8 +72,7 @@
 
 bool CGUIFontTTFDX::FirstBegin()
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
- if (!pContext)
+ if (!DX::DeviceResources::Get()->GetD3DContext())
 return false;
 
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
@@ -77,7 +83,7 @@
 
 void CGUIFontTTFDX::LastEnd()
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 if (!pContext)
 return;
 
@@ -99,7 +105,7 @@
 // Enable alpha blend
 DX::Windowing().SetAlphaBlendEnable(true);
 // Set our static index buffer
- pContext->IASetIndexBuffer(m_staticIndexBuffer, DXGI_FORMAT_R16_UINT, 0);
+ pContext->IASetIndexBuffer(m_staticIndexBuffer.Get(), DXGI_FORMAT_R16_UINT, 0);
 // Set the type of primitive that should be rendered from this vertex buffer, in this case triangles.
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
 
@@ -110,7 +116,7 @@
 return;
 
 // Set the dynamic vertex buffer to active in the input assembler
- pContext->IASetVertexBuffers(0, 1, &m_vertexBuffer, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vertexBuffer.GetAddressOf(), &stride, &offset);
 
 // Do the actual drawing operation, split into groups of characters no
 // larger than the pre-determined size of the element array
@@ -189,7 +195,7 @@
 {
 buffer = new CD3DBuffer();
 if (!buffer->Create(D3D11_BIND_VERTEX_BUFFER, vertices.size(), sizeof(SVertex), DXGI_FORMAT_UNKNOWN, D3D11_USAGE_IMMUTABLE, &vertices[0]))
- CLog::Log(LOGERROR, "%s - Failed to create vertex buffer.", __FUNCTION__);
+ CLog::LogF(LOGERROR, "Failed to create vertex buffer.");
 else
 AddReference((CGUIFontTTFDX*)this, buffer);
 }
@@ -208,7 +214,8 @@
 {
 CD3DBuffer* vbuffer = reinterpret_cast<CD3DBuffer*>(buffer.bufferHandle);
 ClearReference((CGUIFontTTFDX*)this, vbuffer);
- SAFE_DELETE(vbuffer);
+ if (vbuffer)
+ delete vbuffer;
 buffer.bufferHandle = 0;
 }
 }
@@ -227,9 +234,9 @@
 if(m_textureHeight == 0)
 {
 delete m_texture;
- m_texture = NULL;
+ m_texture = nullptr;
 delete m_speedupTexture;
- m_speedupTexture = NULL;
+ m_speedupTexture = nullptr;
 }
 m_staticCache.Flush();
 m_dynamicCache.Flush();
@@ -238,22 +245,29 @@
 CD3DTexture* newSpeedupTexture = new CD3DTexture();
 if (!newSpeedupTexture->Create(m_textureWidth, newHeight, 1, D3D11_USAGE_DEFAULT, DXGI_FORMAT_R8_UNORM))
 {
- SAFE_DELETE(newSpeedupTexture);
- SAFE_DELETE(pNewTexture);
- return NULL;
+ delete newSpeedupTexture;
+ delete pNewTexture;
+ return nullptr;
 }
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetImmediateContext();
-
 // There might be data to copy from the previous texture
 if (newSpeedupTexture && m_speedupTexture)
 {
 CD3D11_BOX rect(0, 0, 0, m_textureWidth, m_textureHeight, 1);
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetImmediateContext();
 pContext->CopySubresourceRegion(newSpeedupTexture->Get(), 0, 0, 0, 0, m_speedupTexture->Get(), 0, &rect);
 }
 
- SAFE_DELETE(m_texture);
- SAFE_DELETE(m_speedupTexture);
+ if (m_texture)
+ {
+ delete m_texture;
+ m_texture = nullptr;
+ }
+ if (m_speedupTexture)
+ {
+ delete m_speedupTexture;
+ m_speedupTexture = nullptr;
+ }
 m_textureHeight = newHeight;
 m_textureScaleY = 1.0f / m_textureHeight;
 m_speedupTexture = newSpeedupTexture;
@@ -265,7 +279,7 @@
 {
 FT_Bitmap bitmap = bitGlyph->bitmap;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetImmediateContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetImmediateContext();
 if (m_speedupTexture && m_speedupTexture->Get() && pContext && bitmap.buffer)
 {
 CD3D11_BOX dstBox(x1, y1, 0, x2, y2, 1);
@@ -282,8 +296,8 @@
 
 bool CGUIFontTTFDX::UpdateDynamicVertexBuffer(const SVertex* pSysMem, unsigned int vertex_count)
 {
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 
 if (!pDevice || !pContext)
 return false;
@@ -291,16 +305,14 @@
 unsigned width = sizeof(SVertex) * vertex_count;
 if (width > m_vertexWidth) // create or re-create
 {
- SAFE_RELEASE(m_vertexBuffer);
-
 CD3D11_BUFFER_DESC bufferDesc(width, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
 D3D11_SUBRESOURCE_DATA initData;
 ZeroMemory(&initData, sizeof(D3D11_SUBRESOURCE_DATA));
 initData.pSysMem = pSysMem;
 
- if (FAILED(pDevice->CreateBuffer(&bufferDesc, &initData, &m_vertexBuffer)))
+ if (FAILED(pDevice->CreateBuffer(&bufferDesc, &initData, m_vertexBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to create the vertex buffer.");
+ CLog::LogF(LOGERROR, "Failed to create the vertex buffer.");
 return false;
 }
 
@@ -309,13 +321,13 @@
 else
 {
 D3D11_MAPPED_SUBRESOURCE resource;
- if (FAILED(pContext->Map(m_vertexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
+ if (FAILED(pContext->Map(m_vertexBuffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to update the vertex buffer.");
+ CLog::LogF(LOGERROR, "Failed to update the vertex buffer.");
 return false;
 }
 memcpy(resource.pData, pSysMem, width);
- pContext->Unmap(m_vertexBuffer, 0);
+ pContext->Unmap(m_vertexBuffer.Get(), 0);
 }
 return true;
 }
@@ -325,7 +337,7 @@
 if (m_staticIndexBufferCreated)
 return;
 
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 if (!pDevice)
 return;
 
@@ -344,19 +356,19 @@
 D3D11_SUBRESOURCE_DATA initData = { 0 };
 initData.pSysMem = index;
 
- if (SUCCEEDED(pDevice->CreateBuffer(&desc, &initData, &m_staticIndexBuffer)))
+ if (SUCCEEDED(pDevice->CreateBuffer(&desc, &initData, m_staticIndexBuffer.ReleaseAndGetAddressOf())))
 m_staticIndexBufferCreated = true;
 }
 
 bool CGUIFontTTFDX::m_staticIndexBufferCreated = false;
-ID3D11Buffer* CGUIFontTTFDX::m_staticIndexBuffer = nullptr;
+ComPtr<ID3D11Buffer> CGUIFontTTFDX::m_staticIndexBuffer = nullptr;
 
 void CGUIFontTTFDX::OnDestroyDevice(bool fatal)
 {
- SAFE_RELEASE(m_staticIndexBuffer);
 m_staticIndexBufferCreated = false;
- SAFE_RELEASE(m_vertexBuffer);
 m_vertexWidth = 0;
+ m_staticIndexBuffer = nullptr;
+ m_vertexBuffer = nullptr;
 }
 
 void CGUIFontTTFDX::OnCreateDevice(void)

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTFDX.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -31,6 +31,7 @@
 #include "GUIFontTTF.h"
 #include <list>
 #include <vector>
+#include <wrl/client.h>
 
 #define ELEMENT_ARRAY_MAX_CHAR_INDEX (2000)
 
@@ -65,14 +66,13 @@
 static void AddReference(CGUIFontTTFDX* font, CD3DBuffer* pBuffer);
 static void ClearReference(CGUIFontTTFDX* font, CD3DBuffer* pBuffer);
 
- CD3DTexture* m_speedupTexture; // extra texture to speed up reallocations when the main texture is in d3dpool_default.
- // that's the typical situation of Windows Vista and above.
- ID3D11Buffer* m_vertexBuffer;
- unsigned m_vertexWidth;
+ unsigned m_vertexWidth;
+ CD3DTexture* m_speedupTexture; // extra texture to speed up reallocations
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_vertexBuffer;
 std::list<CD3DBuffer*> m_buffers;
 
- static bool m_staticIndexBufferCreated;
- static ID3D11Buffer* m_staticIndexBuffer;
+ static bool m_staticIndexBufferCreated;
+ static Microsoft::WRL::ComPtr<ID3D11Buffer> m_staticIndexBuffer;
 };
 
 #endif

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTFGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIFontTTFGL.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIImage.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIImage.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIIncludes.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIIncludes.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIInfoTypes.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIKeyboard.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIKeyboardFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIKeyboardFactory.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUILabel.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUILabel.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUILabelControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUILabelControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListGroup.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListGroup.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListItem.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListItemLayout.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListItemLayout.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListLabel.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIListLabel.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIMessage.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIMoverControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIMoverControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIMultiImage.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIMultiImage.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIPanelContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIPanelContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIProgressControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIProgressControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRSSControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRSSControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRadioButtonControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRadioButtonControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRenderingControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIRenderingControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIResizeControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIResizeControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIScrollBarControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIScrollBarControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISettingsSliderControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISettingsSliderControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIShader.cpp Deleted

@@ -1,195 +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 "GUIShader.h"
-#include "MatrixGLES.h"
-#include "ServiceBroker.h"
-#include "utils/log.h"
-#include "rendering/RenderSystem.h"
-#include "guilib/GraphicContext.h"
-
-using namespace Shaders;
-
-CGUIShader::CGUIShader( const char *shader ) : CGLSLShaderProgram("guishader_vert.glsl", shader)
-{
- // Initialise values
- m_hTex0 = 0;
- m_hTex1 = 0;
- m_hProj = 0;
- m_hModel = 0;
- m_hPos = 0;
- m_hCol = 0;
- m_hCord0 = 0;
- m_hCord1 = 0;
- m_hUniCol = 0;
- m_hCoord0Matrix = 0;
- m_hField = 0;
- m_hStep = 0;
- m_hContrast = 0;
- m_hBrightness = 0;
-
- m_proj = NULL;
- m_model = NULL;
- m_clipPossible = false;
-}
-
-void CGUIShader::OnCompiledAndLinked()
-{
- // This is called after CompileAndLink()
-
- // Variables passed directly to the Fragment shader
- m_hTex0 = glGetUniformLocation(ProgramHandle(), "m_samp0");
- m_hTex1 = glGetUniformLocation(ProgramHandle(), "m_samp1");
- m_hUniCol = glGetUniformLocation(ProgramHandle(), "m_unicol");
- m_hField = glGetUniformLocation(ProgramHandle(), "m_field");
- m_hStep = glGetUniformLocation(ProgramHandle(), "m_step");
- m_hContrast = glGetUniformLocation(ProgramHandle(), "m_contrast");
- m_hBrightness = glGetUniformLocation(ProgramHandle(), "m_brightness");
-
- // Variables passed directly to the Vertex shader
- m_hProj = glGetUniformLocation(ProgramHandle(), "m_proj");
- m_hModel = glGetUniformLocation(ProgramHandle(), "m_model");
- m_hCoord0Matrix = glGetUniformLocation(ProgramHandle(), "m_coord0Matrix");
-
- // Vertex attributes
- m_hPos = glGetAttribLocation(ProgramHandle(), "m_attrpos");
- m_hCol = glGetAttribLocation(ProgramHandle(), "m_attrcol");
- m_hCord0 = glGetAttribLocation(ProgramHandle(), "m_attrcord0");
- m_hCord1 = glGetAttribLocation(ProgramHandle(), "m_attrcord1");
-
- // It's okay to do this only one time. Textures units never change.
- glUseProgram( ProgramHandle() );
- glUniform1i(m_hTex0, 0);
- glUniform1i(m_hTex1, 1);
- glUniform4f(m_hUniCol, 1.0, 1.0, 1.0, 1.0);
-
- const float identity[16] = {
- 1.0f, 0.0f, 0.0f, 0.0f,
- 0.0f, 1.0f, 0.0f, 0.0f,
- 0.0f, 0.0f, 1.0f, 0.0f,
- 0.0f, 0.0f, 0.0f, 1.0f
- };
- glUniformMatrix4fv(m_hCoord0Matrix, 1, GL_FALSE, identity);
-
- glUseProgram( 0 );
-}
-
-bool CGUIShader::OnEnabled()
-{
- // This is called after glUseProgram()
-
- GLfloat *projMatrix = glMatrixProject.Get().m_pMatrix;
- GLfloat *modelMatrix = glMatrixModview.Get().m_pMatrix;
- glUniformMatrix4fv(m_hProj, 1, GL_FALSE, projMatrix);
- glUniformMatrix4fv(m_hModel, 1, GL_FALSE, modelMatrix);
-
- const TransformMatrix &guiMatrix = g_graphicsContext.GetGUIMatrix();
- CRect viewPort; // absolute positions of corners
- CServiceBroker::GetRenderSystem().GetViewPort(viewPort);
-
- /* glScissor operates in window coordinates. In order that we can use it to
- * perform clipping, we must ensure that there is an independent linear
- * transformation from the coordinate system used by CGraphicContext::ClipRect
- * to window coordinates, separately for X and Y (in other words, no
- * rotation or shear is introduced at any stage). To do, this, we need to
- * check that zeros are present in the following locations:
- *
- * GUI matrix:
- * / * 0 * * \
- * | 0 * * * |
- * \ 0 0 * * /
- * ^ TransformMatrix::TransformX/Y/ZCoord are only ever called with
- * input z = 0, so this column doesn't matter
- * Model-view matrix:
- * / * 0 0 * \
- * | 0 * 0 * |
- * | 0 0 * * |
- * \ * * * * / <- eye w has no influence on window x/y (last column below
- * is either 0 or ignored)
- * Projection matrix:
- * / * 0 0 0 \
- * | 0 * 0 0 |
- * | * * * * | <- normalised device coordinate z has no influence on window x/y
- * \ 0 0 * 0 /
- *
- * Some of these zeros are not strictly required to ensure this, but they tend
- * to be zeroed in the common case, so by checking for zeros here, we simplify
- * the calculation of the window x/y coordinates further down the line.
- *
- * (Minor detail: we don't quite deal in window coordinates as defined by
- * OpenGL, because CRenderSystemGLES::SetScissors flips the Y axis. But all
- * that's needed to handle that is an effective negation at the stage where
- * Y is in normalised device coordinates.)
- */
- m_clipPossible = guiMatrix.m[0][1] == 0 &&
- guiMatrix.m[1][0] == 0 &&
- guiMatrix.m[2][0] == 0 &&
- guiMatrix.m[2][1] == 0 &&
- modelMatrix[0+1*4] == 0 &&
- modelMatrix[0+2*4] == 0 &&
- modelMatrix[1+0*4] == 0 &&
- modelMatrix[1+2*4] == 0 &&
- modelMatrix[2+0*4] == 0 &&
- modelMatrix[2+1*4] == 0 &&
- projMatrix[0+1*4] == 0 &&
- projMatrix[0+2*4] == 0 &&
- projMatrix[0+3*4] == 0 &&
- projMatrix[1+0*4] == 0 &&
- projMatrix[1+2*4] == 0 &&
- projMatrix[1+3*4] == 0 &&
- projMatrix[3+0*4] == 0 &&
- projMatrix[3+1*4] == 0 &&
- projMatrix[3+3*4] == 0;
-
- m_clipXFactor = 0.0;
- m_clipXOffset = 0.0;
- m_clipYFactor = 0.0;
- m_clipYOffset = 0.0;
-
- if (m_clipPossible)
- {
- m_clipXFactor = guiMatrix.m[0][0] * modelMatrix[0+0*4] * projMatrix[0+0*4];
- m_clipXOffset = (guiMatrix.m[0][3] * modelMatrix[0+0*4] + modelMatrix[0+3*4]) * projMatrix[0+0*4];
- m_clipYFactor = guiMatrix.m[1][1] * modelMatrix[1+1*4] * projMatrix[1+1*4];
- m_clipYOffset = (guiMatrix.m[1][3] * modelMatrix[1+1*4] + modelMatrix[1+3*4]) * projMatrix[1+1*4];
- float clipW = (guiMatrix.m[2][3] * modelMatrix[2+2*4] + modelMatrix[2+3*4]) * projMatrix[3+2*4];
- float xMult = (viewPort.x2 - viewPort.x1) / (2 * clipW);
- float yMult = (viewPort.y1 - viewPort.y2) / (2 * clipW); // correct for inverted window coordinate scheme
- m_clipXFactor = m_clipXFactor * xMult;
- m_clipXOffset = m_clipXOffset * xMult + (viewPort.x2 + viewPort.x1) / 2;
- m_clipYFactor = m_clipYFactor * yMult;
- m_clipYOffset = m_clipYOffset * yMult + (viewPort.y2 + viewPort.y1) / 2;
- }
-
- glUniform1f(m_hBrightness, 0.0f);
- glUniform1f(m_hContrast, 1.0f);
-
- return true;
-}
-
-void CGUIShader::Free()
-{
- // Do Cleanup here
- CGLSLShaderProgram::Free();
-}
-

_service:download_files:master.tar.gz/xbmc/guilib/GUIShader.h Deleted

@@ -1,79 +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/>.
- *
- */
-
-#ifndef GUI_SHADER_H
-#define GUI_SHADER_H
-
-#pragma once
-
-#include "Shader.h"
-
-class CGUIShader : public Shaders::CGLSLShaderProgram
-{
-public:
- CGUIShader( const char *shader = 0 );
- void OnCompiledAndLinked();
- bool OnEnabled();
- void Free();
-
- GLint GetPosLoc() { return m_hPos; }
- GLint GetColLoc() { return m_hCol; }
- GLint GetCord0Loc() { return m_hCord0; }
- GLint GetCord1Loc() { return m_hCord1; }
- GLint GetUniColLoc() { return m_hUniCol; }
- GLint GetCoord0MatrixLoc() { return m_hCoord0Matrix; }
- GLint GetFieldLoc() { return m_hField; }
- GLint GetStepLoc() { return m_hStep; }
- GLint GetContrastLoc() { return m_hContrast; }
- GLint GetBrightnessLoc() { return m_hBrightness; }
- GLint GetModelLoc() { return m_hModel; }
- bool HardwareClipIsPossible() { return m_clipPossible; }
- GLfloat GetClipXFactor() { return m_clipXFactor; }
- GLfloat GetClipXOffset() { return m_clipXOffset; }
- GLfloat GetClipYFactor() { return m_clipYFactor; }
- GLfloat GetClipYOffset() { return m_clipYOffset; }
-
-protected:
- GLint m_hTex0;
- GLint m_hTex1;
- GLint m_hUniCol;
- GLint m_hProj;
- GLint m_hModel;
- GLint m_hPos;
- GLint m_hCol;
- GLint m_hCord0;
- GLint m_hCord1;
- GLint m_hCoord0Matrix;
- GLint m_hField;
- GLint m_hStep;
- GLint m_hContrast;
- GLint m_hBrightness;
-
- GLfloat *m_proj;
- GLfloat *m_model;
-
- bool m_clipPossible;
- GLfloat m_clipXFactor;
- GLfloat m_clipXOffset;
- GLfloat m_clipYFactor;
- GLfloat m_clipYOffset;
-};
-
-#endif // GUI_SHADER_H

_service:download_files:master.tar.gz/xbmc/guilib/GUIShaderDX.cpp Changed

@@ -18,11 +18,11 @@
 *
 */
 
-#include <d3dcompiler.h>
 #include "GUIShaderDX.h"
 #include "guilib/GraphicContext.h"
-#include "utils/log.h"
+#include "rendering/dx/DeviceResources.h"
 #include "rendering/dx/RenderContext.h"
+#include "utils/log.h"
 
 // shaders bytecode includes
 #include "guishader_vert.h"
@@ -35,7 +35,11 @@
 #include "guishader_multi_texture_blend.h"
 #include "guishader_texture.h"
 #include "guishader_texture_noblend.h"
-#include "rendering/dx/DeviceResources.h"
+
+#include <d3dcompiler.h>
+
+using namespace DirectX;
+using namespace Microsoft::WRL;
 
 // shaders bytecode holder
 static const D3D_SHADER_DATA cbPSShaderCode[SHADER_METHOD_RENDER_COUNT] =
@@ -116,22 +120,22 @@
 
 bool CGUIShaderDX::CreateBuffers()
 {
- ID3D11Device* pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ ComPtr<ID3D11Device> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
 
 // create vertex buffer
 CD3D11_BUFFER_DESC bufferDesc(sizeof(Vertex) * 4, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
- if (FAILED(pDevice->CreateBuffer(&bufferDesc, NULL, &m_pVertexBuffer)))
+ if (FAILED(pDevice->CreateBuffer(&bufferDesc, NULL, m_pVertexBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to create GUI vertex buffer.");
+ CLog::LogF(LOGERROR, "Failed to create GUI vertex buffer.");
 return false;
 }
 
 // Create the constant buffer for WVP
 size_t buffSize = (sizeof(cbWorld) + 15) & ~15;
 CD3D11_BUFFER_DESC cbbd(buffSize, D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE); // it can change very frequently
- if (FAILED(pDevice->CreateBuffer(&cbbd, NULL, &m_pWVPBuffer)))
+ if (FAILED(pDevice->CreateBuffer(&cbbd, NULL, m_pWVPBuffer.ReleaseAndGetAddressOf())))
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to create the constant buffer.");
+ CLog::LogF(LOGERROR, "Failed to create the constant buffer.");
 return false;
 }
 m_bIsWVPDirty = true;
@@ -148,7 +152,7 @@
 cbbd.ByteWidth = sizeof(cbViewPort);
 D3D11_SUBRESOURCE_DATA initData = { &m_cbViewPort, 0, 0 };
 // create viewport buffer
- if (FAILED(pDevice->CreateBuffer(&cbbd, &initData, &m_pVPBuffer)))
+ if (FAILED(pDevice->CreateBuffer(&cbbd, &initData, m_pVPBuffer.ReleaseAndGetAddressOf())))
 return false;
 
 return true;
@@ -158,7 +162,7 @@
 {
 // Describe the Sampler State
 D3D11_SAMPLER_DESC sampDesc;
- ZeroMemory(&sampDesc, sizeof(D3D11_SAMPLER_DESC));
+ memset(&sampDesc, 0, sizeof(D3D11_SAMPLER_DESC));
 sampDesc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
 sampDesc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
 sampDesc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
@@ -167,10 +171,10 @@
 sampDesc.MinLOD = 0;
 sampDesc.MaxLOD = D3D11_FLOAT32_MAX;
 
- if (FAILED(DX::DeviceResources::Get()->GetD3DDevice()->CreateSamplerState(&sampDesc, &m_pSampLinear)))
+ if (FAILED(DX::DeviceResources::Get()->GetD3DDevice()->CreateSamplerState(&sampDesc, m_pSampLinear.ReleaseAndGetAddressOf())))
 return false;
 
- DX::DeviceResources::Get()->GetD3DContext()->PSSetSamplers(0, 1, &m_pSampLinear);
+ DX::DeviceResources::Get()->GetD3DContext()->PSSetSamplers(0, 1, m_pSampLinear.GetAddressOf());
 
 return true;
 }
@@ -180,16 +184,16 @@
 if (!m_bCreated)
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 
 m_vertexShader.BindShader();
- pContext->VSSetConstantBuffers(0, 1, &m_pWVPBuffer);
+ pContext->VSSetConstantBuffers(0, 1, m_pWVPBuffer.GetAddressOf());
 
 m_pixelShader[m_currentShader].BindShader();
- pContext->PSSetConstantBuffers(0, 1, &m_pWVPBuffer);
- pContext->PSSetConstantBuffers(1, 1, &m_pVPBuffer);
+ pContext->PSSetConstantBuffers(0, 1, m_pWVPBuffer.GetAddressOf());
+ pContext->PSSetConstantBuffers(1, 1, m_pVPBuffer.GetAddressOf());
 
- pContext->PSSetSamplers(0, 1, &m_pSampLinear);
+ pContext->PSSetSamplers(0, 1, m_pSampLinear.GetAddressOf());
 
 RestoreBuffers();
 }
@@ -220,16 +224,16 @@
 
 ApplyChanges();
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 
 // update vertex buffer
 D3D11_MAPPED_SUBRESOURCE resource;
- if (SUCCEEDED(pContext->Map(m_pVertexBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
+ if (SUCCEEDED(pContext->Map(m_pVertexBuffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &resource)))
 {
 // we are using strip topology
 Vertex vertices[4] = { v2, v3, v1, v4 };
 memcpy(resource.pData, &vertices, sizeof(Vertex) * 4);
- pContext->Unmap(m_pVertexBuffer, 0);
+ pContext->Unmap(m_pVertexBuffer.Get(), 0);
 // Draw primitives
 pContext->Draw(4, 0);
 }
@@ -263,10 +267,10 @@
 
 void CGUIShaderDX::Release()
 {
- SAFE_RELEASE(m_pVertexBuffer);
- SAFE_RELEASE(m_pWVPBuffer);
- SAFE_RELEASE(m_pVPBuffer);
- SAFE_RELEASE(m_pSampLinear);
+ m_pVertexBuffer = nullptr;
+ m_pWVPBuffer = nullptr;
+ m_pVPBuffer = nullptr;
+ m_pSampLinear = nullptr;
 m_bCreated = false;
 }
 
@@ -331,12 +335,12 @@
 
 void CGUIShaderDX::ApplyChanges(void)
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 D3D11_MAPPED_SUBRESOURCE res;
 
 if (m_bIsWVPDirty)
 {
- if (SUCCEEDED(pContext->Map(m_pWVPBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
+ if (SUCCEEDED(pContext->Map(m_pWVPBuffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
 {
 XMMATRIX worldView = XMMatrixMultiply(m_cbWorldViewProj.world, m_cbWorldViewProj.view);
 XMMATRIX worldViewProj = XMMatrixMultiplyTranspose(worldView, m_cbWorldViewProj.projection);
@@ -346,7 +350,7 @@
 buffer->blackLevel = (DX::Windowing().UseLimitedColor() ? 16.f / 255.f : 0.f);
 buffer->colorRange = (DX::Windowing().UseLimitedColor() ? (235.f - 16.f) / 255.f : 1.0f);
 
- pContext->Unmap(m_pWVPBuffer, 0);
+ pContext->Unmap(m_pWVPBuffer.Get(), 0);
 m_bIsWVPDirty = false;
 }
 }
@@ -354,10 +358,10 @@
 // update view port buffer
 if (m_bIsVPDirty)
 {
- if (SUCCEEDED(pContext->Map(m_pVPBuffer, 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
+ if (SUCCEEDED(pContext->Map(m_pVPBuffer.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
 {
 *(cbViewPort*)res.pData = m_cbViewPort;
- pContext->Unmap(m_pVPBuffer, 0);
+ pContext->Unmap(m_pVPBuffer.Get(), 0);
 m_bIsVPDirty = false;
 }
 }
@@ -368,9 +372,9 @@
 const unsigned stride = sizeof(Vertex);
 const unsigned offset = 0;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 // Set the vertex buffer to active in the input assembler so it can be rendered.
- pContext->IASetVertexBuffers(0, 1, &m_pVertexBuffer, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_pVertexBuffer.GetAddressOf(), &stride, &offset);
 // Set the type of primitive that should be rendered from this vertex buffer, in this case triangles.
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 }

_service:download_files:master.tar.gz/xbmc/guilib/GUIShaderDX.h Changed

@@ -19,26 +19,26 @@
 */
 #pragma once
 
-#include "Geometry.h"
+#include "utils/Geometry.h"
 #include "Texture.h"
 #include "D3DResource.h"
-#include <DirectXMath.h>
 
-using namespace DirectX;
+#include <DirectXMath.h>
+#include <wrl/client.h>
 
 struct Vertex {
 Vertex() {}
 
- Vertex(XMFLOAT3 p, XMFLOAT4 c)
+ Vertex(DirectX::XMFLOAT3 p, DirectX::XMFLOAT4 c)
 : pos(p), color(c) {}
 
- Vertex(XMFLOAT3 p, XMFLOAT4 c, XMFLOAT2 t1, XMFLOAT2 t2)
+ Vertex(DirectX::XMFLOAT3 p, DirectX::XMFLOAT4 c, DirectX::XMFLOAT2 t1, DirectX::XMFLOAT2 t2)
 : pos(p), color(c), texCoord(t1), texCoord2(t2) {}
 
- XMFLOAT3 pos;
- XMFLOAT4 color;
- XMFLOAT2 texCoord;
- XMFLOAT2 texCoord2;
+ DirectX::XMFLOAT3 pos;
+ DirectX::XMFLOAT4 color;
+ DirectX::XMFLOAT2 texCoord;
+ DirectX::XMFLOAT2 texCoord2;
 };
 
 class ID3DResource;
@@ -58,20 +58,20 @@
 void SetShaderViews(unsigned int numViews, ID3D11ShaderResourceView** views);
 void SetViewPort(D3D11_VIEWPORT viewPort);
 
- void XM_CALLCONV GetWVP(XMMATRIX &w, XMMATRIX &v, XMMATRIX &p) 
+ void XM_CALLCONV GetWVP(DirectX::XMMATRIX &w, DirectX::XMMATRIX &v, DirectX::XMMATRIX &p)
 { 
 w = m_cbWorldViewProj.world; 
 v = m_cbWorldViewProj.view; 
 p = m_cbWorldViewProj.projection; 
 }
- XMMATRIX XM_CALLCONV GetWorld() const { return m_cbWorldViewProj.world; }
- XMMATRIX XM_CALLCONV GetView() const { return m_cbWorldViewProj.view; }
- XMMATRIX XM_CALLCONV GetProjection() const { return m_cbWorldViewProj.projection; }
- void XM_CALLCONV SetWVP(const XMMATRIX &w, const XMMATRIX &v, const XMMATRIX &p);
- void XM_CALLCONV SetWorld(const XMMATRIX &value);
- void XM_CALLCONV SetView(const XMMATRIX &value);
- void XM_CALLCONV SetProjection(const XMMATRIX &value);
- void Project(float &x, float &y, float &z);
+ DirectX::XMMATRIX XM_CALLCONV GetWorld() const { return m_cbWorldViewProj.world; }
+ DirectX::XMMATRIX XM_CALLCONV GetView() const { return m_cbWorldViewProj.view; }
+ DirectX::XMMATRIX XM_CALLCONV GetProjection() const { return m_cbWorldViewProj.projection; }
+ void XM_CALLCONV SetWVP(const DirectX::XMMATRIX &w, const DirectX::XMMATRIX &v, const DirectX::XMMATRIX &p);
+ void XM_CALLCONV SetWorld(const DirectX::XMMATRIX &value);
+ void XM_CALLCONV SetView(const DirectX::XMMATRIX &value);
+ void XM_CALLCONV SetProjection(const DirectX::XMMATRIX &value);
+ void Project(float &x, float &y, float &z);
 
 void DrawQuad(Vertex& v1, Vertex& v2, Vertex& v3, Vertex& v4);
 void DrawIndexed(unsigned int indexCount, unsigned int startIndex, unsigned int startVertex);
@@ -100,9 +100,9 @@
 private:
 struct cbWorldViewProj
 {
- XMMATRIX world;
- XMMATRIX view;
- XMMATRIX projection;
+ DirectX::XMMATRIX world;
+ DirectX::XMMATRIX view;
+ DirectX::XMMATRIX projection;
 };
 struct cbViewPort
 {
@@ -113,7 +113,7 @@
 };
 struct cbWorld
 {
- XMMATRIX wvp;
+ DirectX::XMMATRIX wvp;
 float blackLevel;
 float colorRange;
 };
@@ -125,26 +125,26 @@
 void ClipToScissorParams(void);
 
 // GUI constants
- cbViewPort m_cbViewPort;
- cbWorldViewProj m_cbWorldViewProj;
+ cbViewPort m_cbViewPort;
+ cbWorldViewProj m_cbWorldViewProj;
 
- bool m_bCreated;
- ID3D11SamplerState* m_pSampLinear;
- CD3DVertexShader m_vertexShader;
- CD3DPixelShader m_pixelShader[SHADER_METHOD_RENDER_COUNT];
- size_t m_currentShader;
+ bool m_bCreated;
+ size_t m_currentShader;
+ CD3DVertexShader m_vertexShader;
+ CD3DPixelShader m_pixelShader[SHADER_METHOD_RENDER_COUNT];
+ Microsoft::WRL::ComPtr<ID3D11SamplerState> m_pSampLinear;
 
 // GUI buffers
- ID3D11Buffer* m_pWVPBuffer;
- ID3D11Buffer* m_pVPBuffer;
- ID3D11Buffer* m_pVertexBuffer;
- bool m_bIsWVPDirty;
- bool m_bIsVPDirty;
+ bool m_bIsWVPDirty;
+ bool m_bIsVPDirty;
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_pWVPBuffer;
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_pVPBuffer;
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_pVertexBuffer;
 
 // clip to scissors params
- bool m_clipPossible;
- float m_clipXFactor;
- float m_clipXOffset;
- float m_clipYFactor;
- float m_clipYOffset;
+ bool m_clipPossible;
+ float m_clipXFactor;
+ float m_clipXOffset;
+ float m_clipYFactor;
+ float m_clipYOffset;
 };

_service:download_files:master.tar.gz/xbmc/guilib/GUISliderControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISliderControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISpinControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISpinControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISpinControlEx.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUISpinControlEx.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIStaticItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIStaticItem.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextBox.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextBox.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextLayout.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextLayout.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITexture.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITexture.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureD3D.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureD3D.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureGL.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureGLES.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUITextureGLES.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIToggleButtonControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIToggleButtonControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIVideoControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIVideoControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIVisualisationControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIVisualisationControl.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIWindow.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIWindow.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIWindowManager.cpp Changed

@@ -151,7 +151,7 @@
 #include "addons/interfaces/AddonInterfaces.h"
 
 /* Game related include files */
-#include "cores/RetroPlayer/windows/GameWindowFullScreen.h"
+#include "cores/RetroPlayer/guiwindows/GameWindowFullScreen.h"
 #include "games/controllers/windows/GUIControllerWindow.h"
 #include "games/windows/GUIWindowGames.h"
 #include "games/dialogs/osd/DialogGameOSD.h"
@@ -522,7 +522,7 @@
   while (topWindow)
   {
     CGUIWindow* dialog = m_activeDialogs[--topWindow];
-    lock.Leave();
+
     if (!modalAcceptedMessage && dialog->IsModalDialog())
     { // modal window
       hasModalDialog = true;
@@ -536,11 +536,10 @@
       if (dialog->OnMessage( message ))
         handled = true;
     }
-    lock.Enter();
+
     if (topWindow > m_activeDialogs.size())
       topWindow = m_activeDialogs.size();
   }
-  lock.Leave();
 
   // now send to the underlying window
   CGUIWindow* window = GetWindow(GetActiveWindow());
@@ -803,13 +802,13 @@
   if (!pNewWindow)
   { // nothing to see here - move along
     CLog::Log(LOGERROR, "Unable to locate window with id %d.  Check skin files", iWindowID - WINDOW_HOME);
-    if (GetActiveWindowID() == WINDOW_STARTUP_ANIM)
+    if (IsWindowActive(WINDOW_STARTUP_ANIM))
       ActivateWindow(WINDOW_HOME);
     return ;
   }
   else if (!pNewWindow->CanBeActivated())
   {
-    if (GetActiveWindowID() == WINDOW_STARTUP_ANIM)
+    if (IsWindowActive(WINDOW_STARTUP_ANIM))
       ActivateWindow(WINDOW_HOME);
     return;
   }
@@ -1506,56 +1505,23 @@
   return WINDOW_INVALID;
 }
 
-int CGUIWindowManager::GetActiveWindowID() const
+int CGUIWindowManager::GetActiveWindowOrDialog() const
 {
-  // Get the currently active window
-  int iWin = GetActiveWindow() & WINDOW_ID_MASK;
-
-  // If there is a dialog active get the dialog id instead
-  if (HasModalDialog())
-    iWin = GetTopmostModalDialog() & WINDOW_ID_MASK;
+  // if there is a dialog active get the dialog id instead
+  int iWin = GetTopmostModalDialog() & WINDOW_ID_MASK;
+  if (iWin != WINDOW_INVALID)
+    return iWin;
 
-  // If the window is FullScreenVideo check for special cases
-  if (iWin == WINDOW_FULLSCREEN_VIDEO)
-  {
-    // check if we're in a DVD menu
-    if (g_application.GetAppPlayer().IsInMenu())
-      iWin = WINDOW_VIDEO_MENU;
-    // check for LiveTV and switch to it's virtual window
-    else if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
-      iWin = WINDOW_FULLSCREEN_LIVETV;
-    // special casing for numeric seek
-    else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
-      iWin = WINDOW_VIDEO_TIME_SEEK;
-  }
-  if (iWin == WINDOW_VISUALISATION)
-  {
-    // special casing for PVR radio
-    if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
-      iWin = WINDOW_FULLSCREEN_RADIO;
-    // special casing for numeric seek
-    else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
-      iWin = WINDOW_VIDEO_TIME_SEEK;
-  }
-  // Return the window id
-  return iWin;
-}
-
-// same as GetActiveWindow() except it first grabs dialogs
-int CGUIWindowManager::GetFocusedWindow() const
-{
-  int dialog = GetTopmostModalDialog(true);
-  if (dialog != WINDOW_INVALID)
-    return dialog;
-
-  return GetActiveWindow();
+  // get the currently active window
+  return GetActiveWindow() & WINDOW_ID_MASK;
 }
 
 bool CGUIWindowManager::IsWindowActive(int id, bool ignoreClosing /* = true */) const
 {
   // mask out multiple instances of the same window
   id &= WINDOW_ID_MASK;
-  if ((GetActiveWindow() & WINDOW_ID_MASK) == id) return true;
+  if ((GetActiveWindow() & WINDOW_ID_MASK) == id)
+    return true;
   // run through the dialogs
   CSingleLock lock(g_graphicsContext);
   for (const auto& window : m_activeDialogs)

_service:download_files:master.tar.gz/xbmc/guilib/GUIWindowManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIWrappingListContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GUIWrappingListContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/Geometry.h Deleted

@@ -1,488 +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/>.
- *
- */
-
-#pragma once
-
-#ifdef __GNUC__
-// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations.
-#define XBMC_FORCE_INLINE __attribute__((always_inline))
-#else
-#define XBMC_FORCE_INLINE
-#endif
-
-#include <algorithm>
-#include <stdexcept>
-#include <vector>
-
-template <typename T> class CPointGen
-{
-public:
- typedef CPointGen<T> this_type;
-
- CPointGen() noexcept = default;
-
- CPointGen(T a, T b)
- : x{a}, y{b}
- {}
-
- template<class U> explicit CPointGen(const CPointGen& rhs)
- : x{static_cast<T> (rhs.x)}, y{static_cast<T> (rhs.y)}
- {}
-
- this_type operator+(const this_type &point) const
- {
- return {x + point.x, y + point.y};
- };
-
- this_type& operator+=(const this_type &point)
- {
- x += point.x;
- y += point.y;
- return *this;
- };
-
- this_type operator-(const this_type &point) const
- {
- return {x - point.x, y - point.y};
- };
-
- this_type& operator-=(const this_type &point)
- {
- x -= point.x;
- y -= point.y;
- return *this;
- };
-
- this_type operator*(T factor) const
- {
- return {x * factor, y * factor};
- }
-
- this_type& operator*=(T factor)
- {
- x *= factor;
- y *= factor;
- return *this;
- }
-
- this_type operator/(T factor) const
- {
- return {x / factor, y / factor};
- }
-
- this_type& operator/=(T factor)
- {
- x /= factor;
- y /= factor;
- return *this;
- }
-
- T x{}, y{};
-};
-
-template<typename T>
-inline bool operator==(const CPointGen<T> &point1, const CPointGen<T> &point2) noexcept
-{
- return (point1.x == point2.x && point1.y == point2.y);
-}
-
-template<typename T>
-inline bool operator!=(const CPointGen<T> &point1, const CPointGen<T> &point2) noexcept
-{
- return !(point1 == point2);
-}
-
-using CPoint = CPointGen<float>;
-using CPointInt = CPointGen<int>;
-
-
-/**
- * Generic two-dimensional size representation
- *
- * Class invariant: width and height are both non-negative
- * Throws std::out_of_range if invariant would be violated. The class
- * is exception-safe. If modification would violate the invariant, the size
- * is not changed.
- */
-template <typename T> class CSizeGen
-{
- T m_w{}, m_h{};
-
- void CheckSet(T width, T height)
- {
- if (width < 0)
- {
- throw std::out_of_range("Size may not have negative width");
- }
- if (height < 0)
- {
- throw std::out_of_range("Size may not have negative height");
- }
- m_w = width;
- m_h = height;
- }
-
-public:
- typedef CSizeGen<T> this_type;
-
- CSizeGen() noexcept = default;
-
- CSizeGen(T width, T height)
- {
- CheckSet(width, height);
- }
-
- T Width() const
- {
- return m_w;
- }
-
- T Height() const
- {
- return m_h;
- }
-
- void SetWidth(T width)
- {
- CheckSet(width, m_h);
- }
-
- void SetHeight(T height)
- {
- CheckSet(m_w, height);
- }
-
- void Set(T width, T height)
- {
- CheckSet(width, height);
- }
-
- bool IsZero() const
- {
- return (m_w == static_cast<T> (0) && m_h == static_cast<T> (0));
- }
-
- T Area() const
- {
- return m_w * m_h;
- }
-
- CPointGen<T> ToPoint() const
- {
- return {m_w, m_h};
- }
-
- template<class U> explicit CSizeGen<T>(const CSizeGen& rhs)
- {
- CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h));
- }
-
- this_type operator+(const this_type& size) const
- {
- return {m_w + size.m_w, m_h + size.m_h};
- };
-
- this_type& operator+=(const this_type& size)
- {
- CheckSet(m_w + size.m_w, m_h + size.m_h);
- return *this;
- };
-
- this_type operator-(const this_type& size) const
- {
- return {m_w - size.m_w, m_h - size.m_h};
- };
-
- this_type& operator-=(const this_type& size)
- {
- CheckSet(m_w - size.m_w, m_h - size.m_h);
- return *this;
- };
-
- this_type operator*(T factor) const
- {
- return {m_w * factor, m_h * factor};
- }
-
- this_type& operator*=(T factor)
- {
- CheckSet(m_w * factor, m_h * factor);
- return *this;
- }
-
- this_type operator/(T factor) const
- {
- return {m_w / factor, m_h / factor};
- }
-
- this_type& operator/=(T factor)
- {
- CheckSet(m_w / factor, m_h / factor);
- return *this;
- }
-};
-
-template<typename T>
-inline bool operator==(const CSizeGen<T>& size1, const CSizeGen<T>& size2) noexcept
-{
- return (size1.Width() == size2.Width() && size1.Height() == size2.Height());
-}
-
-template<typename T>
-inline bool operator!=(const CSizeGen<T>& size1, const CSizeGen<T>& size2) noexcept
-{
- return !(size1 == size2);
-}
-
-using CSize = CSizeGen<float>;
-using CSizeInt = CSizeGen<int>;
-
-
-template <typename T> class CRectGen
-{
-public:
- typedef CRectGen<T> this_type;
- typedef CPointGen<T> point_type;
- typedef CSizeGen<T> size_type;
-
- CRectGen() noexcept = default;
-
- CRectGen(T left, T top, T right, T bottom)
- : x1{left}, y1{top}, x2{right}, y2{bottom}
- {}
-
- CRectGen(const point_type &p1, const point_type &p2)
- : x1{p1.x}, y1{p1.y}, x2{p2.x}, y2{p2.y}
- {}
-
- CRectGen(const point_type &origin, const size_type &size)
- : x1{origin.x}, y1{origin.y}, x2{x1 + size.Width()}, y2{y1 + size.Height()}
- {}
-
- template<class U> explicit CRectGen(const CRectGen& rhs)
- : x1{static_cast<T> (rhs.x1)}, y1{static_cast<T> (rhs.y1)}, x2{static_cast<T> (rhs.x2)}, y2{static_cast<T> (rhs.y2)}
- {}
-
- void SetRect(T left, T top, T right, T bottom)
- {
- x1 = left;
- y1 = top;
- x2 = right;
- y2 = bottom;
- }
-
- bool PtInRect(const point_type &point) const
- {
- return (x1 <= point.x && point.x <= x2 && y1 <= point.y && point.y <= y2);
- };
-
- this_type& operator-=(const point_type &point) XBMC_FORCE_INLINE
- {
- x1 -= point.x;
- y1 -= point.y;
- x2 -= point.x;
- y2 -= point.y;
- return *this;
- };
-
- this_type operator-(const point_type &point) const
- {
- return {x1 - point.x, y1 - point.y, x2 - point.x, y2 - point.y};
- }
-
- this_type& operator+=(const point_type &point) XBMC_FORCE_INLINE
- {
- x1 += point.x;
- y1 += point.y;
- x2 += point.x;
- y2 += point.y;
- return *this;
- };
-
- this_type operator+(const point_type &point) const
- {
- return {x1 + point.x, y1 + point.y, x2 + point.x, y2 + point.y};
- }
-
- this_type& operator-=(const size_type &size)
- {
- x2 -= size.Width();
- y2 -= size.Height();
- return *this;
- };
-
- this_type operator-(const size_type &size) const
- {
- return {x1, y1, x2 - size.Width(), y2 - size.Height()};
- }
-
- this_type& operator+=(const size_type &size)
- {
- x2 += size.Width();
- y2 += size.Height();
- return *this;
- };
-
- this_type operator+(const size_type &size) const
- {
- return {x1, y1, x2 + size.Width(), y2 + size.Height()};
- }
-
- this_type& Intersect(const this_type &rect)
- {
- x1 = clamp_range(x1, rect.x1, rect.x2);
- x2 = clamp_range(x2, rect.x1, rect.x2);
- y1 = clamp_range(y1, rect.y1, rect.y2);
- y2 = clamp_range(y2, rect.y1, rect.y2);
- return *this;
- };
-
- this_type& Union(const this_type &rect)
- {
- if (IsEmpty())
- *this = rect;
- else if (!rect.IsEmpty())
- {
- x1 = std::min(x1,rect.x1);
- y1 = std::min(y1,rect.y1);
-
- x2 = std::max(x2,rect.x2);
- y2 = std::max(y2,rect.y2);
- }
-
- return *this;
- };
-
- bool IsEmpty() const XBMC_FORCE_INLINE
- {
- return (x2 - x1) * (y2 - y1) == 0;
- };
-
- point_type P1() const XBMC_FORCE_INLINE
- {
- return {x1, y1};
- }
-
- point_type P2() const XBMC_FORCE_INLINE
- {
- return {x2, y2};
- }
-
- T Width() const XBMC_FORCE_INLINE
- {
- return x2 - x1;
- };
-
- T Height() const XBMC_FORCE_INLINE
- {
- return y2 - y1;
- };
-
- T Area() const XBMC_FORCE_INLINE
- {
- return Width() * Height();
- };
-
- size_type ToSize() const
- {
- return {Width(), Height()};
- };
-
- std::vector<this_type> SubtractRect(this_type splitterRect)
- {
- std::vector<this_type> newRectanglesList;
- this_type intersection = splitterRect.Intersect(*this);
-
- if (!intersection.IsEmpty())
- {
- this_type add;
-
- // add rect above intersection if not empty
- add = this_type(x1, y1, x2, intersection.y1);
- if (!add.IsEmpty())
- newRectanglesList.push_back(add);
-
- // add rect below intersection if not empty
- add = this_type(x1, intersection.y2, x2, y2);
- if (!add.IsEmpty())
- newRectanglesList.push_back(add);
-
- // add rect left intersection if not empty
- add = this_type(x1, intersection.y1, intersection.x1, intersection.y2);
- if (!add.IsEmpty())
- newRectanglesList.push_back(add);
-
- // add rect right intersection if not empty
- add = this_type(intersection.x2, intersection.y1, x2, intersection.y2);
- if (!add.IsEmpty())
- newRectanglesList.push_back(add);
- }
- else
- {
- newRectanglesList.push_back(*this);
- }
-
- return newRectanglesList;
- }
-
- std::vector<this_type> SubtractRects(std::vector<this_type> intersectionList)
- {
- std::vector<this_type> fragmentsList;
- fragmentsList.push_back(*this);
-
- for (typename std::vector<this_type>::iterator splitter = intersectionList.begin(); splitter != intersectionList.end(); ++splitter)
- {
- typename std::vector<this_type> toAddList;
-
- for (typename std::vector<this_type>::iterator fragment = fragmentsList.begin(); fragment != fragmentsList.end(); ++fragment)
- {
- std::vector<this_type> newFragmentsList = fragment->SubtractRect(*splitter);
- toAddList.insert(toAddList.end(), newFragmentsList.begin(), newFragmentsList.end());
- }
-
- fragmentsList.clear();
- fragmentsList.insert(fragmentsList.end(), toAddList.begin(), toAddList.end());
- }
-
- return fragmentsList;
- }
-
- T x1{}, y1{}, x2{}, y2{};
-private:
- static T clamp_range(T x, T l, T h) XBMC_FORCE_INLINE
- {
- return (x > h) ? h : ((x < l) ? l : x);
- }
-};
-
-template<typename T>
-inline bool operator==(const CRectGen<T> &rect1, const CRectGen<T> &rect2) noexcept
-{
- return (rect1.x1 == rect2.x1 && rect1.y1 == rect2.y1 && rect1.x2 == rect2.x2 && rect1.y2 == rect2.y2);
-}
-
-template<typename T>
-inline bool operator!=(const CRectGen<T> &rect1, const CRectGen<T> &rect2) noexcept
-{
- return !(rect1 == rect2);
-}
-
-using CRect = CRectGen<float>;
-using CRectInt = CRectGen<int>;
\ No newline at end of file

_service:download_files:master.tar.gz/xbmc/guilib/GraphicContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/GraphicContext.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IAudioDeviceChangedCallback.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IDirtyRegionSolver.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IGUIContainer.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IMsgTargetCallback.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IRenderingCallback.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/IWindowManagerCallback.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/IWindowManagerCallback.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/LocalizeStrings.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/LocalizeStrings.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/MatrixGLES.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/MatrixGLES.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/Resolution.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/Resolution.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/Shader.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -89,6 +89,36 @@
   return true;
 }
 
+bool CShader::InsertSource(const std::string& filename, const std::string& loc)
+{
+  if(filename.empty())
+    return true;
+
+  CFileStream file;
+  std::string temp;
+
+  std::string path = "special://xbmc/system/shaders/";
+  path += CServiceBroker::GetRenderSystem().GetShaderPath(filename);
+  path += filename;
+  if(!file.Open(path))
+  {
+    CLog::Log(LOGERROR, "CShader::InsertSource - failed to open file %s", filename.c_str());
+    return false;
+  }
+  getline(file, temp, '\0');
+
+  size_t locPos = m_source.find(loc);
+  if (locPos == std::string::npos)
+  {
+    CLog::Log(LOGERROR, "CShader::InsertSource - could not find location %s", loc.c_str());
+    return false;
+  }
+
+  m_source.insert(locPos, temp);
+
+  return true;
+}
+
 //////////////////////////////////////////////////////////////////////
 // CGLSLVertexShader
 //////////////////////////////////////////////////////////////////////

_service:download_files:master.tar.gz/xbmc/guilib/Shader.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/StereoscopicsManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      http://kodi.tv
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -46,6 +46,7 @@
 #include "utils/Variant.h"
 #include "rendering/RenderSystem.h"
 #include "guiinfo/GUIInfoLabels.h"
+#include "cores/DataCacheCore.h"
 
 using namespace KODI::MESSAGING;
 
@@ -162,7 +163,7 @@
 
 std::string CStereoscopicsManager::DetectStereoModeByString(const std::string &needle)
 {
-  std::string stereoMode = "mono";
+  std::string stereoMode;
   std::string searchString(needle);
   CRegExp re(true);
 
@@ -394,9 +395,6 @@
 {
   switch (message.GetMessage())
   {
-  case GUI_MSG_PLAYBACK_STARTED:
-    OnPlaybackStarted();
-    break;
   case GUI_MSG_PLAYBACK_STOPPED:
   case GUI_MSG_PLAYLISTPLAYER_STOPPED:
     OnPlaybackStopped();
@@ -502,11 +500,7 @@
 {
   std::string playerMode;
   if (g_application.GetAppPlayer().IsPlaying())
-  {
-    VideoStreamInfo videoInfo;
-    g_application.GetAppPlayer().GetVideoStreamInfo(CURRENT_STREAM, videoInfo);
-    playerMode = videoInfo.stereoMode;
-  }
+    playerMode = CServiceBroker::GetDataCacheCore().GetVideoStereoMode();
   return playerMode;
 }
 
@@ -516,7 +510,7 @@
   return !mode.empty() && mode != "mono";
 }
 
-void CStereoscopicsManager::OnPlaybackStarted(void)
+void CStereoscopicsManager::OnStreamChange()
 {
   STEREOSCOPIC_PLAYBACK_MODE playbackMode = (STEREOSCOPIC_PLAYBACK_MODE) CServiceBroker::GetSettings().GetInt(CSettings::SETTING_VIDEOPLAYER_STEREOSCOPICPLAYBACKMODE);
   RENDER_STEREO_MODE mode = GetStereoMode();

_service:download_files:master.tar.gz/xbmc/guilib/StereoscopicsManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/Texture.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/Texture.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureBundle.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureBundle.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureBundleXBT.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureDX.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureDX.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureFormats.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureGL.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TextureManager.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TexturePi.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/TexturePi.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/TransformMatrix.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/VisibleEffect.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/VisibleEffect.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/WindowIDs.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/XBTF.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/XBTF.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/XBTFReader.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/XBTFReader.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/gui3d.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/iimage.h Changed

_service:download_files:master.tar.gz/xbmc/guilib/imagefactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/guilib/imagefactory.h Changed

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.cpp Changed

@@ -32,14 +32,14 @@
 #include "IButtonMapper.h"
 #include "Key.h"
 #include "KeyboardTranslator.h"
-#include "MouseTranslator.h"
 #include "WindowTranslator.h"
-#include "FileItem.h"
 #include "filesystem/Directory.h"
 #include "guilib/WindowIDs.h"
-#include "Util.h"
+#include "input/mouse/MouseTranslator.h"
 #include "utils/log.h"
 #include "utils/XBMCTinyXML.h"
+#include "FileItem.h"
+#include "Util.h"
 
 using namespace KODI;
 
@@ -197,6 +197,9 @@
 {
 std::string strAction;
 
+ // handle virtual windows
+ window = CWindowTranslator::GetVirtualWindow(window);
+
 // try to get the action from the current window
 unsigned int actionID = GetActionCode(window, key, strAction);
 
@@ -225,6 +228,13 @@
 
 bool CButtonTranslator::HasLongpressMapping(int window, const CKey &key)
 {
+ // handle virtual windows
+ window = CWindowTranslator::GetVirtualWindow(window);
+ return HasLongpressMapping_Internal(window, key);
+}
+
+bool CButtonTranslator::HasLongpressMapping_Internal(int window, const CKey &key)
+{
 std::map<int, buttonMap>::const_iterator it = m_translatorMap.find(window);
 if (it != m_translatorMap.end())
 {
@@ -252,11 +262,11 @@
 {
 // first check if we have a fallback for the window
 int fallbackWindow = CWindowTranslator::GetFallbackWindow(window);
- if (fallbackWindow > -1 && HasLongpressMapping(fallbackWindow, key))
+ if (fallbackWindow > -1 && HasLongpressMapping_Internal(fallbackWindow, key))
 return true;
 
 // fallback to default section
- return HasLongpressMapping(-1, key);
+ return HasLongpressMapping_Internal(-1, key);
 }
 
 return false;
@@ -266,11 +276,6 @@
 {
 uint32_t code = key.GetButtonCode();
 
- // Keymaps don't use locking modifiers
- code &= ~CKey::MODIFIER_CAPSLOCK;
- code &= ~CKey::MODIFIER_NUMLOCK;
- code &= ~CKey::MODIFIER_SCROLLLOCK;
-
 std::map<int, buttonMap>::const_iterator it = m_translatorMap.find(window);
 if (it == m_translatorMap.end())
 return ACTION_NONE;

_service:download_files:master.tar.gz/xbmc/input/ButtonTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/CMakeLists.txt Changed

@@ -10,6 +10,7 @@
             InputCodingTableFactory.cpp
             InputCodingTableKorean.cpp
             InputManager.cpp
+            InputTranslator.cpp
             IRTranslator.cpp
             JoystickMapper.cpp
             Key.cpp
@@ -19,14 +20,14 @@
             KeyboardTranslator.cpp
             Keymap.cpp
             KeymapEnvironment.cpp
-            MouseStat.cpp
-            MouseTranslator.cpp
             TouchTranslator.cpp
             WindowKeymap.cpp
             WindowTranslator.cpp
             XBMC_keytable.cpp)
 
 set(HEADERS hardware/IHardwareInput.h
+            remote/IRemoteControl.h
+            remote/IRRemote.h
             Action.h
             ActionIDs.h
             ActionTranslator.h
@@ -44,6 +45,8 @@
             InputCodingTableFactory.h
             InputCodingTableKorean.h
             InputManager.h
+            InputTranslator.h
+            InputTypes.h
             IRTranslator.h
             JoystickMapper.h
             Key.h
@@ -53,12 +56,9 @@
             KeyboardTranslator.h
             Keymap.h
             KeymapEnvironment.h
-            MouseStat.h
-            MouseTranslator.h
             TouchTranslator.h
             WindowTranslator.h
             WindowKeymap.h
-            XBIRRemote.h
             XBMC_keyboard.h
             XBMC_keysym.h
             XBMC_keytable.h

_service:download_files:master.tar.gz/xbmc/input/CustomControllerTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/IRTranslator.cpp Changed

@@ -20,28 +20,28 @@
 
 #include "IRTranslator.h"
 #include "filesystem/File.h"
+#include "input/remote/IRRemote.h"
 #include "profiles/ProfilesManager.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/XBMCTinyXML.h"
 #include "system.h"
-#include "XBIRRemote.h"
 
 #include <stdlib.h>
 #include <vector>
 
-void CIRTranslator::Load()
+CIRTranslator::CIRTranslator(const CProfilesManager &profileManager) :
+ m_profileManager(profileManager)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- Clear();
+}
 
- std::string irMapName;
-#ifdef TARGET_POSIX
- irMapName = "Lircmap.xml";
-#else
- irMapName = "IRSSmap.xml";
-#endif
+void CIRTranslator::Load(const std::string &irMapName)
+{
+ if (irMapName.empty())
+ return;
+
+ Clear();
 
 bool success = false;
 
@@ -51,7 +51,7 @@
 else
 CLog::Log(LOGDEBUG, "CIRTranslator::Load - no system %s found, skipping", irMapName.c_str());
 
- irMapPath = CProfilesManager::GetInstance().GetUserDataItem(irMapName);
+ irMapPath = m_profileManager.GetUserDataItem(irMapName);
 if (XFILE::CFile::Exists(irMapPath))
 success |= LoadIRMap(irMapPath);
 else
@@ -59,17 +59,13 @@
 
 if (!success)
 CLog::Log(LOGERROR, "CIRTranslator::Load - unable to load remote map %s", irMapName.c_str());
-#endif
 }
 
 bool CIRTranslator::LoadIRMap(const std::string &irMapPath)
 {
- std::string remoteMapTag;
-#ifdef TARGET_POSIX
- remoteMapTag = "lircmap";
-#else
- remoteMapTag = "irssmap";
-#endif
+ std::string remoteMapTag = URIUtils::GetFileName(irMapPath);
+ URIUtils::RemoveExtension(remoteMapTag);
+ StringUtils::ToLower(remoteMapTag);
 
 // Load our xml file, and fill up our mapping tables
 CXBMCTinyXML xmlDoc;

_service:download_files:master.tar.gz/xbmc/input/IRTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/InertialScrollingHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/InertialScrollingHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/InputCodingTableBaiduPY.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/InputCodingTableBasePY.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/InputManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2014 Team XBMC
-* http://xbmc.org
+* 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
@@ -28,34 +28,24 @@
 #include "JoystickMapper.h"
 #include "KeymapEnvironment.h"
 #include "TouchTranslator.h"
-#include "input/keyboard/interfaces/IKeyboardHandler.h"
-#include "input/mouse/generic/MouseInputHandling.h"
-#include "input/mouse/interfaces/IMouseDriverHandler.h"
-#include "input/mouse/MouseWindowingButtonMap.h"
+#include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
 #include "input/keyboard/KeyboardEasterEgg.h"
+#include "input/mouse/interfaces/IMouseDriverHandler.h"
+#include "input/mouse/MouseTranslator.h"
 #include "input/Key.h"
+#include "input/WindowTranslator.h"
 #include "messaging/ApplicationMessenger.h"
-#include "guilib/Geometry.h"
 #include "guilib/GUIAudioManager.h"
 #include "guilib/GUIControl.h"
 #include "guilib/GUIWindow.h"
 #include "guilib/GUIWindowManager.h"
 #include "guilib/GUIMessage.h"
-
 #include "network/EventServer.h"
-
-#ifdef HAS_LIRC
-#include "platform/linux/input/LIRC.h"
-#endif
-
-#ifdef HAS_IRSERVERSUITE
-#include "input/windows/IRServerSuite.h"
-#endif
-
 #include "ButtonTranslator.h"
 #include "peripherals/Peripherals.h"
 #include "peripherals/devices/PeripheralImon.h"
 #include "XBMC_vkeys.h"
+#include "utils/Geometry.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 #include "Util.h"
@@ -69,21 +59,26 @@
 using namespace KODI;
 using namespace MESSAGING;
 
-CInputManager::CInputManager(const CAppParamParser &params) :
+CreateRemoteControlFunc CInputManager::m_createRemoteControl = nullptr;
+
+CInputManager::CInputManager(const CAppParamParser &params,
+ const CProfilesManager &profileManager) :
 m_keymapEnvironment(new CKeymapEnvironment),
 m_buttonTranslator(new CButtonTranslator),
- m_irTranslator(new CIRTranslator),
+ m_irTranslator(new CIRTranslator(profileManager)),
 m_customControllerTranslator(new CCustomControllerTranslator),
 m_touchTranslator(new CTouchTranslator),
 m_joystickTranslator(new CJoystickMapper),
- m_mouseButtonMap(new MOUSE::CMouseWindowingButtonMap),
 m_keyboardEasterEgg(new KEYBOARD::CKeyboardEasterEgg)
 {
 m_buttonTranslator->RegisterMapper("touch", m_touchTranslator.get());
 m_buttonTranslator->RegisterMapper("customcontroller", m_customControllerTranslator.get());
 m_buttonTranslator->RegisterMapper("joystick", m_joystickTranslator.get());
 
- RegisterKeyboardHandler(m_keyboardEasterEgg.get());
+ RegisterKeyboardDriverHandler(m_keyboardEasterEgg.get());
+
+ if (m_createRemoteControl)
+ m_RemoteControl.reset(m_createRemoteControl());
 
 if (!params.RemoteControlName().empty())
 SetRemoteControlName(params.RemoteControlName());
@@ -101,10 +96,12 @@
 {
 Deinitialize();
 
+ m_RemoteControl.reset();
+
 // Unregister settings
 CServiceBroker::GetSettings().UnregisterCallback(this);
 
- UnregisterKeyboardHandler(m_keyboardEasterEgg.get());
+ UnregisterKeyboardDriverHandler(m_keyboardEasterEgg.get());
 
 m_buttonTranslator->UnregisterMapper(m_touchTranslator.get());
 m_buttonTranslator->UnregisterMapper(m_customControllerTranslator.get());
@@ -113,10 +110,8 @@
 
 void CInputManager::InitializeInputs()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- m_RemoteControl.Initialize();
-#endif
-
+ if (m_RemoteControl)
+ m_RemoteControl->Initialize();
 m_Keyboard.Initialize();
 
 m_Mouse.Initialize();
@@ -125,21 +120,22 @@
 
 void CInputManager::Deinitialize()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- m_RemoteControl.Disconnect();
-#endif
+ if (m_RemoteControl)
+ m_RemoteControl->Disconnect();
 }
 
 bool CInputManager::ProcessRemote(int windowId)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- if (m_RemoteControl.GetButton())
+ if (!m_RemoteControl)
+ return false;
+
+ m_RemoteControl->Update();
+ if (m_RemoteControl->GetButton())
 {
- CKey key(m_RemoteControl.GetButton(), m_RemoteControl.GetHoldTime());
- m_RemoteControl.Reset();
+ CKey key(m_RemoteControl->GetButton(), m_RemoteControl->GetHoldTimeMs());
+ m_RemoteControl->Reset();
 return OnKey(key);
 }
-#endif
 return false;
 }
 
@@ -284,9 +280,9 @@
 }
 
 if (wKeyID == KEY_BUTTON_LEFT_ANALOG_TRIGGER)
- key = CKey(wKeyID, (BYTE)(255 * fAmount), 0, 0.0, 0.0, 0.0, 0.0, frameTime);
+ key = CKey(wKeyID, static_cast<uint8_t>(255 * fAmount), 0, 0.0, 0.0, 0.0, 0.0, frameTime);
 else if (wKeyID == KEY_BUTTON_RIGHT_ANALOG_TRIGGER)
- key = CKey(wKeyID, 0, (BYTE)(255 * fAmount), 0.0, 0.0, 0.0, 0.0, frameTime);
+ key = CKey(wKeyID, 0, static_cast<uint8_t>(255 * fAmount), 0.0, 0.0, 0.0, 0.0, frameTime);
 else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_LEFT)
 key = CKey(wKeyID, 0, 0, -fAmount, 0.0, 0.0, 0.0, frameTime);
 else if (wKeyID == KEY_BUTTON_LEFT_THUMB_STICK_RIGHT)
@@ -357,11 +353,6 @@
 
 bool CInputManager::Process(int windowId, float frameTime)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- // Read the input from a remote
- m_RemoteControl.Update();
-#endif
-
 // process input actions
 ProcessRemote(windowId);
 ProcessEventServer(windowId, frameTime);
@@ -395,24 +386,35 @@
 {
 bool handled = false;
 
- for (auto it = m_mouseHandlers.begin(); it != m_mouseHandlers.end(); ++it)
+ for (auto driverHandler : m_mouseHandlers)
 {
- if (newEvent.type == XBMC_MOUSEMOTION)
+ switch (newEvent.type)
+ {
+ case XBMC_MOUSEMOTION:
 {
- if (it->driverHandler->OnPosition(newEvent.motion.x, newEvent.motion.y))
+ if (driverHandler->OnPosition(newEvent.motion.x, newEvent.motion.y))
 handled = true;
+ break;
 }
- else
+ case XBMC_MOUSEBUTTONDOWN:
 {
- if (newEvent.type == XBMC_MOUSEBUTTONDOWN)
+ MOUSE::BUTTON_ID buttonId;
+ if (CMouseTranslator::TranslateEventID(newEvent.button.button, buttonId))
 {
- if (it->driverHandler->OnButtonPress(newEvent.button.button))
+ if (driverHandler->OnButtonPress(buttonId))
 handled = true;
 }
- else if (newEvent.type == XBMC_MOUSEBUTTONUP)
- {
- it->driverHandler->OnButtonRelease(newEvent.button.button);
- }
+ break;
+ }
+ case XBMC_MOUSEBUTTONUP:
+ {
+ MOUSE::BUTTON_ID buttonId;
+ if (CMouseTranslator::TranslateEventID(newEvent.button.button, buttonId))
+ driverHandler->OnButtonRelease(buttonId);
+ break;
+ }
+ default:
+ break;
 }
 
 if (handled)
@@ -422,7 +424,7 @@
 if (!handled)
 {
 m_Mouse.HandleEvent(newEvent);
- ProcessMouse(g_windowManager.GetActiveWindowID());
+ ProcessMouse(g_windowManager.GetActiveWindowOrDialog());
 }
 break;
 }
@@ -438,7 +440,7 @@
 actionId = newEvent.touch.action;
 else
 {
- int iWin = g_windowManager.GetActiveWindowID();
+ int iWin = g_windowManager.GetActiveWindowOrDialog();
 m_touchTranslator->TranslateTouchAction(iWin, newEvent.touch.action, newEvent.touch.pointers, actionId, actionString);
 }
 
@@ -481,9 +483,9 @@
 {
 bool bHandled = false;
 
- for (std::vector<KEYBOARD::IKeyboardHandler*>::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
+ for (auto handler : m_keyboardHandlers)
 {
- if ((*it)->OnKeyPress(key))
+ if (handler->OnKeyPress(key))
 {
 bHandled = true;
 break;
@@ -502,7 +504,7 @@
 }
 else
 {
- if (!m_buttonTranslator->HasLongpressMapping(g_windowManager.GetActiveWindowID(), key))
+ if (!m_buttonTranslator->HasLongpressMapping(g_windowManager.GetActiveWindowOrDialog(), key))
 {
 m_LastKey.Reset();
 bHandled = HandleKey(key);
@@ -529,7 +531,7 @@
 m_Mouse.SetActive(false);
 
 // get the current active window
- int iWin = g_windowManager.GetActiveWindowID();
+ int iWin = g_windowManager.GetActiveWindowOrDialog();
 
 // this will be checked for certain keycodes that need
 // special handling if the screensaver is active
@@ -589,7 +591,7 @@
 
 // If the key pressed is shift-A to shift-Z set usekeyboard to true.
 // This causes the keypress to be used for list navigation.
- if (control->IsContainer() && (key.GetModifiers() & CKey::MODIFIER_SHIFT) && key.GetVKey() >= XBMCVK_A && key.GetVKey() <= XBMCVK_Z)
+ if (control->IsContainer() && key.GetModifiers() == CKey::MODIFIER_SHIFT && key.GetVKey() >= XBMCVK_A && key.GetVKey() <= XBMCVK_Z)
 useKeyboard = true;
 }
 }
@@ -628,13 +630,13 @@
 // Check for paste keypress
 #ifdef TARGET_WINDOWS
 // In Windows paste is ctrl-V
- if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_CTRL))
+ if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_CTRL)
 #elif defined(TARGET_LINUX)
 // In Linux paste is ctrl-V
- if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_CTRL))
+ if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_CTRL)
 #elif defined(TARGET_DARWIN_OSX)
 // In OSX paste is cmd-V
- if (key.GetVKey() == XBMCVK_V && (key.GetModifiers() & CKey::MODIFIER_META))
+ if (key.GetVKey() == XBMCVK_V && key.GetModifiers() == CKey::MODIFIER_META)
 #else
 // Placeholder for other operating systems
 if (false)
@@ -671,8 +673,8 @@
 
 void CInputManager::OnKeyUp(const CKey& key)
 {
- for (std::vector<KEYBOARD::IKeyboardHandler*>::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
- (*it)->OnKeyRelease(key);
+ for (auto handler : m_keyboardHandlers)
+ handler->OnKeyRelease(key);
 
 if (m_LastKey.GetButtonCode() != KEY_INVALID && !(m_LastKey.GetButtonCode() & CKey::MODIFIER_LONG))
 {
@@ -733,42 +735,41 @@
 
 bool CInputManager::HasBuiltin(const std::string& command)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- return command == "lirc.stop" ||
- command ==" lirc.start" ||
- command == "lirc.send";
-#endif
-
+ if (HasRemoteControl())
+ return command == "lirc.stop" ||
+ command == "lirc.start" ||
+ command == "lirc.send";
 return false;
 }
 
 int CInputManager::ExecuteBuiltin(const std::string& execute, const std::vector<std::string>& params)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- if (execute == "lirc.stop")
- {
- m_RemoteControl.Disconnect();
- m_RemoteControl.SetEnabled(false);
- }
- else if (execute == "lirc.start")
+ if (HasRemoteControl())
 {
- m_RemoteControl.SetEnabled(true);
- m_RemoteControl.Initialize();
- }
- else if (execute == "lirc.send")
- {
- std::string command;
- for (int i = 0; i < (int)params.size(); i++)
+ if (execute == "lirc.stop")
+ {
+ m_RemoteControl->Disconnect();
+ m_RemoteControl->SetEnabled(false);
+ }
+ else if (execute == "lirc.start")
 {
- command += params[i];
- if (i < (int)params.size() - 1)
- command += ' ';
+ m_RemoteControl->SetEnabled(true);
+ m_RemoteControl->Initialize();
 }
- m_RemoteControl.AddSendCommand(command);
+ else if (execute == "lirc.send")
+ {
+ std::string command;
+ for (int i = 0; i < (int)params.size(); i++)
+ {
+ command += params[i];
+ if (i < (int)params.size() - 1)
+ command += ' ';
+ }
+ m_RemoteControl->AddSendCommand(command);
+ }
+ else
+ return -1;
 }
- else
- return -1;
-#endif
 return 0;
 }
 
@@ -807,56 +808,52 @@
 m_Mouse.SetState(mouseState);
 }
 
+bool CInputManager::HasRemoteControl()
+{
+ return m_RemoteControl ? true : false;
+}
+
 bool CInputManager::IsRemoteControlEnabled()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- return m_RemoteControl.IsInUse();
-#else
- return false;
-#endif
+ return m_RemoteControl && m_RemoteControl->IsInUse();
 }
 
 bool CInputManager::IsRemoteControlInitialized()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- return m_RemoteControl.IsInitialized();
-#else
- return false;
-#endif
+ return m_RemoteControl && m_RemoteControl->IsInitialized();
 }
 
 void CInputManager::EnableRemoteControl()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- m_RemoteControl.SetEnabled(true);
- if (!m_RemoteControl.IsInitialized())
+ if (!m_RemoteControl)
+ return;
+
+ m_RemoteControl->SetEnabled(true);
+ if (!m_RemoteControl->IsInitialized())
 {
- m_RemoteControl.Initialize();
+ m_RemoteControl->Initialize();
 }
-#endif
 }
 
 void CInputManager::DisableRemoteControl()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- m_RemoteControl.Disconnect();
- m_RemoteControl.SetEnabled(false);
-#endif
+ if (m_RemoteControl)
+ {
+ m_RemoteControl->Disconnect();
+ m_RemoteControl->SetEnabled(false);
+ }
 }
 
 void CInputManager::InitializeRemoteControl()
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- if (!m_RemoteControl.IsInitialized())
- m_RemoteControl.Initialize();
-#endif
+ if (m_RemoteControl && !m_RemoteControl->IsInitialized())
+ m_RemoteControl->Initialize();
 }
 
 void CInputManager::SetRemoteControlName(const std::string& name)
 {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- m_RemoteControl.SetDeviceName(name);
-#endif
+ if (m_RemoteControl)
+ m_RemoteControl->SetDeviceName(name);
 }
 
 void CInputManager::OnSettingChanged(std::shared_ptr<const CSetting> setting)
@@ -921,7 +918,8 @@
 
 if (m_buttonTranslator->Load())
 {
- m_irTranslator->Load();
+ if (m_RemoteControl)
+ m_irTranslator->Load(m_RemoteControl->GetMapFile());
 bSuccess = true;
 }
 
@@ -993,40 +991,29 @@
 return m_irTranslator->TranslateButton(szDevice, szButton);
 }
 
-void CInputManager::RegisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler)
+void CInputManager::RegisterKeyboardDriverHandler(KEYBOARD::IKeyboardDriverHandler* handler)
 {
 if (std::find(m_keyboardHandlers.begin(), m_keyboardHandlers.end(), handler) == m_keyboardHandlers.end())
 m_keyboardHandlers.insert(m_keyboardHandlers.begin(), handler);
 }
 
-void CInputManager::UnregisterKeyboardHandler(KEYBOARD::IKeyboardHandler* handler)
+void CInputManager::UnregisterKeyboardDriverHandler(KEYBOARD::IKeyboardDriverHandler* handler)
 {
 m_keyboardHandlers.erase(std::remove(m_keyboardHandlers.begin(), m_keyboardHandlers.end(), handler), m_keyboardHandlers.end());
 }
 
-std::string CInputManager::RegisterMouseHandler(MOUSE::IMouseInputHandler* handler)
+void CInputManager::RegisterMouseDriverHandler(MOUSE::IMouseDriverHandler* handler)
 {
- auto it = std::find_if(m_mouseHandlers.begin(), m_mouseHandlers.end(),
- [handler](const MouseHandlerHandle& element)
- {
- return element.inputHandler == handler;
- });
-
- if (it == m_mouseHandlers.end())
- {
- std::unique_ptr<MOUSE::IMouseDriverHandler> driverHandler(new MOUSE::CMouseInputHandling(handler, m_mouseButtonMap.get()));
- MouseHandlerHandle handle = { handler, std::move(driverHandler) };
- m_mouseHandlers.insert(m_mouseHandlers.begin(), std::move(handle));
- }
+ if (std::find(m_mouseHandlers.begin(), m_mouseHandlers.end(), handler) == m_mouseHandlers.end())
+ m_mouseHandlers.insert(m_mouseHandlers.begin(), handler);
+}
 
- return m_mouseButtonMap->ControllerID();
+void CInputManager::UnregisterMouseDriverHandler(MOUSE::IMouseDriverHandler* handler)
+{
+ m_mouseHandlers.erase(std::remove(m_mouseHandlers.begin(), m_mouseHandlers.end(), handler), m_mouseHandlers.end());
 }
 
-void CInputManager::UnregisterMouseHandler(MOUSE::IMouseInputHandler* handler)
+void CInputManager::RegisterRemoteControl(CreateRemoteControlFunc createFunc)
 {
- m_mouseHandlers.erase(std::remove_if(m_mouseHandlers.begin(), m_mouseHandlers.end(),
- [handler](const MouseHandlerHandle& handle)
- {
- return handle.inputHandler == handler;
- }), m_mouseHandlers.end());
+ m_createRemoteControl = createFunc;
 }

_service:download_files:master.tar.gz/xbmc/input/InputManager.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2014 Team XBMC
-* http://xbmc.org
+* 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
@@ -24,19 +24,12 @@
 #include <string>
 #include <vector>
 
-#if defined(HAS_LIRC)
-#include "platform/linux/input/LIRC.h"
-#endif
-#if defined(HAS_IRSERVERSUITE)
-#include "input/windows/IRServerSuite.h"
-#endif
-
 #include "Action.h"
 #include "windowing/XBMC_events.h"
-#include "input/keyboard/interfaces/IKeyboardInputProvider.h"
 #include "input/mouse/interfaces/IMouseInputProvider.h"
+#include "input/mouse/MouseStat.h"
 #include "input/KeyboardStat.h"
-#include "input/MouseStat.h"
+#include "input/remote/IRemoteControl.h"
 #include "interfaces/IActionListener.h"
 #include "settings/lib/ISettingCallback.h"
 #include "threads/CriticalSection.h"
@@ -48,6 +41,7 @@
 class CIRTranslator;
 class CJoystickMapper;
 class CKey;
+class CProfilesManager;
 class CTouchTranslator;
 class IKeymapEnvironment;
 class IWindowKeymap;
@@ -56,17 +50,16 @@
 {
 namespace KEYBOARD
 {
- class IKeyboardHandler;
+ class IKeyboardDriverHandler;
 }
 
 namespace MOUSE
 {
- class IMouseButtonMap;
 class IMouseDriverHandler;
- class IMouseInputHandler;
 }
 }
 
+using CreateRemoteControlFunc = KODI::REMOTE::IRemoteControl* (*)();
 /// \addtogroup input
 /// \{
 
@@ -82,12 +75,11 @@
 */
 class CInputManager : public ISettingCallback,
 public IActionListener,
- public KODI::KEYBOARD::IKeyboardInputProvider,
- public KODI::MOUSE::IMouseInputProvider,
 public Observable
 {
 public:
- explicit CInputManager(const CAppParamParser &params);
+ explicit CInputManager(const CAppParamParser &params,
+ const CProfilesManager &profileManager);
 CInputManager(const CInputManager&) = delete;
 CInputManager const& operator=(CInputManager const&) = delete;
 ~CInputManager() override;
@@ -211,6 +203,12 @@
 */
 void InitializeRemoteControl();
 
+ /*! \brief Check if the remote control exists
+ *
+ * \return true if remote control is exists, false otherwise 
+ */
+ bool HasRemoteControl();
+
 /*! \brief Check if the remote control is enabled
 *
 * \return true if remote control is enabled, false otherwise 
@@ -279,20 +277,24 @@
 
 int TranslateLircRemoteString(const std::string &szDevice, const std::string &szButton);
 
+ /*!
+ * \brief Queue an action to be processed on the next call to Process()
+ */
+ void QueueAction(const CAction& action);
+
 // implementation of ISettingCallback
 virtual void OnSettingChanged(std::shared_ptr<const CSetting> setting) override;
 
 // implementation of IActionListener
 virtual bool OnAction(const CAction& action) override;
 
- // implementation of IKeyboardInputProvider
- virtual void RegisterKeyboardHandler(KODI::KEYBOARD::IKeyboardHandler* handler) override;
- virtual void UnregisterKeyboardHandler(KODI::KEYBOARD::IKeyboardHandler* handler) override;
+ void RegisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler);
+ void UnregisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler);
 
- // implementation of IMouseInputProvider
- virtual std::string RegisterMouseHandler(KODI::MOUSE::IMouseInputHandler* handler) override;
- virtual void UnregisterMouseHandler(KODI::MOUSE::IMouseInputHandler* handler) override;
+ virtual void RegisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler);
+ virtual void UnregisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler);
 
+ static void RegisterRemoteControl(CreateRemoteControlFunc createFunc);
 private:
 
 /*! \brief Process keyboard event and translate into an action
@@ -339,18 +341,10 @@
 */
 void ProcessQueuedActions();
 
- /*! \brief Queue an action to be processed on the next call to Process()
- */
- void QueueAction(const CAction& action);
-
 CKeyboardStat m_Keyboard;
 CMouseStat m_Mouse;
 CKey m_LastKey;
 
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- CRemoteControl m_RemoteControl;
-#endif
-
 std::map<std::string, std::map<int, float> > m_lastAxisMap;
 
 std::vector<CAction> m_queuedActions;
@@ -363,19 +357,13 @@
 std::unique_ptr<CCustomControllerTranslator> m_customControllerTranslator;
 std::unique_ptr<CTouchTranslator> m_touchTranslator;
 std::unique_ptr<CJoystickMapper> m_joystickTranslator;
+ std::unique_ptr<KODI::REMOTE::IRemoteControl> m_RemoteControl;
 
- std::vector<KODI::KEYBOARD::IKeyboardHandler*> m_keyboardHandlers;
-
- struct MouseHandlerHandle
- {
- KODI::MOUSE::IMouseInputHandler* inputHandler;
- std::unique_ptr<KODI::MOUSE::IMouseDriverHandler> driverHandler;
- };
-
- std::vector<MouseHandlerHandle> m_mouseHandlers;
- std::unique_ptr<KODI::MOUSE::IMouseButtonMap> m_mouseButtonMap;
+ std::vector<KODI::KEYBOARD::IKeyboardDriverHandler*> m_keyboardHandlers;
+ std::vector<KODI::MOUSE::IMouseDriverHandler*> m_mouseHandlers;
 
- std::unique_ptr<KODI::KEYBOARD::IKeyboardHandler> m_keyboardEasterEgg;
+ std::unique_ptr<KODI::KEYBOARD::IKeyboardDriverHandler> m_keyboardEasterEgg;
+ static CreateRemoteControlFunc m_createRemoteControl;
 };
 
 /// \}

_service:download_files:master.tar.gz/xbmc/input/InputTranslator.cpp Added

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2018 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 "InputTranslator.h"
+
+using namespace KODI;
+using namespace INPUT;
+
+#define TAN_1_8_PI 0.4142136f // tan(1/8*PI)
+#define TAN_3_8_PI 2.4142136f // tan(3/8*PI)
+
+CARDINAL_DIRECTION CInputTranslator::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::NONE;
+}
+
+INTERCARDINAL_DIRECTION CInputTranslator::VectorToIntercardinalDirection(float x, float y)
+{
+ if (y >= TAN_3_8_PI * -x && y > TAN_3_8_PI * x) return INTERCARDINAL_DIRECTION::UP;
+ else if (y <= TAN_3_8_PI * x && y > TAN_1_8_PI * x) return INTERCARDINAL_DIRECTION::RIGHTUP;
+ else if (y <= TAN_1_8_PI * x && y > TAN_1_8_PI * -x) return INTERCARDINAL_DIRECTION::RIGHT;
+ else if (y <= TAN_1_8_PI * -x && y > TAN_3_8_PI * -x) return INTERCARDINAL_DIRECTION::RIGHTDOWN;
+ else if (y <= TAN_3_8_PI * -x && y < TAN_3_8_PI * x) return INTERCARDINAL_DIRECTION::DOWN;
+ else if (y >= TAN_3_8_PI * x && y < TAN_1_8_PI * x) return INTERCARDINAL_DIRECTION::LEFTDOWN;
+ else if (y >= TAN_1_8_PI * x && y < TAN_1_8_PI * -x) return INTERCARDINAL_DIRECTION::LEFT;
+ else if (y >= TAN_1_8_PI * -x && y < TAN_3_8_PI * -x) return INTERCARDINAL_DIRECTION::LEFTUP;
+
+ return INTERCARDINAL_DIRECTION::NONE;
+}

_service:download_files:master.tar.gz/xbmc/input/InputTranslator.h Added

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 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 "InputTypes.h"
+
+namespace KODI
+{
+namespace INPUT
+{
+ class CInputTranslator
+ {
+ public:
+ /*!
+ * \brief Get the closest cardinal direction to the given vector
+ *
+ * This function assumes a right-handed cartesian coordinate system; postive
+ * X is right, positive Y is up.
+ *
+ * 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 direction (up, down, right or left), or
+ * CARDINAL_DIRECTION::NONE if x and y are both 0
+ */
+ static CARDINAL_DIRECTION VectorToCardinalDirection(float x, float y);
+
+ /*!
+ * \brief Get the closest cardinal or intercardinal direction to the given
+ * vector
+ *
+ * This function assumes a right-handed cartesian coordinate system; postive
+ * X is right, positive Y is up.
+ *
+ * Ties are resolved in the clockwise direction.
+ *
+ * \param x The x component of the vector
+ * \param y The y component of the vector
+ *
+ * \return The closest intercardinal direction, or
+ * INTERCARDINAL_DIRECTION::NONE if x and y are both 0
+ */
+ static INTERCARDINAL_DIRECTION VectorToIntercardinalDirection(float x, float y);
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/InputTypes.h Added

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2018 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
+
+namespace KODI
+{
+namespace INPUT
+{
+ /*!
+ * \brief Cardinal directions, used for input device motions
+ */
+ enum class CARDINAL_DIRECTION
+ {
+ NONE = 0x0,
+ UP = 0x1,
+ DOWN = 0x2,
+ RIGHT = 0x4,
+ LEFT = 0x8,
+ };
+
+ /*!
+ * \brief Cardinal and intercardinal directions, used for input device motions
+ */
+ enum class INTERCARDINAL_DIRECTION
+ {
+ NONE = static_cast<unsigned int>(CARDINAL_DIRECTION::NONE),
+ UP = static_cast<unsigned int>(CARDINAL_DIRECTION::UP),
+ DOWN = static_cast<unsigned int>(CARDINAL_DIRECTION::DOWN),
+ RIGHT = static_cast<unsigned int>(CARDINAL_DIRECTION::RIGHT),
+ LEFT = static_cast<unsigned int>(CARDINAL_DIRECTION::LEFT),
+ RIGHTUP = RIGHT | UP,
+ RIGHTDOWN = RIGHT | DOWN,
+ LEFTUP = LEFT | UP,
+ LEFTDOWN = LEFT | DOWN,
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/JoystickMapper.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/Key.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -48,7 +48,7 @@
   m_held = held;
 }
 
-CKey::CKey(uint32_t keycode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, unsigned int held)
+CKey::CKey(uint32_t keycode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, uint32_t lockingModifiers, unsigned int held)
 {
   Reset();
   if (vkey) // FIXME: This needs cleaning up - should we always use the unicode key where available?
@@ -61,6 +61,7 @@
   m_unicode = unicode;
   m_ascii = ascii;
   m_modifiers = modifiers;
+  m_lockingModifiers = lockingModifiers;
   m_held = held;
 }
 
@@ -85,6 +86,7 @@
   m_unicode = 0;
   m_ascii = 0;
   m_modifiers = 0;
+  m_lockingModifiers = 0;
   m_held = 0;
 }
 
@@ -105,16 +107,17 @@
   m_unicode     = key.m_unicode;
   m_ascii       = key.m_ascii;
   m_modifiers    = key.m_modifiers;
+  m_lockingModifiers = key.m_lockingModifiers;
   m_held         = key.m_held;
   return *this;
 }
 
-BYTE CKey::GetLeftTrigger() const
+uint8_t CKey::GetLeftTrigger() const
 {
   return m_leftTrigger;
 }
 
-BYTE CKey::GetRightTrigger() const
+uint8_t CKey::GetRightTrigger() const
 {
   return m_rightTrigger;
 }

_service:download_files:master.tar.gz/xbmc/input/Key.h Changed

@@ -6,7 +6,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -32,7 +32,7 @@
 #include <stdint.h>
 
 // Reserved 0 - 255
-// XBIRRemote.h
+// IRRemote.h
 // XINPUT_IR_REMOTE-*
 
 /*
@@ -149,7 +149,7 @@
 CKey(void);
 CKey(uint32_t buttonCode, uint8_t leftTrigger = 0, uint8_t rightTrigger = 0, float leftThumbX = 0.0f, float leftThumbY = 0.0f, float rightThumbX = 0.0f, float rightThumbY = 0.0f, float repeat = 0.0f);
 CKey(uint32_t buttonCode, unsigned int held);
- CKey(uint32_t keycode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, unsigned int held);
+ CKey(uint32_t keycode, uint8_t vkey, wchar_t unicode, char ascii, uint32_t modifiers, uint32_t lockingModifiers, unsigned int held);
 CKey(const CKey& key);
 void Reset();
 
@@ -174,6 +174,7 @@
 inline wchar_t GetUnicode() const { return m_unicode; }
 inline char GetAscii() const { return m_ascii; }
 inline uint32_t GetModifiers() const { return m_modifiers; };
+ inline uint32_t GetLockingModifiers() const { return m_lockingModifiers; };
 inline unsigned int GetHeld() const { return m_held; }
 
 enum Modifier {
@@ -196,6 +197,7 @@
 wchar_t m_unicode;
 char m_ascii;
 uint32_t m_modifiers;
+ uint32_t m_lockingModifiers;
 unsigned int m_held;
 
 uint8_t m_leftTrigger;

_service:download_files:master.tar.gz/xbmc/input/KeyboardLayoutManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/KeyboardLayoutManager.h Changed

_service:download_files:master.tar.gz/xbmc/input/KeyboardStat.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -79,6 +79,7 @@
 wchar_t unicode;
 char ascii;
 uint32_t modifiers;
+ uint32_t lockingModifiers;
 unsigned int held;
 XBMCKEYTABLE keytable;
 
@@ -93,12 +94,14 @@
 modifiers |= CKey::MODIFIER_SUPER;
 if (keysym.mod & XBMCKMOD_META)
 modifiers |= CKey::MODIFIER_META;
+
+ lockingModifiers = 0;
 if (keysym.mod & XBMCKMOD_NUM)
- modifiers |= CKey::MODIFIER_NUMLOCK;
+ lockingModifiers |= CKey::MODIFIER_NUMLOCK;
 if (keysym.mod & XBMCKMOD_CAPS)
- modifiers |= CKey::MODIFIER_CAPSLOCK;
+ lockingModifiers |= CKey::MODIFIER_CAPSLOCK;
 if (keysym.mod & XBMCKMOD_MODE)
- modifiers |= CKey::MODIFIER_SCROLLLOCK;
+ lockingModifiers |= CKey::MODIFIER_SCROLLLOCK;
 
 CLog::Log(LOGDEBUG, "Keyboard: scancode: 0x%02x, sym: 0x%04x, unicode: 0x%04x, modifier: 0x%x", keysym.scancode, keysym.sym, keysym.unicode, keysym.mod);
 
@@ -179,13 +182,13 @@
 // The A-Z keys are exempted because shift-A-Z is used for navigation in lists.
 // The function keys are exempted because function keys have no shifted value and
 // the Nyxboard remote uses keys like Shift-F3 for some buttons.
- if (modifiers & CKey::MODIFIER_SHIFT)
+ if (modifiers == CKey::MODIFIER_SHIFT)
 if ((unicode < 'A' || unicode > 'Z') && (unicode < 'a' || unicode > 'z') && (vkey < XBMCVK_F1 || vkey > XBMCVK_F24))
 modifiers = 0;
 
 // Create and return a CKey
 
- CKey key(keycode, vkey, unicode, ascii, modifiers, held);
+ CKey key(keycode, vkey, unicode, ascii, modifiers, lockingModifiers, held);
 
 return key;
 }

_service:download_files:master.tar.gz/xbmc/input/MouseStat.cpp Deleted

@@ -1,362 +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 "MouseStat.h"
-#include "input/Key.h"
-#include "utils/TimeUtils.h"
-#include "ServiceBroker.h"
-#include "windowing/WinSystem.h"
-#include <cstring>
-#include <algorithm>
-
-CMouseStat::CMouseStat()
-{
- m_pointerState = MOUSE_STATE_NORMAL;
- SetEnabled();
- m_speedX = m_speedY = 0;
- m_maxX = m_maxY = 0;
- memset(&m_mouseState, 0, sizeof(m_mouseState));
- m_Key = KEY_MOUSE_NOOP;
-}
-
-CMouseStat::~CMouseStat() = default;
-
-void CMouseStat::Initialize()
-{
- // Set the default resolution (PAL)
- SetResolution(720, 576, 1, 1);
-}
-
-void CMouseStat::HandleEvent(XBMC_Event& newEvent)
-{
- // Save the mouse position and the size of the last move
- int dx, dy;
- if (newEvent.type == XBMC_MOUSEMOTION)
- {
- dx = newEvent.motion.x - m_mouseState.x;
- dy = newEvent.motion.y - m_mouseState.y;
- }
- else if (newEvent.type == XBMC_MOUSEBUTTONDOWN || newEvent.type == XBMC_MOUSEBUTTONUP)
- {
- dx = newEvent.button.x - m_mouseState.x;
- dy = newEvent.button.y - m_mouseState.y;
- }
- else
- {
- return;
- }
- m_mouseState.dx = dx;
- m_mouseState.dy = dy;
- m_mouseState.x = std::max(0, std::min(m_maxX, m_mouseState.x + dx));
- m_mouseState.y = std::max(0, std::min(m_maxY, m_mouseState.y + dy));
-
- // Fill in the public members
- if (newEvent.type == XBMC_MOUSEBUTTONDOWN)
- {
- if (newEvent.button.button == XBMC_BUTTON_LEFT) m_mouseState.button[MOUSE_LEFT_BUTTON] = true;
- if (newEvent.button.button == XBMC_BUTTON_RIGHT) m_mouseState.button[MOUSE_RIGHT_BUTTON] = true;
- if (newEvent.button.button == XBMC_BUTTON_MIDDLE) m_mouseState.button[MOUSE_MIDDLE_BUTTON] = true;
- if (newEvent.button.button == XBMC_BUTTON_X1) m_mouseState.button[MOUSE_EXTRA_BUTTON1] = true;
- if (newEvent.button.button == XBMC_BUTTON_X2) m_mouseState.button[MOUSE_EXTRA_BUTTON2] = true;
- if (newEvent.button.button == XBMC_BUTTON_X3) m_mouseState.button[MOUSE_EXTRA_BUTTON3] = true;
- if (newEvent.button.button == XBMC_BUTTON_X4) m_mouseState.button[MOUSE_EXTRA_BUTTON4] = true;
- if (newEvent.button.button == XBMC_BUTTON_WHEELUP) m_mouseState.dz = 1;
- if (newEvent.button.button == XBMC_BUTTON_WHEELDOWN) m_mouseState.dz = -1;
- }
- else if (newEvent.type == XBMC_MOUSEBUTTONUP)
- {
- if (newEvent.button.button == XBMC_BUTTON_LEFT) m_mouseState.button[MOUSE_LEFT_BUTTON] = false;
- if (newEvent.button.button == XBMC_BUTTON_RIGHT) m_mouseState.button[MOUSE_RIGHT_BUTTON] = false;
- if (newEvent.button.button == XBMC_BUTTON_MIDDLE) m_mouseState.button[MOUSE_MIDDLE_BUTTON] = false;
- if (newEvent.button.button == XBMC_BUTTON_X1) m_mouseState.button[MOUSE_EXTRA_BUTTON1] = false;
- if (newEvent.button.button == XBMC_BUTTON_X2) m_mouseState.button[MOUSE_EXTRA_BUTTON2] = false;
- if (newEvent.button.button == XBMC_BUTTON_X3) m_mouseState.button[MOUSE_EXTRA_BUTTON3] = false;
- if (newEvent.button.button == XBMC_BUTTON_X4) m_mouseState.button[MOUSE_EXTRA_BUTTON4] = false;
- if (newEvent.button.button == XBMC_BUTTON_WHEELUP) m_mouseState.dz = 0;
- if (newEvent.button.button == XBMC_BUTTON_WHEELDOWN) m_mouseState.dz = 0;
- }
-
- // Now check the current message and the previous state to find out if
- // this is a click, doubleclick, drag etc
- uint32_t now = CTimeUtils::GetFrameTime();
- bool bNothingDown = true;
- 
- for (int i = 0; i < MOUSE_MAX_BUTTON; i++)
- {
- bClick[i] = false;
- bLongClick[i] = false;
- bDoubleClick[i] = false;
- bHold[i] = 0;
-
- // CButtonState::Update does the hard work of checking the button state
- // and spotting drags, doubleclicks etc
- CButtonState::BUTTON_ACTION action = m_buttonState[i].Update(now, m_mouseState.x, m_mouseState.y, m_mouseState.button[i]);
- switch (action)
- {
- case CButtonState::MB_SHORT_CLICK:
- bClick[i] = true;
- bNothingDown = false;
- break;
- case CButtonState::MB_LONG_CLICK:
- bLongClick[i] = true;
- bNothingDown = false;
- break;
- case CButtonState::MB_DOUBLE_CLICK:
- bDoubleClick[i] = true;
- bNothingDown = false;
- break;
- case CButtonState::MB_DRAG_START:
- bHold[i] = CButtonState::MB_DRAG_START;
- bNothingDown = false;
- break;
- case CButtonState::MB_DRAG:
- bHold[i] = CButtonState::MB_DRAG;
- bNothingDown = false;
- break;
- case CButtonState::MB_DRAG_END:
- bHold[i] = CButtonState::MB_DRAG_END;
- bNothingDown = false;
- break;
- default:
- break;
- }
- }
-
- // Now work out what action ID to send to XBMC.
-
- // ignore any mouse messages by default
- m_Key = KEY_MOUSE_NOOP;
-
- for (int button=0; button<MOUSE_MAX_BUTTON; ++button)
- {
- // The bClick array is set true if CButtonState::Update spots a click
- // i.e. a button down followed by a button up.
- if (bClick[button])
- m_Key = KEY_MOUSE_CLICK + button;
- // The bDoubleClick array is set true if CButtonState::Update spots a
- // button down within double_click_time (500ms) of the last click
- else if (bDoubleClick[button])
- m_Key = KEY_MOUSE_DOUBLE_CLICK + button;
- else if (bLongClick[button])
- m_Key = KEY_MOUSE_LONG_CLICK + button;
-
- if (m_Key != KEY_MOUSE_NOOP)
- break;
- }
-
- if (m_Key == KEY_MOUSE_NOOP)
- {
- // The bHold array is set to the drag action
- if (bHold[MOUSE_LEFT_BUTTON] != 0)
- {
- switch (bHold[MOUSE_LEFT_BUTTON])
- {
- case CButtonState::MB_DRAG:
- m_Key = KEY_MOUSE_DRAG;
- break;
- case CButtonState::MB_DRAG_START:
- m_Key = KEY_MOUSE_DRAG_START;
- break;
- case CButtonState::MB_DRAG_END:
- m_Key = KEY_MOUSE_DRAG_END;
- break;
- }
- }
- else if (bHold[MOUSE_RIGHT_BUTTON] != 0)
- {
- switch (bHold[MOUSE_RIGHT_BUTTON])
- {
- case CButtonState::MB_DRAG:
- m_Key = KEY_MOUSE_RDRAG;
- break;
- case CButtonState::MB_DRAG_START:
- m_Key = KEY_MOUSE_RDRAG_START;
- break;
- case CButtonState::MB_DRAG_END:
- m_Key = KEY_MOUSE_RDRAG_END;
- break;
- }
- }
-
- // dz is +1 on wheel up and -1 on wheel down
- else if (m_mouseState.dz > 0)
- m_Key = KEY_MOUSE_WHEEL_UP;
- else if (m_mouseState.dz < 0)
- m_Key = KEY_MOUSE_WHEEL_DOWN;
-
- // Check for a mouse move that isn't a drag, ignoring messages with no movement at all
- else if (newEvent.type == XBMC_MOUSEMOTION && (m_mouseState.dx || m_mouseState.dy))
- m_Key = KEY_MOUSE_MOVE;
- }
-
- // activate the mouse pointer if we have an action or the mouse has moved far enough
- if ((MovedPastThreshold() && m_Key == KEY_MOUSE_MOVE) ||
- (m_Key != KEY_MOUSE_NOOP && m_Key != KEY_MOUSE_MOVE))
- SetActive();
-
- // reset the mouse state if nothing is held down
- if (bNothingDown)
- SetState(MOUSE_STATE_NORMAL);
-}
-
-void CMouseStat::SetResolution(int maxX, int maxY, float speedX, float speedY)
-{
- m_maxX = maxX;
- m_maxY = maxY;
-
- // speed is currently unused
- m_speedX = speedX;
- m_speedY = speedY;
-}
-
-void CMouseStat::SetActive(bool active /*=true*/)
-{
- m_lastActiveTime = CTimeUtils::GetFrameTime();
- m_mouseState.active = active;
- // we show the OS mouse if:
- // 1. The mouse is active (it has been moved) AND
- // 2. The XBMC mouse is disabled in settings AND
- // 3. XBMC is not in fullscreen.
- CWinSystemBase &winSystem = CServiceBroker::GetWinSystem();
- winSystem.ShowOSMouse(m_mouseState.active && !IsEnabled() && !CServiceBroker::GetWinSystem().IsFullScreen());
-}
-
-// IsActive - returns true if we have been active in the last MOUSE_ACTIVE_LENGTH period
-bool CMouseStat::IsActive()
-{
- if (m_mouseState.active && (CTimeUtils::GetFrameTime() - m_lastActiveTime > MOUSE_ACTIVE_LENGTH))
- SetActive(false);
- return (m_mouseState.active && IsEnabled());
-}
-
-void CMouseStat::SetEnabled(bool enabled)
-{
- m_mouseEnabled = enabled;
- SetActive(enabled);
-}
-
-// IsEnabled - returns true if mouse is enabled
-bool CMouseStat::IsEnabled() const
-{
- return m_mouseEnabled;
-}
-
-bool CMouseStat::MovedPastThreshold() const
-{
- return (m_mouseState.dx * m_mouseState.dx + m_mouseState.dy * m_mouseState.dy >= MOUSE_MINIMUM_MOVEMENT * MOUSE_MINIMUM_MOVEMENT);
-}
-
-uint32_t CMouseStat::GetKey() const
-{
- return m_Key;
-}
-
-int CMouseStat::GetHold(int ButtonID) const
-{
- switch (ButtonID)
- { case MOUSE_LEFT_BUTTON:
- return bHold[MOUSE_LEFT_BUTTON];
- }
- return false;
-}
-
-CMouseStat::CButtonState::CButtonState()
-{
- m_state = STATE_RELEASED;
- m_time = 0;
- m_x = 0;
- m_y = 0;
-}
-
-bool CMouseStat::CButtonState::InClickRange(int x, int y) const
-{
- int dx = x - m_x;
- int dy = y - m_y;
- return (unsigned int)(dx*dx + dy*dy) <= click_confines*click_confines;
-}
-
-CMouseStat::CButtonState::BUTTON_ACTION CMouseStat::CButtonState::Update(unsigned int time, int x, int y, bool down)
-{
- if (m_state == STATE_IN_DRAG)
- {
- if (down)
- return MB_DRAG;
- m_state = STATE_RELEASED;
- return MB_DRAG_END;
- }
- else if (m_state == STATE_RELEASED)
- {
- if (down)
- {
- m_state = STATE_IN_CLICK;
- m_time = time;
- m_x = x;
- m_y = y;
- }
- }
- else if (m_state == STATE_IN_CLICK)
- {
- if (down)
- {
- if (!InClickRange(x,y))
- { // beginning a drag
- m_state = STATE_IN_DRAG;
- return MB_DRAG_START;
- }
- }
- else
- { // button up
- if (time - m_time < short_click_time)
- { // single click
- m_state = STATE_IN_DOUBLE_CLICK;
- m_time = time; // double click time and positioning is measured from the
- m_x = x; // end of a single click
- m_y = y;
- return MB_SHORT_CLICK;
- }
- else
- { // long click
- m_state = STATE_RELEASED;
- return MB_LONG_CLICK;
- }
- }
- }
- else if (m_state == STATE_IN_DOUBLE_CLICK)
- {
- if (time - m_time > double_click_time || !InClickRange(x,y))
- { // too long, or moved to much - reset to released state and re-update, as we may be starting a new click
- m_state = STATE_RELEASED;
- return Update(time, x, y, down);
- }
- if (down)
- {
- m_state = STATE_IN_DOUBLE_IGNORE;
- return MB_DOUBLE_CLICK;
- }
- }
- else if (m_state == STATE_IN_DOUBLE_IGNORE)
- {
- if (!down)
- m_state = STATE_RELEASED;
- }
-
- return MB_NONE;
-}
-

_service:download_files:master.tar.gz/xbmc/input/MouseStat.h Deleted

@@ -1,205 +0,0 @@
-#ifndef MOUSE_STAT_H
-#define MOUSE_STAT_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 "windowing/XBMC_events.h"
-
-#define XBMC_BUTTON(X)		(1 << ((X)-1))
-#define XBMC_BUTTON_LEFT		1
-#define XBMC_BUTTON_MIDDLE	2
-#define XBMC_BUTTON_RIGHT	3
-#define XBMC_BUTTON_WHEELUP	4
-#define XBMC_BUTTON_WHEELDOWN	5
-#define XBMC_BUTTON_X1		6
-#define XBMC_BUTTON_X2		7
-#define XBMC_BUTTON_X3		8
-#define XBMC_BUTTON_X4		9
-#define XBMC_BUTTON_LMASK	XBMC_BUTTON(XBMC_BUTTON_LEFT)
-#define XBMC_BUTTON_MMASK	XBMC_BUTTON(XBMC_BUTTON_MIDDLE)
-#define XBMC_BUTTON_RMASK	XBMC_BUTTON(XBMC_BUTTON_RIGHT)
-#define XBMC_BUTTON_X1MASK	XBMC_BUTTON(XBMC_BUTTON_X1)
-#define XBMC_BUTTON_X2MASK	XBMC_BUTTON(XBMC_BUTTON_X2)
-#define XBMC_BUTTON_X3MASK	XBMC_BUTTON(XBMC_BUTTON_X3)
-#define XBMC_BUTTON_X4MASK	XBMC_BUTTON(XBMC_BUTTON_X4)
-
-#define MOUSE_MINIMUM_MOVEMENT 2
-#define MOUSE_DOUBLE_CLICK_LENGTH 500L
-#define MOUSE_ACTIVE_LENGTH 5000L
-
-#define MOUSE_MAX_BUTTON 7
-
-enum MOUSE_STATE 
-{ 
- MOUSE_STATE_NORMAL = 1, /*! < Normal state */
- MOUSE_STATE_FOCUS, /*! < Control below the mouse is currently in focus */
- MOUSE_STATE_DRAG, /*! < A drag operation is being performed */
- MOUSE_STATE_CLICK /*! < A mousebutton is being clicked */
-};
-
-enum MOUSE_BUTTON
-{
- MOUSE_LEFT_BUTTON = 0,
- MOUSE_RIGHT_BUTTON,
- MOUSE_MIDDLE_BUTTON,
- MOUSE_EXTRA_BUTTON1,
- MOUSE_EXTRA_BUTTON2,
- MOUSE_EXTRA_BUTTON3,
- MOUSE_EXTRA_BUTTON4
-};
-
-// this holds everything we know about the current state of the mouse
-struct MouseState
-{
- int x; // x location
- int y; // y location
- int16_t dx; // change in x
- int16_t dy; // change in y
- int8_t dz; // change in z (wheel)
- bool button[MOUSE_MAX_BUTTON]; // current state of the buttons
- bool active; // true if the mouse is active
-};
-
-struct MousePosition
-{
- int x;
- int y;
-};
-
-class CAction;
-
-class CMouseStat
-{
-public:
- CMouseStat();
- virtual ~CMouseStat();
-
- void Initialize();
- void HandleEvent(XBMC_Event& newEvent);
- void SetResolution(int maxX, int maxY, float speedX, float speedY);
- bool IsActive();
- bool IsEnabled() const;
-
- void SetActive(bool active = true);
- void SetState(MOUSE_STATE state) { m_pointerState = state; };
- void SetEnabled(bool enabled = true);
- MOUSE_STATE GetState() const { return m_pointerState; };
- uint32_t GetKey() const;
-
- int GetHold(int ButtonID) const;
- inline int GetX(void) const { return m_mouseState.x; }
- inline int GetY(void) const { return m_mouseState.y; }
- inline int GetDX(void) const { return m_mouseState.dx; }
- inline int GetDY(void) const { return m_mouseState.dy; }
- MousePosition GetPosition() { return MousePosition{ m_mouseState.x, m_mouseState.y }; }
-
-private:
- /*! \brief Holds information regarding a particular mouse button state
-
- The CButtonState class is used to track where in a button event the mouse currently is.
- There is effectively 5 BUTTON_STATE's available, and transitioning between those states
- is handled by the Update() function.
-
- The actions we detect are:
- * short clicks - down/up press of the mouse within short_click_time ms, where the pointer stays within click_confines pixels
- * long clicks - down/up press of the mouse greater than short_click_time ms, where the pointers stays within click_confines pixels
- * double clicks - a further down press of the mouse within double_click_time of the up press of a short click, where the pointer stays within click_confines pixels
- * drag - the mouse is down and has been moved more than click_confines pixels
-
- \sa CMouseStat
- */
- class CButtonState
- {
- public:
- /*! \brief enum for the actions to perform as a result of an Update function
- */
- enum BUTTON_ACTION { MB_NONE = 0, ///< no action should occur
- MB_SHORT_CLICK, ///< a short click has occurred (a double click may be in process)
- MB_LONG_CLICK, ///< a long click has occurred
- MB_DOUBLE_CLICK, ///< a double click has occurred
- MB_DRAG_START, ///< a drag action has started
- MB_DRAG, ///< a drag action is in progress
- MB_DRAG_END }; ///< a drag action has finished
-
- CButtonState();
-
- /*! \brief Update the button state, with where the mouse is, and whether the button is down or not
-
- \param time frame time in ms
- \param x horizontal coordinate of the mouse
- \param y vertical coordinate of the mouse
- \param down true if the button is down
- \return action that should be performed
- */
- BUTTON_ACTION Update(unsigned int time, int x, int y, bool down);
- private:
- static const unsigned int click_confines = 5; ///< number of pixels that the pointer may move while the button is down to trigger a click
- static const unsigned int short_click_time = 1000; ///< time for mouse down/up to trigger a short click rather than a long click
- static const unsigned int double_click_time = 500; ///< time for mouse down following a short click to trigger a double click
-
- bool InClickRange(int x, int y) const;
-
- enum BUTTON_STATE { STATE_RELEASED = 0, ///< mouse button is released, no events pending
- STATE_IN_CLICK, ///< mouse button is down, a click is pending
- STATE_IN_DOUBLE_CLICK, ///< mouse button is released, pending double click
- STATE_IN_DOUBLE_IGNORE, ///< mouse button is down following double click
- STATE_IN_DRAG }; ///< mouse button is down during a drag
-
- BUTTON_STATE m_state;
- unsigned int m_time;
- int m_x;
- int m_y;
- };
-
- /*! \brief detect whether the mouse has moved
-
- Uses a trigger threshold of 2 pixels to detect mouse movement
-
- \return whether the mouse has moved past the trigger threshold.
- */
- bool MovedPastThreshold() const;
-
- // state of the mouse
- MOUSE_STATE m_pointerState;
- MouseState m_mouseState;
- bool m_mouseEnabled;
- CButtonState m_buttonState[MOUSE_MAX_BUTTON];
-
- int m_maxX;
- int m_maxY;
- float m_speedX;
- float m_speedY;
-
- // active/click timers
- unsigned int m_lastActiveTime;
-
- bool bClick[MOUSE_MAX_BUTTON];
- bool bDoubleClick[MOUSE_MAX_BUTTON];
- int bHold[MOUSE_MAX_BUTTON];
- bool bLongClick[MOUSE_MAX_BUTTON];
-
- uint32_t m_Key;
-};
-
-#endif
-
-
-

_service:download_files:master.tar.gz/xbmc/input/MouseTranslator.cpp Deleted

@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2017 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 "MouseTranslator.h"
-#include "Key.h"
-#include "MouseStat.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-#include "utils/XBMCTinyXML.h"
-
-#include <string>
-
-namespace
-{
-
-using ActionName = std::string;
-using KeyID = uint32_t;
-
-static const std::map<ActionName, KeyID> MouseKeys =
-{
- { "click" , KEY_MOUSE_CLICK },
- { "leftclick" , KEY_MOUSE_CLICK },
- { "rightclick" , KEY_MOUSE_RIGHTCLICK },
- { "middleclick" , KEY_MOUSE_MIDDLECLICK },
- { "doubleclick" , KEY_MOUSE_DOUBLE_CLICK },
- { "longclick" , KEY_MOUSE_LONG_CLICK },
- { "wheelup" , KEY_MOUSE_WHEEL_UP },
- { "wheeldown" , KEY_MOUSE_WHEEL_DOWN },
- { "mousemove" , KEY_MOUSE_MOVE },
- { "mousedrag" , KEY_MOUSE_DRAG },
- { "mousedragstart" , KEY_MOUSE_DRAG_START },
- { "mousedragend" , KEY_MOUSE_DRAG_END },
- { "mouserdrag" , KEY_MOUSE_RDRAG },
- { "mouserdragstart" , KEY_MOUSE_RDRAG_START },
- { "mouserdragend" , KEY_MOUSE_RDRAG_END }
-};
-
-} // anonymous namespace
-
-uint32_t CMouseTranslator::TranslateCommand(const TiXmlElement *pButton)
-{
- uint32_t buttonId = 0;
-
- if (pButton != nullptr)
- {
- std::string szKey = pButton->ValueStr();
- if (!szKey.empty())
- {
- StringUtils::ToLower(szKey);
-
- auto it = MouseKeys.find(szKey);
- if (it != MouseKeys.end())
- buttonId = it->second;
-
- if (buttonId == 0)
- {
- CLog::Log(LOGERROR, "Unknown mouse action (%s), skipping", pButton->Value());
- }
- else
- {
- int id = 0;
- if ((pButton->QueryIntAttribute("id", &id) == TIXML_SUCCESS))
- {
- if (0 <= id && id < MOUSE_MAX_BUTTON)
- buttonId += id;
- }
- }
- }
- }
-
- return buttonId;
-}

_service:download_files:master.tar.gz/xbmc/input/MouseTranslator.h Deleted

_service:download_files:master.tar.gz/xbmc/input/TouchTranslator.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/WindowKeymap.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/WindowTranslator.cpp Changed

@@ -19,7 +19,10 @@
  */
 
 #include "WindowTranslator.h"
+#include "Application.h"
 #include "guilib/WindowIDs.h"
+#include "pvr/PVRManager.h"
+#include "ServiceBroker.h"
 #include "utils/log.h"
 #include "utils/StringUtils.h"
 
@@ -231,6 +234,8 @@
 {
   static auto reverseWindowMapping = CreateWindowMappingByID();
 
+  windowId = GetVirtualWindow(windowId);
+
   auto it = reverseWindowMapping.find(WindowMapItem{ "", windowId });
   if (it != reverseWindowMapping.end())
     return it->windowName;
@@ -264,3 +269,30 @@
 
   return reverseWindowMapping;
 }
+
+int CWindowTranslator::GetVirtualWindow(int windowId)
+{
+  if (windowId == WINDOW_FULLSCREEN_VIDEO)
+  {
+    // check if we're in a DVD menu
+    if (g_application.GetAppPlayer().IsInMenu())
+      return WINDOW_VIDEO_MENU;
+    // check for LiveTV and switch to it's virtual window
+    else if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
+      return WINDOW_FULLSCREEN_LIVETV;
+    // special casing for numeric seek
+    else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
+      return WINDOW_VIDEO_TIME_SEEK;
+  }
+  else if (windowId == WINDOW_VISUALISATION)
+  {
+    // special casing for PVR radio
+    if (CServiceBroker::GetPVRManager().IsStarted() && g_application.CurrentFileItem().HasPVRChannelInfoTag())
+      return WINDOW_FULLSCREEN_RADIO;
+    // special casing for numeric seek
+    else if (g_application.GetAppPlayer().GetSeekHandler().HasTimeCode())
+      return WINDOW_VIDEO_TIME_SEEK;
+  }
+
+  return windowId;
+}

_service:download_files:master.tar.gz/xbmc/input/WindowTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/XBIRRemote.h Deleted

@@ -1,118 +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/>.
- *
- */
-
-#ifndef XBIRREMOTE_H
-#define XBIRREMOTE_H
-
-#include "system.h"
-
-#define XINPUT_IR_REMOTE_DISPLAY 213
-#define XINPUT_IR_REMOTE_REVERSE 226
-#define XINPUT_IR_REMOTE_PLAY 234
-#define XINPUT_IR_REMOTE_FORWARD 227
-#define XINPUT_IR_REMOTE_SKIP_MINUS 221
-#define XINPUT_IR_REMOTE_STOP 224
-#define XINPUT_IR_REMOTE_PAUSE 230
-#define XINPUT_IR_REMOTE_SKIP_PLUS 223
-#define XINPUT_IR_REMOTE_TITLE 229
-#define XINPUT_IR_REMOTE_INFO 195
-
-#define XINPUT_IR_REMOTE_UP 166
-#define XINPUT_IR_REMOTE_DOWN 167
-#define XINPUT_IR_REMOTE_LEFT 169
-#define XINPUT_IR_REMOTE_RIGHT 168
-
-#define XINPUT_IR_REMOTE_SELECT 11
-#define XINPUT_IR_REMOTE_ENTER 22
-
-#define XINPUT_IR_REMOTE_SUBTITLE 44
-#define XINPUT_IR_REMOTE_LANGUAGE 45
-
-#define XINPUT_IR_REMOTE_MENU 247
-#define XINPUT_IR_REMOTE_BACK 216
-
-#define XINPUT_IR_REMOTE_1 206
-#define XINPUT_IR_REMOTE_2 205
-#define XINPUT_IR_REMOTE_3 204
-#define XINPUT_IR_REMOTE_4 203
-#define XINPUT_IR_REMOTE_5 202
-#define XINPUT_IR_REMOTE_6 201
-#define XINPUT_IR_REMOTE_7 200
-#define XINPUT_IR_REMOTE_8 199
-#define XINPUT_IR_REMOTE_9 198
-#define XINPUT_IR_REMOTE_0 207
-
-// additional keys from the media center extender for xbox remote
-#define XINPUT_IR_REMOTE_POWER 196
-#define XINPUT_IR_REMOTE_MY_TV 49
-#define XINPUT_IR_REMOTE_MY_MUSIC 9
-#define XINPUT_IR_REMOTE_MY_PICTURES 6
-#define XINPUT_IR_REMOTE_MY_VIDEOS 7
-
-#define XINPUT_IR_REMOTE_RECORD 232
-
-#define XINPUT_IR_REMOTE_START 37
-#define XINPUT_IR_REMOTE_VOLUME_PLUS 208
-#define XINPUT_IR_REMOTE_VOLUME_MINUS 209
-#define XINPUT_IR_REMOTE_CHANNEL_PLUS 210
-#define XINPUT_IR_REMOTE_CHANNEL_MINUS 211
-#define XINPUT_IR_REMOTE_MUTE 192
-
-#define XINPUT_IR_REMOTE_RECORDED_TV 101
-#define XINPUT_IR_REMOTE_LIVE_TV 24
-#define XINPUT_IR_REMOTE_STAR 40
-#define XINPUT_IR_REMOTE_HASH 41
-#define XINPUT_IR_REMOTE_CLEAR 249
-
-// additional keys not defined by xbox remotes but present on generic remotes
-#define XINPUT_IR_REMOTE_TELETEXT 250
-#define XINPUT_IR_REMOTE_RED 251
-#define XINPUT_IR_REMOTE_GREEN 252
-#define XINPUT_IR_REMOTE_YELLOW 253
-#define XINPUT_IR_REMOTE_BLUE 254
-#define XINPUT_IR_REMOTE_PLAYLIST 255
-#define XINPUT_IR_REMOTE_GUIDE 50
-
-#define XINPUT_IR_REMOTE_LIVE_RADIO 248
-#define XINPUT_IR_REMOTE_EPG_SEARCH 246
-
-#define XINPUT_IR_REMOTE_EJECT 235
-#define XINPUT_IR_REMOTE_CONTENTS_MENU 236
-#define XINPUT_IR_REMOTE_ROOT_MENU 237
-#define XINPUT_IR_REMOTE_TOP_MENU 238
-#define XINPUT_IR_REMOTE_DVD_MENU 239
-
-#define XINPUT_IR_REMOTE_PRINT 240
-
-// Reserved 256 -> ...
-// Key.h
-// KEY_BUTTON_*
-
-typedef struct _XINPUT_IR_REMOTE
-{
- BYTE wButtons;
- BYTE region; // just a guess
- BYTE counter; // some value that is changing while a button is pressed... could be the state of the buffer
- BYTE firstEvent; // > 0 - first event triggered after a button was pressed on the remote; 0 - not first event
-}
-XINPUT_IR_REMOTE, *PIR_REMOTE;
-
-
-#endif

_service:download_files:master.tar.gz/xbmc/input/XBMC_keytable.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/hardware/IHardwareInput.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/DriverPrimitive.cpp Changed

@@ -20,6 +20,8 @@
 
 #include "DriverPrimitive.h"
 
+#include <utility>
+
 using namespace KODI;
 using namespace JOYSTICK;
 
@@ -47,6 +49,24 @@
 {
 }
 
+CDriverPrimitive::CDriverPrimitive(XBMCKey keycode) :
+ m_type(PRIMITIVE_TYPE::KEY),
+ m_keycode(keycode)
+{
+}
+
+CDriverPrimitive::CDriverPrimitive(MOUSE::BUTTON_ID index) :
+ m_type(PRIMITIVE_TYPE::MOUSE_BUTTON),
+ m_driverIndex(static_cast<unsigned int>(index))
+{
+}
+
+CDriverPrimitive::CDriverPrimitive(RELATIVE_POINTER_DIRECTION direction) :
+ m_type(PRIMITIVE_TYPE::RELATIVE_POINTER),
+ m_pointerDirection(direction)
+{
+}
+
 bool CDriverPrimitive::operator==(const CDriverPrimitive& rhs) const
 {
 if (m_type == rhs.m_type)
@@ -55,6 +75,7 @@
 {
 case PRIMITIVE_TYPE::BUTTON:
 case PRIMITIVE_TYPE::MOTOR:
+ case PRIMITIVE_TYPE::MOUSE_BUTTON:
 return m_driverIndex == rhs.m_driverIndex;
 case PRIMITIVE_TYPE::HAT:
 return m_driverIndex == rhs.m_driverIndex && m_hatDirection == rhs.m_hatDirection;
@@ -63,6 +84,10 @@
 m_center == rhs.m_center &&
 m_semiAxisDirection == rhs.m_semiAxisDirection &&
 m_range == rhs.m_range;
+ case PRIMITIVE_TYPE::KEY:
+ return m_keycode == rhs.m_keycode;
+ case PRIMITIVE_TYPE::RELATIVE_POINTER:
+ return m_pointerDirection == rhs.m_pointerDirection;
 default:
 return true;
 }
@@ -78,7 +103,8 @@
 if (m_type == PRIMITIVE_TYPE::BUTTON ||
 m_type == PRIMITIVE_TYPE::HAT ||
 m_type == PRIMITIVE_TYPE::SEMIAXIS ||
- m_type == PRIMITIVE_TYPE::MOTOR)
+ m_type == PRIMITIVE_TYPE::MOTOR ||
+ m_type == PRIMITIVE_TYPE::MOUSE_BUTTON)
 {
 if (m_driverIndex < rhs.m_driverIndex) return true;
 if (m_driverIndex > rhs.m_driverIndex) return false;
@@ -102,13 +128,26 @@
 if (m_range > rhs.m_range) return false;
 }
 
+ if (m_type == PRIMITIVE_TYPE::KEY)
+ {
+ if (m_keycode < rhs.m_keycode) return true;
+ if (m_keycode > rhs.m_keycode) return false;
+ }
+
+ if (m_type == PRIMITIVE_TYPE::RELATIVE_POINTER)
+ {
+ if (m_pointerDirection < rhs.m_pointerDirection) return true;
+ if (m_pointerDirection > rhs.m_pointerDirection) return false;
+ }
+
 return false;
 }
 
 bool CDriverPrimitive::IsValid(void) const
 {
 if (m_type == PRIMITIVE_TYPE::BUTTON ||
- m_type == PRIMITIVE_TYPE::MOTOR)
+ m_type == PRIMITIVE_TYPE::MOTOR ||
+ m_type == PRIMITIVE_TYPE::MOUSE_BUTTON)
 return true;
 
 if (m_type == PRIMITIVE_TYPE::HAT)
@@ -153,5 +192,16 @@
 return 1 <= m_range && m_range <= maxRange;
 }
 
+ if (m_type == PRIMITIVE_TYPE::KEY)
+ return m_keycode != XBMCK_UNKNOWN;
+
+ if (m_type == PRIMITIVE_TYPE::RELATIVE_POINTER)
+ {
+ return m_pointerDirection == RELATIVE_POINTER_DIRECTION::UP ||
+ m_pointerDirection == RELATIVE_POINTER_DIRECTION::DOWN ||
+ m_pointerDirection == RELATIVE_POINTER_DIRECTION::RIGHT ||
+ m_pointerDirection == RELATIVE_POINTER_DIRECTION::LEFT;
+ }
+
 return false;
 }

_service:download_files:master.tar.gz/xbmc/input/joysticks/DriverPrimitive.h Changed

@@ -20,6 +20,8 @@
 #pragma once
 
 #include "JoystickTypes.h"
+#include "input/mouse/MouseTypes.h"
+#include "input/XBMC_keysym.h"
 
 #include <stdint.h>
 
@@ -63,6 +65,15 @@
 * Motor:
 * - driver index
 *
+ * Key:
+ * - keycode
+ *
+ * Mouse button:
+ * - driver index
+ *
+ * Relative pointer:
+ * - pointer direction
+ *
 * For more info, see "Chapter 2. Joystick drivers" in the documentation
 * thread: http://forum.kodi.tv/showthread.php?tid=257764
 */
@@ -91,6 +102,21 @@
 */
 CDriverPrimitive(unsigned int axisIndex, int center, SEMIAXIS_DIRECTION direction, unsigned int range);
 
+ /*!
+ * \brief Construct a driver primitive representing a key on a keyboard
+ */
+ CDriverPrimitive(XBMCKey keycode);
+
+ /*!
+ * \brief Construct a driver primitive representing a mouse button
+ */
+ CDriverPrimitive(MOUSE::BUTTON_ID index);
+
+ /*!
+ * \brief Construct a driver primitive representing a relative pointer
+ */
+ CDriverPrimitive(RELATIVE_POINTER_DIRECTION direction);
+
 bool operator==(const CDriverPrimitive& rhs) const;
 bool operator<(const CDriverPrimitive& rhs) const;
 
@@ -136,22 +162,40 @@
 unsigned int Range() const { return m_range; }
 
 /*!
+ * \brief The keybord symbol (valid for keys)
+ */
+ XBMCKey Keycode() const { return m_keycode; }
+
+ /*!
+ * \brief The mouse button ID (valid for mouse buttons)
+ */
+ MOUSE::BUTTON_ID MouseButton() const { return static_cast<MOUSE::BUTTON_ID>(m_driverIndex); }
+
+ /*!
+ * \brief The relative pointer direction (valid for relative pointers)
+ */
+ RELATIVE_POINTER_DIRECTION PointerDirection() const { return m_pointerDirection; }
+
+ /*!
 * \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
+ * 3) for keys, the keycode is non-empty
 */
 bool IsValid(void) const;
 
 private:
 PRIMITIVE_TYPE m_type = PRIMITIVE_TYPE::UNKNOWN;
 unsigned int m_driverIndex = 0;
- HAT_DIRECTION m_hatDirection = HAT_DIRECTION::UNKNOWN;
+ HAT_DIRECTION m_hatDirection = HAT_DIRECTION::NONE;
 int m_center = 0;
 SEMIAXIS_DIRECTION m_semiAxisDirection = SEMIAXIS_DIRECTION::ZERO;
 unsigned int m_range = 1;
+ XBMCKey m_keycode = XBMCK_UNKNOWN;
+ RELATIVE_POINTER_DIRECTION m_pointerDirection = RELATIVE_POINTER_DIRECTION::NONE;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/input/joysticks/JoystickTranslator.cpp Changed

@@ -21,6 +21,7 @@
 #include "JoystickTranslator.h"
 #include "guilib/LocalizeStrings.h"
 #include "input/joysticks/DriverPrimitive.h"
+#include "input/mouse/MouseStat.h"
 #include "utils/StringUtils.h"
 
 using namespace KODI;
@@ -38,7 +39,6 @@
 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;
 }
@@ -68,7 +68,7 @@
 if (dir == "right") return ANALOG_STICK_DIRECTION::RIGHT;
 if (dir == "left") return ANALOG_STICK_DIRECTION::LEFT;
 
- return ANALOG_STICK_DIRECTION::UNKNOWN;
+ return ANALOG_STICK_DIRECTION::NONE;
 }
 
 const char* CJoystickTranslator::TranslateWheelDirection(WHEEL_DIRECTION dir)
@@ -89,7 +89,7 @@
 if (dir == "right") return WHEEL_DIRECTION::RIGHT;
 if (dir == "left") return WHEEL_DIRECTION::LEFT;
 
- return WHEEL_DIRECTION::UNKNOWN;
+ return WHEEL_DIRECTION::NONE;
 }
 
 const char* CJoystickTranslator::TranslateThrottleDirection(THROTTLE_DIRECTION dir)
@@ -110,7 +110,7 @@
 if (dir == "up") return THROTTLE_DIRECTION::UP;
 if (dir == "down") return THROTTLE_DIRECTION::DOWN;
 
- return THROTTLE_DIRECTION::UNKNOWN;
+ return THROTTLE_DIRECTION::NONE;
 }
 
 SEMIAXIS_DIRECTION CJoystickTranslator::PositionToSemiAxisDirection(float position)
@@ -126,7 +126,7 @@
 if (position > 0.0f) return WHEEL_DIRECTION::RIGHT;
 else if (position < 0.0f) return WHEEL_DIRECTION::LEFT;
 
- return WHEEL_DIRECTION::UNKNOWN;
+ return WHEEL_DIRECTION::NONE;
 }
 
 THROTTLE_DIRECTION CJoystickTranslator::PositionToThrottleDirection(float position)
@@ -134,17 +134,7 @@
 if (position > 0.0f) return THROTTLE_DIRECTION::UP;
 else if (position < 0.0f) return THROTTLE_DIRECTION::DOWN;
 
- return THROTTLE_DIRECTION::UNKNOWN;
-}
-
-ANALOG_STICK_DIRECTION CJoystickTranslator::VectorToAnalogStickDirection(float x, float y)
-{
- if (y >= x && y > -x) return ANALOG_STICK_DIRECTION::UP;
- else if (y < x && y >= -x) return ANALOG_STICK_DIRECTION::RIGHT;
- else if (y <= x && y < -x) return ANALOG_STICK_DIRECTION::DOWN;
- else if (y > x && y <= -x) return ANALOG_STICK_DIRECTION::LEFT;
-
- return ANALOG_STICK_DIRECTION::UNKNOWN;
+ return THROTTLE_DIRECTION::NONE;
 }
 
 std::string CJoystickTranslator::GetPrimitiveName(const CDriverPrimitive& primitive)

_service:download_files:master.tar.gz/xbmc/input/joysticks/JoystickTranslator.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/JoystickTypes.h Changed

@@ -24,6 +24,8 @@
 \ingroup joystick
 */
 
+#include "input/InputTypes.h"
+
 #include <set>
 #include <string>
 
@@ -49,6 +51,7 @@
 * 6) absolute pointer
 * 7) wheel
 * 8) throttle
+ * 9) keyboard key
 *
 * [*] All three driver primitives (buttons, hats and axes) have a state that
 * can be represented using a single scalar value. For this reason,
@@ -65,6 +68,7 @@
 ABSPOINTER,
 WHEEL,
 THROTTLE,
+ KEY,
 };
 
 /*!
@@ -94,35 +98,22 @@
 /*!
 * \brief Direction arrows on the hat (directional pad)
 */
- enum class HAT_DIRECTION
- {
- UNKNOWN = 0x0,
- UP = 0x1,
- DOWN = 0x2,
- RIGHT = 0x4,
- LEFT = 0x8,
- };
+ using HAT_DIRECTION = INPUT::CARDINAL_DIRECTION;
+
+ /*!
+ * \brief States in which a hat can be
+ */
+ using HAT_STATE = INPUT::INTERCARDINAL_DIRECTION;
 
 /*!
 * \brief Typedef for analog stick directions
 */
- using ANALOG_STICK_DIRECTION = HAT_DIRECTION;
+ using ANALOG_STICK_DIRECTION = INPUT::CARDINAL_DIRECTION;
 
 /*!
- * \brief States in which a hat can be
+ * \brief Directions of motion for a relative pointer
 */
- 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,
- };
+ using RELATIVE_POINTER_DIRECTION = INPUT::CARDINAL_DIRECTION;
 
 /*!
 * \brief Directions in which a semiaxis can point
@@ -139,7 +130,7 @@
 */
 enum class WHEEL_DIRECTION
 {
- UNKNOWN,
+ NONE,
 RIGHT,
 LEFT,
 };
@@ -149,7 +140,7 @@
 */
 enum class THROTTLE_DIRECTION
 {
- UNKNOWN,
+ NONE,
 UP,
 DOWN,
 };
@@ -174,8 +165,11 @@
 HAT, // one of the four direction arrows on a D-pad
 SEMIAXIS, // the positive or negative half of an axis
 MOTOR, // a rumble motor
+ KEY, // a keyboard key
+ MOUSE_BUTTON, // a mouse button
+ RELATIVE_POINTER, // a relative pointer, such as on a mouse
 };
- 
+
 /*!
 * \ingroup joystick
 * \brief Action entry in joystick.xml

_service:download_files:master.tar.gz/xbmc/input/joysticks/JoystickUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.cpp Changed

@@ -27,6 +27,7 @@
 #include "input/joysticks/DriverPrimitive.h"
 #include "input/joysticks/JoystickTranslator.h"
 #include "input/joysticks/JoystickUtils.h"
+#include "input/InputTranslator.h"
 #include "input/IKeymap.h"
 #include "input/Key.h"
 #include "threads/SystemClock.h"
@@ -245,6 +246,83 @@
 }
 }
 
+// --- CKeyDetector ---------------------------------------------------------
+
+CKeyDetector::CKeyDetector(CButtonMapping* buttonMapping, XBMCKey keycode) :
+ CPrimitiveDetector(buttonMapping),
+ m_keycode(keycode)
+{
+}
+
+bool CKeyDetector::OnMotion(bool bPressed)
+{
+ if (bPressed)
+ return MapPrimitive(CDriverPrimitive(m_keycode));
+
+ return false;
+}
+
+// --- CMouseButtonDetector ----------------------------------------------------
+
+CMouseButtonDetector::CMouseButtonDetector(CButtonMapping* buttonMapping, MOUSE::BUTTON_ID buttonIndex) :
+ CPrimitiveDetector(buttonMapping),
+ m_buttonIndex(buttonIndex)
+{
+}
+
+bool CMouseButtonDetector::OnMotion(bool bPressed)
+{
+ if (bPressed)
+ return MapPrimitive(CDriverPrimitive(m_buttonIndex));
+
+ return false;
+}
+
+// --- CPointerDetector --------------------------------------------------------
+
+CPointerDetector::CPointerDetector(CButtonMapping* buttonMapping) :
+ CPrimitiveDetector(buttonMapping)
+{
+}
+
+bool CPointerDetector::OnMotion(int x, int y)
+{
+ if (!m_bStarted)
+ {
+ m_bStarted = true;
+ m_startX = x;
+ m_startY = y;
+ m_frameCount = 0;
+ }
+
+ if (m_frameCount++ >= MIN_FRAME_COUNT)
+ {
+ int dx = x - m_startX;
+ int dy = y - m_startY;
+
+ INPUT::INTERCARDINAL_DIRECTION dir = GetPointerDirection(dx, dy);
+
+ CDriverPrimitive primitive(static_cast<RELATIVE_POINTER_DIRECTION>(dir));
+ if (primitive.IsValid())
+ {
+ if (MapPrimitive(primitive))
+ m_bStarted = false;
+ }
+ }
+
+ return true;
+}
+
+KODI::INPUT::INTERCARDINAL_DIRECTION CPointerDetector::GetPointerDirection(int x, int y)
+{
+ using namespace INPUT;
+
+ // Translate from left-handed coordinate system to right-handed coordinate system
+ y *= -1;
+
+ return CInputTranslator::VectorToIntercardinalDirection(static_cast<float>(x), static_cast<float>(y));
+}
+
 // --- CButtonMapping ----------------------------------------------------------
 
 CButtonMapping::CButtonMapping(IButtonMapper* buttonMapper, IButtonMap* buttonMap, IKeymap* keymap) :
@@ -321,6 +399,26 @@
 m_frameCount++;
 }
 
+bool CButtonMapping::OnKeyPress(const CKey& key)
+{
+ return GetKey(static_cast<XBMCKey>(key.GetKeycode())).OnMotion(true);
+}
+
+bool CButtonMapping::OnPosition(int x, int y)
+{
+ return GetPointer().OnMotion(x, y);
+}
+
+bool CButtonMapping::OnButtonPress(MOUSE::BUTTON_ID button)
+{
+ return GetMouseButton(button).OnMotion(true);
+}
+
+void CButtonMapping::OnButtonRelease(MOUSE::BUTTON_ID button)
+{
+ GetMouseButton(button).OnMotion(false);
+}
+
 void CButtonMapping::SaveButtonMap()
 {
 m_buttonMap->SaveButtonMap();
@@ -434,6 +532,40 @@
 return itAxis->second;
 }
 
+CKeyDetector& CButtonMapping::GetKey(XBMCKey keycode)
+{
+ auto itKey = m_keys.find(keycode);
+
+ if (itKey == m_keys.end())
+ {
+ m_keys.insert(std::make_pair(keycode, CKeyDetector(this, keycode)));
+ itKey = m_keys.find(keycode);
+ }
+
+ return itKey->second;
+}
+
+CMouseButtonDetector& CButtonMapping::GetMouseButton(MOUSE::BUTTON_ID buttonIndex)
+{
+ auto itButton = m_mouseButtons.find(buttonIndex);
+
+ if (itButton == m_mouseButtons.end())
+ {
+ m_mouseButtons.insert(std::make_pair(buttonIndex, CMouseButtonDetector(this, buttonIndex)));
+ itButton = m_mouseButtons.find(buttonIndex);
+ }
+
+ return itButton->second;
+}
+
+CPointerDetector &CButtonMapping::GetPointer()
+{
+ if (!m_pointer)
+ m_pointer.reset(new CPointerDetector(this));
+
+ return *m_pointer;
+}
+
 void CButtonMapping::OnLateDiscovery(unsigned int axisIndex)
 {
 m_buttonMapper->OnLateAxis(m_buttonMap, axisIndex);

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/ButtonMapping.h Changed

@@ -22,8 +22,12 @@
 #include "input/joysticks/interfaces/IButtonMapCallback.h"
 #include "input/joysticks/interfaces/IDriverHandler.h"
 #include "input/joysticks/DriverPrimitive.h"
+#include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
+#include "input/mouse/interfaces/IMouseDriverHandler.h"
+#include "input/mouse/MouseTypes.h"
 
 #include <map>
+#include <memory>
 #include <stdint.h>
 
 class IKeymap;
@@ -224,6 +228,84 @@
 };
 
 /*!
+ * \brief Detects when a keyboard key should be mapped
+ */
+ class CKeyDetector : public CPrimitiveDetector
+ {
+ public:
+ CKeyDetector(CButtonMapping* buttonMapping, XBMCKey keycode);
+
+ /*!
+ * \brief Key state has been updated
+ *
+ * \param bPressed The new state
+ *
+ * \return True if this press was handled, false if it should fall through
+ * to the next driver handler
+ */
+ bool OnMotion(bool bPressed);
+
+ private:
+ // Construction parameters
+ const XBMCKey m_keycode;
+ };
+
+ /*!
+ * \brief Detects when a mouse button should be mapped
+ */
+ class CMouseButtonDetector : public CPrimitiveDetector
+ {
+ public:
+ CMouseButtonDetector(CButtonMapping* buttonMapping, MOUSE::BUTTON_ID buttonIndex);
+
+ /*!
+ * \brief Button state has been updated
+ *
+ * \param bPressed The new state
+ *
+ * \return True if this press was handled, false if it should fall through
+ * to the next driver handler
+ */
+ bool OnMotion(bool bPressed);
+
+ private:
+ // Construction parameters
+ const MOUSE::BUTTON_ID m_buttonIndex;
+ };
+
+ /*!
+ * \brief Detects when a mouse button should be mapped
+ */
+ class CPointerDetector : public CPrimitiveDetector
+ {
+ public:
+ CPointerDetector(CButtonMapping* buttonMapping);
+
+ /*!
+ * \brief Pointer position has been updated
+ *
+ * \param x The new x coordinate
+ * \param y The new y coordinate
+ *
+ * \return Always true - pointer motion events are always absorbed while
+ * button mapping
+ */
+ bool OnMotion(int x, int y);
+
+ private:
+ // Utility function
+ static INPUT::INTERCARDINAL_DIRECTION GetPointerDirection(int x, int y);
+
+ static const unsigned int MIN_FRAME_COUNT = 10;
+
+ // State variables
+ bool m_bStarted = false;
+ int m_startX = 0;
+ int m_startY = 0;
+ unsigned int m_frameCount = 0;
+ };
+
+ /*!
 * \ingroup joystick
 * \brief Generic implementation of a class that provides button mapping by
 * translating driver events to button mapping commands
@@ -235,6 +317,8 @@
 * activation.
 */
 class CButtonMapping : public IDriverHandler,
+ public KEYBOARD::IKeyboardDriverHandler,
+ public MOUSE::IMouseDriverHandler,
 public IButtonMapCallback
 {
 public:
@@ -254,6 +338,15 @@
 virtual bool OnAxisMotion(unsigned int axisIndex, float position, int center, unsigned int range) override;
 virtual void ProcessAxisMotions(void) override;
 
+ // implementation of IKeyboardDriverHandler
+ bool OnKeyPress(const CKey& key) override;
+ void OnKeyRelease(const CKey& key) override { }
+
+ // implementation of IMouseDriverHandler
+ bool OnPosition(int x, int y) override;
+ bool OnButtonPress(MOUSE::BUTTON_ID button) override;
+ void OnButtonRelease(MOUSE::BUTTON_ID button) override;
+
 // implementation of IButtonMapCallback
 virtual void SaveButtonMap() override;
 virtual void ResetIgnoredPrimitives() override;
@@ -280,6 +373,9 @@
 CButtonDetector& GetButton(unsigned int buttonIndex);
 CHatDetector& GetHat(unsigned int hatIndex);
 CAxisDetector& GetAxis(unsigned int axisIndex, float position, const AxisConfiguration& initialConfig = AxisConfiguration());
+ CKeyDetector& GetKey(XBMCKey keycode);
+ CMouseButtonDetector& GetMouseButton(MOUSE::BUTTON_ID buttonIndex);
+ CPointerDetector &GetPointer();
 
 // Construction parameters
 IButtonMapper* const m_buttonMapper;
@@ -289,6 +385,9 @@
 std::map<unsigned int, CButtonDetector> m_buttons;
 std::map<unsigned int, CHatDetector> m_hats;
 std::map<unsigned int, CAxisDetector> m_axes;
+ std::map<XBMCKey, CKeyDetector> m_keys;
+ std::map<MOUSE::BUTTON_ID, CMouseButtonDetector> m_mouseButtons;
+ std::unique_ptr<CPointerDetector> m_pointer;
 unsigned int m_lastAction;
 uint64_t m_frameCount;
 };

_service:download_files:master.tar.gz/xbmc/input/joysticks/generic/FeatureHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonMap.h Changed

@@ -83,7 +83,7 @@
      * 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 primitive    The driver primitive
      * \param feature      The name of the resolved joystick feature, or
      *                     invalid if false is returned
      *
@@ -182,7 +182,7 @@
      */
     virtual bool GetRelativePointer(
       const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
+      RELATIVE_POINTER_DIRECTION direction,
       CDriverPrimitive& primitive
     ) = 0;
 
@@ -197,7 +197,7 @@
      */
     virtual void AddRelativePointer(
       const FeatureName& feature,
-      ANALOG_STICK_DIRECTION direction,
+      RELATIVE_POINTER_DIRECTION direction,
       const CDriverPrimitive& primitive
     ) = 0;
 
@@ -298,6 +298,34 @@
     ) = 0;
 
     /*!
+     * \brief Get the driver primitive for a keyboard key
+     *
+     * \param feature        Must be a key
+     * \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 GetKey(
+      const FeatureName& feature,
+      CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
+     * \brief Add or update a key
+     *
+     * \param feature        Must be a key
+     * \param primitive      The feature's driver primitive
+     *
+     * \return True if the feature was updated, false if the feature is
+     *         unchanged or failure occurs
+     */
+    virtual void AddKey(
+      const FeatureName& feature,
+      const CDriverPrimitive& primitive
+    ) = 0;
+
+    /*!
      * \brief Set a list of driver primitives to be ignored
      *
      * This is necessary to prevent features from interfering with the button

_service:download_files:master.tar.gz/xbmc/input/joysticks/interfaces/IButtonMapper.h Changed

_service:download_files:master.tar.gz/xbmc/input/joysticks/keymaps/KeymapHandler.cpp Changed

@@ -28,6 +28,7 @@
 #include "input/joysticks/JoystickUtils.h"
 #include "input/IKeymap.h"
 #include "input/IKeymapEnvironment.h"
+#include "input/InputTranslator.h"
 
 #include <algorithm>
 #include <assert.h>
@@ -113,10 +114,12 @@
 
 bool CKeymapHandler::OnAnalogStickMotion(const FeatureName& feature, float x, float y, unsigned int motionTimeMs)
 {
+ using namespace INPUT;
+
 bool bHandled = false;
 
 // Calculate the direction of the stick's position
- const ANALOG_STICK_DIRECTION analogStickDir = CJoystickTranslator::VectorToAnalogStickDirection(x, y);
+ const ANALOG_STICK_DIRECTION analogStickDir = CInputTranslator::VectorToCardinalDirection(x, y);
 
 // Calculate the magnitude projected onto that direction
 const float magnitude = std::max(std::fabs(x), std::fabs(y));
@@ -129,7 +132,7 @@
 }
 
 // Now activate direction the analog stick is pointing
- if (analogStickDir != ANALOG_STICK_DIRECTION::UNKNOWN)
+ if (analogStickDir != ANALOG_STICK_DIRECTION::NONE)
 bHandled = ActivateDirection(feature, magnitude, analogStickDir, motionTimeMs);
 
 return bHandled;
@@ -153,7 +156,7 @@
 }
 
 // Now activate direction in which the wheel is positioned
- if (direction != WHEEL_DIRECTION::UNKNOWN)
+ if (direction != WHEEL_DIRECTION::NONE)
 bHandled = ActivateDirection(feature, magnitude, direction, motionTimeMs);
 
 return bHandled;
@@ -177,7 +180,7 @@
 }
 
 // Now activate direction in which the throttle is positioned
- if (direction != THROTTLE_DIRECTION::UNKNOWN)
+ if (direction != THROTTLE_DIRECTION::NONE)
 bHandled = ActivateDirection(feature, magnitude, direction, motionTimeMs);
 
 return bHandled;

_service:download_files:master.tar.gz/xbmc/input/keyboard/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/KeyboardEasterEgg.h Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/KeyboardTypes.h Added

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2017 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/Key.h"
+
+#include <string>
+
+namespace KODI
+{
+namespace KEYBOARD
+{
+ /*!
+ * \brief Name of a hardware-indendent symbol representing a key
+ *
+ * Names are defined in the keyboard's controller profile.
+ */
+ using KeyName = std::string;
+
+ //! @todo Move CKey enum to this file
+ using Modifier = CKey::Modifier;
+}
+}

_service:download_files:master.tar.gz/xbmc/input/keyboard/KeymapActionMap.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/JoystickEmulation.cpp Deleted

@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "JoystickEmulation.h"
-#include "input/joysticks/interfaces/IDriverHandler.h"
-#include "input/Key.h"
-
-#include <algorithm>
-#include <assert.h>
-
-#define BUTTON_INDEX_MASK 0x01ff
-
-using namespace KODI;
-using namespace KEYBOARD;
-
-CJoystickEmulation::CJoystickEmulation(JOYSTICK::IDriverHandler* handler) :
- m_handler(handler)
-{
- assert(m_handler != nullptr);
-}
-
-bool CJoystickEmulation::OnKeyPress(const CKey& key)
-{
- bool bHandled = false;
-
- unsigned int buttonIndex = GetButtonIndex(key);
- if (buttonIndex != 0)
- bHandled = OnPress(buttonIndex);
-
- return bHandled;
-}
-
-void CJoystickEmulation::OnKeyRelease(const CKey& key)
-{
- unsigned int buttonIndex = GetButtonIndex(key);
- if (buttonIndex != 0)
- OnRelease(buttonIndex);
-}
-
-bool CJoystickEmulation::OnPress(unsigned int buttonIndex)
-{
- bool bHandled = false;
-
- KeyEvent event;
- if (GetEvent(buttonIndex, event))
- {
- bHandled = event.bHandled;
- }
- else
- {
- bHandled = m_handler->OnButtonMotion(buttonIndex, true);
- m_pressedKeys.push_back({buttonIndex, bHandled});
- }
-
- return bHandled;
-}
-
-void CJoystickEmulation::OnRelease(unsigned int buttonIndex)
-{
- KeyEvent event;
- if (GetEvent(buttonIndex, event))
- {
- m_handler->OnButtonMotion(buttonIndex, false);
- m_pressedKeys.erase(std::remove_if(m_pressedKeys.begin(), m_pressedKeys.end(),
- [buttonIndex](const KeyEvent& event)
- {
- return buttonIndex == event.buttonIndex;
- }), m_pressedKeys.end());
- }
-}
-
-bool CJoystickEmulation::GetEvent(unsigned int buttonIndex, KeyEvent& event) const
-{
- std::vector<KeyEvent>::const_iterator it = std::find_if(m_pressedKeys.begin(), m_pressedKeys.end(),
- [buttonIndex](const KeyEvent& event)
- {
- return buttonIndex == event.buttonIndex;
- });
-
- if (it != m_pressedKeys.end())
- {
- event = *it;
- return true;
- }
-
- return false;
-}
-
-unsigned int CJoystickEmulation::GetButtonIndex(const CKey& key)
-{
- return key.GetButtonCode() & BUTTON_INDEX_MASK;
-}

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/JoystickEmulation.h Deleted

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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/keyboard/interfaces/IKeyboardHandler.h"
-
-#include <vector>
-
-namespace KODI
-{
-namespace JOYSTICK
-{
- class IDriverHandler;
-}
-
-namespace KEYBOARD
-{
- /*!
- * \ingroup keyboard
- * \brief Generic implementation of a handler for joysticks that use keyboard
- * drivers. It basically emulates a joystick with many buttons.
- */
- class CJoystickEmulation : public IKeyboardHandler
- {
- public:
- explicit CJoystickEmulation(JOYSTICK::IDriverHandler* handler);
-
- ~CJoystickEmulation(void) override = default;
-
- // implementation of IKeyboardHandler
- bool OnKeyPress(const CKey& key) override;
- void OnKeyRelease(const CKey& key) override;
-
- private:
- struct KeyEvent
- {
- unsigned int buttonIndex;
- bool bHandled;
- };
-
- bool OnPress(unsigned int buttonIndex);
- void OnRelease(unsigned int buttonIndex);
- bool GetEvent(unsigned int buttonIndex, KeyEvent& event) const;
-
- static unsigned int GetButtonIndex(const CKey& key);
-
- JOYSTICK::IDriverHandler* const m_handler;
- std::vector<KeyEvent> m_pressedKeys;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/KeyboardInputHandling.cpp Added

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 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 "KeyboardInputHandling.h"
+#include "input/joysticks/interfaces/IButtonMap.h"
+#include "input/joysticks/DriverPrimitive.h"
+#include "input/keyboard/interfaces/IKeyboardInputHandler.h"
+#include "input/XBMC_keysym.h"
+
+using namespace KODI;
+using namespace KEYBOARD;
+
+CKeyboardInputHandling::CKeyboardInputHandling(IKeyboardInputHandler* handler, JOYSTICK::IButtonMap* buttonMap) :
+ m_handler(handler),
+ m_buttonMap(buttonMap)
+{
+}
+
+bool CKeyboardInputHandling::OnKeyPress(const CKey& key)
+{
+ bool bHandled = false;
+
+ JOYSTICK::CDriverPrimitive source(static_cast<XBMCKey>(key.GetKeycode()));
+
+ KeyName keyName;
+ if (m_buttonMap->GetFeature(source, keyName))
+ {
+ const Modifier mod = static_cast<Modifier>(key.GetModifiers() | key.GetLockingModifiers());
+ bHandled = m_handler->OnKeyPress(keyName, mod, key.GetUnicode());
+ }
+
+ return bHandled;
+}
+
+void CKeyboardInputHandling::OnKeyRelease(const CKey& key)
+{
+ JOYSTICK::CDriverPrimitive source(static_cast<XBMCKey>(key.GetKeycode()));
+
+ KeyName keyName;
+ if (m_buttonMap->GetFeature(source, keyName))
+ {
+ const Modifier mod = static_cast<Modifier>(key.GetModifiers() | key.GetLockingModifiers());
+ m_handler->OnKeyRelease(keyName, mod, key.GetUnicode());
+ }
+}

_service:download_files:master.tar.gz/xbmc/input/keyboard/generic/KeyboardInputHandling.h Added

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 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/keyboard/interfaces/IKeyboardDriverHandler.h"
+
+namespace KODI
+{
+ namespace JOYSTICK
+ {
+ class IButtonMap;
+ }
+
+ namespace KEYBOARD
+ {
+ class IKeyboardInputHandler;
+
+ /*!
+ * \ingroup keyboard
+ * \brief Class to translate input from Kodi keycodes to key names defined
+ * by the keyboard's controller profile
+ */
+ class CKeyboardInputHandling : public IKeyboardDriverHandler
+ {
+ public:
+ CKeyboardInputHandling(IKeyboardInputHandler* handler, JOYSTICK::IButtonMap* buttonMap);
+
+ ~CKeyboardInputHandling(void) override = default;
+
+ // implementation of IKeyboardDriverHandler
+ bool OnKeyPress(const CKey& key) override;
+ void OnKeyRelease(const CKey& key) override;
+
+ private:
+ // Construction parameters
+ IKeyboardInputHandler* const m_handler;
+ JOYSTICK::IButtonMap* const m_buttonMap;
+ };
+ }
+}

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardDriverHandler.h Added

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015-2017 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 KODI
+{
+namespace KEYBOARD
+{
+ /*!
+ * \ingroup keyboard
+ * \brief Interface for handling keyboard events
+ */
+ class IKeyboardDriverHandler
+ {
+ public:
+ virtual ~IKeyboardDriverHandler() = default;
+
+ /*!
+ * \brief A key has been pressed
+ *
+ * \param key The pressed key
+ *
+ * \return True if the event was handled, false otherwise
+ */
+ 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_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardHandler.h Deleted

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 KODI
-{
-namespace KEYBOARD
-{
- /*!
- * \ingroup keyboard
- * \brief Interface for handling keyboard events
- */
- class IKeyboardHandler
- {
- public:
- virtual ~IKeyboardHandler() = default;
-
- /*!
- * \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_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardInputHandler.h Added

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2017 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/keyboard/KeyboardTypes.h"
+
+#include <stdint.h>
+#include <string>
+
+namespace KODI
+{
+namespace KEYBOARD
+{
+ /*!
+ * \ingroup keyboard
+ * \brief Interface for handling input events for keyboards
+ *
+ * Input events are an abstraction over driver events. Keys are identified by
+ * the name defined in the keyboard's controller profile.
+ */
+ class IKeyboardInputHandler
+ {
+ public:
+ virtual ~IKeyboardInputHandler() = default;
+
+ /*!
+ * \brief The add-on ID of the keyboard's controller profile
+ *
+ * \return The ID of the controller profile add-on
+ */
+ virtual std::string ControllerID() const = 0;
+
+ /*!
+ * \brief Return true if the input handler accepts the given key
+ *
+ * \param key A key belonging to the controller specified by ControllerID()
+ *
+ * \return True if the key is used for input, false otherwise
+ */
+ virtual bool HasKey(const KeyName &key) const = 0;
+
+ /*!
+ * \brief A key has been pressed
+ *
+ * \param key A key belonging to the controller specified by ControllerID()
+ * \param mod A combination of modifiers
+ * \param unicode The unicode value associated with the key, or 0 if unknown
+ *
+ * \return True if the event was handled, false otherwise
+ */
+ virtual bool OnKeyPress(const KeyName &key, Modifier mod, uint32_t unicode) = 0;
+
+ /*!
+ * \brief A key has been released
+ *
+ * \param key A key belonging to the controller specified by ControllerID()
+ * \param mod A combination of modifiers
+ * \param unicode The unicode value associated with the key, or 0 if unknown
+ */
+ virtual void OnKeyRelease(const KeyName &key, Modifier mod, uint32_t unicode) = 0;
+ };
+}
+}

_service:download_files:master.tar.gz/xbmc/input/keyboard/interfaces/IKeyboardInputProvider.h Changed

@@ -23,11 +23,11 @@
 {
 namespace KEYBOARD
 {
-  class IKeyboardHandler;
+  class IKeyboardInputHandler;
 
   /*!
    * \ingroup mouse
-   * \brief Interface for classes that can provide mouse input
+   * \brief Interface for classes that can provide keyboard input
    */
   class IKeyboardInputProvider
   {
@@ -38,15 +38,17 @@
      * \brief Registers a handler to be called on keyboard input
      *
      * \param handler The handler to receive keyboard input provided by this class
+     * \param bPromiscuous True to observe all events without affecting the
+     *        input's destination
      */
-    virtual void RegisterKeyboardHandler(IKeyboardHandler* handler) = 0;
+    virtual void RegisterKeyboardHandler(IKeyboardInputHandler* handler, bool bPromiscuous) = 0;
 
     /*!
      * \brief Unregisters handler from keyboard input
      *
      * \param handler The handler that was receiving keyboard input
      */
-    virtual void UnregisterKeyboardHandler(IKeyboardHandler* handler) = 0;
+    virtual void UnregisterKeyboardHandler(IKeyboardInputHandler* handler) = 0;
   };
 }
 }

_service:download_files:master.tar.gz/xbmc/input/mouse/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseStat.cpp Added

@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "MouseStat.h"
+#include "input/Key.h"
+#include "utils/TimeUtils.h"
+#include "ServiceBroker.h"
+#include "windowing/WinSystem.h"
+#include <cstring>
+#include <algorithm>
+
+CMouseStat::CMouseStat()
+{
+ m_pointerState = MOUSE_STATE_NORMAL;
+ SetEnabled();
+ m_speedX = m_speedY = 0;
+ m_maxX = m_maxY = 0;
+ memset(&m_mouseState, 0, sizeof(m_mouseState));
+ m_Key = KEY_MOUSE_NOOP;
+}
+
+CMouseStat::~CMouseStat() = default;
+
+void CMouseStat::Initialize()
+{
+ // Set the default resolution (PAL)
+ SetResolution(720, 576, 1, 1);
+}
+
+void CMouseStat::HandleEvent(XBMC_Event& newEvent)
+{
+ // Save the mouse position and the size of the last move
+ int dx, dy;
+ if (newEvent.type == XBMC_MOUSEMOTION)
+ {
+ dx = newEvent.motion.x - m_mouseState.x;
+ dy = newEvent.motion.y - m_mouseState.y;
+ }
+ else if (newEvent.type == XBMC_MOUSEBUTTONDOWN || newEvent.type == XBMC_MOUSEBUTTONUP)
+ {
+ dx = newEvent.button.x - m_mouseState.x;
+ dy = newEvent.button.y - m_mouseState.y;
+ }
+ else
+ {
+ return;
+ }
+ m_mouseState.dx = dx;
+ m_mouseState.dy = dy;
+ m_mouseState.x = std::max(0, std::min(m_maxX, m_mouseState.x + dx));
+ m_mouseState.y = std::max(0, std::min(m_maxY, m_mouseState.y + dy));
+
+ // Fill in the public members
+ if (newEvent.type == XBMC_MOUSEBUTTONDOWN)
+ {
+ if (newEvent.button.button == XBMC_BUTTON_LEFT) m_mouseState.button[MOUSE_LEFT_BUTTON] = true;
+ if (newEvent.button.button == XBMC_BUTTON_RIGHT) m_mouseState.button[MOUSE_RIGHT_BUTTON] = true;
+ if (newEvent.button.button == XBMC_BUTTON_MIDDLE) m_mouseState.button[MOUSE_MIDDLE_BUTTON] = true;
+ if (newEvent.button.button == XBMC_BUTTON_X1) m_mouseState.button[MOUSE_EXTRA_BUTTON1] = true;
+ if (newEvent.button.button == XBMC_BUTTON_X2) m_mouseState.button[MOUSE_EXTRA_BUTTON2] = true;
+ if (newEvent.button.button == XBMC_BUTTON_X3) m_mouseState.button[MOUSE_EXTRA_BUTTON3] = true;
+ if (newEvent.button.button == XBMC_BUTTON_X4) m_mouseState.button[MOUSE_EXTRA_BUTTON4] = true;
+ if (newEvent.button.button == XBMC_BUTTON_WHEELUP) m_mouseState.dz = 1;
+ if (newEvent.button.button == XBMC_BUTTON_WHEELDOWN) m_mouseState.dz = -1;
+ }
+ else if (newEvent.type == XBMC_MOUSEBUTTONUP)
+ {
+ if (newEvent.button.button == XBMC_BUTTON_LEFT) m_mouseState.button[MOUSE_LEFT_BUTTON] = false;
+ if (newEvent.button.button == XBMC_BUTTON_RIGHT) m_mouseState.button[MOUSE_RIGHT_BUTTON] = false;
+ if (newEvent.button.button == XBMC_BUTTON_MIDDLE) m_mouseState.button[MOUSE_MIDDLE_BUTTON] = false;
+ if (newEvent.button.button == XBMC_BUTTON_X1) m_mouseState.button[MOUSE_EXTRA_BUTTON1] = false;
+ if (newEvent.button.button == XBMC_BUTTON_X2) m_mouseState.button[MOUSE_EXTRA_BUTTON2] = false;
+ if (newEvent.button.button == XBMC_BUTTON_X3) m_mouseState.button[MOUSE_EXTRA_BUTTON3] = false;
+ if (newEvent.button.button == XBMC_BUTTON_X4) m_mouseState.button[MOUSE_EXTRA_BUTTON4] = false;
+ if (newEvent.button.button == XBMC_BUTTON_WHEELUP) m_mouseState.dz = 0;
+ if (newEvent.button.button == XBMC_BUTTON_WHEELDOWN) m_mouseState.dz = 0;
+ }
+
+ // Now check the current message and the previous state to find out if
+ // this is a click, doubleclick, drag etc
+ uint32_t now = CTimeUtils::GetFrameTime();
+ bool bNothingDown = true;
+ 
+ for (int i = 0; i < MOUSE_MAX_BUTTON; i++)
+ {
+ bClick[i] = false;
+ bLongClick[i] = false;
+ bDoubleClick[i] = false;
+ bHold[i] = 0;
+
+ // CButtonState::Update does the hard work of checking the button state
+ // and spotting drags, doubleclicks etc
+ CButtonState::BUTTON_ACTION action = m_buttonState[i].Update(now, m_mouseState.x, m_mouseState.y, m_mouseState.button[i]);
+ switch (action)
+ {
+ case CButtonState::MB_SHORT_CLICK:
+ bClick[i] = true;
+ bNothingDown = false;
+ break;
+ case CButtonState::MB_LONG_CLICK:
+ bLongClick[i] = true;
+ bNothingDown = false;
+ break;
+ case CButtonState::MB_DOUBLE_CLICK:
+ bDoubleClick[i] = true;
+ bNothingDown = false;
+ break;
+ case CButtonState::MB_DRAG_START:
+ bHold[i] = CButtonState::MB_DRAG_START;
+ bNothingDown = false;
+ break;
+ case CButtonState::MB_DRAG:
+ bHold[i] = CButtonState::MB_DRAG;
+ bNothingDown = false;
+ break;
+ case CButtonState::MB_DRAG_END:
+ bHold[i] = CButtonState::MB_DRAG_END;
+ bNothingDown = false;
+ break;
+ default:
+ break;
+ }
+ }
+
+ // Now work out what action ID to send to XBMC.
+
+ // ignore any mouse messages by default
+ m_Key = KEY_MOUSE_NOOP;
+
+ for (int button=0; button<MOUSE_MAX_BUTTON; ++button)
+ {
+ // The bClick array is set true if CButtonState::Update spots a click
+ // i.e. a button down followed by a button up.
+ if (bClick[button])
+ m_Key = KEY_MOUSE_CLICK + button;
+ // The bDoubleClick array is set true if CButtonState::Update spots a
+ // button down within double_click_time (500ms) of the last click
+ else if (bDoubleClick[button])
+ m_Key = KEY_MOUSE_DOUBLE_CLICK + button;
+ else if (bLongClick[button])
+ m_Key = KEY_MOUSE_LONG_CLICK + button;
+
+ if (m_Key != KEY_MOUSE_NOOP)
+ break;
+ }
+
+ if (m_Key == KEY_MOUSE_NOOP)
+ {
+ // The bHold array is set to the drag action
+ if (bHold[MOUSE_LEFT_BUTTON] != 0)
+ {
+ switch (bHold[MOUSE_LEFT_BUTTON])
+ {
+ case CButtonState::MB_DRAG:
+ m_Key = KEY_MOUSE_DRAG;
+ break;
+ case CButtonState::MB_DRAG_START:
+ m_Key = KEY_MOUSE_DRAG_START;
+ break;
+ case CButtonState::MB_DRAG_END:
+ m_Key = KEY_MOUSE_DRAG_END;
+ break;
+ }
+ }
+ else if (bHold[MOUSE_RIGHT_BUTTON] != 0)
+ {
+ switch (bHold[MOUSE_RIGHT_BUTTON])
+ {
+ case CButtonState::MB_DRAG:
+ m_Key = KEY_MOUSE_RDRAG;
+ break;
+ case CButtonState::MB_DRAG_START:
+ m_Key = KEY_MOUSE_RDRAG_START;
+ break;
+ case CButtonState::MB_DRAG_END:
+ m_Key = KEY_MOUSE_RDRAG_END;
+ break;
+ }
+ }
+
+ // dz is +1 on wheel up and -1 on wheel down
+ else if (m_mouseState.dz > 0)
+ m_Key = KEY_MOUSE_WHEEL_UP;
+ else if (m_mouseState.dz < 0)
+ m_Key = KEY_MOUSE_WHEEL_DOWN;
+
+ // Check for a mouse move that isn't a drag, ignoring messages with no movement at all
+ else if (newEvent.type == XBMC_MOUSEMOTION && (m_mouseState.dx || m_mouseState.dy))
+ m_Key = KEY_MOUSE_MOVE;
+ }
+
+ // activate the mouse pointer if we have an action or the mouse has moved far enough
+ if ((MovedPastThreshold() && m_Key == KEY_MOUSE_MOVE) ||
+ (m_Key != KEY_MOUSE_NOOP && m_Key != KEY_MOUSE_MOVE))
+ SetActive();
+
+ // reset the mouse state if nothing is held down
+ if (bNothingDown)
+ SetState(MOUSE_STATE_NORMAL);
+}
+
+void CMouseStat::SetResolution(int maxX, int maxY, float speedX, float speedY)
+{
+ m_maxX = maxX;
+ m_maxY = maxY;
+
+ // speed is currently unused
+ m_speedX = speedX;
+ m_speedY = speedY;
+}
+
+void CMouseStat::SetActive(bool active /*=true*/)
+{
+ m_lastActiveTime = CTimeUtils::GetFrameTime();
+ m_mouseState.active = active;
+ // we show the OS mouse if:
+ // 1. The mouse is active (it has been moved) AND
+ // 2. The XBMC mouse is disabled in settings AND
+ // 3. XBMC is not in fullscreen.
+ CWinSystemBase &winSystem = CServiceBroker::GetWinSystem();
+ winSystem.ShowOSMouse(m_mouseState.active && !IsEnabled() && !CServiceBroker::GetWinSystem().IsFullScreen());
+}
+
+// IsActive - returns true if we have been active in the last MOUSE_ACTIVE_LENGTH period
+bool CMouseStat::IsActive()
+{
+ if (m_mouseState.active && (CTimeUtils::GetFrameTime() - m_lastActiveTime > MOUSE_ACTIVE_LENGTH))
+ SetActive(false);
+ return (m_mouseState.active && IsEnabled());
+}
+
+void CMouseStat::SetEnabled(bool enabled)
+{
+ m_mouseEnabled = enabled;
+ SetActive(enabled);
+}
+
+// IsEnabled - returns true if mouse is enabled
+bool CMouseStat::IsEnabled() const
+{
+ return m_mouseEnabled;
+}
+
+bool CMouseStat::MovedPastThreshold() const
+{
+ return (m_mouseState.dx * m_mouseState.dx + m_mouseState.dy * m_mouseState.dy >= MOUSE_MINIMUM_MOVEMENT * MOUSE_MINIMUM_MOVEMENT);
+}
+
+uint32_t CMouseStat::GetKey() const
+{
+ return m_Key;
+}
+
+int CMouseStat::GetHold(int ButtonID) const
+{
+ switch (ButtonID)
+ { case MOUSE_LEFT_BUTTON:
+ return bHold[MOUSE_LEFT_BUTTON];
+ }
+ return false;
+}
+
+CMouseStat::CButtonState::CButtonState()
+{
+ m_state = STATE_RELEASED;
+ m_time = 0;
+ m_x = 0;
+ m_y = 0;
+}
+
+bool CMouseStat::CButtonState::InClickRange(int x, int y) const
+{
+ int dx = x - m_x;
+ int dy = y - m_y;
+ return (unsigned int)(dx*dx + dy*dy) <= click_confines*click_confines;
+}
+
+CMouseStat::CButtonState::BUTTON_ACTION CMouseStat::CButtonState::Update(unsigned int time, int x, int y, bool down)
+{
+ if (m_state == STATE_IN_DRAG)
+ {
+ if (down)
+ return MB_DRAG;
+ m_state = STATE_RELEASED;
+ return MB_DRAG_END;
+ }
+ else if (m_state == STATE_RELEASED)
+ {
+ if (down)
+ {
+ m_state = STATE_IN_CLICK;
+ m_time = time;
+ m_x = x;
+ m_y = y;
+ }
+ }
+ else if (m_state == STATE_IN_CLICK)
+ {
+ if (down)
+ {
+ if (!InClickRange(x,y))
+ { // beginning a drag
+ m_state = STATE_IN_DRAG;
+ return MB_DRAG_START;
+ }
+ }
+ else
+ { // button up
+ if (time - m_time < short_click_time)
+ { // single click
+ m_state = STATE_IN_DOUBLE_CLICK;
+ m_time = time; // double click time and positioning is measured from the
+ m_x = x; // end of a single click
+ m_y = y;
+ return MB_SHORT_CLICK;
+ }
+ else
+ { // long click
+ m_state = STATE_RELEASED;
+ return MB_LONG_CLICK;
+ }
+ }
+ }
+ else if (m_state == STATE_IN_DOUBLE_CLICK)
+ {
+ if (time - m_time > double_click_time || !InClickRange(x,y))
+ { // too long, or moved to much - reset to released state and re-update, as we may be starting a new click
+ m_state = STATE_RELEASED;
+ return Update(time, x, y, down);
+ }
+ if (down)
+ {
+ m_state = STATE_IN_DOUBLE_IGNORE;
+ return MB_DOUBLE_CLICK;
+ }
+ }
+ else if (m_state == STATE_IN_DOUBLE_IGNORE)
+ {
+ if (!down)
+ m_state = STATE_RELEASED;
+ }
+
+ return MB_NONE;
+}
+

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseStat.h Added

@@ -0,0 +1,205 @@
+#ifndef MOUSE_STAT_H
+#define MOUSE_STAT_H
+
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "windowing/XBMC_events.h"
+
+#define XBMC_BUTTON(X)		(1 << ((X)-1))
+#define XBMC_BUTTON_LEFT		1
+#define XBMC_BUTTON_MIDDLE	2
+#define XBMC_BUTTON_RIGHT	3
+#define XBMC_BUTTON_WHEELUP	4
+#define XBMC_BUTTON_WHEELDOWN	5
+#define XBMC_BUTTON_X1		6
+#define XBMC_BUTTON_X2		7
+#define XBMC_BUTTON_X3		8
+#define XBMC_BUTTON_X4		9
+#define XBMC_BUTTON_LMASK	XBMC_BUTTON(XBMC_BUTTON_LEFT)
+#define XBMC_BUTTON_MMASK	XBMC_BUTTON(XBMC_BUTTON_MIDDLE)
+#define XBMC_BUTTON_RMASK	XBMC_BUTTON(XBMC_BUTTON_RIGHT)
+#define XBMC_BUTTON_X1MASK	XBMC_BUTTON(XBMC_BUTTON_X1)
+#define XBMC_BUTTON_X2MASK	XBMC_BUTTON(XBMC_BUTTON_X2)
+#define XBMC_BUTTON_X3MASK	XBMC_BUTTON(XBMC_BUTTON_X3)
+#define XBMC_BUTTON_X4MASK	XBMC_BUTTON(XBMC_BUTTON_X4)
+
+#define MOUSE_MINIMUM_MOVEMENT 2
+#define MOUSE_DOUBLE_CLICK_LENGTH 500L
+#define MOUSE_ACTIVE_LENGTH 5000L
+
+#define MOUSE_MAX_BUTTON 7
+
+enum MOUSE_STATE 
+{ 
+ MOUSE_STATE_NORMAL = 1, /*! < Normal state */
+ MOUSE_STATE_FOCUS, /*! < Control below the mouse is currently in focus */
+ MOUSE_STATE_DRAG, /*! < A drag operation is being performed */
+ MOUSE_STATE_CLICK /*! < A mousebutton is being clicked */
+};
+
+enum MOUSE_BUTTON
+{
+ MOUSE_LEFT_BUTTON = 0,
+ MOUSE_RIGHT_BUTTON,
+ MOUSE_MIDDLE_BUTTON,
+ MOUSE_EXTRA_BUTTON1,
+ MOUSE_EXTRA_BUTTON2,
+ MOUSE_EXTRA_BUTTON3,
+ MOUSE_EXTRA_BUTTON4
+};
+
+// this holds everything we know about the current state of the mouse
+struct MouseState
+{
+ int x; // x location
+ int y; // y location
+ int16_t dx; // change in x
+ int16_t dy; // change in y
+ int8_t dz; // change in z (wheel)
+ bool button[MOUSE_MAX_BUTTON]; // current state of the buttons
+ bool active; // true if the mouse is active
+};
+
+struct MousePosition
+{
+ int x;
+ int y;
+};
+
+class CAction;
+
+class CMouseStat
+{
+public:
+ CMouseStat();
+ virtual ~CMouseStat();
+
+ void Initialize();
+ void HandleEvent(XBMC_Event& newEvent);
+ void SetResolution(int maxX, int maxY, float speedX, float speedY);
+ bool IsActive();
+ bool IsEnabled() const;
+
+ void SetActive(bool active = true);
+ void SetState(MOUSE_STATE state) { m_pointerState = state; };
+ void SetEnabled(bool enabled = true);
+ MOUSE_STATE GetState() const { return m_pointerState; };
+ uint32_t GetKey() const;
+
+ int GetHold(int ButtonID) const;
+ inline int GetX(void) const { return m_mouseState.x; }
+ inline int GetY(void) const { return m_mouseState.y; }
+ inline int GetDX(void) const { return m_mouseState.dx; }
+ inline int GetDY(void) const { return m_mouseState.dy; }
+ MousePosition GetPosition() { return MousePosition{ m_mouseState.x, m_mouseState.y }; }
+
+private:
+ /*! \brief Holds information regarding a particular mouse button state
+
+ The CButtonState class is used to track where in a button event the mouse currently is.
+ There is effectively 5 BUTTON_STATE's available, and transitioning between those states
+ is handled by the Update() function.
+
+ The actions we detect are:
+ * short clicks - down/up press of the mouse within short_click_time ms, where the pointer stays within click_confines pixels
+ * long clicks - down/up press of the mouse greater than short_click_time ms, where the pointers stays within click_confines pixels
+ * double clicks - a further down press of the mouse within double_click_time of the up press of a short click, where the pointer stays within click_confines pixels
+ * drag - the mouse is down and has been moved more than click_confines pixels
+
+ \sa CMouseStat
+ */
+ class CButtonState
+ {
+ public:
+ /*! \brief enum for the actions to perform as a result of an Update function
+ */
+ enum BUTTON_ACTION { MB_NONE = 0, ///< no action should occur
+ MB_SHORT_CLICK, ///< a short click has occurred (a double click may be in process)
+ MB_LONG_CLICK, ///< a long click has occurred
+ MB_DOUBLE_CLICK, ///< a double click has occurred
+ MB_DRAG_START, ///< a drag action has started
+ MB_DRAG, ///< a drag action is in progress
+ MB_DRAG_END }; ///< a drag action has finished
+
+ CButtonState();
+
+ /*! \brief Update the button state, with where the mouse is, and whether the button is down or not
+
+ \param time frame time in ms
+ \param x horizontal coordinate of the mouse
+ \param y vertical coordinate of the mouse
+ \param down true if the button is down
+ \return action that should be performed
+ */
+ BUTTON_ACTION Update(unsigned int time, int x, int y, bool down);
+ private:
+ static const unsigned int click_confines = 5; ///< number of pixels that the pointer may move while the button is down to trigger a click
+ static const unsigned int short_click_time = 1000; ///< time for mouse down/up to trigger a short click rather than a long click
+ static const unsigned int double_click_time = 500; ///< time for mouse down following a short click to trigger a double click
+
+ bool InClickRange(int x, int y) const;
+
+ enum BUTTON_STATE { STATE_RELEASED = 0, ///< mouse button is released, no events pending
+ STATE_IN_CLICK, ///< mouse button is down, a click is pending
+ STATE_IN_DOUBLE_CLICK, ///< mouse button is released, pending double click
+ STATE_IN_DOUBLE_IGNORE, ///< mouse button is down following double click
+ STATE_IN_DRAG }; ///< mouse button is down during a drag
+
+ BUTTON_STATE m_state;
+ unsigned int m_time;
+ int m_x;
+ int m_y;
+ };
+
+ /*! \brief detect whether the mouse has moved
+
+ Uses a trigger threshold of 2 pixels to detect mouse movement
+
+ \return whether the mouse has moved past the trigger threshold.
+ */
+ bool MovedPastThreshold() const;
+
+ // state of the mouse
+ MOUSE_STATE m_pointerState;
+ MouseState m_mouseState;
+ bool m_mouseEnabled;
+ CButtonState m_buttonState[MOUSE_MAX_BUTTON];
+
+ int m_maxX;
+ int m_maxY;
+ float m_speedX;
+ float m_speedY;
+
+ // active/click timers
+ unsigned int m_lastActiveTime;
+
+ bool bClick[MOUSE_MAX_BUTTON];
+ bool bDoubleClick[MOUSE_MAX_BUTTON];
+ int bHold[MOUSE_MAX_BUTTON];
+ bool bLongClick[MOUSE_MAX_BUTTON];
+
+ uint32_t m_Key;
+};
+
+#endif
+
+
+

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseTranslator.cpp Added

@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2017 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 "MouseTranslator.h"
+#include "MouseStat.h"
+#include "input/Key.h"
+#include "utils/log.h"
+#include "utils/StringUtils.h"
+#include "utils/XBMCTinyXML.h"
+
+#include <string>
+
+using namespace KODI;
+using namespace MOUSE;
+
+namespace
+{
+
+using ActionName = std::string;
+using KeyID = uint32_t;
+
+static const std::map<ActionName, KeyID> MouseKeys =
+{
+ { "click" , KEY_MOUSE_CLICK },
+ { "leftclick" , KEY_MOUSE_CLICK },
+ { "rightclick" , KEY_MOUSE_RIGHTCLICK },
+ { "middleclick" , KEY_MOUSE_MIDDLECLICK },
+ { "doubleclick" , KEY_MOUSE_DOUBLE_CLICK },
+ { "longclick" , KEY_MOUSE_LONG_CLICK },
+ { "wheelup" , KEY_MOUSE_WHEEL_UP },
+ { "wheeldown" , KEY_MOUSE_WHEEL_DOWN },
+ { "mousemove" , KEY_MOUSE_MOVE },
+ { "mousedrag" , KEY_MOUSE_DRAG },
+ { "mousedragstart" , KEY_MOUSE_DRAG_START },
+ { "mousedragend" , KEY_MOUSE_DRAG_END },
+ { "mouserdrag" , KEY_MOUSE_RDRAG },
+ { "mouserdragstart" , KEY_MOUSE_RDRAG_START },
+ { "mouserdragend" , KEY_MOUSE_RDRAG_END }
+};
+
+} // anonymous namespace
+
+uint32_t CMouseTranslator::TranslateCommand(const TiXmlElement *pButton)
+{
+ uint32_t buttonId = 0;
+
+ if (pButton != nullptr)
+ {
+ std::string szKey = pButton->ValueStr();
+ if (!szKey.empty())
+ {
+ StringUtils::ToLower(szKey);
+
+ auto it = MouseKeys.find(szKey);
+ if (it != MouseKeys.end())
+ buttonId = it->second;
+
+ if (buttonId == 0)
+ {
+ CLog::Log(LOGERROR, "Unknown mouse action (%s), skipping", pButton->Value());
+ }
+ else
+ {
+ int id = 0;
+ if ((pButton->QueryIntAttribute("id", &id) == TIXML_SUCCESS))
+ {
+ if (0 <= id && id < MOUSE_MAX_BUTTON)
+ buttonId += id;
+ }
+ }
+ }
+ }
+
+ return buttonId;
+}
+
+bool CMouseTranslator::TranslateEventID(unsigned int eventId, BUTTON_ID &buttonId)
+{
+ switch (eventId)
+ {
+ case XBMC_BUTTON_LEFT:
+ {
+ buttonId = BUTTON_ID::LEFT;
+ return true;
+ }
+ case XBMC_BUTTON_MIDDLE:
+ {
+ buttonId = BUTTON_ID::MIDDLE;
+ return true;
+ }
+ case XBMC_BUTTON_RIGHT:
+ {
+ buttonId = BUTTON_ID::RIGHT;
+ return true;
+ }
+ case XBMC_BUTTON_WHEELUP:
+ {
+ buttonId = BUTTON_ID::WHEEL_UP;
+ return true;
+ }
+ case XBMC_BUTTON_WHEELDOWN:
+ {
+ buttonId = BUTTON_ID::WHEEL_DOWN;
+ return true;
+ }
+ case XBMC_BUTTON_X1:
+ {
+ buttonId = BUTTON_ID::BUTTON4;
+ return true;
+ }
+ case XBMC_BUTTON_X2:
+ {
+ buttonId = BUTTON_ID::BUTTON5;
+ return true;
+ }
+ case XBMC_BUTTON_X3:
+ {
+ buttonId = BUTTON_ID::HORIZ_WHEEL_LEFT;
+ return true;
+ }
+ case XBMC_BUTTON_X4:
+ {
+ buttonId = BUTTON_ID::HORIZ_WHEEL_RIGHT;
+ return true;
+ }
+ default:
+ break;
+ }
+
+ return false;
+}

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseTranslator.h Added

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2017 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 "MouseTypes.h"
+
+#include <stdint.h>
+
+class TiXmlElement;
+
+class CMouseTranslator
+{
+public:
+ /*!
+ * \brief Translate a keymap element to a key ID
+ */
+ static uint32_t TranslateCommand(const TiXmlElement *pButton);
+
+ /*!
+ * \brief Translate a mouse event ID to a mouse button index
+ *
+ * \param eventId The event ID from MouseStat.h
+ * \param[out] buttonId The button ID from MouseTypes.h, or unmodified if unsuccessful
+ *
+ * \return True if successful, false otherwise
+ */
+ static bool TranslateEventID(unsigned int eventId, KODI::MOUSE::BUTTON_ID &buttonId);
+};

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseTypes.h Added

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 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/InputTypes.h"
+
+#include <string>
+
+namespace KODI
+{
+namespace MOUSE
+{
+ /*!
+ * \brief Buttons on a mouse
+ */
+ enum class BUTTON_ID
+ {
+ UNKNOWN,
+ LEFT,
+ RIGHT,
+ MIDDLE,
+ BUTTON4,
+ BUTTON5,
+ WHEEL_UP,
+ WHEEL_DOWN,
+ HORIZ_WHEEL_LEFT,
+ HORIZ_WHEEL_RIGHT,
+ };
+
+ /*!
+ * \brief Name of a mouse button
+ *
+ * Names are defined in the mouse's controller profile.
+ */
+ using ButtonName = std::string;
+
+ /*!
+ * \brief Directions of motion for a mouse pointer
+ */
+ using POINTER_DIRECTION = INPUT::CARDINAL_DIRECTION;
+
+ /*!
+ * \brief Name of the mouse pointer
+ *
+ * Names are defined in the mouse's controller profile.
+ */
+ using PointerName = std::string;
+}
+}

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseWindowingButtonMap.cpp Deleted

@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 "MouseWindowingButtonMap.h"
-#include "input/MouseStat.h"
-
-#include <algorithm>
-
-using namespace KODI;
-using namespace MOUSE;
-
-#define CONTROLLER_PROFILE "game.controller.mouse"
-
-std::vector<std::pair<unsigned int, std::string>> CMouseWindowingButtonMap::m_buttonMap = {
- { XBMC_BUTTON_LEFT, "left" },
- { XBMC_BUTTON_MIDDLE, "middle" },
- { XBMC_BUTTON_RIGHT, "right" },
- { XBMC_BUTTON_WHEELUP, "wheelup" },
- { XBMC_BUTTON_WHEELDOWN, "wheeldown" },
-};
-
-std::string CMouseWindowingButtonMap::m_pointerName = "pointer";
-
-std::string CMouseWindowingButtonMap::ControllerID(void) const
-{
- return CONTROLLER_PROFILE;
-}
-
-bool CMouseWindowingButtonMap::GetButton(unsigned int buttonIndex, std::string& feature)
-{
- auto it = std::find_if(m_buttonMap.begin(), m_buttonMap.end(),
- [buttonIndex](const std::pair<unsigned int, std::string>& entry)
- {
- return entry.first == buttonIndex;
- });
-
- if (it != m_buttonMap.end())
- {
- feature = it->second;
- return true;
- }
-
- return false;
-}
-
-bool CMouseWindowingButtonMap::GetRelativePointer(std::string& feature)
-{
- feature = m_pointerName;
- return true;
-}
-
-bool CMouseWindowingButtonMap::GetButtonIndex(const std::string& feature, unsigned int& buttonIndex)
-{
- auto it = std::find_if(m_buttonMap.begin(), m_buttonMap.end(),
- [&feature](const std::pair<unsigned int, std::string>& entry)
- {
- return entry.second == feature;
- });
-
- if (it != m_buttonMap.end())
- {
- buttonIndex = it->first;
- return true;
- }
- 
- return false;
-}

_service:download_files:master.tar.gz/xbmc/input/mouse/MouseWindowingButtonMap.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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/mouse/interfaces/IMouseButtonMap.h"
-
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace KODI
-{
-namespace MOUSE
-{
- /*!
- * \ingroup mouse
- * \brief Maps mouse windowing events to higher-level features understood by IMouseInputHandler implementations.
- */
- class CMouseWindowingButtonMap : public IMouseButtonMap
- {
- public:
- ~CMouseWindowingButtonMap(void) override = default;
-
- // implementation of IMouseButtonMap
- std::string ControllerID(void) const override;
- bool GetButton(unsigned int buttonIndex, std::string& feature) override;
- bool GetRelativePointer(std::string& feature) override;
- bool GetButtonIndex(const std::string& feature, unsigned int& buttonIndex) override;
-
- private:
- static std::vector<std::pair<unsigned int, std::string>> m_buttonMap;
- static std::string m_pointerName;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/mouse/generic/MouseInputHandling.cpp Changed

@@ -19,30 +19,92 @@
 */
 
 #include "MouseInputHandling.h"
-#include "input/mouse/interfaces/IMouseButtonMap.h"
+#include "input/joysticks/interfaces/IButtonMap.h"
 #include "input/mouse/interfaces/IMouseInputHandler.h"
+#include "input/InputTranslator.h"
 
 using namespace KODI;
 using namespace MOUSE;
 
-CMouseInputHandling::CMouseInputHandling(IMouseInputHandler* handler, IMouseButtonMap* buttonMap) :
+CMouseInputHandling::CMouseInputHandling(IMouseInputHandler* handler, JOYSTICK::IButtonMap* buttonMap) :
 m_handler(handler),
- m_buttonMap(buttonMap),
- m_x(0),
- m_y(0)
+ m_buttonMap(buttonMap)
 {
 }
 
 bool CMouseInputHandling::OnPosition(int x, int y)
 {
+ using namespace JOYSTICK;
+
+ if (!m_bHasPosition)
+ {
+ m_bHasPosition = true;
+ m_x = x;
+ m_y = y;
+ return true;
+ }
+
 int dx = x - m_x;
 int dy = y - m_y;
 
 bool bHandled = false;
 
- std::string featureName;
- if (m_buttonMap->GetRelativePointer(featureName))
- bHandled = m_handler->OnMotion(featureName, dx, dy);
+ // Get direction of motion
+ POINTER_DIRECTION dir = GetPointerDirection(dx, dy);
+
+ CDriverPrimitive source(dir);
+ if (source.IsValid())
+ {
+ // Get pointer in direction of motion
+ PointerName pointerName;
+ if (m_buttonMap->GetFeature(source, pointerName))
+ {
+ // Get orthogonal direction of motion
+ POINTER_DIRECTION dirCCW = GetOrthogonalDirectionCCW(dir);
+
+ // Get mapped directions of motion for rotation and reflection
+ CDriverPrimitive target;
+ CDriverPrimitive targetCCW;
+
+ if (m_buttonMap->GetRelativePointer(pointerName, dir, target))
+ m_buttonMap->GetRelativePointer(pointerName, dirCCW, targetCCW);
+
+ if (target.IsValid())
+ {
+ // Invert y to right-handed cartesian system
+ dy *= -1;
+
+ // Perform rotation
+ int rotation[2][2] = { {1, 0}, {0, 1} };
+
+ GetRotation(dir, target.PointerDirection(), rotation);
+
+ dx = rotation[0][0] * dx + rotation[0][1] * dy;
+ dy = rotation[1][0] * dx + rotation[1][1] * dy;
+
+ if (targetCCW.IsValid())
+ {
+ // Perform reflection
+ int reflection[2][2] = { {1, 0}, {0, 1} };
+
+ GetReflectionCCW(target.PointerDirection(), targetCCW.PointerDirection(), reflection);
+
+ dx = reflection[0][0] * dx + reflection[0][1] * dy;
+ dy = reflection[1][0] * dx + reflection[1][1] * dy;
+ }
+
+ // Invert y back to left-handed coordinate system
+ dy *= -1;
+ }
+
+ bHandled = m_handler->OnMotion(pointerName, dx, dy);
+ }
+ }
+ else
+ {
+ // Don't fall through - might disrupt the game
+ bHandled = true;
+ }
 
 m_x = x;
 m_y = y;
@@ -50,20 +112,244 @@
 return bHandled;
 }
 
-bool CMouseInputHandling::OnButtonPress(unsigned int button)
+bool CMouseInputHandling::OnButtonPress(BUTTON_ID button)
 {
 bool bHandled = false;
 
- std::string featureName;
- if (m_buttonMap->GetButton(button, featureName))
- bHandled = m_handler->OnButtonPress(featureName);
+ JOYSTICK::CDriverPrimitive source(button);
+
+ ButtonName buttonName;
+ if (m_buttonMap->GetFeature(source, buttonName))
+ bHandled = m_handler->OnButtonPress(buttonName);
 
 return bHandled;
 }
 
-void CMouseInputHandling::OnButtonRelease(unsigned int button)
+void CMouseInputHandling::OnButtonRelease(BUTTON_ID button)
+{
+ JOYSTICK::CDriverPrimitive source(button);
+
+ ButtonName buttonName;
+ if (m_buttonMap->GetFeature(source, buttonName))
+ m_handler->OnButtonRelease(buttonName);
+}
+
+POINTER_DIRECTION CMouseInputHandling::GetPointerDirection(int x, int y)
+{
+ using namespace INPUT;
+
+ return CInputTranslator::VectorToCardinalDirection(static_cast<float>(x), static_cast<float>(-y));
+}
+
+POINTER_DIRECTION CMouseInputHandling::GetOrthogonalDirectionCCW(POINTER_DIRECTION direction)
+{
+ switch (direction)
+ {
+ case POINTER_DIRECTION::RIGHT: return POINTER_DIRECTION::UP;
+ case POINTER_DIRECTION::UP: return POINTER_DIRECTION::LEFT;
+ case POINTER_DIRECTION::LEFT: return POINTER_DIRECTION::DOWN;
+ case POINTER_DIRECTION::DOWN: return POINTER_DIRECTION::RIGHT;
+ default:
+ break;
+ }
+
+ return POINTER_DIRECTION::NONE;
+}
+
+void CMouseInputHandling::GetRotation(POINTER_DIRECTION source, POINTER_DIRECTION target, int (&rotation)[2][2])
+{
+ switch (source)
+ {
+ case POINTER_DIRECTION::RIGHT:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::UP:
+ GetRotation(90, rotation);
+ break;
+ case POINTER_DIRECTION::LEFT:
+ GetRotation(180, rotation);
+ break;
+ case POINTER_DIRECTION::DOWN:
+ GetRotation(270, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::UP:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::LEFT:
+ GetRotation(90, rotation);
+ break;
+ case POINTER_DIRECTION::DOWN:
+ GetRotation(180, rotation);
+ break;
+ case POINTER_DIRECTION::RIGHT:
+ GetRotation(270, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::LEFT:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::DOWN:
+ GetRotation(90, rotation);
+ break;
+ case POINTER_DIRECTION::RIGHT:
+ GetRotation(180, rotation);
+ break;
+ case POINTER_DIRECTION::UP:
+ GetRotation(270, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::DOWN:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::RIGHT:
+ GetRotation(90, rotation);
+ break;
+ case POINTER_DIRECTION::UP:
+ GetRotation(180, rotation);
+ break;
+ case POINTER_DIRECTION::LEFT:
+ GetRotation(270, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+void CMouseInputHandling::GetRotation(int deg, int (&rotation)[2][2])
+{
+ switch (deg)
+ {
+ case 90:
+ {
+ rotation[0][0] = 0;
+ rotation[0][1] = -1;
+ rotation[1][0] = 1;
+ rotation[1][1] = 0;
+ break;
+ }
+ case 180:
+ {
+ rotation[0][0] = -1;
+ rotation[0][1] = 0;
+ rotation[1][0] = 0;
+ rotation[1][1] = -1;
+ break;
+ }
+ case 270:
+ {
+ rotation[0][0] = 0;
+ rotation[0][1] = 1;
+ rotation[1][0] = -1;
+ rotation[1][1] = 0;
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+void CMouseInputHandling::GetReflectionCCW(POINTER_DIRECTION source, POINTER_DIRECTION target, int (&rotation)[2][2])
+{
+ switch (source)
+ {
+ case POINTER_DIRECTION::RIGHT:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::DOWN:
+ GetReflection(0, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::UP:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::RIGHT:
+ GetReflection(90, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::LEFT:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::UP:
+ GetReflection(180, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ case POINTER_DIRECTION::DOWN:
+ {
+ switch (target)
+ {
+ case POINTER_DIRECTION::LEFT:
+ GetReflection(270, rotation);
+ break;
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+}
+
+void CMouseInputHandling::GetReflection(int deg, int (&reflection)[2][2])
 {
- std::string featureName;
- if (m_buttonMap->GetButton(button, featureName))
- m_handler->OnButtonRelease(featureName);
+ switch (deg)
+ {
+ case 0:
+ case 180:
+ {
+ reflection[0][0] = 1;
+ reflection[0][1] = 0;
+ reflection[1][0] = 0;
+ reflection[1][1] = -1;
+ break;
+ }
+ case 90:
+ case 270:
+ {
+ reflection[0][0] = -1;
+ reflection[0][1] = 0;
+ reflection[1][0] = 0;
+ reflection[1][1] = 1;
+ break;
+ }
+ default:
+ break;
+ }
 }

_service:download_files:master.tar.gz/xbmc/input/mouse/generic/MouseInputHandling.h Changed

@@ -20,14 +20,18 @@
 #pragma once
 
 #include "input/mouse/interfaces/IMouseDriverHandler.h"
+#include "input/mouse/MouseTypes.h"
 
 namespace KODI
 {
+namespace JOYSTICK
+{
+  class IButtonMap;
+}
+
 namespace MOUSE
 {
   class IMouseInputHandler;
-  class IMouseButtonMap;
-  class CRelativePointer;
 
   /*!
    * \ingroup mouse
@@ -36,23 +40,34 @@
   class CMouseInputHandling : public IMouseDriverHandler
   {
   public:
-    CMouseInputHandling(IMouseInputHandler* handler, IMouseButtonMap* buttonMap);
+    CMouseInputHandling(IMouseInputHandler* handler, JOYSTICK::IButtonMap* buttonMap);
 
     ~CMouseInputHandling(void) override = default;
 
     // implementation of IMouseDriverHandler
     bool OnPosition(int x, int y) override;
-    bool OnButtonPress(unsigned int button) override;
-    void OnButtonRelease(unsigned int button) override;
+    bool OnButtonPress(BUTTON_ID button) override;
+    void OnButtonRelease(BUTTON_ID button) override;
 
   private:
+    // Utility functions
+    static POINTER_DIRECTION GetPointerDirection(int x, int y);
+    static POINTER_DIRECTION GetOrthogonalDirectionCCW(POINTER_DIRECTION direction);
+
+    static void GetRotation(POINTER_DIRECTION source, POINTER_DIRECTION target, int (&rotation)[2][2]);
+    static void GetRotation(int deg, int (&rotation)[2][2]);
+
+    static void GetReflectionCCW(POINTER_DIRECTION source, POINTER_DIRECTION target, int (&reflection)[2][2]);
+    static void GetReflection(int deg, int (&reflection)[2][2]);
+
     // Construction parameters
     IMouseInputHandler* const m_handler;
-    IMouseButtonMap* const    m_buttonMap;
+    JOYSTICK::IButtonMap* const m_buttonMap;
 
     // Mouse parameters
-    int m_x;
-    int m_y;
+    bool m_bHasPosition = false;
+    int m_x = 0;
+    int m_y = 0;
   };
 }
 }

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseButtonMap.h Deleted

@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2016-2017 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 KODI
-{
-namespace MOUSE
-{
- /*!
- * \ingroup mouse
- * \brief Button map interface to translate between the mouse's driver data
- * and its higher-level features.
- */
- class IMouseButtonMap
- {
- public:
- virtual ~IMouseButtonMap(void) = default;
-
- /*!
- * \brief The ID of the controller profile 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 controller profile
- */
- virtual std::string ControllerID(void) const = 0;
-
- /*!
- * \brief Get the name of a button by its index
- *
- * \param buttonIndex The index of the button
- * \param[out] feature The name of the feature with the specified button index
- *
- * \return True if the button index is associated with a feature, false otherwise
- */
- virtual bool GetButton(unsigned int buttonIndex, std::string& feature) = 0;
-
- /*!
- * \brief Get the name of the mouse's relative pointer
- *
- * \param[out] feature The name of the relative pointer
- *
- * \return True if the mouse has a relative pointer, false otherwise
- */
- virtual bool GetRelativePointer(std::string& feature) = 0;
-
- /*!
- * \brief Get the button index for a button
- *
- * \param feature The name of the button
- * \param buttonIndex The resolved button index
- *
- * \return True if the feature resolved to a button index, or false otherwise
- */
- virtual bool GetButtonIndex(const std::string& feature, unsigned int& buttonIndex) = 0;
- };
-}
-}

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseDriverHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseInputHandler.h Changed

@@ -19,6 +19,8 @@
 */
 #pragma once
 
+#include "input/mouse/MouseTypes.h"
+
 #include <string>
 
 namespace KODI
@@ -48,9 +50,12 @@
 * \param dx The relative x coordinate of motion
 * \param dy The relative y coordinate of motion
 *
+ * The mouse uses a left-handed (graphics) cartesian coordinate system.
+ * Positive X is right, positive Y is down.
+ *
 * \return True if the event was handled, otherwise false
 */
- virtual bool OnMotion(const std::string& relpointer, int dx, int dy) = 0;
+ virtual bool OnMotion(const PointerName& relpointer, int dx, int dy) = 0;
 
 /*!
 * \brief A mouse button has been pressed
@@ -59,14 +64,14 @@
 *
 * \return True if the event was handled, otherwise false
 */
- virtual bool OnButtonPress(const std::string& button) = 0;
+ virtual bool OnButtonPress(const ButtonName& button) = 0;
 
 /*!
 * \brief A mouse button has been released
 *
 * \param button The name of the feature being released
 */
- virtual void OnButtonRelease(const std::string& button) = 0;
+ virtual void OnButtonRelease(const ButtonName& button) = 0;
 };
 }
 }

_service:download_files:master.tar.gz/xbmc/input/mouse/interfaces/IMouseInputProvider.h Changed

_service:download_files:master.tar.gz/xbmc/input/remote Added

_service:download_files:master.tar.gz/xbmc/input/remote/IRRemote.h Added

@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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/>.
+ *
+ */
+
+#ifndef XBIRREMOTE_H
+#define XBIRREMOTE_H
+
+#include "system.h"
+
+#define XINPUT_IR_REMOTE_DISPLAY 213
+#define XINPUT_IR_REMOTE_REVERSE 226
+#define XINPUT_IR_REMOTE_PLAY 234
+#define XINPUT_IR_REMOTE_FORWARD 227
+#define XINPUT_IR_REMOTE_SKIP_MINUS 221
+#define XINPUT_IR_REMOTE_STOP 224
+#define XINPUT_IR_REMOTE_PAUSE 230
+#define XINPUT_IR_REMOTE_SKIP_PLUS 223
+#define XINPUT_IR_REMOTE_TITLE 229
+#define XINPUT_IR_REMOTE_INFO 195
+
+#define XINPUT_IR_REMOTE_UP 166
+#define XINPUT_IR_REMOTE_DOWN 167
+#define XINPUT_IR_REMOTE_LEFT 169
+#define XINPUT_IR_REMOTE_RIGHT 168
+
+#define XINPUT_IR_REMOTE_SELECT 11
+#define XINPUT_IR_REMOTE_ENTER 22
+
+#define XINPUT_IR_REMOTE_SUBTITLE 44
+#define XINPUT_IR_REMOTE_LANGUAGE 45
+
+#define XINPUT_IR_REMOTE_MENU 247
+#define XINPUT_IR_REMOTE_BACK 216
+
+#define XINPUT_IR_REMOTE_1 206
+#define XINPUT_IR_REMOTE_2 205
+#define XINPUT_IR_REMOTE_3 204
+#define XINPUT_IR_REMOTE_4 203
+#define XINPUT_IR_REMOTE_5 202
+#define XINPUT_IR_REMOTE_6 201
+#define XINPUT_IR_REMOTE_7 200
+#define XINPUT_IR_REMOTE_8 199
+#define XINPUT_IR_REMOTE_9 198
+#define XINPUT_IR_REMOTE_0 207
+
+// additional keys from the media center extender for xbox remote
+#define XINPUT_IR_REMOTE_POWER 196
+#define XINPUT_IR_REMOTE_MY_TV 49
+#define XINPUT_IR_REMOTE_MY_MUSIC 9
+#define XINPUT_IR_REMOTE_MY_PICTURES 6
+#define XINPUT_IR_REMOTE_MY_VIDEOS 7
+
+#define XINPUT_IR_REMOTE_RECORD 232
+
+#define XINPUT_IR_REMOTE_START 37
+#define XINPUT_IR_REMOTE_VOLUME_PLUS 208
+#define XINPUT_IR_REMOTE_VOLUME_MINUS 209
+#define XINPUT_IR_REMOTE_CHANNEL_PLUS 210
+#define XINPUT_IR_REMOTE_CHANNEL_MINUS 211
+#define XINPUT_IR_REMOTE_MUTE 192
+
+#define XINPUT_IR_REMOTE_RECORDED_TV 101
+#define XINPUT_IR_REMOTE_LIVE_TV 24
+#define XINPUT_IR_REMOTE_STAR 40
+#define XINPUT_IR_REMOTE_HASH 41
+#define XINPUT_IR_REMOTE_CLEAR 249
+
+// additional keys not defined by xbox remotes but present on generic remotes
+#define XINPUT_IR_REMOTE_TELETEXT 250
+#define XINPUT_IR_REMOTE_RED 251
+#define XINPUT_IR_REMOTE_GREEN 252
+#define XINPUT_IR_REMOTE_YELLOW 253
+#define XINPUT_IR_REMOTE_BLUE 254
+#define XINPUT_IR_REMOTE_PLAYLIST 255
+#define XINPUT_IR_REMOTE_GUIDE 50
+
+#define XINPUT_IR_REMOTE_LIVE_RADIO 248
+#define XINPUT_IR_REMOTE_EPG_SEARCH 246
+
+#define XINPUT_IR_REMOTE_EJECT 235
+#define XINPUT_IR_REMOTE_CONTENTS_MENU 236
+#define XINPUT_IR_REMOTE_ROOT_MENU 237
+#define XINPUT_IR_REMOTE_TOP_MENU 238
+#define XINPUT_IR_REMOTE_DVD_MENU 239
+
+#define XINPUT_IR_REMOTE_PRINT 240
+
+// Reserved 256 -> ...
+// Key.h
+// KEY_BUTTON_*
+
+typedef struct _XINPUT_IR_REMOTE
+{
+ unsigned char wButtons;
+ unsigned char region; // just a guess
+ unsigned char counter; // some value that is changing while a button is pressed... could be the state of the buffer
+ unsigned char firstEvent; // > 0 - first event triggered after a button was pressed on the remote; 0 - not first event
+}
+XINPUT_IR_REMOTE, *PIR_REMOTE;
+
+
+#endif

_service:download_files:master.tar.gz/xbmc/input/remote/IRemoteControl.h Added

@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2018 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 <stdint.h>
+
+namespace KODI
+{
+ namespace REMOTE
+ {
+/*!
+ * \brief Interface for remote control
+ */
+class IRemoteControl
+{
+public:
+ virtual ~IRemoteControl() = default;
+
+ /*!
+ * \brief Get IR mappings file name
+ */
+ virtual std::string GetMapFile() = 0;
+
+ /*!
+ * \brief Call once during input manager initialization
+ */
+ virtual void Initialize() = 0;
+
+ /*!
+ * \brief Deinitialize remote control
+ */
+ virtual void Disconnect() = 0;
+
+ /*!
+ * \brief Get the button code read from IR
+ * All codes are defined into IRRemote.h
+ *
+ * \return A predefined button code from IRRemote.h
+ */
+ virtual uint16_t GetButton() const = 0;
+
+ /*!
+ * \brief Get the time in milliseconds while a button was hold
+ *
+ * \return A hold time in milliseconds
+ */
+ virtual uint32_t GetHoldTimeMs() const = 0;
+
+ /*!
+ * \brief Update button state 
+ */
+ virtual void Update() = 0;
+
+ /*!
+ * \brief Reset button state 
+ */
+ virtual void Reset() = 0;
+
+ /*!
+ * \brief Get the initialized status
+ */
+ virtual bool IsInitialized() const = 0;
+
+ /*!
+ * \brief Set enabled status
+ */
+ virtual void SetEnabled(bool bEnabled) = 0;
+
+ /*!
+ * \brief Set a name for a device
+ */
+ virtual void SetDeviceName(const std::string& name) = 0;
+
+ /*!
+ * \brief Add a command to send to a bus
+ */
+ virtual void AddSendCommand(const std::string& command) = 0;
+
+ /*!
+ * \brief Get the in-use status
+ */
+ virtual bool IsInUse() const = 0;
+};
+ }
+}

_service:download_files:master.tar.gz/xbmc/input/touch/ITouchActionHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/ITouchInputHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/ITouchInputHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/ITouchInputHandling.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/TouchTypes.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchActionHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchActionHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchInputHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchInputHandler.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchPinchDetector.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchRotateDetector.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/GenericTouchSwipeDetector.h Changed

_service:download_files:master.tar.gz/xbmc/input/touch/generic/IGenericTouchGestureDetector.h Changed

_service:download_files:master.tar.gz/xbmc/input/windows Deleted

_service:download_files:master.tar.gz/xbmc/input/windows/IRServerSuite.cpp Deleted

@@ -1,482 +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 "IRServerSuite.h"
-#include "IrssMessage.h"
-#include "input/InputManager.h"
-#include "utils/log.h"
-#include "ServiceBroker.h"
-#include <Ws2tcpip.h>
-
-#define IRSS_PORT 24000
-
-CRemoteControl::CRemoteControl()
- : CThread("RemoteControl")
- , m_button(0)
- , m_bInitialized(false)
- , m_socket(INVALID_SOCKET)
- , m_isConnecting(false)
-{
-}
-
-CRemoteControl::~CRemoteControl()
-{
- Disconnect();
-}
-
-void CRemoteControl::Disconnect()
-{
- m_event.Set();
-
- StopThread();
- Close();
-}
-
-void CRemoteControl::Close()
-{
- m_isConnecting = false;
- if (m_socket != INVALID_SOCKET)
- {
- if (m_bInitialized)
- {
- m_bInitialized = false;
- CIrssMessage message(IRSSMT_UnregisterClient, IRSSMF_Request | IRSSMF_ForceNotRespond);
- SendPacket(message);
- }
- shutdown(m_socket, SD_BOTH);
- closesocket(m_socket);
- m_socket = INVALID_SOCKET;
- }
-}
-
-void CRemoteControl::Reset()
-{
- m_button = 0;
-}
-
-void CRemoteControl::Initialize()
-{
- if (m_isConnecting || m_bInitialized || IsRunning())
- return;
- //trying to connect when there is nothing to connect to is kinda slow so kick it off in a thread.
- Create();
-}
-
-void CRemoteControl::Process()
-{
- unsigned int iMsRetryDelay = 5000;
- int iAttempt = 0;
- // try to connect 60 times @ a 5 second interval (5 minutes)
- // multiple tries because irss service might be up and running a little later then xbmc on boot.
- while (!m_bStop && iAttempt <= 60)
- {
- if (Connect(iAttempt == 0))
- break;
-
- if(iAttempt == 0)
- CLog::Log(LOGINFO, "CRemoteControl::Process - failed to connect to irss, will keep retrying every %d seconds", iMsRetryDelay / 1000);
-
- ++iAttempt;
- 
- if (AbortableWait(m_event, iMsRetryDelay) == WAIT_INTERRUPTED)
- break;
- }
-}
-
-bool CRemoteControl::Connect(bool logMessages)
-{
- char namebuf[NI_MAXHOST], portbuf[NI_MAXSERV];
- struct addrinfo hints = {};
- struct addrinfo *result, *addr;
- char service[33];
- int res;
-
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_protocol = IPPROTO_TCP;
- sprintf(service, "%d", IRSS_PORT);
-
- res = getaddrinfo("localhost", service, &hints, &result);
- if(res)
- {
- if (logMessages)
- CLog::Log(LOGDEBUG, "CRemoteControl::Connect - getaddrinfo failed: %s", gai_strerror(res));
- return false;
- }
-
- for(addr = result; addr; addr = addr->ai_next)
- {
- if(getnameinfo(addr->ai_addr, addr->ai_addrlen, namebuf, sizeof(namebuf), portbuf, sizeof(portbuf),NI_NUMERICHOST))
- {
- strcpy(namebuf, "[unknown]");
- strcpy(portbuf, "[unknown]");
- }
-
- if (logMessages)
- CLog::Log(LOGDEBUG, "CRemoteControl::Connect - connecting to: %s:%s ...", namebuf, portbuf);
-
- m_socket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
- if(m_socket == INVALID_SOCKET)
- continue;
-
- if(connect(m_socket, addr->ai_addr, addr->ai_addrlen) != SOCKET_ERROR)
- break;
-
- closesocket(m_socket);
- m_socket = INVALID_SOCKET;
- }
-
- freeaddrinfo(result);
- if(m_socket == INVALID_SOCKET)
- {
- if (logMessages)
- CLog::Log(LOGDEBUG, "CRemoteControl::Connect - failed to connect");
- Close();
- return false;
- }
-
- u_long iMode = 1; //non-blocking
- if (ioctlsocket(m_socket, FIONBIO, &iMode) == SOCKET_ERROR)
- {
- if (logMessages)
- CLog::Log(LOGERROR, "IRServerSuite: failed to set socket to non-blocking.");
- Close();
- return false;
- }
-
- //register
- CIrssMessage mess(IRSSMT_RegisterClient, IRSSMF_Request);
- if (!SendPacket(mess))
- {
- if (logMessages)
- CLog::Log(LOGERROR, "IRServerSuite: failed to send RegisterClient packet.");
- return false;
- }
- m_isConnecting = true;
- return true;
-}
-
-bool CRemoteControl::SendPacket(CIrssMessage& message)
-{
- int iSize = 0;
- char* bytes = message.ToBytes(iSize);
- char buffer[4];
- uint32_t len = htonl(iSize);
- memcpy(&buffer[0], &len, 4);
- bool bResult = WriteN(&buffer[0], 4);
- if (bResult)
- {
- bResult = WriteN(bytes, iSize);
- }
- delete[] bytes;
- if (!bResult)
- {
- Close();
- return false;
- }
- return true;
-}
-
-
-void CRemoteControl::Update()
-{
- if ((!m_bInitialized && !m_isConnecting) || (m_socket == INVALID_SOCKET))
- {
- return;
- }
-
- CIrssMessage mess;
- if (!ReadPacket(mess))
- {
- return;
- }
- switch (mess.GetType())
- {
- case IRSSMT_RegisterClient:
- m_isConnecting = false;
- if ((mess.GetFlags() & IRSSMF_Success) != IRSSMF_Success)
- {
- //uh oh, it failed to register
- Close();
- CLog::Log(LOGERROR, "IRServerSuite: failed to register XBMC as a client.");
- }
- else
- {
- m_bInitialized = true;
- //request info about receivers
- CIrssMessage mess(IRSSMT_DetectedReceivers, IRSSMF_Request);
- if (!SendPacket(mess))
- {
- CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
- }
- mess.SetType(IRSSMT_AvailableReceivers);
- if (!SendPacket(mess))
- {
- CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
- }
- mess.SetType(IRSSMT_ActiveReceivers);
- if (!SendPacket(mess))
- {
- CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
- }
- }
- break;
- case IRSSMT_RemoteEvent:
- HandleRemoteEvent(mess);
- break;
- case IRSSMT_Error:
- //I suppose the errormessage is in the packet somewhere...
- CLog::Log(LOGERROR, "IRServerSuite: we got an error message.");
- break;
- case IRSSMT_ServerShutdown:
- Close();
- break;
- case IRSSMT_ServerSuspend:
- //should we do something?
- break;
- case IRSSMT_ServerResume:
- //should we do something?
- break;
- case IRSSMT_AvailableReceivers:
- {
- uint32_t size = mess.GetDataSize();
- if (size > 0)
- {
- char* data = mess.GetData();
- char* availablereceivers = new char[size + 1];
- memcpy(availablereceivers, data, size);
- availablereceivers[size] = '\0';
- CLog::Log(LOGINFO, "IRServerSuite: Available receivers: %s", availablereceivers);
- delete[] availablereceivers;
- }
- }
- break;
- case IRSSMT_DetectedReceivers:
- {
- uint32_t size = mess.GetDataSize();
- if (size > 0)
- {
- char* data = mess.GetData();
- char* detectedreceivers = new char[size + 1];
- memcpy(detectedreceivers, data, size);
- detectedreceivers[size] = '\0';
- CLog::Log(LOGINFO, "IRServerSuite: Detected receivers: %s", detectedreceivers);
- delete[] detectedreceivers;
- }
- }
- break;
- case IRSSMT_ActiveReceivers:
- {
- uint32_t size = mess.GetDataSize();
- if (size > 0)
- {
- char* data = mess.GetData();
- char* activereceivers = new char[size + 1];
- memcpy(activereceivers, data, size);
- activereceivers[size] = '\0';
- CLog::Log(LOGINFO, "IRServerSuite: Active receivers: %s", activereceivers);
- delete[] activereceivers;
- }
- }
- break;
- }
-}
-
-bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
-{
- try
- {
- //flag should be notify, maybe check it?
- char* data = message.GetData();
- uint32_t datalen = message.GetDataSize();
- char* deviceName;
- char* keycode;
- uint32_t devicenamelength;
- uint32_t keycodelength;
- if (datalen == 0)
- {
- CLog::Log(LOGERROR, "IRServerSuite: no data in remote message.");
- return false;
- }
- if (datalen <= 8)
- {
- //seems to be version 1.0.4.1, only keycode is sent, use Microsoft MCE mapping??
- devicenamelength = 13;
- deviceName = new char[devicenamelength + 1];
- sprintf(deviceName, "Microsoft MCE");
- keycodelength = datalen;
- keycode = new char[keycodelength + 1];
- memcpy(keycode, data, keycodelength);
- }
- else
- {
- //first 4 bytes is devicename length
- memcpy(&devicenamelength, data, 4);
- //devicename itself
- if (datalen < 4 + devicenamelength)
- {
- CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
- return false;
- }
- deviceName = new char[devicenamelength + 1];
- memcpy(deviceName, data + 4, devicenamelength);
- if (datalen < 8 + devicenamelength)
- {
- CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
- delete[] deviceName;
- return false;
- }
- //next 4 bytes is keycode length
- memcpy(&keycodelength, data + 4 + devicenamelength, 4);
- //keycode itself
- if (datalen < 8 + devicenamelength + keycodelength)
- {
- CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
- delete[] deviceName;
- return false;
- }
- keycode = new char[keycodelength + 1];
- memcpy(keycode, data + 8 + devicenamelength, keycodelength);
- }
- deviceName[devicenamelength] = '\0';
- keycode[keycodelength] = '\0';
- //translate to a buttoncode xbmc understands
- m_button = CServiceBroker::GetInputManager().TranslateLircRemoteString(deviceName, keycode);
- CLog::Log(LOGDEBUG, "IRServerSuite, RemoteEvent: %s %s", deviceName, keycode);
-
- delete[] deviceName;
- delete[] keycode;
- return true;
- }
- catch(...)
- {
- CLog::Log(LOGERROR, "IRServerSuite: exception while processing RemoteEvent.");
- return false;
- }
-}
-
-int CRemoteControl::ReadN(char *buffer, int n)
-{
- int nOriginalSize = n;
- memset(buffer, 0, n);
- char *ptr = buffer;
- while (n > 0)
- {
- int nBytes = 0;
- nBytes = recv(m_socket, ptr, n, 0);
-
- if (WSAGetLastError() == WSAEWOULDBLOCK)
- {
- return nOriginalSize - n;
- }
- if (nBytes < 0)
- {
- if (!m_isConnecting)
- {
- CLog::Log(LOGERROR, "%s, IRServerSuite recv error %d", __FUNCTION__, GetLastError());
- }
- Close();
- return -1;
- }
-
- if (nBytes == 0)
- {
- CLog::Log(LOGDEBUG,"%s, IRServerSuite socket closed by server", __FUNCTION__);
- Close();
- break;
- }
-
- n -= nBytes;
- ptr += nBytes;
- }
-
- return nOriginalSize - n;
-}
-
-bool CRemoteControl::WriteN(const char *buffer, int n)
-{
- const char *ptr = buffer;
- while (n > 0)
- {
- int nBytes = send(m_socket, ptr, n, 0);
- if (nBytes < 0)
- {
- CLog::Log(LOGERROR, "%s, IRServerSuite send error %d (%d bytes)", __FUNCTION__, GetLastError(), n);
- Close();
- return false;
- }
-
- if (nBytes == 0)
- break;
-
- n -= nBytes;
- ptr += nBytes;
- }
-
- return n == 0;
-}
-
-bool CRemoteControl::ReadPacket(CIrssMessage &message)
-{
- try
- {
- char sizebuf[4];
- int iRead = ReadN(&sizebuf[0], 4);
- if (iRead <= 0) return false; //nothing to read
- if (iRead != 4)
- {
- CLog::Log(LOGERROR, "IRServerSuite: failed to read packetsize.");
- return false;
- }
- uint32_t size = 0;
- memcpy(&size, &sizebuf[0], 4);
- size = ntohl(size);
- char* messagebytes = new char[size];
- if (ReadN(messagebytes, size) != size)
- {
- CLog::Log(LOGERROR, "IRServerSuite: failed to read packet.");
- delete[] messagebytes;
- return false;
- }
- if (!CIrssMessage::FromBytes(messagebytes, size, message))
- {
- CLog::Log(LOGERROR, "IRServerSuite: invalid packet received (size: %u).", size);
- delete[] messagebytes;
- return false;
- }
- delete[] messagebytes;
- return true;
- }
- catch(...)
- {
- CLog::Log(LOGERROR, "IRServerSuite: exception while processing packet.");
- return false;
- }
-}
-
-WORD CRemoteControl::GetButton()
-{
- return m_button;
-}
-
-unsigned int CRemoteControl::GetHoldTime() const
-{
- return 0;
-}

_service:download_files:master.tar.gz/xbmc/input/windows/IRServerSuite.h Deleted

@@ -1,68 +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/>.
- *
- */
-
-#include <winsock2.h>
-#include <string>
-
-#include "IrssMessage.h"
-#include "threads/Thread.h"
-#include "threads/Event.h"
-
-class CRemoteControl : CThread
-{
-public:
- CRemoteControl();
- virtual ~CRemoteControl();
- void Initialize();
- void Disconnect();
- void Reset();
- void Update();
- WORD GetButton();
- unsigned int GetHoldTime() const;
- bool IsInitialized() {return m_bInitialized;}
-
- //lirc stuff, not implemented
- bool IsInUse() {return false;}
- void SetEnabled(bool) { }
- void SetDeviceName(const std::string&) { }
- void AddSendCommand(const std::string&) {}
-
-protected:
- virtual void Process();
-
-private:
- WORD m_button;
- bool m_bInitialized;
- SOCKET m_socket;
- bool m_isConnecting;
- std::string m_deviceName;
- std::string m_keyCode;
- CEvent m_event;
-
- bool SendPacket(CIrssMessage& message);
- bool ReadPacket(CIrssMessage& message);
- int ReadN(char *buffer, int n);
- bool WriteN(const char *buffer, int n);
- bool Connect(bool logMessages);
- void Close();
-
- bool HandleRemoteEvent(CIrssMessage& message);
-};

_service:download_files:master.tar.gz/xbmc/input/windows/IrssMessage.cpp Deleted

@@ -1,145 +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 "IrssMessage.h"
-
-CIrssMessage::CIrssMessage()
-{
- m_type = IRSSMT_Unknown;
- m_flags = 0;
- m_data = NULL;
- m_dataSize = 0;
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags)
-{
- m_type = type;
- m_flags = flags;
- m_data = NULL;
- m_dataSize = 0;
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size)
-{
- m_type = type;
- m_flags = flags;
- SetDataAsBytes(data, size);
-}
-
-CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, const std::string& data)
-{
- m_type = type;
- m_flags = flags;
- SetDataAsString(data);
-}
-
-CIrssMessage::~CIrssMessage()
-{
- FreeData();
-}
-
-void CIrssMessage::SetDataAsBytes(char* data, int size)
-{
- if (!data)
- {
- FreeData();
- }
- else
- {
- m_data = (char*)malloc(size * sizeof(char));
- memcpy(m_data, data, size);
- m_dataSize = size;
- }
-}
-
-void CIrssMessage::SetDataAsString(const std::string& data)
-{
- if (data.empty())
- {
- FreeData();
- }
- else
- {
- m_data = strdup(data.c_str());
- m_dataSize = strlen(data.c_str());
- }
-}
-
-void CIrssMessage::FreeData()
-{
- free(m_data);
- m_data = NULL;
- m_dataSize = 0;
-}
-
-char* CIrssMessage::ToBytes(int& size)
-{
- int dataLength = 0;
- if (m_data)
- {
- dataLength = m_dataSize;
- }
-
- size = 8 + dataLength;
- char* byteArray = new char[size];
-
- memcpy(&byteArray[0], &m_type, 4);
- memcpy(&byteArray[4], &m_flags, 4);
-
- if (m_data)
- {
- memcpy(&byteArray[8], &m_data, m_dataSize);
- }
-
- return byteArray;
-}
-
-bool CIrssMessage::FromBytes(char* from, int size, CIrssMessage& message)
-{
- if (!from)
- return false;
-
- if (size < 8)
- return false;
-
- //IRSS_MessageType type = (MessageType)BitConverter.ToInt32(from, 0);
- //IRSS_MessageFlags flags = (MessageFlags)BitConverter.ToInt32(from, 4);
- uint32_t type;
- memcpy(&type, from, 4);
- uint32_t flags;
- memcpy(&flags, from + 4, 4);
-
- message.SetType((IRSS_MessageType)type);
- message.SetFlags(flags);
- if (size > 8)
- {
- message.SetDataAsBytes(from + 8, size - 8);
- }
- return true;
-}
-
-void CIrssMessage::SetType(IRSS_MessageType type)
-{
- m_type = type;
-}
-void CIrssMessage::SetFlags(uint32_t flags)
-{
- m_flags = flags;
-}

_service:download_files:master.tar.gz/xbmc/input/windows/IrssMessage.h Deleted

@@ -1,208 +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/>.
- *
- */
-
-#include <string>
-
- /// <summary>
- /// Type of message.
- /// </summary>
- enum IRSS_MessageType
- {
- /// <summary>
- /// Unknown message type.
- /// </summary>
- IRSSMT_Unknown = 0,
-
- /// <summary>
- /// Register Client.
- /// </summary>
- IRSSMT_RegisterClient = 1,
- /// <summary>
- /// Unregister Client.
- /// </summary>
- IRSSMT_UnregisterClient = 2,
-
- /// <summary>
- /// Register Repeater.
- /// </summary>
- IRSSMT_RegisterRepeater = 3,
- /// <summary>
- /// Unregister Repeater.
- /// </summary>
- IRSSMT_UnregisterRepeater = 4,
-
- /// <summary>
- /// Learn IR Command.
- /// </summary>
- IRSSMT_LearnIR = 5,
- /// <summary>
- /// Blast IR Command.
- /// </summary>
- IRSSMT_BlastIR = 6,
-
- /// <summary>
- /// Error.
- /// </summary>
- IRSSMT_Error = 7,
-
- /// <summary>
- /// Server Shutdown.
- /// </summary>
- IRSSMT_ServerShutdown = 8,
- /// <summary>
- /// Server Suspend.
- /// </summary>
- IRSSMT_ServerSuspend = 9,
- /// <summary>
- /// Server Resume
- /// </summary>
- IRSSMT_ServerResume = 10,
-
- /// <summary>
- /// Remote Event.
- /// </summary>
- IRSSMT_RemoteEvent = 11,
- /// <summary>
- /// Keyboard Event.
- /// </summary>
- IRSSMT_KeyboardEvent = 12,
- /// <summary>
- /// Mouse Event.
- /// </summary>
- IRSSMT_MouseEvent = 13,
-
- /// <summary>
- /// Forward a Remote Event.
- /// </summary>
- IRSSMT_ForwardRemoteEvent = 14,
- /// <summary>
- /// Forward a Keyboard Event.
- /// </summary>
- IRSSMT_ForwardKeyboardEvent = 15,
- /// <summary>
- /// Forward a Mouse Event.
- /// </summary>
- IRSSMT_ForwardMouseEvent = 16,
-
- /// <summary>
- /// Available Receivers.
- /// </summary>
- IRSSMT_AvailableReceivers = 17,
- /// <summary>
- /// Available Blasters.
- /// </summary>
- IRSSMT_AvailableBlasters = 18,
- /// <summary>
- /// Active Receivers.
- /// </summary>
- IRSSMT_ActiveReceivers = 19,
- /// <summary>
- /// Active Blasters.
- /// </summary>
- IRSSMT_ActiveBlasters = 20,
- /// <summary>
- /// Detected Receivers.
- /// </summary>
- IRSSMT_DetectedReceivers = 21,
- /// <summary>
- /// Detected Blasters.
- /// </summary>
- IRSSMT_DetectedBlasters = 22,
- };
-
- /// <summary>
- /// Flags to determine more information about the message.
- /// </summary>
- enum IRSS_MessageFlags
- {
- /// <summary>
- /// No Flags.
- /// </summary>
- IRSSMF_None = 0x0000,
-
- /// <summary>
- /// Message is a Request.
- /// </summary>
- IRSSMF_Request = 0x0001,
- /// <summary>
- /// Message is a Response to a received Message.
- /// </summary>
- IRSSMF_Response = 0x0002,
- /// <summary>
- /// Message is a Notification.
- /// </summary>
- IRSSMF_Notify = 0x0004,
-
- /// <summary>
- /// Operation Success.
- /// </summary>
- IRSSMF_Success = 0x0008,
- /// <summary>
- /// Operation Failure.
- /// </summary>
- IRSSMF_Failure = 0x0010,
- /// <summary>
- /// Operation Time-Out.
- /// </summary>
- IRSSMF_Timeout = 0x0020,
-
- //IRSSMF_Error = 0x0040,
-
- //IRSSMF_DataString = 0x0080,
- //IRSSMF_DataBytes = 0x0100,
-
- //IRSSMF_ForceRespond = 0x0200,
-
- /// <summary>
- /// Force the recipient not to respond.
- /// </summary>
- IRSSMF_ForceNotRespond = 0x0400,
- };
-
-class CIrssMessage
-{
-public:
- CIrssMessage();
- CIrssMessage(IRSS_MessageType type, uint32_t flags);
- CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size);
- CIrssMessage(IRSS_MessageType type, uint32_t flags, const std::string& data);
- ~CIrssMessage();
-
- void SetDataAsBytes(char* data, int size);
- void SetDataAsString(const std::string& data);
- char* ToBytes(int& size);
- void SetType(IRSS_MessageType type);
- void SetFlags(uint32_t flags);
- IRSS_MessageType GetType() {return m_type;}
- uint32_t GetFlags() {return m_flags;}
- char* GetData() {return m_data;}
- uint32_t GetDataSize() {return m_dataSize;}
- static bool FromBytes(char* from, int size, CIrssMessage& message);
-
-private:
- IRSS_MessageType m_type;
- uint32_t m_flags;
-
- char* m_data;
- int m_dataSize;
-
- void FreeData();
-};

_service:download_files:master.tar.gz/xbmc/interfaces/AnnouncementManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/AnnouncementManager.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/IActionListener.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/IAnnouncer.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/AddonBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/AddonBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/AndroidBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/AndroidBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/ApplicationBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/ApplicationBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/Builtins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/Builtins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/CECBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/CECBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/GUIBuiltins.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -139,7 +139,7 @@
 unsigned int iPtr = 1;
 while (params.size() > iPtr + 1)
 {
- CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(),
+ CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetActiveWindowOrDialog(),
 atol(params[iPtr].c_str()),
 (params.size() >= iPtr + 2) ? atol(params[iPtr + 1].c_str())+1 : 0);
 g_windowManager.SendMessage(msg);
@@ -229,7 +229,7 @@
 */
 static int ClearProperty(const std::vector<std::string>& params)
 {
- CGUIWindow *window = g_windowManager.GetWindow(params.size() > 1 ? CWindowTranslator::TranslateWindow(params[1]) : g_windowManager.GetFocusedWindow());
+ CGUIWindow *window = g_windowManager.GetWindow(params.size() > 1 ? CWindowTranslator::TranslateWindow(params[1]) : g_windowManager.GetActiveWindowOrDialog());
 if (window)
 window->SetProperty(params[0],"");
 
@@ -379,7 +379,7 @@
 */
 static int SetProperty(const std::vector<std::string>& params)
 {
- CGUIWindow *window = g_windowManager.GetWindow(params.size() > 2 ? CWindowTranslator::TranslateWindow(params[2]) : g_windowManager.GetFocusedWindow());
+ CGUIWindow *window = g_windowManager.GetWindow(params.size() > 2 ? CWindowTranslator::TranslateWindow(params[2]) : g_windowManager.GetActiveWindowOrDialog());
 if (window)
 window->SetProperty(params[0],params[1]);

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/GUIBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/GUIContainerBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/GUIControlBuiltins.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -31,7 +31,7 @@
 */
 static int ControlMove(const std::vector<std::string>& params)
 {
- CGUIMessage message(GUI_MSG_MOVE_OFFSET, g_windowManager.GetFocusedWindow(),
+ CGUIMessage message(GUI_MSG_MOVE_OFFSET, g_windowManager.GetActiveWindowOrDialog(),
 atoi(params[0].c_str()), atoi(params[1].c_str()));
 g_windowManager.SendMessage(message);
 
@@ -54,7 +54,7 @@
 }
 else
 { // single param - assume you meant the focused window
- CGUIMessage message(GUI_MSG_CLICKED, atoi(params[0].c_str()), g_windowManager.GetFocusedWindow());
+ CGUIMessage message(GUI_MSG_CLICKED, atoi(params[0].c_str()), g_windowManager.GetActiveWindowOrDialog());
 g_windowManager.SendMessage(message);
 }
 
@@ -98,7 +98,7 @@
 int absID = 0;
 if (params.size() > 2 && StringUtils::EqualsNoCase(params[2].c_str(), "absolute"))
 absID = 1;
- CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(), controlID, subItem, absID);
+ CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetActiveWindowOrDialog(), controlID, subItem, absID);
 g_windowManager.SendMessage(msg);
 
 return 0;
@@ -114,7 +114,7 @@
 static int ShiftPage(const std::vector<std::string>& params)
 {
 int id = atoi(params[0].c_str());
- CGUIMessage message(Message, g_windowManager.GetFocusedWindow(), id);
+ CGUIMessage message(Message, g_windowManager.GetActiveWindowOrDialog(), id);
 g_windowManager.SendMessage(message);
 
 return 0;

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/GUIControlBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/LibraryBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/LibraryBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/OpticalBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/OpticalBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PVRBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PVRBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PictureBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PictureBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PlayerBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/PlayerBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/ProfileBuiltins.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -45,11 +45,13 @@
 */
 static int LoadProfile(const std::vector<std::string>& params)
 {
- int index = CProfilesManager::GetInstance().GetProfileIndex(params[0]);
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ int index = profileManager.GetProfileIndex(params[0]);
 bool prompt = (params.size() == 2 && StringUtils::EqualsNoCase(params[1], "prompt"));
 bool bCanceled;
 if (index >= 0
- && (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE
+ && (profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE
 || g_passwordManager.IsProfileLockUnlocked(index,bCanceled,prompt)))
 {
 CApplicationMessenger::GetInstance().PostMsg(TMSG_LOADPROFILE, index);
@@ -77,7 +79,11 @@
 CVideoLibraryQueue::GetInstance().CancelAllJobs();
 
 CServiceBroker::GetNetwork().NetworkMessage(CNetwork::SERVICES_DOWN,1);
- CProfilesManager::GetInstance().LoadMasterProfileForLogin();
+
+
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+ profileManager.LoadMasterProfileForLogin();
+
 g_passwordManager.bMasterUser = false;
 
 g_application.WakeUpScreenSaverAndDPMS();

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/ProfileBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/SkinBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/SystemBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/SystemBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/WeatherBuiltins.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/builtins/WeatherBuiltins.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ILanguageInvocationHandler.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ILanguageInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ILanguageInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/LanguageInvokerThread.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/LanguageInvokerThread.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ScriptInvocationManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/generic/ScriptInvocationManager.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/info/InfoBool.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/info/InfoBool.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/info/InfoExpression.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/info/InfoExpression.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/info/SkinVariable.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/AddonsOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/AddonsOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/ApplicationOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/ApplicationOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/AudioLibrary.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/AudioLibrary.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FavouritesOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FavouritesOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FileItemHandler.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FileOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/FileOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/GUIOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/GUIOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/IClient.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/IJSONRPCAnnouncer.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/ITransportLayer.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/InputOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/InputOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONRPC.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONRPCUtils.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONServiceDescription.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/JSONUtils.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PVROperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PVROperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PlayerOperations.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -82,20 +82,22 @@
 
 JSONRPC_STATUS CPlayerOperations::GetPlayers(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 std::string media = parameterObject["media"].asString();
 result = CVariant(CVariant::VariantTypeArray);
 std::vector<std::string> players;
 
 if (media == "all")
 {
- CPlayerCoreFactory::GetInstance().GetPlayers(players);
+ playerCoreFactory.GetPlayers(players);
 }
 else
 {
 bool video = false;
 if (media == "video")
 video = true;
- CPlayerCoreFactory::GetInstance().GetPlayers(players, true, video);
+ playerCoreFactory.GetPlayers(players, true, video);
 }
 
 for (auto playername: players)
@@ -103,9 +105,9 @@
 CVariant player(CVariant::VariantTypeObject);
 player["name"] = playername;
 
- player["playsvideo"] = CPlayerCoreFactory::GetInstance().PlaysVideo(playername);
- player["playsaudio"] = CPlayerCoreFactory::GetInstance().PlaysAudio(playername);
- player["type"] = CPlayerCoreFactory::GetInstance().GetPlayerType(playername);
+ player["playsvideo"] = playerCoreFactory.PlaysVideo(playername);
+ player["playsaudio"] = playerCoreFactory.PlaysAudio(playername);
+ player["type"] = playerCoreFactory.GetPlayerType(playername);
 
 result.push_back(player);
 }
@@ -643,13 +645,16 @@
 
 if (playername != "default")
 {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 // check if the there's actually a player with the given name
- if (CPlayerCoreFactory::GetInstance().GetPlayerType(playername).empty())
+ if (playerCoreFactory.GetPlayerType(playername).empty())
 return InvalidParams;
 
 // check if the player can handle at least the first item in the list
 std::vector<std::string> possiblePlayers;
- CPlayerCoreFactory::GetInstance().GetPlayers(*list.Get(0).get(), possiblePlayers);
+ playerCoreFactory.GetPlayers(*list.Get(0).get(), possiblePlayers);
+
 bool match = false;
 for (auto entry : possiblePlayers)
 {

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PlayerOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PlaylistOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/PlaylistOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/ProfilesOperations.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,17 +24,20 @@
 #include "profiles/ProfilesManager.h"
 #include "utils/md5.h"
 #include "utils/Variant.h"
+#include "ServiceBroker.h"
 
 using namespace JSONRPC;
 using namespace KODI::MESSAGING;
 
 JSONRPC_STATUS CProfilesOperations::GetProfiles(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 CFileItemList listItems;
 
- for (unsigned int i = 0; i < CProfilesManager::GetInstance().GetNumberOfProfiles(); ++i)
+ for (unsigned int i = 0; i < profileManager.GetNumberOfProfiles(); ++i)
 {
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(i);
+ const CProfile *profile = profileManager.GetProfile(i);
 CFileItemPtr item(new CFileItem(profile->getName()));
 item->SetArt("thumb", profile->getThumb());
 listItems.Add(item);
@@ -50,11 +53,11 @@
 for (CVariant::iterator_array profileiter = result["profiles"].begin_array(); profileiter != result["profiles"].end_array(); ++profileiter)
 {
 std::string profilename = (*profileiter)["label"].asString();
- int index = CProfilesManager::GetInstance().GetProfileIndex(profilename);
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(index);
+ int index = profileManager.GetProfileIndex(profilename);
+ const CProfile *profile = profileManager.GetProfile(index);
 LockType locktype = LOCK_MODE_UNKNOWN;
 if (index == 0)
- locktype = CProfilesManager::GetInstance().GetMasterProfile().getLockMode();
+ locktype = profileManager.GetMasterProfile().getLockMode();
 else
 locktype = profile->getLockMode();
 (*profileiter)["lockmode"] = locktype;
@@ -67,7 +70,9 @@
 
 JSONRPC_STATUS CProfilesOperations::GetCurrentProfile(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
- const CProfile& currentProfile = CProfilesManager::GetInstance().GetCurrentProfile();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ const CProfile& currentProfile = profileManager.GetCurrentProfile();
 CVariant profileVariant = CVariant(CVariant::VariantTypeObject);
 profileVariant["label"] = currentProfile.getName();
 for (CVariant::const_iterator_array propertyiter = parameterObject["properties"].begin_array(); propertyiter != parameterObject["properties"].end_array(); ++propertyiter)
@@ -88,14 +93,16 @@
 
 JSONRPC_STATUS CProfilesOperations::LoadProfile(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 std::string profilename = parameterObject["profile"].asString();
- int index = CProfilesManager::GetInstance().GetProfileIndex(profilename);
+ int index = profileManager.GetProfileIndex(profilename);
 
 if (index < 0)
 return InvalidParams;
 
 // get the profile
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(index);
+ const CProfile *profile = profileManager.GetProfile(index);
 if (profile == NULL)
 return InvalidParams;

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/ProfilesOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/SettingsOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/SettingsOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/SystemOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/SystemOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/TextureOperations.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/TextureOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/XBMCOperations.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/json-rpc/schema/version.txt Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Addon.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -93,7 +93,7 @@
       return pAddon->GetSetting(id);
     }
 
-    bool Addon::getSettingBool(const char* id) throw(XBMCAddon::WrongTypeException)
+    bool Addon::getSettingBool(const char* id)
     {
       bool value = false;
       if (!pAddon->GetSettingBool(id, value))
@@ -102,7 +102,7 @@
       return value;
     }
 
-    int Addon::getSettingInt(const char* id) throw(XBMCAddon::WrongTypeException)
+    int Addon::getSettingInt(const char* id)
     {
       int value = 0;
       if (!pAddon->GetSettingInt(id, value))
@@ -111,7 +111,7 @@
       return value;
     }
 
-    double Addon::getSettingNumber(const char* id) throw(XBMCAddon::WrongTypeException)
+    double Addon::getSettingNumber(const char* id)
     {
       double value = 0.0;
       if (!pAddon->GetSettingNumber(id, value))
@@ -120,7 +120,7 @@
       return value;
     }
 
-    String Addon::getSettingString(const char* id) throw(XBMCAddon::WrongTypeException)
+    String Addon::getSettingString(const char* id)
     {
       std::string value;
       if (!pAddon->GetSettingString(id, value))
@@ -140,7 +140,7 @@
       }
     }
 
-    bool Addon::setSettingBool(const char* id, bool value) throw(XBMCAddon::WrongTypeException)
+    bool Addon::setSettingBool(const char* id, bool value)
     {
       DelayedCallGuard dcguard(languageHook);
       ADDON::AddonPtr addon(pAddon);
@@ -155,7 +155,7 @@
       return true;
     }
 
-    bool Addon::setSettingInt(const char* id, int value) throw(XBMCAddon::WrongTypeException)
+    bool Addon::setSettingInt(const char* id, int value)
     {
       DelayedCallGuard dcguard(languageHook);
       ADDON::AddonPtr addon(pAddon);
@@ -170,7 +170,7 @@
       return true;
     }
 
-    bool Addon::setSettingNumber(const char* id, double value) throw(XBMCAddon::WrongTypeException)
+    bool Addon::setSettingNumber(const char* id, double value)
     {
       DelayedCallGuard dcguard(languageHook);
       ADDON::AddonPtr addon(pAddon);
@@ -185,7 +185,7 @@
       return true;
     }
 
-    bool Addon::setSettingString(const char* id, const String& value) throw(XBMCAddon::WrongTypeException)
+    bool Addon::setSettingString(const char* id, const String& value)
     {
       DelayedCallGuard dcguard(languageHook);
       ADDON::AddonPtr addon(pAddon);

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Addon.h Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -166,7 +166,7 @@
       ///
       getSettingBool(...);
 #else
-      bool getSettingBool(const char* id) throw(XBMCAddon::WrongTypeException);
+      bool getSettingBool(const char* id);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -195,7 +195,7 @@
       ///
       getSettingInt(...);
 #else
-      int getSettingInt(const char* id) throw(XBMCAddon::WrongTypeException);
+      int getSettingInt(const char* id);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -224,7 +224,7 @@
       ///
       getSettingNumber(...);
 #else
-      double getSettingNumber(const char* id) throw(XBMCAddon::WrongTypeException);
+      double getSettingNumber(const char* id);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -253,7 +253,7 @@
       ///
       getSettingString(...);
 #else
-      String getSettingString(const char* id) throw(XBMCAddon::WrongTypeException);
+      String getSettingString(const char* id);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -316,7 +316,7 @@
       ///
       setSettingBool(...);
 #else
-      bool setSettingBool(const char* id, bool value) throw(XBMCAddon::WrongTypeException);
+      bool setSettingBool(const char* id, bool value);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -348,7 +348,7 @@
       ///
       setSettingInt(...);
 #else
-      bool setSettingInt(const char* id, int value) throw(XBMCAddon::WrongTypeException);
+      bool setSettingInt(const char* id, int value);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -380,7 +380,7 @@
       ///
       setSettingNumber(...);
 #else
-      bool setSettingNumber(const char* id, double value) throw(XBMCAddon::WrongTypeException);
+      bool setSettingNumber(const char* id, double value);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS
@@ -412,7 +412,7 @@
       ///
       setSettingString(...);
 #else
-      bool setSettingString(const char* id, const String& value) throw(XBMCAddon::WrongTypeException);
+      bool setSettingString(const char* id, const String& value);
 #endif
 
 #ifdef DOXYGEN_SHOULD_USE_THIS

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonCallback.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonCallback.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonClass.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonClass.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonString.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonUtils.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,7 +25,6 @@
 #include "LanguageHook.h"
 #ifdef ENABLE_XBMC_TRACE_API
 #include "utils/log.h"
-#include "threads/ThreadLocal.h"
 #endif
 
 namespace XBMCAddonUtils
@@ -82,7 +81,7 @@
 }
 
 #ifdef ENABLE_XBMC_TRACE_API
- static XbmcThreads::ThreadLocal<TraceGuard> tlParent;
+ static thread_local TraceGuard* tlParent;
 
 static char** getSpacesArray(int size)
 {
@@ -105,19 +104,19 @@
 
 TraceGuard::TraceGuard(const char* _function) :function(_function) 
 {
- parent = tlParent.get();
+ parent = tlParent;
 depth = parent == NULL ? 0 : parent->depth + 1;
 
- tlParent.set(this);
+ tlParent = this;
 
 CLog::Log(LOGDEBUG, "%sNEWADDON Entering %s", spaces[depth], function); 
 }
 
 TraceGuard::TraceGuard() :function(NULL) 
 {
- parent = tlParent.get();
+ parent = tlParent;
 depth = parent == NULL ? 0 : parent->depth + 1;
- tlParent.set(this);
+ tlParent = this;
 // silent
 }
 
@@ -127,7 +126,7 @@
 CLog::Log(LOGDEBUG, "%sNEWADDON Leaving %s", spaces[depth], function);
 
 // need to pop the stack
- tlParent.set(this->parent);
+ tlParent = this->parent;
 }
 #endif

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/AddonUtils.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Alternative.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/CallbackFunction.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/CallbackFunction.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/CallbackHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/CallbackHandler.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Control.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Dialog.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Dialog.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Dictionary.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Exception.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/File.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/File.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/InfoTagMusic.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/InfoTagMusic.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/InfoTagVideo.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/InfoTagVideo.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Keyboard.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Keyboard.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/LanguageHook.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,7 +19,6 @@
 */
 
 #include "LanguageHook.h"
-#include "threads/ThreadLocal.h"
 #include "utils/GlobalsHandling.h"
 
 namespace XBMCAddon
@@ -27,7 +26,7 @@
 // just need a place for the vtab
 LanguageHook::~LanguageHook() = default;
 
- static XbmcThreads::ThreadLocal<LanguageHook> addonLanguageHookTls;
+ static thread_local LanguageHook* addonLanguageHookTls;
 static bool threadLocalInitialized = false;
 static xbmcutil::InitFlag initer(threadLocalInitialized);
 
@@ -35,18 +34,18 @@
 {
 XBMC_TRACE;
 languageHook->Acquire();
- addonLanguageHookTls.set(languageHook);
+ addonLanguageHookTls = languageHook;
 }
 
 LanguageHook* LanguageHook::GetLanguageHook()
 {
- return threadLocalInitialized ? addonLanguageHookTls.get() : NULL;
+ return threadLocalInitialized ? addonLanguageHookTls : NULL;
 }
 
 void LanguageHook::ClearLanguageHook()
 {
- LanguageHook* lh = addonLanguageHookTls.get();
- addonLanguageHookTls.set(NULL);
+ LanguageHook* lh = addonLanguageHookTls;
+ addonLanguageHookTls = NULL;
 if (lh)
 lh->Release();
 }

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/LanguageHook.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/List.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ListItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ListItem.h Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -275,6 +275,33 @@
 #ifdef DOXYGEN_SHOULD_USE_THIS
       ///
       /// \ingroup python_xbmcgui_listitem
+      /// @brief \python_func{ setIsFolder(isFolder) }
+      ///-----------------------------------------------------------------------
+      /// Sets if this listitem is a folder.
+      ///
+      /// @param isFolder            bool - True=folder / False=not a folder (default).
+      ///
+      ///
+      ///-----------------------------------------------------------------------
+      ///
+      /// @python_v18 New function added.
+      ///
+      /// **Example:**
+      /// ~~~~~~~~~~~~~{.py}
+      /// ...
+      /// # setIsFolder(isFolder)
+      /// listitem.setIsFolder(True)
+      /// ...
+      /// ~~~~~~~~~~~~~
+      ///
+      setIsFolder(...);
+#else
+      void setIsFolder(bool isFolder);
+#endif
+
+#ifdef DOXYGEN_SHOULD_USE_THIS
+      ///
+      /// \ingroup python_xbmcgui_listitem
       /// @brief \python_func{ setUniqueIDs(values, defaultrating) }
       ///-----------------------------------------------------------------------
       /// Sets the listitem's uniqueID

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmc.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmc.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcgui.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcgui.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcplugin.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/ModuleXbmcvfs.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Monitor.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Monitor.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/PlayList.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/PlayList.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Player.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Player.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/RenderCapture.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Stat.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/String.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Tuple.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Window.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/Window.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowDialog.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowDialog.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowDialogMixin.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowDialogMixin.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowException.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowInterceptor.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,8 +23,6 @@
 #include "guilib/GUIWindow.h"
 #include "Window.h"
 
-#include "threads/ThreadLocal.h"
-
 namespace XBMCAddon
 {
 namespace xbmcgui
@@ -43,9 +41,9 @@
 protected:
 AddonClass::Ref<Window> window;
 // This instance is in Window.cpp
- static XbmcThreads::ThreadLocal<ref> upcallTls;
+ static thread_local ref* upcallTls;
 
- InterceptorBase() : window(NULL) { upcallTls.set(NULL); }
+ InterceptorBase() : window(NULL) { upcallTls = NULL; }
 
 /**
 * Calling up ONCE resets the upcall to to false. The reason is that when
@@ -60,7 +58,7 @@
 * the call will wrongly proceed back to the xbmc core side rather than
 * to the Addon API side.
 */ 
- static bool up() { bool ret = (upcallTls.get() != NULL); upcallTls.set(NULL); return ret; }
+ static bool up() { bool ret = ((upcallTls) != NULL); upcallTls = NULL; return ret; }
 public:
 
 virtual ~InterceptorBase() { if (window.isNotNull()) { window->interceptorClear(); } }
@@ -89,8 +87,8 @@
 {
 InterceptorBase* w;
 public:
- inline explicit ref(InterceptorBase* b) : w(b) { w->upcallTls.set(this); }
- inline ~ref() { w->upcallTls.set(NULL); }
+ inline explicit ref(InterceptorBase* b) : w(b) { w->upcallTls = this; }
+ inline ~ref() { w->upcallTls = NULL; }
 inline CGUIWindow* operator->() { return w->get(); }
 inline CGUIWindow* get() { return w->get(); }
 };
@@ -121,9 +119,6 @@
 protected:
 CGUIWindow* get() override { return this; }
 
- // this is only called from XBMC core and we only want it to return true every time
- virtual bool Update(const String &strPath) { return true; }
-
 public:
 Interceptor(const char* specializedName,
 Window* _window, int windowid) : P(windowid, ""),

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowXML.cpp Changed

@@ -1,6 +1,6 @@
  /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -83,7 +83,7 @@
       // CGUIMediaWindow
       void GetContextButtons(int itemNumber, CContextButtons &buttons) override
       { XBMC_TRACE; if (up()) CGUIMediaWindow::GetContextButtons(itemNumber,buttons); else xwin->GetContextButtons(itemNumber,buttons); }
-      bool Update(const std::string &strPath) override
+      bool Update(const std::string &strPath, bool) override
       { XBMC_TRACE; return up() ? CGUIMediaWindow::Update(strPath) : xwin->Update(strPath); }
       void SetupShares() override { XBMC_TRACE; if(up()) CGUIMediaWindow::SetupShares(); else checkedv(SetupShares()); }
 
@@ -413,7 +413,7 @@
       return A(CGUIMediaWindow::OnMessage(message));
     }
 
-    void WindowXML::AllocResources(bool forceLoad /*= FALSE */)
+    void WindowXML::AllocResources(bool forceLoad /*= false */)
     {
       XBMC_TRACE;
       std::string tmpDir = URIUtils::GetDirectory(ref(window)->GetProperty("xmlfile").asString());
@@ -428,7 +428,7 @@
       g_TextureManager.RemoveTexturePath(m_mediaDir);
     }
 
-    void WindowXML::FreeResources(bool forceUnLoad /*= FALSE */)
+    void WindowXML::FreeResources(bool forceUnLoad /*= false */)
     {
       XBMC_TRACE;

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/WindowXML.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/aojsonrpc.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/swighelper.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiErrorStream.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiInputStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiInputStream.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiResponse.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiResponse.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/legacy/wsgi/WsgiResponseBody.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/AddonPythonInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/AddonPythonInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/CallbackHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/CallbackHandler.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/ContextItemAddonInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/ContextItemAddonInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/LanguageHook.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/LanguageHook.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/PyContext.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -21,7 +21,6 @@
 #include <Python.h>
 
 #include "PyContext.h"
-#include "threads/ThreadLocal.h"
 #include "utils/log.h"
 
 namespace XBMCAddon
@@ -39,15 +38,15 @@
 bool createdByGilRelease;
 };
 
- static XbmcThreads::ThreadLocal<PyContextState> tlsPyContextState;
+ static thread_local PyContextState* tlsPyContextState;
 
 void* PyContext::enterContext()
 {
- PyContextState* cur = tlsPyContextState.get();
+ PyContextState* cur = tlsPyContextState;
 if (cur == NULL)
 {
 cur = new PyContextState();
- tlsPyContextState.set(cur);
+ tlsPyContextState = cur;
 }
 
 // increment the count
@@ -59,7 +58,7 @@
 void PyContext::leaveContext()
 {
 // here we ASSUME that the constructor was called.
- PyContextState* cur = tlsPyContextState.get();
+ PyContextState* cur = tlsPyContextState;
 cur->value--;
 int curlevel = cur->value;
 
@@ -73,14 +72,14 @@
 if (curlevel == 0)
 {
 // clear the tlsPyContextState
- tlsPyContextState.set(NULL);
+ tlsPyContextState = NULL;
 delete cur;
 }
 }
 
 void PyGILLock::releaseGil()
 {
- PyContextState* cur = tlsPyContextState.get();
+ PyContextState* cur = tlsPyContextState;
 
 // This means we're not within the python context, but
 // because we may be in a thread spawned by python itself,
@@ -105,7 +104,7 @@
 
 void PyGILLock::acquireGil()
 {
- PyContextState* cur = tlsPyContextState.get(); 
+ PyContextState* cur = tlsPyContextState; 
 
 // it's not possible for cur to be NULL (and if it is, we want to fail anyway).

_service:download_files:master.tar.gz/xbmc/interfaces/python/PyContext.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/PythonInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/PythonInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/XBPython.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -34,7 +34,7 @@
 #include "utils/Variant.h"
 #include "Util.h"
 #ifdef TARGET_WINDOWS
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #include "utils/SystemInfo.h"
 #endif
 #include "settings/AdvancedSettings.h"
@@ -124,7 +124,7 @@
 void XBPython::OnPlayBackStarted(const CFileItem &file)
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -136,7 +136,7 @@
 void XBPython::OnPlayBackPaused()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -148,7 +148,7 @@
 void XBPython::OnPlayBackResumed()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -160,7 +160,7 @@
 void XBPython::OnPlayBackEnded()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -172,7 +172,7 @@
 void XBPython::OnPlayBackStopped()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -184,7 +184,7 @@
 void XBPython::OnPlayBackError()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -196,7 +196,7 @@
 void XBPython::OnPlayBackSpeedChanged(int iSpeed)
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -208,7 +208,7 @@
 void XBPython::OnPlayBackSeek(int64_t iTime, int64_t seekOffset)
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -220,7 +220,7 @@
 void XBPython::OnPlayBackSeekChapter(int iChapter)
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))
@@ -232,7 +232,7 @@
 void XBPython::OnQueueNextItem()
 {
 XBMC_TRACE;
- LOCK_AND_COPY(std::vector<PVOID>,tmp,m_vecPlayerCallbackList);
+ LOCK_AND_COPY(std::vector<void*>,tmp,m_vecPlayerCallbackList);
 for (PlayerCallbackList::iterator it = tmp.begin(); (it != tmp.end()); ++it)
 {
 if (CHECK_FOR_ENTRY(m_vecPlayerCallbackList,(*it)))

_service:download_files:master.tar.gz/xbmc/interfaces/python/XBPython.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/preamble.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/pythreadstate.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/swig.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/swig.h Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/test/TestSwig.cpp Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/typemaps/python.Tuple.intm Changed

_service:download_files:master.tar.gz/xbmc/interfaces/python/typemaps/python.vector.intm Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmc.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcaddon.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcgui.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcplugin.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcvfs.i Changed

_service:download_files:master.tar.gz/xbmc/interfaces/swig/AddonModuleXbmcwsgi.i Changed

_service:download_files:master.tar.gz/xbmc/media/MediaType.cpp Changed

_service:download_files:master.tar.gz/xbmc/media/MediaType.h Changed

_service:download_files:master.tar.gz/xbmc/messaging/IMessageTarget.h Changed

_service:download_files:master.tar.gz/xbmc/messaging/ThreadMessage.h Changed

_service:download_files:master.tar.gz/xbmc/music/Album.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/Album.h Changed

_service:download_files:master.tar.gz/xbmc/music/Artist.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/Artist.h Changed

_service:download_files:master.tar.gz/xbmc/music/GUIViewStateMusic.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/GUIViewStateMusic.h Changed

_service:download_files:master.tar.gz/xbmc/music/MusicDatabase.cpp Changed

@@ -2035,7 +2035,7 @@
 item->GetMusicInfoTag()->SetDuration(record->at(song_iDuration).get_asInt());
 item->GetMusicInfoTag()->SetDatabaseId(record->at(song_idSong).get_asInt(), MediaTypeSong);
 SYSTEMTIME stTime;
- stTime.wYear = (WORD)record->at(song_iYear).get_asInt();
+ stTime.wYear = static_cast<unsigned short>(record->at(song_iYear).get_asInt());
 item->GetMusicInfoTag()->SetReleaseDate(stTime);
 item->GetMusicInfoTag()->SetTitle(record->at(song_strTitle).get_asString());
 item->SetLabel(record->at(song_strTitle).get_asString());
@@ -3387,12 +3387,12 @@
 if (bRequery)
 {
 std::string strFile = StringUtils::Format("%x.cddb", pCdInfo->GetCddbDiscId());
- CFile::Delete(URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetCDDBFolder(), strFile));
+ CFile::Delete(URIUtils::AddFileToFolder(m_profileManager.GetCDDBFolder(), strFile));
 }
 
 // Prepare cddb
 Xcddb cddb;
- cddb.setCacheDir(CProfilesManager::GetInstance().GetCDDBFolder());
+ cddb.setCacheDir(m_profileManager.GetCDDBFolder());
 
 // Do we have to look for cddb information
 if (pCdInfo->HasCDDBInfo() && !cddb.isCDCached(pCdInfo))
@@ -3478,7 +3478,7 @@
 {
 #ifdef HAS_DVD_DRIVE
 CFileItemList items;
- if (!CDirectory::GetDirectory(CProfilesManager::GetInstance().GetCDDBFolder(), items, ".cddb", DIR_FLAG_NO_FILE_DIRS))
+ if (!CDirectory::GetDirectory(m_profileManager.GetCDDBFolder(), items, ".cddb", DIR_FLAG_NO_FILE_DIRS))
 {
 HELPERS::ShowOKDialogText(CVariant{313}, CVariant{426});
 return ;
@@ -3490,7 +3490,7 @@
 pDlg->SetHeading(CVariant{g_localizeStrings.Get(181)});
 pDlg->Reset();
 
- std::map<ULONG, std::string> mapCDDBIds;
+ std::map<uint32_t, std::string> mapCDDBIds;
 for (int i = 0; i < items.Size(); ++i)
 {
 if (items[i]->m_bIsFolder)
@@ -3498,9 +3498,9 @@
 
 std::string strFile = URIUtils::GetFileName(items[i]->GetPath());
 strFile.erase(strFile.size() - 5, 5);
- ULONG lDiscId = strtoul(strFile.c_str(), NULL, 16);
+ uint32_t lDiscId = strtoul(strFile.c_str(), NULL, 16);
 Xcddb cddb;
- cddb.setCacheDir(CProfilesManager::GetInstance().GetCDDBFolder());
+ cddb.setCacheDir(m_profileManager.GetCDDBFolder());
 
 if (!cddb.queryCache(lDiscId))
 continue;
@@ -3516,7 +3516,7 @@
 str = strDiskTitle + " - " + strDiskArtist;
 
 pDlg->Add(str);
- mapCDDBIds.insert(std::pair<ULONG, std::string>(lDiscId, str));
+ mapCDDBIds.insert(std::pair<uint32_t, std::string>(lDiscId, str));
 }
 
 pDlg->Sort();
@@ -3536,7 +3536,7 @@
 if (i.second == strSelectedAlbum)
 {
 std::string strFile = StringUtils::Format("%x.cddb", (unsigned int) i.first);
- CFile::Delete(URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetCDDBFolder(), strFile));
+ CFile::Delete(URIUtils::AddFileToFolder(m_profileManager.GetCDDBFolder(), strFile));
 break;
 }
 }
@@ -3702,7 +3702,7 @@
 {
 CFileItemPtr pItem(new CFileItem(m_pDS->fv(0).get_asString()));
 SYSTEMTIME stTime;
- stTime.wYear = (WORD)m_pDS->fv(0).get_asInt();
+ stTime.wYear = static_cast<unsigned short>(m_pDS->fv(0).get_asInt());
 pItem->GetMusicInfoTag()->SetReleaseDate(stTime);
 
 CMusicDbUrl itemUrl = musicUrl;
@@ -7089,18 +7089,91 @@
 }
 }
 
-bool CMusicDatabase::GetArtForItem(int mediaId, const std::string &mediaType, std::map<std::string, std::string> &art)
+bool CMusicDatabase::GetArtForItem(int songId, int albumId, int artistId, bool bPrimaryArtist, std::vector<ArtForThumbLoader> &art)
 {
+ std::string strSQL;
 try
 {
+ if (!(songId > 0 || albumId > 0 || artistId > 0)) return false;
 if (NULL == m_pDB.get()) return false;
 if (NULL == m_pDS2.get()) return false; // using dataset 2 as we're likely called in loops on dataset 1
 
- std::string sql = PrepareSQL("SELECT type,url FROM art WHERE media_id=%i AND media_type='%s'", mediaId, mediaType.c_str());
- m_pDS2->query(sql);
+ Filter filter;
+ if (songId > 0)
+ filter.AppendWhere(PrepareSQL("media_id = %i AND media_type ='%s'", songId, MediaTypeSong));
+ if (albumId > 0)
+ filter.AppendWhere(PrepareSQL("media_id = %i AND media_type ='%s'", albumId, MediaTypeAlbum), false);
+ if (artistId > 0)
+ filter.AppendWhere(PrepareSQL("media_id = %i AND media_type ='%s'", artistId, MediaTypeArtist), false);
+
+ strSQL = "SELECT DISTINCT art_id, media_id, media_type, type, '' as prefix, url, 0 as iorder FROM art";
+ if (!BuildSQL(strSQL, filter, strSQL))
+ return false;
+
+ if (!(artistId > 0))
+ { 
+ // Artist ID unknown, so lookup album artist for albums and songs
+ std::string strSQL2;
+ if (albumId > 0)
+ {
+ //Album ID known, so use it to look up album artist(s)
+ strSQL2 = PrepareSQL(
+ "SELECT art_id, media_id, media_type, type, 'albumartist' as prefix, "
+ "url, album_artist.iOrder as iorder FROM art "
+ "JOIN album_artist ON art.media_id = album_artist.idArtist AND art.media_type ='%s' "
+ "WHERE album_artist.idAlbum = %i ",
+ MediaTypeArtist, albumId);
+ if (bPrimaryArtist)
+ strSQL2 += "AND album_artist.iOrder = 0";
+
+ strSQL = strSQL + " UNION " + strSQL2;
+ }
+ if (songId > 0)
+ {
+ if (albumId < 0)
+ {
+ //Album ID unknown, so get from song to look up album artist(s)
+ strSQL2 = PrepareSQL(
+ "SELECT art_id, media_id, media_type, type, 'albumartist' as prefix, "
+ "url, album_artist.iOrder as iorder FROM art "
+ "JOIN album_artist ON art.media_id = album_artist.idArtist AND art.media_type ='%s' "
+ "JOIN song ON song.idAlbum = album_artist.idAlbum "
+ "WHERE song.idSong = %i ",
+ MediaTypeArtist, songId);
+ if (bPrimaryArtist)
+ strSQL2 += "AND album_artist.iOrder = 0";
+
+ strSQL = strSQL + " UNION " + strSQL2;
+ }
+
+ // Artist ID unknown, so lookup artist for songs (could be different from album artist)
+ strSQL2 = PrepareSQL(
+ "SELECT art_id, media_id, media_type, type, 'artist' as prefix, "
+ "url, song_artist.iOrder as iorder FROM art "
+ "JOIN song_artist on art.media_id = song_artist.idArtist AND art.media_type = '%s' "
+ "WHERE song_artist.idsong = %i AND song_artist.idRole = %i ",
+ MediaTypeArtist, songId, ROLE_ARTIST);
+ if (bPrimaryArtist)
+ strSQL2 += "AND song_artist.iOrder = 0";
+
+ strSQL = strSQL + " UNION " + strSQL2;
+ }
+ }
+
+ m_pDS2->query(strSQL);
 while (!m_pDS2->eof())
 {
- art.insert(std::make_pair(m_pDS2->fv(0).get_asString(), m_pDS2->fv(1).get_asString()));
+ ArtForThumbLoader artitem;
+ artitem.artType = m_pDS2->fv("type").get_asString();
+ artitem.mediaType = m_pDS2->fv("media_type").get_asString();
+ artitem.prefix = m_pDS2->fv("prefix").get_asString();
+ artitem.url = m_pDS2->fv("url").get_asString();
+ int iOrder = m_pDS2->fv("iorder").get_asInt();
+ // Add order to prefix for multiple artist art for songs and albums e.g. "albumartist2"
+ if (iOrder > 0)
+ artitem.prefix += m_pDS2->fv("iorder").get_asString();
+
+ art.emplace_back(artitem);
 m_pDS2->next();
 }
 m_pDS2->close();
@@ -7108,34 +7181,19 @@
 }
 catch (...)
 {
- CLog::Log(LOGERROR, "%s(%d) failed", __FUNCTION__, mediaId);
+ CLog::Log(LOGERROR, "%s(%s) failed", __FUNCTION__, strSQL.c_str());
 }
 return false;
 }
 
-std::string CMusicDatabase::GetArtForItem(int mediaId, const std::string &mediaType, const std::string &artType)
-{
- std::string query = PrepareSQL("SELECT url FROM art WHERE media_id=%i AND media_type='%s' AND type='%s'", mediaId, mediaType.c_str(), artType.c_str());
- return GetSingleValue(query, m_pDS2);
-}
-
-bool CMusicDatabase::GetArtistArtForItem(int mediaId, const std::string &mediaType, std::map<std::string, std::string> &art)
+bool CMusicDatabase::GetArtForItem(int mediaId, const std::string &mediaType, std::map<std::string, std::string> &art)
 {
 try
 {
 if (NULL == m_pDB.get()) return false;
 if (NULL == m_pDS2.get()) return false; // using dataset 2 as we're likely called in loops on dataset 1
 
- std::string sql;
- if (mediaType == MediaTypeAlbum)
- sql = PrepareSQL("SELECT type, url FROM art WHERE media_id=(SELECT idArtist FROM album_artist "
- "WHERE idAlbum=%i AND iOrder=0) AND media_type='artist'", 
- mediaId);
- else
- //Select first "artist" only from song_artist, no other roles.
- sql = PrepareSQL("SELECT type, url FROM art WHERE media_id=(SELECT idArtist FROM song_artist "
- "WHERE idSong=%i AND idRole=%i AND iOrder=0) AND media_type='artist'", 
- mediaId, ROLE_ARTIST);
+ std::string sql = PrepareSQL("SELECT type,url FROM art WHERE media_id=%i AND media_type='%s'", mediaId, mediaType.c_str());
 m_pDS2->query(sql);
 while (!m_pDS2->eof())
 {
@@ -7152,18 +7210,9 @@
 return false;
 }
 
-std::string CMusicDatabase::GetArtistArtForItem(int mediaId, const std::string &mediaType, const std::string &artType)
+std::string CMusicDatabase::GetArtForItem(int mediaId, const std::string &mediaType, const std::string &artType)
 {
- std::string query;
- if (mediaType == MediaTypeAlbum)
- query = PrepareSQL("SELECT url FROM art WHERE media_id=(SELECT idArtist FROM album_artist "
- "WHERE idAlbum=%i AND iOrder=0) AND media_type='artist' AND type='%s'", 
- mediaId, artType.c_str());
- else
- //Select first "artist" only from song_artist, no other roles.
- query = PrepareSQL("SELECT url FROM art WHERE media_id=(SELECT idArtist FROM song_artist "
- "WHERE idSong=%i AND idRole=%i AND iOrder=0) AND media_type='artist' AND type='%s'", 
- mediaId, ROLE_ARTIST, artType.c_str());
+ std::string query = PrepareSQL("SELECT url FROM art WHERE media_id=%i AND media_type='%s' AND type='%s'", mediaId, mediaType.c_str(), artType.c_str());
 return GetSingleValue(query, m_pDS2);
 }

_service:download_files:master.tar.gz/xbmc/music/MusicDatabase.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -73,6 +73,19 @@
 */
 typedef std::set<std::string>::iterator ISETPATHS;
 
+/*!
+\ingroup music
+\brief A structure used for fetching music art data
+\sa CMusicDatabase::GetArtForItem()
+*/
+
+typedef struct {
+ std::string mediaType;
+ std::string artType;
+ std::string prefix;
+ std::string url;
+} ArtForThumbLoader;
+
 class CGUIDialogProgress;
 class CFileItemList;
 
@@ -479,6 +492,26 @@
 */
 void SetArtForItem(int mediaId, const std::string &mediaType, const std::map<std::string, std::string> &art);
 
+
+ /*! \brief Fetch all related art for a database item.
+ Fetches multiple pieces of art for a database item including that for related media types
+ Given song id art for the related album, artist(s) and albumartist(s) will also be fetched, looking up the 
+ album and artist when ids are not provided.
+ Given album id (and not song id) art for the related artist(s) will also be fetched, looking up the 
+ artist(s) when id are not provided.
+ \param songId the id in the song table, -1 when song art not being fetched
+ \param albumId the id in the album table, -1 when album art not being fetched
+ \param artistId the id in the artist table, -1 when artist not known
+ \param bPrimaryArtist true if art from only the first song artist or album artist is to be fetched
+ \param art [out] a vector, each element having media type e.g. "artist", "album" or "song", 
+ artType e.g. "thumb", "fanart", etc., prefix of "", "artist" or "albumartist" etc. giving the kind of artist
+ relationship, and the original url of the art.
+ 
+ \return true if art is retrieved, false if no art is found.
+ \sa SetArtForItem
+ */
+ bool GetArtForItem(int songId, int albumId, int artistId, bool bPrimaryArtist, std::vector<ArtForThumbLoader> &art);
+
 /*! \brief Fetch art for a database item.
 Fetches multiple pieces of art for a database item.
 \param mediaId the id in the media (song/artist/album) table.
@@ -499,26 +532,6 @@
 */
 std::string GetArtForItem(int mediaId, const std::string &mediaType, const std::string &artType);
 
- /*! \brief Fetch artist art for a song or album item.
- Fetches the art associated with the primary artist for the song or album.
- \param mediaId the id in the media (song/album) table.
- \param mediaType the type of media, which corresponds to the table the item resides in (song/album).
- \param art [out] the art map <type, url> of artist art.
- \return true if artist art is found, false otherwise.
- \sa GetArtForItem
- */
- bool GetArtistArtForItem(int mediaId, const std::string &mediaType, std::map<std::string, std::string> &art);
-
- /*! \brief Fetch artist art for a song or album item.
- Fetches a single piece of art associated with the primary artist for the song or album.
- \param mediaId the id in the media (song/album) table.
- \param mediaType the type of media, which corresponds to the table the item resides in (song/album).
- \param artType the type of art to retrieve, eg "thumb", "fanart".
- \return the original URL to the piece of art, if available.
- \sa GetArtForItem
- */
- std::string GetArtistArtForItem(int mediaId, const std::string &mediaType, const std::string &artType);
-
 /*! \brief Remove art for a database item.
 Removes a single piece of art for a database item.
 \param mediaId the id in the media (song/artist/album) table.

_service:download_files:master.tar.gz/xbmc/music/MusicDbUrl.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/MusicDbUrl.h Changed

_service:download_files:master.tar.gz/xbmc/music/MusicInfoLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/MusicInfoLoader.h Changed

_service:download_files:master.tar.gz/xbmc/music/MusicLibraryQueue.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/MusicLibraryQueue.h Changed

_service:download_files:master.tar.gz/xbmc/music/MusicThumbLoader.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -98,39 +98,6 @@
 {
 pItem->SetArt("fanart", art);
 }
- else if (pItem->HasMusicInfoTag() && !pItem->GetMusicInfoTag()->GetArtist().empty())
- {
- std::string artist = pItem->GetMusicInfoTag()->GetArtist()[0];
- m_musicDatabase->Open();
- int idArtist = m_musicDatabase->GetArtistByName(artist);
- if (idArtist >= 0)
- {
- std::string fanart = m_musicDatabase->GetArtForItem(idArtist, MediaTypeArtist, "fanart");
- if (!fanart.empty())
- {
- pItem->SetArt("artist.fanart", fanart);
- pItem->SetArtFallback("fanart", "artist.fanart");
- }
- else if (!pItem->GetMusicInfoTag()->GetAlbumArtist().empty() &&
- pItem->GetMusicInfoTag()->GetAlbumArtist()[0] != artist)
- {
- // If no artist fanart and the album artist is different to the artist,
- // try to get fanart from the album artist
- artist = pItem->GetMusicInfoTag()->GetAlbumArtist()[0];
- idArtist = m_musicDatabase->GetArtistByName(artist);
- if (idArtist >= 0)
- {
- fanart = m_musicDatabase->GetArtForItem(idArtist, MediaTypeArtist, "fanart");
- if (!fanart.empty())
- {
- pItem->SetArt("albumartist.fanart", fanart);
- pItem->SetArtFallback("fanart", "albumartist.fanart");
- }
- }
- }
- }
- m_musicDatabase->Close();
- }
 }
 
 return false;
@@ -196,44 +163,58 @@
 if (tag.GetDatabaseId() > -1 && !tag.GetType().empty())
 {
 m_musicDatabase->Open();
- std::map<std::string, std::string> artwork;
- if (m_musicDatabase->GetArtForItem(tag.GetDatabaseId(), tag.GetType(), artwork))
- item.SetArt(artwork);
- else if (tag.GetType() == MediaTypeSong)
- { // no art for the song, try the album
- ArtCache::const_iterator i = m_albumArt.find(tag.GetAlbumId());
- if (i == m_albumArt.end())
- {
- m_musicDatabase->GetArtForItem(tag.GetAlbumId(), MediaTypeAlbum, artwork);
- i = m_albumArt.insert(make_pair(tag.GetAlbumId(), artwork)).first;
- }
- if (i != m_albumArt.end())
- {
- item.AppendArt(i->second, MediaTypeAlbum);
- for (std::map<std::string, std::string>::const_iterator j = i->second.begin(); j != i->second.end(); ++j)
- item.SetArtFallback(j->first, "album." + j->first);
- }
- }
- if (tag.GetType() == MediaTypeSong || tag.GetType() == MediaTypeAlbum)
- { // fanart from the artist
- std::string fanart = m_musicDatabase->GetArtistArtForItem(tag.GetDatabaseId(), tag.GetType(), "fanart");
- if (!fanart.empty())
- {
- item.SetArt("artist.fanart", fanart);
- item.SetArtFallback("fanart", "artist.fanart");
- }
- else if (tag.GetType() == MediaTypeSong)
+ std::vector<ArtForThumbLoader> art;
+ bool artfound;
+ if (tag.GetType() == MediaTypeSong)
+ artfound = m_musicDatabase->GetArtForItem(tag.GetDatabaseId(), tag.GetAlbumId(), -1, false, art);
+ else if (tag.GetType() == MediaTypeAlbum)
+ artfound = m_musicDatabase->GetArtForItem(-1, tag.GetDatabaseId(), -1, false, art);
+ else //Artist
+ artfound = m_musicDatabase->GetArtForItem(-1, -1, tag.GetDatabaseId(), true, art);
+ 
+ m_musicDatabase->Close();
+ if (artfound)
+ {
+ std::string fanartfallback;
+ std::map<std::string, std::string> artmap;
+ for (auto artitem : art)
 {
- // If no artist fanart, try for album artist fanart
- fanart = m_musicDatabase->GetArtistArtForItem(tag.GetAlbumId(), MediaTypeAlbum, "fanart");
- if (!fanart.empty())
+ /* Add art to artmap, naming according to media type. 
+ For example: artists have "thumb", "fanart", "poster" etc.,
+ albums have "thumb", "artist.thumb", "artist.fanart",... "artist1.thumb", "artist1.fanart" etc.,
+ songs have "thumb", "album.thumb", "artist.thumb", "albumartist.thumb", "albumartist1.thumb" etc.
+ */
+ std::string artname;
+ if (tag.GetType() == artitem.mediaType)
+ artname = artitem.artType;
+ else if (artitem.prefix.empty())
+ artname = artitem.mediaType + "." + artitem.artType;
+ else
 {
- item.SetArt("albumartist.fanart", fanart);
- item.SetArtFallback("fanart", "albumartist.fanart");
+ if (tag.GetType() == MediaTypeAlbum)
+ StringUtils::Replace(artitem.prefix, "albumartist", "artist");
+ artname = artitem.prefix + "." + artitem.artType;
 }
+
+ artmap.insert(std::make_pair(artname, artitem.url));
+
+ // Add fallback art for "thumb" and "fanart" art types only
+ // Set album thumb as the fallback used when song thumb is missing
+ if (tag.GetType() == MediaTypeSong && artitem.mediaType == MediaTypeAlbum && artitem.artType == "thumb")
+ item.SetArtFallback(artitem.artType, artname);
+
+ // For albums and songs set fallback fanart from the artist.
+ // For songs prefer primary song artist over primary albumartist fanart as fallback fanart 
+ if (artitem.prefix == "artist" && artitem.artType == "fanart")
+ fanartfallback = artname;
+ if (artitem.prefix == "albumartist" && artitem.artType == "fanart" && fanartfallback.empty())
+ fanartfallback = artname;
 }
- }
- m_musicDatabase->Close();
+ if (!fanartfallback.empty())
+ item.SetArtFallback("fanart", fanartfallback);
+
+ item.SetArt(artmap);
+ } 
 }
 return !item.GetArt().empty();
 }

_service:download_files:master.tar.gz/xbmc/music/MusicThumbLoader.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -39,9 +39,17 @@
   bool LoadItemCached(CFileItem* pItem) override;
   bool LoadItemLookup(CFileItem* pItem) override;
 
-  /*! \brief helper function to fill the art for a video library item
-   \param item a video CFileItem
-   \return true if we fill art, false otherwise
+  /*! \brief Helper function to fill all the art for a music library item
+  This fetches the original url for each type of art, and sets fallback thumb and fanart.
+  For songs the art for the related album and artist(s) is also set, and for albums that
+  of the related artist(s). Art type is named according to media type of the item, 
+  for example: 
+  artists may have "thumb", "fanart", "logo", "poster" etc., 
+  albums may have "thumb", "spine" etc. and "artist.thumb", "artist.fanart" etc.,
+  songs may have "thumb", "album.thumb", "artist.thumb", "artist.fanart", "artist.logo",... 
+  "artist1.thumb", "artist1.fanart",... "albumartist.thumb", "albumartist1.thumb" etc.
+   \param item a music CFileItem
+   \return true if we fill art, false if there is no art found
    */
   bool FillLibraryArt(CFileItem &item) override;

_service:download_files:master.tar.gz/xbmc/music/Song.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/Song.h Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogInfoProviderSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogInfoProviderSettings.h Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicInfo.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -39,6 +39,7 @@
 #include "music/MusicThumbLoader.h"
 #include "music/windows/GUIWindowMusicNav.h"
 #include "filesystem/Directory.h"
+#include "ServiceBroker.h"
 
 using namespace XFILE;
 
@@ -172,30 +173,23 @@
 SetSongs(m_album.songs);
 *m_albumItem = CFileItem(path, true);
 m_albumItem->GetMusicInfoTag()->SetAlbum(m_album);
- CMusicDatabase::SetPropertiesFromAlbum(*m_albumItem,m_album);
+ CMusicDatabase::SetPropertiesFromAlbum(*m_albumItem, m_album);
 
+ // Load all album and related artist art (to CGUIListItem.m_art)
+ // This includes artist fanart set as fallback album fanart
 CMusicThumbLoader loader;
 loader.LoadItem(m_albumItem.get());
 
- // set the artist thumb, fanart
- if (!m_album.GetAlbumArtist().empty())
- {
- CMusicDatabase db;
- db.Open();
- std::map<std::string, std::string> artwork;
- if (db.GetArtistArtForItem(m_album.idAlbum, MediaTypeAlbum, artwork))
- {
- if (artwork.find("thumb") != artwork.end())
- m_albumItem->SetProperty("artistthumb", artwork["thumb"]);
- if (artwork.find("fanart") != artwork.end())
- m_albumItem->SetArt("fanart",artwork["fanart"]);
- }
- }
 m_startUserrating = m_album.iUserrating;
 m_hasUpdatedThumb = false;
 m_bArtistInfo = false;
 m_needsUpdate = false;
+
+ // CurrentDirectory() returns m_albumSongs (a convenient CFileItemList)
+ // Set content so can return dialog CONTAINER_CONTENT as "albums"
 m_albumSongs->SetContent("albums");
+ // Copy art from ListItem so CONTAINER_ART returns album art
+ m_albumSongs->SetArt(m_albumItem->GetArt());
 }
 
 void CGUIDialogMusicInfo::SetArtist(const CArtist& artist, const std::string &path)
@@ -216,16 +210,24 @@
 
 m_hasUpdatedThumb = false;
 m_bArtistInfo = true;
- m_albumSongs->SetContent("artists");
+
+ // CurrentDirectory() returns m_albumSongs (a convenient CFileItemList)
+ // Set content so can return dialog CONTAINER_CONTENT as "artists"
+ m_albumSongs->SetContent("artists"); 
+ // Copy art from ListItem so CONTAINER_ART returns artist art
+ m_albumSongs->SetArt(m_albumItem->GetArt());
 }
 
 void CGUIDialogMusicInfo::SetSongs(const VECSONGS &songs) const
 {
 m_albumSongs->Clear();
+ CMusicThumbLoader loader;
 for (unsigned int i = 0; i < songs.size(); i++)
 {
 const CSong& song = songs[i];
 CFileItemPtr item(new CFileItem(song));
+ // Load the song art and related artist(s) (that may be different from album artist) art
+ loader.LoadItem(item.get());
 m_albumSongs->Add(item);
 }
 }
@@ -250,6 +252,7 @@
 CFileItemPtr item(new CFileItem(discography[i].first));
 item->SetLabel2(discography[i].second);
 
+ CMusicThumbLoader loader;
 int idAlbum = -1;
 for (std::vector<int>::const_iterator album = albumsByArtist.begin(); album != albumsByArtist.end(); ++album)
 {
@@ -257,13 +260,12 @@
 {
 idAlbum = *album;
 item->GetMusicInfoTag()->SetDatabaseId(idAlbum, "album");
+ // Load all the album art and related artist(s) art (could be other collaborating artists)
+ loader.LoadItem(item.get());
 break;
 }
 }
-
- if (idAlbum != -1) // we need this slight stupidity to get correct case for the album name
- item->SetArt("thumb", database.GetArtForItem(idAlbum, MediaTypeAlbum, "thumb"));
- else
+ if (idAlbum == -1) 
 item->SetArt("thumb", "DefaultAlbumCover.png");
 
 m_albumSongs->Add(item);
@@ -291,8 +293,10 @@
 
 }
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // disable the GetThumb button if the user isn't allowed it
- CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB, CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser);
+ CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB, profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser);
 }
 
 void CGUIDialogMusicInfo::SetLabel(int iControl, const std::string& strLabel)

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicInfo.h Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicOSD.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogMusicOSD.h Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogSongInfo.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -244,33 +244,26 @@
 m_song->LoadMusicTag();
 m_startUserrating = m_song->GetMusicInfoTag()->GetUserrating();
 MUSIC_INFO::CMusicInfoLoader::LoadAdditionalTagInfo(m_song.get());
- // set artist thumb as well
- CMusicDatabase db;
- db.Open();
- if (item->IsMusicDb())
+
+ // Load song art. 
+ // For songs in library this includes related album and artist(s) art, 
+ // otherwise just embedded or cached thumb is fetched.
+ CMusicThumbLoader loader;
+ loader.LoadItem(m_song.get());
+
+ // Set artist art for non db songs when artist can be found uniquely by name
+ if (!m_song->IsMusicDb() && m_song->HasMusicInfoTag() && !m_song->GetMusicInfoTag()->GetArtist().empty())
 {
- std::vector<int> artists;
- CVariant artistthumbs;
- db.GetArtistsBySong(item->GetMusicInfoTag()->GetDatabaseId(), artists);
- for (std::vector<int>::const_iterator artistId = artists.begin(); artistId != artists.end(); ++artistId)
- {
- std::string thumb = db.GetArtForItem(*artistId, MediaTypeArtist, "thumb");
- if (!thumb.empty())
- artistthumbs.push_back(thumb);
- }
- if (artistthumbs.size())
+ CMusicDatabase db;
+ db.Open();
+ int idArtist = db.GetArtistByName(m_song->GetMusicInfoTag()->GetArtist()[0]);
+ if (idArtist > 0)
 {
- m_song->SetProperty("artistthumbs", artistthumbs);
- m_song->SetProperty("artistthumb", artistthumbs[0]);
+ std::map<std::string, std::string> art;
+ if (db.GetArtForItem(idArtist, MediaTypeArtist, art))
+ m_song->SetArt(art);
 }
 }
- else if (m_song->HasMusicInfoTag() && !m_song->GetMusicInfoTag()->GetArtist().empty())
- {
- int idArtist = db.GetArtistByName(m_song->GetMusicInfoTag()->GetArtist()[0]);
- std::string thumb = db.GetArtForItem(idArtist, MediaTypeArtist, "thumb");
- if (!thumb.empty())
- m_song->SetProperty("artistthumb", thumb);
- }
 m_needsUpdate = false;
 }

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogSongInfo.h Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicAlbumInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicAlbumInfo.h Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicArtistInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicArtistInfo.h Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicInfoScanner.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicInfoScanner.h Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicInfoScraper.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/infoscanner/MusicInfoScraper.h Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryCleaningJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryCleaningJob.h Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryExportJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryExportJob.h Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryJob.h Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryProgressJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryProgressJob.h Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryScanningJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/jobs/MusicLibraryScanningJob.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/ImusicInfoTagLoader.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTag.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderCDDA.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderDatabase.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderDatabase.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderFactory.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderShn.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/MusicInfoTagLoaderShn.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/ReplayGain.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/ReplayGain.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/TagLibVFSStream.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/TagLibVFSStream.h Changed

_service:download_files:master.tar.gz/xbmc/music/tags/TagLoaderTagLib.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/tags/TagLoaderTagLib.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicBase.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -379,7 +379,9 @@
 // Check if the entry should be refreshed (Only happens if a user pressed refresh)
 if (refresh)
 {
- if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (!profileManager.GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
 break; // should display a dialog saying no permissions
 
 if (g_application.IsMusicScanning())
@@ -451,7 +453,9 @@
 // Check if the entry should be refreshed (Only happens if a user pressed refresh)
 if (refresh)
 {
- if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (!profileManager.GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
 {
 //! @todo should display a dialog saying no permissions
 if (m_dlgProgress)
@@ -750,6 +754,8 @@
 
 if (item)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 if (item && !item->IsParentFolder())
 {
 if (item->CanQueue() && !item->IsAddonsPath() && !item->IsScript())
@@ -763,9 +769,12 @@
 buttons.Add(CONTEXT_BUTTON_PLAY_ITEM, 208); // Play
 }
 else
- { // check what players we have, if we have multiple display play with option
+ {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
+ // check what players we have, if we have multiple display play with option
 std::vector<std::string> players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
+ playerCoreFactory.GetPlayers(*item, players);
 if (players.size() >= 1)
 buttons.Add(CONTEXT_BUTTON_PLAY_WITH, 15213); // Play With...
 }
@@ -790,7 +799,7 @@
 !item->IsPlugin() && !item->IsMusicDb() &&
 !item->IsLibraryFolder() &&
 !StringUtils::StartsWithNoCase(item->GetPath(), "addons://") &&
- (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
+ (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
 {
 buttons.Add(CONTEXT_BUTTON_SCAN, 13352);
 }
@@ -808,7 +817,7 @@
 
 // enable CDDB lookup if the current dir is CDDA
 if (g_mediaManager.IsDiscInDrive() && m_vecItems->IsCDDA() &&
- (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
+ (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
 {
 buttons.Add(CONTEXT_BUTTON_CDDB, 16002);
 }
@@ -868,9 +877,11 @@
 
 case CONTEXT_BUTTON_PLAY_WITH:
 {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 std::vector<std::string> players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(*item, players);
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 OnClick(itemNumber, player);
 return true;
@@ -1085,10 +1096,12 @@
 
 void CGUIWindowMusicBase::UpdateThumb(const CAlbum &album, const std::string &path)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // check user permissions
 bool saveDb = album.idAlbum != -1;
 bool saveDirThumb = true;
- if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
+ if (!profileManager.GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
 {
 saveDb = false;
 saveDirThumb = false;
@@ -1209,27 +1222,46 @@
 CQueryParams params;
 CDirectoryNode::GetDatabaseInfo(items.GetPath(), params);
 
+ // Get art for directory when album or artist
+ bool artfound = false;
+ std::vector<ArtForThumbLoader> art;
 if (params.GetAlbumId() > 0)
- {
- std::map<std::string, std::string> artistArt;
- if (m_musicdatabase.GetArtistArtForItem(params.GetAlbumId(), MediaTypeAlbum, artistArt))
- items.AppendArt(artistArt, MediaTypeArtist);
-
- std::map<std::string, std::string> albumArt;
- if (m_musicdatabase.GetArtForItem(params.GetAlbumId(), MediaTypeAlbum, albumArt))
- items.AppendArt(albumArt, MediaTypeAlbum);
+ { // Get album and related artist(s) art
+ artfound = m_musicdatabase.GetArtForItem(-1, params.GetAlbumId(), -1, false, art);
+ }
+ else if (params.GetArtistId() > 0)
+ { // get artist art
+ artfound = m_musicdatabase.GetArtForItem(-1, -1, params.GetArtistId(), true, art);
 }
- if (params.GetArtistId() > 0)
+ if (artfound)
 {
- std::map<std::string, std::string> artistArt;
- if (m_musicdatabase.GetArtForItem(params.GetArtistId(), "artist", artistArt))
- items.AppendArt(artistArt, MediaTypeArtist);
+ std::string dirType = MediaTypeArtist;
+ if (params.GetAlbumId() > 0)
+ dirType = MediaTypeAlbum;
+ std::map<std::string, std::string> artmap;
+ for (auto artitem : art)
+ {
+ std::string artname;
+ if (dirType == artitem.mediaType)
+ artname = artitem.artType;
+ else if (artitem.prefix.empty())
+ artname = artitem.mediaType + "." + artitem.artType;
+ else
+ {
+ if (dirType == MediaTypeAlbum)
+ StringUtils::Replace(artitem.prefix, "albumartist", "artist");
+ artname = artitem.prefix + "." + artitem.artType;
+ }
+ }
+ items.SetArt(artmap);
 }
 
 // add in the "New Playlist" item if we're in the playlists folder
 if ((items.GetPath() == "special://musicplaylists/") && !items.Contains("newplaylist://"))
 {
- CFileItemPtr newPlaylist(new CFileItem(CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp"),false));
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ CFileItemPtr newPlaylist(new CFileItem(profileManager.GetUserDataItem("PartyMode.xsp"),false));
 newPlaylist->SetLabel(g_localizeStrings.Get(16035));
 newPlaylist->SetLabelPreformatted(true);
 newPlaylist->SetIconImage("DefaultPartyMode.png");

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicBase.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicNav.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -578,6 +578,8 @@
     item = m_vecItems->Get(itemNumber);
   if (item)
   {
+    const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
     // are we in the playlists location?
     bool inPlaylists = m_vecItems->IsPath(CUtil::MusicPlaylistsLocation()) ||
       m_vecItems->IsPath("special://musicplaylists/");
@@ -605,7 +607,7 @@
         !item->IsPath("add") && !item->IsParentFolder() &&
         !item->IsPlugin() &&
         !StringUtils::StartsWithNoCase(item->GetPath(), "addons://") &&
-        (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
+        (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
       {
         buttons.Add(CONTEXT_BUTTON_SCAN, 13352);
       }
@@ -668,7 +670,7 @@
         }
         if (item->HasVideoInfoTag() && !item->m_bIsFolder)
         {
-          if ((CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !item->IsPlugin())
+          if ((profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !item->IsPlugin())
           {
             buttons.Add(CONTEXT_BUTTON_RENAME, 16105);
             buttons.Add(CONTEXT_BUTTON_DELETE, 646);

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicNav.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylist.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -512,10 +512,13 @@
 buttons.Add(CONTEXT_BUTTON_CANCEL_MOVE, 13253);
 }
 else
- { // aren't in a move
+ {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
+ // aren't in a move
 // check what players we have, if we have multiple display play with option
 std::vector<std::string> players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
+ playerCoreFactory.GetPlayers(*item, players);
 if (players.size() > 1)
 buttons.Add(CONTEXT_BUTTON_PLAY_WITH, 15213); // Play With...
 
@@ -553,9 +556,11 @@
 if (!item)
 break;
 
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 std::vector<std::string> players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(*item, players);
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 OnClick(itemNumber, player);
 return true;
@@ -598,7 +603,9 @@
 
 case CONTEXT_BUTTON_EDIT_PARTYMODE:
 {
- std::string playlist = CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp");
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string playlist = profileManager.GetUserDataItem("PartyMode.xsp");
 if (CGUIDialogSmartPlaylistEditor::EditPlaylist(playlist))
 {
 // apply new rules

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylist.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowMusicPlaylistEditor.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowVisualisation.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/windows/GUIWindowVisualisation.h Changed

_service:download_files:master.tar.gz/xbmc/music/windows/MusicFileItemListModifier.cpp Changed

_service:download_files:master.tar.gz/xbmc/music/windows/MusicFileItemListModifier.h Changed

_service:download_files:master.tar.gz/xbmc/network/AirPlayServer.h Changed

_service:download_files:master.tar.gz/xbmc/network/AirTunesServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/AirTunesServer.h Changed

_service:download_files:master.tar.gz/xbmc/network/DNSNameCache.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/DNSNameCache.h Changed

_service:download_files:master.tar.gz/xbmc/network/DllLibPlist.h Changed

_service:download_files:master.tar.gz/xbmc/network/DllLibShairplay.h Changed

_service:download_files:master.tar.gz/xbmc/network/EventClient.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -91,13 +91,16 @@
       else if ( (m_mapName.length() > 3) &&
                 (StringUtils::StartsWith(m_mapName, "LI:")) ) // starts with LI: ?
       {
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
-        std::string lircDevice = m_mapName.substr(3);
-        m_iKeyCode = CServiceBroker::GetInputManager().TranslateLircRemoteString( lircDevice.c_str(),
-                                                                   m_buttonName.c_str() );
-#else
-        CLog::Log(LOGERROR, "ES: LIRC support not enabled");
-#endif
+        if (CServiceBroker::GetInputManager().HasRemoteControl())
+        {
+          std::string lircDevice = m_mapName.substr(3);
+          m_iKeyCode = CServiceBroker::GetInputManager().TranslateLircRemoteString( lircDevice.c_str(),
+                                                                     m_buttonName.c_str() );
+        }
+        else
+        {
+          CLog::Log(LOGERROR, "ES: LIRC support not enabled");
+        }
       }
       else
       {

_service:download_files:master.tar.gz/xbmc/network/EventPacket.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/EventServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/GUIDialogAccessPoints.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/GUIDialogAccessPoints.h Changed

_service:download_files:master.tar.gz/xbmc/network/GUIDialogNetworkSetup.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -217,7 +217,8 @@
          { true,  true,  true,  true, false,  21,   "ftp", 20173},
          { true,  true,  true,  true, false, 990,  "ftps", 20174},
          {false, false, false, false,  true,   0,  "upnp", 20175},
-         { true,  true,  true,  true, false,  80,   "rss", 20304}};
+         { true,  true,  true,  true, false,  80,   "rss", 20304},
+         { true,  true,  true,  true, false, 443,  "rsss", 20305}};
 
  m_protocols.insert(m_protocols.end(), defaults.begin(), defaults.end());
 #ifdef HAS_FILESYSTEM_NFS
@@ -378,7 +379,7 @@
     SendMessage(GUI_MSG_SET_TYPE, passControlID, CGUIEditControl::INPUT_TYPE_PASSWORD, 12326);
   }
 
-  // server browse should be disabled if we are in FTP, FTPS, HTTP, HTTPS, RSS, DAV or DAVS
+  // server browse should be disabled if we are in FTP, FTPS, HTTP, HTTPS, RSS, RSSS, DAV or DAVS
   BaseSettingControlPtr browseControl = GetSettingControl(SETTING_SERVER_BROWSE);
   if (browseControl != NULL && browseControl->GetControl() != NULL)
   {

_service:download_files:master.tar.gz/xbmc/network/GUIDialogNetworkSetup.h Changed

_service:download_files:master.tar.gz/xbmc/network/Network.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/Network.h Changed

_service:download_files:master.tar.gz/xbmc/network/NetworkServices.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/NetworkServices.h Changed

_service:download_files:master.tar.gz/xbmc/network/Socket.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/TCPServer.h Changed

_service:download_files:master.tar.gz/xbmc/network/UdpClient.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -90,7 +90,7 @@
 {
 CSingleLock lock(critical_section);
 
- SOCKADDR_IN addr;
+ struct sockaddr_in addr;
 addr.sin_family = AF_INET;
 addr.sin_port = htons(aPort);
 addr.sin_addr.s_addr = INADDR_BROADCAST;
@@ -107,7 +107,7 @@
 {
 CSingleLock lock(critical_section);
 
- SOCKADDR_IN addr;
+ struct sockaddr_in addr;
 addr.sin_family = AF_INET;
 addr.sin_port = htons(aPort);
 addr.sin_addr.s_addr = inet_addr(aIpAddress.c_str());
@@ -119,7 +119,7 @@
 return true;
 }
 
-bool CUdpClient::Send(SOCKADDR_IN aAddress, const std::string& aMessage)
+bool CUdpClient::Send(struct sockaddr_in aAddress, const std::string& aMessage)
 {
 CSingleLock lock(critical_section);
 
@@ -129,7 +129,7 @@
 return true;
 }
 
-bool CUdpClient::Send(SOCKADDR_IN aAddress, LPBYTE pMessage, DWORD dwSize)
+bool CUdpClient::Send(struct sockaddr_in aAddress, unsigned char* pMessage, DWORD dwSize)
 {
 CSingleLock lock(critical_section);
 
@@ -146,7 +146,7 @@
 
 CLog::Log(UDPCLIENT_DEBUG_LEVEL, "UDPCLIENT: Listening.");
 
- SOCKADDR_IN remoteAddress;
+ struct sockaddr_in remoteAddress;
 char messageBuffer[1024];
 DWORD dataAvailable;
 
@@ -192,7 +192,7 @@
 CLog::Log(UDPCLIENT_DEBUG_LEVEL, "UDPCLIENT RX: %u\t\t<- '%s'",
 XbmcThreads::SystemClockMillis(), message.c_str() );
 
- OnMessage(remoteAddress, message, (LPBYTE)messageBuffer, messageLength);
+ OnMessage(remoteAddress, message, reinterpret_cast<unsigned char*>(messageBuffer), messageLength);
 }
 else
 {
@@ -238,7 +238,7 @@
 
 do
 {
- ret = sendto(client_socket, (LPCSTR) command.binary, command.binarySize, 0, (struct sockaddr *) & command.address, sizeof(command.address));
+ ret = sendto(client_socket, (const char*) command.binary, command.binarySize, 0, (struct sockaddr *) & command.address, sizeof(command.address));
 }
 while (ret == -1);

_service:download_files:master.tar.gz/xbmc/network/UdpClient.h Changed

@@ -5,7 +5,7 @@
  *      Portions Copyright (c) by the authors of ffmpeg and xvid
  *
  *      Copyright (C) 2002-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -47,18 +47,18 @@
 
   bool Broadcast(int aPort, const std::string& aMessage);
   bool Send(const std::string& aIpAddress, int aPort, const std::string& aMessage);
-  bool Send(SOCKADDR_IN aAddress, const std::string& aMessage);
-  bool Send(SOCKADDR_IN aAddress, LPBYTE pMessage, DWORD dwSize);
+  bool Send(struct sockaddr_in aAddress, const std::string& aMessage);
+  bool Send(struct sockaddr_in aAddress, unsigned char* pMessage, DWORD dwSize);
 
-  virtual void OnMessage(SOCKADDR_IN& aRemoteAddress, const std::string& aMessage, LPBYTE pMessage, DWORD dwMessageLength){};
+  virtual void OnMessage(struct sockaddr_in& aRemoteAddress, const std::string& aMessage, unsigned char* pMessage, DWORD dwMessageLength){};
 
 protected:
 
   struct UdpCommand
   {
-    SOCKADDR_IN address;
+    struct sockaddr_in address;
     std::string message;
-    LPBYTE binary;
+    unsigned char* binary;
     DWORD binarySize;
   };

_service:download_files:master.tar.gz/xbmc/network/WakeOnAccess.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/WakeOnAccess.h Changed

_service:download_files:master.tar.gz/xbmc/network/WebServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/WebServer.h Changed

_service:download_files:master.tar.gz/xbmc/network/Zeroconf.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/Zeroconf.h Changed

_service:download_files:master.tar.gz/xbmc/network/ZeroconfBrowser.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/ZeroconfBrowser.h Changed

_service:download_files:master.tar.gz/xbmc/network/android/NetworkAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/android/NetworkAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/network/android/ZeroconfAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/android/ZeroconfAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/network/android/ZeroconfBrowserAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/android/ZeroconfBrowserAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/network/cddb.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/cddb.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPFileHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPFileHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPImageHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPImageHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPImageTransformationHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPPythonHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPPythonHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPRequestHandlerUtils.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPVfsHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/IHTTPRequestHandler.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonRequest.h Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonWsgiInvoker.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/httprequesthandler/python/HTTPPythonWsgiInvoker.h Changed

_service:download_files:master.tar.gz/xbmc/network/linux/NetworkLinux.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/linux/NetworkLinux.h Changed

_service:download_files:master.tar.gz/xbmc/network/linux/ZeroconfAvahi.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/linux/ZeroconfAvahi.h Changed

_service:download_files:master.tar.gz/xbmc/network/linux/ZeroconfBrowserAvahi.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/linux/ZeroconfBrowserAvahi.h Changed

_service:download_files:master.tar.gz/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/mdns/ZeroconfBrowserMDNS.h Changed

_service:download_files:master.tar.gz/xbmc/network/mdns/ZeroconfMDNS.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/mdns/ZeroconfMDNS.h Changed

_service:download_files:master.tar.gz/xbmc/network/osx/ZeroconfBrowserOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/osx/ZeroconfBrowserOSX.h Changed

_service:download_files:master.tar.gz/xbmc/network/osx/ZeroconfOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/osx/ZeroconfOSX.h Changed

_service:download_files:master.tar.gz/xbmc/network/osx/ioshacks.h Changed

_service:download_files:master.tar.gz/xbmc/network/test/TestWebServer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnP.cpp Changed

@@ -4,7 +4,7 @@
 * Portions Copyright (c) by the authors of libPlatinum
 * http://www.plutinosoft.com/blog/category/platinum/
 * Copyright (C) 2006-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -383,7 +383,9 @@
 if (device->GetUUID().IsEmpty() || device->GetUUID().GetChars() == NULL)
 return false;
 
- CPlayerCoreFactory::GetInstance().OnPlayerDiscovered((const char*)device->GetUUID()
+ CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
+ playerCoreFactory.OnPlayerDiscovered((const char*)device->GetUUID()
 ,(const char*)device->GetFriendlyName());
 
 m_registeredRenderers.insert(std::string(device->GetUUID().GetChars()));
@@ -403,7 +405,9 @@
 private:
 void unregisterRenderer(const std::string &deviceUUID)
 {
- CPlayerCoreFactory::GetInstance().OnPlayerRemoved(deviceUUID);
+ CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
+ playerCoreFactory.OnPlayerRemoved(deviceUUID);
 }
 
 std::set<std::string> m_registeredRenderers;
@@ -658,8 +662,10 @@
 {
 if (!m_ServerHolder->m_Device.IsNull()) return false;
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // load upnpserver.xml
- std::string filename = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetUserDataFolder(), "upnpserver.xml");
+ std::string filename = URIUtils::AddFileToFolder(profileManager.GetUserDataFolder(), "upnpserver.xml");
 CUPnPSettings::GetInstance().Load(filename);
 
 // create the server with a XBox compatible friendlyname and UUID from upnpserver.xml if found
@@ -738,7 +744,9 @@
 {
 if (!m_RendererHolder->m_Device.IsNull()) return false;
 
- std::string filename = URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetUserDataFolder(), "upnpserver.xml");
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string filename = URIUtils::AddFileToFolder(profileManager.GetUserDataFolder(), "upnpserver.xml");
 CUPnPSettings::GetInstance().Load(filename);
 
 m_RendererHolder->m_Device = CreateRenderer(CUPnPSettings::GetInstance().GetRendererPort());

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnP.h Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPInternal.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPInternal.h Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPPlayer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPPlayer.h Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPRenderer.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPRenderer.h Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPServer.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -50,6 +50,7 @@
 #include "guilib/GUIWindowManager.h"
 #include "GUIUserMessages.h"
 #include "utils/FileUtils.h"
+#include "TextureDatabase.h"
 
 NPT_SET_LOCAL_LOGGER("xbmc.upnp.server")
 
@@ -235,19 +236,24 @@
 {
 CURL url(file_path);
 std::string md5;
+ std::string mapped_file_path(file_path);
 
 // determine the filename to provide context to md5'd urls
 std::string filename;
 if (url.IsProtocol("image"))
+ {
 filename = URIUtils::GetFileName(url.GetHostName());
+ // Remove trailing / for Platinum/Neptune to recognize the file extension and use the correct mime type when serving the image
+ URIUtils::RemoveSlashAtEnd(mapped_file_path);
+ }
 else
- filename = URIUtils::GetFileName(file_path);
+ filename = URIUtils::GetFileName(mapped_file_path);
 
 filename = CURL::Encode(filename);
- md5 = XBMC::XBMC_MD5::GetMD5(file_path);
+ md5 = XBMC::XBMC_MD5::GetMD5(mapped_file_path);
 md5 += "/" + filename;
 { NPT_AutoLock lock(m_FileMutex);
- NPT_CHECK(m_FileMap.Put(md5.c_str(), file_path));
+ NPT_CHECK(m_FileMap.Put(md5.c_str(), mapped_file_path.c_str()));
 }
 return PLT_FileMediaServer::BuildSafeResourceUri(rooturi, host, md5.c_str());
 }
@@ -1193,9 +1199,10 @@
 return NPT_SUCCESS;
 }
 
- if(URIUtils::IsURL((const char*)file_path))
+ if (URIUtils::IsURL(static_cast<const char*>(file_path)))
 {
- std::string disp = "inline; filename=\"" + URIUtils::GetFileName((const char*)file_path) + "\"";
+ CURL url(CTextureUtils::UnwrapImageURL(static_cast<const char*>(file_path)));
+ std::string disp = "inline; filename=\"" + URIUtils::GetFileName(url) + "\"";
 response.GetHeaders().SetHeader("Content-Disposition", disp.c_str());
 }

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPServer.h Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/upnp/UPnPSettings.h Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocket.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocket.h Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketManager.h Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketV13.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketV13.h Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketV8.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/websocket/WebSocketV8.h Changed

_service:download_files:master.tar.gz/xbmc/network/win10/NetworkWin10.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/win10/NetworkWin10.h Changed

_service:download_files:master.tar.gz/xbmc/network/windows/NetworkWin32.cpp Changed

_service:download_files:master.tar.gz/xbmc/network/windows/NetworkWin32.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/PeripheralTypes.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -62,6 +62,8 @@
     FEATURE_JOYSTICK,
     FEATURE_RUMBLE,
     FEATURE_POWER_OFF,
+    FEATURE_KEYBOARD,
+    FEATURE_MOUSE,
   };
 
   enum PeripheralType
@@ -76,7 +78,8 @@
     PERIPHERAL_TUNER,
     PERIPHERAL_IMON,
     PERIPHERAL_JOYSTICK,
-    PERIPHERAL_JOYSTICK_EMULATION,
+    PERIPHERAL_KEYBOARD,
+    PERIPHERAL_MOUSE,
   };
 
   class CPeripheral;
@@ -137,8 +140,10 @@
         return "imon";
       case PERIPHERAL_JOYSTICK:
         return "joystick";
-      case PERIPHERAL_JOYSTICK_EMULATION:
-        return "joystickemulation";
+      case PERIPHERAL_KEYBOARD:
+        return "keyboard";
+      case PERIPHERAL_MOUSE:
+        return "mouse";
       default:
         return "unknown";
       }
@@ -167,8 +172,10 @@
         return PERIPHERAL_IMON;
       else if (strTypeLowerCase == "joystick")
         return PERIPHERAL_JOYSTICK;
-      else if (strTypeLowerCase == "joystickemulation")
-        return PERIPHERAL_JOYSTICK_EMULATION;
+      else if (strTypeLowerCase == "keyboard")
+        return PERIPHERAL_KEYBOARD;
+      else if (strTypeLowerCase == "mouse")
+        return PERIPHERAL_MOUSE;
 
       return PERIPHERAL_UNKNOWN;
     };
@@ -249,6 +256,10 @@
         return "rumble";
       case FEATURE_POWER_OFF:
         return "poweroff";
+      case FEATURE_KEYBOARD:
+        return "keyboard";
+      case FEATURE_MOUSE:
+        return "mouse";
       case FEATURE_UNKNOWN:
       default:
         return "unknown";
@@ -280,6 +291,10 @@
         return FEATURE_RUMBLE;
       else if (strTypeLowerCase == "poweroff")
         return FEATURE_POWER_OFF;
+      else if (strTypeLowerCase == "keyboard")
+        return FEATURE_KEYBOARD;
+      else if (strTypeLowerCase == "mouse")
+        return FEATURE_MOUSE;
 
       return FEATURE_UNKNOWN;
     };

_service:download_files:master.tar.gz/xbmc/peripherals/Peripherals.cpp Changed

@@ -39,7 +39,8 @@
 #include "devices/PeripheralHID.h"
 #include "devices/PeripheralImon.h"
 #include "devices/PeripheralJoystick.h"
-#include "devices/PeripheralJoystickEmulation.h"
+#include "devices/PeripheralKeyboard.h"
+#include "devices/PeripheralMouse.h"
 #include "devices/PeripheralNIC.h"
 #include "devices/PeripheralNyxboard.h"
 #include "devices/PeripheralTuner.h"
@@ -354,8 +355,12 @@
 peripheral = PeripheralPtr(new CPeripheralJoystick(*this, mappedResult, &bus));
 break;
 
- case PERIPHERAL_JOYSTICK_EMULATION:
- peripheral = PeripheralPtr(new CPeripheralJoystickEmulation(*this, mappedResult, &bus));
+ case PERIPHERAL_KEYBOARD:
+ peripheral = PeripheralPtr(new CPeripheralKeyboard(*this, mappedResult, &bus));
+ break;
+
+ case PERIPHERAL_MOUSE:
+ peripheral = PeripheralPtr(new CPeripheralMouse(*this, mappedResult, &bus));
 break;
 
 default:
@@ -387,10 +392,6 @@
 if (!bus.IsInitialised())
 bNotify = false;
 
- // don't show a notification for emulated peripherals
- if (peripheral.Type() == PERIPHERAL_JOYSTICK_EMULATION) //! @todo Change to peripheral.IsEmulated()
- bNotify = false;
-
 if (bNotify)
 CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, g_localizeStrings.Get(35005), peripheral.DeviceName());
 #endif
@@ -404,10 +405,6 @@
 #if 0
 bool bNotify = true;
 
- // don't show a notification for emulated peripherals
- if (peripheral.Type() == PERIPHERAL_JOYSTICK_EMULATION) //! @todo Change to peripheral.IsEmulated()
- bNotify = false;
-
 if (bNotify)
 CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Info, g_localizeStrings.Get(35006), peripheral.DeviceName());
 #endif
@@ -877,27 +874,11 @@
 {
 PeripheralVector peripherals;
 GetPeripheralsWithFeature(peripherals, FEATURE_JOYSTICK);
+ GetPeripheralsWithFeature(peripherals, FEATURE_KEYBOARD);
+ GetPeripheralsWithFeature(peripherals, FEATURE_MOUSE);
 
 for (auto& peripheral : peripherals)
- {
- if (mapper->Emulation())
- {
- if (peripheral->Type() != PERIPHERAL_JOYSTICK_EMULATION)
- continue;
-
- unsigned int controllerNumber = std::static_pointer_cast<CPeripheralJoystickEmulation>(peripheral)->ControllerNumber();
-
- if (mapper->ControllerNumber() != controllerNumber)
- continue;
- }
- else
- {
- if (peripheral->Type() != PERIPHERAL_JOYSTICK)
- continue;
- }
-
 peripheral->RegisterJoystickButtonMapper(mapper);
- }
 }
 
 void CPeripherals::UnregisterJoystickButtonMapper(IButtonMapper* mapper)
@@ -906,6 +887,8 @@
 
 PeripheralVector peripherals;
 GetPeripheralsWithFeature(peripherals, FEATURE_JOYSTICK);
+ GetPeripheralsWithFeature(peripherals, FEATURE_KEYBOARD);
+ GetPeripheralsWithFeature(peripherals, FEATURE_MOUSE);
 
 for (auto& peripheral : peripherals)
 peripheral->UnregisterJoystickButtonMapper(mapper);

_service:download_files:master.tar.gz/xbmc/peripherals/Peripherals.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.cpp Changed

@@ -176,7 +176,7 @@
 
 if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_ANALOG_STICK)
 {
- primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive(GetPrimitiveIndex(direction)));
+ primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive(GetAnalogStickIndex(direction)));
 retVal = primitive.IsValid();
 }
 }
@@ -190,7 +190,7 @@
 {
 using namespace JOYSTICK;
 
- JOYSTICK_FEATURE_PRIMITIVE primitiveIndex = GetPrimitiveIndex(direction);
+ JOYSTICK_FEATURE_PRIMITIVE primitiveIndex = GetAnalogStickIndex(direction);
 kodi::addon::DriverPrimitive addonPrimitive = CPeripheralAddonTranslator::TranslatePrimitive(primitive);
 
 kodi::addon::JoystickFeature analogStick(feature, JOYSTICK_FEATURE_TYPE_ANALOG_STICK);
@@ -216,7 +216,7 @@
 }
 
 bool CAddonButtonMap::GetRelativePointer(const FeatureName& feature,
- JOYSTICK::ANALOG_STICK_DIRECTION direction,
+ JOYSTICK::RELATIVE_POINTER_DIRECTION direction,
 JOYSTICK::CDriverPrimitive& primitive)
 {
 bool retVal(false);
@@ -230,7 +230,7 @@
 
 if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_RELPOINTER)
 {
- primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive(GetPrimitiveIndex(direction)));
+ primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive(GetRelativePointerIndex(direction)));
 retVal = primitive.IsValid();
 }
 }
@@ -239,12 +239,12 @@
 }
 
 void CAddonButtonMap::AddRelativePointer(const FeatureName& feature,
- JOYSTICK::ANALOG_STICK_DIRECTION direction,
+ JOYSTICK::RELATIVE_POINTER_DIRECTION direction,
 const JOYSTICK::CDriverPrimitive& primitive)
 {
 using namespace JOYSTICK;
 
- JOYSTICK_FEATURE_PRIMITIVE primitiveIndex = GetPrimitiveIndex(direction);
+ JOYSTICK_FEATURE_PRIMITIVE primitiveIndex = GetRelativePointerIndex(direction);
 kodi::addon::DriverPrimitive addonPrimitive = CPeripheralAddonTranslator::TranslatePrimitive(primitive);
 
 kodi::addon::JoystickFeature relPointer(feature, JOYSTICK_FEATURE_TYPE_RELPOINTER);
@@ -420,6 +420,36 @@
 Load();
 }
 
+bool CAddonButtonMap::GetKey(const FeatureName& feature, CDriverPrimitive& primitive)
+{
+ bool retVal(false);
+
+ CSingleLock lock(m_mutex);
+
+ FeatureMap::const_iterator it = m_features.find(feature);
+ if (it != m_features.end())
+ {
+ const kodi::addon::JoystickFeature& addonFeature = it->second;
+
+ if (addonFeature.Type() == JOYSTICK_FEATURE_TYPE_KEY)
+ {
+ primitive = CPeripheralAddonTranslator::TranslatePrimitive(addonFeature.Primitive(JOYSTICK_SCALAR_PRIMITIVE));
+ retVal = true;
+ }
+ }
+
+ return retVal;
+}
+
+void CAddonButtonMap::AddKey(const FeatureName& feature, const CDriverPrimitive& primitive)
+{
+ kodi::addon::JoystickFeature scalar(feature, JOYSTICK_FEATURE_TYPE_KEY);
+ scalar.SetPrimitive(JOYSTICK_SCALAR_PRIMITIVE, CPeripheralAddonTranslator::TranslatePrimitive(primitive));
+
+ if (auto addon = m_addon.lock())
+ addon->MapFeature(m_device, m_strControllerId, scalar);
+}
+
 void CAddonButtonMap::SetIgnoredPrimitives(const std::vector<JOYSTICK::CDriverPrimitive>& primitives)
 {
 if (auto addon = m_addon.lock())
@@ -478,13 +508,13 @@
 switch (feature.Type())
 {
 case JOYSTICK_FEATURE_TYPE_SCALAR:
+ case JOYSTICK_FEATURE_TYPE_KEY:
 {
 driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Primitive(JOYSTICK_SCALAR_PRIMITIVE))] = it->first;
 break;
 }
 
 case JOYSTICK_FEATURE_TYPE_ANALOG_STICK:
- case JOYSTICK_FEATURE_TYPE_RELPOINTER:
 {
 std::vector<JOYSTICK_FEATURE_PRIMITIVE> primitives = {
 JOYSTICK_ANALOG_STICK_UP,
@@ -542,6 +572,20 @@
 break;
 }
 
+ case JOYSTICK_FEATURE_TYPE_RELPOINTER:
+ {
+ std::vector<JOYSTICK_FEATURE_PRIMITIVE> primitives = {
+ JOYSTICK_RELPOINTER_UP,
+ JOYSTICK_RELPOINTER_DOWN,
+ JOYSTICK_RELPOINTER_RIGHT,
+ JOYSTICK_RELPOINTER_LEFT,
+ };
+
+ for (auto primitive : primitives)
+ driverMap[CPeripheralAddonTranslator::TranslatePrimitive(feature.Primitive(primitive))] = it->first;
+ break;
+ }
+
 default:
 break;
 }
@@ -550,7 +594,7 @@
 return driverMap;
 }
 
-JOYSTICK_FEATURE_PRIMITIVE CAddonButtonMap::GetPrimitiveIndex(JOYSTICK::ANALOG_STICK_DIRECTION dir)
+JOYSTICK_FEATURE_PRIMITIVE CAddonButtonMap::GetAnalogStickIndex(JOYSTICK::ANALOG_STICK_DIRECTION dir)
 {
 using namespace JOYSTICK;
 
@@ -566,6 +610,22 @@
 return static_cast<JOYSTICK_FEATURE_PRIMITIVE>(0);
 }
 
+JOYSTICK_FEATURE_PRIMITIVE CAddonButtonMap::GetRelativePointerIndex(JOYSTICK::RELATIVE_POINTER_DIRECTION dir)
+{
+ using namespace JOYSTICK;
+
+ switch (dir)
+ {
+ case RELATIVE_POINTER_DIRECTION::UP: return JOYSTICK_RELPOINTER_UP;
+ case RELATIVE_POINTER_DIRECTION::DOWN: return JOYSTICK_RELPOINTER_DOWN;
+ case RELATIVE_POINTER_DIRECTION::RIGHT: return JOYSTICK_RELPOINTER_RIGHT;
+ case RELATIVE_POINTER_DIRECTION::LEFT: return JOYSTICK_RELPOINTER_LEFT;
+ default: break;
+ }
+
+ return static_cast<JOYSTICK_FEATURE_PRIMITIVE>(0);
+}
+
 JOYSTICK_FEATURE_PRIMITIVE CAddonButtonMap::GetPrimitiveIndex(JOYSTICK::WHEEL_DIRECTION dir)
 {
 using namespace JOYSTICK;

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMap.h Changed

@@ -82,13 +82,13 @@
 
 bool GetRelativePointer(
 const KODI::JOYSTICK::FeatureName& feature,
- KODI::JOYSTICK::ANALOG_STICK_DIRECTION direction,
+ KODI::JOYSTICK::RELATIVE_POINTER_DIRECTION direction,
 KODI::JOYSTICK::CDriverPrimitive& primitive
 ) override;
 
 void AddRelativePointer(
 const KODI::JOYSTICK::FeatureName& feature,
- KODI::JOYSTICK::ANALOG_STICK_DIRECTION direction,
+ KODI::JOYSTICK::RELATIVE_POINTER_DIRECTION direction,
 const KODI::JOYSTICK::CDriverPrimitive& primitive
 ) override;
 
@@ -130,6 +130,16 @@
 const KODI::JOYSTICK::CDriverPrimitive& primitive
 ) override;
 
+ bool GetKey(
+ const KODI::JOYSTICK::FeatureName& feature,
+ KODI::JOYSTICK::CDriverPrimitive& primitive
+ ) override;
+
+ void AddKey(
+ const KODI::JOYSTICK::FeatureName& feature,
+ const KODI::JOYSTICK::CDriverPrimitive& primitive
+ ) override;
+
 void SetIgnoredPrimitives(const std::vector<KODI::JOYSTICK::CDriverPrimitive>& primitives) override;
 
 bool IsIgnored(const KODI::JOYSTICK::CDriverPrimitive& primitive) override;
@@ -147,7 +157,8 @@
 // Utility functions
 static DriverMap CreateLookupTable(const FeatureMap& features);
 
- static JOYSTICK_FEATURE_PRIMITIVE GetPrimitiveIndex(KODI::JOYSTICK::ANALOG_STICK_DIRECTION dir);
+ static JOYSTICK_FEATURE_PRIMITIVE GetAnalogStickIndex(KODI::JOYSTICK::ANALOG_STICK_DIRECTION dir);
+ static JOYSTICK_FEATURE_PRIMITIVE GetRelativePointerIndex(KODI::JOYSTICK::RELATIVE_POINTER_DIRECTION dir);
 static JOYSTICK_FEATURE_PRIMITIVE GetPrimitiveIndex(KODI::JOYSTICK::WHEEL_DIRECTION dir);
 static JOYSTICK_FEATURE_PRIMITIVE GetPrimitiveIndex(KODI::JOYSTICK::THROTTLE_DIRECTION dir);

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonButtonMapping.h Changed

@@ -21,6 +21,8 @@
 
 #include "input/joysticks/interfaces/IButtonMapCallback.h"
 #include "input/joysticks/interfaces/IDriverHandler.h"
+#include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
+#include "input/mouse/interfaces/IMouseDriverHandler.h"
 
 #include <memory>
 
@@ -40,6 +42,8 @@
 class CPeripherals;
 
 class CAddonButtonMapping : public KODI::JOYSTICK::IDriverHandler,
+ public KODI::KEYBOARD::IKeyboardDriverHandler,
+ public KODI::MOUSE::IMouseDriverHandler,
 public KODI::JOYSTICK::IButtonMapCallback
 {
 public:
@@ -53,6 +57,15 @@
 bool OnAxisMotion(unsigned int axisIndex, float position, int center, unsigned int range) override;
 void ProcessAxisMotions(void) override;
 
+ // implementation of IKeyboardDriverHandler
+ bool OnKeyPress(const CKey& key) override;
+ void OnKeyRelease(const CKey& key) override;
+
+ // implementation of IMouseDriverHandler
+ bool OnPosition(int x, int y) override;
+ bool OnButtonPress(KODI::MOUSE::BUTTON_ID button) override;
+ void OnButtonRelease(KODI::MOUSE::BUTTON_ID button) override;
+
 // implementation of IButtonMapCallback
 void SaveButtonMap() override;
 void ResetIgnoredPrimitives() override;

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.cpp Changed

@@ -23,6 +23,10 @@
 #include "input/joysticks/generic/InputHandling.h"
 #include "input/joysticks/interfaces/IInputHandler.h"
 #include "input/joysticks/interfaces/IDriverReceiver.h"
+#include "input/keyboard/generic/KeyboardInputHandling.h"
+#include "input/keyboard/interfaces/IKeyboardInputHandler.h"
+#include "input/mouse/generic/MouseInputHandling.h"
+#include "input/mouse/interfaces/IMouseInputHandler.h"
 #include "peripherals/addons/AddonButtonMap.h"
 #include "peripherals/devices/PeripheralJoystick.h"
 #include "peripherals/Peripherals.h"
@@ -62,10 +66,55 @@
   }
 }
 
+CAddonInputHandling::CAddonInputHandling(CPeripherals& manager, CPeripheral* peripheral, KEYBOARD::IKeyboardInputHandler* handler)
+{
+  PeripheralAddonPtr addon = manager.GetAddonWithButtonMap(peripheral);
+
+  if (!addon)
+  {
+    CLog::Log(LOGDEBUG, "Failed to locate add-on for \"%s\"", peripheral->DeviceName().c_str());
+  }
+  else
+  {
+    m_buttonMap.reset(new CAddonButtonMap(peripheral, addon, handler->ControllerID()));
+    if (m_buttonMap->Load())
+    {
+      m_keyboardHandler.reset(new KEYBOARD::CKeyboardInputHandling(handler, m_buttonMap.get()));
+    }
+    else
+    {
+      m_buttonMap.reset();
+    }
+  }
+}
+
+CAddonInputHandling::CAddonInputHandling(CPeripherals& manager, CPeripheral* peripheral, MOUSE::IMouseInputHandler* handler)
+{
+  PeripheralAddonPtr addon = manager.GetAddonWithButtonMap(peripheral);
+
+  if (!addon)
+  {
+    CLog::Log(LOGDEBUG, "Failed to locate add-on for \"%s\"", peripheral->DeviceName().c_str());
+  }
+  else
+  {
+    m_buttonMap.reset(new CAddonButtonMap(peripheral, addon, handler->ControllerID()));
+    if (m_buttonMap->Load())
+    {
+      m_mouseHandler.reset(new MOUSE::CMouseInputHandling(handler, m_buttonMap.get()));
+    }
+    else
+    {
+      m_buttonMap.reset();
+    }
+  }
+}
+
 CAddonInputHandling::~CAddonInputHandling(void)
 {
   m_driverHandler.reset();
   m_inputReceiver.reset();
+  m_keyboardHandler.reset();
   m_buttonMap.reset();
 }
 
@@ -99,6 +148,43 @@
     m_driverHandler->ProcessAxisMotions();
 }
 
+bool CAddonInputHandling::OnKeyPress(const CKey& key)
+{
+  if (m_keyboardHandler)
+    return m_keyboardHandler->OnKeyPress(key);
+
+  return false;
+}
+
+void CAddonInputHandling::OnKeyRelease(const CKey& key)
+{
+  if (m_keyboardHandler)
+    m_keyboardHandler->OnKeyRelease(key);
+}
+
+
+bool CAddonInputHandling::OnPosition(int x, int y)
+{
+  if (m_mouseHandler)
+    return m_mouseHandler->OnPosition(x, y);
+
+  return false;
+}
+
+bool CAddonInputHandling::OnButtonPress(MOUSE::BUTTON_ID button)
+{
+  if (m_mouseHandler)
+    return m_mouseHandler->OnButtonPress(button);
+
+  return false;
+}
+
+void CAddonInputHandling::OnButtonRelease(MOUSE::BUTTON_ID button)
+{
+  if (m_mouseHandler)
+    m_mouseHandler->OnButtonRelease(button);
+}
+
 bool CAddonInputHandling::SetRumbleState(const JOYSTICK::FeatureName& feature, float magnitude)
 {
   if (m_inputReceiver)

_service:download_files:master.tar.gz/xbmc/peripherals/addons/AddonInputHandling.h Changed

@@ -21,6 +21,8 @@
 
 #include "input/joysticks/interfaces/IDriverHandler.h"
 #include "input/joysticks/interfaces/IInputReceiver.h"
+#include "input/keyboard/interfaces/IKeyboardDriverHandler.h"
+#include "input/mouse/interfaces/IMouseDriverHandler.h"
 
 #include <memory>
 
@@ -32,6 +34,16 @@
 class IDriverReceiver;
 class IInputHandler;
 }
+
+namespace KEYBOARD
+{
+ class IKeyboardInputHandler;
+}
+
+namespace MOUSE
+{
+ class IMouseInputHandler;
+}
 }
 
 namespace PERIPHERALS
@@ -40,7 +52,9 @@
 class CPeripherals;
 
 class CAddonInputHandling : public KODI::JOYSTICK::IDriverHandler,
- public KODI::JOYSTICK::IInputReceiver
+ public KODI::JOYSTICK::IInputReceiver,
+ public KODI::KEYBOARD::IKeyboardDriverHandler,
+ public KODI::MOUSE::IMouseDriverHandler
 {
 public:
 CAddonInputHandling(CPeripherals& manager,
@@ -48,6 +62,14 @@
 KODI::JOYSTICK::IInputHandler* handler,
 KODI::JOYSTICK::IDriverReceiver* receiver);
 
+ CAddonInputHandling(CPeripherals& manager,
+ CPeripheral* peripheral,
+ KODI::KEYBOARD::IKeyboardInputHandler* handler);
+
+ CAddonInputHandling(CPeripherals& manager,
+ CPeripheral* peripheral,
+ KODI::MOUSE::IMouseInputHandler* handler);
+
 ~CAddonInputHandling(void) override;
 
 // implementation of IDriverHandler
@@ -56,12 +78,23 @@
 bool OnAxisMotion(unsigned int axisIndex, float position, int center, unsigned int range) override;
 void ProcessAxisMotions(void) override;
 
+ // implementation of IKeyboardDriverHandler
+ bool OnKeyPress(const CKey& key) override;
+ void OnKeyRelease(const CKey& key) override;
+
+ // implementation of IMouseDriverHandler
+ bool OnPosition(int x, int y) override;
+ bool OnButtonPress(KODI::MOUSE::BUTTON_ID button) override;
+ void OnButtonRelease(KODI::MOUSE::BUTTON_ID button) override;
+
 // implementation of IInputReceiver
 bool SetRumbleState(const KODI::JOYSTICK::FeatureName& feature, float magnitude) override;
 
 private:
 std::unique_ptr<KODI::JOYSTICK::IDriverHandler> m_driverHandler;
 std::unique_ptr<KODI::JOYSTICK::IInputReceiver> m_inputReceiver;
+ std::unique_ptr<KODI::KEYBOARD::IKeyboardDriverHandler> m_keyboardHandler;
+ std::unique_ptr<KODI::MOUSE::IMouseDriverHandler> m_mouseHandler;
 std::unique_ptr<KODI::JOYSTICK::IButtonMap> m_buttonMap;
 };
 }

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddon.cpp Changed

@@ -35,7 +35,6 @@
 #include "peripherals/Peripherals.h"
 #include "peripherals/bus/virtual/PeripheralBusAddon.h"
 #include "peripherals/devices/PeripheralJoystick.h"
-#include "peripherals/devices/PeripheralJoystickEmulation.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
@@ -50,8 +49,11 @@
 using namespace PERIPHERALS;
 using namespace XFILE;
 
-#define JOYSTICK_EMULATION_BUTTON_MAP_NAME "Keyboard"
-#define JOYSTICK_EMULATION_PROVIDER "application"
+#define KEYBOARD_BUTTON_MAP_NAME "Keyboard"
+#define KEYBOARD_PROVIDER "application"
+
+#define MOUSE_BUTTON_MAP_NAME "Mouse"
+#define MOUSE_PROVIDER "application"
 
 #ifndef SAFE_DELETE
 #define SAFE_DELETE(p) do { delete (p); (p) = NULL; } while (0)
@@ -829,12 +831,11 @@
 joystickInfo.SetMotorCount(joystick->MotorCount());
 joystickInfo.SetSupportsPowerOff(joystick->SupportsPowerOff());
 }
- else if (device->Type() == PERIPHERAL_JOYSTICK_EMULATION)
+ else if (device->Type() == PERIPHERAL_KEYBOARD ||
+ device->Type() == PERIPHERAL_MOUSE)
 {
- const CPeripheralJoystickEmulation* joystick = static_cast<const CPeripheralJoystickEmulation*>(device);
- joystickInfo.SetName(GetDeviceName(PERIPHERAL_JOYSTICK_EMULATION)); // Override name with non-localized version
- joystickInfo.SetProvider(GetProvider(PERIPHERAL_JOYSTICK_EMULATION));
- joystickInfo.SetIndex(joystick->ControllerNumber());
+ joystickInfo.SetName(GetDeviceName(device->Type())); // Override name with non-localized version
+ joystickInfo.SetProvider(GetProvider(device->Type()));
 }
 }
 
@@ -864,8 +865,10 @@
 {
 switch (type)
 {
- case PERIPHERAL_JOYSTICK_EMULATION:
- return JOYSTICK_EMULATION_BUTTON_MAP_NAME;
+ case PERIPHERAL_KEYBOARD:
+ return KEYBOARD_BUTTON_MAP_NAME;
+ case PERIPHERAL_MOUSE:
+ return MOUSE_BUTTON_MAP_NAME;
 default:
 break;
 }
@@ -877,8 +880,10 @@
 {
 switch (type)
 {
- case PERIPHERAL_JOYSTICK_EMULATION:
- return JOYSTICK_EMULATION_PROVIDER;
+ case PERIPHERAL_KEYBOARD:
+ return KEYBOARD_PROVIDER;
+ case PERIPHERAL_MOUSE:
+ return MOUSE_PROVIDER;
 default:
 break;
 }

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddonTranslator.cpp Changed

@@ -19,6 +19,7 @@
 */
 
 #include "PeripheralAddonTranslator.h"
+#include "games/controllers/ControllerTranslator.h"
 #include "input/joysticks/JoystickUtils.h"
 
 #include <algorithm>
@@ -65,8 +66,6 @@
 {
 case PERIPHERAL_TYPE_JOYSTICK:
 return PERIPHERAL_JOYSTICK;
- case PERIPHERAL_TYPE_KEYBOARD:
- return PERIPHERAL_JOYSTICK_EMULATION;
 default:
 break;
 }
@@ -79,8 +78,6 @@
 {
 case PERIPHERAL_JOYSTICK:
 return PERIPHERAL_TYPE_JOYSTICK;
- case PERIPHERAL_JOYSTICK_EMULATION:
- return PERIPHERAL_TYPE_KEYBOARD;
 default:
 break;
 }
@@ -113,6 +110,22 @@
 retVal = CDriverPrimitive(PRIMITIVE_TYPE::MOTOR, primitive.DriverIndex());
 break;
 }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_KEY:
+ {
+ XBMCKey keycode = GAME::CControllerTranslator::TranslateKeysym(primitive.Keycode());
+ retVal = CDriverPrimitive(keycode);
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_MOUSE_BUTTON:
+ {
+ retVal = CDriverPrimitive(TranslateMouseButton(primitive.MouseIndex()));
+ break;
+ }
+ case JOYSTICK_DRIVER_PRIMITIVE_TYPE_RELPOINTER_DIRECTION:
+ {
+ retVal = CDriverPrimitive(TranslateRelPointerDirection(primitive.RelPointerDirection()));
+ break;
+ }
 default:
 break;
 }
@@ -146,6 +159,22 @@
 retVal = kodi::addon::DriverPrimitive::CreateMotor(primitive.Index());
 break;
 }
+ case PRIMITIVE_TYPE::KEY:
+ {
+ std::string keysym = GAME::CControllerTranslator::TranslateKeycode(primitive.Keycode());
+ retVal = kodi::addon::DriverPrimitive(keysym);
+ break;
+ }
+ case PRIMITIVE_TYPE::MOUSE_BUTTON:
+ {
+ retVal = kodi::addon::DriverPrimitive::CreateMouseButton(TranslateMouseButton(primitive.MouseButton()));
+ break;
+ }
+ case PRIMITIVE_TYPE::RELATIVE_POINTER:
+ {
+ retVal = kodi::addon::DriverPrimitive(TranslateRelPointerDirection(primitive.PointerDirection()));
+ break;
+ }
 default:
 break;
 }
@@ -186,7 +215,7 @@
 default:
 break;
 }
- return HAT_DIRECTION::UNKNOWN;
+ return HAT_DIRECTION::NONE;
 }
 
 JOYSTICK_DRIVER_HAT_DIRECTION CPeripheralAddonTranslator::TranslateHatDirection(HAT_DIRECTION dir)
@@ -205,7 +234,7 @@
 
 HAT_STATE CPeripheralAddonTranslator::TranslateHatState(JOYSTICK_STATE_HAT state)
 {
- HAT_STATE translatedState = HAT_STATE::UNPRESSED;
+ HAT_STATE translatedState = HAT_STATE::NONE;
 
 if (state & JOYSTICK_STATE_HAT_UP) translatedState |= HAT_STATE::UP;
 if (state & JOYSTICK_STATE_HAT_DOWN) translatedState |= HAT_STATE::DOWN;
@@ -239,6 +268,75 @@
 return JOYSTICK_DRIVER_SEMIAXIS_UNKNOWN;
 }
 
+MOUSE::BUTTON_ID CPeripheralAddonTranslator::TranslateMouseButton(JOYSTICK_DRIVER_MOUSE_INDEX button)
+{
+ switch (button)
+ {
+ case JOYSTICK_DRIVER_MOUSE_INDEX_LEFT: return MOUSE::BUTTON_ID::LEFT;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_RIGHT: return MOUSE::BUTTON_ID::RIGHT;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_MIDDLE: return MOUSE::BUTTON_ID::MIDDLE;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON4: return MOUSE::BUTTON_ID::BUTTON4;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON5: return MOUSE::BUTTON_ID::BUTTON5;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_UP: return MOUSE::BUTTON_ID::WHEEL_UP;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_DOWN: return MOUSE::BUTTON_ID::WHEEL_DOWN;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_LEFT: return MOUSE::BUTTON_ID::HORIZ_WHEEL_LEFT;
+ case JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_RIGHT: return MOUSE::BUTTON_ID::HORIZ_WHEEL_RIGHT;
+ default:
+ break;
+ }
+
+ return MOUSE::BUTTON_ID::UNKNOWN;
+}
+
+JOYSTICK_DRIVER_MOUSE_INDEX CPeripheralAddonTranslator::TranslateMouseButton(MOUSE::BUTTON_ID button)
+{
+ switch (button)
+ {
+ case MOUSE::BUTTON_ID::LEFT: return JOYSTICK_DRIVER_MOUSE_INDEX_LEFT;
+ case MOUSE::BUTTON_ID::RIGHT: return JOYSTICK_DRIVER_MOUSE_INDEX_RIGHT;
+ case MOUSE::BUTTON_ID::MIDDLE: return JOYSTICK_DRIVER_MOUSE_INDEX_MIDDLE;
+ case MOUSE::BUTTON_ID::BUTTON4: return JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON4;
+ case MOUSE::BUTTON_ID::BUTTON5: return JOYSTICK_DRIVER_MOUSE_INDEX_BUTTON5;
+ case MOUSE::BUTTON_ID::WHEEL_UP: return JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_UP;
+ case MOUSE::BUTTON_ID::WHEEL_DOWN: return JOYSTICK_DRIVER_MOUSE_INDEX_WHEEL_DOWN;
+ case MOUSE::BUTTON_ID::HORIZ_WHEEL_LEFT: return JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_LEFT;
+ case MOUSE::BUTTON_ID::HORIZ_WHEEL_RIGHT: return JOYSTICK_DRIVER_MOUSE_INDEX_HORIZ_WHEEL_RIGHT;
+ default:
+ break;
+ }
+
+ return JOYSTICK_DRIVER_MOUSE_INDEX_UNKNOWN;
+}
+
+RELATIVE_POINTER_DIRECTION CPeripheralAddonTranslator::TranslateRelPointerDirection(JOYSTICK_DRIVER_RELPOINTER_DIRECTION dir)
+{
+ switch (dir)
+ {
+ case JOYSTICK_DRIVER_RELPOINTER_LEFT: return RELATIVE_POINTER_DIRECTION::LEFT;
+ case JOYSTICK_DRIVER_RELPOINTER_RIGHT: return RELATIVE_POINTER_DIRECTION::RIGHT;
+ case JOYSTICK_DRIVER_RELPOINTER_UP: return RELATIVE_POINTER_DIRECTION::UP;
+ case JOYSTICK_DRIVER_RELPOINTER_DOWN: return RELATIVE_POINTER_DIRECTION::DOWN;
+ default:
+ break;
+ }
+
+ return RELATIVE_POINTER_DIRECTION::NONE;
+}
+
+JOYSTICK_DRIVER_RELPOINTER_DIRECTION CPeripheralAddonTranslator::TranslateRelPointerDirection(RELATIVE_POINTER_DIRECTION dir)
+{
+ switch (dir)
+ {
+ case RELATIVE_POINTER_DIRECTION::UP: return JOYSTICK_DRIVER_RELPOINTER_UP;
+ case RELATIVE_POINTER_DIRECTION::DOWN: return JOYSTICK_DRIVER_RELPOINTER_DOWN;
+ case RELATIVE_POINTER_DIRECTION::RIGHT: return JOYSTICK_DRIVER_RELPOINTER_RIGHT;
+ case RELATIVE_POINTER_DIRECTION::LEFT: return JOYSTICK_DRIVER_RELPOINTER_LEFT;
+ default:
+ break;
+ }
+ return JOYSTICK_DRIVER_RELPOINTER_UNKNOWN;
+}
+
 JOYSTICK::FEATURE_TYPE CPeripheralAddonTranslator::TranslateFeatureType(JOYSTICK_FEATURE_TYPE type)
 {
 switch (type)
@@ -251,6 +349,7 @@
 case JOYSTICK_FEATURE_TYPE_ABSPOINTER: return JOYSTICK::FEATURE_TYPE::ABSPOINTER;
 case JOYSTICK_FEATURE_TYPE_WHEEL: return JOYSTICK::FEATURE_TYPE::WHEEL;
 case JOYSTICK_FEATURE_TYPE_THROTTLE: return JOYSTICK::FEATURE_TYPE::THROTTLE;
+ case JOYSTICK_FEATURE_TYPE_KEY: return JOYSTICK::FEATURE_TYPE::KEY;
 default:
 break;
 }
@@ -269,6 +368,7 @@
 case JOYSTICK::FEATURE_TYPE::ABSPOINTER: return JOYSTICK_FEATURE_TYPE_ABSPOINTER;
 case JOYSTICK::FEATURE_TYPE::WHEEL: return JOYSTICK_FEATURE_TYPE_WHEEL;
 case JOYSTICK::FEATURE_TYPE::THROTTLE: return JOYSTICK_FEATURE_TYPE_THROTTLE;
+ case JOYSTICK::FEATURE_TYPE::KEY: return JOYSTICK_FEATURE_TYPE_KEY;
 default:
 break;
 }

_service:download_files:master.tar.gz/xbmc/peripherals/addons/PeripheralAddonTranslator.h Changed

@@ -23,6 +23,7 @@
 #include "addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h"
 #include "input/joysticks/DriverPrimitive.h"
 #include "input/joysticks/JoystickTypes.h"
+#include "input/mouse/MouseTypes.h"
 #include "peripherals/PeripheralTypes.h"
 
 #include <vector>
@@ -51,6 +52,12 @@
 static KODI::JOYSTICK::SEMIAXIS_DIRECTION TranslateSemiAxisDirection(JOYSTICK_DRIVER_SEMIAXIS_DIRECTION dir);
 static JOYSTICK_DRIVER_SEMIAXIS_DIRECTION TranslateSemiAxisDirection(KODI::JOYSTICK::SEMIAXIS_DIRECTION dir);
 
+ static KODI::MOUSE::BUTTON_ID TranslateMouseButton(JOYSTICK_DRIVER_MOUSE_INDEX button);
+ static JOYSTICK_DRIVER_MOUSE_INDEX TranslateMouseButton(KODI::MOUSE::BUTTON_ID button);
+
+ static KODI::JOYSTICK::RELATIVE_POINTER_DIRECTION TranslateRelPointerDirection(JOYSTICK_DRIVER_RELPOINTER_DIRECTION dir);
+ static JOYSTICK_DRIVER_RELPOINTER_DIRECTION TranslateRelPointerDirection(KODI::JOYSTICK::RELATIVE_POINTER_DIRECTION dir);
+
 static KODI::JOYSTICK::FEATURE_TYPE TranslateFeatureType(JOYSTICK_FEATURE_TYPE type);
 static JOYSTICK_FEATURE_TYPE TranslateFeatureType(KODI::JOYSTICK::FEATURE_TYPE type);

_service:download_files:master.tar.gz/xbmc/peripherals/bus/PeripheralBus.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/PeripheralBus.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/PeripheralBusUSB.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/osx/PeripheralBusUSB.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/osx/PeripheralBusUSB.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusAddon.cpp Changed

@@ -42,7 +42,6 @@
   using namespace ADDON;
 
   CServiceBroker::GetAddonMgr().Events().Subscribe(this, &CPeripheralBusAddon::OnEvent);
-  CServiceBroker::GetAddonMgr().UnloadEvents().Subscribe(this, &CPeripheralBusAddon::OnEvent);
 
   UpdateAddons();
 }
@@ -51,7 +50,6 @@
 {
   using namespace ADDON;
 
-  CServiceBroker::GetAddonMgr().UnloadEvents().Unsubscribe(this);
   CServiceBroker::GetAddonMgr().Events().Unsubscribe(this);
 
   // stop everything before destroying any (loaded) addons
@@ -335,17 +333,20 @@
 void CPeripheralBusAddon::OnEvent(const ADDON::AddonEvent& event)
 {
   if (typeid(event) == typeid(ADDON::AddonEvents::Enabled) ||
-      typeid(event) == typeid(ADDON::AddonEvents::Load))
+      typeid(event) == typeid(ADDON::AddonEvents::ReInstalled))
   {
     if (CServiceBroker::GetAddonMgr().HasType(event.id, ADDON::ADDON_PERIPHERALDLL))
       UpdateAddons();
   }
-  else if (typeid(event) == typeid(ADDON::AddonEvents::Disabled) ||
-           typeid(event) == typeid(ADDON::AddonEvents::Unload))
+  else if (typeid(event) == typeid(ADDON::AddonEvents::Disabled))
   {
     if (CServiceBroker::GetAddonMgr().HasType(event.id, ADDON::ADDON_PERIPHERALDLL))
       UnRegisterAddon(event.id);
   }
+  else if (typeid(event) == typeid(ADDON::AddonEvents::UnInstalled))
+  {
+    UnRegisterAddon(event.id);
+  }
 }
 
 bool CPeripheralBusAddon::SplitLocation(const std::string& strLocation, PeripheralAddonPtr& addon, unsigned int& peripheralIndex) const
@@ -444,8 +445,6 @@
 
 void CPeripheralBusAddon::UnRegisterAddon(const std::string& addonId)
 {
-  CLog::Log(LOGDEBUG, "Add-on bus: Unregistering add-on %s", addonId.c_str());
-
   PeripheralAddonPtr erased;
   auto ErasePeripheralAddon = [&addonId, &erased](const PeripheralAddonPtr& addon)
     {
@@ -463,6 +462,7 @@
 
   if (erased)
   {
+    CLog::Log(LOGDEBUG, "Add-on bus: Unregistered add-on %s", addonId.c_str());
     CSingleExit exit(m_critSection);
     erased->DestroyAddon();
   }

_service:download_files:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusApplication.cpp Changed

@@ -41,17 +41,36 @@
 
 bool CPeripheralBusApplication::PerformDeviceScan(PeripheralScanResults& results)
 {
- const unsigned int controllerCount = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_GAMES_KEYBOARD_PLAYERS);
+ {
+ PeripheralScanResult result(Type());
+ result.m_type = PERIPHERAL_KEYBOARD;
+ result.m_strDeviceName = g_localizeStrings.Get(35150); // "Keyboard"
+ result.m_strLocation = PeripheralTypeTranslator::TypeToString(PERIPHERAL_KEYBOARD);
+ result.m_iVendorId = 0;
+ result.m_iProductId = 0;
+ result.m_mappedType = PERIPHERAL_KEYBOARD;
+ result.m_mappedBusType = Type();
+ result.m_iSequence = 0;
+
+ if (!results.ContainsResult(result))
+ results.m_results.push_back(result);
+ }
+
+ bool bHasMouse = CServiceBroker::GetSettings().GetBool(CSettings::SETTING_INPUT_ENABLEMOUSE);
+
+ //! @todo Fix game clients to handle mouse disconnecting
+ //! For now mouse is always connected
+ bHasMouse = true;
 
- for (unsigned int i = 1; i <= controllerCount; i++)
+ if (bHasMouse)
 {
 PeripheralScanResult result(Type());
- result.m_type = PERIPHERAL_JOYSTICK_EMULATION;
- result.m_strDeviceName = g_localizeStrings.Get(35165); // "Keyboard player"
- result.m_strLocation = MakeLocation(i);
+ result.m_type = PERIPHERAL_MOUSE;
+ result.m_strDeviceName = g_localizeStrings.Get(35171); // "Mouse"
+ result.m_strLocation = PeripheralTypeTranslator::TypeToString(PERIPHERAL_MOUSE);
 result.m_iVendorId = 0;
 result.m_iProductId = 0;
- result.m_mappedType = PERIPHERAL_JOYSTICK_EMULATION;
+ result.m_mappedType = PERIPHERAL_MOUSE;
 result.m_mappedBusType = Type();
 result.m_iSequence = 0;
 
@@ -64,7 +83,7 @@
 
 void CPeripheralBusApplication::GetDirectory(const std::string &strPath, CFileItemList &items) const
 {
- // Don't list emulated joysticks in the GUI
+ // Don't list virtual devices in the GUI
 }
 
 std::string CPeripheralBusApplication::MakeLocation(unsigned int controllerIndex) const

_service:download_files:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/virtual/PeripheralBusCEC.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/win10/PeripheralBusUSB.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/win10/PeripheralBusUSB.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/bus/win32/PeripheralBusUSB.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/Peripheral.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -584,6 +584,48 @@
 }
 }
 
+void CPeripheral::RegisterKeyboardHandler(KEYBOARD::IKeyboardInputHandler* handler, bool bPromiscuous)
+{
+ auto it = m_keyboardHandlers.find(handler);
+ if (it == m_keyboardHandlers.end())
+ {
+ std::unique_ptr<CAddonInputHandling> addonInput(new CAddonInputHandling(m_manager, this, handler));
+ RegisterKeyboardDriverHandler(addonInput.get(), bPromiscuous);
+ m_keyboardHandlers[handler] = std::move(addonInput);
+ }
+}
+
+void CPeripheral::UnregisterKeyboardHandler(KEYBOARD::IKeyboardInputHandler* handler)
+{
+ auto it = m_keyboardHandlers.find(handler);
+ if (it != m_keyboardHandlers.end())
+ {
+ UnregisterKeyboardDriverHandler(it->second.get());
+ m_keyboardHandlers.erase(it);
+ }
+}
+
+void CPeripheral::RegisterMouseHandler(MOUSE::IMouseInputHandler* handler, bool bPromiscuous)
+{
+ auto it = m_mouseHandlers.find(handler);
+ if (it == m_mouseHandlers.end())
+ {
+ std::unique_ptr<CAddonInputHandling> addonInput(new CAddonInputHandling(m_manager, this, handler));
+ RegisterMouseDriverHandler(addonInput.get(), bPromiscuous);
+ m_mouseHandlers[handler] = std::move(addonInput);
+ }
+}
+
+void CPeripheral::UnregisterMouseHandler(MOUSE::IMouseInputHandler* handler)
+{
+ auto it = m_mouseHandlers.find(handler);
+ if (it != m_mouseHandlers.end())
+ {
+ UnregisterMouseDriverHandler(it->second.get());
+ m_mouseHandlers.erase(it);
+ }
+}
+
 void CPeripheral::RegisterJoystickButtonMapper(IButtonMapper* mapper)
 {
 auto it = m_buttonMappers.find(mapper);
@@ -592,6 +634,8 @@
 std::unique_ptr<CAddonButtonMapping> addonMapping(new CAddonButtonMapping(m_manager, this, mapper));
 
 RegisterJoystickDriverHandler(addonMapping.get(), false);
+ RegisterKeyboardDriverHandler(addonMapping.get(), false);
+ RegisterMouseDriverHandler(addonMapping.get(), false);
 
 m_buttonMappers[mapper] = std::move(addonMapping);
 }
@@ -602,6 +646,8 @@
 auto it = m_buttonMappers.find(mapper);
 if (it != m_buttonMappers.end())
 {
+ UnregisterMouseDriverHandler(it->second.get());
+ UnregisterKeyboardDriverHandler(it->second.get());
 UnregisterJoystickDriverHandler(it->second.get());
 
 m_buttonMappers.erase(it);

_service:download_files:master.tar.gz/xbmc/peripherals/devices/Peripheral.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,6 +25,8 @@
 #include <vector>
 
 #include "input/joysticks/interfaces/IInputProvider.h"
+#include "input/keyboard/interfaces/IKeyboardInputProvider.h"
+#include "input/mouse/interfaces/IMouseInputProvider.h"
 #include "peripherals/PeripheralTypes.h"
 
 class TiXmlDocument;
@@ -40,6 +42,16 @@
 class IDriverReceiver;
 class IInputHandler;
 }
+
+namespace KEYBOARD
+{
+ class IKeyboardDriverHandler;
+}
+
+namespace MOUSE
+{
+ class IMouseDriverHandler;
+}
 }
 
 namespace PERIPHERALS
@@ -56,7 +68,9 @@
 STATE_STANDBY
 } CecStateChange;
 
- class CPeripheral : public KODI::JOYSTICK::IInputProvider
+ class CPeripheral : public KODI::JOYSTICK::IInputProvider,
+ public KODI::KEYBOARD::IKeyboardInputProvider,
+ public KODI::MOUSE::IMouseInputProvider
 {
 friend class CGUIDialogPeripheralSettings;
 
@@ -202,10 +216,24 @@
 virtual void RegisterJoystickDriverHandler(KODI::JOYSTICK::IDriverHandler* handler, bool bPromiscuous) { }
 virtual void UnregisterJoystickDriverHandler(KODI::JOYSTICK::IDriverHandler* handler) { }
 
+ virtual void RegisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler, bool bPromiscuous) { }
+ virtual void UnregisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler) { }
+
+ virtual void RegisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler, bool bPromiscuous) { }
+ virtual void UnregisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler) { }
+
 // implementation of IInputProvider
 void RegisterInputHandler(KODI::JOYSTICK::IInputHandler* handler, bool bPromiscuous) override;
 void UnregisterInputHandler(KODI::JOYSTICK::IInputHandler* handler) override;
 
+ // implementation of IKeyboardInputProvider
+ void RegisterKeyboardHandler(KODI::KEYBOARD::IKeyboardInputHandler* handler, bool bPromiscuous) override;
+ void UnregisterKeyboardHandler(KODI::KEYBOARD::IKeyboardInputHandler* handler) override;
+
+ // implementation of IMouseInputProvider
+ void RegisterMouseHandler(KODI::MOUSE::IMouseInputHandler* handler, bool bPromiscuous) override;
+ void UnregisterMouseHandler(KODI::MOUSE::IMouseInputHandler* handler) override;
+
 virtual void RegisterJoystickButtonMapper(KODI::JOYSTICK::IButtonMapper* mapper);
 virtual void UnregisterJoystickButtonMapper(KODI::JOYSTICK::IButtonMapper* mapper);
 
@@ -238,6 +266,8 @@
 std::set<std::string> m_changedSettings;
 CPeripheralBus* m_bus;
 std::map<KODI::JOYSTICK::IInputHandler*, std::unique_ptr<KODI::JOYSTICK::IDriverHandler>> m_inputHandlers;
+ std::map<KODI::KEYBOARD::IKeyboardInputHandler*, std::unique_ptr<KODI::KEYBOARD::IKeyboardDriverHandler>> m_keyboardHandlers;
+ std::map<KODI::MOUSE::IMouseInputHandler*, std::unique_ptr<KODI::MOUSE::IMouseDriverHandler>> m_mouseHandlers;
 std::map<KODI::JOYSTICK::IButtonMapper*, std::unique_ptr<CAddonButtonMapping>> m_buttonMappers;
 };
 }

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralBluetooth.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralBluetooth.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralCecAdapter.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -21,7 +21,7 @@
 #include "system.h"
 #if defined(HAVE_LIBCEC)
 #include "PeripheralCecAdapter.h"
-#include "input/XBIRRemote.h"
+#include "input/remote/IRRemote.h"
 #include "Application.h"
 #include "messaging/ApplicationMessenger.h"
 #include "DynamicDll.h"
@@ -808,7 +808,10 @@
   CLog::Log(LOGDEBUG, "%s - received key %2x duration %d", __FUNCTION__, key.iButton, key.iDuration);
 
   CSingleLock lock(m_critSection);
-  if (key.iDuration > 0)
+  // avoid the queue getting too long
+  if (m_configuration.iButtonRepeatRateMs && m_buttonQueue.size() > 5)
+    return;
+  if (m_configuration.iButtonRepeatRateMs == 0 && key.iDuration > 0)
   {
     if (m_currentButton.iButton == key.iButton && m_currentButton.iDuration == 0)
     {
@@ -1301,6 +1304,15 @@
   m_configuration.bActivateSource = config.bActivateSource;
   bChanged |= SetSetting("activate_source", m_configuration.bActivateSource == 1);
 
+  m_configuration.iDoubleTapTimeoutMs = config.iDoubleTapTimeoutMs;
+  bChanged |= SetSetting("double_tap_timeout_ms", (int)m_configuration.iDoubleTapTimeoutMs);
+
+  m_configuration.iButtonRepeatRateMs = config.iButtonRepeatRateMs;
+  bChanged |= SetSetting("button_repeat_rate_ms", (int)m_configuration.iButtonRepeatRateMs);
+
+  m_configuration.iButtonReleaseDelayMs = config.iButtonReleaseDelayMs;
+  bChanged |= SetSetting("button_release_delay_ms", (int)m_configuration.iButtonReleaseDelayMs);
+
   m_configuration.bPowerOffOnStandby = config.bPowerOffOnStandby;
 
   m_configuration.iFirmwareVersion = config.iFirmwareVersion;
@@ -1396,13 +1408,10 @@
   m_configuration.bPowerOffOnStandby = (iStandbyAction == LOCALISED_ID_SUSPEND || iStandbyAction == LOCALISED_ID_HIBERNATE) ? 1 : 0;
   m_bShutdownOnStandby = iStandbyAction == LOCALISED_ID_POWEROFF;
 
-#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD)
-  // double tap prevention timeout in ms. libCEC uses 50ms units for this in 2.2.0, so divide by 50
-  m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50;
-#else
-  // backwards compatibility. will be removed once the next major release of libCEC is out
+  // double tap prevention timeout in ms
   m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms");
-#endif
+  m_configuration.iButtonRepeatRateMs = GetSettingInt("button_repeat_rate_ms");
+  m_configuration.iButtonReleaseDelayMs = GetSettingInt("button_release_delay_ms");
 
   if (GetSettingBool("pause_playback_on_deactivate"))
   {

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralCecAdapter.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralDisk.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralDisk.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralHID.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralHID.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralImon.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralImon.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystick.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystickEmulation.cpp Deleted

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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 "PeripheralJoystickEmulation.h"
-#include "input/keyboard/generic/JoystickEmulation.h"
-#include "input/InputManager.h"
-#include "peripherals/Peripherals.h"
-#include "threads/SingleLock.h"
-
-#include <algorithm>
-#include <sstream>
-
-using namespace KODI;
-using namespace PERIPHERALS;
-
-CPeripheralJoystickEmulation::CPeripheralJoystickEmulation(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
- CPeripheral(manager, scanResult, bus)
-{
- m_features.push_back(FEATURE_JOYSTICK);
-}
-
-CPeripheralJoystickEmulation::~CPeripheralJoystickEmulation(void)
-{
- m_manager.GetInputManager().UnregisterKeyboardHandler(this);
-}
-
-bool CPeripheralJoystickEmulation::InitialiseFeature(const PeripheralFeature feature)
-{
- bool bSuccess = false;
-
- if (CPeripheral::InitialiseFeature(feature))
- {
- if (feature == FEATURE_JOYSTICK)
- {
- m_manager.GetInputManager().RegisterKeyboardHandler(this);
- }
- bSuccess = true;
- }
-
- return bSuccess;
-}
-
-void CPeripheralJoystickEmulation::RegisterJoystickDriverHandler(JOYSTICK::IDriverHandler* handler, bool bPromiscuous)
-{
- using namespace KEYBOARD;
-
- CSingleLock lock(m_mutex);
-
- KeyboardHandle handle{ handler, new CJoystickEmulation(handler), bPromiscuous };
- m_keyboardHandlers.insert(m_keyboardHandlers.begin(), std::move(handle));
-}
-
-void CPeripheralJoystickEmulation::UnregisterJoystickDriverHandler(JOYSTICK::IDriverHandler* handler)
-{
- CSingleLock lock(m_mutex);
-
- KeyboardHandlers::iterator it = std::find_if(m_keyboardHandlers.begin(), m_keyboardHandlers.end(),
- [handler](const KeyboardHandle &handle)
- {
- return handle.joystickHandler == handler;
- });
-
- if (it != m_keyboardHandlers.end())
- {
- delete it->handler;
- m_keyboardHandlers.erase(it);
- }
-}
-
-bool CPeripheralJoystickEmulation::OnKeyPress(const CKey& key)
-{
- CSingleLock lock(m_mutex);
-
- bool bHandled = false;
-
- // Process promiscuous handlers
- for (KeyboardHandlers::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
- {
- if (it->bPromiscuous)
- it->handler->OnKeyPress(key);
- }
-
- // Process handlers until one is handled
- for (KeyboardHandlers::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
- {
- if (!it->bPromiscuous)
- {
- bHandled = it->handler->OnKeyPress(key);
- if (bHandled)
- break;
- }
- }
-
- return bHandled;
-}
-
-void CPeripheralJoystickEmulation::OnKeyRelease(const CKey& key)
-{
- CSingleLock lock(m_mutex);
-
- for (KeyboardHandlers::iterator it = m_keyboardHandlers.begin(); it != m_keyboardHandlers.end(); ++it)
- it->handler->OnKeyRelease(key);
-}
-
-unsigned int CPeripheralJoystickEmulation::ControllerNumber(void) const
-{
- unsigned int number;
- std::istringstream str(m_strLocation);
- str >> number;
- return number;
-}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralJoystickEmulation.h Deleted

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2015-2017 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/keyboard/interfaces/IKeyboardHandler.h"
-#include "threads/CriticalSection.h"
-
-#include <vector>
-
-namespace PERIPHERALS
-{
- class CPeripheralJoystickEmulation : public CPeripheral,
- public KODI::KEYBOARD::IKeyboardHandler
- {
- public:
- CPeripheralJoystickEmulation(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus);
-
- ~CPeripheralJoystickEmulation(void) override;
-
- // implementation of CPeripheral
- bool InitialiseFeature(const PeripheralFeature feature) override;
- void RegisterJoystickDriverHandler(KODI::JOYSTICK::IDriverHandler* handler, bool bPromiscuous) override;
- void UnregisterJoystickDriverHandler(KODI::JOYSTICK::IDriverHandler* handler) override;
-
- // implementation of IKeyboardHandler
- bool OnKeyPress(const CKey& key) override;
- void OnKeyRelease(const CKey& key) override;
-
- /*!
- * \brief Number of the emulated controller (1-indexed)
- */
- unsigned int ControllerNumber(void) const;
-
- private:
- struct KeyboardHandle
- {
- KODI::JOYSTICK::IDriverHandler* joystickHandler;
- KODI::KEYBOARD::IKeyboardHandler* handler;
- bool bPromiscuous;
- };
-
- using KeyboardHandlers = std::vector<KeyboardHandle>;
-
- KeyboardHandlers m_keyboardHandlers;
- CCriticalSection m_mutex;
- };
-}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralKeyboard.cpp Added

@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2017 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 "PeripheralKeyboard.h"
+#include "input/InputManager.h"
+#include "peripherals/Peripherals.h"
+#include "threads/SingleLock.h"
+
+#include <sstream>
+
+using namespace KODI;
+using namespace PERIPHERALS;
+
+CPeripheralKeyboard::CPeripheralKeyboard(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
+ CPeripheral(manager, scanResult, bus)
+{
+ // Initialize CPeripheral
+ m_features.push_back(FEATURE_KEYBOARD);
+}
+
+CPeripheralKeyboard::~CPeripheralKeyboard(void)
+{
+ m_manager.GetInputManager().UnregisterKeyboardDriverHandler(this);
+}
+
+bool CPeripheralKeyboard::InitialiseFeature(const PeripheralFeature feature)
+{
+ bool bSuccess = false;
+
+ if (CPeripheral::InitialiseFeature(feature))
+ {
+ switch (feature)
+ {
+ case FEATURE_KEYBOARD:
+ {
+ m_manager.GetInputManager().RegisterKeyboardDriverHandler(this);
+ break;
+ }
+ default:
+ break;
+ }
+
+ bSuccess = true;
+ }
+
+ return bSuccess;
+}
+
+void CPeripheralKeyboard::RegisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler, bool bPromiscuous)
+{
+ CSingleLock lock(m_mutex);
+
+ KeyboardHandle handle{ handler, bPromiscuous };
+ m_keyboardHandlers.insert(m_keyboardHandlers.begin(), handle);
+}
+
+void CPeripheralKeyboard::UnregisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler)
+{
+ CSingleLock lock(m_mutex);
+
+ auto it = std::find_if(m_keyboardHandlers.begin(), m_keyboardHandlers.end(),
+ [handler](const KeyboardHandle &handle)
+ {
+ return handle.handler == handler;
+ });
+
+ if (it != m_keyboardHandlers.end())
+ m_keyboardHandlers.erase(it);
+}
+
+bool CPeripheralKeyboard::OnKeyPress(const CKey& key)
+{
+ CSingleLock lock(m_mutex);
+
+ bool bHandled = false;
+
+ // Process promiscuous handlers
+ for (const KeyboardHandle &handle : m_keyboardHandlers)
+ {
+ if (handle.bPromiscuous)
+ handle.handler->OnKeyPress(key);
+ }
+
+ // Process handlers until one is handled
+ for (const KeyboardHandle &handle : m_keyboardHandlers)
+ {
+ if (!handle.bPromiscuous)
+ {
+ bHandled = handle.handler->OnKeyPress(key);
+ if (bHandled)
+ break;
+ }
+ }
+
+ return bHandled;
+}
+
+void CPeripheralKeyboard::OnKeyRelease(const CKey& key)
+{
+ CSingleLock lock(m_mutex);
+
+ for (const KeyboardHandle &handle : m_keyboardHandlers)
+ handle.handler->OnKeyRelease(key);
+}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralKeyboard.h Added

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2017 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/keyboard/interfaces/IKeyboardDriverHandler.h"
+#include "threads/CriticalSection.h"
+
+#include <vector>
+
+namespace PERIPHERALS
+{
+ class CPeripheralKeyboard : public CPeripheral,
+ public KODI::KEYBOARD::IKeyboardDriverHandler
+ {
+ public:
+ CPeripheralKeyboard(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus);
+
+ ~CPeripheralKeyboard(void) override;
+
+ // implementation of CPeripheral
+ bool InitialiseFeature(const PeripheralFeature feature) override;
+ void RegisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler, bool bPromiscuous) override;
+ void UnregisterKeyboardDriverHandler(KODI::KEYBOARD::IKeyboardDriverHandler* handler) override;
+
+ // implementation of IKeyboardDriverHandler
+ bool OnKeyPress(const CKey& key) override;
+ void OnKeyRelease(const CKey& key) override;
+
+ private:
+ struct KeyboardHandle
+ {
+ KODI::KEYBOARD::IKeyboardDriverHandler* handler;
+ bool bPromiscuous;
+ };
+
+ std::vector<KeyboardHandle> m_keyboardHandlers;
+ CCriticalSection m_mutex;
+ };
+}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralMouse.cpp Added

@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2017-2018 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 "PeripheralMouse.h"
+#include "input/InputManager.h"
+#include "peripherals/Peripherals.h"
+#include "threads/SingleLock.h"
+
+#include <sstream>
+
+using namespace KODI;
+using namespace PERIPHERALS;
+
+CPeripheralMouse::CPeripheralMouse(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus) :
+ CPeripheral(manager, scanResult, bus)
+{
+ // Initialize CPeripheral
+ m_features.push_back(FEATURE_MOUSE);
+}
+
+CPeripheralMouse::~CPeripheralMouse(void)
+{
+ m_manager.GetInputManager().UnregisterMouseDriverHandler(this);
+}
+
+bool CPeripheralMouse::InitialiseFeature(const PeripheralFeature feature)
+{
+ bool bSuccess = false;
+
+ if (CPeripheral::InitialiseFeature(feature))
+ {
+ if (feature == FEATURE_MOUSE)
+ {
+ m_manager.GetInputManager().RegisterMouseDriverHandler(this);
+ }
+
+ bSuccess = true;
+ }
+
+ return bSuccess;
+}
+
+void CPeripheralMouse::RegisterMouseDriverHandler(MOUSE::IMouseDriverHandler* handler, bool bPromiscuous)
+{
+ using namespace KEYBOARD;
+
+ CSingleLock lock(m_mutex);
+
+ MouseHandle handle{ handler, bPromiscuous };
+ m_mouseHandlers.insert(m_mouseHandlers.begin(), handle);
+}
+
+void CPeripheralMouse::UnregisterMouseDriverHandler(MOUSE::IMouseDriverHandler* handler)
+{
+ CSingleLock lock(m_mutex);
+
+ auto it = std::find_if(m_mouseHandlers.begin(), m_mouseHandlers.end(),
+ [handler](const MouseHandle &handle)
+ {
+ return handle.handler == handler;
+ });
+
+ if (it != m_mouseHandlers.end())
+ m_mouseHandlers.erase(it);
+}
+
+bool CPeripheralMouse::OnPosition(int x, int y)
+{
+ CSingleLock lock(m_mutex);
+
+ bool bHandled = false;
+
+ // Process promiscuous handlers
+ for (const MouseHandle &handle : m_mouseHandlers)
+ {
+ if (handle.bPromiscuous)
+ handle.handler->OnPosition(x, y);
+ }
+
+ // Process handlers until one is handled
+ for (const MouseHandle &handle : m_mouseHandlers)
+ {
+ if (!handle.bPromiscuous)
+ {
+ bHandled = handle.handler->OnPosition(x, y);
+ if (bHandled)
+ break;
+ }
+ }
+
+ return bHandled;
+}
+
+bool CPeripheralMouse::OnButtonPress(MOUSE::BUTTON_ID button)
+{
+ CSingleLock lock(m_mutex);
+
+ bool bHandled = false;
+
+ // Process promiscuous handlers
+ for (const MouseHandle &handle : m_mouseHandlers)
+ {
+ if (handle.bPromiscuous)
+ handle.handler->OnButtonPress(button);
+ }
+
+ // Process handlers until one is handled
+ for (const MouseHandle &handle : m_mouseHandlers)
+ {
+ if (!handle.bPromiscuous)
+ {
+ bHandled = handle.handler->OnButtonPress(button);
+ if (bHandled)
+ break;
+ }
+ }
+
+ return bHandled;
+}
+
+void CPeripheralMouse::OnButtonRelease(MOUSE::BUTTON_ID button)
+{
+ CSingleLock lock(m_mutex);
+
+ for (const MouseHandle &handle : m_mouseHandlers)
+ handle.handler->OnButtonRelease(button);
+}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralMouse.h Added

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2017-2018 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/mouse/interfaces/IMouseDriverHandler.h"
+#include "threads/CriticalSection.h"
+
+#include <vector>
+
+namespace PERIPHERALS
+{
+ class CPeripheralMouse : public CPeripheral,
+ public KODI::MOUSE::IMouseDriverHandler
+ {
+ public:
+ CPeripheralMouse(CPeripherals& manager, const PeripheralScanResult& scanResult, CPeripheralBus* bus);
+
+ ~CPeripheralMouse(void) override;
+
+ // implementation of CPeripheral
+ bool InitialiseFeature(const PeripheralFeature feature) override;
+ void RegisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler, bool bPromiscuous) override;
+ void UnregisterMouseDriverHandler(KODI::MOUSE::IMouseDriverHandler* handler) override;
+
+ // implementation of IMouseDriverHandler
+ bool OnPosition(int x, int y) override;
+ bool OnButtonPress(KODI::MOUSE::BUTTON_ID button) override;
+ void OnButtonRelease(KODI::MOUSE::BUTTON_ID button) override;
+
+ private:
+ struct MouseHandle
+ {
+ KODI::MOUSE::IMouseDriverHandler* handler;
+ bool bPromiscuous;
+ };
+
+ std::vector<MouseHandle> m_mouseHandlers;
+ CCriticalSection m_mutex;
+ };
+}

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralNIC.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralNIC.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralNyxboard.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralNyxboard.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralTuner.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/devices/PeripheralTuner.h Changed

_service:download_files:master.tar.gz/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/ExifParse.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIDialogPictureInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIDialogPictureInfo.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIViewStatePictures.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIViewStatePictures.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowPictures.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowPictures.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowSlideShow.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/GUIWindowSlideShow.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/IptcParse.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/JpegParse.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/Picture.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -50,7 +50,7 @@
 
 // get an image handler
 IImage* image = ImageFactory::CreateLoader(thumbFile);
- if (image == NULL || !image->CreateThumbnailFromSurface((BYTE *)buffer, width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str(), thumb, thumbsize))
+ if (image == NULL || !image->CreateThumbnailFromSurface(const_cast<unsigned char*>(buffer), width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str(), thumb, thumbsize))
 {
 delete image;
 return false;
@@ -74,7 +74,7 @@
 if (URIUtils::HasExtension(thumbFile, ".jpg"))
 {
 #if defined(TARGET_RASPBERRY_PI)
- if (COMXImage::CreateThumbnailFromSurface((BYTE *)buffer, width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str()))
+ if (COMXImage::CreateThumbnailFromSurface(const_cast<unsigned char*>(buffer), width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str()))
 return true;
 #endif
 }
@@ -82,7 +82,7 @@
 unsigned char *thumb = NULL;
 unsigned int thumbsize=0;
 IImage* pImage = ImageFactory::CreateLoader(thumbFile);
- if(pImage == NULL || !pImage->CreateThumbnailFromSurface((BYTE *)buffer, width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str(), thumb, thumbsize))
+ if(pImage == NULL || !pImage->CreateThumbnailFromSurface(const_cast<unsigned char*>(buffer), width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str(), thumb, thumbsize))
 {
 CLog::Log(LOGERROR, "Failed to CreateThumbnailFromSurface for %s", CURL::GetRedacted(thumbFile).c_str());
 delete pImage;

_service:download_files:master.tar.gz/xbmc/pictures/Picture.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureInfoLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureInfoLoader.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureInfoTag.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureScalingAlgorithm.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureScalingAlgorithm.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureThumbLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/pictures/PictureThumbLoader.h Changed

_service:download_files:master.tar.gz/xbmc/pictures/SlideShowPicture.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -39,6 +39,9 @@
 #elif defined(TARGET_WINDOWS)
 #include "rendering/dx/DeviceResources.h"
 #include "rendering/dx/RenderContext.h"
+#include <DirectXMath.h>
+using namespace DirectX;
+using namespace Microsoft::WRL;
 #endif
 
 #define IMMEDIATE_TRANSITION_TIME 20
@@ -64,9 +67,6 @@
 
 m_bCanMoveHorizontally = false;
 m_bCanMoveVertically = false;
-#ifdef HAS_DX
- m_vb = NULL;
-#endif
 }
 
 CSlideShowPic::~CSlideShowPic()
@@ -80,7 +80,7 @@
 if (m_pImage)
 {
 delete m_pImage;
- m_pImage = NULL;
+ m_pImage = nullptr;
 }
 m_bIsLoaded = false;
 m_bIsFinished = false;
@@ -89,7 +89,7 @@
 m_bIsDirty = true;
 m_alpha = 0;
 #ifdef HAS_DX
- SAFE_RELEASE(m_vb);
+ m_vb = nullptr;
 #endif
 }
 
@@ -268,7 +268,7 @@
 if (m_pImage)
 {
 delete m_pImage;
- m_pImage = NULL;
+ m_pImage = nullptr;
 }
 m_pImage = pTexture;
 m_fWidth = (float)pTexture->GetWidth();
@@ -774,17 +774,17 @@
 D3D11_SUBRESOURCE_DATA initData = {};
 initData.pSysMem = vertices;
 initData.SysMemPitch = sizeof(Vertex) * 5;
- if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DDevice()->CreateBuffer(&desc, &initData, &m_vb)))
+ if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DDevice()->CreateBuffer(&desc, &initData, m_vb.ReleaseAndGetAddressOf())))
 return true;
 }
 else // update 
 {
 ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
 D3D11_MAPPED_SUBRESOURCE res;
- if (SUCCEEDED(pContext->Map(m_vb, 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
+ if (SUCCEEDED(pContext->Map(m_vb.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
 {
 memcpy(res.pData, vertices, sizeof(Vertex) * 5);
- pContext->Unmap(m_vb, 0);
+ pContext->Unmap(m_vb.Get(), 0);
 return true;
 }
 }
@@ -834,11 +834,11 @@
 if (!UpdateVertexBuffer(vertex))
 return;
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 
 unsigned stride = sizeof(Vertex);
 unsigned offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP);
 
 pGUIShader->Draw(5, 0);

_service:download_files:master.tar.gz/xbmc/pictures/SlideShowPicture.h Changed

_service:download_files:master.tar.gz/xbmc/platform/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/Environment.cpp Added

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2013 Team XBMC
+ * 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/>.
+ *
+ */
+
+/**
+ * \file platform\Environment.cpp
+ * \brief Implements CEnvironment class functions.
+ *
+ * Some ideas were inspired by PostgreSQL's pgwin32_putenv function.
+ * Refined, updated, enhanced and modified for XBMC by Karlson2k.
+ */
+
+#include "Environment.h"
+#include <stdlib.h>
+
+
+// --------------------- Main Functions ---------------------
+
+int CEnvironment::setenv(const std::string &name, const std::string &value, int overwrite /*= 1*/)
+{
+#ifdef TARGET_WINDOWS
+ return (win_setenv(name, value, overwrite ? autoDetect : addOnly) == 0) ? 0 : -1;
+#else
+ if (value.empty() && overwrite != 0)
+ return ::unsetenv(name.c_str());
+ return ::setenv(name.c_str(), value.c_str(), overwrite);
+#endif
+}
+
+std::string CEnvironment::getenv(const std::string &name)
+{
+#ifdef TARGET_WINDOWS
+ return win_getenv(name);
+#else
+ char * str = ::getenv(name.c_str());
+ if (str == NULL)
+ return "";
+ return str;
+#endif
+}
+
+int CEnvironment::unsetenv(const std::string &name)
+{
+#ifdef TARGET_WINDOWS
+ return (win_setenv(name, "", deleteVariable)) == 0 ? 0 : -1;
+#else
+ return ::unsetenv(name.c_str());
+#endif
+}
+
+int CEnvironment::putenv(const std::string &envstring)
+{
+ if (envstring.empty())
+ return 0;
+ size_t pos = envstring.find('=');
+ if (pos == 0) // '=' is the first character
+ return -1;
+ if (pos == std::string::npos)
+ return unsetenv(envstring);
+ if (pos == envstring.length()-1) // '=' is in last position
+ {
+ std::string name(envstring);
+ name.erase(name.length()-1, 1);
+ return unsetenv(name);
+ }
+ std::string name(envstring, 0, pos), value(envstring, pos+1);
+
+ return setenv(name, value);
+}
+

_service:download_files:master.tar.gz/xbmc/platform/Environment.h Added

@@ -0,0 +1,111 @@
+#pragma once
+#ifndef XBMC_SETENV_H
+#define XBMC_SETENV_H
+/*
+ * Copyright (C) 2013 Team XBMC
+ * 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/>.
+ *
+ */
+
+/**
+ * \file utils\Environment.h
+ * \brief Declares CEnvironment class for platform-independent environment variables manipulations.
+ * 		
+ */
+#include <string>
+
+/**
+ * @class CEnvironment
+ *
+ * @brief Platform-independent environment variables manipulations.
+ *
+ * 	Provide analog for POSIX functions:
+ * 	+ setenv 
+ * 	+ unsetenv 
+ * 	+ putenv 
+ * 	+ getenv
+ *
+ * 	You can generally use the functions as you would normally in POSIX-style.
+ * The differences below are just to make things more convenient through use of std::string (2,3),
+ * and to also allow the Win32-style of unsetting variables (4,5) if wanted.
+ * 	1. CEnvironment::setenv parameter 'overwrite' is optional, set by default to 1 (allow overwrite).
+ * 	2. CEnvironment::putenv uses copy of provided string (rather than string itself) to change environment,
+ * so you can free parameter variable right after call of function.
+ * 	3. CEnvironment::getenv returns a copy of environment variable value instead of pointer to value.
+ * 	4. CEnvironment::setenv can be used to unset variables. Just pass empty string for 'value' parameter. 
+ * 	5. CEnvironment::putenv can be used to unset variables. Set parameter to 'var=' (Windows style) or 
+ * just 'var' (POSIX style), and 'var' will be unset. 
+ * 	
+ * 	All 'std::string' types are supposed to be in UTF-8 encoding.
+ * 	All functions work on all platforms. Special care is taken on Windows platform where Environment is changed for process itself, 
+ * 	for process runtime library and for all runtime libraries (MSVCRT) loaded by third-party modules.
+ * 	Functions internally make all necessary UTF-8 <-> wide conversions.*
+ */
+
+class CEnvironment
+{
+public:
+ /**
+ * \fn static int CEnvironment::setenv(const std::string &name, const std::string &value,
+ * int overwrite = 1);
+ * \brief Sets or unsets environment variable.
+ * \param name The environment variable name to add/modify/delete.
+ * \param value The environment variable new value. If set to empty string, variable will be 
+ * 					deleted from the environment.
+ * \param overwrite (optional) If set to non-zero, existing variable will be overwritten. If set to zero and
+ * 					variable is already present, then variable will be unchanged and function returns success.
+ * \return Zero on success, non-zero on error.
+ */
+ static int setenv(const std::string &name, const std::string &value, int overwrite = 1);
+ /**
+ * \fn static int CEnvironment::unsetenv(const std::string &name);
+ * \brief Deletes environment variable.
+ * \param name The environment variable name to delete.
+ * \return Zero on success, non-zero on error.
+ */
+ static int unsetenv(const std::string &name);
+
+ /**
+ * \fn static int CEnvironment::putenv(const std::string &envstring);
+ * \brief Adds/modifies/deletes environment variable.
+ * \param envstring The variable-value string in form 'var=value'. If set to 'var=' or 'var', then variable 
+ * 					will be deleted from the environment.
+ * \return Zero on success, non-zero on error.
+ */
+ static int putenv(const std::string &envstring);
+ /**
+ * \fn static std::string CEnvironment::getenv(const std::string &name);
+ * \brief Gets value of environment variable in UTF-8 encoding.
+ * \param name The name of environment variable.
+ * \return Copy of of environment variable value or empty string if variable in not present in environment.
+ * \sa xbmc_getenvUtf8, xbmc_getenvW
+ */
+ static std::string getenv(const std::string &name);
+private:
+#ifdef TARGET_WINDOWS
+ enum updateAction:int 
+ {
+ addOrUpdateOnly = -2, 
+ deleteVariable = -1, 
+ addOnly = 0, 
+ autoDetect = 1
+ };
+ static int win_setenv(const std::string &name, const std::string &value = "", updateAction action = autoDetect);
+ static std::string win_getenv(const std::string &name);
+#endif // TARGET_WINDOWS
+};
+#endif

_service:download_files:master.tar.gz/xbmc/platform/Filesystem.h Changed

@@ -1,43 +1,43 @@
-#pragma once
-/*
-* Copyright (C) 2005-2017 Team Kodi
-* 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>
-#include <system_error>
-namespace KODI
-{
-namespace PLATFORM
-{
-namespace FILESYSTEM
-{
-struct space_info {
- std::uintmax_t capacity;
- std::uintmax_t free;
- std::uintmax_t available;
-};
-
-space_info space(const std::string &path, std::error_code &ec);
-
-std::string temp_directory_path(std::error_code &ec);
-std::string create_temp_directory(std::error_code &ec);
-std::string temp_file_path(std::string suffix, std::error_code &ec);
-}
-}
-}
\ No newline at end of file
+#pragma once
+/*
+* Copyright (C) 2005-2017 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 <string>
+#include <system_error>
+namespace KODI
+{
+namespace PLATFORM
+{
+namespace FILESYSTEM
+{
+struct space_info {
+ std::uintmax_t capacity;
+ std::uintmax_t free;
+ std::uintmax_t available;
+};
+
+space_info space(const std::string &path, std::error_code &ec);
+
+std::string temp_directory_path(std::error_code &ec);
+std::string create_temp_directory(std::error_code &ec);
+std::string temp_file_path(std::string suffix, std::error_code &ec);
+}
+}
+}

_service:download_files:master.tar.gz/xbmc/platform/MessagePrinter.h Changed

_service:download_files:master.tar.gz/xbmc/platform/XbmcContext.cpp Deleted

@@ -1,60 +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 "XbmcContext.h"
-
-#include "threads/Thread.h"
-#include "commons/Exception.h"
-#include "utils/log.h"
-
-namespace XBMC
-{
-
- class ContextOpaque
- {
- public:
- XbmcCommons::ILogger* loggerImpl;
-
- ContextOpaque() : loggerImpl(NULL) {}
- };
-
- Context::Context()
- {
- impl = new ContextOpaque;
-
- // instantiate
- impl->loggerImpl = new XbmcUtils::LogImplementation;
-
- // set
- XbmcCommons::Exception::SetLogger(impl->loggerImpl);
- CThread::SetLogger(impl->loggerImpl);
- }
-
- Context::~Context()
- {
- // cleanup
- XbmcCommons::Exception::SetLogger(NULL);
- CThread::SetLogger(NULL);
- delete impl->loggerImpl;
-
- delete impl;
- }
-}
-

_service:download_files:master.tar.gz/xbmc/platform/XbmcContext.h Deleted

@@ -1,45 +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/>.
- *
- */
-
-#pragma once
-
-namespace XBMC
-{
- class ContextOpaque;
-
- /**
- * This class sets up a few instances and services. Currently it only
- * provides a logger to the CThread functionality. If it never does
- * more than this it can be removed.
- */
- class Context
- {
- ContextOpaque* impl;
- public:
- Context();
- virtual ~Context();
- private:
- Context(const Context&) = delete;
- Context& operator=(const Context&) = delete;
- };
-}
-
-
-

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidExtra.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidFeatures.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidFeatures.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidJoyStick.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidJoyStick.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidKey.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidKey.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidMouse.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidMouse.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidTouch.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/AndroidTouch.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/DllGraphicBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/EventLoop.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/EventLoop.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/GraphicBuffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/GraphicBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/IActivityHandler.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/IInputDeviceCallbacks.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/IInputDeviceEventHandler.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/IInputHandler.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIMainActivity.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIMainActivity.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCFile.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCFile.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCJsonHandler.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCJsonHandler.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMainView.cpp Added

@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 Christian Browet
+ * 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 "JNIXBMCMainView.h"
+
+#include <androidjni/jutils-details.hpp>
+#include <androidjni/Context.h>
+
+#include "utils/StringUtils.h"
+#include "utils/log.h"
+
+#include <list>
+#include <algorithm>
+#include <cassert>
+
+#include "CompileInfo.h"
+
+using namespace jni;
+
+static std::string s_className = std::string(CCompileInfo::GetClass()) + "/XBMCMainView";
+CEvent CJNIXBMCMainView::m_surfaceCreated;
+CJNIXBMCMainView* CJNIXBMCMainView::m_instance = nullptr;
+
+void CJNIXBMCMainView::RegisterNatives(JNIEnv* env)
+{
+ jclass cClass = env->FindClass(s_className.c_str());
+ if(cClass)
+ {
+ JNINativeMethod methods[] =
+ {
+ {"_attach", "()V", (void*)&CJNIXBMCMainView::_attach},
+ {"_surfaceChanged", "(Landroid/view/SurfaceHolder;III)V", (void*)&CJNIXBMCMainView::_surfaceChanged},
+ {"_surfaceCreated", "(Landroid/view/SurfaceHolder;)V", (void*)&CJNIXBMCMainView::_surfaceCreated},
+ {"_surfaceDestroyed", "(Landroid/view/SurfaceHolder;)V", (void*)&CJNIXBMCMainView::_surfaceDestroyed}
+ };
+
+ env->RegisterNatives(cClass, methods, sizeof(methods)/sizeof(methods[0]));
+ }
+}
+
+CJNIXBMCMainView::CJNIXBMCMainView(CJNISurfaceHolderCallback* callback)
+ : m_callback(callback)
+{
+ m_instance = this;
+}
+
+CJNIXBMCMainView::~CJNIXBMCMainView()
+{
+}
+
+void CJNIXBMCMainView::_attach(JNIEnv* env, jobject thiz)
+{
+ (void)env;
+
+ if (m_instance)
+ m_instance->attach(thiz);
+}
+
+void CJNIXBMCMainView::_surfaceChanged(JNIEnv *env, jobject thiz, jobject holder, jint format, jint width, jint height )
+{
+ (void)env;
+
+ if (m_instance)
+ m_instance->surfaceChanged(CJNISurfaceHolder(jhobject(holder)), format, width, height);
+}
+
+void CJNIXBMCMainView::_surfaceCreated(JNIEnv* env, jobject thiz, jobject holder)
+{
+ (void)env;
+
+ if (m_instance)
+ m_instance->surfaceCreated(CJNISurfaceHolder(jhobject(holder)));
+}
+
+void CJNIXBMCMainView::_surfaceDestroyed(JNIEnv* env, jobject thiz, jobject holder)
+{
+ (void)env;
+
+ if (m_instance)
+ m_instance->surfaceDestroyed(CJNISurfaceHolder(jhobject(holder)));
+}
+
+void CJNIXBMCMainView::attach(const jobject& thiz)
+{
+ if (!m_object)
+ {
+ m_object = jhobject(thiz);
+ m_object.setGlobal();
+ }
+}
+
+void CJNIXBMCMainView::surfaceChanged(CJNISurfaceHolder holder, int format, int width, int height)
+{
+ if (m_callback)
+ m_callback->surfaceChanged(holder, format, width, height);
+}
+
+void CJNIXBMCMainView::surfaceCreated(CJNISurfaceHolder holder)
+{
+ if (m_callback)
+ m_callback->surfaceCreated(holder);
+ m_surfaceCreated.Set();
+}
+
+void CJNIXBMCMainView::surfaceDestroyed(CJNISurfaceHolder holder)
+{
+ m_surfaceCreated.Reset();
+ if (m_callback)
+ m_callback->surfaceDestroyed(holder);
+}
+
+bool CJNIXBMCMainView::waitForSurface(unsigned int millis)
+{
+ return m_surfaceCreated.WaitMSec(millis);
+}
+
+bool CJNIXBMCMainView::isCreated() const
+{
+ if (!m_object)
+ return false;
+ return get_field<jboolean>(m_object, "mIsCreated");
+
+}
+

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMainView.h Added

@@ -0,0 +1,59 @@
+#pragma once
+/*
+ * Copyright (C) 2017 Christian Browet
+ * 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 <androidjni/JNIBase.h>
+
+#include <androidjni/Context.h>
+#include <androidjni/Surface.h>
+#include <androidjni/SurfaceHolder.h>
+
+#include "threads/Event.h"
+#include "utils/Geometry.h"
+
+class CJNIXBMCMainView : virtual public CJNIBase, public CJNISurfaceHolderCallback, public CJNIInterfaceImplem<CJNIXBMCMainView>
+{
+public:
+ CJNIXBMCMainView(CJNISurfaceHolderCallback* callback);
+ ~CJNIXBMCMainView();
+
+ static void RegisterNatives(JNIEnv* env);
+
+ // CJNISurfaceHolderCallback interface
+ void surfaceChanged(CJNISurfaceHolder holder, int format, int width, int height);
+ void surfaceCreated(CJNISurfaceHolder holder);
+ void surfaceDestroyed(CJNISurfaceHolder holder);
+
+ void attach(const jobject& thiz);
+ bool waitForSurface(unsigned int millis);
+ bool isActive() { return m_surfaceCreated.Signaled(); }
+ CJNISurface getSurface();
+ bool isCreated() const;
+
+protected:
+ static CJNIXBMCMainView* m_instance;
+ CJNISurfaceHolderCallback* m_callback;
+ static CEvent m_surfaceCreated;
+
+ static void _attach(JNIEnv* env, jobject thiz);
+ static void _surfaceChanged(JNIEnv* env, jobject thiz, jobject holder, jint format, jint width, jint height);
+ static void _surfaceCreated(JNIEnv* env, jobject thiz, jobject holder);
+ static void _surfaceDestroyed(JNIEnv* env, jobject thiz, jobject holder);
+};

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMediaSession.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCMediaSession.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerDiscoveryListener.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerRegistrationListener.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCNsdManagerResolveListener.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h Changed

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCVideoView.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2016 Christian Browet
- *      http://xbmc.org
+ *      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
@@ -54,20 +54,17 @@
 
 CJNIXBMCVideoView::CJNIXBMCVideoView()
   : m_callback(nullptr)
-  , m_surfaceCreated(nullptr)
 {
 }
 
 CJNIXBMCVideoView::CJNIXBMCVideoView(const jni::jhobject &object)
   : CJNIBase(object)
   , m_callback(nullptr)
-  , m_surfaceCreated(nullptr)
 {
 }
 
 CJNIXBMCVideoView::~CJNIXBMCVideoView()
 {
-  delete m_surfaceCreated;
 }
 
 CJNIXBMCVideoView* CJNIXBMCVideoView::createVideoView(CJNISurfaceHolderCallback* callback)
@@ -85,9 +82,8 @@
 
   add_instance(pvw->get_raw(), pvw);
   pvw->m_callback = callback;
-  pvw->m_surfaceCreated = new CEvent;
   if (pvw->isCreated())
-    pvw->m_surfaceCreated->Set();
+    pvw->m_surfaceCreated.Set();
   pvw->add();
 
   return pvw;
@@ -128,23 +124,21 @@
 
 void CJNIXBMCVideoView::surfaceCreated(CJNISurfaceHolder holder)
 {
-  if (m_surfaceCreated)
-    m_surfaceCreated->Set();
   if (m_callback)
     m_callback->surfaceCreated(holder);
+  m_surfaceCreated.Set();
 }
 
 void CJNIXBMCVideoView::surfaceDestroyed(CJNISurfaceHolder holder)
 {
-  if (m_surfaceCreated)
-    m_surfaceCreated->Reset();
+  m_surfaceCreated.Reset();
   if (m_callback)
     m_callback->surfaceDestroyed(holder);
 }
 
 bool CJNIXBMCVideoView::waitForSurface(unsigned int millis)
 {
-  return m_surfaceCreated->WaitMSec(millis);
+  return m_surfaceCreated.WaitMSec(millis);
 }
 
 void CJNIXBMCVideoView::add()

_service:download_files:master.tar.gz/xbmc/platform/android/activity/JNIXBMCVideoView.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2016 Christian Browet
- * http://xbmc.org
+ * 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
@@ -26,8 +26,8 @@
 #include <androidjni/Surface.h>
 #include <androidjni/SurfaceHolder.h>
 
-#include "guilib/Geometry.h"
 #include "threads/Event.h"
+#include "utils/Geometry.h"
 
 class CJNIXBMCVideoView : virtual public CJNIBase, public CJNISurfaceHolderCallback, public CJNIInterfaceImplem<CJNIXBMCVideoView>
 {
@@ -49,7 +49,7 @@
 static void _surfaceDestroyed(JNIEnv* env, jobject thiz, jobject holder);
 
 bool waitForSurface(unsigned int millis);
- bool isActive() { return m_surfaceCreated->Signaled(); }
+ bool isActive() { return m_surfaceCreated.Signaled(); }
 CJNISurface getSurface();
 const CRect& getSurfaceRect();
 void setSurfaceRect(const CRect& rect);
@@ -60,7 +60,7 @@
 
 protected:
 CJNISurfaceHolderCallback* m_callback;
- CEvent* m_surfaceCreated;
+ CEvent m_surfaceCreated;
 CRect m_surfaceRect;
 
 private:

_service:download_files:master.tar.gz/xbmc/platform/android/activity/XBMCApp.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -31,6 +31,7 @@
 #include <android/bitmap.h>
 #include <android/log.h>
 #include <android/native_window.h>
+#include <android/native_window_jni.h>
 
 #include <androidjni/ApplicationInfo.h>
 #include <androidjni/BitmapFactory.h>
@@ -81,9 +82,9 @@
 #include "guiinfo/GUIInfoLabels.h"
 #include "platform/android/activity/IInputDeviceCallbacks.h"
 #include "platform/android/activity/IInputDeviceEventHandler.h"
+#include "input/mouse/MouseStat.h"
 #include "input/Key.h"
 #include "utils/log.h"
-#include "input/MouseStat.h"
 #include "network/android/NetworkAndroid.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderManager.h"
 #include "filesystem/SpecialProtocol.h"
@@ -95,7 +96,6 @@
 #include "windowing/android/VideoSyncAndroid.h"
 #include "windowing/WinEvents.h"
 #include "platform/xbmc.h"
-#include "platform/XbmcContext.h"
 
 #define GIGABYTES 1073741824
 
@@ -119,13 +119,14 @@
 }
 
 CXBMCApp* CXBMCApp::m_xbmcappinstance = NULL;
-CEvent CXBMCApp::m_windowCreated;
+std::unique_ptr<CJNIXBMCMainView> CXBMCApp::m_mainView;
 ANativeActivity *CXBMCApp::m_activity = NULL;
 CJNIWakeLock *CXBMCApp::m_wakeLock = NULL;
 ANativeWindow* CXBMCApp::m_window = NULL;
 int CXBMCApp::m_batteryLevel = 0;
 bool CXBMCApp::m_hasFocus = false;
 bool CXBMCApp::m_headsetPlugged = false;
+bool CXBMCApp::m_hdmiPlugged = true;
 IInputDeviceCallbacks* CXBMCApp::m_inputDeviceCallbacks = nullptr;
 IInputDeviceEventHandler* CXBMCApp::m_inputDeviceEventHandler = nullptr;
 bool CXBMCApp::m_hasReqVisible = false;
@@ -144,14 +145,16 @@
 {
 m_xbmcappinstance = this;
 m_activity = nativeActivity;
- m_firstrun = true;
- m_exiting=false;
 if (m_activity == NULL)
 {
 android_printf("CXBMCApp: invalid ANativeActivity instance");
 exit(1);
 return;
 }
+ m_mainView.reset(new CJNIXBMCMainView(this));
+ m_firstrun = true;
+ m_exiting = false;
+ android_printf("CXBMCApp: Created");
 }
 
 CXBMCApp::~CXBMCApp()
@@ -212,7 +215,7 @@
 intentFilter.addAction("android.intent.action.BATTERY_CHANGED");
 intentFilter.addAction("android.intent.action.SCREEN_ON");
 intentFilter.addAction("android.intent.action.HEADSET_PLUG");
- intentFilter.addAction("android.intent.action.HDMI_AUDIO_PLUG");
+ intentFilter.addAction("android.media.action.HDMI_AUDIO_PLUG");
 intentFilter.addAction("android.intent.action.SCREEN_OFF");
 intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
 registerReceiver(*this, intentFilter);
@@ -256,6 +259,9 @@
 }
 }
 
+ if (m_hasReqVisible)
+ g_application.SwitchToFullScreen(true);
+
 EnableWakeLock(false);
 m_hasReqVisible = false;
 }
@@ -312,39 +318,18 @@
 void CXBMCApp::onCreateWindow(ANativeWindow* window)
 {
 android_printf("%s: ", __PRETTY_FUNCTION__);
- if (window == NULL)
- {
- android_printf(" => invalid ANativeWindow object");
- return;
- }
- m_window = window;
- m_windowCreated.Set();
- if(!m_firstrun)
- {
- XBMC_SetupDisplay();
- XBMC_Pause(false);
- }
 }
 
 void CXBMCApp::onResizeWindow()
 {
 android_printf("%s: ", __PRETTY_FUNCTION__);
 m_window = NULL;
- m_windowCreated.Reset();
 // no need to do anything because we are fixed in fullscreen landscape mode
 }
 
 void CXBMCApp::onDestroyWindow()
 {
 android_printf("%s: ", __PRETTY_FUNCTION__);
-
- // If we have exited XBMC, it no longer exists.
- if (!m_exiting)
- {
- XBMC_DestroyDisplay();
- m_window = NULL;
- XBMC_Pause(true);
- }
 }
 
 void CXBMCApp::onGainFocus()
@@ -452,12 +437,21 @@
 return m_headsetPlugged;
 }
 
+bool CXBMCApp::IsHDMIPlugged()
+{
+ return m_hdmiPlugged;
+}
+
 void CXBMCApp::run()
 {
 int status = 0;
 
 SetupEnv();
- XBMC::Context context;
+
+ // Wait for main window
+ ANativeWindow* nativeWindow = CXBMCApp::GetNativeWindow(30000);
+ if (!nativeWindow)
+ return;
 
 m_firstrun=false;
 android_printf(" => running XBMC_Run...");
@@ -957,11 +951,10 @@
 g_application.WakeUpScreenSaverAndDPMS();
 }
 else if (action == "android.intent.action.HEADSET_PLUG" ||
- action == "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED" ||
- action == "android.intent.action.HDMI_AUDIO_PLUG")
+ action == "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED")
 {
 bool newstate = m_headsetPlugged;
- if (action == "android.intent.action.HEADSET_PLUG" || action == "android.intent.action.HDMI_AUDIO_PLUG")
+ if (action == "android.intent.action.HEADSET_PLUG")
 newstate = (intent.getIntExtra("state", 0) != 0);
 else if (action == "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED")
 newstate = (intent.getIntExtra("android.bluetooth.profile.extra.STATE", 0) == 2 /* STATE_CONNECTED */);
@@ -972,6 +965,18 @@
 CServiceBroker::GetActiveAE().DeviceChange();
 }
 }
+ else if (action == "android.media.action.HDMI_AUDIO_PLUG")
+ {
+ bool newstate;
+ newstate = (intent.getIntExtra("android.media.extra.AUDIO_PLUG_STATE", 0) != 0);
+
+ if (newstate != m_hdmiPlugged)
+ {
+ CLog::Log(LOGDEBUG, "-- HDMI state: %s", newstate ? "on" : "off");
+ m_hdmiPlugged = newstate;
+ CServiceBroker::GetActiveAE().DeviceChange();
+ }
+ }
 else if (action == "android.intent.action.SCREEN_OFF")
 {
 if (m_playback_state & PLAYBACK_STATE_VIDEO)
@@ -1249,7 +1254,9 @@
 if (m_window)
 return m_window;
 
- m_windowCreated.WaitMSec(timeout);
+ if (m_mainView)
+ m_mainView->waitForSurface(timeout);
+
 return m_window;
 }
 
@@ -1310,3 +1317,32 @@
 
 return false;
 }
+
+
+void CXBMCApp::surfaceChanged(CJNISurfaceHolder holder, int format, int width, int height)
+{
+}
+
+void CXBMCApp::surfaceCreated(CJNISurfaceHolder holder)
+{
+ m_window = ANativeWindow_fromSurface(xbmc_jnienv(), holder.getSurface().get_raw());
+ if (m_window == NULL)
+ {
+ android_printf(" => invalid ANativeWindow object");
+ return;
+ }
+ if(!m_firstrun)
+ {
+ XBMC_SetupDisplay();
+ }
+}
+
+void CXBMCApp::surfaceDestroyed(CJNISurfaceHolder holder)
+{
+ // If we have exited XBMC, it no longer exists.
+ if (!m_exiting)
+ {
+ XBMC_DestroyDisplay();
+ m_window = NULL;
+ }
+}

_service:download_files:master.tar.gz/xbmc/platform/android/activity/XBMCApp.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -33,18 +33,20 @@
 #include <androidjni/Activity.h>
 #include <androidjni/AudioManager.h>
 #include <androidjni/BroadcastReceiver.h>
+#include <androidjni/SurfaceHolder.h>
 #include <androidjni/View.h>
 
 #include "threads/Event.h"
 #include "interfaces/IAnnouncer.h"
 
-#include "guilib/Geometry.h"
 #include "IActivityHandler.h"
 #include "IInputHandler.h"
 #include "JNIMainActivity.h"
 #include "JNIXBMCAudioManagerOnAudioFocusChangeListener.h"
+#include "JNIXBMCMainView.h"
 #include "JNIXBMCMediaSession.h"
 #include "platform/xbmc.h"
+#include "utils/Geometry.h"
 
 // forward declares
 class CJNIWakeLock;
@@ -92,6 +94,7 @@
 , public CJNIMainActivity
 , public CJNIBroadcastReceiver
 , public ANNOUNCEMENT::IAnnouncer
+ , public CJNISurfaceHolderCallback
 {
 public:
 explicit CXBMCApp(ANativeActivity *nativeActivity);
@@ -143,6 +146,7 @@
 static bool EnableWakeLock(bool on);
 static bool HasFocus() { return m_hasFocus; }
 static bool IsHeadsetPlugged();
+ static bool IsHDMIPlugged();
 
 static bool StartActivity(const std::string &package, const std::string &intent = std::string(), const std::string &dataType = std::string(), const std::string &dataURI = std::string());
 static std::vector <androidPackage> GetApplications();
@@ -209,6 +213,7 @@
 private:
 static CXBMCApp* m_xbmcappinstance;
 CJNIXBMCAudioManagerOnAudioFocusChangeListener m_audioFocusListener;
+ static std::unique_ptr<CJNIXBMCMainView> m_mainView;
 std::unique_ptr<jni::CJNIXBMCMediaSession> m_mediaSession;
 static bool HasLaunchIntent(const std::string &package);
 std::string GetFilenameFromIntent(const CJNIIntent &intent);
@@ -222,6 +227,7 @@
 static int m_batteryLevel;
 static bool m_hasFocus;
 static bool m_headsetPlugged;
+ static bool m_hdmiPlugged;
 static IInputDeviceCallbacks* m_inputDeviceCallbacks;
 static IInputDeviceEventHandler* m_inputDeviceEventHandler;
 static bool m_hasReqVisible;
@@ -234,7 +240,6 @@
 static std::vector<CActivityResultEvent*> m_activityResultEvents;
 
 static ANativeWindow* m_window;
- static CEvent m_windowCreated;
 
 static CVideoSyncAndroid* m_syncImpl;
 static CEvent m_vsyncEvent;
@@ -245,4 +250,10 @@
 bool XBMC_SetupDisplay();
 
 static uint32_t m_playback_state;
+
+public:
+ // CJNISurfaceHolderCallback interface
+ void surfaceChanged(CJNISurfaceHolder holder, int format, int width, int height) override;
+ void surfaceCreated(CJNISurfaceHolder holder) override;
+ void surfaceDestroyed(CJNISurfaceHolder holder) override;
 };

_service:download_files:master.tar.gz/xbmc/platform/android/activity/android_main.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -30,6 +30,7 @@
 #include "CompileInfo.h"
 #include "EventLoop.h"
 #include "platform/android/activity/JNIMainActivity.h"
+#include "platform/android/activity/JNIXBMCMainView.h"
 #include "platform/android/activity/JNIXBMCVideoView.h"
 #include "platform/android/activity/JNIXBMCAudioManagerOnAudioFocusChangeListener.h"
 #include "platform/android/activity/JNIXBMCSurfaceTextureOnFrameAvailableListener.h"
@@ -152,6 +153,7 @@
 
   CJNIXBMCAudioManagerOnAudioFocusChangeListener::RegisterNatives(env);
   CJNIXBMCSurfaceTextureOnFrameAvailableListener::RegisterNatives(env);
+  CJNIXBMCMainView::RegisterNatives(env);
   CJNIXBMCVideoView::RegisterNatives(env);
   jni::CJNIXBMCNsdManagerDiscoveryListener::RegisterNatives(env);
   jni::CJNIXBMCNsdManagerRegistrationListener::RegisterNatives(env);

_service:download_files:master.tar.gz/xbmc/platform/android/bionic_supplement/bionic_supplement.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/NSLogDebugHelpers.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios-common/AnnounceReceiver.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSEAGLView.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSEAGLView.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSExternalTouchController.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSExternalTouchController.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSKeyboard.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSKeyboardView.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/IOSScreenManager.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/XBMCApplication.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/XBMCController.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/ios/XBMCDebugHelpers.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/OSXTextInputResponder.h Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/OSXTextInputResponder.mm Changed

_service:download_files:master.tar.gz/xbmc/platform/darwin/osx/XBMCHelper.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/ConvUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/ConvUtils.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusMessage.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusMessage.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusReserve.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusReserve.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusUtil.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DBusUtil.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DllBCM.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/DllOMX.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/FDEventMonitor.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/FDEventMonitor.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/LinuxResourceCounter.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/LinuxTimezone.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/OMXClock.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/OMXClock.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/OMXCore.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/OMXCore.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/PlatformConstants.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/PlatformDefs.h Changed

@@ -22,8 +22,6 @@
 
 #ifdef TARGET_POSIX
 
-#define LINE_ENDING "\n"
-
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
 #endif
@@ -67,19 +65,11 @@
 #define PIXEL_RSHIFT 8
 #define PIXEL_GSHIFT 16
 #define PIXEL_BSHIFT 24
-#define AMASK 0x000000ff
-#define RMASK 0x0000ff00
-#define GMASK 0x00ff0000
-#define BMASK 0xff000000
 #else
 #define PIXEL_ASHIFT 24
 #define PIXEL_RSHIFT 16
 #define PIXEL_GSHIFT 8
 #define PIXEL_BSHIFT 0
-#define AMASK 0xff000000
-#define RMASK 0x00ff0000
-#define GMASK 0x0000ff00
-#define BMASK 0x000000ff
 #endif
 
 #include <stdint.h>
@@ -108,40 +98,12 @@
 #endif
 #endif
 	
-#ifndef PRIx64
-#ifdef TARGET_WINDOWS
-#define PRIx64 "I64x"
-#else
-#if __WORDSIZE == 64
-#define PRIx64 "lx"
-#else
-#define PRIx64 "llx"
-#endif
-#endif
-#endif
-
 #ifndef PRIdS
 #define PRIdS "zd"
 #endif
 
-#ifndef PRIuS
-#define PRIuS "zu"
-#endif
-
 #ifdef TARGET_POSIX
 
-#ifndef INSTALL_PATH
-#define INSTALL_PATH "/usr/share/xbmc"
-#endif
-
-#ifndef BIN_INSTALL_PATH
-#define BIN_INSTALL_PATH "/usr/lib/xbmc"
-#endif
-
-#define CONST const
-#define FALSE 0
-#define TRUE 1
-
 #define _fdopen fdopen
 #define _vsnprintf vsnprintf
 #define _stricmp strcasecmp
@@ -149,37 +111,11 @@
 #define strcmpi strcasecmp
 #define strnicmp strncasecmp
 #define _atoi64(x) atoll(x)
-#define CopyMemory(dst,src,size) memmove(dst, src, size)
-#define ZeroMemory(dst,size) memset(dst, 0, size)
-
-#define VOID void
-#define __int8 char
-#define __int16 short
-#define __int32 int
-#define __int64 long long
-#define __uint64 unsigned long long
 
 #define __stdcall
 #define __cdecl
-#define WINBASEAPI
-#define NTAPI __stdcall
-#define CALLBACK __stdcall
 #define WINAPI __stdcall
-#define WINAPIV __cdecl
-#if !defined(TARGET_DARWIN) && !defined(TARGET_FREEBSD)
-#undef APIENTRY
-#define APIENTRY WINAPI
-#else
 #undef APIENTRY
-#define APIENTRY
-#endif
-#define APIPRIVATE __stdcall
-#define IN
-#define OUT
-#define OPTIONAL
-#define _declspec(X)
-#define __declspec(X)
-
 struct CXHandle; // forward declaration
 typedef CXHandle* HANDLE;
 
@@ -187,62 +123,22 @@
 typedef void* HMODULE;
 
 typedef unsigned int DWORD;
-typedef unsigned short WORD;
-typedef unsigned char BYTE;
-typedef char CHAR;
-typedef wchar_t WCHAR;
-typedef int INT;
-typedef unsigned int UINT;
-// typedef int INT32; // unused; must match Xmd.h but why bother
-typedef long long INT64;
-typedef unsigned long long UINT64;
-typedef long LONG;
-typedef long long LONGLONG;
-#if defined(TARGET_DARWIN_OSX)
-typedef UInt32 ULONG;
-#else
-typedef unsigned long ULONG;
-#endif
-typedef size_t SIZE_T;
-typedef void* PVOID;
-typedef void* LPVOID;
-//typedef PVOID HANDLE;
 #define INVALID_HANDLE_VALUE ((HANDLE)~0U)
-typedef HANDLE HDC;
-typedef void* HWND;
-typedef BYTE* LPBYTE;
-typedef DWORD* LPDWORD;
-typedef CONST CHAR* LPCSTR;
-typedef CONST WCHAR* LPCWSTR;
-typedef CHAR* LPTSTR;
-typedef WCHAR *PWSTR, *LPWSTR, *NWPSTR;
-typedef CHAR *PSTR, *LPSTR, *NPSTR;
-typedef LONG *PLONG, *LPLONG;
 #ifdef UNICODE
-typedef LPCWSTR LPCTSTR;
+typedef const wchar_t* LPCTSTR;
 #else
-typedef LPCSTR LPCTSTR;
+typedef const char* LPCTSTR;
 #endif
-typedef unsigned __int64 ULONGLONG;
-typedef unsigned long ULONG_PTR;
-typedef ULONG_PTR DWORD_PTR;
-typedef intptr_t (*FARPROC)(void);
 
 #define MAXWORD 0xffff
 
-typedef DWORD LCID;
-typedef WORD* LPWORD;
-typedef CHAR* LPCHAR;
-typedef CHAR* PCHAR;
-typedef const void* LPCVOID;
-
 typedef union _LARGE_INTEGER
 {
 struct {
 DWORD LowPart;
 int32_t HighPart;
 } u;
- LONGLONG QuadPart;
+ long long QuadPart;
 } LARGE_INTEGER, *PLARGE_INTEGER;
 
 typedef union _ULARGE_INTEGER {
@@ -250,36 +146,33 @@
 DWORD LowPart;
 DWORD HighPart;
 } u;
- ULONGLONG QuadPart;
+ unsigned long long QuadPart;
 } ULARGE_INTEGER, *PULARGE_INTEGER;
 
-#define MAKELONG(low,high) ((LONG)(((WORD)((DWORD_PTR)(low) & 0xFFFF)) | ((DWORD)((WORD)((DWORD_PTR)(high) & 0xFFFF))) << 16))
-LONGLONG Int32x32To64(LONG Multiplier, LONG Multiplicand);
-
 void OutputDebugString(LPCTSTR lpOutputString);
 
 // Date / Time
 
 typedef struct _SYSTEMTIME
 {
- WORD wYear;
- WORD wMonth;
- WORD wDayOfWeek;
- WORD wDay;
- WORD wHour;
- WORD wMinute;
- WORD wSecond;
- WORD wMilliseconds;
+ unsigned short wYear;
+ unsigned short wMonth;
+ unsigned short wDayOfWeek;
+ unsigned short wDay;
+ unsigned short wHour;
+ unsigned short wMinute;
+ unsigned short wSecond;
+ unsigned short wMilliseconds;
 } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
 
 typedef struct _TIME_ZONE_INFORMATION {
- LONG Bias;
- WCHAR StandardName[32];
+ long Bias;
+ wchar_t StandardName[32];
 SYSTEMTIME StandardDate;
- LONG StandardBias;
- WCHAR DaylightName[32];
+ long StandardBias;
+ wchar_t DaylightName[32];
 SYSTEMTIME DaylightDate;
- LONG DaylightBias;
+ long DaylightBias;
 } TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION;
 
 #define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF)
@@ -297,27 +190,14 @@
 #define THREAD_PRIORITY_NORMAL 0
 #define THREAD_PRIORITY_HIGHEST THREAD_BASE_PRIORITY_MAX
 #define THREAD_PRIORITY_ABOVE_NORMAL (THREAD_PRIORITY_HIGHEST-1)
-#define THREAD_PRIORITY_ERROR_RETURN (0x7fffffff)
-#define THREAD_PRIORITY_TIME_CRITICAL THREAD_BASE_PRIORITY_LOWRT
-#define THREAD_PRIORITY_IDLE THREAD_BASE_PRIORITY_IDLE
 
 // Network
-#define SOCKADDR_IN struct sockaddr_in
-#define IN_ADDR struct in_addr
 #define SOCKET_ERROR (-1)
 #define INVALID_SOCKET (~0)
 #define closesocket(s) close(s)
 #define ioctlsocket(s, f, v) ioctl(s, f, v)
 #define WSAGetLastError() (errno)
-#define WSASetLastError(e) (errno = e)
 #define WSAECONNRESET ECONNRESET
-#define WSAHOST_NOT_FOUND ENOENT
-#define WSAETIMEDOUT ETIMEDOUT
-#define WSAEADDRINUSE EADDRINUSE
-#define WSAECANCELLED EINTR
-#define WSAECONNREFUSED ECONNREFUSED
-#define WSAECONNABORTED ECONNABORTED
-#define WSAETIMEDOUT ETIMEDOUT
 
 typedef int SOCKET;
 
@@ -326,7 +206,6 @@
 
 // File
 #define O_BINARY 0
-#define O_TEXT 0
 #define _O_TRUNC O_TRUNC
 #define _O_RDONLY O_RDONLY
 #define _O_WRONLY O_WRONLY
@@ -351,7 +230,7 @@
 short st_uid;
 short st_gid;
 dev_t st_rdev;
- __int64 st_size;
+ long long st_size;
 time_t _st_atime;
 time_t _st_mtime;
 time_t _st_ctime;
@@ -373,17 +252,15 @@
 DWORD nFileSizeLow;
 DWORD dwReserved0;
 DWORD dwReserved1;
- CHAR cFileName[260];
- CHAR cAlternateFileName[14];
+ char cFileName[260];
+ char cAlternateFileName[14];
 } WIN32_FIND_DATA, *PWIN32_FIND_DATA, *LPWIN32_FIND_DATA;
 
-#define LPWIN32_FIND_DATAA LPWIN32_FIND_DATA
-
 #define FILE_ATTRIBUTE_DIRECTORY 0x00000010
 
 typedef struct _SECURITY_ATTRIBUTES {
 DWORD nLength;
- LPVOID lpSecurityDescriptor;
+ void* lpSecurityDescriptor;
 int bInheritHandle;
 } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
@@ -395,8 +272,6 @@
 #define _S_IFDIR S_IFDIR
 #define MAX_PATH PATH_MAX
 
-#define _stat stat
-
 // Memory
 typedef struct _MEMORYSTATUSEX
 {
@@ -411,30 +286,9 @@
 uint64_t ullAvailVirtual;
 } MEMORYSTATUSEX, *LPMEMORYSTATUSEX;
 
-// Basic D3D stuff
-typedef struct _RECT {
- LONG left;
- LONG top;
- LONG right;
- LONG bottom;
-} RECT, *PRECT;
-
-// Misc stuff found in the code, not really important
-#define PAGE_READWRITE 0x04
-#define MAXULONG_PTR ((ULONG) 0xffffffff)
-
 // CreateFile defines
-#define FILE_FLAG_WRITE_THROUGH 0x80000000
-#define FILE_FLAG_OVERLAPPED 0x40000000
 #define FILE_FLAG_NO_BUFFERING 0x20000000
-#define FILE_FLAG_RANDOM_ACCESS 0x10000000
-#define FILE_FLAG_SEQUENTIAL_SCAN 0x08000000
 #define FILE_FLAG_DELETE_ON_CLOSE 0x04000000
-#define FILE_FLAG_BACKUP_SEMANTICS 0x02000000
-#define FILE_FLAG_POSIX_SEMANTICS 0x01000000
-#define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000
-#define FILE_FLAG_OPEN_NO_RECALL 0x00100000
-#define FILE_FLAG_FIRST_PIPE_INSTANCE 0x00080000
 
 #define CREATE_NEW 1
 #define CREATE_ALWAYS 2
@@ -442,21 +296,8 @@
 #define OPEN_ALWAYS 4
 #define TRUNCATE_EXISTING 5
 
-#define FILE_ATTRIBUTE_NORMAL 0x00000080
-#define FILE_ATTRIBUTE_READONLY 0x00000001
-#define FILE_ATTRIBUTE_HIDDEN 0x00000002
-#define FILE_ATTRIBUTE_SYSTEM 0x00000004
-#define FILE_ATTRIBUTE_DIRECTORY 0x00000010
-
 #define FILE_READ_DATA ( 0x0001 )
 #define FILE_WRITE_DATA ( 0x0002 )
-#define FILE_APPEND_DATA ( 0x0004 )
-
-#define GENERIC_READ FILE_READ_DATA
-#define GENERIC_WRITE FILE_WRITE_DATA
-#define FILE_SHARE_READ 0x00000001
-#define FILE_SHARE_WRITE 0x00000002
-#define FILE_SHARE_DELETE 0x00000004
 
 #endif

_service:download_files:master.tar.gz/xbmc/platform/linux/PosixMountProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/PosixMountProvider.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/RBP.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/RBP.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/TimeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/TimeUtils.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/XFileUtils.cpp Changed

@@ -164,8 +164,8 @@
 return result;
 }
 
-int ReadFile(HANDLE hFile, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
- LPDWORD lpNumberOfBytesRead, LPVOID lpOverlapped)
+int ReadFile(HANDLE hFile, void* lpBuffer, DWORD nNumberOfBytesToRead,
+ unsigned int* lpNumberOfBytesRead, void* lpOverlapped)
 {
 if (lpOverlapped)
 {
@@ -184,7 +184,7 @@
 }
 
 int WriteFile(HANDLE hFile, const void * lpBuffer, DWORD nNumberOfBytesToWrite,
- LPDWORD lpNumberOfBytesWritten, LPVOID lpOverlapped)
+ unsigned int* lpNumberOfBytesWritten, void* lpOverlapped)
 {
 if (lpOverlapped)
 {
@@ -208,10 +208,10 @@
 if (hFile == NULL)
 return 0;
 
- LONGLONG offset = lDistanceToMove;
+ long long offset = lDistanceToMove;
 if (lpDistanceToMoveHigh)
 {
- LONGLONG helper = *lpDistanceToMoveHigh;
+ long long helper = *lpDistanceToMoveHigh;
 helper <<= 32;
 offset &= 0xFFFFFFFF; // Zero out the upper half (sign ext)
 offset |= helper;
@@ -259,13 +259,13 @@
 #endif
 
 if (lpFreeBytesAvailable)
- lpFreeBytesAvailable->QuadPart = (ULONGLONG)fsInfo.f_bavail * (ULONGLONG)fsInfo.f_bsize;
+ lpFreeBytesAvailable->QuadPart = static_cast<unsigned long long>(fsInfo.f_bavail) * static_cast<unsigned long long>(fsInfo.f_bsize);
 
 if (lpTotalNumberOfBytes)
- lpTotalNumberOfBytes->QuadPart = (ULONGLONG)fsInfo.f_blocks * (ULONGLONG)fsInfo.f_bsize;
+ lpTotalNumberOfBytes->QuadPart = static_cast<unsigned long long>(fsInfo.f_blocks) * static_cast<unsigned long long>(fsInfo.f_bsize);
 
 if (lpTotalNumberOfFreeBytes)
- lpTotalNumberOfFreeBytes->QuadPart = (ULONGLONG)fsInfo.f_bfree * (ULONGLONG)fsInfo.f_bsize;
+ lpTotalNumberOfFreeBytes->QuadPart = static_cast<unsigned long long>(fsInfo.f_bfree) * static_cast<unsigned long long>(fsInfo.f_bsize);
 
 return 1;
 }

_service:download_files:master.tar.gz/xbmc/platform/linux/XFileUtils.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/XHandle.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/XHandlePublic.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/XMemUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/XTimeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LIRC.cpp Changed

@@ -1,6 +1,6 @@
 /*
 *      Copyright (C) 2007-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -37,6 +37,18 @@
 #include "threads/SingleLock.h"
 #include "ServiceBroker.h"
 
+#define LIRC_MAP_FILENAME "Lircmap.xml"
+
+KODI::REMOTE::IRemoteControl* CRemoteControl::CreateInstance()
+{
+  return new CRemoteControl();
+}
+
+void CRemoteControl::Register()
+{
+  CInputManager::RegisterRemoteControl(CRemoteControl::CreateInstance);
+}
+
 CRemoteControl::CRemoteControl()
   : CThread("RemoteControl")
   , m_fd(-1)
@@ -61,10 +73,15 @@
     fclose(m_file);
 }
 
-void CRemoteControl::SetEnabled(bool value)
+std::string CRemoteControl::GetMapFile()
+{
+  return LIRC_MAP_FILENAME;
+}
+
+void CRemoteControl::SetEnabled(bool bEnabled)
 {
-  m_used=value;
-  if (!value)
+  m_used = bEnabled;
+  if (!bEnabled)
     CLog::Log(LOGINFO, "LIRC %s: disabled", __FUNCTION__);
 }
 
@@ -107,12 +124,12 @@
   }
 }
 
-void CRemoteControl::SetDeviceName(const std::string& value)
+void CRemoteControl::SetDeviceName(const std::string& name)
 {
-  if (value.length()>0)
-    m_deviceName=value;
+  if (name.length() > 0)
+    m_deviceName = name;
   else
-    m_deviceName=LIRC_DEVICE;
+    m_deviceName = LIRC_DEVICE;
 }
 
 void CRemoteControl::Initialize()
@@ -305,12 +322,12 @@
   }
 }
 
-WORD CRemoteControl::GetButton()
+uint16_t CRemoteControl::GetButton() const
 {
   return m_button;
 }
 
-unsigned int CRemoteControl::GetHoldTime() const
+uint32_t CRemoteControl::GetHoldTimeMs() const
 {
   return m_holdTime;
 }

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LIRC.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2007-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,28 +24,33 @@
 #include <atomic>
 
 #include "system.h"
+#include "input/remote/IRemoteControl.h"
 #include "threads/Thread.h"
 #include "threads/Event.h"
 
-class CRemoteControl : CThread
+class CRemoteControl : public KODI::REMOTE::IRemoteControl, CThread
 {
 public:
 CRemoteControl();
 ~CRemoteControl() override;
- void Initialize();
- void Disconnect();
- void Reset();
- void Update();
- WORD GetButton();
+ void Initialize() override;
+ void Disconnect() override;
+ void Reset() override;
+ void Update() override;
+ uint16_t GetButton() const override;
 /*! \brief retrieve the time in milliseconds that the button has been held
 \return time in milliseconds the button has been down
 */
- unsigned int GetHoldTime() const;
- void SetDeviceName(const std::string& value);
- void SetEnabled(bool value);
- bool IsInUse() const { return m_used; }
- bool IsInitialized() const { return m_bInitialized; }
- void AddSendCommand(const std::string& command);
+ uint32_t GetHoldTimeMs() const override;
+ void SetDeviceName(const std::string& name) override;
+ void SetEnabled(bool bEnabled) override;
+ bool IsInUse() const override { return m_used; }
+ bool IsInitialized() const override { return m_bInitialized; }
+ void AddSendCommand(const std::string& command) override;
+ std::string GetMapFile() override;
+
+ static IRemoteControl* CreateInstance();
+ static void Register();
 
 protected:
 void Process() override;

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LinuxInputDevices.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/input/LinuxInputDevices.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/sse4/CopyFrame.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      http://kodi.tv
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,6 @@
 #include "smmintrin.h"
 
 #define CACHED_BUFFER_SIZE 4096
-typedef unsigned int UINT;
 
 extern "C"
 {
@@ -32,16 +31,16 @@
  * ASSUMES PITCH IS A MULTIPLE OF 64B CACHE LINE SIZE, WIDTH MAY NOT BE
  */
 void copy_frame( void * pSrc, void * pDest, void * pCacheBlock,
-    UINT width, UINT height, UINT pitch )
+    unsigned int width, unsigned int height, unsigned int pitch )
 {
   __m128i         x0, x1, x2, x3;
   __m128i         *pLoad;
   __m128i         *pStore;
   __m128i         *pCache;
-  UINT            x, y, yLoad, yStore;
-  UINT            rowsPerBlock;
-  UINT            width64;
-  UINT            extraPitch;
+  unsigned int x, y, yLoad, yStore;
+  unsigned int rowsPerBlock;
+  unsigned int width64;
+  unsigned int extraPitch;
 
 
   rowsPerBlock = CACHED_BUFFER_SIZE / pitch;

_service:download_files:master.tar.gz/xbmc/platform/linux/sse4/DllLibSSE4.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -29,13 +29,13 @@
 {
 public:
   virtual ~DllLibSSE4Interface() = default;
-  virtual void copy_frame(void * pSrc, void * pDest, void * pCacheBlock, UINT width, UINT height, UINT pitch) = 0;
+  virtual void copy_frame(void * pSrc, void * pDest, void * pCacheBlock, unsigned int width, unsigned int height, unsigned int pitch) = 0;
 };
 
 class DllLibSSE4 : public DllDynamic, DllLibSSE4Interface
 {
   DECLARE_DLL_WRAPPER(DllLibSSE4, DLL_PATH_LIBSSE4)
-  DEFINE_METHOD6(void, copy_frame, (void *p1, void *p2, void *p3, UINT p4, UINT p5, UINT p6))
+  DEFINE_METHOD6(void, copy_frame, (void *p1, void *p2, void *p3, unsigned int p4, unsigned int p5, unsigned int p6))
 
   BEGIN_METHOD_RESOLVE()
     RESOLVE_METHOD(copy_frame)

_service:download_files:master.tar.gz/xbmc/platform/linux/stat_utf8.h Changed

_service:download_files:master.tar.gz/xbmc/platform/linux/stdio_utf8.h Changed

_service:download_files:master.tar.gz/xbmc/platform/overrides/windowsstore Added

_service:download_files:master.tar.gz/xbmc/platform/overrides/windowsstore/PlatformWin10.cpp Added

@@ -0,0 +1,38 @@
+/*
+ * 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 Kodi; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "PlatformWin10.h"
+#include <stdlib.h>
+#include "filesystem/SpecialProtocol.h"
+#include "platform/Environment.h"
+
+CPlatform* CPlatform::CreateInstance()
+{
+ return new CPlatformWin10();
+}
+
+CPlatformWin10::CPlatformWin10() = default;
+
+CPlatformWin10::~CPlatformWin10() = default;
+
+void CPlatformWin10::Init()
+{
+ CEnvironment::setenv("SSL_CERT_FILE", CSpecialProtocol::TranslatePath("special://xbmc/system/certs/cacert.pem").c_str(), 1);
+}

_service:download_files:master.tar.gz/xbmc/platform/overrides/windowsstore/PlatformWin10.h Added

@@ -0,0 +1,35 @@
+#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 Kodi; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "platform/Platform.h"
+
+class CPlatformWin10 : public CPlatform
+{
+ public:
+ /**\brief C'tor */
+ CPlatformWin10();
+ 
+ /**\brief D'tor */
+ virtual ~CPlatformWin10();
+ 
+ void Init() override;
+};

_service:download_files:master.tar.gz/xbmc/platform/posix/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/Filesystem.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/MessagePrinter.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/posix/main.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/Environment.cpp Added

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2018 Team XBMC
+ * 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/>.
+ *
+ */
+
+/**
+ * \file platfrom\win10\Environment.cpp
+ * \brief Implements CEnvironment WinRT specified class functions.
+ */
+
+#include "platform/Environment.h"
+#include "platform/win32/CharsetConverter.h"
+
+using namespace Windows::Storage;
+using namespace Windows::Foundation;
+
+// --------------------- Internal Function ---------------------
+
+/**
+ * \fn int CEnvironment::win_setenv(const std::wstring &name, const std::wstring &value = L"",
+ * updateAction action = autoDetect)
+ * \brief Internal function used to manipulate environment variables on WinRT.
+ *
+ * This function make all dirty work with setting, deleting and modifying environment variables.
+ *
+ * \param name The environment variable name.
+ * \param value (optional) the new value of environment variable.
+ * \param action (optional) the action.
+ * \return Zero on success and -1 otherwise
+ */
+int CEnvironment::win_setenv(const std::string &name, const std::string &value /* = "" */, enum updateAction action /* = autoDetect */)
+{
+ std::wstring Wname = KODI::PLATFORM::WINDOWS::ToW(name);
+ if (Wname.empty() || name.find('=') != std::wstring::npos)
+ return -1;
+ if ((action == addOnly || action == addOrUpdateOnly) && value.empty())
+ return -1;
+ if (action == addOnly && !getenv(name).empty())
+ return 0;
+
+ std::wstring Wvalue = KODI::PLATFORM::WINDOWS::ToW(value);
+ int retValue = 0;
+
+ ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
+ auto values = localSettings->Values;
+
+ Platform::String^ key = ref new Platform::String(Wname.c_str());
+ Platform::String^ v = ref new Platform::String(Wvalue.c_str());
+
+ switch (action)
+ {
+ case deleteVariable:
+ if (values->HasKey(key))
+ {
+ values->Remove(key);
+ }
+ retValue = 0;
+ break;
+
+ default:
+ retValue = values->Insert(key, v) ? 0 : -1;
+ break;
+ }
+
+ return retValue;
+}
+
+std::string CEnvironment::win_getenv(const std::string &name)
+{
+ std::string result;
+
+ // check key
+ if (name.empty())
+ return "";
+
+ std::wstring Wname = KODI::PLATFORM::WINDOWS::ToW(name);
+ Platform::String^ key = ref new Platform::String(Wname.c_str());
+
+ ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
+ auto values = localSettings->Values;
+
+ if (values->HasKey(key))
+ {
+ auto value = safe_cast<Platform::String^>(values->Lookup(key));
+ result = KODI::PLATFORM::WINDOWS::FromW(value->Data());
+ }
+
+ return result;
+}

_service:download_files:master.tar.gz/xbmc/platform/win10/Win10App.cpp Changed

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (C) 2005-2017 Team Kodi
 * http://kodi.tv
 *
@@ -23,16 +23,15 @@
 #include "Application.h"
 #include "AppParamParser.h"
 #include "platform/xbmc.h"
-#include "platform/XbmcContext.h"
 #include "platform/win32/CharsetConverter.h"
 #include "rendering/dx/RenderContext.h"
 #include "settings/AdvancedSettings.h"
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #include "utils/log.h"
 #include "windowing/win10/WinEventsWin10.h"
 #include "Win10App.h"
 
-#include <agile.h>
+#include <agile.h>
 #include <collection.h>
 #include <ppltasks.h>
 
@@ -66,9 +65,9 @@
 // TODO 
 // CoreApplication::UnhandledErrorDetected += ref new EventHandler<UnhandledErrorDetectedEventArgs^>(this, &App::OnUnhandledErrorDetected);
 
- //Initialize COM
- CoInitializeEx(nullptr, COINIT_MULTITHREADED);
-
+ //Initialize COM
+ CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+
 // At this point we have access to the device. 
 // We can create the device-dependent resources.
 CWinEventsWin10::InitOSKeymap();
@@ -96,7 +95,6 @@
 void App::Run()
 {
 {
- XBMC::Context context;
 // Initialize before CAppParamParser so it can set the log level
 g_advancedSettings.Initialize();
 // fix the case then window opened in FS, but current setting is RES_WINDOW
@@ -111,7 +109,7 @@
 XBMC_Run(true, appParamParser);
 }
 
- WSACleanup();
+ WSACleanup();
 //CoUninitialize();
 }

_service:download_files:master.tar.gz/xbmc/platform/win10/Win10App.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win10/input Added

_service:download_files:master.tar.gz/xbmc/platform/win10/input/RemoteControlXbox.cpp Added

@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2005-2018 Team XBMC
+ * 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 "RemoteControlXbox.h"
+#include "input/InputManager.h"
+#include "input/remote/IRRemote.h"
+#include "threads/SystemClock.h"
+#include "utils/log.h"
+#include "ServiceBroker.h"
+
+#define XBOX_REMOTE_DEVICE_ID L"GIP:0000F50000000001"
+#define XBOX_REMOTE_DEVICE_NAME "Xbox One Game Controller"
+
+using namespace Windows::Foundation;
+using namespace Windows::Media;
+using namespace Windows::System;
+using namespace Windows::UI::Core;
+
+KODI::REMOTE::IRemoteControl* CRemoteControlXbox::CreateInstance()
+{
+ return new CRemoteControlXbox();
+}
+
+void CRemoteControlXbox::Register()
+{
+ CInputManager::RegisterRemoteControl(CRemoteControlXbox::CreateInstance);
+}
+
+bool CRemoteControlXbox::IsRemoteControlId(const std::wstring &deviceId)
+{
+ return deviceId.compare(XBOX_REMOTE_DEVICE_ID) == 0;
+}
+
+CRemoteControlXbox::CRemoteControlXbox()
+ : m_button(0)
+ , m_lastButton(0)
+ , m_bInitialized(false)
+ , m_holdTime(0)
+ , m_firstClickTime(0)
+ , m_lastKey(VirtualKey::None)
+ , m_deviceName(XBOX_REMOTE_DEVICE_NAME)
+{
+}
+
+CRemoteControlXbox::~CRemoteControlXbox()
+{
+ if (m_bInitialized)
+ Disconnect();
+}
+
+std::string CRemoteControlXbox::GetMapFile()
+{
+ return "";
+}
+
+void CRemoteControlXbox::Disconnect()
+{
+ auto dispatcher = CoreWindow::GetForCurrentThread()->Dispatcher;
+ dispatcher->AcceleratorKeyActivated -= m_token;
+
+ auto smtc = SystemMediaTransportControls::GetForCurrentView();
+ if (smtc)
+ {
+ smtc->ButtonPressed -= m_mediatoken;
+ }
+ m_bInitialized = false;
+}
+
+void CRemoteControlXbox::Reset()
+{
+ m_button = 0;
+ m_holdTime = 0;
+}
+
+void CRemoteControlXbox::Initialize()
+{
+ auto dispatcher = CoreWindow::GetForCurrentThread()->Dispatcher;
+ m_token = dispatcher->AcceleratorKeyActivated += ref new TypedEventHandler<CoreDispatcher^, AcceleratorKeyEventArgs^>
+ ([this](CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args) 
+ {
+ if (IsRemoteControlId(args->DeviceId->Data()))
+ HandleAcceleratorKey(sender, args);
+ });
+
+ auto smtc = SystemMediaTransportControls::GetForCurrentView();
+ if (smtc)
+ {
+ m_mediatoken = smtc->ButtonPressed += ref new TypedEventHandler<SystemMediaTransportControls^, SystemMediaTransportControlsButtonPressedEventArgs^>
+ ([this](SystemMediaTransportControls^ sender, SystemMediaTransportControlsButtonPressedEventArgs^ args)
+ {
+ HandleMediaButton(args);
+ });
+ smtc->IsEnabled = true;
+ }
+ m_bInitialized = true;
+}
+
+void CRemoteControlXbox::Update()
+{
+ if (m_lastButton != 0)
+ {
+ m_button = m_lastButton;
+ m_lastButton = 0;
+ }
+}
+
+uint16_t CRemoteControlXbox::GetButton() const
+{
+ return m_button;
+}
+
+uint32_t CRemoteControlXbox::GetHoldTimeMs() const
+{
+ return m_holdTime;
+}
+
+
+
+void CRemoteControlXbox::HandleAcceleratorKey(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args)
+{
+ auto button = TranslateVirtualKey(args->VirtualKey);
+ if (!button)
+ return;
+ 
+ switch (args->EventType)
+ {
+ case CoreAcceleratorKeyEventType::KeyDown:
+ case CoreAcceleratorKeyEventType::SystemKeyDown:
+ {
+ if (m_lastKey != args->VirtualKey)
+ {
+ m_lastKey = args->VirtualKey;
+ m_firstClickTime = XbmcThreads::SystemClockMillis();
+ m_holdTime = 0;
+ }
+ else
+ m_holdTime = XbmcThreads::SystemClockMillis() - m_firstClickTime;
+
+ m_lastButton = button;
+ break;
+ }
+ case CoreAcceleratorKeyEventType::KeyUp:
+ case CoreAcceleratorKeyEventType::SystemKeyUp:
+ {
+ if (m_lastKey == args->VirtualKey)
+ m_holdTime = XbmcThreads::SystemClockMillis() - m_firstClickTime;
+ else
+ m_holdTime = 0;
+
+ m_lastKey = VirtualKey::None;
+ break;
+ }
+ case CoreAcceleratorKeyEventType::Character:
+ case CoreAcceleratorKeyEventType::SystemCharacter:
+ case CoreAcceleratorKeyEventType::UnicodeCharacter:
+ case CoreAcceleratorKeyEventType::DeadCharacter:
+ case CoreAcceleratorKeyEventType::SystemDeadCharacter:
+ default:
+ break;
+ }
+ args->Handled = true;
+}
+
+void CRemoteControlXbox::HandleMediaButton(Windows::Media::SystemMediaTransportControlsButtonPressedEventArgs^ args)
+{
+ m_lastButton = TranslateMediaKey(args->Button);
+}
+
+int32_t CRemoteControlXbox::TranslateVirtualKey(Windows::System::VirtualKey vk)
+{
+ switch (vk)
+ {
+ case VirtualKey::GamepadDPadLeft:
+ return XINPUT_IR_REMOTE_LEFT;
+ case VirtualKey::GamepadDPadUp:
+ return XINPUT_IR_REMOTE_UP;
+ case VirtualKey::GamepadDPadRight:
+ return XINPUT_IR_REMOTE_RIGHT;
+ case VirtualKey::GamepadDPadDown:
+ return XINPUT_IR_REMOTE_DOWN;
+ case VirtualKey::GamepadA:
+ return XINPUT_IR_REMOTE_SELECT;
+ case VirtualKey::GamepadB:
+ return XINPUT_IR_REMOTE_BACK;
+ case VirtualKey::GamepadX:
+ return XINPUT_IR_REMOTE_CONTENTS_MENU;
+ case VirtualKey::GamepadY:
+ return XINPUT_IR_REMOTE_INFO;
+ case VirtualKey::Clear:
+ return XINPUT_IR_REMOTE_CLEAR;
+ case VirtualKey::PageDown:
+ return XINPUT_IR_REMOTE_CHANNEL_MINUS;
+ case VirtualKey::PageUp:
+ return XINPUT_IR_REMOTE_CHANNEL_PLUS;
+ case VirtualKey::Number0:
+ return XINPUT_IR_REMOTE_0;
+ case VirtualKey::Number1:
+ return XINPUT_IR_REMOTE_1;
+ case VirtualKey::Number2:
+ return XINPUT_IR_REMOTE_2;
+ case VirtualKey::Number3:
+ return XINPUT_IR_REMOTE_3;
+ case VirtualKey::Number4:
+ return XINPUT_IR_REMOTE_4;
+ case VirtualKey::Number5:
+ return XINPUT_IR_REMOTE_5;
+ case VirtualKey::Number6:
+ return XINPUT_IR_REMOTE_6;
+ case VirtualKey::Number7:
+ return XINPUT_IR_REMOTE_7;
+ case VirtualKey::Number8:
+ return XINPUT_IR_REMOTE_8;
+ case VirtualKey::Number9:
+ return XINPUT_IR_REMOTE_9;
+ case VirtualKey::Decimal:
+ return XINPUT_IR_REMOTE_STAR;
+ case VirtualKey::GamepadView:
+ return XINPUT_IR_REMOTE_DISPLAY;
+ case VirtualKey::GamepadMenu:
+ return XINPUT_IR_REMOTE_MENU;
+ default:
+ CLog::LogFunction(LOGDEBUG, __FUNCTION__, "unknown vrtual key %d", static_cast<int>(vk));
+ return 0;
+ }
+}
+
+int32_t CRemoteControlXbox::TranslateMediaKey(Windows::Media::SystemMediaTransportControlsButton mk)
+{
+ switch (mk)
+ {
+ case SystemMediaTransportControlsButton::ChannelDown:
+ return XINPUT_IR_REMOTE_CHANNEL_MINUS;
+ break;
+ case SystemMediaTransportControlsButton::ChannelUp:
+ return XINPUT_IR_REMOTE_CHANNEL_PLUS;
+ case SystemMediaTransportControlsButton::FastForward:
+ return XINPUT_IR_REMOTE_FORWARD;
+ case SystemMediaTransportControlsButton::Rewind:
+ return XINPUT_IR_REMOTE_REVERSE;
+ case SystemMediaTransportControlsButton::Next:
+ return XINPUT_IR_REMOTE_SKIP_PLUS;
+ case SystemMediaTransportControlsButton::Previous:
+ return XINPUT_IR_REMOTE_SKIP_MINUS;
+ case SystemMediaTransportControlsButton::Pause:
+ return XINPUT_IR_REMOTE_PAUSE;
+ case SystemMediaTransportControlsButton::Play:
+ return XINPUT_IR_REMOTE_PLAY;
+ case SystemMediaTransportControlsButton::Stop:
+ return XINPUT_IR_REMOTE_STOP;
+ case SystemMediaTransportControlsButton::Record:
+ return XINPUT_IR_REMOTE_RECORD;
+ default:
+ return 0;
+ }
+}

_service:download_files:master.tar.gz/xbmc/platform/win10/input/RemoteControlXbox.h Added

@@ -0,0 +1,65 @@
+#pragma once
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "input/remote/IRemoteControl.h"
+#include <string>
+
+class CRemoteControlXbox : public KODI::REMOTE::IRemoteControl
+{
+public:
+ CRemoteControlXbox();
+ virtual ~CRemoteControlXbox();
+ void Initialize() override;
+ void Disconnect() override;
+ void Reset() override;
+ void Update() override;
+ uint16_t GetButton() const override;
+ uint32_t GetHoldTimeMs() const override;
+ bool IsInitialized() const override { return m_bInitialized; }
+ std::string GetMapFile() override;
+
+ void SetEnabled(bool) override { }
+ void SetDeviceName(const std::string&) override { }
+ void AddSendCommand(const std::string&) override { }
+ bool IsInUse() const override { return false; }
+
+ static KODI::REMOTE::IRemoteControl* CreateInstance();
+ static void Register();
+
+ static bool IsRemoteControlId(const std::wstring &deviceId);
+
+private:
+ void HandleAcceleratorKey(Windows::UI::Core::CoreDispatcher^ sender, Windows::UI::Core::AcceleratorKeyEventArgs^ args);
+ void HandleMediaButton(Windows::Media::SystemMediaTransportControlsButtonPressedEventArgs^ args);
+ int32_t TranslateVirtualKey(Windows::System::VirtualKey vk);
+ int32_t TranslateMediaKey(Windows::Media::SystemMediaTransportControlsButton mk);
+
+ int32_t m_button;
+ int32_t m_lastButton;
+ uint32_t m_holdTime;
+ uint32_t m_firstClickTime;
+ bool m_bInitialized;
+ std::string m_deviceName;
+ Windows::Foundation::EventRegistrationToken m_token;
+ Windows::Foundation::EventRegistrationToken m_mediatoken;
+ Windows::System::VirtualKey m_lastKey;
+ Windows::Media::SystemMediaTransportControlsButton m_lastMediaButton;
+};

_service:download_files:master.tar.gz/xbmc/platform/win10/main.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/CharsetConverter.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/CharsetConverter.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/Environment.cpp Added

@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2018 Team XBMC
+ * 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/>.
+ *
+ */
+
+/**
+ * \file platform\win32\Environment.cpp
+ * \brief Implements CEnvironment win32 specified class functions.
+ */
+
+#include "platform/Environment.h"
+#include "platform/win32/CharsetConverter.h"
+#include <stdlib.h>
+#include <Windows.h>
+
+// --------------------- Internal Function ---------------------
+
+/**
+ * \fn int CEnvironment::win32_setenv(const std::wstring &name, const std::wstring &value = L"",
+ * updateAction action = autoDetect)
+ * \brief Internal function used to manipulate environment variables on win32.
+ *
+ * This function make all dirty work with setting, deleting and modifying environment variables.
+ *
+ * \param name The environment variable name.
+ * \param value (optional) the new value of environment variable.
+ * \param action (optional) the action.
+ * \return Zero on success, 2 if at least one external runtime update failed, 4 if process
+ * 		 environment update failed, 8 if our runtime environment update failed or, in case of
+ * 		 several errors, sum of all errors values; non-zero in case of other errors.
+ */
+int CEnvironment::win_setenv(const std::string &name, const std::string &value /* = "" */, enum updateAction action /* = autoDetect */)
+{
+ std::wstring Wname = KODI::PLATFORM::WINDOWS::ToW(name);
+ if (Wname.empty() || name.find('=') != std::wstring::npos)
+ return -1;
+ if ( (action == addOnly || action == addOrUpdateOnly) && value.empty() )
+ return -1;
+ if (action == addOnly && !getenv(name).empty() )
+ return 0;
+
+ std::wstring Wvalue = KODI::PLATFORM::WINDOWS::ToW(value);
+ int retValue = 0;
+
+ std::wstring EnvString;
+ if (action == deleteVariable)
+ EnvString = Wname + L"=";
+ else
+ EnvString = Wname + L"=" + Wvalue;
+
+ #ifdef _DEBUG
+ // Most dependencies are built in release and use non-debug runtime libs, 
+ // and so we have to sync environment vars for these during debug because 
+ // they don't share environments between themselves
+ typedef int(_cdecl * wputenvPtr) (const wchar_t *envstring);
+ static const wchar_t *modulesList[] =
+ {
+ { L"vcruntime140.dll" },
+ { L"ucrtbase.dll" },
+ { nullptr } // Terminating NULL for list
+ };
+ 
+ // Check all modules each function run, because modules can be loaded/unloaded at runtime
+ for (int i = 0; modulesList[i]; i++)
+ {
+ HMODULE hModule;
+ if (!GetModuleHandleExW(0, modulesList[i], &hModule) || hModule == nullptr) // Flag 0 ensures that module will be kept loaded until it'll be freed
+ continue; // Module not loaded
+ 
+ wputenvPtr wputenvFunc = (wputenvPtr)GetProcAddress(hModule, "_wputenv");
+ if (wputenvFunc != nullptr && wputenvFunc(EnvString.c_str()) != 0)
+ retValue |= 2; // At lest one external runtime library Environment update failed
+ FreeLibrary(hModule);
+ }
+ #endif
+
+ // Update process Environment used for current process and for future new child processes
+ if (action == deleteVariable || value.empty())
+ retValue += SetEnvironmentVariableW(Wname.c_str(), nullptr) ? 0 : 4; // 4 if failed
+ else
+ retValue += SetEnvironmentVariableW(Wname.c_str(), Wvalue.c_str()) ? 0 : 4; // 4 if failed
+
+ // Finally update our runtime Environment
+ retValue += (::_wputenv(EnvString.c_str()) == 0) ? 0 : 8; // 8 if failed
+ return retValue;
+}
+
+std::string CEnvironment::win_getenv(const std::string &name)
+{
+ std::wstring Wname = KODI::PLATFORM::WINDOWS::ToW(name);
+ if (Wname.empty())
+ return "";
+
+ wchar_t * wStr = ::_wgetenv(Wname.c_str());
+ if (wStr != nullptr)
+ return KODI::PLATFORM::WINDOWS::FromW(wStr);
+
+ // Not found in Environment of runtime library
+ // Try Environment of process as fallback
+ unsigned int varSize = GetEnvironmentVariableW(Wname.c_str(), nullptr, 0);
+ if (varSize == 0)
+ return ""; // Not found
+ wchar_t * valBuf = new wchar_t[varSize];
+ if (GetEnvironmentVariableW(Wname.c_str(), valBuf, varSize) != varSize-1)
+ {
+ delete[] valBuf;
+ return "";
+ }
+ std::wstring Wvalue (valBuf);
+ delete[] valBuf;
+
+ return KODI::PLATFORM::WINDOWS::FromW(Wvalue);
+}

_service:download_files:master.tar.gz/xbmc/platform/win32/Filesystem.cpp Changed

@@ -1,129 +1,126 @@
-/*
- * Copyright (C) 2005-2017 Team Kodi
- * 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 "platform/Filesystem.h"
-#include "platform/win32/CharsetConverter.h"
-
-#if !defined(WIN32_LEAN_AND_MEAN)
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <Windows.h>
-
-namespace win = KODI::PLATFORM::WINDOWS;
-
-namespace KODI
-{
-namespace PLATFORM
-{
-namespace FILESYSTEM
-{
-space_info space(const std::string& path, std::error_code& ec)
-{
-
- ec.clear();
- space_info sp;
- auto pathW = win::ToW(path);
-
- ULARGE_INTEGER capacity;
- ULARGE_INTEGER available;
- ULARGE_INTEGER free;
- auto result = GetDiskFreeSpaceExW(pathW.c_str(), &available, &capacity, &free);
-
- if (result == FALSE)
- {
- ec.assign(GetLastError(), std::system_category());
- sp.available = static_cast<uintmax_t>(-1);
- sp.capacity = static_cast<uintmax_t>(-1);
- sp.free = static_cast<uintmax_t>(-1);
- return sp;
- }
-
- sp.available = static_cast<uintmax_t>(available.QuadPart);
- sp.capacity = static_cast<uintmax_t>(capacity.QuadPart);
- sp.free = static_cast<uintmax_t>(free.QuadPart);
-
- return sp;
-}
-
-std::string temp_directory_path(std::error_code &ec)
-{
- wchar_t lpTempPathBuffer[MAX_PATH + 1];
-
- if (!GetTempPathW(MAX_PATH, lpTempPathBuffer))
- {
- ec.assign(GetLastError(), std::system_category());
- return std::string();
- }
-
- ec.clear();
- return win::FromW(lpTempPathBuffer);
-}
-
-std::string create_temp_directory(std::error_code &ec)
-{
- wchar_t lpTempPathBuffer[MAX_PATH + 1];
-
- std::wstring xbmcTempPath = win::ToW(temp_directory_path(ec));
-
- if (ec)
- return std::string();
-
- if (!GetTempFileNameW(xbmcTempPath.c_str(), L"xbm", 0, lpTempPathBuffer))
- {
- ec.assign(GetLastError(), std::system_category());
- return std::string();
- }
-
- DeleteFileW(lpTempPathBuffer);
-
- if (!CreateDirectoryW(lpTempPathBuffer, nullptr))
- {
- ec.assign(GetLastError(), std::system_category());
- return std::string();
- }
-
- ec.clear();
- return win::FromW(lpTempPathBuffer);
-}
-
-std::string temp_file_path(std::string, std::error_code &ec)
-{
- wchar_t lpTempPathBuffer[MAX_PATH + 1];
-
- std::wstring xbmcTempPath = win::ToW(create_temp_directory(ec));
-
- if (ec)
- return std::string();
-
- if (!GetTempFileNameW(xbmcTempPath.c_str(), L"xbm", 0, lpTempPathBuffer))
- {
- ec.assign(GetLastError(), std::system_category());
- return std::string();
- }
-
- DeleteFileW(lpTempPathBuffer);
-
- ec.clear();
- return win::FromW(lpTempPathBuffer);
-}
-
-}
-}
-}
\ No newline at end of file
+/*
+ * Copyright (C) 2005-2017 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 "platform/Filesystem.h"
+#include "platform/win32/CharsetConverter.h"
+
+#include <Windows.h>
+
+namespace win = KODI::PLATFORM::WINDOWS;
+
+namespace KODI
+{
+namespace PLATFORM
+{
+namespace FILESYSTEM
+{
+space_info space(const std::string& path, std::error_code& ec)
+{
+
+ ec.clear();
+ space_info sp;
+ auto pathW = win::ToW(path);
+
+ ULARGE_INTEGER capacity;
+ ULARGE_INTEGER available;
+ ULARGE_INTEGER free;
+ auto result = GetDiskFreeSpaceExW(pathW.c_str(), &available, &capacity, &free);
+
+ if (result == FALSE)
+ {
+ ec.assign(GetLastError(), std::system_category());
+ sp.available = static_cast<uintmax_t>(-1);
+ sp.capacity = static_cast<uintmax_t>(-1);
+ sp.free = static_cast<uintmax_t>(-1);
+ return sp;
+ }
+
+ sp.available = static_cast<uintmax_t>(available.QuadPart);
+ sp.capacity = static_cast<uintmax_t>(capacity.QuadPart);
+ sp.free = static_cast<uintmax_t>(free.QuadPart);
+
+ return sp;
+}
+
+std::string temp_directory_path(std::error_code &ec)
+{
+ wchar_t lpTempPathBuffer[MAX_PATH + 1];
+
+ if (!GetTempPathW(MAX_PATH, lpTempPathBuffer))
+ {
+ ec.assign(GetLastError(), std::system_category());
+ return std::string();
+ }
+
+ ec.clear();
+ return win::FromW(lpTempPathBuffer);
+}
+
+std::string create_temp_directory(std::error_code &ec)
+{
+ wchar_t lpTempPathBuffer[MAX_PATH + 1];
+
+ std::wstring xbmcTempPath = win::ToW(temp_directory_path(ec));
+
+ if (ec)
+ return std::string();
+
+ if (!GetTempFileNameW(xbmcTempPath.c_str(), L"xbm", 0, lpTempPathBuffer))
+ {
+ ec.assign(GetLastError(), std::system_category());
+ return std::string();
+ }
+
+ DeleteFileW(lpTempPathBuffer);
+
+ if (!CreateDirectoryW(lpTempPathBuffer, nullptr))
+ {
+ ec.assign(GetLastError(), std::system_category());
+ return std::string();
+ }
+
+ ec.clear();
+ return win::FromW(lpTempPathBuffer);
+}
+
+std::string temp_file_path(std::string, std::error_code &ec)
+{
+ wchar_t lpTempPathBuffer[MAX_PATH + 1];
+
+ std::wstring xbmcTempPath = win::ToW(create_temp_directory(ec));
+
+ if (ec)
+ return std::string();
+
+ if (!GetTempFileNameW(xbmcTempPath.c_str(), L"xbm", 0, lpTempPathBuffer))
+ {
+ ec.assign(GetLastError(), std::system_category());
+ return std::string();
+ }
+
+ DeleteFileW(lpTempPathBuffer);
+
+ ec.clear();
+ return win::FromW(lpTempPathBuffer);
+}
+
+}
+}
+}

_service:download_files:master.tar.gz/xbmc/platform/win32/IMMNotificationClient.h Changed

@@ -1,7 +1,7 @@
 //#pragma once
 /*
 * Copyright (C) 2014 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,28 +19,29 @@
 *
 */
 
-#include <mmdeviceapi.h>
-#include "system.h" // for SAFE_RELEASE
-#include "utils/log.h"
-#include "ServiceBroker.h"
 #include "cores/AudioEngine/Engines/ActiveAE/ActiveAE.h"
 #include "powermanagement/windows/Win32PowerSyscall.h"
+#include "ServiceBroker.h"
+#include "utils/log.h"
+#include "platform/win32/CharsetConverter.h"
+
+#include <mmdeviceapi.h>
+#include <wrl/client.h>
+
+using KODI::PLATFORM::WINDOWS::FromW;
 
 class CMMNotificationClient : public IMMNotificationClient
 {
 LONG _cRef;
- IMMDeviceEnumerator *_pEnumerator;
+ Microsoft::WRL::ComPtr<IMMDeviceEnumerator> _pEnumerator;
 
 
 public:
- CMMNotificationClient() : _cRef(1), _pEnumerator(NULL)
+ CMMNotificationClient() : _cRef(1), _pEnumerator(nullptr)
 {
 }
 
- ~CMMNotificationClient()
- {
- SAFE_RELEASE(_pEnumerator);
- }
+ ~CMMNotificationClient() = default;
 
 // IUnknown methods -- AddRef, Release, and QueryInterface
 
@@ -59,7 +60,7 @@
 return ulRef;
 }
 
- HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, VOID **ppvInterface)
+ HRESULT STDMETHODCALLTYPE QueryInterface(const IID & riid, void **ppvInterface)
 {
 if (IID_IUnknown == riid)
 {
@@ -73,7 +74,7 @@
 }
 else
 {
- *ppvInterface = NULL;
+ *ppvInterface = nullptr;
 return E_NOINTERFACE;
 }
 return S_OK;
@@ -118,14 +119,14 @@
 
 HRESULT STDMETHODCALLTYPE OnDeviceAdded(LPCWSTR pwstrDeviceId)
 {
- CLog::Log(LOGDEBUG, "%s: Added device: %s", __FUNCTION__, pwstrDeviceId);
+ CLog::Log(LOGDEBUG, "%s: Added device: %s", __FUNCTION__, FromW(pwstrDeviceId));
 NotifyAE();
 return S_OK;
 }
 
 HRESULT STDMETHODCALLTYPE OnDeviceRemoved(LPCWSTR pwstrDeviceId)
 {
- CLog::Log(LOGDEBUG, "%s: Removed device: %s", __FUNCTION__, pwstrDeviceId);
+ CLog::Log(LOGDEBUG, "%s: Removed device: %s", __FUNCTION__, FromW(pwstrDeviceId));
 NotifyAE();
 return S_OK;
 }
@@ -156,8 +157,8 @@
 
 HRESULT STDMETHODCALLTYPE OnPropertyValueChanged(LPCWSTR pwstrDeviceId, const PROPERTYKEY key)
 {
- CLog::Log(LOGDEBUG, "%s: Changed device property of %S is {%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}#%d", 
- __FUNCTION__, pwstrDeviceId, key.fmtid.Data1, key.fmtid.Data2, key.fmtid.Data3,
+ CLog::Log(LOGDEBUG, "%s: Changed device property of %s is {{%8.8x-%4.4x-%4.4x-%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x}}#%d", 
+ __FUNCTION__, FromW(pwstrDeviceId), key.fmtid.Data1, key.fmtid.Data2, key.fmtid.Data3,
 key.fmtid.Data4[0], key.fmtid.Data4[1],
 key.fmtid.Data4[2], key.fmtid.Data4[3],
 key.fmtid.Data4[4], key.fmtid.Data4[5],

_service:download_files:master.tar.gz/xbmc/platform/win32/MessagePrinter.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/PlatformDefs.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/WIN32Util.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,7 +25,6 @@
 #include "PowrProf.h"
 #include "WindowHelper.h"
 #include "Application.h"
-#include <shlobj.h>
 #include "my_ntddscsi.h"
 #include "storage/MediaManager.h"
 #include "guilib/LocalizeStrings.h"
@@ -41,6 +40,10 @@
 #endif
 #include <locale.h>
 
+#include <shellapi.h>
+#include <shlobj.h>
+#include <winioctl.h>
+
 #ifdef TARGET_WINDOWS_DESKTOP
 extern HWND g_hWnd;
 #endif
@@ -68,8 +71,8 @@
 int CWIN32Util::GetDriveStatus(const std::string &strPath, bool bStatusEx)
 {
 #ifdef TARGET_WINDOWS_STORE
- CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
- CLog::Log(LOGDEBUG, __FUNCTION__": Could not determine tray status %d", GetLastError());
+ CLog::LogF(LOGDEBUG, "is not implemented");
+ CLog::LogF(LOGDEBUG, "Could not determine tray status %d", GetLastError());
 return -1;
 #else
 using KODI::PLATFORM::WINDOWS::ToW;
@@ -82,7 +85,7 @@
 T_SPDT_SBUF sptd_sb; //SCSI Pass Through Direct variable.
 byte DataBuf[8]; //Buffer for holding data to/from drive.
 
- CLog::Log(LOGDEBUG, __FUNCTION__": Requesting status for drive %s.", strPath.c_str());
+ CLog::LogF(LOGDEBUG, "Requesting status for drive %s.", strPath);
 
 hDevice = CreateFile( strPathW.c_str(), // drive
 0, // no access to the drive
@@ -94,11 +97,11 @@
 
 if (hDevice == INVALID_HANDLE_VALUE) // cannot open the drive
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to CreateFile for %s.", strPath.c_str());
+ CLog::LogF(LOGERROR, "Failed to CreateFile for %s.", strPath);
 return -1;
 }
 
- CLog::Log(LOGDEBUG, __FUNCTION__": Requesting media status for drive %s.", strPath.c_str());
+ CLog::LogF(LOGDEBUG, "Requesting media status for drive %s.", strPath);
 iResult = DeviceIoControl((HANDLE) hDevice, // handle to device
 IOCTL_STORAGE_CHECK_VERIFY2, // dwIoControlCode
 NULL, // lpInBuffer
@@ -127,7 +130,7 @@
 
 if (hDevice == INVALID_HANDLE_VALUE)
 {
- CLog::Log(LOGERROR, __FUNCTION__": Failed to CreateFile2 for %s.", strPath.c_str());
+ CLog::LogF(LOGERROR, "Failed to CreateFile2 for %s.", strPath);
 return -1;
 }
 
@@ -164,7 +167,7 @@
 ZeroMemory(sptd_sb.SenseBuf, MAX_SENSE_LEN);
 
 //Send the command to drive
- CLog::Log(LOGDEBUG, __FUNCTION__": Requesting tray status for drive %s.", strPath.c_str());
+ CLog::LogF(LOGDEBUG, "Requesting tray status for drive %s.", strPath);
 iResult = DeviceIoControl((HANDLE) hDevice,
 IOCTL_SCSI_PASS_THROUGH_DIRECT,
 (PVOID)&sptd_sb, (DWORD)sizeof(sptd_sb),
@@ -184,7 +187,7 @@
 else
 return 2; // tray closed, media present
 }
- CLog::Log(LOGERROR, __FUNCTION__": Could not determine tray status %d", GetLastError());
+ CLog::LogF(LOGERROR, "Could not determine tray status %d", GetLastError());
 return -1;
 #endif
 }
@@ -203,7 +206,7 @@
 bool CWIN32Util::XBMCShellExecute(const std::string &strPath, bool bWaitForScriptExit)
 {
 #ifdef TARGET_WINDOWS_STORE
- CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "s not implemented");
 return false;
 #else
 std::string strCommand = strPath;
@@ -299,7 +302,7 @@
 int CWIN32Util::GetDesktopColorDepth()
 {
 #ifdef TARGET_WINDOWS_STORE
- CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "s not implemented");
 return 32;
 #else
 DEVMODE devmode;
@@ -477,7 +480,7 @@
 else
 return std::wstring(); // unsupported protocol, return empty string
 
- CLog::Log(LOGERROR, "%s: Error converting path \"%s\" to Win32 form", __FUNCTION__, url.Get().c_str());
+ CLog::LogF(LOGERROR, "Error converting path \"%s\" to Win32 form", url.Get());
 return std::wstring(); // empty string
 }
 
@@ -500,7 +503,7 @@
 HRESULT CWIN32Util::ToggleTray(const char cDriveLetter)
 {
 #ifdef TARGET_WINDOWS_STORE
- CLog::Log(LOGDEBUG, "%s is not implemented", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "s not implemented");
 return false;
 #else
 using namespace KODI::PLATFORM::WINDOWS;

_service:download_files:master.tar.gz/xbmc/platform/win32/WIN32Util.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/WinMain.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,15 +24,17 @@
 #include "threads/platform/win/Win32Exception.h"
 #include "platform/win32/CharsetConverter.h"
 #include "platform/xbmc.h"
-#include "platform/XbmcContext.h"
 #include "settings/AdvancedSettings.h"
 #include "utils/CPUInfo.h"
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #include "utils/CharsetConverter.h" // Required to initialize converters before usage
 
 
 #include <dbghelp.h>
+#include <mmsystem.h>
+#include <Objbase.h>
 #include <shellapi.h>
+#include <WinSock2.h>
 
 
 // Minidump creation function
@@ -126,8 +128,6 @@
 
 int status;
 {
- // set up some xbmc specific relationships
- XBMC::Context context;
 // Initialize before CAppParamParser so it can set the log level
 g_advancedSettings.Initialize();

_service:download_files:master.tar.gz/xbmc/platform/win32/WindowHelper.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/WindowHelper.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/arpa/inet.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/dxerr.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/input Added

_service:download_files:master.tar.gz/xbmc/platform/win32/input/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/input/IRServerSuite.cpp Added

@@ -0,0 +1,500 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "IRServerSuite.h"
+#include "IrssMessage.h"
+#include "input/InputManager.h"
+#include "utils/log.h"
+#include "ServiceBroker.h"
+#include "platform/win32/CharsetConverter.h"
+#include <Ws2tcpip.h>
+
+#define IRSS_PORT 24000
+#define IRSS_MAP_FILENAME "IRSSmap.xml"
+
+KODI::REMOTE::IRemoteControl* CRemoteControl::CreateInstance()
+{
+ return new CRemoteControl();
+}
+
+void CRemoteControl::Register()
+{
+ CInputManager::RegisterRemoteControl(CRemoteControl::CreateInstance);
+}
+
+CRemoteControl::CRemoteControl()
+ : CThread("RemoteControl")
+ , m_button(0)
+ , m_bInitialized(false)
+ , m_socket(INVALID_SOCKET)
+ , m_isConnecting(false)
+{
+}
+
+CRemoteControl::~CRemoteControl()
+{
+ Disconnect();
+}
+
+std::string CRemoteControl::GetMapFile()
+{
+ return IRSS_MAP_FILENAME;
+}
+
+void CRemoteControl::Disconnect()
+{
+ m_event.Set();
+
+ StopThread();
+ Close();
+}
+
+void CRemoteControl::Close()
+{
+ m_isConnecting = false;
+ if (m_socket != INVALID_SOCKET)
+ {
+ if (m_bInitialized)
+ {
+ m_bInitialized = false;
+ CIrssMessage message(IRSSMT_UnregisterClient, IRSSMF_Request | IRSSMF_ForceNotRespond);
+ SendPacket(message);
+ }
+ shutdown(m_socket, SD_BOTH);
+ closesocket(m_socket);
+ m_socket = INVALID_SOCKET;
+ }
+}
+
+void CRemoteControl::Reset()
+{
+ m_button = 0;
+}
+
+void CRemoteControl::Initialize()
+{
+ if (m_isConnecting || m_bInitialized || IsRunning())
+ return;
+ //trying to connect when there is nothing to connect to is kinda slow so kick it off in a thread.
+ Create();
+}
+
+void CRemoteControl::Process()
+{
+ unsigned int iMsRetryDelay = 5000;
+ int iAttempt = 0;
+ // try to connect 60 times @ a 5 second interval (5 minutes)
+ // multiple tries because irss service might be up and running a little later then xbmc on boot.
+ while (!m_bStop && iAttempt <= 60)
+ {
+ if (Connect(iAttempt == 0))
+ break;
+
+ if(iAttempt == 0)
+ CLog::Log(LOGINFO, "CRemoteControl::Process - failed to connect to irss, will keep retrying every %d seconds", iMsRetryDelay / 1000);
+
+ ++iAttempt;
+ 
+ if (AbortableWait(m_event, iMsRetryDelay) == WAIT_INTERRUPTED)
+ break;
+ }
+}
+
+bool CRemoteControl::Connect(bool logMessages)
+{
+ char namebuf[NI_MAXHOST], portbuf[NI_MAXSERV];
+ struct addrinfo hints = {};
+ struct addrinfo *result, *addr;
+ char service[33];
+ int res;
+
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
+ sprintf(service, "%d", IRSS_PORT);
+
+ res = getaddrinfo("localhost", service, &hints, &result);
+ if(res)
+ {
+ if (logMessages)
+ CLog::Log(LOGDEBUG, "CRemoteControl::Connect - getaddrinfo failed: %s",
+ KODI::PLATFORM::WINDOWS::FromW(gai_strerror(res)));
+ return false;
+ }
+
+ for(addr = result; addr; addr = addr->ai_next)
+ {
+ if(getnameinfo(addr->ai_addr, addr->ai_addrlen, namebuf, sizeof(namebuf), portbuf, sizeof(portbuf),NI_NUMERICHOST))
+ {
+ strcpy(namebuf, "[unknown]");
+ strcpy(portbuf, "[unknown]");
+ }
+
+ if (logMessages)
+ CLog::Log(LOGDEBUG, "CRemoteControl::Connect - connecting to: %s:%s ...", namebuf, portbuf);
+
+ m_socket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+ if(m_socket == INVALID_SOCKET)
+ continue;
+
+ if(connect(m_socket, addr->ai_addr, addr->ai_addrlen) != SOCKET_ERROR)
+ break;
+
+ closesocket(m_socket);
+ m_socket = INVALID_SOCKET;
+ }
+
+ freeaddrinfo(result);
+ if(m_socket == INVALID_SOCKET)
+ {
+ if (logMessages)
+ CLog::Log(LOGDEBUG, "CRemoteControl::Connect - failed to connect");
+ Close();
+ return false;
+ }
+
+ u_long iMode = 1; //non-blocking
+ if (ioctlsocket(m_socket, FIONBIO, &iMode) == SOCKET_ERROR)
+ {
+ if (logMessages)
+ CLog::Log(LOGERROR, "IRServerSuite: failed to set socket to non-blocking.");
+ Close();
+ return false;
+ }
+
+ //register
+ CIrssMessage mess(IRSSMT_RegisterClient, IRSSMF_Request);
+ if (!SendPacket(mess))
+ {
+ if (logMessages)
+ CLog::Log(LOGERROR, "IRServerSuite: failed to send RegisterClient packet.");
+ return false;
+ }
+ m_isConnecting = true;
+ return true;
+}
+
+bool CRemoteControl::SendPacket(CIrssMessage& message)
+{
+ int iSize = 0;
+ char* bytes = message.ToBytes(iSize);
+ char buffer[4];
+ uint32_t len = htonl(iSize);
+ memcpy(&buffer[0], &len, 4);
+ bool bResult = WriteN(&buffer[0], 4);
+ if (bResult)
+ {
+ bResult = WriteN(bytes, iSize);
+ }
+ delete[] bytes;
+ if (!bResult)
+ {
+ Close();
+ return false;
+ }
+ return true;
+}
+
+
+void CRemoteControl::Update()
+{
+ if ((!m_bInitialized && !m_isConnecting) || (m_socket == INVALID_SOCKET))
+ {
+ return;
+ }
+
+ CIrssMessage mess;
+ if (!ReadPacket(mess))
+ {
+ return;
+ }
+ switch (mess.GetType())
+ {
+ case IRSSMT_RegisterClient:
+ m_isConnecting = false;
+ if ((mess.GetFlags() & IRSSMF_Success) != IRSSMF_Success)
+ {
+ //uh oh, it failed to register
+ Close();
+ CLog::Log(LOGERROR, "IRServerSuite: failed to register XBMC as a client.");
+ }
+ else
+ {
+ m_bInitialized = true;
+ //request info about receivers
+ CIrssMessage mess(IRSSMT_DetectedReceivers, IRSSMF_Request);
+ if (!SendPacket(mess))
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+ }
+ mess.SetType(IRSSMT_AvailableReceivers);
+ if (!SendPacket(mess))
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+ }
+ mess.SetType(IRSSMT_ActiveReceivers);
+ if (!SendPacket(mess))
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: failed to send AvailableReceivers packet.");
+ }
+ }
+ break;
+ case IRSSMT_RemoteEvent:
+ HandleRemoteEvent(mess);
+ break;
+ case IRSSMT_Error:
+ //I suppose the errormessage is in the packet somewhere...
+ CLog::Log(LOGERROR, "IRServerSuite: we got an error message.");
+ break;
+ case IRSSMT_ServerShutdown:
+ Close();
+ break;
+ case IRSSMT_ServerSuspend:
+ //should we do something?
+ break;
+ case IRSSMT_ServerResume:
+ //should we do something?
+ break;
+ case IRSSMT_AvailableReceivers:
+ {
+ uint32_t size = mess.GetDataSize();
+ if (size > 0)
+ {
+ char* data = mess.GetData();
+ char* availablereceivers = new char[size + 1];
+ memcpy(availablereceivers, data, size);
+ availablereceivers[size] = '\0';
+ CLog::Log(LOGINFO, "IRServerSuite: Available receivers: %s", availablereceivers);
+ delete[] availablereceivers;
+ }
+ }
+ break;
+ case IRSSMT_DetectedReceivers:
+ {
+ uint32_t size = mess.GetDataSize();
+ if (size > 0)
+ {
+ char* data = mess.GetData();
+ char* detectedreceivers = new char[size + 1];
+ memcpy(detectedreceivers, data, size);
+ detectedreceivers[size] = '\0';
+ CLog::Log(LOGINFO, "IRServerSuite: Detected receivers: %s", detectedreceivers);
+ delete[] detectedreceivers;
+ }
+ }
+ break;
+ case IRSSMT_ActiveReceivers:
+ {
+ uint32_t size = mess.GetDataSize();
+ if (size > 0)
+ {
+ char* data = mess.GetData();
+ char* activereceivers = new char[size + 1];
+ memcpy(activereceivers, data, size);
+ activereceivers[size] = '\0';
+ CLog::Log(LOGINFO, "IRServerSuite: Active receivers: %s", activereceivers);
+ delete[] activereceivers;
+ }
+ }
+ break;
+ }
+}
+
+bool CRemoteControl::HandleRemoteEvent(CIrssMessage& message)
+{
+ try
+ {
+ //flag should be notify, maybe check it?
+ char* data = message.GetData();
+ uint32_t datalen = message.GetDataSize();
+ char* deviceName;
+ char* keycode;
+ uint32_t devicenamelength;
+ uint32_t keycodelength;
+ if (datalen == 0)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: no data in remote message.");
+ return false;
+ }
+ if (datalen <= 8)
+ {
+ //seems to be version 1.0.4.1, only keycode is sent, use Microsoft MCE mapping??
+ devicenamelength = 13;
+ deviceName = new char[devicenamelength + 1];
+ sprintf(deviceName, "Microsoft MCE");
+ keycodelength = datalen;
+ keycode = new char[keycodelength + 1];
+ memcpy(keycode, data, keycodelength);
+ }
+ else
+ {
+ //first 4 bytes is devicename length
+ memcpy(&devicenamelength, data, 4);
+ //devicename itself
+ if (datalen < 4 + devicenamelength)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+ return false;
+ }
+ deviceName = new char[devicenamelength + 1];
+ memcpy(deviceName, data + 4, devicenamelength);
+ if (datalen < 8 + devicenamelength)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+ delete[] deviceName;
+ return false;
+ }
+ //next 4 bytes is keycode length
+ memcpy(&keycodelength, data + 4 + devicenamelength, 4);
+ //keycode itself
+ if (datalen < 8 + devicenamelength + keycodelength)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: invalid data in remote message (size: %u).", datalen);
+ delete[] deviceName;
+ return false;
+ }
+ keycode = new char[keycodelength + 1];
+ memcpy(keycode, data + 8 + devicenamelength, keycodelength);
+ }
+ deviceName[devicenamelength] = '\0';
+ keycode[keycodelength] = '\0';
+ //translate to a buttoncode xbmc understands
+ m_button = CServiceBroker::GetInputManager().TranslateLircRemoteString(deviceName, keycode);
+ CLog::Log(LOGDEBUG, "IRServerSuite, RemoteEvent: %s %s", deviceName, keycode);
+
+ delete[] deviceName;
+ delete[] keycode;
+ return true;
+ }
+ catch(...)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: exception while processing RemoteEvent.");
+ return false;
+ }
+}
+
+int CRemoteControl::ReadN(char *buffer, int n)
+{
+ int nOriginalSize = n;
+ memset(buffer, 0, n);
+ char *ptr = buffer;
+ while (n > 0)
+ {
+ int nBytes = 0;
+ nBytes = recv(m_socket, ptr, n, 0);
+
+ if (WSAGetLastError() == WSAEWOULDBLOCK)
+ {
+ return nOriginalSize - n;
+ }
+ if (nBytes < 0)
+ {
+ if (!m_isConnecting)
+ {
+ CLog::Log(LOGERROR, "%s, IRServerSuite recv error %d", __FUNCTION__, GetLastError());
+ }
+ Close();
+ return -1;
+ }
+
+ if (nBytes == 0)
+ {
+ CLog::Log(LOGDEBUG,"%s, IRServerSuite socket closed by server", __FUNCTION__);
+ Close();
+ break;
+ }
+
+ n -= nBytes;
+ ptr += nBytes;
+ }
+
+ return nOriginalSize - n;
+}
+
+bool CRemoteControl::WriteN(const char *buffer, int n)
+{
+ const char *ptr = buffer;
+ while (n > 0)
+ {
+ int nBytes = send(m_socket, ptr, n, 0);
+ if (nBytes < 0)
+ {
+ CLog::Log(LOGERROR, "%s, IRServerSuite send error %d (%d bytes)", __FUNCTION__, GetLastError(), n);
+ Close();
+ return false;
+ }
+
+ if (nBytes == 0)
+ break;
+
+ n -= nBytes;
+ ptr += nBytes;
+ }
+
+ return n == 0;
+}
+
+bool CRemoteControl::ReadPacket(CIrssMessage &message)
+{
+ try
+ {
+ char sizebuf[4];
+ int iRead = ReadN(&sizebuf[0], 4);
+ if (iRead <= 0) return false; //nothing to read
+ if (iRead != 4)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: failed to read packetsize.");
+ return false;
+ }
+ uint32_t size = 0;
+ memcpy(&size, &sizebuf[0], 4);
+ size = ntohl(size);
+ char* messagebytes = new char[size];
+ if (ReadN(messagebytes, size) != size)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: failed to read packet.");
+ delete[] messagebytes;
+ return false;
+ }
+ if (!CIrssMessage::FromBytes(messagebytes, size, message))
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: invalid packet received (size: %u).", size);
+ delete[] messagebytes;
+ return false;
+ }
+ delete[] messagebytes;
+ return true;
+ }
+ catch(...)
+ {
+ CLog::Log(LOGERROR, "IRServerSuite: exception while processing packet.");
+ return false;
+ }
+}
+
+uint16_t CRemoteControl::GetButton() const
+{
+ return m_button;
+}
+
+uint32_t CRemoteControl::GetHoldTimeMs() const
+{
+ return 0;
+}

_service:download_files:master.tar.gz/xbmc/platform/win32/input/IRServerSuite.h Added

@@ -0,0 +1,72 @@
+#pragma once
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "IrssMessage.h"
+#include "input/remote/IRemoteControl.h"
+#include "threads/Thread.h"
+#include "threads/Event.h"
+
+#include <winsock2.h>
+#include <string>
+
+class CRemoteControl : public KODI::REMOTE::IRemoteControl, CThread
+{
+public:
+ CRemoteControl();
+ virtual ~CRemoteControl();
+ void Initialize() override;
+ void Disconnect() override;
+ void Reset() override;
+ void Update() override;
+ uint16_t GetButton() const override;
+ uint32_t GetHoldTimeMs() const override;
+ bool IsInitialized() const override { return m_bInitialized; }
+ std::string GetMapFile() override;
+
+ void SetEnabled(bool) override { }
+ void SetDeviceName(const std::string&) override { }
+ void AddSendCommand(const std::string&) override { }
+ bool IsInUse() const override { return false; }
+
+ static IRemoteControl* CreateInstance();
+ static void Register();
+
+protected:
+ virtual void Process();
+
+private:
+ WORD m_button;
+ bool m_bInitialized;
+ SOCKET m_socket;
+ bool m_isConnecting;
+ std::string m_deviceName;
+ std::string m_keyCode;
+ CEvent m_event;
+
+ bool SendPacket(CIrssMessage& message);
+ bool ReadPacket(CIrssMessage& message);
+ int ReadN(char *buffer, int n);
+ bool WriteN(const char *buffer, int n);
+ bool Connect(bool logMessages);
+ void Close();
+
+ bool HandleRemoteEvent(CIrssMessage& message);
+};

_service:download_files:master.tar.gz/xbmc/platform/win32/input/IrssMessage.cpp Added

@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "IrssMessage.h"
+
+CIrssMessage::CIrssMessage()
+{
+ m_type = IRSSMT_Unknown;
+ m_flags = 0;
+ m_data = NULL;
+ m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags)
+{
+ m_type = type;
+ m_flags = flags;
+ m_data = NULL;
+ m_dataSize = 0;
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size)
+{
+ m_type = type;
+ m_flags = flags;
+ SetDataAsBytes(data, size);
+}
+
+CIrssMessage::CIrssMessage(IRSS_MessageType type, uint32_t flags, const std::string& data)
+{
+ m_type = type;
+ m_flags = flags;
+ SetDataAsString(data);
+}
+
+CIrssMessage::~CIrssMessage()
+{
+ FreeData();
+}
+
+void CIrssMessage::SetDataAsBytes(char* data, int size)
+{
+ if (!data)
+ {
+ FreeData();
+ }
+ else
+ {
+ m_data = (char*)malloc(size * sizeof(char));
+ memcpy(m_data, data, size);
+ m_dataSize = size;
+ }
+}
+
+void CIrssMessage::SetDataAsString(const std::string& data)
+{
+ if (data.empty())
+ {
+ FreeData();
+ }
+ else
+ {
+ m_data = strdup(data.c_str());
+ m_dataSize = strlen(data.c_str());
+ }
+}
+
+void CIrssMessage::FreeData()
+{
+ free(m_data);
+ m_data = NULL;
+ m_dataSize = 0;
+}
+
+char* CIrssMessage::ToBytes(int& size)
+{
+ int dataLength = 0;
+ if (m_data)
+ {
+ dataLength = m_dataSize;
+ }
+
+ size = 8 + dataLength;
+ char* byteArray = new char[size];
+
+ memcpy(&byteArray[0], &m_type, 4);
+ memcpy(&byteArray[4], &m_flags, 4);
+
+ if (m_data)
+ {
+ memcpy(&byteArray[8], &m_data, m_dataSize);
+ }
+
+ return byteArray;
+}
+
+bool CIrssMessage::FromBytes(char* from, int size, CIrssMessage& message)
+{
+ if (!from)
+ return false;
+
+ if (size < 8)
+ return false;
+
+ //IRSS_MessageType type = (MessageType)BitConverter.ToInt32(from, 0);
+ //IRSS_MessageFlags flags = (MessageFlags)BitConverter.ToInt32(from, 4);
+ uint32_t type;
+ memcpy(&type, from, 4);
+ uint32_t flags;
+ memcpy(&flags, from + 4, 4);
+
+ message.SetType((IRSS_MessageType)type);
+ message.SetFlags(flags);
+ if (size > 8)
+ {
+ message.SetDataAsBytes(from + 8, size - 8);
+ }
+ return true;
+}
+
+void CIrssMessage::SetType(IRSS_MessageType type)
+{
+ m_type = type;
+}
+void CIrssMessage::SetFlags(uint32_t flags)
+{
+ m_flags = flags;
+}

_service:download_files:master.tar.gz/xbmc/platform/win32/input/IrssMessage.h Added

@@ -0,0 +1,208 @@
+#pragma once
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 <string>
+
+ /// <summary>
+ /// Type of message.
+ /// </summary>
+ enum IRSS_MessageType
+ {
+ /// <summary>
+ /// Unknown message type.
+ /// </summary>
+ IRSSMT_Unknown = 0,
+
+ /// <summary>
+ /// Register Client.
+ /// </summary>
+ IRSSMT_RegisterClient = 1,
+ /// <summary>
+ /// Unregister Client.
+ /// </summary>
+ IRSSMT_UnregisterClient = 2,
+
+ /// <summary>
+ /// Register Repeater.
+ /// </summary>
+ IRSSMT_RegisterRepeater = 3,
+ /// <summary>
+ /// Unregister Repeater.
+ /// </summary>
+ IRSSMT_UnregisterRepeater = 4,
+
+ /// <summary>
+ /// Learn IR Command.
+ /// </summary>
+ IRSSMT_LearnIR = 5,
+ /// <summary>
+ /// Blast IR Command.
+ /// </summary>
+ IRSSMT_BlastIR = 6,
+
+ /// <summary>
+ /// Error.
+ /// </summary>
+ IRSSMT_Error = 7,
+
+ /// <summary>
+ /// Server Shutdown.
+ /// </summary>
+ IRSSMT_ServerShutdown = 8,
+ /// <summary>
+ /// Server Suspend.
+ /// </summary>
+ IRSSMT_ServerSuspend = 9,
+ /// <summary>
+ /// Server Resume
+ /// </summary>
+ IRSSMT_ServerResume = 10,
+
+ /// <summary>
+ /// Remote Event.
+ /// </summary>
+ IRSSMT_RemoteEvent = 11,
+ /// <summary>
+ /// Keyboard Event.
+ /// </summary>
+ IRSSMT_KeyboardEvent = 12,
+ /// <summary>
+ /// Mouse Event.
+ /// </summary>
+ IRSSMT_MouseEvent = 13,
+
+ /// <summary>
+ /// Forward a Remote Event.
+ /// </summary>
+ IRSSMT_ForwardRemoteEvent = 14,
+ /// <summary>
+ /// Forward a Keyboard Event.
+ /// </summary>
+ IRSSMT_ForwardKeyboardEvent = 15,
+ /// <summary>
+ /// Forward a Mouse Event.
+ /// </summary>
+ IRSSMT_ForwardMouseEvent = 16,
+
+ /// <summary>
+ /// Available Receivers.
+ /// </summary>
+ IRSSMT_AvailableReceivers = 17,
+ /// <summary>
+ /// Available Blasters.
+ /// </summary>
+ IRSSMT_AvailableBlasters = 18,
+ /// <summary>
+ /// Active Receivers.
+ /// </summary>
+ IRSSMT_ActiveReceivers = 19,
+ /// <summary>
+ /// Active Blasters.
+ /// </summary>
+ IRSSMT_ActiveBlasters = 20,
+ /// <summary>
+ /// Detected Receivers.
+ /// </summary>
+ IRSSMT_DetectedReceivers = 21,
+ /// <summary>
+ /// Detected Blasters.
+ /// </summary>
+ IRSSMT_DetectedBlasters = 22,
+ };
+
+ /// <summary>
+ /// Flags to determine more information about the message.
+ /// </summary>
+ enum IRSS_MessageFlags
+ {
+ /// <summary>
+ /// No Flags.
+ /// </summary>
+ IRSSMF_None = 0x0000,
+
+ /// <summary>
+ /// Message is a Request.
+ /// </summary>
+ IRSSMF_Request = 0x0001,
+ /// <summary>
+ /// Message is a Response to a received Message.
+ /// </summary>
+ IRSSMF_Response = 0x0002,
+ /// <summary>
+ /// Message is a Notification.
+ /// </summary>
+ IRSSMF_Notify = 0x0004,
+
+ /// <summary>
+ /// Operation Success.
+ /// </summary>
+ IRSSMF_Success = 0x0008,
+ /// <summary>
+ /// Operation Failure.
+ /// </summary>
+ IRSSMF_Failure = 0x0010,
+ /// <summary>
+ /// Operation Time-Out.
+ /// </summary>
+ IRSSMF_Timeout = 0x0020,
+
+ //IRSSMF_Error = 0x0040,
+
+ //IRSSMF_DataString = 0x0080,
+ //IRSSMF_DataBytes = 0x0100,
+
+ //IRSSMF_ForceRespond = 0x0200,
+
+ /// <summary>
+ /// Force the recipient not to respond.
+ /// </summary>
+ IRSSMF_ForceNotRespond = 0x0400,
+ };
+
+class CIrssMessage
+{
+public:
+ CIrssMessage();
+ CIrssMessage(IRSS_MessageType type, uint32_t flags);
+ CIrssMessage(IRSS_MessageType type, uint32_t flags, char* data, int size);
+ CIrssMessage(IRSS_MessageType type, uint32_t flags, const std::string& data);
+ ~CIrssMessage();
+
+ void SetDataAsBytes(char* data, int size);
+ void SetDataAsString(const std::string& data);
+ char* ToBytes(int& size);
+ void SetType(IRSS_MessageType type);
+ void SetFlags(uint32_t flags);
+ IRSS_MessageType GetType() {return m_type;}
+ uint32_t GetFlags() {return m_flags;}
+ char* GetData() {return m_data;}
+ uint32_t GetDataSize() {return m_dataSize;}
+ static bool FromBytes(char* from, int size, CIrssMessage& message);
+
+private:
+ IRSS_MessageType m_type;
+ uint32_t m_flags;
+
+ char* m_data;
+ int m_dataSize;
+
+ void FreeData();
+};

_service:download_files:master.tar.gz/xbmc/platform/win32/my_ntddcdrm.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/my_ntddscsi.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/netdb.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/netinet/in.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/netinet/tcp.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/pch.cpp Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/pch.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/resource.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/sys/select.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/sys/socket.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/sys/time.h Changed

_service:download_files:master.tar.gz/xbmc/platform/win32/unistd.h Changed

_service:download_files:master.tar.gz/xbmc/platform/xbmc.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -26,8 +26,9 @@
 #endif
 
 #ifdef TARGET_WINDOWS_DESKTOP
-#include <mmdeviceapi.h>
 #include "platform/win32/IMMNotificationClient.h"
+#include <mmdeviceapi.h>
+#include <wrl/client.h>
 #endif
 
 #if defined(TARGET_ANDROID)
@@ -36,6 +37,7 @@
 
 #include "platform/MessagePrinter.h"
 #include "utils/log.h"
+#include "commons/Exception.h"
 
 extern "C" int XBMC_Run(bool renderGUI, const CAppParamParser &params)
 {
@@ -72,14 +74,14 @@
 }
 
 #ifdef TARGET_WINDOWS_DESKTOP
- IMMDeviceEnumerator *pEnumerator = nullptr;
+ Microsoft::WRL::ComPtr<IMMDeviceEnumerator> pEnumerator = nullptr;
 CMMNotificationClient cMMNC;
 HRESULT hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator,
- reinterpret_cast<void**>(&pEnumerator));
+ reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
 if (SUCCEEDED(hr))
 {
 pEnumerator->RegisterEndpointNotificationCallback(&cMMNC);
- SAFE_RELEASE(pEnumerator);
+ pEnumerator = nullptr;
 }
 #endif
 
@@ -104,11 +106,11 @@
 #ifdef TARGET_WINDOWS_DESKTOP
 // the end
 hr = CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator,
- reinterpret_cast<void**>(&pEnumerator));
+ reinterpret_cast<void**>(pEnumerator.GetAddressOf()));
 if (SUCCEEDED(hr))
 {
 pEnumerator->UnregisterEndpointNotificationCallback(&cMMNC);
- SAFE_RELEASE(pEnumerator);
+ pEnumerator = nullptr;
 }
 #endif

_service:download_files:master.tar.gz/xbmc/platform/xbmc.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayList.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayList.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListB4S.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListB4S.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListFactory.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListM3U.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListPLS.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListPLS.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListURL.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListURL.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListWPL.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListWPL.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListXML.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/PlayListXML.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/SmartPlayList.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/SmartPlayList.h Changed

_service:download_files:master.tar.gz/xbmc/playlists/SmartPlaylistFileItemListModifier.cpp Changed

_service:download_files:master.tar.gz/xbmc/playlists/SmartPlaylistFileItemListModifier.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/DPMSSupport.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2009-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -108,22 +108,8 @@
 #include "windowing/X11/WinSystemX11.h"
 //// X Windows
 
-// Here's a sad story: our Windows-inspired BOOL type from linux/PlatformDefs.h
-// is incompatible with the BOOL in X11's Xmd.h (int vs. unsigned char).
-// This is not a good idea for a X11 app and it should
-// probably be fixed. Meanwhile, we can work around it rather cleanly with
-// the preprocessor (which is partly to blame for this needless conflict
-// anyway). BOOL is not used in the DPMS APIs that we need. Try not to use
-// BOOL in the remaining X11-specific code in this file, since X might
-// someday use a #define instead of a typedef.
-// Addendum: INT64 apparently hhas the same problem on x86_64. Oh well.
-// Once again, INT64 is not used in the APIs we need, so we can #ifdef it away.
-#define BOOL __X11_SPECIFIC_BOOL
-#define INT64 __X11_SPECIFIC_INT64
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
-#undef INT64
-#undef BOOL
 
 // Mapping of PowerSavingMode to X11's mode constants.
 static const CARD16 X_DPMS_MODES[] =

_service:download_files:master.tar.gz/xbmc/powermanagement/DPMSSupport.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/IPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/IPowerSyscall.h Changed

@@ -2,7 +2,7 @@
 
 /*
  *      Copyright (C) 2005-2015 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -31,9 +31,19 @@
   virtual void OnLowBattery() = 0;
 };
 
+class IPowerSyscall;
+using CreatePowerSyscallFunc = IPowerSyscall* (*)();
+
 class IPowerSyscall
 {
 public:
+  /**\brief Called by power manager to create platform power system adapter
+  *
+  * This method used to create platfrom specified power system adapter
+  */
+  static IPowerSyscall* CreateInstance();
+  static void RegisterPowerSyscall(CreatePowerSyscallFunc createFunc);
+
   virtual ~IPowerSyscall() = default;
   virtual bool Powerdown()    = 0;
   virtual bool Suspend()      = 0;
@@ -64,6 +74,9 @@
   virtual bool PumpPowerEvents(IPowerEventsCallback *callback) = 0;
 
   static const int MAX_COUNT_POWER_FEATURES = 4;
+
+private:
+  static CreatePowerSyscallFunc m_createFunc;
 };
 
 class CAbstractPowerSyscall : public IPowerSyscall

_service:download_files:master.tar.gz/xbmc/powermanagement/PowerManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2015 Team XBMC
- * http://xbmc.org
+ * 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
@@ -34,6 +34,7 @@
 #include "interfaces/builtins/Builtins.h"
 #include "network/Network.h"
 #include "pvr/PVRManager.h"
+#include "ServiceBroker.h"
 #include "settings/lib/Setting.h"
 #include "settings/Settings.h"
 #include "system.h"
@@ -41,89 +42,19 @@
 #include "weather/WeatherManager.h"
 #include "windowing/WinSystem.h"
 
-#if defined(TARGET_DARWIN)
-#include "osx/CocoaPowerSyscall.h"
-#elif defined(TARGET_ANDROID)
-#include "android/AndroidPowerSyscall.h"
-#elif defined(TARGET_POSIX)
-#include "linux/FallbackPowerSyscall.h"
-#if defined(HAS_DBUS)
-#include "linux/ConsoleUPowerSyscall.h"
-#include "linux/LogindUPowerSyscall.h"
-#include "linux/UPowerSyscall.h"
-#endif // HAS_DBUS
-#elif defined(TARGET_WINDOWS_DESKTOP)
-#include "powermanagement/windows/Win32PowerSyscall.h"
+#if defined(TARGET_WINDOWS_DESKTOP)
 extern HWND g_hWnd;
-#elif defined(TARGET_WINDOWS_STORE)
-#include "powermanagement/win10/Win10PowerSyscall.h"
 #endif
 
 using namespace ANNOUNCEMENT;
 
-CPowerManager::CPowerManager()
-{
- m_instance = NULL;
-}
+CPowerManager::CPowerManager() = default;
 
-CPowerManager::~CPowerManager()
-{
- delete m_instance;
-}
+CPowerManager::~CPowerManager() = default;
 
 void CPowerManager::Initialize()
 {
- SAFE_DELETE(m_instance);
-
-#if defined(TARGET_DARWIN)
- m_instance = new CCocoaPowerSyscall();
-#elif defined(TARGET_ANDROID)
- m_instance = new CAndroidPowerSyscall();
-#elif defined(TARGET_POSIX)
-#if defined(HAS_DBUS)
- std::unique_ptr<IPowerSyscall> bestPowerManager;
- std::unique_ptr<IPowerSyscall> currPowerManager;
- int bestCount = -1;
- int currCount = -1;
-
- std::list< std::pair< std::function<bool()>,
- std::function<IPowerSyscall*()> > > powerManagers =
- {
- std::make_pair(CConsoleUPowerSyscall::HasConsoleKitAndUPower,
- [] { return new CConsoleUPowerSyscall(); }),
- std::make_pair(CLogindUPowerSyscall::HasLogind,
- [] { return new CLogindUPowerSyscall(); }),
- std::make_pair(CUPowerSyscall::HasUPower,
- [] { return new CUPowerSyscall(); })
- };
- for(const auto& powerManager : powerManagers)
- {
- if (powerManager.first())
- {
- currPowerManager.reset(powerManager.second());
- currCount = currPowerManager->CountPowerFeatures();
- if (currCount > bestCount)
- {
- bestCount = currCount;
- bestPowerManager = std::move(currPowerManager);
- }
- if (bestCount == IPowerSyscall::MAX_COUNT_POWER_FEATURES)
- break;
- }
- }
- if (bestPowerManager)
- m_instance = bestPowerManager.release();
- else
-#endif // HAS_DBUS
- m_instance = new CFallbackPowerSyscall();
-#elif defined(TARGET_WINDOWS_DESKTOP)
- m_instance = new CWin32PowerSyscall();
-#elif defined(TARGET_WINDOWS_STORE)
- m_instance = new CPowerSyscall();
-#endif
-
- if (m_instance == NULL)
- m_instance = new CNullPowerSyscall();
+ m_instance.reset(IPowerSyscall::CreateInstance());
 }
 
 void CPowerManager::SetDefaults()
@@ -232,6 +163,9 @@
 }
 void CPowerManager::ProcessEvents()
 {
+ if (!m_instance)
+ return;
+
 static int nesting = 0;
 
 if (++nesting == 1)
@@ -251,13 +185,14 @@
 CLog::Log(LOGNOTICE, "%s: Running sleep jobs", __FUNCTION__);
 
 // stop lirc
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- CLog::Log(LOGNOTICE, "%s: Stopping lirc", __FUNCTION__);
- CBuiltins::GetInstance().Execute("LIRC.Stop");
-#endif
+ if (CBuiltins::GetInstance().HasCommand("LIRC.Stop"))
+ {
+ CLog::Log(LOGNOTICE, "%s: Stopping lirc", __FUNCTION__);
+ CBuiltins::GetInstance().Execute("LIRC.Stop");
+ }
 
 CServiceBroker::GetPVRManager().OnSleep();
-
+ StorePlayerState();
 g_application.StopPlaying();
 g_application.StopShutdownTimer();
 g_application.StopScreenSaverTimer();
@@ -282,7 +217,7 @@
 if (CServiceBroker::GetWinSystem().IsFullScreen())
 {
 #if defined(TARGET_WINDOWS_DESKTOP)
- ShowWindow(g_hWnd,SW_RESTORE);
+ ShowWindow(g_hWnd, SW_RESTORE);
 SetForegroundWindow(g_hWnd);
 #endif
 }
@@ -290,16 +225,18 @@
 #endif
 
 // restart lirc
-#if defined(HAS_LIRC) || defined(HAS_IRSERVERSUITE)
- CLog::Log(LOGNOTICE, "%s: Restarting lirc", __FUNCTION__);
- CBuiltins::GetInstance().Execute("LIRC.Start");
-#endif
+ if (CBuiltins::GetInstance().HasCommand("LIRC.Start"))
+ {
+ CLog::Log(LOGNOTICE, "%s: Restarting lirc", __FUNCTION__);
+ CBuiltins::GetInstance().Execute("LIRC.Start");
+ }
 
 CServiceBroker::GetActiveAE().Resume();
 g_application.UpdateLibraries();
 CServiceBroker::GetWeatherManager().Refresh();
-
 CServiceBroker::GetPVRManager().OnWake();
+ RestorePlayerState();
+
 CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnWake");
 }
 
@@ -312,6 +249,40 @@
 CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnLowBattery");
 }
 
+void CPowerManager::StorePlayerState()
+{
+ CApplicationPlayer &appPlayer = g_application.GetAppPlayer();
+ if (appPlayer.IsPlaying())
+ {
+ m_lastUsedPlayer = appPlayer.GetCurrentPlayer();
+ m_lastPlayedFileItem.reset(new CFileItem(g_application.CurrentFileItem()));
+ // set the actual offset instead of store and load it from database
+ m_lastPlayedFileItem->m_lStartOffset = appPlayer.GetTime();
+ // in case of regular stack, correct the start offset by adding current part start time
+ if (g_application.GetAppStackHelper().IsPlayingRegularStack())
+ m_lastPlayedFileItem->m_lStartOffset += g_application.GetAppStackHelper().GetCurrentStackPartStartTimeMs();
+ // in case of iso stack, keep track of part number
+ m_lastPlayedFileItem->m_lStartPartNumber = g_application.GetAppStackHelper().IsPlayingISOStack() ? g_application.GetAppStackHelper().GetCurrentPartNumber() + 1 : 1;
+ // for iso and iso stacks, keep track of playerstate
+ m_lastPlayedFileItem->SetProperty("savedplayerstate", appPlayer.GetPlayerState());
+ CLog::Log(LOGDEBUG, "CPowerManager::StorePlayerState - store last played item (startOffset: %i ms)", m_lastPlayedFileItem->m_lStartOffset);
+ }
+ else
+ {
+ m_lastUsedPlayer.clear();
+ m_lastPlayedFileItem.reset();
+ }
+}
+
+void CPowerManager::RestorePlayerState()
+{
+ if (!m_lastPlayedFileItem)
+ return;
+
+ CLog::Log(LOGDEBUG, "CPowerManager::RestorePlayerState - resume last played item (startOffset: %i ms)", m_lastPlayedFileItem->m_lStartOffset);
+ g_application.PlayFile(*m_lastPlayedFileItem, m_lastUsedPlayer);
+}
+
 void CPowerManager::SettingOptionsShutdownStatesFiller(SettingConstPtr setting, std::vector< std::pair<std::string, int> > &list, int &current, void *data)
 {
 if (CServiceBroker::GetPowerManager().CanPowerdown())

_service:download_files:master.tar.gz/xbmc/powermanagement/PowerManager.h Changed

@@ -27,6 +27,7 @@
 
 #include "IPowerSyscall.h"
 
+class CFileItem;
 class CSetting;
 
 enum PowerState
@@ -41,26 +42,6 @@
 POWERSTATE_ASK
 };
 
-// For systems without PowerSyscalls we have a NullObject
-class CNullPowerSyscall : public CAbstractPowerSyscall
-{
-public:
- bool Powerdown() override { return false; }
- bool Suspend() override { return false; }
- bool Hibernate() override { return false; }
- bool Reboot() override { return false; }
-
- bool CanPowerdown() override { return true; }
- bool CanSuspend() override { return true; }
- bool CanHibernate() override { return true; }
- bool CanReboot() override { return true; }
-
- int BatteryLevel() override { return 0; }
-
-
- bool PumpPowerEvents(IPowerEventsCallback *callback) override { return false; }
-};
-
 // This class will wrap and handle PowerSyscalls.
 // It will handle and decide if syscalls are needed.
 class CPowerManager : public IPowerEventsCallback
@@ -91,8 +72,11 @@
 private:
 void OnSleep() override;
 void OnWake() override;
-
 void OnLowBattery() override;
+ void RestorePlayerState();
+ void StorePlayerState();
 
- IPowerSyscall *m_instance;
+ std::unique_ptr<IPowerSyscall> m_instance;
+ std::unique_ptr<CFileItem> m_lastPlayedFileItem;
+ std::string m_lastUsedPlayer;
 };

_service:download_files:master.tar.gz/xbmc/powermanagement/android/AndroidPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/android/AndroidPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/ConsoleUPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/ConsoleUPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/FallbackPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/LinuxPowerSyscall.cpp Added

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2005-2018 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 "LinuxPowerSyscall.h"
+#include "FallbackPowerSyscall.h"
+#if defined(HAS_DBUS)
+#include "ConsoleUPowerSyscall.h"
+#include "LogindUPowerSyscall.h"
+#include "UPowerSyscall.h"
+#endif // HAS_DBUS
+
+#include <functional>
+#include <list>
+#include <memory>
+#include <utility>
+
+IPowerSyscall* CLinuxPowerSyscall::CreateInstance()
+{
+#if defined(HAS_DBUS)
+ std::unique_ptr<IPowerSyscall> bestPowerManager;
+ std::unique_ptr<IPowerSyscall> currPowerManager;
+ int bestCount = -1;
+ int currCount = -1;
+
+ std::list< std::pair< std::function<bool()>,
+ std::function<IPowerSyscall*()> > > powerManagers =
+ {
+ std::make_pair(CConsoleUPowerSyscall::HasConsoleKitAndUPower,
+ [] { return new CConsoleUPowerSyscall(); }),
+ std::make_pair(CLogindUPowerSyscall::HasLogind,
+ [] { return new CLogindUPowerSyscall(); }),
+ std::make_pair(CUPowerSyscall::HasUPower,
+ [] { return new CUPowerSyscall(); })
+ };
+ for(const auto& powerManager : powerManagers)
+ {
+ if (powerManager.first())
+ {
+ currPowerManager.reset(powerManager.second());
+ currCount = currPowerManager->CountPowerFeatures();
+ if (currCount > bestCount)
+ {
+ bestCount = currCount;
+ bestPowerManager = std::move(currPowerManager);
+ }
+ if (bestCount == IPowerSyscall::MAX_COUNT_POWER_FEATURES)
+ break;
+ }
+ }
+ if (bestPowerManager)
+ return bestPowerManager.release();
+ else
+#endif // HAS_DBUS
+ return new CFallbackPowerSyscall();
+}
+
+void CLinuxPowerSyscall::Register()
+{
+ IPowerSyscall::RegisterPowerSyscall(CLinuxPowerSyscall::CreateInstance);
+}

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/LinuxPowerSyscall.h Added

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/LogindUPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/UPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/linux/UPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/osx/CocoaPowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/win10/Win10PowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/win10/Win10PowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/windows/Win32PowerSyscall.cpp Changed

_service:download_files:master.tar.gz/xbmc/powermanagement/windows/Win32PowerSyscall.h Changed

_service:download_files:master.tar.gz/xbmc/profiles/Profile.cpp Changed

_service:download_files:master.tar.gz/xbmc/profiles/Profile.h Changed

_service:download_files:master.tar.gz/xbmc/profiles/ProfilesManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -33,6 +33,8 @@
 #include "Util.h"
 #include "addons/Skin.h"
 #include "dialogs/GUIDialogYesNo.h"
+#include "events/EventLog.h"
+#include "events/EventLogManager.h"
 #include "filesystem/Directory.h"
 #include "filesystem/DirectoryCache.h"
 #include "filesystem/File.h"
@@ -41,6 +43,7 @@
 #include "guilib/LocalizeStrings.h"
 #include "input/InputManager.h"
 #include "settings/Settings.h"
+#include "settings/lib/SettingsManager.h"
 #if !defined(TARGET_WINDOWS) && defined(HAS_DVD_DRIVE)
 #include "storage/DetectDVDType.h"
 #endif
@@ -69,31 +72,42 @@
 
 static CProfile EmptyProfile;
 
-CProfilesManager::CProfilesManager()
- : m_usingLoginScreen(false),
+CProfilesManager::CProfilesManager(CSettings &settings) :
+ m_settings(settings),
+ m_usingLoginScreen(false),
 m_profileLoadedForLogin(false),
 m_autoLoginProfile(-1),
 m_lastUsedProfile(0),
 m_currentProfile(0),
- m_nextProfileId(0)
-{ }
+ m_nextProfileId(0),
+ m_eventLogs(new CEventLogManager)
+{
+ if (m_settings.IsLoaded())
+ OnSettingsLoaded();
+
+ m_settings.GetSettingsManager()->RegisterSettingsHandler(this);
+
+ std::set<std::string> settingSet = {
+ CSettings::SETTING_EVENTLOG_SHOW
+ };
 
-CProfilesManager::~CProfilesManager() = default;
+ m_settings.GetSettingsManager()->RegisterCallback(this, settingSet);
+}
 
-CProfilesManager& CProfilesManager::GetInstance()
+CProfilesManager::~CProfilesManager()
 {
- static CProfilesManager sProfilesManager;
- return sProfilesManager;
+ m_settings.GetSettingsManager()->UnregisterCallback(this);
+ m_settings.GetSettingsManager()->UnregisterSettingsHandler(this);
 }
 
 void CProfilesManager::OnSettingsLoaded()
 {
 // check them all
- std::string strDir = CServiceBroker::GetSettings().GetString(CSettings::SETTING_SYSTEM_PLAYLISTSPATH);
+ std::string strDir = m_settings.GetString(CSettings::SETTING_SYSTEM_PLAYLISTSPATH);
 if (strDir == "set default" || strDir.empty())
 {
 strDir = "special://profile/playlists/";
- CServiceBroker::GetSettings().SetString(CSettings::SETTING_SYSTEM_PLAYLISTSPATH, strDir.c_str());
+ m_settings.SetString(CSettings::SETTING_SYSTEM_PLAYLISTSPATH, strDir.c_str());
 }
 
 CDirectory::Create(strDir);
@@ -262,7 +276,7 @@
 
 CreateProfileFolders();
 
- CDatabaseManager::GetInstance().Initialize();
+ CServiceBroker::GetDatabaseManager().Initialize();
 CServiceBroker::GetInputManager().LoadKeymaps();
 
 CServiceBroker::GetInputManager().SetMouseEnabled(CServiceBroker::GetSettings().GetBool(CSettings::SETTING_INPUT_ENABLEMOUSE));
@@ -330,7 +344,7 @@
 if (index == m_currentProfile)
 {
 LoadProfile(0);
- CServiceBroker::GetSettings().Save();
+ m_settings.Save();
 }
 
 CFileItemPtr item = CFileItemPtr(new CFileItem(URIUtils::AddFileToFolder(GetUserDataFolder(), strDirectory)));
@@ -535,6 +549,21 @@
 return path;
 }
 
+CEventLog& CProfilesManager::GetEventLog()
+{
+ return m_eventLogs->GetEventLog(GetCurrentProfileId());
+}
+
+void CProfilesManager::OnSettingAction(std::shared_ptr<const CSetting> setting)
+{
+ if (setting == nullptr)
+ return;
+
+ const std::string& settingId = setting->GetId();
+ if (settingId == CSettings::SETTING_EVENTLOG_SHOW)
+ GetEventLog().ShowFullEventLog();
+}
+
 void CProfilesManager::SetCurrentProfileId(size_t profileId)
 {
 CSingleLock lock(m_critical);

_service:download_files:master.tar.gz/xbmc/profiles/ProfilesManager.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,19 +19,28 @@
 *
 */
 
+#include <memory>
 #include <stdint.h>
 #include <vector>
 
 #include "profiles/Profile.h"
+#include "settings/lib/ISettingCallback.h"
 #include "settings/lib/ISettingsHandler.h"
 #include "threads/CriticalSection.h"
 
+class CEventLog;
+class CEventLogManager;
+class CSettings;
 class TiXmlNode;
 
-class CProfilesManager : public ISettingsHandler
+class CProfilesManager : protected ISettingsHandler,
+ protected ISettingCallback
 {
 public:
- static CProfilesManager& GetInstance();
+ CProfilesManager(CSettings &settings);
+ CProfilesManager(const CProfilesManager&) = delete;
+ CProfilesManager& operator=(CProfilesManager const&) = delete;
+ ~CProfilesManager() override;
 
 void OnSettingsLoaded() override;
 void OnSettingsSaved() const override;
@@ -177,11 +186,12 @@
 // uses HasSlashAtEnd to determine if a directory or file was meant
 std::string GetUserDataItem(const std::string& strFile) const;
 
+ // Event log access
+ CEventLog &GetEventLog();
+
 protected:
- CProfilesManager();
- CProfilesManager(const CProfilesManager&) = delete;
- CProfilesManager& operator=(CProfilesManager const&) = delete;
- ~CProfilesManager() override;
+ // implementation of ISettingCallback
+ void OnSettingAction(std::shared_ptr<const CSetting> setting) override;
 
 private:
 /*! \brief Set the current profile id and update the special://profile path
@@ -189,6 +199,9 @@
 */
 void SetCurrentProfileId(size_t profileId);
 
+ // Construction parameters
+ CSettings &m_settings;
+
 std::vector<CProfile> m_profiles;
 bool m_usingLoginScreen;
 bool m_profileLoadedForLogin;
@@ -197,4 +210,7 @@
 uint32_t m_currentProfile; // do not modify directly, use SetCurrentProfileId() function instead
 int m_nextProfileId; // for tracking the next available id to give to a new profile to ensure id's are not re-used
 CCriticalSection m_critical;
+
+ // Event properties
+ std::unique_ptr<CEventLogManager> m_eventLogs;
 };

_service:download_files:master.tar.gz/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/profiles/dialogs/GUIDialogLockSettings.h Changed

_service:download_files:master.tar.gz/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -41,6 +41,7 @@
 #include "utils/StringUtils.h"
 #include "utils/URIUtils.h"
 #include "utils/Variant.h"
+#include "ServiceBroker.h"
 
 #define SETTING_PROFILE_NAME "profile.name"
 #define SETTING_PROFILE_IMAGE "profile.image"
@@ -58,7 +59,9 @@
 
 bool CGUIDialogProfileSettings::ShowForProfile(unsigned int iProfile, bool firstLogin)
 {
- if (firstLogin && iProfile > CProfilesManager::GetInstance().GetNumberOfProfiles())
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (firstLogin && iProfile > profileManager.GetNumberOfProfiles())
 return false;
 
 CGUIDialogProfileSettings *dialog = g_windowManager.GetWindow<CGUIDialogProfileSettings>(WINDOW_DIALOG_PROFILE_SETTINGS);
@@ -69,7 +72,7 @@
 dialog->m_isDefault = iProfile == 0;
 dialog->m_showDetails = !firstLogin;
 
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(iProfile);
+ const CProfile *profile = profileManager.GetProfile(iProfile);
 if (profile == NULL)
 {
 dialog->m_name.clear();
@@ -77,7 +80,7 @@
 dialog->m_sourcesMode = 2;
 dialog->m_locks = CProfile::CLock();
 
- bool bLock = CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser;
+ bool bLock = profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser;
 dialog->m_locks.addonManager = bLock;
 dialog->m_locks.settings = (bLock) ? LOCK_LEVEL::ALL : LOCK_LEVEL::NONE;
 dialog->m_locks.files = bLock;
@@ -124,7 +127,7 @@
 dialog->Open();
 if (dialog->m_needsSaving)
 {
- if (iProfile >= CProfilesManager::GetInstance().GetNumberOfProfiles())
+ if (iProfile >= profileManager.GetNumberOfProfiles())
 {
 if (dialog->m_name.empty() || dialog->m_directory.empty())
 return false;
@@ -133,13 +136,13 @@
 strLabel.Format(g_localizeStrings.Get(20047),dialog->m_strName);
 if (!CGUIDialogYesNo::ShowAndGetInput(20058, strLabel, dialog->m_strDirectory, ""))
 {
- CDirectory::Remove(URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetUserDataFolder(), dialog->m_strDirectory));
+ CDirectory::Remove(URIUtils::AddFileToFolder(profileManager.GetUserDataFolder(), dialog->m_strDirectory));
 return false;
 }*/
 
 // check for old profile settings
- CProfile profile(dialog->m_directory, dialog->m_name, CProfilesManager::GetInstance().GetNextProfileId());
- CProfilesManager::GetInstance().AddProfile(profile);
+ CProfile profile(dialog->m_directory, dialog->m_name, profileManager.GetNextProfileId());
+ profileManager.AddProfile(profile);
 bool exists = XFILE::CFile::Exists(URIUtils::AddFileToFolder("special://masterprofile/", dialog->m_directory, "guisettings.xml"));
 
 if (exists && !CGUIDialogYesNo::ShowAndGetInput(CVariant{20058}, CVariant{20104}))
@@ -178,7 +181,7 @@
 if (!CGUIDialogYesNo::ShowAndGetInput(20067, 20103))
 return false;*/
 
- CProfile *profile = CProfilesManager::GetInstance().GetProfile(iProfile);
+ CProfile *profile = profileManager.GetProfile(iProfile);
 assert(profile);
 profile->setName(dialog->m_name);
 profile->setDirectory(dialog->m_directory);
@@ -188,7 +191,7 @@
 profile->setDatabases((dialog->m_dbMode & 2) == 2);
 profile->setSources((dialog->m_sourcesMode & 2) == 2);
 profile->SetLocks(dialog->m_locks);
- CProfilesManager::GetInstance().Save();
+ profileManager.Save();
 
 return true;
 }
@@ -270,15 +273,17 @@
 {
 if (m_showDetails)
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE && !m_isDefault)
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE && !m_isDefault)
 {
 if (CGUIDialogYesNo::ShowAndGetInput(CVariant{20066}, CVariant{20118}))
 g_passwordManager.SetMasterLockMode(false);
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
+ if (profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE)
 return;
 }
 if (CGUIDialogLockSettings::ShowAndGetLock(m_locks, m_isDefault ? 12360 : 20068,
- CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || m_isDefault))
+ profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || m_isDefault))
 m_needsSaving = true;
 }
 else
@@ -330,6 +335,8 @@
 return;
 }
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 AddEdit(group, SETTING_PROFILE_NAME, 20093, SettingLevel::Basic, m_name);
 AddButton(group, SETTING_PROFILE_IMAGE, 20065, SettingLevel::Basic);
 
@@ -337,7 +344,7 @@
 AddButton(group, SETTING_PROFILE_DIRECTORY, 20070, SettingLevel::Basic);
 
 if (m_showDetails ||
- (m_locks.mode == LOCK_MODE_EVERYONE && CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE))
+ (m_locks.mode == LOCK_MODE_EVERYONE && profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE))
 AddButton(group, SETTING_PROFILE_LOCKS, 20066, SettingLevel::Basic);
 
 if (!m_isDefault && m_showDetails)
@@ -353,7 +360,7 @@
 entries.push_back(std::make_pair(20062, 0));
 entries.push_back(std::make_pair(20063, 1));
 entries.push_back(std::make_pair(20061, 2));
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
+ if (profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
 entries.push_back(std::make_pair(20107, 3));
 
 AddSpinner(groupMedia, SETTING_PROFILE_MEDIA, 20060, SettingLevel::Basic, m_dbMode, entries);

_service:download_files:master.tar.gz/xbmc/profiles/dialogs/GUIDialogProfileSettings.h Changed

_service:download_files:master.tar.gz/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -66,7 +66,9 @@
 
 void CGUIWindowSettingsProfile::OnPopupMenu(int iItem)
 {
- if (iItem == (int)CProfilesManager::GetInstance().GetNumberOfProfiles())
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (iItem == (int)profileManager.GetNumberOfProfiles())
 return;
 
 // popup the context menu
@@ -83,14 +85,14 @@
 CGUIMessage msg2(GUI_MSG_ITEM_SELECTED, g_windowManager.GetActiveWindow(), iCtrlID);
 g_windowManager.SendMessage(msg2);
 CServiceBroker::GetNetwork().NetworkMessage(CNetwork::SERVICES_DOWN,1);
- CProfilesManager::GetInstance().LoadMasterProfileForLogin();
+ profileManager.LoadMasterProfileForLogin();
 CGUIWindowLoginScreen::LoadProfile(iItem);
 return;
 }
 
 if (choice == 2)
 {
- if (CProfilesManager::GetInstance().DeleteProfile(iItem))
+ if (profileManager.DeleteProfile(iItem))
 iItem--;
 }
 
@@ -124,19 +126,21 @@
 iAction == ACTION_MOUSE_RIGHT_CLICK
 )
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), CONTROL_PROFILES);
 g_windowManager.SendMessage(msg);
 int iItem = msg.GetParam1();
 if (iAction == ACTION_CONTEXT_MENU || iAction == ACTION_MOUSE_RIGHT_CLICK)
 {
 //contextmenu
- if (iItem <= (int)CProfilesManager::GetInstance().GetNumberOfProfiles() - 1)
+ if (iItem <= (int)profileManager.GetNumberOfProfiles() - 1)
 {
 OnPopupMenu(iItem);
 }
 return true;
 }
- else if (iItem < (int)CProfilesManager::GetInstance().GetNumberOfProfiles())
+ else if (iItem < (int)profileManager.GetNumberOfProfiles())
 {
 if (CGUIDialogProfileSettings::ShowForProfile(iItem))
 {
@@ -149,10 +153,10 @@
 
 return false;
 }
- else if (iItem > (int)CProfilesManager::GetInstance().GetNumberOfProfiles() - 1)
+ else if (iItem > (int)profileManager.GetNumberOfProfiles() - 1)
 {
- CDirectory::Create(URIUtils::AddFileToFolder(CProfilesManager::GetInstance().GetUserDataFolder(),"profiles"));
- if (CGUIDialogProfileSettings::ShowForProfile(CProfilesManager::GetInstance().GetNumberOfProfiles()))
+ CDirectory::Create(URIUtils::AddFileToFolder(profileManager.GetUserDataFolder(),"profiles"));
+ if (CGUIDialogProfileSettings::ShowForProfile(profileManager.GetNumberOfProfiles()))
 {
 LoadList();
 CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(), 2,iItem);
@@ -166,18 +170,22 @@
 }
 else if (iControl == CONTROL_LOGINSCREEN)
 {
- CProfilesManager::GetInstance().ToggleLoginScreen();
- CProfilesManager::GetInstance().Save();
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ profileManager.ToggleLoginScreen();
+ profileManager.Save();
 return true;
 }
 else if (iControl == CONTROL_AUTOLOGIN)
 {
- int currentId = CProfilesManager::GetInstance().GetAutoLoginProfileId();
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ int currentId = profileManager.GetAutoLoginProfileId();
 int profileId;
 if (GetAutoLoginProfileChoice(profileId) && (currentId != profileId))
 {
- CProfilesManager::GetInstance().SetAutoLoginProfileId(profileId);
- CProfilesManager::GetInstance().Save();
+ profileManager.SetAutoLoginProfileId(profileId);
+ profileManager.Save();
 }
 return true;
 }
@@ -192,9 +200,11 @@
 {
 ClearListItems();
 
- for (unsigned int i = 0; i < CProfilesManager::GetInstance().GetNumberOfProfiles(); i++)
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ for (unsigned int i = 0; i < profileManager.GetNumberOfProfiles(); i++)
 {
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(i);
+ const CProfile *profile = profileManager.GetProfile(i);
 CFileItemPtr item(new CFileItem(profile->getName()));
 item->SetLabel2(profile->getDate());
 item->SetArt("thumb", profile->getThumb());
@@ -208,7 +218,7 @@
 CGUIMessage msg(GUI_MSG_LABEL_BIND, GetID(), CONTROL_PROFILES, 0, 0, m_listItems);
 OnMessage(msg);
 
- if (CProfilesManager::GetInstance().UsingLoginScreen())
+ if (profileManager.UsingLoginScreen())
 {
 CONTROL_SELECT(CONTROL_LOGINSCREEN);
 }
@@ -237,18 +247,20 @@
 CGUIDialogSelect *dialog = g_windowManager.GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT);
 if (!dialog) return false;
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // add items
 // "Last used profile" option comes first, so up indices by 1
- int autoLoginProfileId = CProfilesManager::GetInstance().GetAutoLoginProfileId() + 1;
+ int autoLoginProfileId = profileManager.GetAutoLoginProfileId() + 1;
 CFileItemList items;
 CFileItemPtr item(new CFileItem());
 item->SetLabel(g_localizeStrings.Get(37014)); // Last used profile
 item->SetIconImage("DefaultUser.png");
 items.Add(item);
 
- for (unsigned int i = 0; i < CProfilesManager::GetInstance().GetNumberOfProfiles(); i++)
+ for (unsigned int i = 0; i < profileManager.GetNumberOfProfiles(); i++)
 {
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(i);
+ const CProfile *profile = profileManager.GetProfile(i);
 std::string locked = g_localizeStrings.Get(profile->getLockMode() > 0 ? 20166 : 20165);
 CFileItemPtr item(new CFileItem(profile->getName()));
 item->SetLabel2(locked); // lock setting

_service:download_files:master.tar.gz/xbmc/profiles/windows/GUIWindowSettingsProfile.h Changed

_service:download_files:master.tar.gz/xbmc/programs/GUIViewStatePrograms.cpp Changed

_service:download_files:master.tar.gz/xbmc/programs/GUIViewStatePrograms.h Changed

_service:download_files:master.tar.gz/xbmc/programs/GUIWindowPrograms.cpp Changed

_service:download_files:master.tar.gz/xbmc/programs/GUIWindowPrograms.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRActionListener.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRActionListener.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRDatabase.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRDatabase.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIActions.cpp Changed

@@ -589,7 +589,7 @@
 break;
 
 default:
- CLog::Log(LOGERROR, "PVRGUIActions - %s - unknown instant record action selection (%d), defaulting to fixed length recording.", __FUNCTION__, eSelected);
+ CLog::Log(LOGERROR, "PVRGUIActions - %s - unknown instant record action selection (%d), defaulting to fixed length recording.", __FUNCTION__, static_cast<int>(eSelected));
 epgTag.reset();
 break;
 }
@@ -821,7 +821,7 @@
 }
 default:
 {
- CLog::Log(LOGERROR, "CPVRGUIActions - %s - unhandled TimerOperationResult (%d)!", __FUNCTION__, result);
+ CLog::Log(LOGERROR, "CPVRGUIActions - %s - unhandled TimerOperationResult (%d)!", __FUNCTION__, static_cast<int>(result));
 break;
 }
 }
@@ -1821,7 +1821,7 @@
 CPVRChannelNumberInputHandler &CPVRGUIActions::GetChannelNumberInputHandler()
 {
 // window/dialog specific input handler
- CPVRChannelNumberInputHandler *windowInputHandler = dynamic_cast<CPVRChannelNumberInputHandler*>(g_windowManager.GetWindow(g_windowManager.GetFocusedWindow()));
+ CPVRChannelNumberInputHandler *windowInputHandler = dynamic_cast<CPVRChannelNumberInputHandler*>(g_windowManager.GetWindow(g_windowManager.GetActiveWindowOrDialog()));
 if (windowInputHandler)
 return *windowInputHandler;

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIChannelNavigator.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIInfo.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,6 +20,7 @@
 
 #include "PVRGUIInfo.h"
 
+#include <cmath>
 #include <ctime>
 
 #include "Application.h"
@@ -555,13 +556,17 @@
 return bReturn;
 }
 
-int CPVRGUIInfo::TranslateIntInfo(DWORD dwInfo) const
+int CPVRGUIInfo::TranslateIntInfo(const CFileItem &item, DWORD dwInfo) const
 {
 int iReturn(0);
 CSingleLock lock(m_critSection);
 
 if (dwInfo == PVR_EPG_EVENT_PROGRESS)
- iReturn = (int) ((float) GetPlayingTime() / m_iDuration * 100);
+ {
+ const CPVREpgInfoTagPtr epgTag = item.GetEPGInfoTag();
+ if (epgTag)
+ iReturn = std::lrintf(epgTag->ProgressPercentage());
+ }
 else if (dwInfo == PVR_ACTUAL_STREAM_SIG_PROGR)
 iReturn = (int) ((float) m_qualityInfo.iSignal / 0xFFFF * 100);
 else if (dwInfo == PVR_ACTUAL_STREAM_SNR_PROGR)
@@ -575,8 +580,8 @@
 }
 else if (dwInfo == PVR_TIMESHIFT_PROGRESS)
 {
- iReturn = static_cast<int>(static_cast<float>(m_iTimeshiftPlayTime - m_iTimeshiftStartTime) /
- (m_iTimeshiftEndTime - m_iTimeshiftStartTime) * 100);
+ iReturn = std::lrintf(static_cast<float>(m_iTimeshiftPlayTime - m_iTimeshiftStartTime) /
+ (m_iTimeshiftEndTime - m_iTimeshiftStartTime) * 100);
 }
 
 return iReturn;

_service:download_files:master.tar.gz/xbmc/pvr/PVRGUIInfo.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRJobs.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRJobs.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/PVRManager.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/addons/PVRClients.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannel.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannel.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroup.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroup.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupInternal.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupInternal.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroups.cpp Changed

@@ -133,25 +133,23 @@
 }
 }
 
-CFileItemPtr CPVRChannelGroups::GetByPath(const std::string &strPath) const
+CFileItemPtr CPVRChannelGroups::GetByPath(const std::string &strInPath) const
 {
- // get the filename from curl
- CURL url(strPath);
- std::string strFileName = url.GetFileName();
- URIUtils::RemoveSlashAtEnd(strFileName);
+ std::string strPath = strInPath;
+ URIUtils::RemoveSlashAtEnd(strPath);
 
 std::string strCheckPath;
- for (std::vector<CPVRChannelGroupPtr>::const_iterator it = m_groups.begin(); it != m_groups.end(); ++it)
+ for (const auto& group: m_groups)
 {
 // check if the path matches
- strCheckPath = StringUtils::Format("channels/%s/%s/", (*it)->IsRadio() ? "radio" : "tv", (*it)->GroupName().c_str());
- if (URIUtils::PathHasParent(strFileName, strCheckPath))
+ strCheckPath = group->GetPath();
+ if (URIUtils::PathHasParent(strPath, strCheckPath))
 {
- strFileName.erase(0, strCheckPath.length());
- std::vector<std::string> split(StringUtils::Split(strFileName, '_', 2));
+ strPath.erase(0, strCheckPath.size());
+ std::vector<std::string> split(StringUtils::Split(strPath, '_', 2));
 if (split.size() == 2)
 {
- CPVRChannelPtr channel((*it)->GetByUniqueID(atoi(split[1].c_str()), CServiceBroker::GetPVRManager().Clients()->GetClientId(split[0])));
+ const CPVRChannelPtr channel = group->GetByUniqueID(atoi(split[1].c_str()), CServiceBroker::GetPVRManager().Clients()->GetClientId(split[0]));
 if (channel)
 return CFileItemPtr(new CFileItem(channel));
 }
@@ -159,8 +157,7 @@
 }
 
 // no match
- CFileItemPtr retVal(new CFileItem);
- return retVal;
+ return CFileItemPtr(new CFileItem());
 }
 
 CPVRChannelGroupPtr CPVRChannelGroups::GetById(int iGroupId) const
@@ -322,7 +319,7 @@
 CPVRChannelGroupPtr lastPlayedGroup = GetLastPlayedGroup();
 SetSelectedGroup(lastPlayedGroup ? lastPlayedGroup : internalGroup);
 
- CLog::Log(LOGDEBUG, "CPVRChannelGroups - {0} - {1} %s channel groups loaded", __FUNCTION__, m_groups.size(), m_bRadio ? "radio" : "TV");
+ CLog::Log(LOGDEBUG, "CPVRChannelGroups - {0} - {1} {2} channel groups loaded", __FUNCTION__, m_groups.size(), m_bRadio ? "radio" : "TV");
 
 // need at least 1 group
 return m_groups.size() > 0;
@@ -392,15 +389,13 @@
 int iReturn(0);
 CSingleLock lock(m_critSection);
 
- std::string strPath;
 for (std::vector<CPVRChannelGroupPtr>::const_iterator it = m_groups.begin(); it != m_groups.end(); ++it)
 {
 // exclude hidden groups if desired
 if (bExcludeHidden && (*it)->IsHidden())
 continue;
 
- strPath = StringUtils::Format("pvr://channels/%s/%s/", m_bRadio ? "radio" : "tv", (*it)->GroupName().c_str());
- CFileItemPtr group(new CFileItem(strPath, true));
+ CFileItemPtr group(new CFileItem((*it)->GetPath(), true));
 group->m_strTitle = (*it)->GroupName();
 group->SetLabel((*it)->GroupName());
 results->Add(group);

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroups.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/channels/PVRChannelGroupsContainer.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelGuide.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelGuide.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h Changed

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

_service:download_files:master.tar.gz/xbmc/pvr/epg/Epg.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgContainer.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgContainer.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgDatabase.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgDatabase.h Changed

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

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

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchFilter.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -34,7 +34,8 @@
 
 using namespace PVR;
 
-CPVREpgSearchFilter::CPVREpgSearchFilter()
+CPVREpgSearchFilter::CPVREpgSearchFilter(bool bRadio)
+: m_bIsRadio(bRadio)
 {
   Reset();
 }
@@ -51,17 +52,22 @@
 
   m_startDateTime.SetFromUTCDateTime(CServiceBroker::GetPVRManager().EpgContainer().GetFirstEPGDate());
   if (!m_startDateTime.IsValid())
+  {
+    CLog::Log(LOGWARNING, "%s - No valid epg start time. Defaulting search start time to 'now'", __FUNCTION__);
     m_startDateTime.SetFromUTCDateTime(CDateTime::GetUTCDateTime()); // default to 'now'
+  }
 
   m_endDateTime.SetFromUTCDateTime(CServiceBroker::GetPVRManager().EpgContainer().GetLastEPGDate());
   if (!m_endDateTime.IsValid())
+  {
+    CLog::Log(LOGWARNING, "%s - No valid epg end time. Defaulting search end time to search start time plus 10 days", __FUNCTION__);
     m_endDateTime.SetFromUTCDateTime(m_startDateTime + CDateTimeSpan(10, 0, 0, 0)); // default to start + 10 days
+  }
 
   m_bIncludeUnknownGenres    = false;
   m_bRemoveDuplicates        = false;
 
   /* pvr specific filters */
-  m_bIsRadio                 = false;
   m_channelNumber = CPVRChannelNumber();
   m_bFreeToAirOnly           = false;
   m_iChannelGroup            = EPG_SEARCH_UNSET;

_service:download_files:master.tar.gz/xbmc/pvr/epg/EpgSearchFilter.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -35,7 +35,13 @@
 class CPVREpgSearchFilter
 {
 public:
- CPVREpgSearchFilter();
+ CPVREpgSearchFilter() = delete;
+
+ /*!
+ * @brief ctor.
+ * @param bRadio the type of channels to search - if true, 'radio'. 'tv', otherwise.
+ */
+ CPVREpgSearchFilter(bool bRadio);
 
 /*!
 * @brief Clear this filter.
@@ -56,6 +62,12 @@
 */
 static int RemoveDuplicates(CFileItemList &results);
 
+ /*!
+ * @brief Get the type of channels to search.
+ * @return true, if 'radio'. false, otherwise.
+ */
+ bool IsRadio() const { return m_bIsRadio; }
+
 const std::string &GetSearchTerm() const { return m_strSearchTerm; }
 void SetSearchTerm(const std::string &strSearchTerm) { m_strSearchTerm = strSearchTerm; }
 void SetSearchPhrase(const std::string &strSearchPhrase);
@@ -90,9 +102,6 @@
 bool ShouldRemoveDuplicates() const { return m_bRemoveDuplicates; }
 void SetRemoveDuplicates(bool bRemoveDuplicates) { m_bRemoveDuplicates = bRemoveDuplicates; }
 
- bool IsRadio() const { return m_bIsRadio; }
- void SetIsRadio(bool bIsRadio) { m_bIsRadio = bIsRadio; }
-
 const CPVRChannelNumber& GetChannelNumber() const { return m_channelNumber; }
 void SetChannelNumber(const CPVRChannelNumber& channelNumber) { m_channelNumber = channelNumber; }
 
@@ -135,7 +144,7 @@
 CDateTime m_endDateTime; /*!< The maximum end time for an entry */
 bool m_bIncludeUnknownGenres; /*!< Include unknown genres or not */
 bool m_bRemoveDuplicates; /*!< True to remove duplicate events, false if not */
- bool m_bIsRadio; /*!< True to filter radio channels only, false to tv only */
+ const bool m_bIsRadio; /*!< True to filter radio channels only, false to tv only */
 
 /* PVR specific filters */
 CPVRChannelNumber m_channelNumber; /*!< The channel number in the selected channel group */

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecording.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecording.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecordings.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecordings.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecordingsPath.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/recordings/PVRRecordingsPath.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimerInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimers.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/timers/PVRTimers.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainer.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -450,11 +450,13 @@
     case ACTION_NEXT_ITEM:
       // skip +12h
       ScrollToBlockOffset(m_blockOffset + (12 * 60  / CGUIEPGGridContainerModel::MINSPERBLOCK));
+      SetBlock(m_blockCursor);
       return true;
 
     case ACTION_PREV_ITEM:
       // skip -12h
       ScrollToBlockOffset(m_blockOffset - (12 * 60 / CGUIEPGGridContainerModel::MINSPERBLOCK));
+      SetBlock(m_blockCursor);
       return true;
 
     case REMOTE_0:
@@ -631,10 +633,15 @@
         if (message.GetSenderId() == m_pageControl && IsVisible())
         {
           if (m_orientation == VERTICAL)
+          {
             ScrollToChannelOffset(message.GetParam1());
+            SetChannel(m_channelCursor);
+          }
           else
+          {
             ScrollToBlockOffset(message.GetParam1());
-
+            SetBlock(m_blockCursor);
+          }
           return true;
         }
         break;
@@ -831,12 +838,14 @@
     offset = 0;
 
   ScrollToChannelOffset(offset);
+  SetChannel(m_channelCursor);
 }
 
 void CGUIEPGGridContainer::ProgrammesScroll(int amount)
 {
   // increase or decrease the horizontal offset
   ScrollToBlockOffset(m_blockOffset + amount);
+  SetBlock(m_blockCursor);
 }
 
 void CGUIEPGGridContainer::OnUp()
@@ -1211,7 +1220,9 @@
       CGUIMessage msg(GUI_MSG_EXCLUSIVE_MOUSE, 0, GetParentID());
       SendWindowMessage(msg);
       ScrollToChannelOffset(MathUtils::round_int(m_channelScrollOffset / m_channelLayout->Size(m_orientation)));
+      SetChannel(m_channelCursor);
       ScrollToBlockOffset(MathUtils::round_int(m_programmeScrollOffset / m_blockSize));
+      SetBlock(m_blockCursor);
       return EVENT_RESULT_HANDLED;
     }
   case ACTION_GESTURE_PAN:

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainer.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainerModel.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIEPGGridContainerModel.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIViewStatePVR.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIViewStatePVR.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRBase.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -47,9 +47,95 @@
 using namespace PVR;
 using namespace KODI::MESSAGING;
 
+namespace PVR
+{
+
+class CGUIPVRChannelGroupsSelector
+{
+public:
+ CGUIPVRChannelGroupsSelector() : m_control(nullptr) {};
+ virtual ~CGUIPVRChannelGroupsSelector() = default;
+
+ bool Initialize(CGUIWindow* parent, bool bRadio);
+
+ bool HasFocus() const;
+ CPVRChannelGroupPtr GetSelectedChannelGroup() const;
+ bool SelectChannelGroup(const CPVRChannelGroupPtr &newGroup);
+
+private:
+ CGUIControl *m_control;
+ std::vector<CPVRChannelGroupPtr> m_channelGroups;
+};
+
+} // namespace PVR
+
+bool CGUIPVRChannelGroupsSelector::Initialize(CGUIWindow* parent, bool bRadio)
+{
+ CGUIControl* control = parent->GetControl(CONTROL_LSTCHANNELGROUPS);
+ if (control && control->IsContainer())
+ {
+ m_control = control;
+ m_channelGroups = CServiceBroker::GetPVRManager().ChannelGroups()->Get(bRadio)->GetMembers(true);
+ CFileItemList channelGroupItems;
+ for (const auto& group : m_channelGroups)
+ {
+ CFileItemPtr item(new CFileItem(group->GetPath(), true));
+ item->m_strTitle = group->GroupName();
+ item->SetLabel(group->GroupName());
+ channelGroupItems.Add(item);
+ }
+
+ CGUIMessage msg(GUI_MSG_LABEL_BIND, m_control->GetID(), CONTROL_LSTCHANNELGROUPS, 0, 0, &channelGroupItems);
+ m_control->OnMessage(msg);
+ return true;
+ }
+ return false;
+}
+
+bool CGUIPVRChannelGroupsSelector::HasFocus() const
+{
+ return m_control && m_control->HasFocus();
+}
+
+CPVRChannelGroupPtr CGUIPVRChannelGroupsSelector::GetSelectedChannelGroup() const
+{
+ if (m_control)
+ {
+ CGUIMessage msg(GUI_MSG_ITEM_SELECTED, m_control->GetID(), CONTROL_LSTCHANNELGROUPS);
+ m_control->OnMessage(msg);
+
+ const auto it = std::next(m_channelGroups.begin(), msg.GetParam1());
+ if (it != m_channelGroups.end())
+ {
+ return *it;
+ }
+ }
+ return CPVRChannelGroupPtr();
+}
+
+bool CGUIPVRChannelGroupsSelector::SelectChannelGroup(const CPVRChannelGroupPtr &newGroup)
+{
+ if (m_control && newGroup)
+ {
+ int iIndex = 0;
+ for (const auto& group : m_channelGroups)
+ {
+ if (*newGroup == *group)
+ {
+ CGUIMessage msg(GUI_MSG_ITEM_SELECT, m_control->GetID(), CONTROL_LSTCHANNELGROUPS, iIndex);
+ m_control->OnMessage(msg);
+ return true;
+ }
+ ++iIndex;
+ }
+ }
+ return false;
+}
+
 CGUIWindowPVRBase::CGUIWindowPVRBase(bool bRadio, int id, const std::string &xmlFile) :
 CGUIMediaWindow(id, xmlFile.c_str()),
 m_bRadio(bRadio),
+ m_channelGroupsSelector(new CGUIPVRChannelGroupsSelector),
 m_progressHandle(nullptr)
 {
 // prevent removable drives to appear in directory listing (base class default behavior).
@@ -105,9 +191,20 @@
 {
 case ACTION_PREVIOUS_CHANNELGROUP:
 case ACTION_NEXT_CHANNELGROUP:
+ {
 // switch to next or previous group
 SetChannelGroup(action.GetID() == ACTION_NEXT_CHANNELGROUP ? m_channelGroup->GetNextGroup() : m_channelGroup->GetPreviousGroup());
 return true;
+ }
+ case ACTION_MOVE_RIGHT:
+ case ACTION_MOVE_LEFT:
+ {
+ if (m_channelGroupsSelector->HasFocus() && CGUIMediaWindow::OnAction(action))
+ {
+ SetChannelGroup(m_channelGroupsSelector->GetSelectedChannelGroup());
+ return true;
+ }
+ }
 }
 
 return CGUIMediaWindow::OnAction(action);
@@ -118,7 +215,7 @@
 if (actionID == ACTION_NAV_BACK)
 {
 // don't call CGUIMediaWindow as it will attempt to go to the parent folder which we don't want.
- if (GetPreviousWindow() != WINDOW_FULLSCREEN_LIVETV)
+ if (GetPreviousWindow() != WINDOW_FULLSCREEN_VIDEO)
 {
 g_windowManager.ActivateWindow(WINDOW_HOME);
 return true;
@@ -133,6 +230,7 @@
 {
 CSingleLock lock(m_critSection);
 m_channelGroup.reset();
+ m_channelGroupsSelector.reset(new CGUIPVRChannelGroupsSelector);
 }
 
 void CGUIWindowPVRBase::OnInitWindow(void)
@@ -141,10 +239,15 @@
 
 if (InitChannelGroup())
 {
+ m_channelGroupsSelector->Initialize(this, m_bRadio);
+
 CGUIMediaWindow::OnInitWindow();
 
 // mark item as selected by channel path
 m_viewControl.SetSelectedItem(CServiceBroker::GetPVRManager().GUIActions()->GetSelectedItemPath(m_bRadio));
+
+ // This has to be done after base class OnInitWindow to restore correct selection
+ m_channelGroupsSelector->SelectChannelGroup(m_channelGroup);
 }
 else
 {
@@ -171,9 +274,23 @@
 {
 case CONTROL_BTNCHANNELGROUPS:
 return OpenChannelGroupSelectionDialog();
+
+ case CONTROL_LSTCHANNELGROUPS:
+ {
+ switch (message.GetParam1())
+ {
+ case ACTION_SELECT_ITEM:
+ case ACTION_MOUSE_LEFT_CLICK:
+ {
+ SetChannelGroup(m_channelGroupsSelector->GetSelectedChannelGroup());
+ bReturn = true;
+ break;
+ }
+ }
+ }
 }
+ break;
 }
- break;
 
 case GUI_MSG_REFRESH_LIST:
 {
@@ -183,6 +300,8 @@
 {
 // late init
 InitChannelGroup();
+ m_channelGroupsSelector->Initialize(this, m_bRadio);
+ m_channelGroupsSelector->SelectChannelGroup(m_channelGroup);
 RegisterObservers();
 HideProgressDialog();
 Refresh(true);
@@ -197,8 +316,8 @@
 UpdateSelectedItemPath();
 }
 bReturn = true;
+ break;
 }
- break;
 
 case GUI_MSG_NOTIFY_ALL:
 {
@@ -212,8 +331,8 @@
 break;
 }
 }
+ break;
 }
- break;
 }
 
 return bReturn || CGUIMediaWindow::OnMessage(message);
@@ -356,7 +475,9 @@
 void CGUIWindowPVRBase::UpdateButtons(void)
 {
 CGUIMediaWindow::UpdateButtons();
+
 SET_CONTROL_LABEL(CONTROL_BTNCHANNELGROUPS, g_localizeStrings.Get(19141) + ": " + m_channelGroup->GroupName());
+ m_channelGroupsSelector->SelectChannelGroup(m_channelGroup);
 }
 
 void CGUIWindowPVRBase::ShowProgressDialog(const std::string &strText, int iProgress)

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRBase.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,6 +19,9 @@
 *
 */
 
+#include <memory>
+#include <vector>
+
 #include "utils/Observer.h"
 #include "windows/GUIMediaWindow.h"
 
@@ -32,6 +35,7 @@
 #define CONTROL_BTNSHOWDELETED 7
 #define CONTROL_BTNHIDEDISABLEDTIMERS 8
 #define CONTROL_BTNSHOWMODE 10
+#define CONTROL_LSTCHANNELGROUPS 11
 
 #define CONTROL_BTNCHANNELGROUPS 28
 #define CONTROL_BTNFILTERCHANNELS 31
@@ -53,6 +57,8 @@
 EPG_SELECT_ACTION_SMART_SELECT = 5
 };
 
+ class CGUIPVRChannelGroupsSelector;
+
 class CGUIWindowPVRBase : public CGUIMediaWindow, public Observer
 {
 public:
@@ -124,6 +130,7 @@
 */
 void HideProgressDialog(void);
 
+ std::unique_ptr<CGUIPVRChannelGroupsSelector> m_channelGroupsSelector;
 CPVRChannelGroupPtr m_channelGroup;
 XbmcThreads::EndTime m_refreshTimeout;
 CGUIDialogProgressBarHandle *m_progressHandle; /*!< progress dialog that is displayed while the pvr manager is loading */

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRChannels.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRChannels.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -18,6 +18,8 @@
 *
 */
 
+#include <iterator>
+
 #include "GUIWindowPVRGuide.h"
 
 #include "ContextMenuManager.h"
@@ -29,15 +31,12 @@
 #include "messaging/ApplicationMessenger.h"
 #include "settings/Settings.h"
 #include "threads/SingleLock.h"
-#include "utils/log.h"
 #include "view/GUIViewState.h"
 
 #include "pvr/PVRGUIActions.h"
 #include "pvr/PVRManager.h"
-#include "pvr/addons/PVRClients.h"
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/epg/EpgContainer.h"
-#include "pvr/timers/PVRTimers.h"
 #include "pvr/windows/GUIEPGGridContainer.h"
 
 using namespace PVR;
@@ -63,7 +62,7 @@
 return dynamic_cast<CGUIEPGGridContainer*>(GetControl(m_viewControl.GetCurrentControl()));
 }
 
-void CGUIWindowPVRGuideBase::Init()
+void CGUIWindowPVRGuideBase::InitEpgGridControl()
 {
 CGUIEPGGridContainer *epgGridContainer = GetGridControl();
 if (epgGridContainer)
@@ -98,7 +97,7 @@
 m_viewControl.SetCurrentView(m_guiState->GetViewAsControl(), false);
 
 if (InitChannelGroup()) // no channels -> lazy init
- Init();
+ InitEpgGridControl();
 
 CGUIWindowPVRBase::OnInitWindow();
 }
@@ -184,6 +183,7 @@
 void CGUIWindowPVRGuideBase::UpdateButtons(void)
 {
 CGUIWindowPVRBase::UpdateButtons();
+
 SET_CONTROL_LABEL(CONTROL_LABEL_HEADER1, g_localizeStrings.Get(19032));
 SET_CONTROL_LABEL(CONTROL_LABEL_HEADER2, GetChannelGroup()->GroupName());
 }
@@ -425,7 +425,7 @@
 CSingleLock lock(m_critSection);
 m_bRefreshTimelineItems = true;
 }
- Init();
+ InitEpgGridControl();
 
 Refresh(true);
 bReturn = true;
@@ -438,7 +438,7 @@
 {
 // late init
 InitChannelGroup();
- Init();
+ InitEpgGridControl();
 break;
 }
 case ObservableMessageChannelGroupReset:

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRGuide.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRRecordings.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRSearch.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2012-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -37,6 +37,7 @@
 #include "pvr/channels/PVRChannelGroupsContainer.h"
 #include "pvr/dialogs/GUIDialogPVRGuideSearch.h"
 #include "pvr/epg/EpgContainer.h"
+#include "pvr/epg/EpgSearchFilter.h"
 
 using namespace PVR;
 using namespace KODI::MESSAGING;
@@ -98,17 +99,17 @@
 
 void CGUIWindowPVRSearchBase::SetItemToSearch(const CFileItemPtr &item)
 {
-  m_searchfilter.Reset();
+  m_searchfilter.reset(new CPVREpgSearchFilter(m_bRadio));
 
   if (item->IsUsablePVRRecording())
   {
-    m_searchfilter.SetSearchPhrase(item->GetPVRRecordingInfoTag()->m_strTitle);
+    m_searchfilter->SetSearchPhrase(item->GetPVRRecordingInfoTag()->m_strTitle);
   }
   else
   {
     const CPVREpgInfoTagPtr epgTag(CPVRItem(item).GetEpgInfoTag());
     if (epgTag)
-      m_searchfilter.SetSearchPhrase(epgTag->Title());
+      m_searchfilter->SetSearchPhrase(epgTag->Title());
   }
 
   m_bSearchConfirmed = true;
@@ -126,11 +127,11 @@
     bAddSpecialSearchItem = true;
 
     items.Clear();
-    AsyncSearchAction(&items, &m_searchfilter).Execute();
+    AsyncSearchAction(&items, m_searchfilter.get()).Execute();
 
     if (items.IsEmpty())
       HELPERS::ShowOKDialogText(CVariant{284}, // "No results found"
-                                    m_searchfilter.GetSearchTerm());
+                                m_searchfilter->GetSearchTerm());
   }
 
   if (bAddSpecialSearchItem)
@@ -194,7 +195,7 @@
     bReturn = true;
 
     m_bSearchConfirmed = false;
-    m_searchfilter.Reset();
+    m_searchfilter.reset();
 
     Refresh(true);
   }
@@ -209,10 +210,10 @@
   if (!dlgSearch)
     return;
 
-  dlgSearch->SetFilterData(&m_searchfilter);
+  if (!m_searchfilter)
+    m_searchfilter.reset(new CPVREpgSearchFilter(m_bRadio));
 
-  /* Set channel type filter */
-  m_searchfilter.SetIsRadio(m_bRadio);
+  dlgSearch->SetFilterData(m_searchfilter.get());
 
   /* Open dialog window */
   dlgSearch->Open();

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRSearch.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimerRules.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimerRules.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimers.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimers.h Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimersBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/pvr/windows/GUIWindowPVRTimersBase.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/RenderSystem.cpp Changed

_service:download_files:master.tar.gz/xbmc/rendering/RenderSystem.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/RenderSystemTypes.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/dx/DeviceResources.cpp Changed

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (C) 2005-2017 Team Kodi
 * http://kodi.tv
 *
@@ -20,11 +20,12 @@
 
 #include "DeviceResources.h"
 #include "DirectXHelper.h"
-#include "guilib/GraphicContext.h"
+#include "RenderContext.h"
 #include "guilib/GUIWindowManager.h"
+#include "guilib/GraphicContext.h"
 #include "messaging/ApplicationMessenger.h"
+#include "platform/win32/CharsetConverter.h"
 #include "utils/log.h"
-#include "RenderContext.h"
 
 using namespace DirectX;
 using namespace Microsoft::WRL;
@@ -54,7 +55,6 @@
 m_usage = desc.Usage;
 
 m_texture = pTexture;
- m_texture->AddRef();
 return true;
 }
 
@@ -103,11 +103,21 @@
 m_d3dContext = nullptr;
 m_d3dDevice = nullptr;
 m_bDeviceCreated = false;
+#ifdef _DEBUG
+ if (m_d3dDebug)
+ {
+ m_d3dDebug->ReportLiveDeviceObjects(D3D11_RLDO_SUMMARY | D3D11_RLDO_DETAIL);
+ m_d3dDebug = nullptr;
+ }
+#endif
 }
 
-void DX::DeviceResources::GetOutput(IDXGIOutput** pOutput) const
+void DX::DeviceResources::GetOutput(IDXGIOutput** ppOutput) const
 {
- m_swapChain->GetContainingOutput(pOutput);
+ ComPtr<IDXGIOutput> pOutput;
+ if (FAILED(m_swapChain->GetContainingOutput(pOutput.GetAddressOf())) || !pOutput)
+ m_output.As(&pOutput);
+ *ppOutput = pOutput.Detach();
 }
 
 void DX::DeviceResources::GetAdapterDesc(DXGI_ADAPTER_DESC* desc) const
@@ -121,7 +131,7 @@
 DXGI_OUTPUT_DESC outDesc;
 ComPtr<IDXGIOutput> pOutput;
 
- m_swapChain->GetContainingOutput(&pOutput);
+ GetOutput(pOutput.GetAddressOf());
 pOutput->GetDesc(&outDesc);
 
 DXGI_SWAP_CHAIN_DESC scDesc;
@@ -146,6 +156,13 @@
 int i = (((sDevMode.dmDisplayFrequency + 1) % 24) == 0 || ((sDevMode.dmDisplayFrequency + 1) % 30) == 0) ? 1 : 0;
 mode->RefreshRate.Numerator = (sDevMode.dmDisplayFrequency + i) * 1000;
 mode->RefreshRate.Denominator = 1000 + i;
+ if (sDevMode.dmDisplayFlags & DM_INTERLACED)
+ {
+ mode->RefreshRate.Numerator *= 2;
+ mode->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST; // guessing
+ }
+ else
+ mode->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
 }
 #endif
 }
@@ -178,7 +195,8 @@
 
 critical_section::scoped_lock lock(m_criticalSection);
 
- CLog::Log(LOGDEBUG, __FUNCTION__": switching to/from fullscreen (%f x %f)", m_outputSize.Width, m_outputSize.Height);
+ CLog::LogF(LOGDEBUG, "switching to/from fullscreen (%f x %f)", m_outputSize.Width,
+ m_outputSize.Height);
 
 BOOL bFullScreen;
 bool recreate = m_stereoEnabled != (g_graphicsContext.GetStereoMode() == RENDER_STEREO_MODE_HARDWAREBASED);
@@ -186,7 +204,7 @@
 m_swapChain->GetFullscreenState(&bFullScreen, nullptr);
 if (!!bFullScreen && !fullscreen)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": switching to windowed");
+ CLog::LogF(LOGDEBUG, "switching to windowed");
 recreate |= SUCCEEDED(m_swapChain->SetFullscreenState(false, nullptr));
 }
 else if (fullscreen)
@@ -196,15 +214,24 @@
 {
 DXGI_MODE_DESC currentMode;
 GetDisplayMode(&currentMode);
+ DXGI_SWAP_CHAIN_DESC scDesc;
+ m_swapChain->GetDesc(&scDesc);
+
+ bool is_interlaced = scDesc.BufferDesc.ScanlineOrdering > DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
+ float refreshRate = res.fRefreshRate;
+ if (res.dwFlags & D3DPRESENTFLAG_INTERLACED)
+ refreshRate *= 2;
 
 if (currentMode.Width != res.iWidth
 || currentMode.Height != res.iHeight
- || DX::RationalToFloat(currentMode.RefreshRate) != res.fRefreshRate
+ || DX::RationalToFloat(currentMode.RefreshRate) != refreshRate
+ || is_interlaced != (res.dwFlags & D3DPRESENTFLAG_INTERLACED ? true : false)
 // force resolution change for stereo mode
 // some drivers unable to create stereo swapchain if mode does not match @23.976
 || g_graphicsContext.GetStereoMode() == RENDER_STEREO_MODE_HARDWAREBASED)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": changing display mode to %dx%d@%0.3f", res.iWidth, res.iHeight, res.fRefreshRate);
+ CLog::Log(LOGDEBUG, __FUNCTION__": changing display mode to %dx%d@%0.3fs", res.iWidth, res.iHeight, res.fRefreshRate,
+ res.dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : "");
 
 int refresh = static_cast<int>(res.fRefreshRate);
 int i = (refresh + 1) % 24 == 0 || (refresh + 1) % 30 == 0 ? 1 : 0;
@@ -213,16 +240,20 @@
 currentMode.Height = res.iHeight;
 currentMode.RefreshRate.Numerator = (refresh + i) * 1000;
 currentMode.RefreshRate.Denominator = 1000 + i;
-
+ if (res.dwFlags & D3DPRESENTFLAG_INTERLACED)
+ {
+ currentMode.RefreshRate.Numerator *= 2;
+ currentMode.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST; // guessing;
+ }
 recreate |= SUCCEEDED(m_swapChain->ResizeTarget(&currentMode));
 }
 }
 if (!bFullScreen)
 {
 ComPtr<IDXGIOutput> pOutput;
- m_swapChain->GetContainingOutput(&pOutput);
+ GetOutput(pOutput.GetAddressOf());
 
- CLog::Log(LOGDEBUG, __FUNCTION__": switching to fullscreen");
+ CLog::LogF(LOGDEBUG, "switching to fullscreen");
 recreate |= SUCCEEDED(m_swapChain->SetFullscreenState(true, pOutput.Get()));
 }
 }
@@ -231,7 +262,7 @@
 if (recreate)
 ResizeBuffers();
 
- CLog::Log(LOGDEBUG, __FUNCTION__": switching done.");
+ CLog::LogF(LOGDEBUG, "switching done.");
 
 return true;
 }
@@ -274,9 +305,10 @@
 ComPtr<ID3D11Device> device;
 ComPtr<ID3D11DeviceContext> context;
 
+ D3D_DRIVER_TYPE drivertType = m_adapter != nullptr ? D3D_DRIVER_TYPE_UNKNOWN : D3D_DRIVER_TYPE_HARDWARE;
 HRESULT hr = D3D11CreateDevice(
- nullptr, // Specify nullptr to use the default adapter.
- D3D_DRIVER_TYPE_HARDWARE, // Create a device using the hardware graphics driver.
+ m_adapter.Get(), // Create a device on specified adapter.
+ drivertType, // Create a device using scepcified driver.
 nullptr, // Should be 0 unless the driver is D3D_DRIVER_TYPE_SOFTWARE.
 creationFlags, // Set debug and Direct2D compatibility flags.
 featureLevels, // List of feature levels this app can support.
@@ -317,20 +349,46 @@
 hr = m_d3dDevice.As(&d3dMultiThread); CHECK_ERR();
 d3dMultiThread->SetMultithreadProtected(1);
 
+#ifdef _DEBUG
+ if (SUCCEEDED(m_d3dDevice.As(&m_d3dDebug)))
+ {
+ ComPtr<ID3D11InfoQueue> d3dInfoQueue;
+ if (SUCCEEDED(m_d3dDebug.As(&d3dInfoQueue)))
+ {
+ D3D11_MESSAGE_ID hide[] =
+ {
+ D3D11_MESSAGE_ID_GETVIDEOPROCESSORFILTERRANGE_UNSUPPORTED, // avoid GETVIDEOPROCESSORFILTERRANGE_UNSUPPORTED (dx bug)
+ D3D11_MESSAGE_ID_DEVICE_RSSETSCISSORRECTS_NEGATIVESCISSOR // avoid warning for some labels out of screen
+ // Add more message IDs here as needed
+ };
+
+ D3D11_INFO_QUEUE_FILTER filter;
+ ZeroMemory(&filter, sizeof(filter));
+ filter.DenyList.NumIDs = _countof(hide);
+ filter.DenyList.pIDList = hide;
+ d3dInfoQueue->AddStorageFilterEntries(&filter);
+ }
+ }
+#endif
+
 hr = context.As(&m_d3dContext); CHECK_ERR();
 hr = m_d3dDevice->CreateDeferredContext1(0, &m_deferrContext); CHECK_ERR();
 
- ComPtr<IDXGIDevice1> dxgiDevice;
- ComPtr<IDXGIAdapter> adapter;
- hr = m_d3dDevice.As(&dxgiDevice); CHECK_ERR();
- hr = dxgiDevice->GetAdapter(&adapter); CHECK_ERR();
- hr = adapter.As(&m_adapter); CHECK_ERR();
+ if (!m_adapter)
+ {
+ ComPtr<IDXGIDevice1> dxgiDevice;
+ ComPtr<IDXGIAdapter> adapter;
+ hr = m_d3dDevice.As(&dxgiDevice); CHECK_ERR();
+ hr = dxgiDevice->GetAdapter(&adapter); CHECK_ERR();
+ hr = adapter.As(&m_adapter); CHECK_ERR();
+ }
 hr = m_adapter->GetParent(IID_PPV_ARGS(&m_dxgiFactory)); CHECK_ERR();
 
 DXGI_ADAPTER_DESC aDesc;
 m_adapter->GetDesc(&aDesc);
 
- CLog::LogF(LOGDEBUG, "device is created on adapter '%S' with feature level %04x.", aDesc.Description, m_d3dFeatureLevel);
+ CLog::LogF(LOGDEBUG, "device is created on adapter '%s' with feature level %04x.",
+ KODI::PLATFORM::WINDOWS::FromW(aDesc.Description), m_d3dFeatureLevel);
 
 m_bDeviceCreated = true;
 }
@@ -340,8 +398,8 @@
 CLog::LogF(LOGDEBUG, "release buffers.");
 
 // Clear the previous window size specific context.
- ID3D11RenderTargetView* nullViews[] = { nullptr };
- m_deferrContext->OMSetRenderTargets(ARRAYSIZE(nullViews), nullViews, nullptr);
+ ID3D11RenderTargetView* nullViews[] = { nullptr, nullptr, nullptr, nullptr };
+ m_deferrContext->OMSetRenderTargets(4, nullViews, nullptr);
 FinishCommandList(false);
 
 m_backBufferTex.Release();
@@ -438,10 +496,10 @@
 bool bHWStereoEnabled = RENDER_STEREO_MODE_HARDWAREBASED == g_graphicsContext.GetStereoMode();
 bool windowed = true;
 
+ DXGI_SWAP_CHAIN_DESC1 scDesc = { 0 };
 if (m_swapChain)
 {
 // check if swapchain needs to be recreated
- DXGI_SWAP_CHAIN_DESC1 scDesc = { 0 };
 m_swapChain->GetDesc1(&scDesc);
 if ((scDesc.Stereo == TRUE) != bHWStereoEnabled)
 {
@@ -463,11 +521,12 @@
 if (m_swapChain != nullptr)
 {
 // If the swap chain already exists, resize it.
+ m_swapChain->GetDesc1(&scDesc);
 HRESULT hr = m_swapChain->ResizeBuffers(
- 2, // Double-buffered swap chain.
+ scDesc.BufferCount,
 lround(m_outputSize.Width),
 lround(m_outputSize.Height),
- DXGI_FORMAT_B8G8R8A8_UNORM,
+ scDesc.Format,
 0
 );
 
@@ -500,7 +559,7 @@
 swapChainDesc.SampleDesc.Quality = 0;
 
 DXGI_SWAP_CHAIN_FULLSCREEN_DESC scFSDesc = { 0 }; // unused for uwp
- scFSDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE;
+ scFSDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
 scFSDesc.Windowed = windowed;
 
 ComPtr<IDXGISwapChain1> swapChain;
@@ -717,21 +776,29 @@
 // Recreate all device resources and set them back to the current state.
 void DX::DeviceResources::HandleDeviceLost(bool removed)
 {
+ bool backbuferExists = m_backBufferTex.Get() != nullptr;
+
 OnDeviceLost(removed);
 if (m_deviceNotify != nullptr)
 m_deviceNotify->OnDXDeviceLost();
 
- ReleaseBackBuffer();
- m_swapChain = nullptr;
+ if (backbuferExists)
+ ReleaseBackBuffer();
 
+ m_swapChain = nullptr;
 CreateDeviceResources();
- CreateWindowSizeDependentResources();
+ UpdateRenderTargetSize();
+ ResizeBuffers();
+
+ if (backbuferExists)
+ CreateBackBuffer();
 
 if (m_deviceNotify != nullptr)
 m_deviceNotify->OnDXDeviceRestored();
 OnDeviceRestored();
 
- KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, "ReloadSkin");
+ if (removed)
+ KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr, "ReloadSkin");
 }
 
 bool DX::DeviceResources::Begin()
@@ -801,51 +868,42 @@
 m_deferrContext->ClearRenderTargetView(pRTView, color);
 }
 
-void DX::DeviceResources::SetMonitor(HMONITOR monitor) const
+void DX::DeviceResources::HandleOutputChange(const std::function<bool(DXGI_OUTPUT_DESC)>& cmpFunc)
 {
- HRESULT hr;
 DXGI_ADAPTER_DESC currentDesc = { 0 };
 DXGI_ADAPTER_DESC foundDesc = { 0 };
 
- ComPtr<IDXGIFactory1> dxgiFactory;
- ComPtr<IDXGIAdapter1> adapter;
-
- if (m_d3dDevice)
- {
- ComPtr<IDXGIDevice1> dxgiDevice;
- ComPtr<IDXGIAdapter> deviceAdapter;
-
- hr = m_d3dDevice.As(&dxgiDevice); CHECK_ERR();
- dxgiDevice->GetAdapter(&deviceAdapter);
- deviceAdapter->GetDesc(&currentDesc);
- }
+ ComPtr<IDXGIFactory1> factory;
+ if (m_adapter)
+ m_adapter->GetDesc(&currentDesc);
 
- CreateDXGIFactory1(IID_IDXGIFactory1, &dxgiFactory);
+ CreateDXGIFactory1(IID_IDXGIFactory1, &factory);
 
- int index = 0;
- while (true)
+ ComPtr<IDXGIAdapter1> adapter;
+ for (int i = 0; factory->EnumAdapters1(i, adapter.ReleaseAndGetAddressOf()) != DXGI_ERROR_NOT_FOUND; i++)
 {
- hr = dxgiFactory->EnumAdapters1(index, &adapter);
- if (hr == DXGI_ERROR_NOT_FOUND)
- break;
-
- ComPtr<IDXGIOutput> output;
 adapter->GetDesc(&foundDesc);
-
- for (int j = 0; adapter->EnumOutputs(j, &output) != DXGI_ERROR_NOT_FOUND; j++)
+ ComPtr<IDXGIOutput> output;
+ for (int j = 0; adapter->EnumOutputs(j, output.ReleaseAndGetAddressOf()) != DXGI_ERROR_NOT_FOUND; j++)
 {
 DXGI_OUTPUT_DESC outputDesc;
 output->GetDesc(&outputDesc);
- if (outputDesc.Monitor == monitor)
+ if (cmpFunc(outputDesc))
 {
+ output.As(&m_output);
 // check if adapter is changed
 if (currentDesc.AdapterLuid.HighPart != foundDesc.AdapterLuid.HighPart
 || currentDesc.AdapterLuid.LowPart != foundDesc.AdapterLuid.LowPart)
 {
- CLog::LogF(LOGDEBUG, "selected %S adapter. ", foundDesc.Description);
-
- // adapter is changed, (re)init hooks into new driver
+ // adapter is changed
+ m_adapter = adapter;
+ CLog::LogF(LOGDEBUG, "selected {} adapter. ",
+ KODI::PLATFORM::WINDOWS::FromW(foundDesc.Description));
+ // (re)init hooks into new driver
 Windowing().InitHooks(output.Get());
+ // recreate d3d11 device on new adapter
+ if (m_d3dDevice)
+ HandleDeviceLost(false);
 }
 return;
 }
@@ -853,6 +911,13 @@
 }
 }
 
+void DX::DeviceResources::SetMonitor(HMONITOR monitor)
+{
+ HandleOutputChange([monitor](DXGI_OUTPUT_DESC outputDesc) { 
+ return outputDesc.Monitor == monitor; 
+ });
+}
+
 void DX::DeviceResources::RegisterDeviceNotify(IDeviceNotify* deviceNotify)
 {
 m_deviceNotify = deviceNotify;
@@ -863,7 +928,7 @@
 if (m_swapChain)
 {
 ComPtr<IDXGIOutput> output;
- HRESULT hr = m_swapChain->GetContainingOutput(&output); RETURN_ERR(nullptr);
+ GetOutput(output.GetAddressOf());
 if (output)
 {
 DXGI_OUTPUT_DESC desc;
@@ -902,6 +967,7 @@
 auto coreWindow = Windows::UI::Core::CoreWindow::GetForCurrentThread();
 m_logicalSize = Windows::Foundation::Size(coreWindow->Bounds.Width, coreWindow->Bounds.Height);
 m_dpi = Windows::Graphics::Display::DisplayInformation::GetForCurrentView()->LogicalDpi;
+ SetWindowPos(coreWindow->Bounds);
 });
 if (dispatcher->HasThreadAccess)
 handler->Invoke();
@@ -914,6 +980,18 @@
 CreateWindowSizeDependentResources();
 }
 
+void DX::DeviceResources::SetWindowPos(Windows::Foundation::Rect rect)
+{
+ int centerX = rect.X + rect.Width / 2;
+ int centerY = rect.Y + rect.Height / 2;
+
+ HandleOutputChange([centerX, centerY](DXGI_OUTPUT_DESC outputDesc) {
+ // DesktopCoordinates depends on the DPI of the desktop
+ return outputDesc.DesktopCoordinates.left <= centerX && outputDesc.DesktopCoordinates.right >= centerX
+ && outputDesc.DesktopCoordinates.top <= centerY && outputDesc.DesktopCoordinates.bottom >= centerY;
+ });
+}
+
 // Call this method when the app suspends. It provides a hint to the driver that the app 
 // is entering an idle state and that temporary buffers can be reclaimed for use by other apps.
 void DX::DeviceResources::Trim() const

_service:download_files:master.tar.gz/xbmc/rendering/dx/DeviceResources.h Changed

@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (C) 2005-2017 Team Kodi
 * http://kodi.tv
 *
@@ -29,6 +29,7 @@
 #include <dxgi1_2.h>
 #include <easyhook/easyhook.h>
 #endif
+#include <functional>
 #include <memory>
 
 #include "DirectXHelper.h"
@@ -98,7 +99,7 @@
 D3D_FEATURE_LEVEL GetDeviceFeatureLevel() const { return m_d3dFeatureLevel; }
 CD3DTexture* GetBackBuffer() { return &m_backBufferTex; }
 
- void GetOutput(IDXGIOutput** pOutput) const;
+ void GetOutput(IDXGIOutput** ppOutput) const;
 void GetAdapterDesc(DXGI_ADAPTER_DESC *desc) const;
 void GetDisplayMode(DXGI_MODE_DESC *mode) const;
 
@@ -124,13 +125,14 @@
 bool IsStereoEnabled() const { return m_stereoEnabled; }
 void SetStereoIdx(byte idx) { m_backBufferTex.SetViewIdx(idx); }
 
- void SetMonitor(HMONITOR monitor) const;
+ void SetMonitor(HMONITOR monitor);
 HMONITOR GetMonitor() const;
 #if defined(TARGET_WINDOWS_DESKTOP)
 void SetWindow(HWND window);
 #elif defined(TARGET_WINDOWS_STORE)
 void Trim() const;
 void SetWindow(Windows::UI::Core::CoreWindow^ window);
+ void SetWindowPos(Windows::Foundation::Rect rect);
 #endif // TARGET_WINDOWS_STORE
 
 private:
@@ -149,6 +151,7 @@
 void UpdateRenderTargetSize();
 void OnDeviceLost(bool removed);
 void OnDeviceRestored();
+ void HandleOutputChange(const std::function<bool(DXGI_OUTPUT_DESC)>& cmpFunc);
 
 HWND m_window{ nullptr };
 #if defined(TARGET_WINDOWS_STORE)
@@ -162,6 +165,9 @@
 Microsoft::WRL::ComPtr<ID3D11DeviceContext1> m_d3dContext;
 Microsoft::WRL::ComPtr<ID3D11DeviceContext1> m_deferrContext;
 Microsoft::WRL::ComPtr<IDXGISwapChain1> m_swapChain;
+#ifdef _DEBUG
+ Microsoft::WRL::ComPtr<ID3D11Debug> m_d3dDebug;
+#endif
 
 CBackBuffer m_backBufferTex;
 Microsoft::WRL::ComPtr<ID3D11DepthStencilView> m_d3dDepthStencilView;

_service:download_files:master.tar.gz/xbmc/rendering/dx/DirectXHelper.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * http://kodi.tv
 *
 * Test patterns designed by Ofer LaOr - hometheater.co.il
 *
@@ -29,7 +29,9 @@
 
 #ifndef _d3d9TYPES_H_
 #include "DirectXPackedVector.h"
+using namespace DirectX;
 using namespace DirectX::PackedVector;
+using namespace Microsoft::WRL;
 
 DWORD D3DCOLOR_COLORVALUE(float r, float g, float b, float a)
 {
@@ -43,13 +45,13 @@
 
 CGUIWindowTestPatternDX::CGUIWindowTestPatternDX(void) : CGUIWindowTestPattern()
 {
- m_vb = NULL;
+ m_vb = nullptr;
 m_bufferWidth = 0;
 }
 
 CGUIWindowTestPatternDX::~CGUIWindowTestPatternDX(void)
 {
- SAFE_RELEASE(m_vb);
+ m_vb = nullptr;
 m_bufferWidth = 0;
 }
 
@@ -72,12 +74,12 @@
 }
 UpdateVertexBuffer(vert, p);
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
 pGUIShader->Draw(p, 0);
 
@@ -103,12 +105,12 @@
 }
 UpdateVertexBuffer(vert, p);
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
 pGUIShader->Draw(p, 0);
 
@@ -145,12 +147,12 @@
 }
 UpdateVertexBuffer(vert, i);
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
 pGUIShader->Draw(i, 0);
 
@@ -228,12 +230,12 @@
 };
 UpdateVertexBuffer(vert, ARRAYSIZE(vert));
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
 pGUIShader->Draw(ARRAYSIZE(vert), 0);
 
@@ -302,19 +304,19 @@
 
 UpdateVertexBuffer(vert, ARRAYSIZE(vert));
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 pGUIShader->Draw(ARRAYSIZE(vert), 0);
 }
 
 void CGUIWindowTestPatternDX::BeginRender()
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 ID3D11RenderTargetView* renderTarget;
 
 pContext->OMGetRenderTargets(1, &renderTarget, NULL);
@@ -345,12 +347,12 @@
 
 UpdateVertexBuffer(vert, ARRAYSIZE(vert));
 
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 CGUIShaderDX* pGUIShader = DX::Windowing().GetGUIShader();
 
 pGUIShader->Begin(SHADER_METHOD_RENDER_DEFAULT);
 unsigned stride = sizeof(Vertex), offset = 0;
- pContext->IASetVertexBuffers(0, 1, &m_vb, &stride, &offset);
+ pContext->IASetVertexBuffers(0, 1, m_vb.GetAddressOf(), &stride, &offset);
 pContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
 pGUIShader->Draw(ARRAYSIZE(vert), 0);
 }
@@ -361,13 +363,13 @@
 
 if (!m_vb || width > m_bufferWidth) // create new
 {
- SAFE_RELEASE(m_vb);
-
 CD3D11_BUFFER_DESC desc(width, D3D11_BIND_VERTEX_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
 D3D11_SUBRESOURCE_DATA initData = {};
 initData.pSysMem = vertices;
 initData.SysMemPitch = width;
- if (SUCCEEDED(DX::DeviceResources::Get()->GetD3DDevice()->CreateBuffer(&desc, &initData, &m_vb)))
+
+ ComPtr<ID3D11Device1> pDevice = DX::DeviceResources::Get()->GetD3DDevice();
+ if (SUCCEEDED(pDevice->CreateBuffer(&desc, &initData, m_vb.ReleaseAndGetAddressOf())))
 {
 m_bufferWidth = width;
 }
@@ -375,12 +377,12 @@
 }
 else // update 
 {
- ID3D11DeviceContext* pContext = DX::DeviceResources::Get()->GetD3DContext();
+ ComPtr<ID3D11DeviceContext> pContext = DX::DeviceResources::Get()->GetD3DContext();
 D3D11_MAPPED_SUBRESOURCE res;
- if (SUCCEEDED(pContext->Map(m_vb, 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
+ if (SUCCEEDED(pContext->Map(m_vb.Get(), 0, D3D11_MAP_WRITE_DISCARD, 0, &res)))
 {
 memcpy(res.pData, vertices, sizeof(Vertex) * count);
- pContext->Unmap(m_vb, 0);
+ pContext->Unmap(m_vb.Get(), 0);
 }
 }
 }

_service:download_files:master.tar.gz/xbmc/rendering/dx/GUIWindowTestPatternDX.h Changed

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * http://kodi.tv
 *
 * Test patterns designed by Ofer LaOr - hometheater.co.il
 *
@@ -25,27 +25,30 @@
 #include "settings/windows/GUIWindowTestPattern.h"
 #include "guilib/GUIShaderDX.h"
 
+#include <wrl/client.h>
+
 class CGUIWindowTestPatternDX : public CGUIWindowTestPattern
 {
 public:
 CGUIWindowTestPatternDX(void);
 virtual ~CGUIWindowTestPatternDX(void);
 
-private:
- virtual void DrawVerticalLines(int top, int left, int bottom, int right);
- virtual void DrawHorizontalLines(int top, int left, int bottom, int right);
- virtual void DrawCheckers(int top, int left, int bottom, int right);
- virtual void DrawBouncingRectangle(int top, int left, int bottom, int right);
- virtual void DrawContrastBrightnessPattern(int top, int left, int bottom, int right);
- virtual void DrawCircle(int originX, int originY, int radius);
- virtual void BeginRender();
- virtual void EndRender();
- virtual void UpdateVertexBuffer(Vertex *vertices, unsigned count);
+protected:
+ void DrawVerticalLines(int top, int left, int bottom, int right) override;
+ void DrawHorizontalLines(int top, int left, int bottom, int right) override;
+ void DrawCheckers(int top, int left, int bottom, int right) override;
+ void DrawBouncingRectangle(int top, int left, int bottom, int right) override;
+ void DrawContrastBrightnessPattern(int top, int left, int bottom, int right) override;
+ void DrawCircle(int originX, int originY, int radius) override;
+ void BeginRender() override;
+ void EndRender() override;
 
+private:
+ void UpdateVertexBuffer(Vertex *vertices, unsigned count);
 void DrawRectangle(float x, float y, float x2, float y2, DWORD color);
 void DrawCircleEx(float originX, float originY, float radius, DWORD color);
 
- ID3D11Buffer* m_vb;
- unsigned m_bufferWidth;
+ unsigned m_bufferWidth;
+ Microsoft::WRL::ComPtr<ID3D11Buffer> m_vb;
 };

_service:download_files:master.tar.gz/xbmc/rendering/dx/RenderSystemDX.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -17,8 +17,7 @@
 * <http://www.gnu.org/licenses/>.
 *
 */
-#include <DirectXPackedVector.h>
-
+#include "RenderSystemDX.h"
 #include "Application.h"
 #if defined(TARGET_WINDOWS_DESKTOP)
 #include "cores/RetroPlayer/process/windows/RPProcessInfoWin.h"
@@ -42,13 +41,15 @@
 #include "threads/SingleLock.h"
 #include "utils/MathUtils.h"
 #include "utils/log.h"
-#include "RenderSystemDX.h"
+
+#include <DirectXPackedVector.h>
 
 extern "C" {
 #include "libavutil/pixfmt.h"
 }
 
 using namespace KODI;
+using namespace DirectX;
 using namespace DirectX::PackedVector;
 using namespace Microsoft::WRL;
 
@@ -118,22 +119,9 @@
 CheckInterlacedStereoView();
 }
 
-inline void DXWait(ID3D11Device* pDevice, ID3D11DeviceContext* pContext)
-{
- ID3D11Query* wait = nullptr;
- CD3D11_QUERY_DESC qd(D3D11_QUERY_EVENT);
- if (SUCCEEDED(pDevice->CreateQuery(&qd, &wait)))
- {
- pContext->End(wait);
- while (S_FALSE == pContext->GetData(wait, nullptr, 0, 0))
- Sleep(1);
- }
- SAFE_RELEASE(wait);
-}
-
 bool CRenderSystemDX::IsFormatSupport(DXGI_FORMAT format, unsigned int usage) const
 {
- auto pD3DDev = m_deviceResources->GetD3DDevice();
+ ComPtr<ID3D11Device1> pD3DDev = m_deviceResources->GetD3DDevice();
 UINT supported;
 pD3DDev->CheckFormatSupport(format, &supported);
 return (supported & usage) != 0;
@@ -146,7 +134,8 @@
 if (m_pGUIShader)
 {
 m_pGUIShader->End();
- SAFE_DELETE(m_pGUIShader);
+ delete m_pGUIShader;
+ m_pGUIShader = nullptr;
 }
 m_rightEyeTex.Release();
 m_BlendEnableState = nullptr;
@@ -565,12 +554,12 @@
 
 void CRenderSystemDX::OnDXDeviceLost()
 {
- DestroyRenderSystem();
+ CRenderSystemDX::DestroyRenderSystem();
 }
 
 void CRenderSystemDX::OnDXDeviceRestored()
 {
- InitRenderSystem();
+ CRenderSystemDX::InitRenderSystem();
 }
 
 void CRenderSystemDX::SetStereoMode(RENDER_STEREO_MODE mode, RENDER_STEREO_VIEW view)
@@ -669,11 +658,13 @@
 
 bool CRenderSystemDX::InitGUIShader()
 {
- SAFE_DELETE(m_pGUIShader);
+ delete m_pGUIShader;
+ m_pGUIShader = nullptr;
+
 m_pGUIShader = new CGUIShaderDX();
 if (!m_pGUIShader->Initialize())
 {
- CLog::Log(LOGERROR, __FUNCTION__ " - Failed to initialize GUI shader.");
+ CLog::LogF(LOGERROR, "Failed to initialize GUI shader.");
 return false;
 }

_service:download_files:master.tar.gz/xbmc/rendering/dx/RenderSystemDX.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/GLShader.cpp Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/GLShader.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/GUIWindowTestPatternGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/GUIWindowTestPatternGL.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/RenderSystemGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/rendering/gl/RenderSystemGL.h Changed

_service:download_files:master.tar.gz/xbmc/rendering/gles/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/rendering/gles/GLESShader.cpp Added

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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"
+
+#include "GLESShader.h"
+#include "xbmc/guilib/MatrixGLES.h"
+#include "ServiceBroker.h"
+#include "utils/log.h"
+#include "rendering/RenderSystem.h"
+#include "guilib/GraphicContext.h"
+
+using namespace Shaders;
+
+CGLESShader::CGLESShader( const char *shader ) : CGLSLShaderProgram("gles_shader.vert", shader)
+{
+ m_proj = nullptr;
+ m_model = nullptr;
+ m_clipPossible = false;
+}
+
+CGLESShader::CGLESShader(const char *vshader, const char *fshader) : CGLSLShaderProgram(vshader, fshader)
+{
+ m_proj = nullptr;
+ m_model = nullptr;
+ m_clipPossible = false;
+}
+
+void CGLESShader::OnCompiledAndLinked()
+{
+ // This is called after CompileAndLink()
+
+ // Variables passed directly to the Fragment shader
+ m_hTex0 = glGetUniformLocation(ProgramHandle(), "m_samp0");
+ m_hTex1 = glGetUniformLocation(ProgramHandle(), "m_samp1");
+ m_hUniCol = glGetUniformLocation(ProgramHandle(), "m_unicol");
+ m_hField = glGetUniformLocation(ProgramHandle(), "m_field");
+ m_hStep = glGetUniformLocation(ProgramHandle(), "m_step");
+ m_hContrast = glGetUniformLocation(ProgramHandle(), "m_contrast");
+ m_hBrightness = glGetUniformLocation(ProgramHandle(), "m_brightness");
+
+ // Variables passed directly to the Vertex shader
+ m_hProj = glGetUniformLocation(ProgramHandle(), "m_proj");
+ m_hModel = glGetUniformLocation(ProgramHandle(), "m_model");
+ m_hCoord0Matrix = glGetUniformLocation(ProgramHandle(), "m_coord0Matrix");
+
+ // Vertex attributes
+ m_hPos = glGetAttribLocation(ProgramHandle(), "m_attrpos");
+ m_hCol = glGetAttribLocation(ProgramHandle(), "m_attrcol");
+ m_hCord0 = glGetAttribLocation(ProgramHandle(), "m_attrcord0");
+ m_hCord1 = glGetAttribLocation(ProgramHandle(), "m_attrcord1");
+
+ // It's okay to do this only one time. Textures units never change.
+ glUseProgram( ProgramHandle() );
+ glUniform1i(m_hTex0, 0);
+ glUniform1i(m_hTex1, 1);
+ glUniform4f(m_hUniCol, 1.0, 1.0, 1.0, 1.0);
+
+ const float identity[16] = {
+ 1.0f, 0.0f, 0.0f, 0.0f,
+ 0.0f, 1.0f, 0.0f, 0.0f,
+ 0.0f, 0.0f, 1.0f, 0.0f,
+ 0.0f, 0.0f, 0.0f, 1.0f
+ };
+ glUniformMatrix4fv(m_hCoord0Matrix, 1, GL_FALSE, identity);
+
+ glUseProgram( 0 );
+}
+
+bool CGLESShader::OnEnabled()
+{
+ // This is called after glUseProgram()
+
+ GLfloat *projMatrix = glMatrixProject.Get().m_pMatrix;
+ GLfloat *modelMatrix = glMatrixModview.Get().m_pMatrix;
+ glUniformMatrix4fv(m_hProj, 1, GL_FALSE, projMatrix);
+ glUniformMatrix4fv(m_hModel, 1, GL_FALSE, modelMatrix);
+
+ const TransformMatrix &guiMatrix = g_graphicsContext.GetGUIMatrix();
+ CRect viewPort; // absolute positions of corners
+ CServiceBroker::GetRenderSystem().GetViewPort(viewPort);
+
+ /* glScissor operates in window coordinates. In order that we can use it to
+ * perform clipping, we must ensure that there is an independent linear
+ * transformation from the coordinate system used by CGraphicContext::ClipRect
+ * to window coordinates, separately for X and Y (in other words, no
+ * rotation or shear is introduced at any stage). To do, this, we need to
+ * check that zeros are present in the following locations:
+ *
+ * GUI matrix:
+ * / * 0 * * \
+ * | 0 * * * |
+ * \ 0 0 * * /
+ * ^ TransformMatrix::TransformX/Y/ZCoord are only ever called with
+ * input z = 0, so this column doesn't matter
+ * Model-view matrix:
+ * / * 0 0 * \
+ * | 0 * 0 * |
+ * | 0 0 * * |
+ * \ * * * * / <- eye w has no influence on window x/y (last column below
+ * is either 0 or ignored)
+ * Projection matrix:
+ * / * 0 0 0 \
+ * | 0 * 0 0 |
+ * | * * * * | <- normalised device coordinate z has no influence on window x/y
+ * \ 0 0 * 0 /
+ *
+ * Some of these zeros are not strictly required to ensure this, but they tend
+ * to be zeroed in the common case, so by checking for zeros here, we simplify
+ * the calculation of the window x/y coordinates further down the line.
+ *
+ * (Minor detail: we don't quite deal in window coordinates as defined by
+ * OpenGL, because CRenderSystemGLES::SetScissors flips the Y axis. But all
+ * that's needed to handle that is an effective negation at the stage where
+ * Y is in normalised device coordinates.)
+ */
+ m_clipPossible = guiMatrix.m[0][1] == 0 &&
+ guiMatrix.m[1][0] == 0 &&
+ guiMatrix.m[2][0] == 0 &&
+ guiMatrix.m[2][1] == 0 &&
+ modelMatrix[0+1*4] == 0 &&
+ modelMatrix[0+2*4] == 0 &&
+ modelMatrix[1+0*4] == 0 &&
+ modelMatrix[1+2*4] == 0 &&
+ modelMatrix[2+0*4] == 0 &&
+ modelMatrix[2+1*4] == 0 &&
+ projMatrix[0+1*4] == 0 &&
+ projMatrix[0+2*4] == 0 &&
+ projMatrix[0+3*4] == 0 &&
+ projMatrix[1+0*4] == 0 &&
+ projMatrix[1+2*4] == 0 &&
+ projMatrix[1+3*4] == 0 &&
+ projMatrix[3+0*4] == 0 &&
+ projMatrix[3+1*4] == 0 &&
+ projMatrix[3+3*4] == 0;
+
+ m_clipXFactor = 0.0;
+ m_clipXOffset = 0.0;
+ m_clipYFactor = 0.0;
+ m_clipYOffset = 0.0;
+
+ if (m_clipPossible)
+ {
+ m_clipXFactor = guiMatrix.m[0][0] * modelMatrix[0+0*4] * projMatrix[0+0*4];
+ m_clipXOffset = (guiMatrix.m[0][3] * modelMatrix[0+0*4] + modelMatrix[0+3*4]) * projMatrix[0+0*4];
+ m_clipYFactor = guiMatrix.m[1][1] * modelMatrix[1+1*4] * projMatrix[1+1*4];
+ m_clipYOffset = (guiMatrix.m[1][3] * modelMatrix[1+1*4] + modelMatrix[1+3*4]) * projMatrix[1+1*4];
+ float clipW = (guiMatrix.m[2][3] * modelMatrix[2+2*4] + modelMatrix[2+3*4]) * projMatrix[3+2*4];
+ float xMult = (viewPort.x2 - viewPort.x1) / (2 * clipW);
+ float yMult = (viewPort.y1 - viewPort.y2) / (2 * clipW); // correct for inverted window coordinate scheme
+ m_clipXFactor = m_clipXFactor * xMult;
+ m_clipXOffset = m_clipXOffset * xMult + (viewPort.x2 + viewPort.x1) / 2;
+ m_clipYFactor = m_clipYFactor * yMult;
+ m_clipYOffset = m_clipYOffset * yMult + (viewPort.y2 + viewPort.y1) / 2;
+ }
+
+ glUniform1f(m_hBrightness, 0.0f);
+ glUniform1f(m_hContrast, 1.0f);
+
+ return true;
+}
+
+void CGLESShader::Free()
+{
+ // Do Cleanup here
+ CGLSLShaderProgram::Free();
+}
+

_service:download_files:master.tar.gz/xbmc/rendering/gles/GLESShader.h Added

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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 "xbmc/guilib/Shader.h"
+
+class CGLESShader : public Shaders::CGLSLShaderProgram
+{
+public:
+ CGLESShader( const char *shader = 0 );
+ CGLESShader(const char *vshader, const char *fshader);
+ void OnCompiledAndLinked();
+ bool OnEnabled();
+ void Free();
+
+ GLint GetPosLoc() { return m_hPos; }
+ GLint GetColLoc() { return m_hCol; }
+ GLint GetCord0Loc() { return m_hCord0; }
+ GLint GetCord1Loc() { return m_hCord1; }
+ GLint GetUniColLoc() { return m_hUniCol; }
+ GLint GetCoord0MatrixLoc() { return m_hCoord0Matrix; }
+ GLint GetFieldLoc() { return m_hField; }
+ GLint GetStepLoc() { return m_hStep; }
+ GLint GetContrastLoc() { return m_hContrast; }
+ GLint GetBrightnessLoc() { return m_hBrightness; }
+ GLint GetModelLoc() { return m_hModel; }
+ bool HardwareClipIsPossible() { return m_clipPossible; }
+ GLfloat GetClipXFactor() { return m_clipXFactor; }
+ GLfloat GetClipXOffset() { return m_clipXOffset; }
+ GLfloat GetClipYFactor() { return m_clipYFactor; }
+ GLfloat GetClipYOffset() { return m_clipYOffset; }
+
+protected:
+ GLint m_hTex0 = 0;
+ GLint m_hTex1 = 0;
+ GLint m_hUniCol = 0;
+ GLint m_hProj = 0;
+ GLint m_hModel = 0;
+ GLint m_hPos = 0;
+ GLint m_hCol = 0;
+ GLint m_hCord0 = 0;
+ GLint m_hCord1 = 0;
+ GLint m_hCoord0Matrix = 0;
+ GLint m_hField = 0;
+ GLint m_hStep = 0;
+ GLint m_hContrast = 0;
+ GLint m_hBrightness = 0;
+
+ GLfloat *m_proj;
+ GLfloat *m_model;
+
+ bool m_clipPossible;
+ GLfloat m_clipXFactor;
+ GLfloat m_clipXOffset;
+ GLfloat m_clipYFactor;
+ GLfloat m_clipYOffset;
+};

_service:download_files:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -34,24 +34,11 @@
 #include "XTimeUtils.h"
 #endif
 
-static const char* ShaderNames[SM_ESHADERCOUNT] =
- {"guishader_frag_default.glsl",
- "guishader_frag_texture.glsl",
- "guishader_frag_multi.glsl",
- "guishader_frag_fonts.glsl",
- "guishader_frag_texture_noblend.glsl",
- "guishader_frag_multi_blendcolor.glsl",
- "guishader_frag_rgba.glsl",
- "guishader_frag_rgba_oes.glsl",
- "guishader_frag_rgba_blendcolor.glsl",
- "guishader_frag_rgba_bob.glsl",
- "guishader_frag_rgba_bob_oes.glsl"
- };
-
 CRenderSystemGLES::CRenderSystemGLES()
 : CRenderSystemBase()
 {
 m_enumRenderingSystem = RENDERING_SYSTEM_OPENGLES;
+ m_pShader.reset(new CGLESShader*[SM_MAX]);
 }
 
 CRenderSystemGLES::~CRenderSystemGLES()
@@ -81,7 +68,7 @@
 sscanf(ver, "%*s %*s %d.%d", &m_RenderVersionMajor, &m_RenderVersionMinor);
 m_RenderVersion = ver;
 }
- 
+
 // Get our driver vendor and renderer
 const char *tmpVendor = (const char*) glGetString(GL_VENDOR);
 m_RenderVendor.clear();
@@ -104,7 +91,7 @@
 m_RenderExtensions += " ";
 
 LogGraphicsInfo();
- 
+
 m_renderCaps |= RENDER_CAPS_NPOT;
 
 if (IsExtSupported("GL_EXT_texture_format_BGRA8888"))
@@ -122,11 +109,9 @@
 m_renderCaps |= RENDER_CAPS_BGRA_APPLE;
 }
 
-
-
 m_bRenderCreated = true;
- 
- InitialiseGUIShader();
+
+ InitialiseShader();
 
 return true;
 }
@@ -135,14 +120,14 @@
 {
 m_width = width;
 m_height = height;
- 
+
 glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
 CalculateMaxTexturesize();
 
 CRect rect( 0, 0, width, height );
 SetViewPort( rect );
 
- glEnable(GL_SCISSOR_TEST); 
+ glEnable(GL_SCISSOR_TEST);
 
 glMatrixProject.Clear();
 glMatrixProject->LoadIdentity();
@@ -159,30 +144,13 @@
 
 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 glEnable(GL_BLEND); // Turn Blending On
- glDisable(GL_DEPTH_TEST); 
- 
+ glDisable(GL_DEPTH_TEST);
+
 return true;
 }
 
 bool CRenderSystemGLES::DestroyRenderSystem()
 {
- CLog::Log(LOGDEBUG, "GUI Shader - Destroying Shader : %p", m_pGUIshader);
-
- if (m_pGUIshader)
- {
- for (int i = 0; i < SM_ESHADERCOUNT; i++)
- {
- if (m_pGUIshader[i])
- {
- m_pGUIshader[i]->Free();
- delete m_pGUIshader[i];
- m_pGUIshader[i] = NULL;
- }
- }
- delete[] m_pGUIshader;
- m_pGUIshader = NULL;
- }
-
 ResetScissors();
 CDirtyRegionList dirtyRegions;
 CDirtyRegion dirtyWindow(g_graphicsContext.GetViewWindow());
@@ -282,7 +250,7 @@
 
 if (!m_bRenderCreated)
 return;
- 
+
 if (enable)
 CLog::Log(LOGINFO, "GLES: Enabling VSYNC");
 else
@@ -294,7 +262,7 @@
 m_bVsyncInit = true;
 
 SetVSyncImpl(enable);
- 
+
 if (!enable)
 return;
 
@@ -329,17 +297,17 @@
 glMatrixTexture.PopLoad();
 glActiveTexture(GL_TEXTURE0);
 glEnable(GL_BLEND);
- glEnable(GL_SCISSOR_TEST); 
+ glEnable(GL_SCISSOR_TEST);
 glClear(GL_DEPTH_BUFFER_BIT);
 }
 
 void CRenderSystemGLES::SetCameraPosition(const CPoint &camera, int screenWidth, int screenHeight, float stereoFactor)
-{ 
+{
 if (!m_bRenderCreated)
 return;
- 
+
 CPoint offset = camera - CPoint(screenWidth*0.5f, screenHeight*0.5f);
- 
+
 float w = (float)m_viewPort[2]*0.5f;
 float h = (float)m_viewPort[3]*0.5f;
 
@@ -410,7 +378,7 @@
 }
 
 void CRenderSystemGLES::ApplyHardwareTransform(const TransformMatrix &finalMatrix)
-{ 
+{
 if (!m_bRenderCreated)
 return;
 
@@ -470,20 +438,20 @@
 
 bool CRenderSystemGLES::ScissorsCanEffectClipping()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->HardwareClipIsPossible();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->HardwareClipIsPossible();
 
 return false;
 }
 
 CRect CRenderSystemGLES::ClipRectToScissorRect(const CRect &rect)
 {
- if (!m_pGUIshader[m_method])
+ if (!m_pShader[m_method])
 return CRect();
- float xFactor = m_pGUIshader[m_method]->GetClipXFactor();
- float xOffset = m_pGUIshader[m_method]->GetClipXOffset();
- float yFactor = m_pGUIshader[m_method]->GetClipYFactor();
- float yOffset = m_pGUIshader[m_method]->GetClipYOffset();
+ float xFactor = m_pShader[m_method]->GetClipXFactor();
+ float xOffset = m_pShader[m_method]->GetClipXOffset();
+ float yFactor = m_pShader[m_method]->GetClipYFactor();
+ float yOffset = m_pShader[m_method]->GetClipYOffset();
 return CRect(rect.x1 * xFactor + xOffset,
 rect.y1 * yFactor + yOffset,
 rect.x2 * xFactor + xOffset,
@@ -506,141 +474,215 @@
 SetScissors(CRect(0, 0, (float)m_width, (float)m_height));
 }
 
-void CRenderSystemGLES::InitialiseGUIShader()
+void CRenderSystemGLES::InitialiseShader()
 {
- if (!m_pGUIshader)
+ m_pShader[SM_DEFAULT] = new CGLESShader("gles_shader.vert", "gles_shader_default.frag");
+ if (!m_pShader[SM_DEFAULT]->CompileAndLink())
+ {
+ m_pShader[SM_DEFAULT]->Free();
+ delete m_pShader[SM_DEFAULT];
+ m_pShader[SM_DEFAULT] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_default.frag - compile and link failed");
+ }
+
+ m_pShader[SM_TEXTURE] = new CGLESShader("gles_shader_texture.frag");
+ if (!m_pShader[SM_TEXTURE]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE]->Free();
+ delete m_pShader[SM_TEXTURE];
+ m_pShader[SM_TEXTURE] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_texture.frag - compile and link failed");
+ }
+
+ m_pShader[SM_MULTI] = new CGLESShader("gles_shader_multi.frag");
+ if (!m_pShader[SM_MULTI]->CompileAndLink())
 {
- m_pGUIshader = new CGUIShader*[SM_ESHADERCOUNT];
- for (int i = 0; i < SM_ESHADERCOUNT; i++)
+ m_pShader[SM_MULTI]->Free();
+ delete m_pShader[SM_MULTI];
+ m_pShader[SM_MULTI] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_multi.frag - compile and link failed");
+ }
+
+ m_pShader[SM_FONTS] = new CGLESShader("gles_shader_fonts.frag");
+ if (!m_pShader[SM_FONTS]->CompileAndLink())
+ {
+ m_pShader[SM_FONTS]->Free();
+ delete m_pShader[SM_FONTS];
+ m_pShader[SM_FONTS] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_fonts.frag - compile and link failed");
+ }
+
+ m_pShader[SM_TEXTURE_NOBLEND] = new CGLESShader("gles_shader_texture_noblend.frag");
+ if (!m_pShader[SM_TEXTURE_NOBLEND]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE_NOBLEND]->Free();
+ delete m_pShader[SM_TEXTURE_NOBLEND];
+ m_pShader[SM_TEXTURE_NOBLEND] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_texture_noblend.frag - compile and link failed");
+ }
+
+ m_pShader[SM_MULTI_BLENDCOLOR] = new CGLESShader("gles_shader_multi_blendcolor.frag");
+ if (!m_pShader[SM_MULTI_BLENDCOLOR]->CompileAndLink())
+ {
+ m_pShader[SM_MULTI_BLENDCOLOR]->Free();
+ delete m_pShader[SM_MULTI_BLENDCOLOR];
+ m_pShader[SM_MULTI_BLENDCOLOR] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_multi_blendcolor.frag - compile and link failed");
+ }
+
+ m_pShader[SM_TEXTURE_RGBA] = new CGLESShader("gles_shader_rgba.frag");
+ if (!m_pShader[SM_TEXTURE_RGBA]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE_RGBA]->Free();
+ delete m_pShader[SM_TEXTURE_RGBA];
+ m_pShader[SM_TEXTURE_RGBA] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_rgba.frag - compile and link failed");
+ }
+
+ m_pShader[SM_TEXTURE_RGBA_BLENDCOLOR] = new CGLESShader("gles_shader_rgba_blendcolor.frag");
+ if (!m_pShader[SM_TEXTURE_RGBA_BLENDCOLOR]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE_RGBA_BLENDCOLOR]->Free();
+ delete m_pShader[SM_TEXTURE_RGBA_BLENDCOLOR];
+ m_pShader[SM_TEXTURE_RGBA_BLENDCOLOR] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_rgba_blendcolor.frag - compile and link failed");
+ }
+
+ m_pShader[SM_TEXTURE_RGBA_BOB] = new CGLESShader("gles_shader_rgba_bob.frag");
+ if (!m_pShader[SM_TEXTURE_RGBA_BOB]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE_RGBA_BOB]->Free();
+ delete m_pShader[SM_TEXTURE_RGBA_BOB];
+ m_pShader[SM_TEXTURE_RGBA_BOB] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_rgba_bob.frag - compile and link failed");
+ }
+
+ if (IsExtSupported("GL_OES_EGL_image_external"))
+ {
+ m_pShader[SM_TEXTURE_RGBA_OES] = new CGLESShader("gles_shader_rgba_oes.frag");
+ if (!m_pShader[SM_TEXTURE_RGBA_OES]->CompileAndLink())
+ {
+ m_pShader[SM_TEXTURE_RGBA_OES]->Free();
+ delete m_pShader[SM_TEXTURE_RGBA_OES];
+ m_pShader[SM_TEXTURE_RGBA_OES] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_rgba_oes.frag - compile and link failed");
+ }
+
+
+ m_pShader[SM_TEXTURE_RGBA_BOB_OES] = new CGLESShader("gles_shader_rgba_bob_oes.frag");
+ if (!m_pShader[SM_TEXTURE_RGBA_BOB_OES]->CompileAndLink())
 {
- if (i == SM_TEXTURE_RGBA_OES || i == SM_TEXTURE_RGBA_BOB_OES)
- {
- if (!IsExtSupported("GL_OES_EGL_image_external"))
- {
- m_pGUIshader[i] = NULL;
- continue;
- }
- }
-
- m_pGUIshader[i] = new CGUIShader( ShaderNames[i] );
-
- if (!m_pGUIshader[i]->CompileAndLink())
- {
- m_pGUIshader[i]->Free();
- delete m_pGUIshader[i];
- m_pGUIshader[i] = NULL;
- CLog::Log(LOGERROR, "GUI Shader [%s] - Initialise failed", ShaderNames[i]);
- }
- else
- {
- CLog::Log(LOGDEBUG, "GUI Shader [%s]- Initialise successful : %p", ShaderNames[i], m_pGUIshader[i]);
- }
+ m_pShader[SM_TEXTURE_RGBA_BOB_OES]->Free();
+ delete m_pShader[SM_TEXTURE_RGBA_BOB_OES];
+ m_pShader[SM_TEXTURE_RGBA_BOB_OES] = nullptr;
+ CLog::Log(LOGERROR, "GUI Shader gles_shader_rgba_bob_oes.frag - compile and link failed");
 }
 }
 else
 {
- CLog::Log(LOGDEBUG, "GUI Shader - Tried to Initialise again. Was this intentional?");
+ m_pShader[SM_TEXTURE_RGBA_OES] = nullptr;
+ m_pShader[SM_TEXTURE_RGBA_BOB_OES] = nullptr;
 }
 }
 
 void CRenderSystemGLES::EnableGUIShader(ESHADERMETHOD method)
 {
 m_method = method;
- if (m_pGUIshader[m_method])
+ if (m_pShader[m_method])
 {
- m_pGUIshader[m_method]->Enable();
+ m_pShader[m_method]->Enable();
 }
 else
 {
- CLog::Log(LOGERROR, "Invalid GUI Shader selected - [%s]", ShaderNames[(int)method]);
+ CLog::Log(LOGERROR, "Invalid GUI Shader selected - %d", method);
 }
 }
 
 void CRenderSystemGLES::DisableGUIShader()
 {
- if (m_pGUIshader[m_method])
+ if (m_pShader[m_method])
 {
- m_pGUIshader[m_method]->Disable();
+ m_pShader[m_method]->Disable();
 }
 m_method = SM_DEFAULT;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetPos()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetPosLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetPosLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetCol()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetColLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetColLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetCoord0()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetCord0Loc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetCord0Loc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetCoord1()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetCord1Loc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetCord1Loc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetUniCol()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetUniColLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetUniColLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetCoord0Matrix()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetCoord0MatrixLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetCoord0MatrixLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetField()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetFieldLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetFieldLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetStep()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetStepLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetStepLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetContrast()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetContrastLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetContrastLoc();
 
 return -1;
 }
 
 GLint CRenderSystemGLES::GUIShaderGetBrightness()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetBrightnessLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetBrightnessLoc();
 
 return -1;
 }
@@ -660,8 +702,8 @@
 
 GLint CRenderSystemGLES::GUIShaderGetModel()
 {
- if (m_pGUIshader[m_method])
- return m_pGUIshader[m_method]->GetModelLoc();
+ if (m_pShader[m_method])
+ return m_pShader[m_method]->GetModelLoc();
 
 return -1;
 }

_service:download_files:master.tar.gz/xbmc/rendering/gles/RenderSystemGLES.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,7 +23,7 @@
 #include "system.h"
 #include "system_gl.h"
 #include "rendering/RenderSystem.h"
-#include "xbmc/guilib/GUIShader.h"
+#include "GLESShader.h"
 
 enum ESHADERMETHOD
 {
@@ -38,7 +38,7 @@
 SM_TEXTURE_RGBA_BLENDCOLOR,
 SM_TEXTURE_RGBA_BOB,
 SM_TEXTURE_RGBA_BOB_OES,
- SM_ESHADERCOUNT
+ SM_MAX
 };
 
 class CRenderSystemGLES : public CRenderSystemBase
@@ -81,7 +81,9 @@
 
 void Project(float &x, float &y, float &z) override;
 
- void InitialiseGUIShader();
+ std::string GetShaderPath(const std::string &filename) override { return "GLES/2.0/"; }
+
+ void InitialiseShader();
 void EnableGUIShader(ESHADERMETHOD method);
 void DisableGUIShader();
 
@@ -110,8 +112,8 @@
 
 std::string m_RenderExtensions;
 
- CGUIShader **m_pGUIshader = nullptr; // One GUI shader for each method
- ESHADERMETHOD m_method = SM_DEFAULT; // Current GUI Shader method
+ std::unique_ptr<CGLESShader*[]> m_pShader;
+ ESHADERMETHOD m_method = SM_DEFAULT;
 
 GLint m_viewPort[4];
 };

_service:download_files:master.tar.gz/xbmc/settings/AdvancedSettings.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -60,8 +60,10 @@
 
 void CAdvancedSettings::OnSettingsLoaded()
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // load advanced settings
- Load();
+ Load(profileManager);
 
 // default players?
 CLog::Log(LOGNOTICE, "Default Video Player: %s", m_videoDefaultPlayer.c_str());
@@ -378,10 +380,10 @@
 m_databaseMusic.Reset();
 m_databaseVideo.Reset();
 
- m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.cbr|.rar|.rss|.webp|.jp2|.apng";
- m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.gdm|.imf|.m15|.sfx|.uni|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.rar|.wv|.dsp|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.wtv|.mka|.tak|.opus|.dff|.dsf|.m4b";
- m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.udf|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.rar|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|.trp|.f4v";
- m_subtitlesExtensions = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.text|.ssa|.aqt|.jss|.ass|.idx|.ifo|.rar|.zip";
+ m_pictureExtensions = ".png|.jpg|.jpeg|.bmp|.gif|.ico|.tif|.tiff|.tga|.pcx|.cbz|.zip|.rss|.webp|.jp2|.apng";
+ m_musicExtensions = ".nsv|.m4a|.flac|.aac|.strm|.pls|.rm|.rma|.mpa|.wav|.wma|.ogg|.mp3|.mp2|.m3u|.gdm|.imf|.m15|.sfx|.uni|.ac3|.dts|.cue|.aif|.aiff|.wpl|.ape|.mac|.mpc|.mp+|.mpp|.shn|.zip|.wv|.dsp|.xsp|.xwav|.waa|.wvs|.wam|.gcm|.idsp|.mpdsp|.mss|.spt|.rsd|.sap|.cmc|.cmr|.dmc|.mpt|.mpd|.rmt|.tmc|.tm8|.tm2|.oga|.url|.pxml|.tta|.rss|.wtv|.mka|.tak|.opus|.dff|.dsf|.m4b";
+ m_videoExtensions = ".m4v|.3g2|.3gp|.nsv|.tp|.ts|.ty|.strm|.pls|.rm|.rmvb|.mpd|.m3u|.m3u8|.ifo|.mov|.qt|.divx|.xvid|.bivx|.vob|.nrg|.img|.iso|.udf|.pva|.wmv|.asf|.asx|.ogm|.m2v|.avi|.bin|.dat|.mpg|.mpeg|.mp4|.mkv|.mk3d|.avc|.vp3|.svq3|.nuv|.viv|.dv|.fli|.flv|.001|.wpl|.zip|.vdr|.dvr-ms|.xsp|.mts|.m2t|.m2ts|.evo|.ogv|.sdp|.avs|.rec|.url|.pxml|.vc1|.h264|.rcv|.rss|.mpls|.webm|.bdmv|.wtv|.trp|.f4v";
+ m_subtitlesExtensions = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.text|.ssa|.aqt|.jss|.ass|.idx|.ifo|.zip";
 m_discStubExtensions = ".disc";
 // internal music extensions
 m_musicExtensions += "|.cdda";
@@ -405,7 +407,7 @@
 m_initialized = true;
 }
 
-bool CAdvancedSettings::Load()
+bool CAdvancedSettings::Load(const CProfilesManager &profileManager)
 {
 // NOTE: This routine should NOT set the default of any of these parameters
 // it should instead use the versions of GetString/Integer/Float that
@@ -414,7 +416,8 @@
 ParseSettingsFile("special://xbmc/system/advancedsettings.xml");
 for (unsigned int i = 0; i < m_settingsFiles.size(); i++)
 ParseSettingsFile(m_settingsFiles[i]);
- ParseSettingsFile(CProfilesManager::GetInstance().GetUserDataItem("advancedsettings.xml"));
+
+ ParseSettingsFile(profileManager.GetUserDataItem("advancedsettings.xml"));
 
 // Add the list of disc stub extensions (if any) to the list of video extensions
 if (!m_discStubExtensions.empty())

_service:download_files:master.tar.gz/xbmc/settings/AdvancedSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/DiscSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/DiscSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/DisplaySettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/DisplaySettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/MediaSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/MediaSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/MediaSourceSettings.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -32,6 +32,7 @@
 #include "utils/XBMCTinyXML.h"
 #include "utils/XMLUtils.h"
 #include "network/WakeOnAccess.h"
+#include "ServiceBroker.h"
 
 #define SOURCES_FILE  "sources.xml"
 #define XML_SOURCES   "sources"
@@ -54,11 +55,13 @@
 
 std::string CMediaSourceSettings::GetSourcesFile()
 {
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
   std::string file;
-  if (CProfilesManager::GetInstance().GetCurrentProfile().hasSources())
-    file = CProfilesManager::GetInstance().GetProfileUserDataFolder();
+  if (profileManager.GetCurrentProfile().hasSources())
+    file = profileManager.GetProfileUserDataFolder();
   else
-    file = CProfilesManager::GetInstance().GetUserDataFolder();
+    file = profileManager.GetUserDataFolder();
 
   return URIUtils::AddFileToFolder(file, SOURCES_FILE);
 }

_service:download_files:master.tar.gz/xbmc/settings/MediaSourceSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingAddon.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingAddon.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingConditions.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -125,52 +125,52 @@
 
 bool ProfileCanWriteDatabase(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases();
+ return CSettingConditions::GetCurrentProfile().canWriteDatabases();
 }
 
 bool ProfileCanWriteSources(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources();
+ return CSettingConditions::GetCurrentProfile().canWriteSources();
 }
 
 bool ProfileHasAddons(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().hasAddons();
+ return CSettingConditions::GetCurrentProfile().hasAddons();
 }
 
 bool ProfileHasDatabase(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().hasDatabases();
+ return CSettingConditions::GetCurrentProfile().hasDatabases();
 }
 
 bool ProfileHasSources(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().hasSources();
+ return CSettingConditions::GetCurrentProfile().hasSources();
 }
 
 bool ProfileHasAddonManagerLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().addonmanagerLocked();
+ return CSettingConditions::GetCurrentProfile().addonmanagerLocked();
 }
 
 bool ProfileHasFilesLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().filesLocked();
+ return CSettingConditions::GetCurrentProfile().filesLocked();
 }
 
 bool ProfileHasMusicLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().musicLocked();
+ return CSettingConditions::GetCurrentProfile().musicLocked();
 }
 
 bool ProfileHasPicturesLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().picturesLocked();
+ return CSettingConditions::GetCurrentProfile().picturesLocked();
 }
 
 bool ProfileHasProgramsLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().programsLocked();
+ return CSettingConditions::GetCurrentProfile().programsLocked();
 }
 
 bool ProfileHasSettingsLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
@@ -184,12 +184,12 @@
 slValue = LOCK_LEVEL::ADVANCED;
 else if (StringUtils::EqualsNoCase(value, "expert"))
 slValue = LOCK_LEVEL::EXPERT;
- return slValue <= CProfilesManager::GetInstance().GetCurrentProfile().settingsLockLevel();
+ return slValue <= CSettingConditions::GetCurrentProfile().settingsLockLevel();
 }
 
 bool ProfileHasVideosLocked(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
 {
- return CProfilesManager::GetInstance().GetCurrentProfile().videoLocked();
+ return CSettingConditions::GetCurrentProfile().videoLocked();
 }
 
 bool ProfileLockMode(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
@@ -199,7 +199,7 @@
 if (tmp != NULL && *tmp != '\0')
 return false;
 
- return CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() == lock;
+ return CSettingConditions::GetCurrentProfile().getLockMode() == lock;
 }
 
 bool GreaterThan(const std::string &condition, const std::string &value, SettingConstPtr setting, void *data)
@@ -270,14 +270,17 @@
 return lhs <= rhs;
 }
 
+const CProfilesManager *CSettingConditions::m_profileManager = nullptr;
 std::set<std::string> CSettingConditions::m_simpleConditions;
 std::map<std::string, SettingConditionCheck> CSettingConditions::m_complexConditions;
 
-void CSettingConditions::Initialize()
+void CSettingConditions::Initialize(const CProfilesManager &profileManager)
 {
 if (!m_simpleConditions.empty())
 return;
 
+ m_profileManager = &profileManager;
+
 // add simple conditions
 m_simpleConditions.insert("true");
 #ifdef HAS_UPNP
@@ -388,6 +391,20 @@
 m_complexConditions.insert(std::pair<std::string, SettingConditionCheck>("pvrsettingvisible", PVR::CPVRSettings::IsSettingVisible));
 }
 
+void CSettingConditions::Deinitialize()
+{
+ m_profileManager = nullptr;
+}
+
+const CProfile& CSettingConditions::GetCurrentProfile()
+{
+ if (m_profileManager)
+ return m_profileManager->GetCurrentProfile();
+
+ static CProfile emptyProfile;
+ return emptyProfile;
+}
+
 bool CSettingConditions::Check(const std::string &condition, const std::string &value /* = "" */, SettingConstPtr setting /* = NULL */)
 {
 if (m_simpleConditions.find(condition) != m_simpleConditions.end())

_service:download_files:master.tar.gz/xbmc/settings/SettingConditions.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2014 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,10 +24,16 @@
 
 #include "settings/lib/SettingConditions.h"
 
+class CProfile;
+class CProfilesManager;
+
 class CSettingConditions
 {
 public:
- static void Initialize();
+ static void Initialize(const CProfilesManager &profileManager);
+ static void Deinitialize();
+
+ static const CProfile& GetCurrentProfile();
 
 static const std::set<std::string>& GetSimpleConditions() { return m_simpleConditions; }
 static const std::map<std::string, SettingConditionCheck>& GetComplexConditions() { return m_complexConditions; }
@@ -35,6 +41,9 @@
 static bool Check(const std::string &condition, const std::string &value = "", std::shared_ptr<const CSetting> setting = NULL);
 
 private:
+ // Initialization parameters
+ static const CProfilesManager *m_profileManager;
+
 static std::set<std::string> m_simpleConditions;
 static std::map<std::string, SettingConditionCheck> m_complexConditions;
 };

_service:download_files:master.tar.gz/xbmc/settings/SettingControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingControl.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingCreator.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingCreator.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingDateTime.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingDateTime.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingPath.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingPath.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingUtils.h Changed

_service:download_files:master.tar.gz/xbmc/settings/Settings.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,7 +25,6 @@
 #include "Autorun.h"
 #include "LangInfo.h"
 #include "Util.h"
-#include "events/EventLog.h"
 #include "addons/AddonSystemSettings.h"
 #include "addons/Skin.h"
 #include "cores/playercorefactory/PlayerCoreFactory.h"
@@ -433,15 +432,6 @@
 const std::string CSettings::SETTING_SOURCE_VIDEOS = "source.videos";
 const std::string CSettings::SETTING_SOURCE_MUSIC = "source.music";
 const std::string CSettings::SETTING_SOURCE_PICTURES = "source.pictures";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERS = "gameskeyboard.keyboardplayers";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_1 = "gameskeyboard.keyboardplayerconfig1";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_2 = "gameskeyboard.keyboardplayerconfig2";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_3 = "gameskeyboard.keyboardplayerconfig3";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_4 = "gameskeyboard.keyboardplayerconfig4";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_5 = "gameskeyboard.keyboardplayerconfig5";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_6 = "gameskeyboard.keyboardplayerconfig6";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_7 = "gameskeyboard.keyboardplayerconfig7";
-const std::string CSettings::SETTING_GAMES_KEYBOARD_PLAYERCONFIG_8 = "gameskeyboard.keyboardplayerconfig8";
 const std::string CSettings::SETTING_GAMES_ENABLE = "gamesgeneral.enable";
 const std::string CSettings::SETTING_GAMES_ENABLEREWIND = "gamesgeneral.enablerewind";
 const std::string CSettings::SETTING_GAMES_REWINDTIME = "gamesgeneral.rewindtime";
@@ -479,7 +469,9 @@
 
 bool CSettings::Load()
 {
- return Load(CProfilesManager::GetInstance().GetSettingsFile());
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ return Load(profileManager.GetSettingsFile());
 }
 
 bool CSettings::Load(const std::string &file)
@@ -505,7 +497,9 @@
 
 bool CSettings::Save()
 {
- return Save(CProfilesManager::GetInstance().GetSettingsFile());
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ return Save(profileManager.GetSettingsFile());
 }
 
 bool CSettings::Save(const std::string &file)
@@ -656,7 +650,6 @@
 #endif // defined(TARGET_POSIX)
 
 #if defined(TARGET_WINDOWS)
- std::static_pointer_cast<CSettingString>(GetSettingsManager()->GetSetting(CSettings::SETTING_MUSICPLAYER_VISUALISATION))->SetDefault("visualization.milkdrop");
 // We prefer a fake fullscreen mode (window covering the screen rather than dedicated fullscreen)
 // as it works nicer with switching to other applications. However on some systems vsync is broken
 // when we do this (eg non-Aero on ATI in particular) and on others (AppleTV) we can't get XBMC to
@@ -764,7 +757,9 @@
 
 void CSettings::InitializeConditions()
 {
- CSettingConditions::Initialize();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ CSettingConditions::Initialize(profileManager);
 
 // add basic conditions
 const std::set<std::string> &simpleConditions = CSettingConditions::GetSimpleConditions();
@@ -777,14 +772,17 @@
 GetSettingsManager()->AddCondition(itCondition->first, itCondition->second);
 }
 
+void CSettings::UninitializeConditions()
+{
+ CSettingConditions::Deinitialize();
+}
+
 void CSettings::InitializeISettingsHandlers()
 {
 // register ISettingsHandler implementations
 // The order of these matters! Handlers are processed in the order they were registered.
 GetSettingsManager()->RegisterSettingsHandler(&g_advancedSettings);
 GetSettingsManager()->RegisterSettingsHandler(&CMediaSourceSettings::GetInstance());
- GetSettingsManager()->RegisterSettingsHandler(&CPlayerCoreFactory::GetInstance());
- GetSettingsManager()->RegisterSettingsHandler(&CProfilesManager::GetInstance());
 #ifdef HAS_UPNP
 GetSettingsManager()->RegisterSettingsHandler(&CUPnPSettings::GetInstance());
 #endif
@@ -801,7 +799,6 @@
 void CSettings::UninitializeISettingsHandlers()
 {
 // unregister ISettingCallback implementations
- GetSettingsManager()->UnregisterCallback(&CEventLog::GetInstance());
 GetSettingsManager()->UnregisterCallback(&g_advancedSettings);
 GetSettingsManager()->UnregisterCallback(&CMediaSettings::GetInstance());
 GetSettingsManager()->UnregisterCallback(&CDisplaySettings::GetInstance());
@@ -849,10 +846,6 @@
 {
 // register any ISettingCallback implementations
 std::set<std::string> settingSet;
- settingSet.insert(CSettings::SETTING_EVENTLOG_SHOW);
- GetSettingsManager()->RegisterCallback(&CEventLog::GetInstance(), settingSet);
-
- settingSet.clear();
 settingSet.insert(CSettings::SETTING_DEBUG_SHOWLOGINFO);
 settingSet.insert(CSettings::SETTING_DEBUG_EXTRALOGGING);
 settingSet.insert(CSettings::SETTING_DEBUG_SETEXTRALOGLEVEL);
@@ -1011,7 +1004,6 @@
 
 void CSettings::UninitializeISettingCallbacks()
 {
- GetSettingsManager()->UnregisterCallback(&CEventLog::GetInstance());
 GetSettingsManager()->UnregisterCallback(&g_advancedSettings);
 GetSettingsManager()->UnregisterCallback(&CMediaSettings::GetInstance());
 GetSettingsManager()->UnregisterCallback(&CDisplaySettings::GetInstance());
@@ -1038,7 +1030,10 @@
 
 bool CSettings::Reset()
 {
- std::string settingsFile = CProfilesManager::GetInstance().GetSettingsFile();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string settingsFile = profileManager.GetSettingsFile();
+
 // try to delete the settings file
 if (XFILE::CFile::Exists(settingsFile, false) && !XFILE::CFile::Delete(settingsFile))
 CLog::Log(LOGWARNING, "Unable to delete old settings file at %s", settingsFile.c_str());

_service:download_files:master.tar.gz/xbmc/settings/Settings.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -384,15 +384,6 @@
   static const std::string SETTING_SOURCE_VIDEOS;
   static const std::string SETTING_SOURCE_MUSIC;
   static const std::string SETTING_SOURCE_PICTURES;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERS;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_1;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_2;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_3;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_4;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_5;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_6;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_7;
-  static const std::string SETTING_GAMES_KEYBOARD_PLAYERCONFIG_8;
   static const std::string SETTING_GAMES_ENABLE;
   static const std::string SETTING_GAMES_ENABLEREWIND;
   static const std::string SETTING_GAMES_REWINDTIME;
@@ -466,6 +457,7 @@
   void InitializeOptionFillers() override;
   void UninitializeOptionFillers() override;
   void InitializeConditions() override;
+  void UninitializeConditions() override;
   void InitializeVisibility() override;
   void InitializeDefaults() override;
   void InitializeISettingsHandlers() override;

_service:download_files:master.tar.gz/xbmc/settings/SettingsBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SettingsBase.h Changed

_service:download_files:master.tar.gz/xbmc/settings/SkinSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/SkinSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogAudioDSPSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogContentSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogContentSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogLibExportSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISetting.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISetting.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingCallback.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingControl.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingControlCreator.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingCreator.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISettingsHandler.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/ISubSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/Setting.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/Setting.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingCategoryAccess.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingCategoryAccess.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingConditions.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingConditions.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingDefinitions.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingDependency.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingDependency.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingLevel.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingRequirement.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingRequirement.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingSection.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingSection.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingType.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingUpdate.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingUpdate.h Changed

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingsManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -30,6 +30,9 @@
 #include "utils/StringUtils.h"
 #include "utils/XBMCTinyXML.h"
 
+const uint32_t CSettingsManager::Version = 2;
+const uint32_t CSettingsManager::MinimumSupportedVersion = 0;
+
 bool ParseSettingIdentifier(const std::string& settingId, std::string& categoryTag, std::string& settingTag)
 {
   static const std::string Separator = ".";
@@ -418,7 +421,7 @@
 
   auto creatorIt = m_settingCreators.find(settingType);
   if (creatorIt == m_settingCreators.end())
-    m_settingCreators.insert(make_pair(settingType, settingCreator));
+    m_settingCreators.insert(std::make_pair(settingType, settingCreator));
 }
 
 void CSettingsManager::RegisterSettingControl(const std::string &controlType, ISettingControlCreator *settingControlCreator)
@@ -429,7 +432,7 @@
   CExclusiveLock lock(m_critical);
   auto creatorIt = m_settingControlCreators.find(controlType);
   if (creatorIt == m_settingControlCreators.end())
-    m_settingControlCreators.insert(make_pair(controlType, settingControlCreator));
+    m_settingControlCreators.insert(std::make_pair(controlType, settingControlCreator));
 }
 
 void CSettingsManager::RegisterSettingsHandler(ISettingsHandler *settingsHandler)

_service:download_files:master.tar.gz/xbmc/settings/lib/SettingsManager.h Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIControlSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIControlSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettings.h Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettingsCategory.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettingsCategory.h Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowTestPattern.cpp Changed

_service:download_files:master.tar.gz/xbmc/settings/windows/GUIWindowTestPattern.h Changed

_service:download_files:master.tar.gz/xbmc/storage/AutorunMediaJob.h Changed

_service:download_files:master.tar.gz/xbmc/storage/DetectDVDType.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/IStorageProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/IoSupport.cpp Changed

@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Frodo
 * Portions Copyright (c) by the authors of ffmpeg and xvid
 * Copyright (C) 2002-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -69,7 +69,7 @@
 using namespace MEDIA_DETECT;
 #endif
 
-PVOID CIoSupport::m_rawXferBuffer;
+void* CIoSupport::m_rawXferBuffer;
 
 HANDLE CIoSupport::OpenCDROM()
 {
@@ -111,7 +111,7 @@
 #endif
 }
 
-INT CIoSupport::ReadSector(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CIoSupport::ReadSector(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 
 {
 DWORD dwRead;
@@ -168,7 +168,7 @@
 }
 #endif
 LARGE_INTEGER Displacement;
- Displacement.QuadPart = ((INT64)dwSector) * dwSectorSize;
+ Displacement.QuadPart = static_cast<long long>(dwSector) * dwSectorSize;
 
 for (int i = 0; i < 5; i++)
 {
@@ -187,7 +187,7 @@
 }
 
 
-INT CIoSupport::ReadSectorMode2(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CIoSupport::ReadSectorMode2(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 {
 #ifdef HAS_DVD_DRIVE
 #if defined(TARGET_DARWIN)
@@ -281,12 +281,12 @@
 return -1;
 }
 
-INT CIoSupport::ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CIoSupport::ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 {
 return -1;
 }
 
-VOID CIoSupport::CloseCDROM(HANDLE hDevice)
+void CIoSupport::CloseCDROM(HANDLE hDevice)
 {
 CloseHandle(hDevice);
 }

_service:download_files:master.tar.gz/xbmc/storage/IoSupport.h Changed

@@ -2,7 +2,7 @@
  *      Copyright (c) 2002 Frodo
  *      Portions Copyright (c) by the authors of ffmpeg and xvid
  *      Copyright (C) 2002-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -44,13 +44,13 @@
   static void FreeReadBuffer();
 
   static HANDLE OpenCDROM();
-  static INT ReadSector(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer);
-  static INT ReadSectorMode2(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer);
-  static INT ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer);
-  static VOID CloseCDROM(HANDLE hDevice);
+  static int ReadSector(HANDLE hDevice, DWORD dwSector, char* lpczBuffer);
+  static int ReadSectorMode2(HANDLE hDevice, DWORD dwSector, char* lpczBuffer);
+  static int ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, char* lpczBuffer);
+  static void CloseCDROM(HANDLE hDevice);
 
 private:
-  static PVOID m_rawXferBuffer;
+  static void* m_rawXferBuffer;
 };
 
 #endif // !defined(AFX_IOSUPPORT_H__F084A488_BD6E_49D5_8CD3_0BE62149DB40__INCLUDED_)

_service:download_files:master.tar.gz/xbmc/storage/MediaManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -52,25 +52,12 @@
 #include "AutorunMediaJob.h"
 
 #include "filesystem/File.h"
-
 #include "cores/VideoPlayer/DVDInputStreams/DVDInputStreamNavigator.h"
 
-#if defined(TARGET_DARWIN)
-#include "osx/DarwinStorageProvider.h"
-#elif defined(TARGET_ANDROID)
-#include "android/AndroidStorageProvider.h"
-#elif defined(TARGET_FREEBSD)
-#include "linux/LinuxStorageProvider.h"
-#elif defined(TARGET_POSIX)
-#include "linux/LinuxStorageProvider.h"
+#if defined(TARGET_POSIX) && !defined(TARGET_DARWIN) && !defined(TARGET_FREEBSD)
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
-#elif TARGET_WINDOWS_DESKTOP
-#include "windows/Win32StorageProvider.h"
-#elif TARGET_WINDOWS_STORE
-#include "win10/Win10StorageProvider.h"
 #endif
-
 #include <string>
 #include <vector>
 
@@ -107,17 +94,7 @@
 {
 if (!m_platformStorage)
 {
- #if defined(TARGET_DARWIN)
- m_platformStorage = new CDarwinStorageProvider();
- #elif defined(TARGET_ANDROID)
- m_platformStorage = new CAndroidStorageProvider();
- #elif defined(TARGET_POSIX)
- m_platformStorage = new CLinuxStorageProvider();
- #elif TARGET_WINDOWS_DESKTOP
- m_platformStorage = new CWin32StorageProvider();
- #elif TARGET_WINDOWS_STORE
- m_platformStorage = new CStorageProvider();
- #endif
+ m_platformStorage = IStorageProvider::CreateInstance();
 }
 #ifdef HAS_DVD_DRIVE
 m_strFirstAvailDrive = m_platformStorage->GetFirstOpticalDeviceFileName();
@@ -606,7 +583,7 @@
 m_platformStorage->GetRemovableDrives(drives);
 for(unsigned i = 0; i < drives.size(); ++i)
 {
- if(drives[i].m_iDriveType == CMediaSource::SOURCE_TYPE_DVD)
+ if(drives[i].m_iDriveType == CMediaSource::SOURCE_TYPE_DVD && !drives[i].strPath.empty())
 return drives[i].strPath;
 }

_service:download_files:master.tar.gz/xbmc/storage/MediaManager.h Changed

_service:download_files:master.tar.gz/xbmc/storage/android/AndroidStorageProvider.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2012-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -59,6 +59,11 @@
 "/mnt/media_rw"
 };
 
+IStorageProvider* IStorageProvider::CreateInstance()
+{
+ return new CAndroidStorageProvider();
+}
+
 CAndroidStorageProvider::CAndroidStorageProvider()
 {
 PumpDriveChangeEvents(NULL);
@@ -280,28 +285,47 @@
 
 // What mount points are rejected
 for (unsigned int i=0; i < ARRAY_SIZE(mountBL); ++i)
+ {
 if (StringUtils::StartsWithNoCase(mountStr, mountBL[i]))
+ {
 bl_ok = false;
+ break;
+ }
+ }
 
 if (bl_ok)
 {
 // What filesystems are accepted
 bool fsok = false;
 for (unsigned int i=0; i < ARRAY_SIZE(typeWL); ++i)
+ {
 if (StringUtils::StartsWithNoCase(fsStr, typeWL[i]))
- continue;
-
+ {
+ fsok = true;
+ break;
+ }
+ }
 // What devices are accepted
 bool devok = false;
 for (unsigned int i=0; i < ARRAY_SIZE(deviceWL); ++i)
+ {
 if (StringUtils::StartsWithNoCase(deviceStr, deviceWL[i]))
+ {
 devok = true;
+ break;
+ }
+ }
 
 // What mount points are accepted
 bool mountok = false;
 for (unsigned int i=0; i < ARRAY_SIZE(mountWL); ++i)
+ {
 if (StringUtils::StartsWithNoCase(mountStr, mountWL[i]))
+ {
 mountok = true;
+ break;
+ }
+ }
 
 if(devok && (fsok || mountok))
 {

_service:download_files:master.tar.gz/xbmc/storage/android/AndroidStorageProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/cdioSupport.cpp Changed

@@ -23,7 +23,7 @@
 #include "cdioSupport.h"
 #include "threads/SingleLock.h"
 #include "utils/log.h"
-#include "utils/Environment.h"
+#include "platform/Environment.h"
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/util.h>
@@ -284,7 +284,7 @@
 return reinterpret_cast<HANDLE>(cdio);
 }
 
-INT CCdIoSupport::ReadSector(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CCdIoSupport::ReadSector(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 {
 CSingleLock lock(*m_cdio);
 
@@ -298,7 +298,7 @@
 return -1;
 }
 
-INT CCdIoSupport::ReadSectorMode2(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CCdIoSupport::ReadSectorMode2(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 {
 CSingleLock lock(*m_cdio);
 
@@ -312,7 +312,7 @@
 return -1;
 }
 
-INT CCdIoSupport::ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, LPSTR lpczBuffer)
+int CCdIoSupport::ReadSectorCDDA(HANDLE hDevice, DWORD dwSector, char* lpczBuffer)
 {
 CSingleLock lock(*m_cdio);
 
@@ -326,7 +326,7 @@
 return -1;
 }
 
-VOID CCdIoSupport::CloseCDROM(HANDLE hDevice)
+void CCdIoSupport::CloseCDROM(HANDLE hDevice)
 {
 CSingleLock lock(*m_cdio);
 
@@ -468,7 +468,7 @@
 unsigned int track_sec_count = ::cdio_get_track_sec_count(cdio, track_num);
 memset(buffer[bufnum], 0, CDIO_CD_FRAMESIZE);
 
- if ( track_sec_count < (UINT)superblock)
+ if ( track_sec_count < static_cast<unsigned int>(superblock))
 {
 ::cdio_debug("reading block %u skipped track %d has only %u sectors\n",
 superblock, track_num, track_sec_count);
@@ -908,7 +908,7 @@
 }
 
 // Return the number of seconds (discarding frame portion) of an MSF
-UINT CCdIoSupport::MsfSeconds(msf_t *msf)
+unsigned int CCdIoSupport::MsfSeconds(msf_t *msf)
 {
 CSingleLock lock(*m_cdio);

_service:download_files:master.tar.gz/xbmc/storage/cdioSupport.h Changed

_service:download_files:master.tar.gz/xbmc/storage/linux/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/storage/linux/LinuxStorageProvider.cpp Added

@@ -0,0 +1,100 @@
+/*
+ * 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 "LinuxStorageProvider.h"
+#include "guilib/LocalizeStrings.h"
+#include "UDevProvider.h"
+#ifdef HAS_DBUS
+#include "UDisksProvider.h"
+#endif
+#include "PosixMountProvider.h"
+
+IStorageProvider* IStorageProvider::CreateInstance()
+{
+ return new CLinuxStorageProvider();
+}
+
+CLinuxStorageProvider::CLinuxStorageProvider()
+{
+ m_instance = NULL;
+
+#ifdef HAS_DBUS
+ if (CUDisksProvider::HasUDisks())
+ m_instance = new CUDisksProvider();
+#endif
+#ifdef HAVE_LIBUDEV
+ if (m_instance == NULL)
+ m_instance = new CUDevProvider();
+#endif
+
+ if (m_instance == NULL)
+ m_instance = new CPosixMountProvider();
+}
+
+CLinuxStorageProvider::~CLinuxStorageProvider()
+{
+ delete m_instance;
+}
+
+void CLinuxStorageProvider::Initialize()
+{
+ m_instance->Initialize();
+}
+
+void CLinuxStorageProvider::Stop()
+{
+ m_instance->Stop();
+}
+
+void CLinuxStorageProvider::GetLocalDrives(VECSOURCES &localDrives)
+{
+ // Home directory
+ CMediaSource share;
+ share.strPath = getenv("HOME");
+ share.strName = g_localizeStrings.Get(21440);
+ share.m_ignore = true;
+ share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
+ localDrives.push_back(share);
+ share.strPath = "/";
+ share.strName = g_localizeStrings.Get(21453);
+ localDrives.push_back(share);
+
+ m_instance->GetLocalDrives(localDrives);
+}
+
+void CLinuxStorageProvider::GetRemovableDrives(VECSOURCES &removableDrives)
+{
+ m_instance->GetRemovableDrives(removableDrives);
+}
+
+bool CLinuxStorageProvider::Eject(const std::string& mountpath)
+{
+ return m_instance->Eject(mountpath);
+}
+
+std::vector<std::string> CLinuxStorageProvider::GetDiskUsage()
+{
+ return m_instance->GetDiskUsage();
+}
+
+bool CLinuxStorageProvider::PumpDriveChangeEvents(IStorageEventsCallback *callback)
+{
+ return m_instance->PumpDriveChangeEvents(callback);
+}

_service:download_files:master.tar.gz/xbmc/storage/linux/LinuxStorageProvider.h Changed

@@ -1,7 +1,7 @@
 #pragma once
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,84 +20,21 @@
 */
 
 #include <vector>
-
 #include "storage/IStorageProvider.h"
-#include "UDevProvider.h"
-#ifdef HAS_DBUS
-#include "UDisksProvider.h"
-#endif
-#include "PosixMountProvider.h"
 
 class CLinuxStorageProvider : public IStorageProvider
 {
 public:
- CLinuxStorageProvider()
- {
- m_instance = NULL;
-
-#ifdef HAS_DBUS
- if (CUDisksProvider::HasUDisks())
- m_instance = new CUDisksProvider();
-#endif
-#ifdef HAVE_LIBUDEV
- if (m_instance == NULL)
- m_instance = new CUDevProvider();
-#endif
-
- if (m_instance == NULL)
- m_instance = new CPosixMountProvider();
- }
-
- ~CLinuxStorageProvider() override
- {
- delete m_instance;
- }
-
- void Initialize() override
- {
- m_instance->Initialize();
- }
-
- void Stop() override
- {
- m_instance->Stop();
- }
-
- void GetLocalDrives(VECSOURCES &localDrives) override
- {
- // Home directory
- CMediaSource share;
- share.strPath = getenv("HOME");
- share.strName = g_localizeStrings.Get(21440);
- share.m_ignore = true;
- share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
- localDrives.push_back(share);
- share.strPath = "/";
- share.strName = g_localizeStrings.Get(21453);
- localDrives.push_back(share);
-
- m_instance->GetLocalDrives(localDrives);
- }
-
- void GetRemovableDrives(VECSOURCES &removableDrives) override
- {
- m_instance->GetRemovableDrives(removableDrives);
- }
-
- bool Eject(const std::string& mountpath) override
- {
- return m_instance->Eject(mountpath);
- }
-
- std::vector<std::string> GetDiskUsage() override
- {
- return m_instance->GetDiskUsage();
- }
-
- bool PumpDriveChangeEvents(IStorageEventsCallback *callback) override
- {
- return m_instance->PumpDriveChangeEvents(callback);
- }
+ CLinuxStorageProvider();
+ virtual ~CLinuxStorageProvider();
+
+ void Initialize() override;
+ void Stop() override;
+ void GetLocalDrives(VECSOURCES &localDrives) override;
+ void GetRemovableDrives(VECSOURCES &removableDrives) override;
+ bool Eject(const std::string& mountpath) override;
+ std::vector<std::string> GetDiskUsage() override;
+ bool PumpDriveChangeEvents(IStorageEventsCallback *callback) override;
 
 private:
 IStorageProvider *m_instance;

_service:download_files:master.tar.gz/xbmc/storage/linux/UDevProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/linux/UDevProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/linux/UDisksProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/osx/DarwinStorageProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/osx/DarwinStorageProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/win10/Win10StorageProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/win10/Win10StorageProvider.h Changed

_service:download_files:master.tar.gz/xbmc/storage/windows/Win32StorageProvider.cpp Changed

_service:download_files:master.tar.gz/xbmc/storage/windows/Win32StorageProvider.h Changed

_service:download_files:master.tar.gz/xbmc/system.h Changed

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -32,34 +32,13 @@
 #define DECLARE_UNUSED(a,b) a b;
 #endif
 
-/*****************
- * FreeBSD Specific
- *****************/
-
-#ifdef TARGET_FREEBSD
-#include "freebsd/FreeBSDGNUReplacements.h"
-#endif
-
 /****************************************
 * Additional platform specific includes
 ****************************************/
 
 #if defined(TARGET_WINDOWS)
 #include <windows.h>
-#define DIRECTINPUT_VERSION 0x0800
-#include "mmsystem.h"
-#include "DInput.h"
-#if defined(TARGET_WINDOWS_DESKTOP)
-#include "DSound.h"
-#endif
-#define DSSPEAKER_USE_DEFAULT DSSPEAKER_STEREO
-#define LPDIRECTSOUND8 LPDIRECTSOUND
-#undef GetFreeSpace
 #include "PlatformInclude.h"
-#include "d3d11_1.h"
-#include "dxgi.h"
-#include "d3dcompiler.h"
-#include "directxmath.h"
 #endif
 
 #if defined(TARGET_POSIX)

_service:download_files:master.tar.gz/xbmc/system_gl.h Changed

_service:download_files:master.tar.gz/xbmc/test/TestBasicEnvironment.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestBasicEnvironment.h Changed

_service:download_files:master.tar.gz/xbmc/test/TestFileItem.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestTextureUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestURL.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestUtil.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/test/TestUtils.h Changed

_service:download_files:master.tar.gz/xbmc/test/xbmc-test.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/Atomics.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/threads/Condition.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,15 +20,63 @@
 
 #pragma once
 
-#include "threads/platform/Condition.h"
-
+#include "threads/SingleLock.h"
+#include "threads/Helpers.h"
 #include "threads/SystemClock.h"
-#include <stdio.h>
+
+#include <condition_variable>
+#include <chrono>
 
 namespace XbmcThreads
 {
 
 /**
+ * This is a thin wrapper around std::condition_variable_any. It is subject
+ * to "spurious returns" as it is built on boost which is built on posix
+ * on many of our platforms.
+ */
+ class ConditionVariable
+ {
+ private:
+ std::condition_variable_any cond;
+ ConditionVariable(const ConditionVariable&) = delete;
+ ConditionVariable& operator=(const ConditionVariable&) = delete;
+
+ public:
+ ConditionVariable() = default;
+
+ inline void wait(CCriticalSection& lock) 
+ {
+ int count = lock.count;
+ lock.count = 0;
+ cond.wait(lock.get_underlying());
+ lock.count = count;
+ }
+
+ inline bool wait(CCriticalSection& lock, unsigned long milliseconds) 
+ { 
+ int count = lock.count;
+ lock.count = 0;
+ std::cv_status res = cond.wait_for(lock.get_underlying(), std::chrono::milliseconds(milliseconds));
+ lock.count = count;
+ return res == std::cv_status::no_timeout;
+ }
+
+ inline void wait(CSingleLock& lock) { wait(lock.get_underlying()); }
+ inline bool wait(CSingleLock& lock, unsigned long milliseconds) { return wait(lock.get_underlying(), milliseconds); }
+
+ inline void notifyAll() 
+ { 
+ cond.notify_all();
+ }
+
+ inline void notify() 
+ { 
+ cond.notify_one();
+ }
+ };
+
+ /**
 * This is a condition variable along with its predicate. This allows the use of a 
 * condition variable without the spurious returns since the state being monitored
 * is also part of the condition.

_service:download_files:master.tar.gz/xbmc/threads/CriticalSection.h Changed

_service:download_files:master.tar.gz/xbmc/threads/Event.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/Event.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -43,7 +43,7 @@
 *
 * This class manages 'spurious returns' from the condition variable.
 */
-class CEvent : public XbmcThreads::NonCopyable
+class CEvent
 {
 bool manualReset;
 volatile bool signaled;
@@ -69,6 +69,9 @@
 // helper for the two wait methods
 inline bool prepReturn() { bool ret = signaled; if (!manualReset && numWaits == 0) signaled = false; return ret; }
 
+ CEvent(const CEvent&) = delete;
+ CEvent& operator=(const CEvent&) = delete;
+
 public:
 inline CEvent(bool manual = false, bool signaled_ = false) : 
 manualReset(manual), signaled(signaled_), numWaits(0), condVar(actualCv,signaled) {}
@@ -110,7 +113,7 @@
 * It is equivalent to WaitOnMultipleObject that returns when "any" Event
 * in the group signaled.
 */
- class CEventGroup : public NonCopyable
+ class CEventGroup
 {
 std::vector<CEvent*> events;
 CEvent* signaled{};
@@ -125,6 +128,9 @@
 
 friend class ::CEvent;
 
+ CEventGroup(const CEventGroup&) = delete;
+ CEventGroup& operator=(const CEventGroup&) = delete;
+
 public:
 /**
 * Create a CEventGroup from a number of CEvents.

_service:download_files:master.tar.gz/xbmc/threads/Helpers.h Changed

_service:download_files:master.tar.gz/xbmc/threads/Lockables.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -46,9 +46,12 @@
 *
 * All xbmc code expects Lockables to be recursive.
 */
- template<class L> class CountingLockable : public NonCopyable
+ template<class L> class CountingLockable
 {
 friend class ConditionVariable;
+
+ CountingLockable(const CountingLockable&) = delete;
+ CountingLockable& operator=(const CountingLockable&) = delete;
 protected:
 L mutex;
 unsigned int count;
@@ -119,8 +122,10 @@
 * This template can be used to define the base implementation for any UniqueLock
 * (such as CSingleLock) that uses a Lockable as its mutex/critical section.
 */
- template<typename L> class UniqueLock : public NonCopyable
+ template<typename L> class UniqueLock
 {
+ UniqueLock(const UniqueLock&) = delete;
+ UniqueLock& operator=(const UniqueLock&) = delete;
 protected:
 L& mutex;
 bool owns;
@@ -154,8 +159,10 @@
 * bool try_lock_shared();
 * void unlock_shared();
 */
- template<typename L> class SharedLock : public NonCopyable
+ template<typename L> class SharedLock
 {
+ SharedLock(const SharedLock&) = delete;
+ SharedLock& operator=(const SharedLock&) = delete;
 protected:
 L& mutex;
 bool owns;

_service:download_files:master.tar.gz/xbmc/threads/SharedSection.h Changed

_service:download_files:master.tar.gz/xbmc/threads/SingleLock.h Changed

_service:download_files:master.tar.gz/xbmc/threads/SystemClock.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/SystemClock.h Changed

_service:download_files:master.tar.gz/xbmc/threads/Thread.cpp Changed

@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Frodo
 * Portions Copyright (c) by the authors of ffmpeg and xvid
 * Copyright (C) 2002-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,17 +22,15 @@
 
 #include "threads/SystemClock.h"
 #include "Thread.h"
-#include "threads/ThreadLocal.h"
 #include "threads/SingleLock.h"
 #include "commons/Exception.h"
 #include <stdlib.h>
+#include "utils/log.h"
 
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 
-static XbmcThreads::ThreadLocal<CThread> currentThread;
-
-XbmcCommons::ILogger* CThread::logger = NULL;
+static thread_local CThread* currentThread;
 
 #include "threads/platform/ThreadImpl.cpp"
 
@@ -40,8 +38,6 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-#define LOG if(logger) logger->Log
-
 CThread::CThread(const char* ThreadName)
 : m_StopEvent(true,true), m_TermEvent(true), m_StartEvent(true)
 {
@@ -85,7 +81,7 @@
 {
 if (m_ThreadId != 0)
 {
- LOG(LOGERROR, "%s - fatal error creating thread %s - old thread id not null", __FUNCTION__, m_ThreadName.c_str());
+ CLog::Log(LOGERROR, "%s - fatal error creating thread %s - old thread id not null", __FUNCTION__, m_ThreadName.c_str());
 exit(1);
 }
 m_iLastTime = XbmcThreads::SystemClockMillis() * 10000ULL;
@@ -113,7 +109,7 @@
 bool autodelete;
 
 if (!pThread) {
- LOG(LOGERROR,"%s, sanity failed. thread is NULL.",__FUNCTION__);
+ CLog::Log(LOGERROR,"%s, sanity failed. thread is NULL.",__FUNCTION__);
 return 1;
 }
 
@@ -123,9 +119,9 @@
 
 pThread->SetThreadInfo();
 
- LOG(LOGDEBUG,"Thread %s start, auto delete: %s", name.c_str(), (autodelete ? "true" : "false"));
+ CLog::Log(LOGDEBUG,"Thread %s start, auto delete: %s", name.c_str(), (autodelete ? "true" : "false"));
 
- currentThread.set(pThread);
+ currentThread = pThread;
 pThread->m_StartEvent.Set();
 
 pThread->Action();
@@ -141,12 +137,12 @@
 
 if (autodelete)
 {
- LOG(LOGDEBUG,"Thread %s %" PRIu64" terminating (autodelete)", name.c_str(), (uint64_t)id);
+ CLog::Log(LOGDEBUG,"Thread %s %" PRIu64" terminating (autodelete)", name.c_str(), (uint64_t)id);
 delete pThread;
 pThread = NULL;
 }
 else
- LOG(LOGDEBUG,"Thread %s %" PRIu64" terminating", name.c_str(), (uint64_t)id);
+ CLog::Log(LOGDEBUG,"Thread %s %" PRIu64" terminating", name.c_str(), (uint64_t)id);
 
 return 0;
 }
@@ -186,7 +182,7 @@
 
 CThread* CThread::GetCurrentThread()
 {
- return currentThread.get();
+ return currentThread;
 }
 
 void CThread::Sleep(unsigned int milliseconds)
@@ -211,7 +207,7 @@
 }
 catch (...)
 {
- LOG(LOGERROR, "%s - thread %s, Unhandled exception caught in thread startup, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
+ CLog::Log(LOGERROR, "%s - thread %s, Unhandled exception caught in thread startup, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
 if (IsAutoDelete())
 return;
 }
@@ -226,7 +222,7 @@
 }
 catch (...)
 {
- LOG(LOGERROR, "%s - thread %s, Unhandled exception caught in thread process, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
+ CLog::Log(LOGERROR, "%s - thread %s, Unhandled exception caught in thread process, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
 }
 
 try
@@ -239,7 +235,7 @@
 }
 catch (...)
 {
- LOG(LOGERROR, "%s - thread %s, Unhandled exception caught in thread OnExit, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
+ CLog::Log(LOGERROR, "%s - thread %s, Unhandled exception caught in thread OnExit, aborting. auto delete: %d", __FUNCTION__, m_ThreadName.c_str(), IsAutoDelete());
 }
 }

_service:download_files:master.tar.gz/xbmc/threads/Thread.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -29,8 +29,6 @@
 #include <stdint.h>
 #include "Event.h"
 #include "threads/ThreadImpl.h"
-#include "threads/ThreadLocal.h"
-#include "commons/ilog.h"
 
 #ifdef TARGET_DARWIN
 #include <mach/mach.h>
@@ -50,8 +48,6 @@
 
 class CThread
 {
- static XbmcCommons::ILogger* logger;
-
 protected:
 explicit CThread(const char* ThreadName);
 
@@ -83,8 +79,6 @@
 static bool IsCurrentThread(const ThreadIdentifier tid);
 static ThreadIdentifier GetCurrentThreadId();
 static CThread* GetCurrentThread();
- static inline void SetLogger(XbmcCommons::ILogger* logger_) { CThread::logger = logger_; }
- static inline XbmcCommons::ILogger* GetLogger() { return CThread::logger; }
 
 virtual void OnException(){} // signal termination handler
 protected:

_service:download_files:master.tar.gz/xbmc/threads/ThreadImpl.h Changed

_service:download_files:master.tar.gz/xbmc/threads/ThreadLocal.h Deleted

_service:download_files:master.tar.gz/xbmc/threads/Timer.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/Timer.h Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/Condition.h Deleted

_service:download_files:master.tar.gz/xbmc/threads/platform/CriticalSection.h Deleted

_service:download_files:master.tar.gz/xbmc/threads/platform/Implementation.cpp Deleted

_service:download_files:master.tar.gz/xbmc/threads/platform/ThreadImpl.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/ThreadImpl.h Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/ThreadLocal.h Deleted

_service:download_files:master.tar.gz/xbmc/threads/platform/darwin/ThreadSchedImpl.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/linux/ThreadSchedImpl.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/Condition.h Deleted

@@ -1,103 +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/>.
- *
- */
-
-#pragma once
-
-#include "threads/SingleLock.h"
-#include "threads/Helpers.h"
-
-#include <pthread.h>
-
-#ifdef TARGET_DARWIN
- #include <sys/time.h> //for gettimeofday
-#else
- #include <time.h> //for clock_gettime
-#endif
-
-namespace XbmcThreads
-{
-
- /**
- * This is a thin wrapper around boost::condition_variable. It is subject
- * to "spurious returns" as it is built on boost which is built on posix
- * on many of our platforms.
- */
- class ConditionVariable : public NonCopyable
- {
- private:
- pthread_cond_t cond;
-
- public:
- inline ConditionVariable() 
- { 
- pthread_cond_init(&cond,NULL); 
- }
-
- inline ~ConditionVariable() 
- { 
- pthread_cond_destroy(&cond);
- }
-
- inline void wait(CCriticalSection& lock) 
- {
- int count = lock.count;
- lock.count = 0;
- pthread_cond_wait(&cond,&lock.get_underlying().mutex);
- lock.count = count;
- }
-
- inline bool wait(CCriticalSection& lock, unsigned long milliseconds) 
- { 
- struct timespec ts;
-
-#ifdef TARGET_DARWIN
- struct timeval tv;
- gettimeofday(&tv, NULL);
- ts.tv_nsec = tv.tv_usec * 1000;
- ts.tv_sec = tv.tv_sec;
-#else
- clock_gettime(CLOCK_REALTIME, &ts);
-#endif
-
- ts.tv_nsec += milliseconds % 1000 * 1000000;
- ts.tv_sec += milliseconds / 1000 + ts.tv_nsec / 1000000000;
- ts.tv_nsec %= 1000000000;
- int count = lock.count;
- lock.count = 0;
- int res = pthread_cond_timedwait(&cond,&lock.get_underlying().mutex,&ts);
- lock.count = count;
- return res == 0;
- }
-
- inline void wait(CSingleLock& lock) { wait(lock.get_underlying()); }
- inline bool wait(CSingleLock& lock, unsigned long milliseconds) { return wait(lock.get_underlying(), milliseconds); }
-
- inline void notifyAll() 
- { 
- pthread_cond_broadcast(&cond);
- }
-
- inline void notify() 
- { 
- pthread_cond_signal(&cond);
- }
- };
-
-}

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/CriticalSection.h Deleted

@@ -1,67 +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/>.
- *
- */
-
-#pragma once
-
-#include <pthread.h>
-#include <errno.h>
-
-#include "threads/Lockables.h"
-#include "threads/Helpers.h"
-
-namespace XbmcThreads
-{
-
- // forward declare in preparation for the friend declaration
- class ConditionVariable;
-
- namespace pthreads
- {
- class RecursiveMutex
- {
- pthread_mutexattr_t* getRecursiveAttr();
- pthread_mutex_t mutex;
-
- // needs access to 'mutex'
- friend class XbmcThreads::ConditionVariable;
- public:
- inline RecursiveMutex() { pthread_mutex_init(&mutex,getRecursiveAttr()); }
- 
- inline ~RecursiveMutex() { pthread_mutex_destroy(&mutex); }
-
- inline void lock() { pthread_mutex_lock(&mutex); }
-
- inline void unlock() { pthread_mutex_unlock(&mutex); }
- 
- inline bool try_lock() { return (pthread_mutex_trylock(&mutex) == 0); }
- };
- }
-}
-
-
-/**
- * A CCriticalSection is a CountingLockable whose implementation is a 
- * native recursive mutex.
- *
- * This is not a typedef because of a number of "class CCriticalSection;" 
- * forward declarations in the code that break when it's done that way.
- */
-class CCriticalSection : public XbmcThreads::CountingLockable<XbmcThreads::pthreads::RecursiveMutex> {};
-

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/Implementation.cpp Deleted

@@ -1,60 +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 "threads/Lockables.h"
-#include "threads/platform/pthreads/CriticalSection.h"
-#include "threads/Helpers.h"
-
-#include <pthread.h>
-
-namespace XbmcThreads
-{
- namespace pthreads
- {
- // ==========================================================
- static pthread_mutexattr_t recursiveAttr;
-
- static bool setRecursiveAttr() 
- {
- static bool alreadyCalled = false; // initialized to 0 in the data segment prior to startup init code running
- if (!alreadyCalled)
- {
- pthread_mutexattr_init(&recursiveAttr);
- pthread_mutexattr_settype(&recursiveAttr,PTHREAD_MUTEX_RECURSIVE);
-#if !defined(__arm__) && !defined(TARGET_ANDROID)
- pthread_mutexattr_setprotocol(&recursiveAttr,PTHREAD_PRIO_INHERIT);
-#endif
- alreadyCalled = true;
- }
- return true; // note, we never call destroy.
- }
-
- static bool recursiveAttrSet = setRecursiveAttr();
-
- pthread_mutexattr_t* RecursiveMutex::getRecursiveAttr()
- {
- if (!recursiveAttrSet) // this is only possible in the single threaded startup code
- recursiveAttrSet = setRecursiveAttr();
- return &recursiveAttr;
- }
- // ==========================================================
- }
-}
-

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/ThreadImpl.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -36,6 +36,7 @@
 #endif
 
 #include <signal.h>
+#include "utils/log.h"
 
 void CThread::SpawnThread(unsigned stacksize)
 {
@@ -48,7 +49,7 @@
 pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 if (pthread_create(&m_ThreadId, &attr, (void*(*)(void*))staticThread, this) != 0)
 {
- if (logger) logger->Log(LOGNOTICE, "%s - fatal error creating thread",__FUNCTION__);
+ CLog::Log(LOGNOTICE, "%s - fatal error creating thread",__FUNCTION__);
 }
 pthread_attr_destroy(&attr);
 }
@@ -106,7 +107,7 @@
 // start thread with nice level of application
 int appNice = getpriority(PRIO_PROCESS, getpid());
 if (setpriority(PRIO_PROCESS, m_ThreadOpaque.LwpId, appNice) != 0)
- if (logger) logger->Log(LOGERROR, "%s: error %s", __FUNCTION__, strerror(errno));
+ CLog::Log(LOGERROR, "%s: error %s", __FUNCTION__, strerror(errno));
 }
 #endif
 }
@@ -189,7 +190,7 @@
 if (setpriority(PRIO_PROCESS, m_ThreadOpaque.LwpId, prio) == 0)
 bReturn = true;
 else
- if (logger) logger->Log(LOGERROR, "%s: error %s", __FUNCTION__, strerror(errno));
+ CLog::Log(LOGERROR, "%s: error %s", __FUNCTION__, strerror(errno));
 }
 #endif
 
@@ -277,9 +278,7 @@
 
 void term_handler (int signum)
 {
- XbmcCommons::ILogger* logger = CThread::GetLogger();
- if (logger)
- logger->Log(LOGERROR,"thread 0x%lx (%lu) got signal %d. calling OnException and terminating thread abnormally.", (long unsigned int)pthread_self(), (long unsigned int)pthread_self(), signum);
+ CLog::Log(LOGERROR,"thread 0x%lx (%lu) got signal %d. calling OnException and terminating thread abnormally.", (long unsigned int)pthread_self(), (long unsigned int)pthread_self(), signum);
 CThread* curThread = CThread::GetCurrentThread();
 if (curThread)
 {

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/ThreadImpl.h Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/pthreads/ThreadLocal.h Deleted

@@ -1,44 +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/>.
- *
- */
-
-#pragma once
-
-#include <pthread.h>
-
-namespace XbmcThreads
-{
- /**
- * A thin wrapper around pthreads thread specific storage
- * functionality.
- */
- template <typename T> class ThreadLocal
- {
- pthread_key_t key;
- public:
- inline ThreadLocal() : key(0) { pthread_key_create(&key,NULL); }
-
- inline ~ThreadLocal() { pthread_key_delete(key); }
-
- inline void set(T* val) { pthread_setspecific(key,(void*)val); }
-
- inline T* get() { return (T*)pthread_getspecific(key); }
- };
-}
-

_service:download_files:master.tar.gz/xbmc/threads/platform/win/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/win/Condition.h Deleted

@@ -1,72 +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/>.
- *
- */
-
-#pragma once
-
-#include "threads/SingleLock.h"
-#include "threads/Helpers.h"
-
-#include <windows.h>
-
-namespace XbmcThreads
-{
- /**
- * This is condition variable implementation that uses the underlying
- * Windows mechanisms and assumes Vista (or later)
- */
- class ConditionVariable : public NonCopyable
- {
- CONDITION_VARIABLE cond;
-
- // SleepConditionVariableCS requires the condition variable be entered
- // only once.
- struct AlmostExit 
- {
- unsigned int count;
- CCriticalSection& cc;
- inline explicit AlmostExit(CCriticalSection& pcc) : count(pcc.exit(1)), cc(pcc) { cc.count = 0; }
- inline ~AlmostExit() { cc.count = 1; cc.restore(count); }
- };
-
- public:
- inline ConditionVariable() { InitializeConditionVariable(&cond); }
-
- // apparently, windows condition variables do not need to be deleted
- inline ~ConditionVariable() { }
-
- inline void wait(CCriticalSection& lock) 
- { 
- AlmostExit ae(lock);
- // even the windows implementation is capable of spontaneous wakes
- SleepConditionVariableCS(&cond,&lock.get_underlying().mutex,INFINITE);
- }
-
- inline bool wait(CCriticalSection& lock, unsigned long milliseconds) 
- { 
- AlmostExit ae(lock);
- return SleepConditionVariableCS(&cond,&lock.get_underlying().mutex,milliseconds) ? true : false;
- }
-
- inline void wait(CSingleLock& lock) { wait(lock.get_underlying()); }
- inline bool wait(CSingleLock& lock, unsigned long milliseconds) { return wait(lock.get_underlying(), milliseconds); }
- inline void notifyAll() { WakeAllConditionVariable(&cond); }
- inline void notify() { WakeConditionVariable(&cond); }
- };
-}

_service:download_files:master.tar.gz/xbmc/threads/platform/win/CriticalSection.h Deleted

@@ -1,79 +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/>.
- *
- */
-
-#pragma once
-
-#include "threads/Lockables.h"
-
-#include <windows.h>
-
-namespace XbmcThreads
-{
-
- // forward declare in preparation for the friend declaration
- class ConditionVariable;
-
- namespace windows
- {
- class RecursiveMutex
- {
- CRITICAL_SECTION mutex;
-
- // needs access to 'mutex'
- friend class XbmcThreads::ConditionVariable;
- public:
- inline RecursiveMutex()
- {
- InitializeCriticalSection(&mutex);
- }
- 
- inline ~RecursiveMutex()
- {
- DeleteCriticalSection(&mutex);
- }
-
- inline void lock()
- {
- EnterCriticalSection(&mutex);
- }
-
- inline void unlock()
- {
- LeaveCriticalSection(&mutex);
- }
- 
- inline bool try_lock()
- {
- return TryEnterCriticalSection(&mutex) ? true : false;
- }
- };
- }
-}
-
-
-/**
- * A CCriticalSection is a CountingLockable whose implementation is a 
- * native recursive mutex.
- *
- * This is not a typedef because of a number of "class CCriticalSection;" 
- * forward declarations in the code that break when it's done that way.
- */
-class CCriticalSection : public XbmcThreads::CountingLockable<XbmcThreads::windows::RecursiveMutex> {};
-

_service:download_files:master.tar.gz/xbmc/threads/platform/win/ThreadImpl.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -21,6 +21,7 @@
 #include <windows.h>
 #include <process.h>
 #include "platform/win32/WIN32Util.h"
+#include "utils/log.h"
 
 void CThread::SpawnThread(unsigned stacksize)
 {
@@ -30,13 +31,13 @@
 m_ThreadOpaque.handle = (HANDLE)_beginthreadex(NULL, stacksize, &staticThread, this, CREATE_SUSPENDED, &threadId);
 if (m_ThreadOpaque.handle == NULL)
 {
- if (logger) logger->Log(LOGERROR, "%s - fatal error %d creating thread", __FUNCTION__, GetLastError());
+ CLog::Log(LOGERROR, "%s - fatal error %d creating thread", __FUNCTION__, GetLastError());
 return;
 }
 m_ThreadId = threadId;
 
 if (ResumeThread(m_ThreadOpaque.handle) == -1)
- if (logger) logger->Log(LOGERROR, "%s - fatal error %d resuming thread", __FUNCTION__, GetLastError());
+ CLog::Log(LOGERROR, "%s - fatal error %d resuming thread", __FUNCTION__, GetLastError());
 
 }

_service:download_files:master.tar.gz/xbmc/threads/platform/win/ThreadImpl.h Changed

_service:download_files:master.tar.gz/xbmc/threads/platform/win/ThreadLocal.h Deleted

@@ -1,57 +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/>.
- *
- */
-
-#pragma once
-
-#include <windows.h>
-#include "commons/Exception.h"
-
-namespace XbmcThreads
-{
- /**
- * A thin wrapper around windows thread specific storage
- * functionality.
- */
- template <typename T> class ThreadLocal
- {
- DWORD key;
- public:
- inline ThreadLocal()
- {
- if ((key = TlsAlloc()) == TLS_OUT_OF_INDEXES)
- throw XbmcCommons::UncheckedException("Ran out of Windows TLS Indexes. Windows Error Code %d",(int)GetLastError());
- }
-
- inline ~ThreadLocal() 
- {
- if (!TlsFree(key))
- throw XbmcCommons::UncheckedException("Failed to free Tls %d, Windows Error Code %d",(int)key, (int)GetLastError());
- }
-
- inline void set(T* val)
- {
- if (!TlsSetValue(key,(LPVOID)val))
- throw XbmcCommons::UncheckedException("Failed to set Tls %d, Windows Error Code %d",(int)key, (int)GetLastError());
- }
-
- inline T* get() { return (T*)TlsGetValue(key); }
- };
-}
-

_service:download_files:master.tar.gz/xbmc/threads/platform/win/Win32Exception.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -28,9 +28,9 @@
 #include "platform/win32/CharsetConverter.h"
 
 typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
-                                        CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-                                        CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
-                                        CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
+                                        const PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+                                        const PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+                                        const PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
 
 // StackWalk64()
 typedef BOOL (__stdcall *tSW)(

_service:download_files:master.tar.gz/xbmc/threads/platform/win/Win32Exception.h Changed

_service:download_files:master.tar.gz/xbmc/threads/test/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/threads/test/TestEvent.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/test/TestHelpers.h Changed

_service:download_files:master.tar.gz/xbmc/threads/test/TestSharedSection.cpp Changed

_service:download_files:master.tar.gz/xbmc/threads/test/TestThreadLocal.cpp Deleted

@@ -1,117 +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 "threads/ThreadLocal.h"
-
-#include "threads/Event.h"
-#include "TestHelpers.h"
-
-using namespace XbmcThreads;
-
-bool destructorCalled = false;
-
-class Thingy
-{
-public:
- inline ~Thingy() { destructorCalled = true; }
-};
-
-Thingy* staticThingy = NULL;
-CEvent gate;
-ThreadLocal<Thingy> staticThreadLocal;
-
-void cleanup()
-{
- if (destructorCalled)
- staticThingy = NULL;
- destructorCalled = false;
-}
-
-CEvent waiter;
-class Runnable : public IRunnable
-{
-public:
- bool waiting;
- bool threadLocalHadValue;
- ThreadLocal<Thingy>& threadLocal;
-
- inline Runnable(ThreadLocal<Thingy>& tl) : waiting(false), threadLocal(tl) {}
- inline void Run() override
- {
- staticThingy = new Thingy;
- staticThreadLocal.set(staticThingy);
- waiting = true;
- gate.Set();
- waiter.Wait();
- waiting = false;
-
- threadLocalHadValue = staticThreadLocal.get() != NULL;
- gate.Set();
- }
-};
-
-class GlobalThreadLocal : public Runnable
-{
-public:
- GlobalThreadLocal() : Runnable(staticThreadLocal) {}
-};
-
-class StackThreadLocal : public Runnable
-{
-public:
- ThreadLocal<Thingy> threadLocal;
- inline StackThreadLocal() : Runnable(threadLocal) {}
-};
-
-TEST(TestThreadLocal, DISABLED_Simple)
-{
- GlobalThreadLocal runnable;
- thread t(runnable);
-
- gate.Wait();
- EXPECT_TRUE(runnable.waiting);
- EXPECT_TRUE(staticThingy != NULL);
- EXPECT_TRUE(staticThreadLocal.get() == NULL);
- waiter.Set();
- gate.Wait();
- EXPECT_TRUE(runnable.threadLocalHadValue);
- EXPECT_TRUE(!destructorCalled);
- delete staticThingy;
- EXPECT_TRUE(destructorCalled);
- cleanup();
-}
-
-TEST(TestThreadLocal, DISABLED_Stack)
-{
- StackThreadLocal runnable;
- thread t(runnable);
-
- gate.Wait();
- EXPECT_TRUE(runnable.waiting);
- EXPECT_TRUE(staticThingy != NULL);
- EXPECT_TRUE(runnable.threadLocal.get() == NULL);
- waiter.Set();
- gate.Wait();
- EXPECT_TRUE(runnable.threadLocalHadValue);
- EXPECT_TRUE(!destructorCalled);
- delete staticThingy;
- EXPECT_TRUE(destructorCalled);
- cleanup();
-}

_service:download_files:master.tar.gz/xbmc/utils/AMLUtils.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2011-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -389,141 +389,6 @@
 res->fRefreshRate = 60;
 res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
 }
- else if ((StringUtils::EqualsNoCase(fromMode, "480cvbs")) || (StringUtils::EqualsNoCase(fromMode, "480i")))
- {
- res->iWidth = 720;
- res->iHeight= 480;
- res->iScreenWidth = 720;
- res->iScreenHeight= 480;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_INTERLACED;
- }
- else if ((StringUtils::EqualsNoCase(fromMode, "576cvbs")) || (StringUtils::EqualsNoCase(fromMode, "576i")))
- {
- res->iWidth = 720;
- res->iHeight= 576;
- res->iScreenWidth = 720;
- res->iScreenHeight= 576;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_INTERLACED;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "480p"))
- {
- res->iWidth = 720;
- res->iHeight= 480;
- res->iScreenWidth = 720;
- res->iScreenHeight= 480;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "576p"))
- {
- res->iWidth = 720;
- res->iHeight= 576;
- res->iScreenWidth = 720;
- res->iScreenHeight= 576;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "720p") || StringUtils::EqualsNoCase(fromMode, "720p60hz"))
- {
- res->iWidth = 1280;
- res->iHeight= 720;
- res->iScreenWidth = 1280;
- res->iScreenHeight= 720;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "720p50hz"))
- {
- res->iWidth = 1280;
- res->iHeight= 720;
- res->iScreenWidth = 1280;
- res->iScreenHeight= 720;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p") || StringUtils::EqualsNoCase(fromMode, "1080p60hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p23hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 23.976;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p24hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 24;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p30hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 30;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p50hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080p59hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 59.940;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080i") || StringUtils::EqualsNoCase(fromMode, "1080i60hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_INTERLACED;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080i50hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_INTERLACED;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "1080i59hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 1920;
- res->iScreenHeight= 1080;
- res->fRefreshRate = 59.940;
- res->dwFlags = D3DPRESENTFLAG_INTERLACED;
- }
 else if (StringUtils::EqualsNoCase(fromMode, "4k2ksmpte") || StringUtils::EqualsNoCase(fromMode, "smpte24hz"))
 {
 res->iWidth = 1920;
@@ -533,74 +398,69 @@
 res->fRefreshRate = 24;
 res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
 }
- else if (StringUtils::EqualsNoCase(fromMode, "4k2k23hz") || StringUtils::EqualsNoCase(fromMode, "2160p23hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 23.976;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "4k2k24hz") || StringUtils::EqualsNoCase(fromMode, "2160p24hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 24;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "4k2k25hz") || StringUtils::EqualsNoCase(fromMode, "2160p25hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 25;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "4k2k29hz") || StringUtils::EqualsNoCase(fromMode, "2160p29hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 29.970;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "4k2k30hz") || StringUtils::EqualsNoCase(fromMode, "2160p30hz"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 30;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "2160p50hz420"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 50;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
- else if (StringUtils::EqualsNoCase(fromMode, "2160p60hz420"))
- {
- res->iWidth = 1920;
- res->iHeight= 1080;
- res->iScreenWidth = 3840;
- res->iScreenHeight= 2160;
- res->fRefreshRate = 60;
- res->dwFlags = D3DPRESENTFLAG_PROGRESSIVE;
- }
 else
 {
- return false;
- }
+ int width = 0, height = 0, rrate = 60;
+ char smode = 'p';
 
+ if (sscanf(fromMode.c_str(), "%dx%dp%dhz", &width, &height, &rrate) == 3)
+ {
+ smode = 'p';
+ }
+ else if (sscanf(fromMode.c_str(), "%d%[ip]%dhz", &height, &smode, &rrate) >= 2)
+ {
+ switch (height)
+ {
+ case 480:
+ case 576:
+ width = 720;
+ break;
+ case 720:
+ width = 1280;
+ break;
+ case 1080:
+ width = 1920;
+ break;
+ case 2160:
+ width = 3840;
+ break;
+ }
+ }
+ else if (sscanf(fromMode.c_str(), "%dcvbs", &height) == 1)
+ {
+ width = 720;
+ smode = 'i';
+ rrate = (height == 576) ? 50 : 60;
+ }
+ else if (sscanf(fromMode.c_str(), "4k2k%d", &rrate) == 1)
+ {
+ width = 3840;
+ height = 2160;
+ smode = 'p';
+ }
+ else
+ {
+ return false;
+ }
+
+ res->iWidth = (width < 3840) ? width : 1920;
+ res->iHeight= (height < 2160) ? height : 1080;
+ res->iScreenWidth = width;
+ res->iScreenHeight = height;
+ res->dwFlags = (smode == 'p') ? D3DPRESENTFLAG_PROGRESSIVE : D3DPRESENTFLAG_INTERLACED;
+
+ switch (rrate)
+ {
+ case 23:
+ case 29:
+ case 59:
+ res->fRefreshRate = (float)((rrate + 1)/1.001);
+ break;
+ default:
+ res->fRefreshRate = (float)rrate;
+ break;
+ }
+ }
 
 res->iScreen = 0;
 res->bFullScreen = true;
@@ -644,13 +504,16 @@
 
 bool aml_probe_resolutions(std::vector<RESOLUTION_INFO> &resolutions)
 {
- std::string valstr, dcapfile;
+ std::string valstr, vesastr, dcapfile;
 dcapfile = CSpecialProtocol::TranslatePath("special://home/userdata/disp_cap");
 
 if (SysfsUtils::GetString(dcapfile, valstr) < 0)
 {
 if (SysfsUtils::GetString("/sys/class/amhdmitx/amhdmitx0/disp_cap", valstr) < 0)
 return false;
+
+ if (SysfsUtils::GetString("/sys/class/amhdmitx/amhdmitx0/vesa_cap", vesastr) == 0)
+ valstr += "\n" + vesastr;
 }
 std::vector<std::string> probe_str = StringUtils::Split(valstr, "\n");
 
@@ -820,7 +683,7 @@
 
 void aml_set_framebuffer_resolution(const RESOLUTION_INFO &res, std::string framebuffer_name)
 {
- aml_set_framebuffer_resolution(res.iScreenWidth, res.iScreenHeight, framebuffer_name);
+ aml_set_framebuffer_resolution(res.iWidth, res.iHeight, framebuffer_name);
 }
 
 void aml_set_framebuffer_resolution(int width, int height, std::string framebuffer_name)

_service:download_files:master.tar.gz/xbmc/utils/AMLUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ActorProtocol.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/ActorProtocol.h Changed

_service:download_files:master.tar.gz/xbmc/utils/AlarmClock.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -30,6 +30,7 @@
 #include "messaging/ApplicationMessenger.h"
 #include "threads/SingleLock.h"
 #include "utils/StringUtils.h"
+#include "ServiceBroker.h"
 
 using namespace KODI::MESSAGING;
 
@@ -72,9 +73,9 @@
 EventPtr alarmClockActivity(new CNotificationEvent(labelAlarmClock,
 StringUtils::Format(g_localizeStrings.Get(labelStarted).c_str(), static_cast<int>(event.m_fSecs) / 60, static_cast<int>(event.m_fSecs) % 60)));
 if (bSilent)
- CEventLog::GetInstance().Add(alarmClockActivity);
+ CServiceBroker::GetEventLog().Add(alarmClockActivity);
 else
- CEventLog::GetInstance().AddWithNotification(alarmClockActivity);
+ CServiceBroker::GetEventLog().AddWithNotification(alarmClockActivity);
 
 event.watch.StartZero();
 CSingleLock lock(m_events);
@@ -117,9 +118,9 @@
 {
 EventPtr alarmClockActivity(new CNotificationEvent(labelAlarmClock, strMessage));
 if (bSilent)
- CEventLog::GetInstance().Add(alarmClockActivity);
+ CServiceBroker::GetEventLog().Add(alarmClockActivity);
 else
- CEventLog::GetInstance().AddWithNotification(alarmClockActivity);
+ CServiceBroker::GetEventLog().AddWithNotification(alarmClockActivity);
 }
 else
 {

_service:download_files:master.tar.gz/xbmc/utils/AlarmClock.h Changed

_service:download_files:master.tar.gz/xbmc/utils/AliasShortcutUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/AliasShortcutUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Archive.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Archive.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Base64.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Base64.h Changed

_service:download_files:master.tar.gz/xbmc/utils/BitstreamConverter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/BitstreamReader.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/BitstreamStats.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/BitstreamStats.h Changed

_service:download_files:master.tar.gz/xbmc/utils/BitstreamWriter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/BooleanLogic.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/BooleanLogic.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/utils/CPUInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/CPUInfo.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CharsetConverter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/CharsetConverter.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CharsetDetection.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/CharsetDetection.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Crc32.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Crc32.h Changed

_service:download_files:master.tar.gz/xbmc/utils/CryptThreading.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/CryptThreading.h Changed

_service:download_files:master.tar.gz/xbmc/utils/DatabaseUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/DatabaseUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/EGLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/EGLUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/EmbeddedArt.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/EmbeddedArt.h Changed

_service:download_files:master.tar.gz/xbmc/utils/EndianSwap.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Environment.cpp Deleted

@@ -1,345 +0,0 @@
-/*
- * 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/>.
- *
- */
-
-/**
- * \file utils\Environment.cpp
- * \brief Implements CEnvironment class functions.
- *
- * Some ideas were inspired by PostgreSQL's pgwin32_putenv function.
- * Refined, updated, enhanced and modified for XBMC by Karlson2k.
- */
-
-#include "Environment.h"
-#include <stdlib.h>
-#ifdef TARGET_WINDOWS
-#include <Windows.h>
-#ifdef TARGET_WINDOWS_STORE
-using namespace Windows::Storage;
-using namespace Windows::Foundation;
-#endif
-#endif
-
-// --------------------- Helper Functions ---------------------
-
-#ifdef TARGET_WINDOWS
-
-std::wstring CEnvironment::win32ConvertUtf8ToW(const std::string &text, bool *resultSuccessful /* = NULL*/)
-{
- if (text.empty())
- {
- if (resultSuccessful != NULL)
- *resultSuccessful = true;
- return L"";
- }
- if (resultSuccessful != NULL)
- *resultSuccessful = false;
-
- int bufSize = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, text.c_str(), -1, NULL, 0);
- if (bufSize == 0)
- return L"";
- wchar_t *converted = new wchar_t[bufSize];
- if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, text.c_str(), -1, converted, bufSize) != bufSize)
- {
- delete[] converted;
- return L"";
- }
-
- std::wstring Wret (converted);
- delete[] converted;
-
- if (resultSuccessful != NULL)
- *resultSuccessful = true;
- return Wret;
-}
-
-std::string CEnvironment::win32ConvertWToUtf8(const std::wstring &text, bool *resultSuccessful /*= NULL*/)
-{
- if (text.empty())
- {
- if (resultSuccessful != NULL)
- *resultSuccessful = true;
- return "";
- }
- if (resultSuccessful != NULL)
- *resultSuccessful = false;
-
- int bufSize = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, text.c_str(), -1, NULL, 0, NULL, NULL);
- if (bufSize == 0)
- return "";
- char * converted = new char[bufSize];
- if (WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, text.c_str(), -1, converted, bufSize, NULL, NULL) != bufSize)
- {
- delete[] converted;
- return "";
- }
-
- std::string ret(converted);
- delete[] converted;
-
- if (resultSuccessful != NULL)
- *resultSuccessful = true;
- return ret;
-}
-
-// --------------------- Internal Function ---------------------
-
-typedef int (_cdecl * wputenvPtr) (const wchar_t *envstring);
-
-/**
- * \fn int CEnvironment::win32_setenv(const std::wstring &name, const std::wstring &value = L"",
- * updateAction action = autoDetect)
- * \brief Internal function used to manipulate with environment variables on win32.
- *
- * This function make all dirty work with setting, deleting and modifying environment variables.
- *
- * \param name The environment variable name.
- * \param value (optional) the new value of environment variable.
- * \param action (optional) the action.
- * \return Zero on success, 2 if at least one external runtime update failed, 4 if process
- * 		 environment update failed, 8 if our runtime environment update failed or, in case of
- * 		 several errors, sum of all errors values; non-zero in case of other errors.
- */
-#ifdef TARGET_WINDOWS_STORE
-int CEnvironment::win10_setenv(const std::string &name, const std::string &value /* = "" */, enum updateAction action /* = autoDetect */)
-{
- std::wstring Wname(win32ConvertUtf8ToW(name));
- if (Wname.empty() || name.find('=') != std::wstring::npos)
- return -1;
- if ((action == addOnly || action == addOrUpdateOnly) && value.empty())
- return -1;
- if (action == addOnly && !(getenv(name).empty()))
- return 0;
-
- bool convIsOK;
- std::wstring Wvalue(win32ConvertUtf8ToW(value, &convIsOK));
- if (!convIsOK)
- return -1;
-
- int retValue = 0;
-
- ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
- auto values = localSettings->Values;
-
- Platform::String^ key = ref new Platform::String(Wname.c_str());
- Platform::String^ v = ref new Platform::String(Wvalue.c_str());
-
- switch (action)
- {
- case deleteVariable:
- if (values->HasKey(key))
- {
- values->Remove(key);
- }
- retValue = 0;
- break;
-
- default:
- retValue = values->Insert(key, v) ? 0 : 4;
- break;
- }
-
- return retValue;
-}
-#else
-int CEnvironment::win32_setenv(const std::string &name, const std::string &value /* = "" */, enum updateAction action /* = autoDetect */)
-{
- std::wstring Wname (win32ConvertUtf8ToW(name));
- if (Wname.empty() || name.find('=') != std::wstring::npos)
- return -1;
- if ( (action == addOnly || action == addOrUpdateOnly) && value.empty() )
- return -1;
- if (action == addOnly && !(getenv(name).empty()) )
- return 0;
-
- bool convIsOK;
- std::wstring Wvalue (win32ConvertUtf8ToW(value,&convIsOK));
- if (!convIsOK)
- return -1;
-
- int retValue = 0;
- std::wstring EnvString;
- if (action == deleteVariable)
- EnvString = Wname + L"=";
- else
- EnvString = Wname + L"=" + Wvalue;
-
- static const wchar_t *modulesList[] =
- {
- /*{ L"msvcrt20.dll" }, // Visual C++ 2.0 / 2.1 / 2.2
- { L"msvcrt40.dll" }, // Visual C++ 4.0 / 4.1 */ // too old and no UNICODE support - ignoring
- { L"msvcrt.dll" }, // Visual Studio 6.0 / MinGW[-w64]
- { L"msvcr70.dll" }, // Visual Studio 2002
- { L"msvcr71.dll" }, // Visual Studio 2003
- { L"msvcr80.dll" }, // Visual Studio 2005
- { L"msvcr90.dll" }, // Visual Studio 2008
- { L"msvcr100.dll" }, // Visual Studio 2010
-#ifdef _DEBUG
- { L"msvcr100d.dll" },// Visual Studio 2010 (debug)
-#endif
- { L"msvcr110.dll" }, // Visual Studio 2012
-#ifdef _DEBUG
- { L"msvcr110d.dll" },// Visual Studio 2012 (debug)
-#endif
- { L"msvcr120.dll" }, // Visual Studio 2013
-#ifdef _DEBUG
- { L"msvcr120d.dll" },// Visual Studio 2013 (debug)
-#endif
- { L"vcruntime140.dll" },
- { L"ucrtbase.dll" },
-#ifdef _DEBUG
- { L"vcruntime140d.dll" },
- { L"ucrtbased.dll" },
-#endif
- { NULL } // Terminating NULL for list
- };
-
- // Check all modules each function run, because modules can be loaded/unloaded at runtime
- for (int i = 0; modulesList[i]; i++)
- {
- HMODULE hModule;
- if (!GetModuleHandleExW(0, modulesList[i], &hModule) || hModule == NULL) // Flag 0 ensures that module will be kept loaded until it'll be freed
- continue; // Module not loaded
-
- wputenvPtr wputenvFunc = (wputenvPtr) GetProcAddress(hModule, "_wputenv");
- if (wputenvFunc != NULL && wputenvFunc(EnvString.c_str()) != 0)
- retValue |= 2; // At lest one external runtime library Environment update failed
- FreeLibrary(hModule);
- }
-
- // Update process Environment used for current process and for future new child processes
- if (action == deleteVariable || value.empty())
- retValue += SetEnvironmentVariableW(Wname.c_str(), NULL) ? 0 : 4; // 4 if failed
- else
- retValue += SetEnvironmentVariableW(Wname.c_str(), Wvalue.c_str()) ? 0 : 4; // 4 if failed
-
- // Finally update our runtime Environment
- retValue += (::_wputenv(EnvString.c_str()) == 0) ? 0 : 8; // 8 if failed
- return retValue;
-}
-#endif
-#endif
-
-// --------------------- Main Functions ---------------------
-
-int CEnvironment::setenv(const std::string &name, const std::string &value, int overwrite /*= 1*/)
-{
-#ifdef TARGET_WINDOWS_STORE
- return (win10_setenv(name, value, overwrite ? autoDetect : addOnly) == 0) ? 0 : -1;
-#elif defined(TARGET_WINDOWS_DESKTOP)
- return (win32_setenv(name, value, overwrite ? autoDetect : addOnly)==0) ? 0 : -1;
-#else
- if (value.empty() && overwrite != 0)
- return ::unsetenv(name.c_str());
- return ::setenv(name.c_str(), value.c_str(), overwrite);
-#endif
-}
-
-#ifdef TARGET_WINDOWS_STORE
-std::string CEnvironment::getenv(const std::string &name)
-{
- std::string result;
-
- // check key
- if (name.empty())
- {
- return "";
- }
-
- std::wstring Wname(win32ConvertUtf8ToW(name));
- Platform::String^ key = ref new Platform::String(Wname.c_str());
-
- ApplicationDataContainer^ localSettings = ApplicationData::Current->LocalSettings;
- auto values = localSettings->Values;
-
- if (values->HasKey(key))
- {
- auto value = safe_cast<Platform::String^>(values->Lookup(key));
- result = win32ConvertWToUtf8(std::wstring(value->Data()));
- }
-
- return "";
-}
-#else
-std::string CEnvironment::getenv(const std::string &name)
-{
-#ifdef TARGET_WINDOWS
- std::wstring Wname (win32ConvertUtf8ToW(name));
- if (Wname.empty())
- return "";
-
- wchar_t * wStr = ::_wgetenv(Wname.c_str());
- if (wStr != NULL)
- return win32ConvertWToUtf8(wStr);
-
- // Not found in Environment of runtime library
- // Try Environment of process as fallback
- unsigned int varSize = GetEnvironmentVariableW(Wname.c_str(), NULL, 0);
- if (varSize == 0)
- return ""; // Not found
- wchar_t * valBuf = new wchar_t[varSize];
- if (GetEnvironmentVariableW(Wname.c_str(), valBuf, varSize) != varSize-1)
- {
- delete[] valBuf;
- return "";
- }
- std::wstring Wvalue (valBuf);
- delete[] valBuf;
-
- return win32ConvertWToUtf8(Wvalue);
-#else
- char * str = ::getenv(name.c_str());
- if (str == NULL)
- return "";
- return str;
-#endif
-}
-#endif
-
-int CEnvironment::unsetenv(const std::string &name)
-{
-#ifdef TARGET_WINDOWS_STORE
- return (win10_setenv(name, "", deleteVariable)) == 0 ? 0 : -1;
-#elif defined(TARGET_WINDOWS_DESKTOP)
- return (win32_setenv(name, "", deleteVariable)) == 0 ? 0 : -1;
-#else
- return ::unsetenv(name.c_str());
-#endif
-}
-
-int CEnvironment::putenv(const std::string &envstring)
-{
- if (envstring.empty())
- return 0;
- size_t pos = envstring.find('=');
- if (pos == 0) // '=' is the first character
- return -1;
- if (pos == std::string::npos)
- return unsetenv(envstring);
- if (pos == envstring.length()-1) // '=' is in last position
- {
- std::string name(envstring);
- name.erase(name.length()-1, 1);
- return unsetenv(name);
- }
- std::string name(envstring, 0, pos), value(envstring, pos+1);
-
- return setenv(name, value);
-}
-

_service:download_files:master.tar.gz/xbmc/utils/Environment.h Deleted

@@ -1,110 +0,0 @@
-#pragma once
-#ifndef XBMC_SETENV_H
-#define XBMC_SETENV_H
-/*
- * 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/>.
- *
- */
-
-/**
- * \file utils\Environment.h
- * \brief Declares CEnvironment class for platform-independent environment variables manipulations.
- * 		
- */
-#include <string>
-
-/**
- * @class CEnvironment
- *
- * @brief Platform-independent environment variables manipulations.
- *
- * 	Provide analog for POSIX functions:
- * 	+ setenv 
- * 	+ unsetenv 
- * 	+ putenv 
- * 	+ getenv
- *
- * 	You can generally use the functions as you would normally in POSIX-style.
- * The differences below are just to make things more convenient through use of std::string (2,3),
- * and to also allow the Win32-style of unsetting variables (4,5) if wanted.
- * 	1. CEnvironment::setenv parameter 'overwrite' is optional, set by default to 1 (allow overwrite).
- * 	2. CEnvironment::putenv uses copy of provided string (rather than string itself) to change environment,
- * so you can free parameter variable right after call of function.
- * 	3. CEnvironment::getenv returns a copy of environment variable value instead of pointer to value.
- * 	4. CEnvironment::setenv can be used to unset variables. Just pass empty string for 'value' parameter. 
- * 	5. CEnvironment::putenv can be used to unset variables. Set parameter to 'var=' (Windows style) or 
- * just 'var' (POSIX style), and 'var' will be unset. 
- * 	
- * 	All 'std::string' types are supposed to be in UTF-8 encoding.
- * 	All functions work on all platforms. Special care is taken on Windows platform where Environment is changed for process itself, 
- * 	for process runtime library and for all runtime libraries (MSVCRT) loaded by third-party modules.
- * 	Functions internally make all necessary UTF-8 <-> wide conversions.*
- */
-
-class CEnvironment
-{
-public:
- /**
- * \fn static int CEnvironment::setenv(const std::string &name, const std::string &value,
- * int overwrite = 1);
- * \brief Sets or unsets environment variable.
- * \param name The environment variable name to add/modify/delete.
- * \param value The environment variable new value. If set to empty string, variable will be 
- * 					deleted from the environment.
- * \param overwrite (optional) If set to non-zero, existing variable will be overwritten. If set to zero and
- * 					variable is already present, then variable will be unchanged and function returns success.
- * \return Zero on success, non-zero on error.
- */
- static int setenv(const std::string &name, const std::string &value, int overwrite = 1);
- /**
- * \fn static int CEnvironment::unsetenv(const std::string &name);
- * \brief Deletes environment variable.
- * \param name The environment variable name to delete.
- * \return Zero on success, non-zero on error.
- */
- static int unsetenv(const std::string &name);
-
- /**
- * \fn static int CEnvironment::putenv(const std::string &envstring);
- * \brief Adds/modifies/deletes environment variable.
- * \param envstring The variable-value string in form 'var=value'. If set to 'var=' or 'var', then variable 
- * 					will be deleted from the environment.
- * \return Zero on success, non-zero on error.
- */
- static int putenv(const std::string &envstring);
- /**
- * \fn static std::string CEnvironment::getenv(const std::string &name);
- * \brief Gets value of environment variable in UTF-8 encoding.
- * \param name The name of environment variable.
- * \return Copy of of environment variable value or empty string if variable in not present in environment.
- * \sa xbmc_getenvUtf8, xbmc_getenvW
- */
- static std::string getenv(const std::string &name);
-private:
-#ifdef TARGET_WINDOWS
- static std::wstring win32ConvertUtf8ToW(const std::string &text, bool *resultSuccessful = NULL);
- static std::string win32ConvertWToUtf8(const std::wstring &text, bool *resultSuccessful = NULL);
- enum updateAction:int {addOrUpdateOnly = -2, deleteVariable = -1, addOnly = 0, autoDetect = 1};
-#ifdef TARGET_WINDOWS_STORE
- static int win10_setenv(const std::string &name, const std::string &value = "", updateAction action = autoDetect);
-#else
- static int win32_setenv(const std::string &name, const std::string &value = "", updateAction action = autoDetect);
-#endif
-#endif // TARGET_WINDOWS
-};
-#endif

_service:download_files:master.tar.gz/xbmc/utils/EventStream.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Fanart.h Changed

_service:download_files:master.tar.gz/xbmc/utils/FileExtensionProvider.cpp Changed

@@ -25,7 +25,6 @@
 
 #include "addons/AddonManager.h"
 #include "addons/binary-addons/BinaryAddonBase.h"
-#include "ServiceBroker.h"
 
 using namespace ADDON;
 
@@ -35,20 +34,21 @@
 ADDON_AUDIODECODER
 };
 
-CFileExtensionProvider::CFileExtensionProvider()
+CFileExtensionProvider::CFileExtensionProvider(ADDON::CAddonMgr &addonManager,
+ ADDON::CBinaryAddonManager &binaryAddonManager) :
+ m_addonManager(addonManager),
+ m_binaryAddonManager(binaryAddonManager)
 {
 m_advancedSettings = g_advancedSettingsRef;
 
 SetAddonExtensions();
 
- if (CServiceBroker::IsBinaryAddonCacheUp())
- CServiceBroker::GetAddonMgr().Events().Subscribe(this, &CFileExtensionProvider::OnAddonEvent);
+ m_addonManager.Events().Subscribe(this, &CFileExtensionProvider::OnAddonEvent);
 }
 
 CFileExtensionProvider::~CFileExtensionProvider()
 {
- if (CServiceBroker::IsBinaryAddonCacheUp())
- CServiceBroker::GetAddonMgr().Events().Unsubscribe(this);
+ m_addonManager.Events().Unsubscribe(this);
 
 m_advancedSettings.reset();
 m_addonExtensions.clear();
@@ -133,13 +133,10 @@
 
 void CFileExtensionProvider::SetAddonExtensions(const TYPE& type)
 {
- if (!CServiceBroker::IsBinaryAddonCacheUp())
- return;
-
 std::vector<std::string> extensions;
 std::vector<std::string> fileFolderExtensions;
 BinaryAddonBaseList addonInfos;
- CServiceBroker::GetBinaryAddonManager().GetAddonInfos(addonInfos, true, type);
+ m_binaryAddonManager.GetAddonInfos(addonInfos, true, type);
 for (const auto& addonInfo : addonInfos)
 {
 std::string info = ADDON_VFS == type ? "@extensions" : "@extension";
@@ -169,7 +166,7 @@
 {
 for (auto &type : ADDON_TYPES)
 {
- if (CServiceBroker::GetAddonMgr().HasType(event.id, type))
+ if (m_addonManager.HasType(event.id, type))
 {
 SetAddonExtensions(type);
 break;

_service:download_files:master.tar.gz/xbmc/utils/FileExtensionProvider.h Changed

_service:download_files:master.tar.gz/xbmc/utils/FileOperationJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/FileOperationJob.h Changed

_service:download_files:master.tar.gz/xbmc/utils/FileUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/FileUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/GLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/GLUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Geometry.h Added

@@ -0,0 +1,488 @@
+/*
+ * Copyright (C) 2005-2013 Team XBMC
+ * 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
+
+#ifdef __GNUC__
+// under gcc, inline will only take place if optimizations are applied (-O). this will force inline even with optimizations.
+#define XBMC_FORCE_INLINE __attribute__((always_inline))
+#else
+#define XBMC_FORCE_INLINE
+#endif
+
+#include <algorithm>
+#include <stdexcept>
+#include <vector>
+
+template <typename T> class CPointGen
+{
+public:
+ typedef CPointGen<T> this_type;
+
+ CPointGen() noexcept = default;
+
+ CPointGen(T a, T b)
+ : x{a}, y{b}
+ {}
+
+ template<class U> explicit CPointGen(const CPointGen& rhs)
+ : x{static_cast<T> (rhs.x)}, y{static_cast<T> (rhs.y)}
+ {}
+
+ this_type operator+(const this_type &point) const
+ {
+ return {x + point.x, y + point.y};
+ };
+
+ this_type& operator+=(const this_type &point)
+ {
+ x += point.x;
+ y += point.y;
+ return *this;
+ };
+
+ this_type operator-(const this_type &point) const
+ {
+ return {x - point.x, y - point.y};
+ };
+
+ this_type& operator-=(const this_type &point)
+ {
+ x -= point.x;
+ y -= point.y;
+ return *this;
+ };
+
+ this_type operator*(T factor) const
+ {
+ return {x * factor, y * factor};
+ }
+
+ this_type& operator*=(T factor)
+ {
+ x *= factor;
+ y *= factor;
+ return *this;
+ }
+
+ this_type operator/(T factor) const
+ {
+ return {x / factor, y / factor};
+ }
+
+ this_type& operator/=(T factor)
+ {
+ x /= factor;
+ y /= factor;
+ return *this;
+ }
+
+ T x{}, y{};
+};
+
+template<typename T>
+inline bool operator==(const CPointGen<T> &point1, const CPointGen<T> &point2) noexcept
+{
+ return (point1.x == point2.x && point1.y == point2.y);
+}
+
+template<typename T>
+inline bool operator!=(const CPointGen<T> &point1, const CPointGen<T> &point2) noexcept
+{
+ return !(point1 == point2);
+}
+
+using CPoint = CPointGen<float>;
+using CPointInt = CPointGen<int>;
+
+
+/**
+ * Generic two-dimensional size representation
+ *
+ * Class invariant: width and height are both non-negative
+ * Throws std::out_of_range if invariant would be violated. The class
+ * is exception-safe. If modification would violate the invariant, the size
+ * is not changed.
+ */
+template <typename T> class CSizeGen
+{
+ T m_w{}, m_h{};
+
+ void CheckSet(T width, T height)
+ {
+ if (width < 0)
+ {
+ throw std::out_of_range("Size may not have negative width");
+ }
+ if (height < 0)
+ {
+ throw std::out_of_range("Size may not have negative height");
+ }
+ m_w = width;
+ m_h = height;
+ }
+
+public:
+ typedef CSizeGen<T> this_type;
+
+ CSizeGen() noexcept = default;
+
+ CSizeGen(T width, T height)
+ {
+ CheckSet(width, height);
+ }
+
+ T Width() const
+ {
+ return m_w;
+ }
+
+ T Height() const
+ {
+ return m_h;
+ }
+
+ void SetWidth(T width)
+ {
+ CheckSet(width, m_h);
+ }
+
+ void SetHeight(T height)
+ {
+ CheckSet(m_w, height);
+ }
+
+ void Set(T width, T height)
+ {
+ CheckSet(width, height);
+ }
+
+ bool IsZero() const
+ {
+ return (m_w == static_cast<T> (0) && m_h == static_cast<T> (0));
+ }
+
+ T Area() const
+ {
+ return m_w * m_h;
+ }
+
+ CPointGen<T> ToPoint() const
+ {
+ return {m_w, m_h};
+ }
+
+ template<class U> explicit CSizeGen<T>(const CSizeGen& rhs)
+ {
+ CheckSet(static_cast<T> (rhs.m_w), static_cast<T> (rhs.m_h));
+ }
+
+ this_type operator+(const this_type& size) const
+ {
+ return {m_w + size.m_w, m_h + size.m_h};
+ };
+
+ this_type& operator+=(const this_type& size)
+ {
+ CheckSet(m_w + size.m_w, m_h + size.m_h);
+ return *this;
+ };
+
+ this_type operator-(const this_type& size) const
+ {
+ return {m_w - size.m_w, m_h - size.m_h};
+ };
+
+ this_type& operator-=(const this_type& size)
+ {
+ CheckSet(m_w - size.m_w, m_h - size.m_h);
+ return *this;
+ };
+
+ this_type operator*(T factor) const
+ {
+ return {m_w * factor, m_h * factor};
+ }
+
+ this_type& operator*=(T factor)
+ {
+ CheckSet(m_w * factor, m_h * factor);
+ return *this;
+ }
+
+ this_type operator/(T factor) const
+ {
+ return {m_w / factor, m_h / factor};
+ }
+
+ this_type& operator/=(T factor)
+ {
+ CheckSet(m_w / factor, m_h / factor);
+ return *this;
+ }
+};
+
+template<typename T>
+inline bool operator==(const CSizeGen<T>& size1, const CSizeGen<T>& size2) noexcept
+{
+ return (size1.Width() == size2.Width() && size1.Height() == size2.Height());
+}
+
+template<typename T>
+inline bool operator!=(const CSizeGen<T>& size1, const CSizeGen<T>& size2) noexcept
+{
+ return !(size1 == size2);
+}
+
+using CSize = CSizeGen<float>;
+using CSizeInt = CSizeGen<int>;
+
+
+template <typename T> class CRectGen
+{
+public:
+ typedef CRectGen<T> this_type;
+ typedef CPointGen<T> point_type;
+ typedef CSizeGen<T> size_type;
+
+ CRectGen() noexcept = default;
+
+ CRectGen(T left, T top, T right, T bottom)
+ : x1{left}, y1{top}, x2{right}, y2{bottom}
+ {}
+
+ CRectGen(const point_type &p1, const point_type &p2)
+ : x1{p1.x}, y1{p1.y}, x2{p2.x}, y2{p2.y}
+ {}
+
+ CRectGen(const point_type &origin, const size_type &size)
+ : x1{origin.x}, y1{origin.y}, x2{x1 + size.Width()}, y2{y1 + size.Height()}
+ {}
+
+ template<class U> explicit CRectGen(const CRectGen& rhs)
+ : x1{static_cast<T> (rhs.x1)}, y1{static_cast<T> (rhs.y1)}, x2{static_cast<T> (rhs.x2)}, y2{static_cast<T> (rhs.y2)}
+ {}
+
+ void SetRect(T left, T top, T right, T bottom)
+ {
+ x1 = left;
+ y1 = top;
+ x2 = right;
+ y2 = bottom;
+ }
+
+ bool PtInRect(const point_type &point) const
+ {
+ return (x1 <= point.x && point.x <= x2 && y1 <= point.y && point.y <= y2);
+ };
+
+ this_type& operator-=(const point_type &point) XBMC_FORCE_INLINE
+ {
+ x1 -= point.x;
+ y1 -= point.y;
+ x2 -= point.x;
+ y2 -= point.y;
+ return *this;
+ };
+
+ this_type operator-(const point_type &point) const
+ {
+ return {x1 - point.x, y1 - point.y, x2 - point.x, y2 - point.y};
+ }
+
+ this_type& operator+=(const point_type &point) XBMC_FORCE_INLINE
+ {
+ x1 += point.x;
+ y1 += point.y;
+ x2 += point.x;
+ y2 += point.y;
+ return *this;
+ };
+
+ this_type operator+(const point_type &point) const
+ {
+ return {x1 + point.x, y1 + point.y, x2 + point.x, y2 + point.y};
+ }
+
+ this_type& operator-=(const size_type &size)
+ {
+ x2 -= size.Width();
+ y2 -= size.Height();
+ return *this;
+ };
+
+ this_type operator-(const size_type &size) const
+ {
+ return {x1, y1, x2 - size.Width(), y2 - size.Height()};
+ }
+
+ this_type& operator+=(const size_type &size)
+ {
+ x2 += size.Width();
+ y2 += size.Height();
+ return *this;
+ };
+
+ this_type operator+(const size_type &size) const
+ {
+ return {x1, y1, x2 + size.Width(), y2 + size.Height()};
+ }
+
+ this_type& Intersect(const this_type &rect)
+ {
+ x1 = clamp_range(x1, rect.x1, rect.x2);
+ x2 = clamp_range(x2, rect.x1, rect.x2);
+ y1 = clamp_range(y1, rect.y1, rect.y2);
+ y2 = clamp_range(y2, rect.y1, rect.y2);
+ return *this;
+ };
+
+ this_type& Union(const this_type &rect)
+ {
+ if (IsEmpty())
+ *this = rect;
+ else if (!rect.IsEmpty())
+ {
+ x1 = std::min(x1,rect.x1);
+ y1 = std::min(y1,rect.y1);
+
+ x2 = std::max(x2,rect.x2);
+ y2 = std::max(y2,rect.y2);
+ }
+
+ return *this;
+ };
+
+ bool IsEmpty() const XBMC_FORCE_INLINE
+ {
+ return (x2 - x1) * (y2 - y1) == 0;
+ };
+
+ point_type P1() const XBMC_FORCE_INLINE
+ {
+ return {x1, y1};
+ }
+
+ point_type P2() const XBMC_FORCE_INLINE
+ {
+ return {x2, y2};
+ }
+
+ T Width() const XBMC_FORCE_INLINE
+ {
+ return x2 - x1;
+ };
+
+ T Height() const XBMC_FORCE_INLINE
+ {
+ return y2 - y1;
+ };
+
+ T Area() const XBMC_FORCE_INLINE
+ {
+ return Width() * Height();
+ };
+
+ size_type ToSize() const
+ {
+ return {Width(), Height()};
+ };
+
+ std::vector<this_type> SubtractRect(this_type splitterRect)
+ {
+ std::vector<this_type> newRectanglesList;
+ this_type intersection = splitterRect.Intersect(*this);
+
+ if (!intersection.IsEmpty())
+ {
+ this_type add;
+
+ // add rect above intersection if not empty
+ add = this_type(x1, y1, x2, intersection.y1);
+ if (!add.IsEmpty())
+ newRectanglesList.push_back(add);
+
+ // add rect below intersection if not empty
+ add = this_type(x1, intersection.y2, x2, y2);
+ if (!add.IsEmpty())
+ newRectanglesList.push_back(add);
+
+ // add rect left intersection if not empty
+ add = this_type(x1, intersection.y1, intersection.x1, intersection.y2);
+ if (!add.IsEmpty())
+ newRectanglesList.push_back(add);
+
+ // add rect right intersection if not empty
+ add = this_type(intersection.x2, intersection.y1, x2, intersection.y2);
+ if (!add.IsEmpty())
+ newRectanglesList.push_back(add);
+ }
+ else
+ {
+ newRectanglesList.push_back(*this);
+ }
+
+ return newRectanglesList;
+ }
+
+ std::vector<this_type> SubtractRects(std::vector<this_type> intersectionList)
+ {
+ std::vector<this_type> fragmentsList;
+ fragmentsList.push_back(*this);
+
+ for (typename std::vector<this_type>::iterator splitter = intersectionList.begin(); splitter != intersectionList.end(); ++splitter)
+ {
+ typename std::vector<this_type> toAddList;
+
+ for (typename std::vector<this_type>::iterator fragment = fragmentsList.begin(); fragment != fragmentsList.end(); ++fragment)
+ {
+ std::vector<this_type> newFragmentsList = fragment->SubtractRect(*splitter);
+ toAddList.insert(toAddList.end(), newFragmentsList.begin(), newFragmentsList.end());
+ }
+
+ fragmentsList.clear();
+ fragmentsList.insert(fragmentsList.end(), toAddList.begin(), toAddList.end());
+ }
+
+ return fragmentsList;
+ }
+
+ T x1{}, y1{}, x2{}, y2{};
+private:
+ static T clamp_range(T x, T l, T h) XBMC_FORCE_INLINE
+ {
+ return (x > h) ? h : ((x < l) ? l : x);
+ }
+};
+
+template<typename T>
+inline bool operator==(const CRectGen<T> &rect1, const CRectGen<T> &rect2) noexcept
+{
+ return (rect1.x1 == rect2.x1 && rect1.y1 == rect2.y1 && rect1.x2 == rect2.x2 && rect1.y2 == rect2.y2);
+}
+
+template<typename T>
+inline bool operator!=(const CRectGen<T> &rect1, const CRectGen<T> &rect2) noexcept
+{
+ return !(rect1 == rect2);
+}
+
+using CRect = CRectGen<float>;
+using CRectInt = CRectGen<int>;
\ No newline at end of file

_service:download_files:master.tar.gz/xbmc/utils/GlobalsHandling.h Changed

_service:download_files:master.tar.gz/xbmc/utils/GroupUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/GroupUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/HTMLUtil.h Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpHeader.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpHeader.h Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpParser.h Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpRangeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpRangeUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpResponse.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/HttpResponse.h Changed

_service:download_files:master.tar.gz/xbmc/utils/IArchivable.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ILocalizer.h Changed

_service:download_files:master.tar.gz/xbmc/utils/IRssObserver.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ISerializable.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ISortable.h Changed

_service:download_files:master.tar.gz/xbmc/utils/IXmlDeserializable.h Changed

_service:download_files:master.tar.gz/xbmc/utils/InfoLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/InfoLoader.h Changed

_service:download_files:master.tar.gz/xbmc/utils/JSONVariantParser.h Changed

_service:download_files:master.tar.gz/xbmc/utils/JSONVariantWriter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/JSONVariantWriter.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Job.h Changed

_service:download_files:master.tar.gz/xbmc/utils/JobManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/JobManager.h Changed

_service:download_files:master.tar.gz/xbmc/utils/LabelFormatter.h Changed

_service:download_files:master.tar.gz/xbmc/utils/LangCodeExpander.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/LangCodeExpander.h Changed

_service:download_files:master.tar.gz/xbmc/utils/LegacyPathTranslation.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/LegacyPathTranslation.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Literals.h Changed

@@ -1,40 +1,40 @@
-#pragma once
-/*
- * Copyright (C) 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/>.
- *
- */
-
-constexpr unsigned long long int operator"" _kib (unsigned long long int val)
-{
- return val * 1024ull;
-}
-
-constexpr unsigned long long int operator"" _kb (unsigned long long int val)
-{
- return val * 1000ull;
-}
-
-constexpr unsigned long long int operator"" _mib (unsigned long long int val)
-{
- return val * 1024ull * 1024ull;
-}
-
-constexpr unsigned long long int operator"" _mb (unsigned long long int val)
-{
- return val * 1000ull * 1000ull;
-}
\ No newline at end of file
+#pragma once
+/*
+ * Copyright (C) 2014 Team XBMC
+ * 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/>.
+ *
+ */
+
+constexpr unsigned long long int operator"" _kib (unsigned long long int val)
+{
+ return val * 1024ull;
+}
+
+constexpr unsigned long long int operator"" _kb (unsigned long long int val)
+{
+ return val * 1000ull;
+}
+
+constexpr unsigned long long int operator"" _mib (unsigned long long int val)
+{
+ return val * 1024ull * 1024ull;
+}
+
+constexpr unsigned long long int operator"" _mb (unsigned long long int val)
+{
+ return val * 1000ull * 1000ull;
+}

_service:download_files:master.tar.gz/xbmc/utils/Locale.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Locale.h Changed

_service:download_files:master.tar.gz/xbmc/utils/MathUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Mime.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Mime.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Observer.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Observer.h Changed

_service:download_files:master.tar.gz/xbmc/utils/POUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ProgressJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/ProgressJob.h Changed

_service:download_files:master.tar.gz/xbmc/utils/RecentlyAddedJob.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -269,8 +269,23 @@
 {
 auto& album=albums[j];
 std::string value = StringUtils::Format("%lu", j + 1);
- std::string strThumb = musicdatabase.GetArtForItem(album.idAlbum, MediaTypeAlbum, "thumb");
- std::string strFanart = musicdatabase.GetArtistArtForItem(album.idAlbum, MediaTypeAlbum, "fanart");
+ std::string strThumb;
+ std::string strFanart;
+ bool artfound = false;
+ std::vector<ArtForThumbLoader> art;
+ // Get album thumb and fanart for first album artist
+ artfound = musicdatabase.GetArtForItem(-1, album.idAlbum, -1, true, art);
+ if (artfound)
+ {
+ for (auto artitem : art)
+ {
+ if (artitem.mediaType == MediaTypeAlbum && artitem.artType == "thumb")
+ strThumb = artitem.url;
+ else if (artitem.mediaType == MediaTypeArtist && artitem.artType == "fanart")
+ strFanart = artitem.url;
+ }
+ }
+
 std::string strDBpath = StringUtils::Format("musicdb://albums/%li/", album.idAlbum);
 
 home->SetProperty("LatestAlbum." + value + ".Title" , album.strAlbum);

_service:download_files:master.tar.gz/xbmc/utils/RecentlyAddedJob.h Changed

_service:download_files:master.tar.gz/xbmc/utils/RegExp.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/RegExp.h Changed

_service:download_files:master.tar.gz/xbmc/utils/RingBuffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/RingBuffer.h Changed

_service:download_files:master.tar.gz/xbmc/utils/RssManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/RssManager.h Changed

_service:download_files:master.tar.gz/xbmc/utils/RssReader.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/RssReader.h Changed

_service:download_files:master.tar.gz/xbmc/utils/SaveFileStateJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/SaveFileStateJob.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ScraperParser.h Changed

_service:download_files:master.tar.gz/xbmc/utils/ScraperUrl.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/ScraperUrl.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Screenshot.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -52,6 +52,8 @@
 
 #if defined(TARGET_WINDOWS)
 #include "rendering/dx/DeviceResources.h"
+#include <wrl/client.h>
+using namespace Microsoft::WRL;
 #endif
 
 using namespace XFILE;
@@ -85,54 +87,47 @@
 auto deviceResources = DX::DeviceResources::Get();
 deviceResources->FinishCommandList();
 
- ID3D11DeviceContext* pImdContext = deviceResources->GetImmediateContext();
- ID3D11DeviceContext* pContext = deviceResources->GetD3DContext();
- ID3D11Device* pDevice = deviceResources->GetD3DDevice();
+ ComPtr<ID3D11DeviceContext> pImdContext = deviceResources->GetImmediateContext();
+ ComPtr<ID3D11DeviceContext> pContext = deviceResources->GetD3DContext();
+ ComPtr<ID3D11Device> pDevice = deviceResources->GetD3DDevice();
 
- ID3D11RenderTargetView* pRTView = nullptr;
- pContext->OMGetRenderTargets(1, &pRTView, nullptr);
+ ComPtr<ID3D11RenderTargetView> pRTView = nullptr;
+ pContext->OMGetRenderTargets(1, pRTView.GetAddressOf(), nullptr);
 if (pRTView == nullptr)
 return false;
 
- ID3D11Resource *pRTResource = nullptr;
- pRTView->GetResource(&pRTResource);
- SAFE_RELEASE(pRTView);
+ ComPtr<ID3D11Resource> pRTResource = nullptr;
+ pRTView->GetResource(pRTResource.GetAddressOf());
 
- ID3D11Texture2D* pCopyTexture = nullptr;
- ID3D11Texture2D* pRTTexture = nullptr;
- HRESULT hr = pRTResource->QueryInterface(__uuidof(ID3D11Texture2D), reinterpret_cast<void**>(&pRTTexture));
- SAFE_RELEASE(pRTResource);
- if (FAILED(hr))
+ ComPtr<ID3D11Texture2D> pCopyTexture = nullptr;
+ ComPtr<ID3D11Texture2D> pRTTexture = nullptr;
+ if (FAILED(pRTResource.As(&pRTTexture)))
 return false;
 
- D3D11_TEXTURE2D_DESC desc;
+ D3D11_TEXTURE2D_DESC desc = { 0 };
 pRTTexture->GetDesc(&desc);
 desc.Usage = D3D11_USAGE_STAGING;
 desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
 desc.BindFlags = 0;
 
- if (SUCCEEDED(pDevice->CreateTexture2D(&desc, nullptr, &pCopyTexture)))
+ if (SUCCEEDED(pDevice->CreateTexture2D(&desc, nullptr, pCopyTexture.GetAddressOf())))
 {
 // take copy
- pImdContext->CopyResource(pCopyTexture, pRTTexture);
+ pImdContext->CopyResource(pCopyTexture.Get(), pRTTexture.Get());
 
 D3D11_MAPPED_SUBRESOURCE res;
- if (SUCCEEDED(pImdContext->Map(pCopyTexture, 0, D3D11_MAP_READ, 0, &res)))
+ if (SUCCEEDED(pImdContext->Map(pCopyTexture.Get(), 0, D3D11_MAP_READ, 0, &res)))
 {
 m_width = desc.Width;
 m_height = desc.Height;
 m_stride = res.RowPitch;
 m_buffer = new unsigned char[m_height * m_stride];
 memcpy(m_buffer, res.pData, m_height * m_stride);
- pImdContext->Unmap(pCopyTexture, 0);
+ pImdContext->Unmap(pCopyTexture.Get(), 0);
 }
 else
- CLog::Log(LOGERROR, "%s: MAP_READ failed.", __FUNCTION__);
-
- SAFE_RELEASE(pCopyTexture);
+ CLog::LogFunction(LOGERROR, __FUNCTION__, "MAP_READ failed.");
 }
- SAFE_RELEASE(pRTTexture);
-
 #elif defined(HAS_GL) || defined(HAS_GLES)
 
 CSingleLock lock(g_graphicsContext);

_service:download_files:master.tar.gz/xbmc/utils/Screenshot.h Changed

_service:download_files:master.tar.gz/xbmc/utils/SortUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/SortUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Speed.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Speed.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Stopwatch.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Stopwatch.h Changed

_service:download_files:master.tar.gz/xbmc/utils/StreamDetails.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/StreamDetails.h Changed

_service:download_files:master.tar.gz/xbmc/utils/StreamUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/StreamUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/StringUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/StringValidation.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/StringValidation.h Changed

_service:download_files:master.tar.gz/xbmc/utils/SysfsUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/SysfsUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/SystemInfo.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Temperature.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Temperature.h Changed

_service:download_files:master.tar.gz/xbmc/utils/TextSearch.h Changed

_service:download_files:master.tar.gz/xbmc/utils/TimeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/TimeUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/URIUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/UrlOptions.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/UrlOptions.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Utf8Utils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Utf8Utils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/VC1BitstreamParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Variant.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Variant.h Changed

_service:download_files:master.tar.gz/xbmc/utils/Vector.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/Vector.h Changed

_service:download_files:master.tar.gz/xbmc/utils/XBMCTinyXML.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/XBMCTinyXML.h Changed

_service:download_files:master.tar.gz/xbmc/utils/XMLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/XMLUtils.h Changed

_service:download_files:master.tar.gz/xbmc/utils/auto_buffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/auto_buffer.h Changed

_service:download_files:master.tar.gz/xbmc/utils/log.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2014 Team XBMC
- * http://xbmc.org
+ * 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
@@ -19,12 +19,22 @@
 */
 
 #include "log.h"
+#include "CompileInfo.h"
 #include "settings/AdvancedSettings.h"
 #include "system.h"
+#include "threads/CriticalSection.h"
 #include "threads/SingleLock.h"
 #include "threads/Thread.h"
 #include "utils/StringUtils.h"
-#include "CompileInfo.h"
+
+#if defined(TARGET_POSIX)
+#include "posix/PosixInterfaceForCLog.h"
+typedef class CPosixInterfaceForCLog PlatformInterfaceForCLog;
+#elif defined(TARGET_WINDOWS)
+#include "win32/Win32InterfaceForCLog.h"
+typedef class CWin32InterfaceForCLog PlatformInterfaceForCLog;
+#endif
+
 
 static const char* const levelNames[] =
 {"DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "SEVERE", "FATAL", "NONE"};
@@ -33,97 +43,59 @@
 static const char* const logLevelNames[] =
 { "LOG_LEVEL_NONE" /*-1*/, "LOG_LEVEL_NORMAL" /*0*/, "LOG_LEVEL_DEBUG" /*1*/, "LOG_LEVEL_DEBUG_FREEMEM" /*2*/ };
 
-// s_globals is used as static global with CLog global variables
-#define s_globals XBMC_GLOBAL_USE(CLog).m_globalInstance
-
-CLog::CLog() = default;
-
-CLog::~CLog() = default;
-
-void CLog::Close()
+namespace
 {
- CSingleLock waitLock(s_globals.critSec);
- s_globals.m_platform.CloseLogFile();
- s_globals.m_repeatLine.clear();
-}
-
-void CLog::Log(int loglevel, PRINTF_FORMAT_STRING const char *format, ...)
+class CLogGlobals
 {
- if (IsLogLevelLogged(loglevel))
- {
- va_list va;
- va_start(va, format);
- LogString(loglevel, StringUtils::FormatV(format, va));
- va_end(va);
- }
+public:
+ CLogGlobals(void) : m_repeatCount(0), m_repeatLogLevel(-1), m_logLevel(LOG_LEVEL_DEBUG), m_extraLogLevels(0) {}
+ ~CLogGlobals() = default;
+ PlatformInterfaceForCLog m_platform;
+ int m_repeatCount;
+ int m_repeatLogLevel;
+ std::string m_repeatLine;
+ int m_logLevel;
+ int m_extraLogLevels;
+ CCriticalSection critSec;
+};
+
+static CLogGlobals g_logState;
 }
 
-void CLog::Log(int loglevel, int component, PRINTF_FORMAT_STRING const char *format, ...)
-{
- if (g_advancedSettings.CanLogComponent(component) && IsLogLevelLogged(loglevel))
- {
- va_list va;
- va_start(va, format);
- LogString(loglevel, StringUtils::FormatV(format, va));
- va_end(va);
- }
-}
+CLog::CLog() = default;
 
-void CLog::LogFunction(int loglevel, const char* functionName, const char* format, ...)
-{
- if (IsLogLevelLogged(loglevel))
- {
- std::string fNameStr;
- if (functionName && functionName[0])
- fNameStr.assign(functionName).append(": ");
- va_list va;
- va_start(va, format);
- LogString(loglevel, fNameStr + StringUtils::FormatV(format, va));
- va_end(va);
- }
-}
+CLog::~CLog() = default;
 
-void CLog::LogFunction(int loglevel, const char* functionName, int component, const char* format, ...)
+void CLog::Close()
 {
- if (g_advancedSettings.CanLogComponent(component))
- {
- va_list va;
- va_start(va, format);
- #if defined(__GNUC__)
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wformat-security"
- #endif
- LogFunction(loglevel, functionName, StringUtils::FormatV(format, va).c_str());
- #if defined(__GNUC__)
- #pragma GCC diagnostic pop
- #endif
- va_end(va);
- }
+ CSingleLock waitLock(g_logState.critSec);
+ g_logState.m_platform.CloseLogFile();
+ g_logState.m_repeatLine.clear();
 }
 
-void CLog::LogString(int logLevel, const std::string& logString)
+void CLog::LogString(int logLevel, std::string&& logString)
 {
- CSingleLock waitLock(s_globals.critSec);
+ CSingleLock waitLock(g_logState.critSec);
 std::string strData(logString);
 StringUtils::TrimRight(strData);
 if (!strData.empty())
 {
- if (s_globals.m_repeatLogLevel == logLevel && s_globals.m_repeatLine == strData)
+ if (g_logState.m_repeatLogLevel == logLevel && g_logState.m_repeatLine == strData)
 {
- s_globals.m_repeatCount++;
+ g_logState.m_repeatCount++;
 return;
 }
- else if (s_globals.m_repeatCount)
+ else if (g_logState.m_repeatCount)
 {
 std::string strData2 = StringUtils::Format("Previous line repeats %d times.",
- s_globals.m_repeatCount);
+ g_logState.m_repeatCount);
 PrintDebugString(strData2);
- WriteLogString(s_globals.m_repeatLogLevel, strData2);
- s_globals.m_repeatCount = 0;
+ WriteLogString(g_logState.m_repeatLogLevel, strData2);
+ g_logState.m_repeatCount = 0;
 }
 
- s_globals.m_repeatLine = strData;
- s_globals.m_repeatLogLevel = logLevel;
+ g_logState.m_repeatLine = strData;
+ g_logState.m_repeatLogLevel = logLevel;
 
 PrintDebugString(strData);
 
@@ -131,16 +103,22 @@
 }
 }
 
+void CLog::LogString(int logLevel, int component, std::string&& logString)
+{
+ if (g_advancedSettings.CanLogComponent(component) && IsLogLevelLogged(logLevel))
+ LogString(logLevel, std::move(logString));
+}
+
 bool CLog::Init(const std::string& path)
 {
- CSingleLock waitLock(s_globals.critSec);
+ CSingleLock waitLock(g_logState.critSec);
 
 // the log folder location is initialized in the CAdvancedSettings
 // constructor and changed in CApplication::Create()
 
 std::string appName = CCompileInfo::GetAppName();
 StringUtils::ToLower(appName);
- return s_globals.m_platform.OpenLogFile(path + appName + ".log", path + appName + ".old.log");
+ return g_logState.m_platform.OpenLogFile(path + appName + ".log", path + appName + ".old.log");
 }
 
 void CLog::MemDump(char *pData, int length)
@@ -176,11 +154,11 @@
 
 void CLog::SetLogLevel(int level)
 {
- CSingleLock waitLock(s_globals.critSec);
+ CSingleLock waitLock(g_logState.critSec);
 if (level >= LOG_LEVEL_NONE && level <= LOG_LEVEL_MAX)
 {
- s_globals.m_logLevel = level;
- CLog::Log(LOGNOTICE, "Log level changed to \"%s\"", logLevelNames[s_globals.m_logLevel + 1]);
+ g_logState.m_logLevel = level;
+ CLog::Log(LOGNOTICE, "Log level changed to \"%s\"", logLevelNames[g_logState.m_logLevel + 1]);
 }
 else
 CLog::Log(LOGERROR, "%s: Invalid log level requested: %d", __FUNCTION__, level);
@@ -188,24 +166,24 @@
 
 int CLog::GetLogLevel()
 {
- return s_globals.m_logLevel;
+ return g_logState.m_logLevel;
 }
 
 void CLog::SetExtraLogLevels(int level)
 {
- CSingleLock waitLock(s_globals.critSec);
- s_globals.m_extraLogLevels = level;
+ CSingleLock waitLock(g_logState.critSec);
+ g_logState.m_extraLogLevels = level;
 }
 
 bool CLog::IsLogLevelLogged(int loglevel)
 {
 const int extras = (loglevel & ~LOGMASK);
- if (extras != 0 && (s_globals.m_extraLogLevels & extras) == 0)
+ if (extras != 0 && (g_logState.m_extraLogLevels & extras) == 0)
 return false;
 
- if (s_globals.m_logLevel >= LOG_LEVEL_DEBUG)
+ if (g_logState.m_logLevel >= LOG_LEVEL_DEBUG)
 return true;
- if (s_globals.m_logLevel <= LOG_LEVEL_NONE)
+ if (g_logState.m_logLevel <= LOG_LEVEL_NONE)
 return false;
 
 // "m_logLevel" is "LOG_LEVEL_NORMAL"
@@ -216,7 +194,7 @@
 void CLog::PrintDebugString(const std::string& line)
 {
 #if defined(_DEBUG) || defined(PROFILE)
- s_globals.m_platform.PrintDebugString(line);
+ g_logState.m_platform.PrintDebugString(line);
 #endif // defined(_DEBUG) || defined(PROFILE)
 }
 
@@ -230,7 +208,7 @@
 
 int hour, minute, second;
 double millisecond;
- s_globals.m_platform.GetCurrentLocalTime(hour, minute, second, millisecond);
+ g_logState.m_platform.GetCurrentLocalTime(hour, minute, second, millisecond);
 
 strData = StringUtils::Format(prefixFormat,
 hour,
@@ -240,5 +218,5 @@
 (uint64_t)CThread::GetCurrentThreadId(),
 levelNames[logLevel]) + strData;
 
- return s_globals.m_platform.WriteStringToLog(strData);
+ return g_logState.m_platform.WriteStringToLog(strData);
 }

_service:download_files:master.tar.gz/xbmc/utils/log.h Changed

@@ -2,7 +2,7 @@
 
 /*
 * Copyright (C) 2005-2014 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,33 +20,89 @@
 *
 */
 
+#include <memory>
 #include <string>
-
-#if defined(TARGET_POSIX)
-#include "posix/PosixInterfaceForCLog.h"
-typedef class CPosixInterfaceForCLog PlatformInterfaceForCLog;
-#elif defined(TARGET_WINDOWS)
-#include "win32/Win32InterfaceForCLog.h"
-typedef class CWin32InterfaceForCLog PlatformInterfaceForCLog;
-#endif
+#include <utility>
 
 #include "commons/ilog.h"
-#include "threads/CriticalSection.h"
 #include "utils/GlobalsHandling.h"
+#include "utils/StringUtils.h"
 
-#include "utils/params_check_macros.h"
 
 class CLog
 {
 public:
 CLog();
- ~CLog(void);
+ ~CLog();
 static void Close();
- static void Log(int loglevel, PRINTF_FORMAT_STRING const char *format, ...);
- static void Log(int loglevel, int component, PRINTF_FORMAT_STRING const char *format, ...);
- static void LogFunction(int loglevel, IN_OPT_STRING const char* functionName, PRINTF_FORMAT_STRING const char* format, ...) PARAM3_PRINTF_FORMAT;
- static void LogFunction(int loglevel, IN_OPT_STRING const char* functionName, int component, PRINTF_FORMAT_STRING const char* format, ...) PARAM4_PRINTF_FORMAT;
-#define LogF(loglevel,...) LogFunction((loglevel), __FUNCTION__, ##__VA_ARGS__)
+
+ static void Log(int loglevel, const char* format)
+ {
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, format);
+ }
+
+ template<typename... Args>
+ static void Log(int loglevel, const char* format, Args&&... args)
+ {
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, StringUtils::Format(format, std::forward<Args>(args)...));
+ }
+
+ static void Log(int loglevel, int component, const char* format)
+ {
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, component, format);
+ }
+
+ template<typename... Args>
+ static void Log(int loglevel, int component, const char* format, Args&&... args)
+ {
+ // We defer component checking to LogString to avoid having to drag in advancedsettings
+ // everywhere we want to log anything
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, component, StringUtils::Format(format, std::forward<Args>(args)...));
+ }
+
+ static void LogFunction(int loglevel, std::string functionName, const char* format)
+ {
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, functionName + ": " + format);
+ }
+
+ template<typename... Args>
+ static void LogFunction(int loglevel,
+ std::string functionName,
+ const char* format,
+ Args&&... args)
+ {
+ if (IsLogLevelLogged(loglevel))
+ {
+ functionName.append(": ");
+ LogString(loglevel, functionName + StringUtils::Format(format, std::forward<Args>(args)...));
+ }
+ }
+
+ static void LogFunction(int loglevel, std::string functionName, int component, const char* format)
+ {
+ if (IsLogLevelLogged(loglevel))
+ LogString(loglevel, component, functionName + ": " + format);
+ }
+
+ template<typename... Args>
+ static void LogFunction(
+ int loglevel, std::string functionName, int component, const char* format, Args&&... args)
+ {
+ // We defer component checking to LogString to avoid having to drag in advancedsettings
+ // everywhere we want to log anything
+ if (IsLogLevelLogged(loglevel))
+ {
+ functionName.append(": ");
+ LogString(loglevel, component,
+ functionName + StringUtils::Format(format, std::forward<Args>(args)...));
+ }
+ }
+#define LogF(loglevel, ...) LogFunction((loglevel), __FUNCTION__, ##__VA_ARGS__)
 static void MemDump(char *pData, int length);
 static bool Init(const std::string& path);
 static void PrintDebugString(const std::string& line); // universal interface for printing debug strings
@@ -56,33 +112,7 @@
 static bool IsLogLevelLogged(int loglevel);
 
 protected:
- class CLogGlobals
- {
- public:
- CLogGlobals(void) : m_repeatCount(0), m_repeatLogLevel(-1), m_logLevel(LOG_LEVEL_DEBUG), m_extraLogLevels(0) {}
- ~CLogGlobals() = default;
- PlatformInterfaceForCLog m_platform;
- int m_repeatCount;
- int m_repeatLogLevel;
- std::string m_repeatLine;
- int m_logLevel;
- int m_extraLogLevels;
- CCriticalSection critSec;
- };
- class CLogGlobals m_globalInstance; // used as static global variable
- static void LogString(int logLevel, const std::string& logString);
+ static void LogString(int logLevel, std::string&& logString);
+ static void LogString(int logLevel, int component, std::string&& logString);
 static bool WriteLogString(int logLevel, const std::string& logString);
-};
-
-
-namespace XbmcUtils
-{
- class LogImplementation : public XbmcCommons::ILogger
- {
- public:
- ~LogImplementation() override = default;
- inline void log(int logLevel, IN_STRING const char* message) override { CLog::Log(logLevel, "%s", message); }
- };
-}
-
-XBMC_GLOBAL_REF(CLog, g_log);
+};
\ No newline at end of file

_service:download_files:master.tar.gz/xbmc/utils/md5.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/params_check_macros.h Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/FileHandle.h Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/Mmap.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/Mmap.h Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/PosixInterfaceForCLog.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/PosixInterfaceForCLog.h Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/SharedMemory.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/posix/SharedMemory.h Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestAlarmClock.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestAliasShortcutUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestArchive.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestBase64.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestBitstreamStats.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestCPUInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestCharsetConverter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestCrc32.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestCryptThreading.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestDatabaseUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestEndianSwap.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestFileOperationJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestFileUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestGlobalsHandling.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestGlobalsHandlingPattern1.h Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestHTMLUtil.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestHttpHeader.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestHttpParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestHttpRangeUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestHttpResponse.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestJSONVariantParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestJSONVariantWriter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestJobManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestLabelFormatter.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestLangCodeExpander.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestLocale.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestMathUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestMime.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestPOUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestRegExp.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestRingBuffer.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestScraperParser.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestScraperUrl.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestSortUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestStopwatch.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestStreamDetails.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestStreamUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestStringUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestSystemInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestURIUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestUrlOptions.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestVariant.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestXBMCTinyXML.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/TestXMLUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/Testfstrcmp.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/Testlog.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/test/Testmd5.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/win32/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/utils/win32/Win32InterfaceForCLog.cpp Changed

_service:download_files:master.tar.gz/xbmc/utils/win32/Win32InterfaceForCLog.h Changed

_service:download_files:master.tar.gz/xbmc/utils/win32/Win32Log.cpp Deleted

@@ -1,65 +0,0 @@
-/*
-* Copyright (C) 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 "Win32Log.h"
-#include "utils/StringUtils.h"
-#include "utils/CharsetConverter.h"
-
-void CWin32Log::LogW(int loglevel, const wchar_t* format, ...)
-{
- if (IsLogLevelLogged(loglevel))
- {
- va_list va;
- va_start(va, format);
- std::wstring strDataW(StringUtils::FormatV(format, va));
- va_end(va);
- if (!strDataW.empty())
- {
- std::string strDataUtf8;
- if (g_charsetConverter.wToUTF8(strDataW, strDataUtf8, false) && !strDataUtf8.empty())
- LogString(loglevel, strDataUtf8);
- else
- PrintDebugString(__FUNCTION__ ": Can't convert log wide string to UTF-8");
- }
- }
-}
-
-void CWin32Log::LogFunctionW(int loglevel, const char* functionName, const wchar_t* format, ...)
-{
- if (IsLogLevelLogged(loglevel))
- {
- va_list va;
- va_start(va, format);
- std::wstring strDataW(StringUtils::FormatV(format, va));
- va_end(va);
- if (!strDataW.empty())
- {
- std::string funcNameStr;
- if (functionName && functionName[0])
- funcNameStr.assign(functionName).append(": ");
-
- std::string strDataUtf8;
- if (g_charsetConverter.wToUTF8(strDataW, strDataUtf8, false) && !strDataUtf8.empty())
- LogString(loglevel, funcNameStr + strDataUtf8);
- else
- PrintDebugString(__FUNCTION__ ": Can't convert log wide string to UTF-8");
- }
- }
-}

_service:download_files:master.tar.gz/xbmc/utils/win32/Win32Log.h Deleted

@@ -1,40 +0,0 @@
-#pragma once
-
-/*
-* Copyright (C) 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 "utils/log.h"
-
-#ifndef TARGET_WINDOWS
-#error This file is for Win32 platform only
-#endif // TARGET_WINDOWS
-
-
-// CLog version for Win32 with additional widestring logging capabilities
-class CWin32Log : public CLog
-{
-public:
- static void LogW(int loglevel, PRINTF_FORMAT_STRING const wchar_t *format, ...);
- static void LogFunctionW(int loglevel, IN_OPT_STRING const char* functionName, PRINTF_FORMAT_STRING const wchar_t* format, ...);
-#define LogFW(loglevel,format,...) LogFunctionW((loglevel),__FUNCTION__,(format),##__VA_ARGS__)
-};
-
-// substitute CWin32Log instead of CLog for Win32
-#define CLog CWin32Log

_service:download_files:master.tar.gz/xbmc/video/Bookmark.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/Bookmark.h Changed

_service:download_files:master.tar.gz/xbmc/video/Episode.h Changed

_service:download_files:master.tar.gz/xbmc/video/GUIViewStateVideo.h Changed

_service:download_files:master.tar.gz/xbmc/video/PlayerController.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/PlayerController.h Changed

_service:download_files:master.tar.gz/xbmc/video/Teletext.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/Teletext.h Changed

_service:download_files:master.tar.gz/xbmc/video/TeletextDefines.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoDatabase.cpp Changed

@@ -5597,7 +5597,7 @@
 
 std::string strSQL;
 Filter extFilter = filter;
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::string view, view_id, media_type, extraField, extraJoin;
 if (idContent == VIDEODB_CONTENT_MOVIES)
@@ -5699,7 +5699,7 @@
 return true;
 }
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::map<int, std::pair<std::string,int> > mapItems;
 while (!m_pDS->eof())
@@ -5845,7 +5845,7 @@
 extFilter.fields = PrepareSQL("musicvideo_view.c%02d, musicvideo_view.idMVideo, actor.name", VIDEODB_ID_MUSICVIDEO_ALBUM);
 extFilter.AppendJoin(PrepareSQL("JOIN actor_link ON actor_link.media_id=musicvideo_view.idMVideo AND actor_link.media_type='musicvideo'"));
 extFilter.AppendJoin(PrepareSQL("JOIN actor ON actor.actor_id = actor_link.actor_id"));
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 extFilter.fields += ", path.strPath";
 extFilter.AppendJoin("join files on files.idFile = musicvideo_view.idFile join path on path.idPath = files.idPath");
@@ -5881,7 +5881,7 @@
 return true;
 }
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::map<int, std::pair<std::string,std::string> > mapAlbums;
 while (!m_pDS->eof())
@@ -6003,7 +6003,7 @@
 // get primary genres for movies
 std::string strSQL;
 Filter extFilter = filter;
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::string view, view_id, media_type, extraField, group;
 if (idContent == VIDEODB_CONTENT_MOVIES)
@@ -6127,7 +6127,7 @@
 return true;
 }
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::map<int, CActor> mapActors;
 
@@ -6235,7 +6235,7 @@
 
 std::string strSQL;
 Filter extFilter = filter;
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 if (idContent == VIDEODB_CONTENT_MOVIES)
 {
@@ -6287,7 +6287,7 @@
 if (iRowsFound <= 0)
 return iRowsFound == 0;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 {
 std::map<int, std::pair<std::string,int> > mapYears;
 while (!m_pDS->eof())
@@ -6473,7 +6473,7 @@
 std::string path = m_pDS->fv(VIDEODB_ID_SEASON_TVSHOW_PATH).get_asString();
 
 if (mapSeasons.find(std::make_pair(showId, iSeason)) == mapSeasons.end() &&
- (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser ||
+ (m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser ||
 g_passwordManager.IsDatabasePathUnlocked(path, *CMediaSourceSettings::GetInstance().GetSources("video"))))
 {
 mapSeasons.insert(std::make_pair(showId, iSeason));
@@ -6768,7 +6768,7 @@
 const dbiplus::sql_record* const record = data.at(targetRow);
 
 CVideoInfoTag movie = GetDetailsForMovie(record, getDetails);
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ if (m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
 g_passwordManager.bMasterUser ||
 g_passwordManager.IsDatabasePathUnlocked(movie.m_strPath, *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
@@ -6876,7 +6876,7 @@
 
 CFileItemPtr pItem(new CFileItem());
 CVideoInfoTag movie = GetDetailsForTvShow(record, getDetails, pItem.get());
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ if (m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
 g_passwordManager.bMasterUser ||
 g_passwordManager.IsDatabasePathUnlocked(movie.m_strPath, *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
@@ -7003,7 +7003,7 @@
 const dbiplus::sql_record* const record = data.at(targetRow);
 
 CVideoInfoTag movie = GetDetailsForEpisode(record, getDetails);
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ if (m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE ||
 g_passwordManager.bMasterUser ||
 g_passwordManager.IsDatabasePathUnlocked(movie.m_strPath, *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
@@ -7425,7 +7425,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT genre.genre_id, genre.name, path.strPath FROM genre INNER JOIN genre_link ON genre_link.genre_id = genre.genre_id INNER JOIN movie ON (genre_link.media_type='movie' = genre_link.media_id=movie.idMovie) INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE genre.name LIKE '%%%s%%'",strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT genre.genre_id, genre.name FROM genre INNER JOIN genre_link ON genre_link.genre_id=genre.genre_id WHERE genre_link.media_type='movie' AND name LIKE '%%%s%%'", strSearch.c_str());
@@ -7433,7 +7433,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),
 *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
@@ -7465,7 +7465,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT country.country_id, country.name, path.strPath FROM country INNER JOIN country_link ON country_link.country_id=country.country_id INNER JOIN movie ON country_link.media_id=movie.idMovie INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE country_link.media_type='movie' AND country.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT country.country_id, country.name FROM country INNER JOIN country_link ON country_link.country_id=country.country_id WHERE country_link.media_type='movie' AND name like '%%%s%%'", strSearch.c_str());
@@ -7473,7 +7473,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),
 *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
@@ -7505,7 +7505,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT genre.genre_id, genre.name, path.strPath FROM genre INNER JOIN genre_link ON genre_link.genre_id=genre.genre_id INNER JOIN tvshow ON genre_link.media_id=tvshow.idShow INNER JOIN tvshowlinkpath ON tvshowlinkpath.idShow=tvshow.idShow INNER JOIN path ON path.idPath=tvshowlinkpath.idPath WHERE genre_link.media_type='tvshow' AND genre.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT genre.genre_id, genre.name FROM genre INNER JOIN genre_link ON genre_link.genre_id=genre.genre_id WHERE genre_link.media_type='tvshow' AND name LIKE '%%%s%%'", strSearch.c_str());
@@ -7513,7 +7513,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7544,7 +7544,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT actor.actor_id, actor.name, path.strPath FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN movie ON actor_link.media_id=movie.idMovie INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE actor_link.media_type='movie' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT actor.actor_id, actor.name FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN movie ON actor_link.media_id=movie.idMovie WHERE actor_link.media_type='movie' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
@@ -7552,7 +7552,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7583,7 +7583,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT actor.actor_id, actor.name, path.strPath FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN tvshow ON actor_link.media_id=tvshow.idShow INNER JOIN tvshowlinkpath ON tvshowlinkpath.idPath=tvshow.idShow INNER JOIN path ON path.idPath=tvshowlinkpath.idPath WHERE actor_link.media_type='tvshow' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT actor.actor_id, actor.name FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN tvshow ON actor_link.media_id=tvshow.idShow WHERE actor_link.media_type='tvshow' AND actor.name LIKE '%%%s%%'",strSearch.c_str());
@@ -7591,7 +7591,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7625,7 +7625,7 @@
 std::string strLike;
 if (!strSearch.empty())
 strLike = "and actor.name like '%%%s%%'";
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT actor.actor_id, actor.name, path.strPath FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN musicvideo ON actor_link.media_id=musicvideo.idMVideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE actor_link.media_type='musicvideo' "+strLike, strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT actor.actor_id, actor.name from actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id WHERE actor_link.media_type='musicvideo' "+strLike,strSearch.c_str());
@@ -7633,7 +7633,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7664,7 +7664,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT genre.genre_id, genre.name, path.strPath FROM genre INNER JOIN genre_link ON genre_link.genre_id=genre.genre_id INNER JOIN musicvideo ON genre_link.media_id=musicvideo.idMVideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE genre_link.media_type='musicvideo' AND genre.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT genre.genre_id, genre.name FROM genre INNER JOIN genre_link ON genre_link.genre_id=genre.genre_id WHERE genre_link.media_type='musicvideo' AND genre.name LIKE '%%%s%%'", strSearch.c_str());
@@ -7672,7 +7672,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7726,7 +7726,7 @@
 continue;
 }
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv(2).get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7757,7 +7757,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT musicvideo.idMVideo, musicvideo.c%02d,musicvideo.c%02d, path.strPath FROM musicvideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE musicvideo.c%02d LIKE '%%%s%%'", VIDEODB_ID_MUSICVIDEO_ALBUM, VIDEODB_ID_MUSICVIDEO_TITLE, VIDEODB_ID_MUSICVIDEO_ALBUM, strSearch.c_str());
 else
 strSQL = PrepareSQL("select musicvideo.idMVideo,musicvideo.c%02d,musicvideo.c%02d from musicvideo where musicvideo.c%02d like '%%%s%%'",VIDEODB_ID_MUSICVIDEO_ALBUM,VIDEODB_ID_MUSICVIDEO_TITLE,VIDEODB_ID_MUSICVIDEO_ALBUM,strSearch.c_str());
@@ -7765,7 +7765,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -7843,7 +7843,7 @@
 const dbiplus::sql_record* const record = data.at(targetRow);
 
 CVideoInfoTag musicvideo = GetDetailsForMusicVideo(record, getDetails);
- if (!checkLocks || CProfilesManager::GetInstance().GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser ||
+ if (!checkLocks || m_profileManager.GetMasterProfile().getLockMode() == LOCK_MODE_EVERYONE || g_passwordManager.bMasterUser ||
 g_passwordManager.IsDatabasePathUnlocked(musicvideo.m_strPath, *CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 CFileItemPtr item(new CFileItem(musicvideo));
@@ -7951,14 +7951,14 @@
 std::string strSQL;
 if (strAlbum.empty() && strTitle.empty())
 { // we want to return matching artists only
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL=PrepareSQL("SELECT DISTINCT actor.actor_id, path.strPath FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN musicvideo ON actor_link.media_id=musicvideo.idMVideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE actor_link.media_type='musicvideo' AND actor.name like '%s'", strArtist.c_str());
 else
 strSQL=PrepareSQL("SELECT DISTINCT actor.actor_id FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id WHERE actor_link.media_type='musicvideo' AND actor.name LIKE '%s'", strArtist.c_str());
 }
 else
 { // we want to return the matching musicvideo
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT musicvideo.idMVideo FROM actor INNER JOIN actor_link ON actor_link.actor_id=actor.actor_id INNER JOIN musicvideo ON actor_link.media_id=musicvideo.idMVideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE actor_link.media_type='musicvideo' AND musicvideo.c%02d LIKE '%s' AND musicvideo.c%02d LIKE '%s' AND actor.name LIKE '%s'", VIDEODB_ID_MUSICVIDEO_ALBUM, strAlbum.c_str(), VIDEODB_ID_MUSICVIDEO_TITLE, strTitle.c_str(), strArtist.c_str());
 else
 strSQL = PrepareSQL("select musicvideo.idMVideo from musicvideo join actor_link on actor_link.media_id=musicvideo.idMVideo AND actor_link.media_type='musicvideo' join actor on actor.actor_id=actor_link.actor_id where musicvideo.c%02d like '%s' and musicvideo.c%02d like '%s' and actor.name like '%s'",VIDEODB_ID_MUSICVIDEO_ALBUM,strAlbum.c_str(),VIDEODB_ID_MUSICVIDEO_TITLE,strTitle.c_str(),strArtist.c_str());
@@ -7968,7 +7968,7 @@
 if (m_pDS->eof())
 return -1;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->close();
@@ -7995,7 +7995,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT movie.idMovie, movie.c%02d, path.strPath, movie.idSet FROM movie INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE movie.c%02d LIKE '%%%s%%'", VIDEODB_ID_TITLE, VIDEODB_ID_TITLE, strSearch.c_str());
 else
 strSQL = PrepareSQL("select movie.idMovie,movie.c%02d, movie.idSet from movie where movie.c%02d like '%%%s%%'",VIDEODB_ID_TITLE,VIDEODB_ID_TITLE,strSearch.c_str());
@@ -8003,7 +8003,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8040,7 +8040,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT tvshow.idShow, tvshow.c%02d, path.strPath FROM tvshow INNER JOIN tvshowlinkpath ON tvshowlinkpath.idShow=tvshow.idShow INNER JOIN path ON path.idPath=tvshowlinkpath.idPath WHERE tvshow.c%02d LIKE '%%%s%%'", VIDEODB_ID_TV_TITLE, VIDEODB_ID_TV_TITLE, strSearch.c_str());
 else
 strSQL = PrepareSQL("select tvshow.idShow,tvshow.c%02d from tvshow where tvshow.c%02d like '%%%s%%'",VIDEODB_ID_TV_TITLE,VIDEODB_ID_TV_TITLE,strSearch.c_str());
@@ -8048,7 +8048,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8081,7 +8081,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT episode.idEpisode, episode.c%02d, episode.c%02d, episode.idShow, tvshow.c%02d, path.strPath FROM episode INNER JOIN tvshow ON tvshow.idShow=episode.idShow INNER JOIN files ON files.idFile=episode.idFile INNER JOIN path ON path.idPath=files.idPath WHERE episode.c%02d LIKE '%%%s%%'", VIDEODB_ID_EPISODE_TITLE, VIDEODB_ID_EPISODE_SEASON, VIDEODB_ID_TV_TITLE, VIDEODB_ID_EPISODE_TITLE, strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT episode.idEpisode, episode.c%02d, episode.c%02d, episode.idShow, tvshow.c%02d FROM episode INNER JOIN tvshow ON tvshow.idShow=episode.idShow WHERE episode.c%02d like '%%%s%%'", VIDEODB_ID_EPISODE_TITLE, VIDEODB_ID_EPISODE_SEASON, VIDEODB_ID_TV_TITLE, VIDEODB_ID_EPISODE_TITLE, strSearch.c_str());
@@ -8089,7 +8089,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8124,7 +8124,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT musicvideo.idMVideo, musicvideo.c%02d, path.strPath FROM musicvideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE musicvideo.c%02d LIKE '%%%s%%'", VIDEODB_ID_MUSICVIDEO_TITLE, VIDEODB_ID_MUSICVIDEO_TITLE, strSearch.c_str());
 else
 strSQL = PrepareSQL("select musicvideo.idMVideo,musicvideo.c%02d from musicvideo where musicvideo.c%02d like '%%%s%%'",VIDEODB_ID_MUSICVIDEO_TITLE,VIDEODB_ID_MUSICVIDEO_TITLE,strSearch.c_str());
@@ -8132,7 +8132,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8171,7 +8171,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT episode.idEpisode, episode.c%02d, episode.c%02d, episode.idShow, tvshow.c%02d, path.strPath FROM episode INNER JOIN tvshow ON tvshow.idShow=episode.idShow INNER JOIN files ON files.idFile=episode.idFile INNER JOIN path ON path.idPath=files.idPath WHERE episode.c%02d LIKE '%%%s%%'", VIDEODB_ID_EPISODE_TITLE, VIDEODB_ID_EPISODE_SEASON, VIDEODB_ID_TV_TITLE, VIDEODB_ID_EPISODE_PLOT, strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT episode.idEpisode, episode.c%02d, episode.c%02d, episode.idShow, tvshow.c%02d FROM episode INNER JOIN tvshow ON tvshow.idShow=episode.idShow WHERE episode.c%02d LIKE '%%%s%%'", VIDEODB_ID_EPISODE_TITLE, VIDEODB_ID_EPISODE_SEASON, VIDEODB_ID_TV_TITLE, VIDEODB_ID_EPISODE_PLOT, strSearch.c_str());
@@ -8179,7 +8179,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8210,7 +8210,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("select movie.idMovie, movie.c%02d, path.strPath FROM movie INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE movie.c%02d LIKE '%%%s%%' OR movie.c%02d LIKE '%%%s%%' OR movie.c%02d LIKE '%%%s%%'", VIDEODB_ID_TITLE,VIDEODB_ID_PLOT, strSearch.c_str(), VIDEODB_ID_PLOTOUTLINE, strSearch.c_str(), VIDEODB_ID_TAGLINE,strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT movie.idMovie, movie.c%02d FROM movie WHERE (movie.c%02d LIKE '%%%s%%' OR movie.c%02d LIKE '%%%s%%' OR movie.c%02d LIKE '%%%s%%')", VIDEODB_ID_TITLE, VIDEODB_ID_PLOT, strSearch.c_str(), VIDEODB_ID_PLOTOUTLINE, strSearch.c_str(), VIDEODB_ID_TAGLINE, strSearch.c_str());
@@ -8219,7 +8219,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv(2).get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8252,7 +8252,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name, path.strPath FROM movie INNER JOIN director_link ON (director_link.media_id=movie.idMovie AND director_link.media_type='movie') INNER JOIN actor ON actor.actor_id=director_link.actor_id INNER JOIN files ON files.idFile=movie.idFile INNER JOIN path ON path.idPath=files.idPath WHERE actor.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name FROM actor INNER JOIN director_link ON director_link.actor_id=actor.actor_id INNER JOIN movie ON director_link.media_id=movie.idMovie WHERE director_link.media_type='movie' AND actor.name like '%%%s%%'", strSearch.c_str());
@@ -8261,7 +8261,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8293,7 +8293,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name, path.strPath FROM actor INNER JOIN director_link ON director_link.actor_id=actor.actor_id INNER JOIN tvshow ON director_link.media_id=tvshow.idShow INNER JOIN tvshowlinkpath ON tvshowlinkpath.idShow=tvshow.idShow INNER JOIN path ON path.idPath=tvshowlinkpath.idPath WHERE director_link.media_type='tvshow' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name FROM actor INNER JOIN director_link ON director_link.actor_id=actor.actor_id INNER JOIN tvshow ON director_link.media_id=tvshow.idShow WHERE director_link.media_type='tvshow' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
@@ -8302,7 +8302,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();
@@ -8334,7 +8334,7 @@
 if (NULL == m_pDB.get()) return;
 if (NULL == m_pDS.get()) return;
 
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name, path.strPath FROM actor INNER JOIN director_link ON director_link.actor_id=actor.actor_id INNER JOIN musicvideo ON director_link.media_id=musicvideo.idMVideo INNER JOIN files ON files.idFile=musicvideo.idFile INNER JOIN path ON path.idPath=files.idPath WHERE director_link.media_type='musicvideo' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
 else
 strSQL = PrepareSQL("SELECT DISTINCT director_link.actor_id, actor.name FROM actor INNER JOIN director_link ON director_link.actor_id=actor.actor_id INNER JOIN musicvideo ON director_link.media_id=musicvideo.idMVideo WHERE director_link.media_type='musicvideo' AND actor.name LIKE '%%%s%%'", strSearch.c_str());
@@ -8343,7 +8343,7 @@
 
 while (!m_pDS->eof())
 {
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
+ if (m_profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
 if (!g_passwordManager.IsDatabasePathUnlocked(std::string(m_pDS->fv("path.strPath").get_asString()),*CMediaSourceSettings::GetInstance().GetSources("video")))
 {
 m_pDS->next();

_service:download_files:master.tar.gz/xbmc/video/VideoDbUrl.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoDownloader.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoDownloader.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoScanner.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoScanner.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoTag.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoInfoTag.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoLibraryQueue.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoLibraryQueue.h Changed

_service:download_files:master.tar.gz/xbmc/video/VideoThumbLoader.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/VideoThumbLoader.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogCMSSettings.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogFullScreenInfo.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogSubtitles.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogSubtitles.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogTeletext.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogTeletext.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoBookmarks.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoInfo.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -250,14 +250,16 @@
 m_hasUpdatedUserrating = false;
 m_bViewReview = true;
 
- CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_REFRESH, (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID(), "xx"));
- CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB, (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID().c_str() + 2, "plugin"));
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_REFRESH, (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID(), "xx"));
+ CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_THUMB, (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID().c_str() + 2, "plugin"));
 // Disable video user rating button for plugins as they don't have tables to save this
 CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_USERRATING, !m_movieItem->IsPlugin());
 
 VIDEODB_CONTENT_TYPE type = static_cast<VIDEODB_CONTENT_TYPE>(m_movieItem->GetVideoContentType());
 if (type == VIDEODB_CONTENT_TVSHOWS || type == VIDEODB_CONTENT_MOVIES)
- CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_FANART, (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID().c_str() + 2, "plugin"));
+ CONTROL_ENABLE_ON_CONDITION(CONTROL_BTN_GET_FANART, (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser) && !StringUtils::StartsWithNoCase(m_movieItem->GetVideoInfoTag()->GetUniqueID().c_str() + 2, "plugin"));
 else
 CONTROL_DISABLE(CONTROL_BTN_GET_FANART);
 
@@ -1396,10 +1398,12 @@
 if (!DeleteVideoItemFromDatabase(item, unavailable))
 return false;
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // check if the user is allowed to delete the actual file as well
 if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_FILELISTS_ALLOWFILEDELETION) &&
- (CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() == LOCK_MODE_EVERYONE ||
- !CProfilesManager::GetInstance().GetCurrentProfile().filesLocked() ||
+ (profileManager.GetCurrentProfile().getLockMode() == LOCK_MODE_EVERYONE ||
+ !profileManager.GetCurrentProfile().filesLocked() ||
 g_passwordManager.IsMasterLockUnlocked(true)))
 {
 std::string strDeletePath = item->GetVideoInfoTag()->GetPath();

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoInfo.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoOSD.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoOSD.h Changed

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoSettings.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2014 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -201,8 +201,10 @@
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_VIDEO_CALIBRATION)
   {
+    const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
     // launch calibration window
-    if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE  &&
+    if (profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE  &&
         g_passwordManager.CheckSettingLevelLock(CServiceBroker::GetSettings().GetSetting(CSettings::SETTING_VIDEOSCREEN_GUICALIBRATION)->GetLevel()))
       return;
     g_windowManager.ForceActivateWindow(WINDOW_SCREEN_CALIBRATION);
@@ -214,7 +216,9 @@
 
 void CGUIDialogVideoSettings::Save()
 {
-  if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+  if (profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE &&
       !g_passwordManager.CheckSettingLevelLock(::SettingLevel::Expert))
     return;

_service:download_files:master.tar.gz/xbmc/video/dialogs/GUIDialogVideoSettings.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryCleaningJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryCleaningJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryMarkWatchedJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryMarkWatchedJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryProgressJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryProgressJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryRefreshingJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryRefreshingJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryResetResumePointJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryScanningJob.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/jobs/VideoLibraryScanningJob.h Changed

_service:download_files:master.tar.gz/xbmc/video/tags/IVideoInfoTagLoader.h Changed

_service:download_files:master.tar.gz/xbmc/video/tags/VideoInfoTagLoaderFactory.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/tags/VideoInfoTagLoaderFactory.h Changed

_service:download_files:master.tar.gz/xbmc/video/tags/VideoTagLoaderFFmpeg.h Changed

_service:download_files:master.tar.gz/xbmc/video/tags/VideoTagLoaderNFO.h Changed

_service:download_files:master.tar.gz/xbmc/video/test/TestVideoInfoScanner.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowFullScreen.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowFullScreen.h Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoBase.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -172,8 +172,10 @@
 }
 else if (iAction == ACTION_DELETE_ITEM)
 {
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // is delete allowed?
- if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases())
+ if (profileManager.GetCurrentProfile().canWriteDatabases())
 {
 // must be at the title window
 if (GetID() == WINDOW_VIDEO_NAV)
@@ -383,8 +385,10 @@
 }
 }
 
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 // quietly return if Internet lookups are disabled
- if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
+ if (!profileManager.GetCurrentProfile().canWriteDatabases() && !g_passwordManager.bMasterUser)
 return false;
 
 if (!info)
@@ -566,7 +570,7 @@
 {
 if (item->GetCurrentResumeTimeAndPartNumber(startoffset, partNumber))
 {
- startoffset *= 75;
+ startoffset = CUtil::ConvertSecsToMilliSecs(startoffset);
 }
 else
 {
@@ -848,15 +852,19 @@
 }
 
 if (!item->m_bIsFolder && !(item->IsPlayList() && !g_advancedSettings.m_playlistAsFolders))
- { // get players
+ {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
+ // get players
 std::vector<std::string> players;
 if (item->IsVideoDb())
 {
 CFileItem item2(item->GetVideoInfoTag()->m_strFileNameAndPath, false);
- CPlayerCoreFactory::GetInstance().GetPlayers(item2, players);
+ playerCoreFactory.GetPlayers(item2, players);
 }
 else
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
+ playerCoreFactory.GetPlayers(*item, players);
+
 if (players.size() > 1)
 buttons.Add(CONTEXT_BUTTON_PLAY_WITH, 15213);
 }
@@ -984,15 +992,18 @@
 
 case CONTEXT_BUTTON_PLAY_WITH:
 {
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 std::vector<std::string> players;
 if (item->IsVideoDb())
 {
 CFileItem item2(*item->GetVideoInfoTag());
- CPlayerCoreFactory::GetInstance().GetPlayers(item2, players);
+ playerCoreFactory.GetPlayers(item2, players);
 }
 else
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
- std:: string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(*item, players);
+
+ std:: string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 {
 // any other select actions but play or resume, resume, play or playpart
@@ -1137,8 +1148,11 @@
 // HACK: stacked files need to be treated as folders in order to be deleted
 if (item->IsStack())
 item->m_bIsFolder = true;
- if (CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE &&
- CProfilesManager::GetInstance().GetCurrentProfile().filesLocked())
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (profileManager.GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE &&
+ profileManager.GetCurrentProfile().filesLocked())
 {
 if (!g_passwordManager.IsMasterLockUnlocked(true))
 return;
@@ -1242,7 +1256,9 @@
 // add in the "New Playlist" item if we're in the playlists folder
 if ((items.GetPath() == "special://videoplaylists/") && !items.Contains("newplaylist://"))
 {
- CFileItemPtr newPlaylist(new CFileItem(CProfilesManager::GetInstance().GetUserDataItem("PartyMode-Video.xsp"),false));
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ CFileItemPtr newPlaylist(new CFileItem(profileManager.GetUserDataItem("PartyMode-Video.xsp"),false));
 newPlaylist->SetLabel(g_localizeStrings.Get(16035));
 newPlaylist->SetLabelPreformatted(true);
 newPlaylist->SetIconImage("DefaultPartyMode.png");

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoBase.h Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoNav.cpp Changed

@@ -900,6 +900,8 @@
   CVideoDatabaseDirectory dir;
   NODE_TYPE node = dir.GetDirectoryChildType(m_vecItems->GetPath());
 
+  const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
   if (!item)
   {
     // nothing to do here
@@ -909,7 +911,7 @@
     // get the usual shares
     CGUIDialogContextMenu::GetContextButtons("video", item, buttons);
     if (!item->IsDVD() && item->GetPath() != "add" && !item->IsParentFolder() &&
-        (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
+        (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))
     {
       CVideoDatabase database;
       database.Open();
@@ -967,7 +969,7 @@
       GetScraperForItem(item.get(), info, settings);
 
       // can we update the database?
-      if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)
+      if (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)
       {
         if (!g_application.IsVideoScanning() && item->IsVideoDb() && item->HasVideoInfoTag() &&
            (item->GetVideoInfoTag()->m_type == MediaTypeMovie ||          // movies
@@ -1128,7 +1130,10 @@
   if (!item->m_bIsFolder && item->IsVideoDb() && !item->Exists())
   {
     CLog::Log(LOGDEBUG, "%s called on '%s' but file doesn't exist", __FUNCTION__, item->GetPath().c_str());
-    if (CProfilesManager::GetInstance().GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)
+
+    const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+    if (profileManager.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser)
     {
       if (!CGUIDialogVideoInfo::DeleteVideoItemFromDatabase(item, true))
         return true;

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoNav.h Changed

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoPlaylist.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -405,15 +405,19 @@
 if (itemNumber > -1)
 {
 CFileItemPtr item = m_vecItems->Get(itemNumber);
+
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 // check what players we have, if we have multiple display play with option
 std::vector<std::string> players;
 if (item->IsVideoDb())
 {
 CFileItem item2(item->GetVideoInfoTag()->m_strFileNameAndPath, false);
- CPlayerCoreFactory::GetInstance().GetPlayers(item2, players);
+ playerCoreFactory.GetPlayers(item2, players);
 }
 else
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
+ playerCoreFactory.GetPlayers(*item, players);
+
 if (players.size() > 1)
 buttons.Add(CONTEXT_BUTTON_PLAY_WITH, 15213); // Play With...
 
@@ -451,15 +455,18 @@
 if (!item)
 break;
 
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 std::vector<std::string> players;
 if (item->IsVideoDb())
 {
 CFileItem item2(*item->GetVideoInfoTag());
- CPlayerCoreFactory::GetInstance().GetPlayers(item2, players);
+ playerCoreFactory.GetPlayers(item2, players);
 }
 else
- CPlayerCoreFactory::GetInstance().GetPlayers(*item, players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(*item, players);
+
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 OnClick(itemNumber, player);
 return true;

_service:download_files:master.tar.gz/xbmc/video/windows/GUIWindowVideoPlaylist.h Changed

_service:download_files:master.tar.gz/xbmc/video/windows/VideoFileItemListModifier.cpp Changed

_service:download_files:master.tar.gz/xbmc/video/windows/VideoFileItemListModifier.h Changed

_service:download_files:master.tar.gz/xbmc/view/GUIViewControl.cpp Changed

_service:download_files:master.tar.gz/xbmc/view/GUIViewControl.h Changed

_service:download_files:master.tar.gz/xbmc/view/GUIViewState.cpp Changed

_service:download_files:master.tar.gz/xbmc/view/GUIViewState.h Changed

_service:download_files:master.tar.gz/xbmc/view/ViewDatabase.cpp Changed

_service:download_files:master.tar.gz/xbmc/view/ViewDatabase.h Changed

_service:download_files:master.tar.gz/xbmc/view/ViewState.h Changed

_service:download_files:master.tar.gz/xbmc/view/ViewStateSettings.cpp Changed

_service:download_files:master.tar.gz/xbmc/view/ViewStateSettings.h Changed

_service:download_files:master.tar.gz/xbmc/weather/GUIWindowWeather.cpp Changed

_service:download_files:master.tar.gz/xbmc/weather/GUIWindowWeather.h Changed

_service:download_files:master.tar.gz/xbmc/weather/WeatherManager.cpp Changed

_service:download_files:master.tar.gz/xbmc/weather/WeatherManager.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/OSScreenSaver.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/OSScreenSaver.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/VideoSync.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/WinEvents.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/WinEventsLinux.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/WinEventsLinux.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/WinSystem.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/WinSystem.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContextEGL.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2014 Team XBMC
- * http://xbmc.org
+ * 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
@@ -28,9 +28,9 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/glext.h>
-
 #include "GLContextEGL.h"
 #include "utils/log.h"
+#include <EGL/eglext.h>
 
 #define EGL_NO_CONFIG (EGLConfig)0
 
@@ -129,7 +129,7 @@
 }
 eglTerminate(m_eglDisplay);
 m_eglDisplay = EGL_NO_DISPLAY;
- XSync(m_dpy, FALSE);
+ XSync(m_dpy, False);
 newContext = true;
 }
 
@@ -177,14 +177,29 @@
 
 EGLint contextAttributes[] =
 {
- EGL_CONTEXT_CLIENT_VERSION, 2,
+ EGL_CONTEXT_MAJOR_VERSION_KHR, 3,
+ EGL_CONTEXT_MINOR_VERSION_KHR, 2,
+ EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
 EGL_NONE
 };
 m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig, EGL_NO_CONTEXT, contextAttributes);
 if (m_eglContext == EGL_NO_CONTEXT)
 {
- CLog::Log(LOGERROR, "failed to create EGL context\n");
- return false;
+ EGLint contextAttributes[] =
+ {
+ EGL_CONTEXT_MAJOR_VERSION_KHR, 2,
+ EGL_NONE
+ };
+ m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig, EGL_NO_CONTEXT, contextAttributes);
+
+ if (m_eglContext == EGL_NO_CONTEXT)
+ {
+ CLog::Log(LOGERROR, "failed to create EGL context\n");
+ return false;
+ }
+
+ CLog::Log(LOGWARNING, "Failed to get an OpenGL context supporting core profile 3.2, \
+ using legacy mode with reduced feature set");
 }
 
 if (!eglMakeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext))

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContextEGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContextGLX.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/GLContextGLX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/OSScreenSaverX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/OSScreenSaverX11.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/VideoSyncDRM.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/VideoSyncDRM.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/VideoSyncGLX.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/VideoSyncGLX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinEventsX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLContext.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -34,7 +34,7 @@
 #include "VideoSyncDRM.h"
 
 #include "cores/RetroPlayer/process/X11/RPProcessInfoX11.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGL.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/Process/X11/ProcessInfoX11.h"
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
@@ -149,7 +149,7 @@
   if (newwin)
   {
     RefreshGLContext(m_currentOutput.compare(output) != 0);
-    XSync(m_dpy, FALSE);
+    XSync(m_dpy, False);
     g_graphicsContext.Clear(0);
     g_graphicsContext.Flip(true, false);
     ResetVSync();
@@ -257,7 +257,7 @@
 
   VIDEOPLAYER::CProcessInfoX11::Register();
   RETRO::CRPProcessInfoX11::Register();
-  RETRO::CRPProcessInfoX11::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+  RETRO::CRPProcessInfoX11::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGL);
   CDVDFactoryCodec::ClearHWAccels();
   VIDEOPLAYER::CRendererFactory::ClearRenderer();
   CLinuxRendererGL::Register();

_service:download_files:master.tar.gz/xbmc/windowing/X11/WinSystemX11GLContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/X11/XRandR.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/XBMC_events.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/GLContextEGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/GLContextEGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/VideoSyncAML.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/VideoSyncAML.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/WinSystemAmlogic.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,7 +25,7 @@
 
 #include "ServiceBroker.h"
 #include "cores/RetroPlayer/process/amlogic/RPProcessInfoAmlogic.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h"
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h"
 #include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h"
@@ -34,6 +34,7 @@
 #include "cores/AudioEngine/Sinks/AESinkALSA.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/Resolution.h"
+#include "powermanagement/linux/LinuxPowerSyscall.h"
 #include "settings/Settings.h"
 #include "settings/DisplaySettings.h"
 #include "guilib/DispResource.h"
@@ -63,7 +64,7 @@
 }
 
 m_nativeDisplay = EGL_NO_DISPLAY;
- m_nativeWindow = nullptr;
+ m_nativeWindow = static_cast<EGLNativeWindowType>(NULL);
 
 m_displayWidth = 0;
 m_displayHeight = 0;
@@ -78,13 +79,14 @@
 // Register sink
 AE::CAESinkFactory::ClearSinks();
 CAESinkALSA::Register();
+ CLinuxPowerSyscall::Register();
 }
 
 CWinSystemAmlogic::~CWinSystemAmlogic()
 {
 if(m_nativeWindow)
 {
- m_nativeWindow = nullptr;
+ m_nativeWindow = static_cast<EGLNativeWindowType>(NULL);
 }
 }
 
@@ -95,9 +97,11 @@
 CDVDVideoCodecAmlogic::Register();
 CLinuxRendererGLES::Register();
 RETRO::CRPProcessInfoAmlogic::Register();
- RETRO::CRPProcessInfoAmlogic::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+ RETRO::CRPProcessInfoAmlogic::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
 CRendererAML::Register();
 
+ aml_set_framebuffer_resolution(1920, 1080, m_framebuffer_name);
+
 return CWinSystemBase::InitWindowSystem();
 }
 
@@ -149,10 +153,12 @@
 m_stereo_mode = stereo_mode;
 m_bFullScreen = fullScreen;
 
+#ifdef _FBDEV_WINDOW_H_
 fbdev_window *nativeWindow = new fbdev_window;
 nativeWindow->width = res.iWidth;
 nativeWindow->height = res.iHeight;
 m_nativeWindow = static_cast<EGLNativeWindowType>(nativeWindow);
+#endif
 
 aml_set_native_resolution(res, m_framebuffer_name, stereo_mode);
 
@@ -171,7 +177,7 @@
 
 bool CWinSystemAmlogic::DestroyWindow()
 {
- m_nativeWindow = nullptr;
+ m_nativeWindow = static_cast<EGLNativeWindowType>(NULL);
 
 return true;
 }

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/WinSystemAmlogic.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/WinSystemAmlogicGLESContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/amlogic/WinSystemAmlogicGLESContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/AndroidUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/AndroidUtils.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/GLContextEGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/GLContextEGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinEventsAndroid.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinEventsAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroid.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -35,11 +35,12 @@
 #include "platform/android/activity/XBMCApp.h"
 
 #include "cores/RetroPlayer/process/android/RPProcessInfoAndroid.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h"
 #include "cores/VideoPlayer/DVDCodecs/Audio/DVDAudioCodecAndroidMediaCodec.h"
 #include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodec.h"
 #include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererMediaCodecSurface.h"
+#include "powermanagement/android/AndroidPowerSyscall.h"
 
 #include <EGL/egl.h>
 #include <EGL/eglplatform.h>
@@ -60,6 +61,7 @@
 m_android = nullptr;
 
 m_winEvents.reset(new CWinEventsAndroid());
+ CAndroidPowerSyscall::Register();
 }
 
 CWinSystemAndroid::~CWinSystemAndroid()
@@ -81,7 +83,7 @@
 
 CLinuxRendererGLES::Register();
 RETRO::CRPProcessInfoAndroid::Register();
- RETRO::CRPProcessInfoAndroid::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+ RETRO::CRPProcessInfoAndroid::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
 CRendererMediaCodec::Register();
 CRendererMediaCodecSurface::Register();

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroid.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroidGLESContext.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/android/WinSystemAndroidGLESContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMAtomic.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMAtomic.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMLegacy.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMLegacy.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/DRMUtils.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/GBMUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/GBMUtils.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/GLContextEGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/GLContextEGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbm.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbm.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbmGLESContext.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -22,7 +22,7 @@
 #include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererDRMPRIME.h"
 
 #include "cores/RetroPlayer/process/gbm/RPProcessInfoGbm.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
@@ -43,7 +43,7 @@
 {
   CLinuxRendererGLES::Register();
   RETRO::CRPProcessInfoGbm::Register();
-  RETRO::CRPProcessInfoGbm::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+  RETRO::CRPProcessInfoGbm::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
 
   if (!CWinSystemGbm::InitWindowSystem())
   {

_service:download_files:master.tar.gz/xbmc/windowing/gbm/WinSystemGbmGLESContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/linux/OSScreenSaverFreedesktop.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/linux/OSScreenSaverFreedesktop.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/mir/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/windowing/mir/WinEventsMir.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/mir/WinSystemMir.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/OSScreenSaverOSX.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/OSScreenSaverOSX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinEventsIOS.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinEventsOSX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinEventsSDL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinEventsSDL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinSystemIOS.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinSystemIOS.mm Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinSystemOSX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinSystemOSX.mm Changed

@@ -29,7 +29,7 @@
 #include "cores/AudioEngine/AESinkFactory.h"
 #include "cores/AudioEngine/Sinks/AESinkDARWINOSX.h"
 #include "cores/RetroPlayer/process/osx/RPProcessInfoOSX.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGL.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/VTB.h"
 #include "cores/VideoPlayer/Process/osx/ProcessInfoOSX.h"
@@ -38,6 +38,7 @@
 #include "cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h"
 #include "guilib/DispResource.h"
 #include "guilib/GUIWindowManager.h"
+#include "powermanagement/osx/CocoaPowerSyscall.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
 #include "settings/DisplaySettings.h"
@@ -617,6 +618,7 @@
 
   AE::CAESinkFactory::ClearSinks();
   CAESinkDARWINOSX::Register();
+  CCocoaPowerSyscall::Register();
 }
 
 CWinSystemOSX::~CWinSystemOSX()
@@ -797,7 +799,7 @@
   CRendererVTB::Register();
   VIDEOPLAYER::CProcessInfoOSX::Register();
   RETRO::CRPProcessInfoOSX::Register();
-  RETRO::CRPProcessInfoOSX::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+  RETRO::CRPProcessInfoOSX::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGL);
   return true;
 }
 
@@ -1230,7 +1232,7 @@
   };
 
   NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:wattrs_gl3];
-  if (!getenv("KODI_GL_PROFILE_3_2"))
+  if (getenv("KODI_GL_PROFILE_LEGACY"))
     pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:wattrs];
 
   newContext = [[NSOpenGLContext alloc] initWithFormat:(NSOpenGLPixelFormat*)pixFmt
@@ -1289,7 +1291,7 @@
   };
 
   NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:fsattrs_gl3];
-  if (!getenv("KODI_GL_PROFILE_3_2"))
+  if (getenv("KODI_GL_PROFILE_LEGACY"))
     pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:fsattrs];
 
   if (!pixFmt)

_service:download_files:master.tar.gz/xbmc/windowing/osx/WinSystemOSXGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/GLContextEGL.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/GLContextEGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/RPIUtils.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/RPIUtils.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/VideoSyncPi.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/VideoSyncPi.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/WinSystemRpi.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/WinSystemRpi.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/rpi/WinSystemRpiGLESContext.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -25,7 +25,7 @@
 #include "utils/log.h"
 #include "cores/RetroPlayer/process/rbpi/RPProcessInfoPi.h"
 #include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererMMAL.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
 #include "cores/VideoPlayer/DVDCodecs/DVDFactoryCodec.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/MMALFFmpeg.h"
 #include "cores/VideoPlayer/DVDCodecs/Video/MMALCodec.h"
@@ -57,7 +57,7 @@
   CProcessInfoPi::Register();
   RETRO::CRPProcessInfoPi::Register();
   //RETRO::CRPProcessInfoPi::RegisterRendererFactory(new RETRO::CRendererFactoryMMAL); //! @todo
-  RETRO::CRPProcessInfoPi::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+  RETRO::CRPProcessInfoPi::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
   CDVDFactoryCodec::ClearHWAccels();
   MMAL::CDecoder::Register();
   CDVDFactoryCodec::ClearHWVideoCodecs();

_service:download_files:master.tar.gz/xbmc/windowing/rpi/WinSystemRpiGLESContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/CMakeLists.txt Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Connection.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Connection.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/EGLContext.cpp Added

@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2017 Team XBMC
+ * 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 "EGLContext.h"
+
+#include "utils/EGLUtils.h"
+#include "utils/log.h"
+
+using namespace KODI::WINDOWING::WAYLAND;
+
+CEGLContext::CEGLContext()
+{
+ // EGL_EXT_platform_wayland requires EGL_EXT_client_extensions, so this should
+ // be safe to use
+ m_clientExtensions = CEGLUtils::GetClientExtensions();
+
+ if (m_clientExtensions.find("EGL_EXT_platform_base") == m_clientExtensions.end())
+ {
+ throw std::runtime_error("EGL implementation does not support EGL_EXT_platform_base, cannot continue");
+ }
+ if (m_clientExtensions.find("EGL_EXT_platform_wayland") == m_clientExtensions.end())
+ {
+ throw std::runtime_error("EGL implementation does not support EGL_EXT_platform_wayland, cannot continue");
+ }
+
+ // Theoretically it is possible to use eglGetDisplay() and eglCreateWindowSurface,
+ // but then the EGL library basically has to guess which platform we want
+ // if it supports multiple which is usually the case -
+ // it's better and safer to make it explicit
+ m_eglGetPlatformDisplayEXT = CEGLUtils::GetRequiredProcAddress<PFNEGLGETPLATFORMDISPLAYEXTPROC>("eglGetPlatformDisplayEXT");
+ m_eglCreatePlatformWindowSurfaceEXT = CEGLUtils::GetRequiredProcAddress<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>("eglCreatePlatformWindowSurfaceEXT");
+}
+
+CEGLContext::~CEGLContext() noexcept
+{
+ Destroy();
+}
+
+bool CEGLContext::CreateDisplay(wayland::display_t& display,
+ EGLint renderableType,
+ EGLenum renderingApi)
+{
+ if (m_eglDisplay != EGL_NO_DISPLAY)
+ {
+ throw std::logic_error("Do not call CreateDisplay when display has already been created");
+ }
+
+ EGLint neglconfigs = 0;
+ int major, minor;
+
+ EGLint attribs[] ={
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+ EGL_RENDERABLE_TYPE, renderableType,
+ EGL_RED_SIZE, 8,
+ EGL_GREEN_SIZE, 8,
+ EGL_BLUE_SIZE, 8,
+ EGL_DEPTH_SIZE, 16,
+ EGL_NONE,
+ };
+
+ m_eglDisplay = m_eglGetPlatformDisplayEXT(EGL_PLATFORM_WAYLAND_EXT, display, nullptr);
+
+ if (m_eglDisplay == EGL_NO_DISPLAY)
+ {
+ CEGLUtils::LogError("Failed to get EGL Wayland platform display");
+ return false;
+ }
+
+ if (eglInitialize(m_eglDisplay, &major, &minor) != EGL_TRUE)
+ {
+ CEGLUtils::LogError("Failed to initialize EGL display");
+ Destroy();
+ return false;
+ }
+ CLog::Log(LOGINFO, "Got EGL v%d.%d", major, minor);
+
+ if (eglBindAPI(renderingApi) != EGL_TRUE)
+ {
+ CEGLUtils::LogError("Failed to bind EGL API");
+ Destroy();
+ return false;
+ }
+
+ if (eglChooseConfig(m_eglDisplay, attribs, &m_eglConfig, 1, &neglconfigs) != EGL_TRUE)
+ {
+ CEGLUtils::LogError("Failed to query number of EGL configs");
+ Destroy();
+ return false;
+ }
+
+ if (neglconfigs <= 0)
+ {
+ CLog::Log(LOGERROR, "No suitable EGL configs found");
+ Destroy();
+ return false;
+ }
+
+ return true;
+}
+
+bool CEGLContext::CreateContext(const EGLint* contextAttribs)
+{
+ if (m_eglContext != EGL_NO_CONTEXT)
+ {
+ throw std::logic_error("Do not call CreateContext when context has already been created");
+ }
+
+ m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig,
+ EGL_NO_CONTEXT, contextAttribs);
+
+ if (m_eglContext == EGL_NO_CONTEXT)
+ {
+ // This is expected to fail under some circumstances, so log as debug
+ CLog::Log(LOGDEBUG, "Failed to create EGL context (EGL error %d)", eglGetError());
+ return false;
+ }
+
+ return true;
+}
+
+bool CEGLContext::CreateSurface(wayland::surface_t const& surface, CSizeInt size)
+{
+ if (m_eglSurface != EGL_NO_SURFACE)
+ {
+ throw std::logic_error("Do not call CreateSurface when surface has already been created");
+ }
+
+ m_nativeWindow = wayland::egl_window_t(surface, size.Width(), size.Height());
+
+ m_eglSurface = m_eglCreatePlatformWindowSurfaceEXT(m_eglDisplay,
+ m_eglConfig,
+ m_nativeWindow, nullptr);
+
+ if (m_eglSurface == EGL_NO_SURFACE)
+ {
+ CEGLUtils::LogError("Failed to create EGL platform window surface");
+ DestroySurface();
+ return false;
+ }
+ return true;
+}
+
+bool CEGLContext::MakeCurrent()
+{
+ if (m_eglDisplay == EGL_NO_DISPLAY || m_eglSurface == EGL_NO_SURFACE || m_eglContext == EGL_NO_CONTEXT)
+ {
+ throw std::logic_error("Activating an EGLContext requires display, surface, and context");
+ }
+
+ if (eglMakeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext) != EGL_TRUE)
+ {
+ CEGLUtils::LogError("Failed to make context current");
+ return false;
+ }
+ return true;
+}
+
+CSizeInt CEGLContext::GetAttachedSize()
+{
+ int width, height;
+ m_nativeWindow.get_attached_size(width, height);
+ return {width, height};
+}
+
+void CEGLContext::Resize(CSizeInt size)
+{
+ m_nativeWindow.resize(size.Width(), size.Height(), 0, 0);
+}
+
+void CEGLContext::Destroy()
+{
+ DestroyContext();
+ DestroySurface();
+
+ if (m_eglDisplay != EGL_NO_DISPLAY)
+ {
+ eglTerminate(m_eglDisplay);
+ m_eglDisplay = EGL_NO_DISPLAY;
+ }
+}
+
+void CEGLContext::DestroyContext()
+{
+ if (m_eglContext != EGL_NO_CONTEXT)
+ {
+ eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ eglDestroyContext(m_eglDisplay, m_eglContext);
+ m_eglContext = EGL_NO_CONTEXT;
+ }
+}
+
+void CEGLContext::DestroySurface()
+{
+ if (m_eglSurface != EGL_NO_SURFACE)
+ {
+ eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+ eglDestroySurface(m_eglDisplay, m_eglSurface);
+ m_eglSurface = EGL_NO_SURFACE;
+ }
+
+ m_nativeWindow = wayland::egl_window_t();
+}
+
+void CEGLContext::SetVSync(bool enable)
+{
+ if (eglSwapInterval(m_eglDisplay, enable) != EGL_TRUE)
+ {
+ CEGLUtils::LogError("Failed to set egl swap interval");
+ }
+}
+
+void CEGLContext::SwapBuffers()
+{
+ if (m_eglDisplay == EGL_NO_DISPLAY || m_eglSurface == EGL_NO_SURFACE)
+ return;
+
+ if (eglSwapBuffers(m_eglDisplay, m_eglSurface) != EGL_TRUE)
+ {
+ // For now we just hard fail if this fails
+ // Theoretically, EGL_CONTEXT_LOST could be handled, but it needs to be checked
+ // whether egl implementations actually use it (mesa does not)
+ CEGLUtils::LogError("eglSwapBuffers failed");
+ throw std::runtime_error("eglSwapBuffers failed");
+ }
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/EGLContext.h Added

@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2017 Team XBMC
+ * 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 <set>
+#include <string>
+
+#include <wayland-client.hpp>
+#include <wayland-egl.hpp>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#include "utils/Geometry.h"
+
+namespace KODI
+{
+namespace WINDOWING
+{
+namespace WAYLAND
+{
+
+/**
+ * Class that handles EGL setup/teardown with Wayland native surfaces
+ */
+class CEGLContext
+{
+public:
+ CEGLContext();
+ ~CEGLContext() noexcept;
+
+ bool CreateDisplay(wayland::display_t& display, EGLint renderableType, EGLenum renderingApi);
+ /**
+ * Create EGL context. Call after \ref CreateDisplay.
+ */
+ bool CreateContext(const EGLint* contextAttribs);
+ /**
+ * Create EGL surface. Call after \ref CreateDisplay.
+ */
+ bool CreateSurface(wayland::surface_t const& surface, CSizeInt size);
+ /**
+ * Activate EGL context. Call after \ref CreateDisplay, \ref CreateContext,
+ * and \ref CreateSurface.
+ */
+ bool MakeCurrent();
+
+ CSizeInt GetAttachedSize();
+ void Resize(CSizeInt size);
+ void DestroyContext();
+ void DestroySurface();
+ void Destroy();
+ void SetVSync(bool enable);
+ void SwapBuffers();
+
+ EGLDisplay GetEGLDisplay() const
+ {
+ return m_eglDisplay;
+ }
+
+private:
+ CEGLContext(CEGLContext const& other) = delete;
+ CEGLContext& operator=(CEGLContext const& other) = delete;
+
+ wayland::egl_window_t m_nativeWindow;
+ EGLDisplay m_eglDisplay{EGL_NO_DISPLAY};
+ EGLSurface m_eglSurface{EGL_NO_SURFACE};
+ EGLContext m_eglContext{EGL_NO_CONTEXT};
+ EGLConfig m_eglConfig{};
+
+ std::set<std::string> m_clientExtensions;
+
+ PFNEGLGETPLATFORMDISPLAYEXTPROC m_eglGetPlatformDisplayEXT = nullptr;
+ PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC m_eglCreatePlatformWindowSurfaceEXT = nullptr;
+};
+
+}
+}
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/GLContextEGL.cpp Deleted

@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2017 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 "GLContextEGL.h"
-
-#include "utils/EGLUtils.h"
-#include "utils/log.h"
-
-using namespace KODI::WINDOWING::WAYLAND;
-
-CGLContextEGL::CGLContextEGL()
-{
- // EGL_EXT_platform_wayland requires EGL_EXT_client_extensions, so this should
- // be safe to use
- m_clientExtensions = CEGLUtils::GetClientExtensions();
-
- if (m_clientExtensions.find("EGL_EXT_platform_base") == m_clientExtensions.end())
- {
- throw std::runtime_error("EGL implementation does not support EGL_EXT_platform_base, cannot continue");
- }
- if (m_clientExtensions.find("EGL_EXT_platform_wayland") == m_clientExtensions.end())
- {
- throw std::runtime_error("EGL implementation does not support EGL_EXT_platform_wayland, cannot continue");
- }
-
- // Theoretically it is possible to use eglGetDisplay() and eglCreateWindowSurface,
- // but then the EGL library basically has to guess which platform we want
- // if it supports multiple which is usually the case -
- // it's better and safer to make it explicit
- m_eglGetPlatformDisplayEXT = CEGLUtils::GetRequiredProcAddress<PFNEGLGETPLATFORMDISPLAYEXTPROC>("eglGetPlatformDisplayEXT");
- m_eglCreatePlatformWindowSurfaceEXT = CEGLUtils::GetRequiredProcAddress<PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC>("eglCreatePlatformWindowSurfaceEXT");
-}
-
-CGLContextEGL::~CGLContextEGL() noexcept
-{
- Destroy();
-}
-
-bool CGLContextEGL::CreateDisplay(wayland::display_t& display,
- EGLint renderableType,
- EGLenum renderingApi)
-{
- EGLint neglconfigs = 0;
- int major, minor;
-
- EGLint attribs[] ={
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
- EGL_RENDERABLE_TYPE, renderableType,
- EGL_RED_SIZE, 8,
- EGL_GREEN_SIZE, 8,
- EGL_BLUE_SIZE, 8,
- EGL_DEPTH_SIZE, 16,
- EGL_NONE,
- };
-
- if (m_eglDisplay == EGL_NO_DISPLAY)
- {
- m_eglDisplay = m_eglGetPlatformDisplayEXT(EGL_PLATFORM_WAYLAND_EXT, display, nullptr);
- }
-
- if (m_eglDisplay == EGL_NO_DISPLAY)
- {
- CEGLUtils::LogError("Failed to get EGL Wayland platform display");
- return false;
- }
-
- if (eglInitialize(m_eglDisplay, &major, &minor) != EGL_TRUE)
- {
- CEGLUtils::LogError("Failed to initialize EGL display");
- return false;
- }
- CLog::Log(LOGINFO, "Got EGL v%d.%d", major, minor);
-
- if (eglBindAPI(renderingApi) != EGL_TRUE)
- {
- CEGLUtils::LogError("Failed to bind EGL API");
- return false;
- }
-
- if (eglChooseConfig(m_eglDisplay, attribs, &m_eglConfig, 1, &neglconfigs) != EGL_TRUE)
- {
- CEGLUtils::LogError("Failed to query number of EGL configs");
- return false;
- }
-
- if (neglconfigs <= 0)
- {
- CLog::Log(LOGERROR, "No suitable EGL configs found");
- return false;
- }
-
- return true;
-}
-
-bool CGLContextEGL::CreateSurface(wayland::surface_t const& surface, CSizeInt size)
-{
- m_nativeWindow = wayland::egl_window_t(surface, size.Width(), size.Height());
-
- m_eglSurface = m_eglCreatePlatformWindowSurfaceEXT(m_eglDisplay,
- m_eglConfig,
- m_nativeWindow, nullptr);
-
- if (m_eglSurface == EGL_NO_SURFACE)
- {
- CEGLUtils::LogError("Failed to create EGL platform window surface");
- return false;
- }
-
- const EGLint context_atrribs[] = {
- EGL_CONTEXT_CLIENT_VERSION, 2,
- EGL_NONE
- };
-
- m_eglContext = eglCreateContext(m_eglDisplay, m_eglConfig,
- EGL_NO_CONTEXT, context_atrribs);
-
- if (m_eglContext == EGL_NO_CONTEXT)
- {
- CEGLUtils::LogError("Failed to create EGL context");
- return false;
- }
-
- if (eglMakeCurrent(m_eglDisplay, m_eglSurface, m_eglSurface, m_eglContext) != EGL_TRUE)
- {
- CEGLUtils::LogError("Failed to make context current");
- return false;
- }
-
- return true;
-}
-
-CSizeInt CGLContextEGL::GetAttachedSize()
-{
- int width, height;
- m_nativeWindow.get_attached_size(width, height);
- return {width, height};
-}
-
-void CGLContextEGL::Resize(CSizeInt size)
-{
- m_nativeWindow.resize(size.Width(), size.Height(), 0, 0);
-}
-
-void CGLContextEGL::Destroy()
-{
- DestroySurface();
-
- if (m_eglDisplay != EGL_NO_DISPLAY)
- {
- eglTerminate(m_eglDisplay);
- m_eglDisplay = EGL_NO_DISPLAY;
- }
-}
-
-void CGLContextEGL::DestroySurface()
-{
- if (m_eglContext != EGL_NO_CONTEXT)
- {
- eglDestroyContext(m_eglDisplay, m_eglContext);
- eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- m_eglContext = EGL_NO_CONTEXT;
- }
-
- if (m_eglSurface != EGL_NO_SURFACE)
- {
- eglDestroySurface(m_eglDisplay, m_eglSurface);
- m_eglSurface = EGL_NO_SURFACE;
- }
-
- m_nativeWindow = wayland::egl_window_t();
-}
-
-void CGLContextEGL::SetVSync(bool enable)
-{
- if (eglSwapInterval(m_eglDisplay, enable) != EGL_TRUE)
- {
- CEGLUtils::LogError("Failed to set egl swap interval");
- }
-}
-
-void CGLContextEGL::SwapBuffers()
-{
- if (m_eglDisplay == EGL_NO_DISPLAY || m_eglSurface == EGL_NO_SURFACE)
- return;
-
- if (eglSwapBuffers(m_eglDisplay, m_eglSurface) != EGL_TRUE)
- {
- // For now we just hard fail if this fails
- // Theoretically, EGL_CONTEXT_LOST could be handled, but it needs to be checked
- // whether egl implementations actually use it (mesa does not)
- CEGLUtils::LogError("eglSwapBuffers failed");
- throw std::runtime_error("eglSwapBuffers failed");
- }
-}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/GLContextEGL.h Deleted

@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 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 <set>
-#include <string>
-
-#include <wayland-client.hpp>
-#include <wayland-egl.hpp>
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#include "guilib/Geometry.h"
-
-namespace KODI
-{
-namespace WINDOWING
-{
-namespace WAYLAND
-{
-
-/**
- * Class that handles EGL setup/teardown with Wayland native surfaces
- */
-class CGLContextEGL
-{
-public:
- CGLContextEGL();
- ~CGLContextEGL() noexcept;
-
- bool CreateDisplay(wayland::display_t& display, EGLint renderableType, EGLenum renderingApi);
- bool CreateSurface(wayland::surface_t const& surface, CSizeInt size);
- CSizeInt GetAttachedSize();
- void Resize(CSizeInt size);
- void DestroySurface();
- void Destroy();
- void SetVSync(bool enable);
- void SwapBuffers();
-
- EGLDisplay GetEGLDisplay() const
- {
- return m_eglDisplay;
- }
-
-private:
- CGLContextEGL(CGLContextEGL const& other) = delete;
- CGLContextEGL& operator=(CGLContextEGL const& other) = delete;
-
- wayland::egl_window_t m_nativeWindow;
- EGLDisplay m_eglDisplay{EGL_NO_DISPLAY};
- EGLSurface m_eglSurface{EGL_NO_SURFACE};
- EGLContext m_eglContext{EGL_NO_CONTEXT};
- EGLConfig m_eglConfig{};
-
- std::set<std::string> m_clientExtensions;
-
- PFNEGLGETPLATFORMDISPLAYEXTPROC m_eglGetPlatformDisplayEXT = nullptr;
- PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC m_eglCreatePlatformWindowSurfaceEXT = nullptr;
-};
-
-}
-}
-}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorKeyboard.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorKeyboard.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorPointer.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorPointer.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorTouch.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/InputProcessorTouch.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/OSScreenSaverIdleInhibitUnstableV1.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/OSScreenSaverIdleInhibitUnstableV1.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Output.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Output.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Registry.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Registry.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Seat.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Seat.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/SeatSelection.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/SeatSelection.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurface.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurface.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceWlShell.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceWlShell.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShell.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShell.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShellUnstableV6.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/ShellSurfaceXdgShellUnstableV6.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Signals.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Util.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/Util.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/VideoSyncWpPresentation.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/VideoSyncWpPresentation.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinEventsWayland.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinEventsWayland.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWayland.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWayland.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContext.cpp Changed

@@ -1,6 +1,6 @@
 /*
  *      Copyright (C) 2017 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -50,12 +50,16 @@
                                                   bool fullScreen,
                                                   RESOLUTION_INFO& res)
 {
-
   if (!CWinSystemWayland::CreateNewWindow(name, fullScreen, res))
   {
     return false;
   }
 
+  if (!CreateContext())
+  {
+    return false;
+  }
+
   // CWinSystemWayland::CreateNewWindow sets internal m_bufferSize
   // to the resolution that should be used for the initial surface size
   // - the compositor might want something other than the resolution given
@@ -64,7 +68,7 @@
     return false;
   }
 
-  return true;
+  return m_eglContext.MakeCurrent();
 }
 
 bool CWinSystemWaylandEGLContext::DestroyWindow()
@@ -137,4 +141,4 @@
 EGLDisplay CWinSystemWaylandEGLContext::GetEGLDisplay() const
 {
   return m_eglContext.GetEGLDisplay();
-}
\ No newline at end of file
+}

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContext.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContextGL.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2017 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,7 +24,7 @@
 #include <EGL/egl.h>
 
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGL.h"
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGL.h"
 #include "utils/log.h"
 
@@ -44,7 +44,7 @@
 }
 
 CLinuxRendererGL::Register();
- RETRO::CRPProcessInfo::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+ RETRO::CRPProcessInfo::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGL);
 
 bool general, hevc;
 m_vaapiProxy.reset(::WAYLAND::VaapiProxyCreate());
@@ -59,6 +59,38 @@
 return true;
 }
 
+bool CWinSystemWaylandEGLContextGL::CreateContext()
+{
+ const EGLint glMajor = 3;
+ const EGLint glMinor = 2;
+
+ const EGLint contextAttribs[] = {
+ EGL_CONTEXT_MAJOR_VERSION_KHR, glMajor,
+ EGL_CONTEXT_MINOR_VERSION_KHR, glMinor,
+ EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR, EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
+ EGL_NONE
+ };
+
+ if (!m_eglContext.CreateContext(contextAttribs))
+ {
+ const EGLint fallbackContextAttribs[] = {
+ EGL_CONTEXT_CLIENT_VERSION, 2,
+ EGL_NONE
+ };
+ if (!m_eglContext.CreateContext(fallbackContextAttribs))
+ {
+ CLog::Log(LOGERROR, "EGL context creation failed");
+ return false;
+ }
+ else
+ {
+ CLog::Log(LOGWARNING, "Your OpenGL drivers do not support OpenGL {}.{} core profile. Kodi will run in compatibility mode, but performance may suffer.", glMajor, glMinor);
+ }
+ }
+
+ return true;
+}
+
 void CWinSystemWaylandEGLContextGL::SetContextSize(CSizeInt size)
 {
 CWinSystemWaylandEGLContext::SetContextSize(size);

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContextGL.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContextGLES.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2017 Team XBMC
- * http://xbmc.org
+ * 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
@@ -24,7 +24,7 @@
 #include <EGL/egl.h>
 
 #include "cores/RetroPlayer/process/RPProcessInfo.h"
-#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererGuiTexture.h"
+#include "cores/RetroPlayer/rendering/VideoRenderers/RPRendererOpenGLES.h"
 #include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
 #include "cores/VideoPlayer/VideoRenderers/LinuxRendererGLES.h"
 #include "utils/log.h"
@@ -45,7 +45,7 @@
 }
 
 CLinuxRendererGLES::Register();
- RETRO::CRPProcessInfo::RegisterRendererFactory(new RETRO::CRendererFactoryGuiTexture);
+ RETRO::CRPProcessInfo::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
 
 bool general, hevc;
 m_vaapiProxy.reset(::WAYLAND::VaapiProxyCreate());
@@ -60,6 +60,20 @@
 return true;
 }
 
+bool CWinSystemWaylandEGLContextGLES::CreateContext()
+{
+ const EGLint contextAttribs[] = {
+ EGL_CONTEXT_CLIENT_VERSION, 2,
+ EGL_NONE
+ };
+ if (!m_eglContext.CreateContext(contextAttribs))
+ {
+ CLog::Log(LOGERROR, "EGL context creation failed");
+ return false;
+ }
+ return true;
+}
+
 void CWinSystemWaylandEGLContextGLES::SetContextSize(CSizeInt size)
 {
 CWinSystemWaylandEGLContext::SetContextSize(size);

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WinSystemWaylandEGLContextGLES.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WindowDecorationHandler.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WindowDecorator.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/WindowDecorator.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/XkbcommonKeymap.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/wayland/XkbcommonKeymap.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinEventsWin10.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -20,28 +20,35 @@
 
 #include "Application.h"
 #include "guilib/GUIWindowManager.h"
-#include "input/Action.h"
-#include "input/ActionIDs.h"
-#include "input/MouseStat.h"
+#include "input/mouse/MouseStat.h"
 #include "input/touch/generic/GenericTouchActionHandler.h"
 #include "input/touch/generic/GenericTouchInputHandler.h"
+#include "input/Action.h"
+#include "input/ActionIDs.h"
+#include "interfaces/AnnouncementManager.h"
 #include "messaging/ApplicationMessenger.h"
+#include "platform/win10/input/RemoteControlXbox.h"
 #include "rendering/dx/DeviceResources.h"
 #include "rendering/dx/RenderContext.h"
 #include "utils/log.h"
 #include "utils/SystemInfo.h"
+#include "utils/Variant.h"
 #include "windowing/windows/WinKeyMap.h"
+#include "xbmc/GUIUserMessages.h"
 #include "WinEventsWin10.h"
 
-using namespace PERIPHERALS;
-using namespace KODI::MESSAGING;
 using namespace Windows::Devices::Input;
 using namespace Windows::Foundation;
 using namespace Windows::Graphics::Display;
+using namespace Windows::Media;
 using namespace Windows::System;
 using namespace Windows::UI::Core;
 using namespace Windows::UI::Input;
 
+using namespace ANNOUNCEMENT;
+using namespace PERIPHERALS;
+using namespace KODI::MESSAGING;
+
 static Point GetScreenPoint(Point point)
 {
 auto dpi = DX::DeviceResources::Get()->GetDpi();
@@ -134,6 +141,29 @@
 // system
 SystemNavigationManager^ sysNavManager = SystemNavigationManager::GetForCurrentView();
 sysNavManager->BackRequested += ref new EventHandler<BackRequestedEventArgs^>(CWinEventsWin10::OnBackRequested);
+
+ // requirement for backgroup playback
+ m_smtc = SystemMediaTransportControls::GetForCurrentView();
+ if (m_smtc)
+ {
+ m_smtc->IsPlayEnabled = true;
+ m_smtc->IsPauseEnabled = true;
+ m_smtc->IsStopEnabled = true;
+ m_smtc->IsRecordEnabled = true;
+ m_smtc->IsNextEnabled = true;
+ m_smtc->IsPreviousEnabled = true;
+ m_smtc->IsFastForwardEnabled = true;
+ m_smtc->IsRewindEnabled = true;
+ m_smtc->IsChannelUpEnabled = true;
+ m_smtc->IsChannelDownEnabled = true;
+ if (CSysInfo::GetWindowsDeviceFamily() != CSysInfo::WindowsDeviceFamily::Xbox)
+ {
+ m_smtc->ButtonPressed += ref new TypedEventHandler<SystemMediaTransportControls^, SystemMediaTransportControlsButtonPressedEventArgs^>
+ (CWinEventsWin10::OnSystemMediaButtonPressed);
+ }
+ m_smtc->IsEnabled = true;
+ CAnnouncementManager::GetInstance().AddAnnouncer(this);
+ }
 }
 
 void CWinEventsWin10::UpdateWindowSize()
@@ -365,70 +395,74 @@
 MessagePush(&newEvent);
 }
 
-void CWinEventsWin10::OnAcceleratorKeyActivated(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args)
-{
+void CWinEventsWin10::OnAcceleratorKeyActivated(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args)
+{
 static auto lockedState = CoreVirtualKeyStates::Locked;
- static VirtualKey keyStore = VirtualKey::None;
-
- bool isDown = false;
- unsigned keyCode = 0;
- unsigned vk = static_cast<unsigned>(args->VirtualKey);
-
+ static VirtualKey keyStore = VirtualKey::None;
+
+ if ( CSysInfo::GetWindowsDeviceFamily() == CSysInfo::WindowsDeviceFamily::Xbox 
+ && CRemoteControlXbox::IsRemoteControlId(args->DeviceId->Data()))
+ return;
+
+ bool isDown = false;
+ unsigned keyCode = 0;
+ unsigned vk = static_cast<unsigned>(args->VirtualKey);
+
 auto window = CoreWindow::GetForCurrentThread();
- bool numLockLocked = ((window->GetKeyState(VirtualKey::NumberKeyLock) & lockedState) == lockedState);
-
- switch (args->EventType)
- {
- case CoreAcceleratorKeyEventType::KeyDown:
- case CoreAcceleratorKeyEventType::SystemKeyDown:
- {
- if ( (vk == 0x08) // VK_BACK
- || (vk == 0x09) // VK_TAB
- || (vk == 0x0C) // VK_CLEAR
- || (vk == 0x0D) // VK_RETURN
- || (vk == 0x1B) // VK_ESCAPE
- || (vk == 0x20) // VK_SPACE
- || (vk >= 0x30 && vk <= 0x39) // numeric keys
- || (vk >= 0x41 && vk <= 0x5A) // alphabetic keys
- || (vk >= 0x60 && vk <= 0x69 && numLockLocked) // keypad numeric (if numlock is on)
- || (vk >= 0x6A && vk <= 0x6F) // keypad keys except numeric
- || (vk >= 0x92 && vk <= 0x96) // OEM specific
- || (vk >= 0xBA && vk <= 0xC0) // OEM specific
- || (vk >= 0xDB && vk <= 0xDF) // OEM specific
- || (vk >= 0xE1 && vk <= 0xF5 && vk != 0xE5 && vk != 0xE7 && vk != 0xE8) // OEM specific
- )
- {
- // store this for character events, because VirtualKey is key code on character event.
+ bool numLockLocked = ((window->GetKeyState(VirtualKey::NumberKeyLock) & lockedState) == lockedState);
+
+ switch (args->EventType)
+ {
+ case CoreAcceleratorKeyEventType::KeyDown:
+ case CoreAcceleratorKeyEventType::SystemKeyDown:
+ {
+ if ( (vk == 0x08) // VK_BACK
+ || (vk == 0x09) // VK_TAB
+ || (vk == 0x0C) // VK_CLEAR
+ || (vk == 0x0D) // VK_RETURN
+ || (vk == 0x1B) // VK_ESCAPE
+ || (vk == 0x20) // VK_SPACE
+ || (vk >= 0x30 && vk <= 0x39) // numeric keys
+ || (vk >= 0x41 && vk <= 0x5A) // alphabetic keys
+ || (vk >= 0x60 && vk <= 0x69 && numLockLocked) // keypad numeric (if numlock is on)
+ || (vk >= 0x6A && vk <= 0x6F) // keypad keys except numeric
+ || (vk >= 0x92 && vk <= 0x96) // OEM specific
+ || (vk >= 0xBA && vk <= 0xC0) // OEM specific
+ || (vk >= 0xDB && vk <= 0xDF) // OEM specific
+ || (vk >= 0xE1 && vk <= 0xF5 && vk != 0xE5 && vk != 0xE7 && vk != 0xE8) // OEM specific
+ )
+ {
+ // store this for character events, because VirtualKey is key code on character event.
 keyStore = args->VirtualKey;
 return;
- }
- isDown = true;
- break;
- }
- case CoreAcceleratorKeyEventType::KeyUp:
- case CoreAcceleratorKeyEventType::SystemKeyUp:
- break;
- case CoreAcceleratorKeyEventType::Character:
- case CoreAcceleratorKeyEventType::SystemCharacter:
- case CoreAcceleratorKeyEventType::UnicodeCharacter:
- case CoreAcceleratorKeyEventType::DeadCharacter:
- case CoreAcceleratorKeyEventType::SystemDeadCharacter:
- {
+ }
+ isDown = true;
+ break;
+ }
+ case CoreAcceleratorKeyEventType::KeyUp:
+ case CoreAcceleratorKeyEventType::SystemKeyUp:
+ break;
+ case CoreAcceleratorKeyEventType::Character:
+ case CoreAcceleratorKeyEventType::SystemCharacter:
+ case CoreAcceleratorKeyEventType::UnicodeCharacter:
+ case CoreAcceleratorKeyEventType::DeadCharacter:
+ case CoreAcceleratorKeyEventType::SystemDeadCharacter:
+ {
 // VirtualKey is KeyCode
 keyCode = static_cast<unsigned>(args->VirtualKey);
 // rewrite vk with stored value
 vk = static_cast<unsigned>(keyStore);
 // reset stored value
 keyStore = VirtualKey::None;
- isDown = true;
- }
+ isDown = true;
+ }
 default:
- break;
- }
-
- Kodi_KeyEvent(vk, args->KeyStatus.ScanCode, keyCode, isDown);
+ break;
+ }
+
+ Kodi_KeyEvent(vk, args->KeyStatus.ScanCode, keyCode, isDown);
 }
-
+
 // DisplayInformation event handlers.
 void CWinEventsWin10::OnDpiChanged(DisplayInformation^ sender, Platform::Object^ args)
 {
@@ -455,14 +489,104 @@
 {
 //critical_section::scoped_lock lock(m_deviceResources->GetCriticalSection());
 DX::DeviceResources::Get()->ValidateDevice();
-}
-
-void CWinEventsWin10::OnBackRequested(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args)
+}
+
+void CWinEventsWin10::OnBackRequested(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args)
 {
 // handle this only on windows mobile
- if (CSysInfo::GetWindowsDeviceFamily() == CSysInfo::Mobile)
- {
- CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>(new CAction(ACTION_NAV_BACK)));
+ if (CSysInfo::GetWindowsDeviceFamily() == CSysInfo::WindowsDeviceFamily::Mobile)
+ {
+ CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>(new CAction(ACTION_NAV_BACK)));
 }
 args->Handled = true;
-}
+}
+
+void CWinEventsWin10::OnSystemMediaButtonPressed(SystemMediaTransportControls^ sender, SystemMediaTransportControlsButtonPressedEventArgs^ args)
+{
+ int action = ACTION_NONE;
+ switch (args->Button)
+ {
+ case SystemMediaTransportControlsButton::ChannelDown:
+ action = ACTION_CHANNEL_DOWN;
+ break;
+ case SystemMediaTransportControlsButton::ChannelUp:
+ action = ACTION_CHANNEL_UP;
+ break;
+ case SystemMediaTransportControlsButton::FastForward:
+ action = ACTION_PLAYER_FORWARD;
+ break;
+ case SystemMediaTransportControlsButton::Rewind:
+ action = ACTION_PLAYER_REWIND;
+ break;
+ case SystemMediaTransportControlsButton::Next:
+ action = ACTION_NEXT_ITEM;
+ break;
+ case SystemMediaTransportControlsButton::Previous:
+ action = ACTION_PREV_ITEM;
+ break;
+ case SystemMediaTransportControlsButton::Pause:
+ case SystemMediaTransportControlsButton::Play:
+ action = ACTION_PLAYER_PLAYPAUSE;
+ break;
+ case SystemMediaTransportControlsButton::Stop:
+ action = ACTION_STOP;
+ break;
+ case SystemMediaTransportControlsButton::Record:
+ action = ACTION_RECORD;
+ break;
+ default:
+ break;
+ }
+ if (action != ACTION_NONE)
+ {
+ CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>(new CAction(action)));
+ }
+}
+
+void CWinEventsWin10::Announce(AnnouncementFlag flag, const char * sender, const char * message, const CVariant & data)
+{
+ if (flag & AnnouncementFlag::Player)
+ {
+ double speed = 1.0;
+ if (data.isMember("player") && data["player"].isMember("speed"))
+ speed = data["player"]["speed"].asDouble(1.0);
+
+ bool changed = false;
+ MediaPlaybackStatus status = MediaPlaybackStatus::Changing;
+
+ if (strcmp(message, "OnPlay") == 0)
+ {
+ changed = true;
+ status = MediaPlaybackStatus::Playing;
+ }
+ else if (strcmp(message, "OnStop") == 0)
+ {
+ changed = true;
+ status = MediaPlaybackStatus::Stopped;
+ }
+ else if (strcmp(message, "OnPause") == 0)
+ {
+ changed = true;
+ status = MediaPlaybackStatus::Paused;
+ }
+ else if (strcmp(message, "OnSpeedChanged") == 0)
+ {
+ changed = true;
+ status = speed != 0.0 ? MediaPlaybackStatus::Playing : MediaPlaybackStatus::Paused;
+ }
+
+ if (changed)
+ {
+ auto dispatcher = Windows::ApplicationModel::Core::CoreApplication::MainView->Dispatcher;
+ dispatcher->RunAsync(CoreDispatcherPriority::Normal, ref new DispatchedHandler([status, speed]
+ {
+ auto smtc = SystemMediaTransportControls::GetForCurrentView();
+ if (!smtc)
+ return;
+
+ smtc->PlaybackStatus = status;
+ smtc->PlaybackRate = speed;
+ }));
+ }
+ }
+}
\ No newline at end of file

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinEventsWin10.h Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -23,10 +23,12 @@
 
 #pragma once
 
+#include "interfaces/IAnnouncer.h"
 #include "windowing/WinEvents.h"
 #include <concurrent_queue.h>
 
 class CWinEventsWin10 : public IWinEvents
+ , public ANNOUNCEMENT::IAnnouncer
 {
 public:
 void MessagePush(XBMC_Event *newEvent);
@@ -57,11 +59,16 @@
 static void OnDisplayContentsInvalidated(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
 // system
 static void OnBackRequested(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args);
+ // system media handlers
+ static void OnSystemMediaButtonPressed(Windows::Media::SystemMediaTransportControls^, Windows::Media::SystemMediaTransportControlsButtonPressedEventArgs^);
+ // IAnnouncer overrides
+ void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) override;
 
 private:
 void UpdateWindowSize();
 void Kodi_KeyEvent(unsigned int vkey, unsigned scancode, unsigned keycode, bool isDown);
 Concurrency::concurrent_queue<XBMC_Event> m_events;
+ Windows::Media::SystemMediaTransportControls^ m_smtc{ nullptr };
 };
 
 #endif // WINDOW_EVENTS_WIN10_H

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,7 +25,9 @@
 #include "guilib/gui3d.h"
 #include "guilib/GraphicContext.h"
 #include "messaging/ApplicationMessenger.h"
+#include "platform/win10/input/RemoteControlXbox.h"
 #include "platform/win32/CharsetConverter.h"
+#include "powermanagement/win10/Win10PowerSyscall.h"
 #include "rendering/dx/DirectXHelper.h"
 #include "ServiceBroker.h"
 #include "settings/AdvancedSettings.h"
@@ -64,6 +66,11 @@
 {
 CAESinkWASAPI::Register();
 }
+ else if (CSysInfo::GetWindowsDeviceFamily() == CSysInfo::WindowsDeviceFamily::Xbox)
+ {
+ CRemoteControlXbox::Register();
+ }
+ CPowerSyscall::Register();
 }
 
 CWinSystemWin10::~CWinSystemWin10()
@@ -72,6 +79,9 @@
 
 bool CWinSystemWin10::InitWindowSystem()
 {
+ m_coreWindow = Windows::UI::Core::CoreWindow::GetForCurrentThread();
+ dynamic_cast<CWinEventsWin10&>(*m_winEvents).InitEventHandlers(m_coreWindow.Get());
+
 if (!CWinSystemBase::InitWindowSystem())
 return false;
 
@@ -93,12 +103,11 @@
 void CWinSystemWin10::SetCoreWindow(Windows::UI::Core::CoreWindow^ window)
 {
 m_coreWindow = window;
- dynamic_cast<CWinEventsWin10&>(*m_winEvents).InitEventHandlers(window);
-}
-
-bool CWinSystemWin10::CanDoWindowed()
-{
- return CSysInfo::GetWindowsDeviceFamily() == CSysInfo::Desktop;
+}
+
+bool CWinSystemWin10::CanDoWindowed()
+{
+ return CSysInfo::GetWindowsDeviceFamily() == CSysInfo::Desktop;
 }
 
 bool CWinSystemWin10::CreateNewWindow(const std::string& name, bool fullScreen, RESOLUTION_INFO& res)
@@ -121,7 +130,7 @@
 AdjustWindow();
 // dispatch all events currently pending in the queue to show window's content
 // and hide UWP splash, without this the Kodi's splash will not be shown
- m_coreWindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessAllIfPresent);
+ m_coreWindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessOneAndAllPending);
 
 return true;
 }
@@ -160,8 +169,8 @@
 return true;
 }
 
-void CWinSystemWin10::FinishWindowResize(int newWidth, int newHeight)
-{
+void CWinSystemWin10::FinishWindowResize(int newWidth, int newHeight)
+{
 m_nWidth = newWidth;
 m_nHeight = newHeight;

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10DX.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -25,18 +25,14 @@
 #include "rendering/dx/DirectXHelper.h"
 #include "rendering/dx/RenderContext.h"
 #include "utils/SystemInfo.h"
-#include "utils/win32/Win32Log.h"
+#include "utils/log.h"
 #include "WinSystemWin10DX.h"
 
 #include <agile.h>
 
 std::unique_ptr<CWinSystemBase> CWinSystemBase::CreateWinSystem()
 {
- auto winSysDX = new CWinSystemWin10DX();
- winSysDX->SetCoreWindow(DX::CoreWindowHolder::Get()->GetWindow());
-
- std::unique_ptr<CWinSystemBase> winSystem(winSysDX);
- return winSystem;
+ return std::make_unique<CWinSystemWin10DX>();
 }
 
 CWinSystemWin10DX::CWinSystemWin10DX() : CRenderSystemDX()
@@ -69,9 +65,11 @@
 return false;
 
 m_deviceResources = DX::DeviceResources::Get();
+
+ bool created = CWinSystemWin10::CreateNewWindow(name, fullScreen, res);
 m_deviceResources->SetWindow(m_coreWindow.Get());
+ created &= m_deviceResources->HasValidDevice();
 
- bool created = CWinSystemWin10::CreateNewWindow(name, fullScreen, res) && m_deviceResources->HasValidDevice();
 if (created)
 {
 CGenericTouchInputHandler::GetInstance().RegisterHandler(&CGenericTouchActionHandler::GetInstance());
@@ -93,6 +91,15 @@
 return true;
 }
 
+void CWinSystemWin10DX::ShowSplash(const std::string & message)
+{
+ CRenderSystemBase::ShowSplash(message);
+
+ // this will prevent killing the app by watchdog timeout during loading
+ if (m_coreWindow.Get())
+ m_coreWindow->Dispatcher->ProcessEvents(Windows::UI::Core::CoreProcessEventsOption::ProcessAllIfPresent);
+}
+
 void CWinSystemWin10DX::UpdateMonitor() const
 {
 //const MONITOR_DETAILS* monitor = GetMonitor(m_nScreen);

_service:download_files:master.tar.gz/xbmc/windowing/win10/WinSystemWin10DX.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/VideoSyncD3D.cpp Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/VideoSyncD3D.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinEventsWin32.cpp Changed

@@ -1,6 +1,6 @@
 /*
 *      Copyright (C) 2005-2013 Team XBMC
- *      http://xbmc.org
+ *      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
@@ -29,10 +29,10 @@
 #include "Application.h"
 #include "guilib/GUIControl.h"       // for EVENT_RESULT
 #include "guilib/GUIWindowManager.h"
-#include "input/MouseStat.h"
-#include "input/InputManager.h"
+#include "input/mouse/MouseStat.h"
 #include "input/touch/generic/GenericTouchActionHandler.h"
 #include "input/touch/generic/GenericTouchSwipeDetector.h"
+#include "input/InputManager.h"
 #include "messaging/ApplicationMessenger.h"
 #include "network/Zeroconf.h"
 #include "network/ZeroconfBrowser.h"
@@ -49,6 +49,7 @@
 #include "rendering/dx/RenderContext.h"
 #include "WinKeyMap.h"
 #include "WinEventsWin32.h"
+#include "platform/win32/CharsetConverter.h"
 
 #ifdef TARGET_WINDOWS
 
@@ -233,6 +234,8 @@
 
 LRESULT CALLBACK CWinEventsWin32::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+  using KODI::PLATFORM::WINDOWS::FromW;
+
   XBMC_Event newEvent;
   ZeroMemory(&newEvent, sizeof(newEvent));
   static HDEVNOTIFY hDeviceNotify;
@@ -282,7 +285,7 @@
         if (UnregisterDeviceNotification(hDeviceNotify))
           hDeviceNotify = nullptr;
         else
-          CLog::Log(LOGNOTICE, "%s: UnregisterDeviceNotification failed (%d)", __FUNCTION__, GetLastError());
+          CLog::LogF(LOGNOTICE, "UnregisterDeviceNotification failed (%d)", GetLastError());
       }
       newEvent.type = XBMC_QUIT;
       g_application.OnEvent(newEvent);
@@ -293,12 +296,12 @@
         g_application.SetRenderGUI(wParam != 0);
         if (g_application.GetRenderGUI() != active)
           DX::Windowing().NotifyAppActiveChange(g_application.GetRenderGUI());
-        CLog::Log(LOGDEBUG, __FUNCTION__": WM_SHOWWINDOW -> window is %s", wParam != 0 ? "shown" : "hidden");
+        CLog::LogF(LOGDEBUG, "WM_SHOWWINDOW -> window is %s", wParam != 0 ? "shown" : "hidden");
       }
       break;
     case WM_ACTIVATE:
       {
-        CLog::Log(LOGDEBUG, __FUNCTION__": WM_ACTIVATE -> window is %s", LOWORD(wParam) != WA_INACTIVE ? "active" : "inactive");
+        CLog::LogF(LOGDEBUG, "WM_ACTIVATE -> window is %s", LOWORD(wParam) != WA_INACTIVE ? "active" : "inactive");
         bool active = g_application.GetRenderGUI();
         if (HIWORD(wParam))
         {
@@ -320,20 +323,20 @@
         }
         if (g_application.GetRenderGUI() != active)
           DX::Windowing().NotifyAppActiveChange(g_application.GetRenderGUI());
-        CLog::Log(LOGDEBUG, __FUNCTION__": window is %s", g_application.GetRenderGUI() ? "active" : "inactive");
+        CLog::LogF(LOGDEBUG, "window is %s", g_application.GetRenderGUI() ? "active" : "inactive");
       }
       break;
     case WM_SETFOCUS:
     case WM_KILLFOCUS:
       g_application.m_AppFocused = uMsg == WM_SETFOCUS;
-      CLog::Log(LOGDEBUG, __FUNCTION__": window focus %s", g_application.m_AppFocused ? "set" : "lost");
+      CLog::LogF(LOGDEBUG, "window focus %s", g_application.m_AppFocused ? "set" : "lost");
 
       DX::Windowing().NotifyAppFocusChange(g_application.m_AppFocused);
       if (uMsg == WM_KILLFOCUS)
       {
         std::string procfile;
         if (CWIN32Util::GetFocussedProcess(procfile))
-          CLog::Log(LOGDEBUG, __FUNCTION__": Focus switched to process %s", procfile.c_str());
+          CLog::LogF(LOGDEBUG, "Focus switched to process %s", procfile);
       }
       break;
     /* needs to be reviewed after frodo. we reset the system idle timer
@@ -440,11 +443,31 @@
     return(0);
     case WM_APPCOMMAND: // MULTIMEDIA keys are mapped to APPCOMMANDS
     {
-      CLog::Log(LOGDEBUG, __FUNCTION__": APPCOMMAND %d", GET_APPCOMMAND_LPARAM(lParam));
-      newEvent.type = XBMC_APPCOMMAND;
-      newEvent.appcommand.action = GET_APPCOMMAND_LPARAM(lParam);
-      if (g_application.OnEvent(newEvent))
-        return TRUE;
+      const unsigned int appcmd = GET_APPCOMMAND_LPARAM(lParam);
+
+      CLog::LogF(LOGDEBUG, "APPCOMMAND %d", appcmd);
+
+      // Reset the screen saver
+      g_application.ResetScreenSaver();
+
+      // If we were currently in the screen saver wake up and don't process the
+      // appcommand
+      if (g_application.WakeUpScreenSaverAndDPMS())
+        return true;
+
+      // Retrieve the action associated with this appcommand from the mapping table
+      CKey key(appcmd | KEY_APPCOMMAND, 0U);
+      int iWin = g_windowManager.GetActiveWindowOrDialog();
+
+      CAction appcmdaction = CServiceBroker::GetInputManager().GetAction(iWin, key);
+      if (appcmdaction.GetID())
+      {
+        CLog::LogF(LOGDEBUG, "appcommand %d, action %s", appcmd, appcmdaction.GetName().c_str());
+        CServiceBroker::GetInputManager().QueueAction(appcmdaction);
+        return true;
+      }
+
+      CLog::LogF(LOGDEBUG, "unknown appcommand %d", appcmd);
       return DefWindowProc(hWnd, uMsg, wParam, lParam);
     }
     case WM_GESTURENOTIFY:
@@ -527,7 +550,7 @@
       return(0);
     }
     case WM_DISPLAYCHANGE:
-      CLog::Log(LOGDEBUG, __FUNCTION__": display change event");  
+      CLog::LogF(LOGDEBUG, "display change event");  
       if (g_application.GetRenderGUI() && !DX::Windowing().IsAlteringWindow() && GET_X_LPARAM(lParam) > 0 && GET_Y_LPARAM(lParam) > 0)  
       {
         DX::Windowing().UpdateResolutions();
@@ -548,6 +571,8 @@
           newEvent.move.x = g_sizeMoveX;
           newEvent.move.y = g_sizeMoveY;
 
+          // tell the device about new position
+          DX::Windowing().OnMove(newEvent.move.x, newEvent.move.y);
           // tell the application about new position
           if (g_application.GetRenderGUI() && !DX::Windowing().IsAlteringWindow())
             g_application.OnEvent(newEvent);
@@ -605,7 +630,7 @@
           newEvent.resize.w = g_sizeMoveWidth;
           newEvent.resize.h = g_sizeMoveHight;
 
-          CLog::Log(LOGDEBUG, __FUNCTION__": window resize event %d x %d", newEvent.resize.w, newEvent.resize.h);
+          CLog::LogF(LOGDEBUG, "window resize event %d x %d", newEvent.resize.w, newEvent.resize.h);
           // tell device about new size
           DX::Windowing().OnResize(newEvent.resize.w, newEvent.resize.h);
           // tell application about size changes
@@ -629,7 +654,10 @@
           newEvent.move.x = g_sizeMoveX;
           newEvent.move.y = g_sizeMoveY;
 
-          CLog::Log(LOGDEBUG, __FUNCTION__": window move event");
+          CLog::LogF(LOGDEBUG, "window move event");
+
+          // tell the device about new position
+          DX::Windowing().OnMove(newEvent.move.x, newEvent.move.y);
           if (g_application.GetRenderGUI() && !DX::Windowing().IsAlteringWindow())
             g_application.OnEvent(newEvent);
         }
@@ -659,7 +687,7 @@
             case SHCNE_MEDIAINSERTED:
               if (GetDriveType(drivePath) != DRIVE_CDROM)
               {
-                CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media has arrived.", drivePath);
+                CLog::LogF(LOGDEBUG, "Drive %s Media has arrived.", FromW(drivePath));
                 CWin32StorageProvider::SetEvent();
               }
               break;
@@ -668,7 +696,7 @@
             case SHCNE_MEDIAREMOVED:
               if (GetDriveType(drivePath) != DRIVE_CDROM)
               {
-                CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media was removed.", drivePath);
+                CLog::LogF(LOGDEBUG, "Drive %s Media was removed.", FromW(drivePath));
                 CWin32StorageProvider::SetEvent();
               }
               break;
@@ -713,12 +741,12 @@
                 std::string strdrive = StringUtils::Format("%c:", CWIN32Util::FirstDriveFromMask(lpdbv ->dbcv_unitmask));
                 if(wParam == DBT_DEVICEARRIVAL)
                 {
-                  CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media has arrived.", strdrive.c_str());
+                  CLog::LogF(LOGDEBUG, "Drive %s Media has arrived.", strdrive.c_str());
                   CJobManager::GetInstance().AddJob(new CDetectDisc(strdrive, true), NULL);
                 }
                 else
                 {
-                  CLog::Log(LOGDEBUG, __FUNCTION__": Drive %s Media was removed.", strdrive.c_str());
+                  CLog::LogF(LOGDEBUG, "Drive %s Media was removed.", strdrive.c_str());
                   CMediaSource share;
                   share.strPath = strdrive;
                   share.strName = share.strPath;

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinEventsWin32.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -29,6 +29,7 @@
 #include "guilib/gui3d.h"
 #include "messaging/ApplicationMessenger.h"
 #include "platform/win32/CharsetConverter.h"
+#include "powermanagement/windows/Win32PowerSyscall.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/DisplaySettings.h"
 #include "settings/Settings.h"
@@ -37,6 +38,7 @@
 #include "utils/CharsetConverter.h"
 #include "utils/SystemInfo.h"
 #include "VideoSyncD3D.h"
+#include "platform/win32/input/IRServerSuite.h"
 
 #include <tpcshrd.h>
 #include "guilib/GraphicContext.h"
@@ -66,6 +68,8 @@
 AE::CAESinkFactory::ClearSinks();
 CAESinkDirectSound::Register();
 CAESinkWASAPI::Register();
+ CWin32PowerSyscall::Register();
+ CRemoteControl::Register();
 }
 
 CWinSystemWin32::~CWinSystemWin32()
@@ -84,7 +88,7 @@
 
 if(m_MonitorsInfo.empty())
 {
- CLog::Log(LOGERROR, "%s - no suitable monitor found, aborting...", __FUNCTION__);
+ CLog::LogF(LOGERROR, " no suitable monitor found, aborting...");
 return false;
 }
 
@@ -104,7 +108,7 @@
 
 m_hInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
 if(m_hInstance == nullptr)
- CLog::Log(LOGDEBUG, "%s : GetModuleHandle failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGDEBUG, " GetModuleHandle failed with %d", GetLastError());
 
 // Load Win32 procs if available
 HMODULE hUser32 = GetModuleHandle(L"user32");
@@ -145,15 +149,20 @@
 
 if( !RegisterClassExW( &wndClass ) )
 {
- CLog::Log(LOGERROR, "%s : RegisterClassExW failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, " RegisterClassExW failed with %d", GetLastError());
 return false;
 }
 
+ // put the window at desired display
+ RECT screenRect = ScreenRect(m_nScreen);
+ m_nLeft = screenRect.left;
+ m_nTop = screenRect.top;
+
 if (state == WINDOW_STATE_WINDOWED)
 {
- RECT newScreenRect = ScreenRect(m_nScreen);
- m_nLeft = newScreenRect.left + ((newScreenRect.right - newScreenRect.left) / 2) - (m_nWidth / 2);
- m_nTop = newScreenRect.top + ((newScreenRect.bottom - newScreenRect.top) / 2) - (m_nHeight / 2);
+ // centering window at desktop
+ m_nLeft += (screenRect.right - screenRect.left) / 2 - m_nWidth / 2;
+ m_nTop += (screenRect.bottom - screenRect.top) / 2 - m_nHeight / 2;
 m_ValidWindowedPosition = true;
 }
 
@@ -174,7 +183,7 @@
 
 if( hWnd == nullptr )
 {
- CLog::Log(LOGERROR, "%s : CreateWindow failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, " CreateWindow failed with %d", GetLastError());
 return false;
 }
 
@@ -221,7 +230,7 @@
 // Now we can go ahead and register our new window class
 if(!RegisterClassEx(&wcex))
 {
- CLog::Log(LOGERROR, "%s : RegisterClass failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, "RegisterClass failed with %d", GetLastError());
 return false;
 }
 
@@ -235,7 +244,7 @@
 
 if(hBlankWindow == nullptr)
 {
- CLog::Log(LOGERROR, "%s : CreateWindowEx failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, "CreateWindowEx failed with %d", GetLastError());
 return false;
 }
 
@@ -326,7 +335,7 @@
 
 void CWinSystemWin32::AdjustWindow(bool forceResize)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": adjusting window if required.");
+ CLog::LogF(LOGDEBUG, "adjusting window if required.");
 
 HWND windowAfter;
 RECT rc;
@@ -364,7 +373,7 @@
 wi.cbSize = sizeof(WINDOWINFO);
 if (!GetWindowInfo(m_hWnd, &wi))
 {
- CLog::Log(LOGERROR, "%s : GetWindowInfo failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, "GetWindowInfo failed with %d", GetLastError());
 return;
 }
 RECT wr = wi.rcWindow;
@@ -386,7 +395,7 @@
 SetWindowLongPtr( m_hWnd, GWL_EXSTYLE, m_windowExStyle );
 
 // resize window
- CLog::Log(LOGDEBUG, "%s - resizing due to size change (%d,%d,%d,%d%s)->(%d,%d,%d,%d%s)", __FUNCTION__
+ CLog::LogF(LOGDEBUG, "resizing due to size change (%d,%d,%d,%d%s)->(%d,%d,%d,%d%s)"
 , wr.left, wr.top, wr.right, wr.bottom, (wi.dwStyle & WS_CAPTION) ? "" : " fullscreen"
 , rc.left, rc.top, rc.right, rc.bottom, (m_windowStyle & WS_CAPTION) ? "" : " fullscreen");
 SetWindowPos(
@@ -426,8 +435,9 @@
 CWinSystemWin32::UpdateStates(fullScreen);
 WINDOW_STATE state = GetState(fullScreen);
 
- CLog::Log(LOGDEBUG, "%s (%s) on screen %d with size %dx%d, refresh %f%s", __FUNCTION__ , window_state_names[state]
- , res.iScreen, res.iWidth, res.iHeight, res.fRefreshRate, (res.dwFlags & D3DPRESENTFLAG_INTERLACED) ? "i" : "");
+ CLog::LogF(LOGDEBUG, "(%s) on screen %d with size %dx%d, refresh %f%s", window_state_names[state],
+ res.iScreen, res.iWidth, res.iHeight, res.fRefreshRate,
+ (res.dwFlags & D3DPRESENTFLAG_INTERLACED) ? "i" : "");
 
 bool forceChange = false; // resolution/display is changed but window state isn't changed
 bool changeScreen = false; // display is changed
@@ -477,6 +487,10 @@
 
 // restoring native resolution on "old" display
 RestoreDesktopResolution(m_nScreen);
+
+ // notify about screen change (it may require recreate rendering device)
+ m_fRefreshRate = res.fRefreshRate; // use desired refresh for driver hook
+ OnScreenChange(res.iScreen);
 }
 
 m_bFullScreen = fullScreen;
@@ -582,7 +596,7 @@
 
 void CWinSystemWin32::RestoreDesktopResolution(int screen)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": restoring desktop resolution for screen %i, ", screen);
+ CLog::LogF(LOGDEBUG, "restoring desktop resolution for screen %i, ", screen);
 int resIdx = RES_DESKTOP;
 for (int idx = RES_DESKTOP; idx < RES_DESKTOP + GetNumScreens(); idx++)
 {
@@ -604,8 +618,8 @@
 // What to do if monitor is not found? Not sure... use the primary screen as a default value.
 if (m_nPrimary >= 0 && static_cast<size_t>(m_nPrimary) < m_MonitorsInfo.size())
 {
- CLog::Log(LOGDEBUG, __FUNCTION__, "no monitor found for screen %i, "
- "will use primary screen %i", screen, m_nPrimary);
+ CLog::LogF(LOGDEBUG, "no monitor found for screen %i, will use primary screen %i", screen,
+ m_nPrimary);
 return &m_MonitorsInfo[m_nPrimary];
 }
 else
@@ -638,7 +652,7 @@
 ZeroMemory(&sDevMode, sizeof(sDevMode));
 sDevMode.dmSize = sizeof(sDevMode);
 if(!EnumDisplaySettingsW(details->DeviceNameW.c_str(), ENUM_CURRENT_SETTINGS, &sDevMode))
- CLog::Log(LOGERROR, "%s : EnumDisplaySettings failed with %d", __FUNCTION__, GetLastError());
+ CLog::LogF(LOGERROR, " EnumDisplaySettings failed with %d", GetLastError());
 
 RECT rc;
 rc.left = sDevMode.dmPosition.x;
@@ -686,7 +700,8 @@
 && !CSysInfo::IsWindowsVersionAtLeast(CSysInfo::WindowsVersionWin10_FCU)
 && (res.fRefreshRate == 24.0 || res.fRefreshRate == 48.0 || res.fRefreshRate == 60.0))
 {
- CLog::Log(LOGDEBUG, "%s : Using Windows 8+ workaround for refresh rate %d Hz", __FUNCTION__, static_cast<int>(res.fRefreshRate));
+ CLog::LogF(LOGDEBUG, "Using Windows 8+ workaround for refresh rate %d Hz",
+ static_cast<int>(res.fRefreshRate));
 
 // Get current resolution stored in registry
 DEVMODEW sDevModeRegistry;
@@ -703,7 +718,7 @@
 if (rc == DISP_CHANGE_SUCCESSFUL)
 bResChanged = true;
 else
- CLog::Log(LOGERROR, "%s : ChangeDisplaySettingsEx (W8+ change resolution) failed with %d, using fallback", __FUNCTION__, rc);
+ CLog::LogF(LOGERROR, "ChangeDisplaySettingsEx (W8+ change resolution) failed with %d, using fallback", rc);
 
 // Restore registry with original values
 sDevModeRegistry.dmSize = sizeof(sDevModeRegistry);
@@ -711,13 +726,13 @@
 sDevModeRegistry.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS;
 rc = ChangeDisplaySettingsExW(details->DeviceNameW.c_str(), &sDevModeRegistry, nullptr, CDS_UPDATEREGISTRY | CDS_NORESET, nullptr);
 if (rc != DISP_CHANGE_SUCCESSFUL)
- CLog::Log(LOGERROR, "%s : ChangeDisplaySettingsEx (W8+ restore registry) failed with %d", __FUNCTION__, rc);
+ CLog::LogF(LOGERROR, "ChangeDisplaySettingsEx (W8+ restore registry) failed with %d", rc);
 }
 else
- CLog::Log(LOGERROR, "%s : ChangeDisplaySettingsEx (W8+ set registry) failed with %d, using fallback", __FUNCTION__, rc);
+ CLog::LogF(LOGERROR, "ChangeDisplaySettingsEx (W8+ set registry) failed with %d, using fallback", rc);
 }
 else
- CLog::Log(LOGERROR, "%s : Unable to retrieve registry settings for Windows 8+ workaround, using fallback", __FUNCTION__);
+ CLog::LogF(LOGERROR, "Unable to retrieve registry settings for Windows 8+ workaround, using fallback");
 }
 
 // Standard resolution change/fallback for Windows 8+ workaround
@@ -729,7 +744,7 @@
 if (rc == DISP_CHANGE_SUCCESSFUL)
 bResChanged = true;
 else
- CLog::Log(LOGERROR, "%s : ChangeDisplaySettingsEx failed with %d", __FUNCTION__, rc);
+ CLog::LogF(LOGERROR, "ChangeDisplaySettingsEx failed with %d", rc);
 }
 
 if (bResChanged)
@@ -985,7 +1000,7 @@
 
 void CWinSystemWin32::OnDisplayLost()
 {
- CLog::Log(LOGDEBUG, "%s - notify display lost event", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "notify display lost event");
 
 // make sure renderer has no invalid references
 KODI::MESSAGING::CApplicationMessenger::GetInstance().SendMsg(TMSG_RENDERER_FLUSH);
@@ -1001,7 +1016,7 @@
 {
 if (!m_delayDispReset)
 {
- CLog::Log(LOGDEBUG, "%s - notify display reset event", __FUNCTION__);
+ CLog::LogF(LOGDEBUG, "notify display reset event");
 CSingleLock lock(m_resourceSection);
 for (std::vector<IDispResource *>::iterator i = m_resources.begin(); i != m_resources.end(); ++i)
 (*i)->OnResetDisplay();

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32.h Changed

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -22,8 +22,9 @@
 #include "guilib/GraphicContext.h"
 #include "rendering/dx/RenderContext.h"
 #include "utils/SystemInfo.h"
-#include "utils/win32/Win32Log.h"
+#include "utils/log.h"
 #include "WinSystemWin32DX.h"
+#include "platform/win32/CharsetConverter.h"
 
 #ifndef _M_X64
 #pragma comment(lib, "EasyHook32.lib")
@@ -35,6 +36,8 @@
 #include <d3d10umddi.h>
 #pragma warning(default: 4091)
 
+using KODI::PLATFORM::WINDOWS::FromW;
+
 // User Mode Driver hooks definitions
 void APIENTRY HookCreateResource(D3D10DDI_HDEVICE hDevice, const D3D10DDIARG_CREATERESOURCE* pResource, D3D10DDI_HRESOURCE hResource, D3D10DDI_HRTRESOURCE hRtResource);
 HRESULT APIENTRY HookCreateDevice(D3D10DDI_HADAPTER hAdapter, D3D10DDIARG_CREATEDEVICE* pCreateData);
@@ -123,6 +126,11 @@
 
 void CWinSystemWin32DX::OnMove(int x, int y)
 {
+ // do not handle moving at window creation because MonitorFromWindow 
+ // returns default system monitor in case of m_hWnd is null
+ if (!m_hWnd) 
+ return;
+
 HMONITOR newMonitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);
 const MONITOR_DETAILS* monitor = GetMonitor(m_nScreen);
 if (newMonitor != monitor->hMonitor)
@@ -161,6 +169,16 @@
 return m_deviceResources->IsStereoEnabled();
 }
 
+void CWinSystemWin32DX::OnScreenChange(int screen)
+{
+ const MONITOR_DETAILS* new_monitor = GetMonitor(screen);
+ const MONITOR_DETAILS* old_monitor = GetMonitor(m_nScreen);
+ if (old_monitor->hMonitor != new_monitor->hMonitor)
+ {
+ m_deviceResources->SetMonitor(new_monitor->hMonitor);
+ }
+}
+
 void CWinSystemWin32DX::OnResize(int width, int height)
 {
 if (!m_IsAlteringWindow)
@@ -220,7 +238,7 @@
 if (!deviceFound)
 return;
 
- CLog::Log(LOGDEBUG, __FUNCTION__": Hooking into UserModeDriver on device %S. ", displayDevice.DeviceKey);
+ CLog::LogF(LOGDEBUG, "Hooking into UserModeDriver on device %s. ", FromW(displayDevice.DeviceKey));
 wchar_t* keyName =
 #ifndef _M_X64
 // on x64 system and x32 build use UserModeDriverNameWow key
@@ -268,7 +286,7 @@
 if (SUCCEEDED(LhInstallHook(s_fnOpenAdapter10_2, HookOpenAdapter10_2, nullptr, m_hHook))
 && SUCCEEDED(LhSetInclusiveACL(ACLEntries, 1, m_hHook)))
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": D3D11 hook installed and activated.");
+ CLog::LogF(LOGDEBUG, "D3D11 hook installed and activated.");
 break;
 }
 else
@@ -284,7 +302,7 @@
 }
 
 if (lstat != ERROR_SUCCESS)
- CLog::Log(LOGDEBUG, __FUNCTION__": error open registry key with error %ld.", lstat);
+ CLog::LogF(LOGDEBUG, "error open registry key with error %ld.", lstat);
 
 if (hKey != nullptr)
 RegCloseKey(hKey);
@@ -297,16 +315,22 @@
 float refreshRate = RATIONAL_TO_FLOAT(pResource->pPrimaryDesc->ModeDesc.RefreshRate);
 if (refreshRate > 10.0f && refreshRate < 300.0f)
 {
+ // interlaced
+ if (pResource->pPrimaryDesc->ModeDesc.ScanlineOrdering > DXGI_DDI_MODE_SCANLINE_ORDER_PROGRESSIVE)
+ refreshRate /= 2;
+
 uint32_t refreshNum, refreshDen;
 DX::GetRefreshRatio(floor(m_fRefreshRate), &refreshNum, &refreshDen);
 float diff = fabs(refreshRate - static_cast<float>(refreshNum) / static_cast<float>(refreshDen)) / refreshRate;
- CLog::Log(LOGDEBUG, __FUNCTION__": refreshRate: %0.4f, desired: %0.4f, deviation: %.5f, fixRequired: %s",
- refreshRate, m_fRefreshRate, diff, (diff > 0.0005) ? "true" : "false");
- if (diff > 0.0005)
+ CLog::LogF(LOGDEBUG, "refreshRate: %0.4f, desired: %0.4f, deviation: %.5f, fixRequired: %s, %d",
+ refreshRate, m_fRefreshRate, diff, (diff > 0.0005 && diff < 0.1) ? "yes" : "no", pResource->pPrimaryDesc->Flags);
+ if (diff > 0.0005 && diff < 0.1)
 {
 pResource->pPrimaryDesc->ModeDesc.RefreshRate.Numerator = refreshNum;
 pResource->pPrimaryDesc->ModeDesc.RefreshRate.Denominator = refreshDen;
- CLog::Log(LOGDEBUG, __FUNCTION__": refreshRate fix applied -> %0.3f", RATIONAL_TO_FLOAT(pResource->pPrimaryDesc->ModeDesc.RefreshRate));
+ if (pResource->pPrimaryDesc->ModeDesc.ScanlineOrdering > DXGI_DDI_MODE_SCANLINE_ORDER_PROGRESSIVE)
+ pResource->pPrimaryDesc->ModeDesc.RefreshRate.Numerator *= 2;
+ CLog::LogF(LOGDEBUG, "refreshRate fix applied -> %0.3f", RATIONAL_TO_FLOAT(pResource->pPrimaryDesc->ModeDesc.RefreshRate));
 }
 }
 }
@@ -326,7 +350,7 @@
 HRESULT hr = s_fnCreateDeviceOrig(hAdapter, pCreateData);
 if (pCreateData->pDeviceFuncs->pfnCreateResource)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": hook into pCreateData->pDeviceFuncs->pfnCreateResource");
+ CLog::LogF(LOGDEBUG, "hook into pCreateData->pDeviceFuncs->pfnCreateResource");
 s_fnCreateResourceOrig = pCreateData->pDeviceFuncs->pfnCreateResource;
 pCreateData->pDeviceFuncs->pfnCreateResource = HookCreateResource;
 }
@@ -338,7 +362,7 @@
 HRESULT hr = s_fnOpenAdapter10_2(pOpenData);
 if (pOpenData->pAdapterFuncs->pfnCreateDevice)
 {
- CLog::Log(LOGDEBUG, __FUNCTION__": hook into pOpenData->pAdapterFuncs->pfnCreateDevice");
+ CLog::LogF(LOGDEBUG, "hook into pOpenData->pAdapterFuncs->pfnCreateDevice");
 s_fnCreateDeviceOrig = pOpenData->pAdapterFuncs->pfnCreateDevice;
 pOpenData->pAdapterFuncs->pfnCreateDevice = HookCreateDevice;
 }

_service:download_files:master.tar.gz/xbmc/windowing/windows/WinSystemWin32DX.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIMediaWindow.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -940,7 +940,11 @@
 */
 bool CGUIMediaWindow::OnClick(int iItem, const std::string &player)
 {
- if ( iItem < 0 || iItem >= (int)m_vecItems->Size() ) return true;
+ if (iItem < 0 || iItem >= (int)m_vecItems->Size())
+ return true;
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
 CFileItemPtr pItem = m_vecItems->Get(iItem);
 
 if (pItem->IsParentFolder())
@@ -948,14 +952,15 @@
 GoParentFolder();
 return true;
 }
+
 if (pItem->GetPath() == "add" || pItem->GetPath() == "sources://add/") // 'add source button' in empty root
 {
- if (CProfilesManager::GetInstance().IsMasterProfile())
+ if (profileManager.IsMasterProfile())
 {
 if (!g_passwordManager.IsMasterLockUnlocked(true))
 return false;
 }
- else if (!CProfilesManager::GetInstance().GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
+ else if (!profileManager.GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked())
 return false;
 
 if (OnAddMediaSource())
@@ -996,7 +1001,7 @@
 if ( pItem->m_bIsShareOrDrive )
 {
 const std::string& strLockType=m_guiState->GetLockType();
- if (CProfilesManager::GetInstance().GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
+ if (profileManager.GetMasterProfile().getLockMode() != LOCK_MODE_EVERYONE)
 if (!strLockType.empty() && !g_passwordManager.IsItemUnlocked(pItem.get(), strLockType))
 return true;
 
@@ -1005,8 +1010,8 @@
 }
 
 // check for the partymode playlist items - they may not exist yet
- if ((pItem->GetPath() == CProfilesManager::GetInstance().GetUserDataItem("PartyMode.xsp")) ||
- (pItem->GetPath() == CProfilesManager::GetInstance().GetUserDataItem("PartyMode-Video.xsp")))
+ if ((pItem->GetPath() == profileManager.GetUserDataItem("PartyMode.xsp")) ||
+ (pItem->GetPath() == profileManager.GetUserDataItem("PartyMode-Video.xsp")))
 {
 // party mode playlist item - if it doesn't exist, prompt for user to define it
 if (!XFILE::CFile::Exists(pItem->GetPath()))
@@ -1540,26 +1545,37 @@
 if (item->IsPlayList())
 item->m_bIsFolder = false;
 
- if (CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE && CProfilesManager::GetInstance().GetCurrentProfile().filesLocked())
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (profileManager.GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE && profileManager.GetCurrentProfile().filesLocked())
+ {
 if (!g_passwordManager.IsMasterLockUnlocked(true))
 return;
+ }
 
 if (!CFileUtils::DeleteItem(item))
 return;
+
 Refresh(true);
 m_viewControl.SetSelectedItem(iItem);
 }
 
 void CGUIMediaWindow::OnRenameItem(int iItem)
 {
- if ( iItem < 0 || iItem >= m_vecItems->Size()) return;
+ if (iItem < 0 || iItem >= m_vecItems->Size())
+ return;
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
- if (CProfilesManager::GetInstance().GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE && CProfilesManager::GetInstance().GetCurrentProfile().filesLocked())
+ if (profileManager.GetCurrentProfile().getLockMode() != LOCK_MODE_EVERYONE && profileManager.GetCurrentProfile().filesLocked())
+ {
 if (!g_passwordManager.IsMasterLockUnlocked(true))
 return;
+ }
 
 if (!CFileUtils::RenameFile(m_vecItems->Get(iItem)->GetPath()))
 return;
+
 Refresh(true);
 m_viewControl.SetSelectedItem(iItem);
 }
@@ -1634,7 +1650,7 @@
 
 bool CGUIMediaWindow::OnPopupMenu(int itemIdx)
 {
- auto InRange = [](int i, std::pair<int, int> range){ return i >= range.first && i < range.second; };
+ auto InRange = [](size_t i, std::pair<size_t, size_t> range){ return i >= range.first && i < range.second; };
 
 if (itemIdx < 0 || itemIdx >= m_vecItems->Size())
 return false;
@@ -1650,28 +1666,28 @@
 int i = 0;
 while (item->HasProperty(StringUtils::Format("contextmenulabel(%i)", i)))
 {
- buttons.emplace_back(-buttons.size(), item->GetProperty(StringUtils::Format("contextmenulabel(%i)", i)).asString());
+ buttons.emplace_back(~buttons.size(), item->GetProperty(StringUtils::Format("contextmenulabel(%i)", i)).asString());
 ++i;
 }
 }
- auto pluginMenuRange = std::make_pair(0, buttons.size());
+ auto pluginMenuRange = std::make_pair(static_cast<size_t>(0), buttons.size());
 
 //Add the global menu
 auto globalMenu = CContextMenuManager::GetInstance().GetItems(*item, CContextMenuManager::MAIN);
 auto globalMenuRange = std::make_pair(buttons.size(), buttons.size() + globalMenu.size());
 for (const auto& menu : globalMenu)
- buttons.emplace_back(-buttons.size(), menu->GetLabel(*item));
+ buttons.emplace_back(~buttons.size(), menu->GetLabel(*item));
 
 //Add legacy items from windows
- auto windowMenuRange = std::make_pair(buttons.size(), -1);
+ auto buttonsSize = buttons.size();
 GetContextButtons(itemIdx, buttons);
- windowMenuRange.second = buttons.size();
+ auto windowMenuRange = std::make_pair(buttonsSize, buttons.size());
 
 //Add addon menus
 auto addonMenu = CContextMenuManager::GetInstance().GetAddonItems(*item, CContextMenuManager::MAIN);
 auto addonMenuRange = std::make_pair(buttons.size(), buttons.size() + addonMenu.size());
 for (const auto& menu : addonMenu)
- buttons.emplace_back(-buttons.size(), menu->GetLabel(*item));
+ buttons.emplace_back(~buttons.size(), menu->GetLabel(*item));
 
 if (buttons.empty())
 return true;
@@ -1680,7 +1696,7 @@
 if (idx < 0 || idx >= static_cast<int>(buttons.size()))
 return false;
 
- if (InRange(idx, pluginMenuRange))
+ if (InRange(static_cast<size_t>(idx), pluginMenuRange))
 {
 CApplicationMessenger::GetInstance().SendMsg(TMSG_EXECUTE_BUILT_IN, -1, -1, nullptr,
 item->GetProperty(StringUtils::Format("contextmenuaction(%i)", idx - pluginMenuRange.first)).asString());

_service:download_files:master.tar.gz/xbmc/windows/GUIMediaWindow.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowDebugInfo.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowDebugInfo.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowFileManager.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -1000,6 +1000,9 @@
 pItem->Select(false);
 return ;
 }
+
+ const CPlayerCoreFactory &playerCoreFactory = CServiceBroker::GetPlayerCoreFactory();
+
 // popup the context menu
 
 bool showEntry = false;
@@ -1009,7 +1012,7 @@
 
 // determine available players
 std::vector<std::string>players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*pItem, players);
+ playerCoreFactory.GetPlayers(*pItem, players);
 
 // add the needed buttons
 CContextButtons choices;
@@ -1057,8 +1060,8 @@
 if (btnid == CONTROL_BTNPLAYWITH)
 {
 std::vector<std::string>players;
- CPlayerCoreFactory::GetInstance().GetPlayers(*pItem, players);
- std::string player = CPlayerCoreFactory::GetInstance().SelectPlayerDialog(players);
+ playerCoreFactory.GetPlayers(*pItem, players);
+ std::string player = playerCoreFactory.SelectPlayerDialog(players);
 if (!player.empty())
 OnStart(pItem.get(), player);
 }

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowFileManager.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowHome.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowHome.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowLoginScreen.cpp Changed

@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -167,16 +167,24 @@
 void CGUIWindowLoginScreen::FrameMove()
 {
 if (GetFocusedControlID() == CONTROL_BIG_LIST && !g_windowManager.HasModalDialog())
+ {
 if (m_viewControl.HasControl(CONTROL_BIG_LIST))
 m_iSelectedItem = m_viewControl.GetSelectedItem();
- std::string strLabel = StringUtils::Format(g_localizeStrings.Get(20114).c_str(), m_iSelectedItem+1, CProfilesManager::GetInstance().GetNumberOfProfiles());
+ }
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ std::string strLabel = StringUtils::Format(g_localizeStrings.Get(20114).c_str(), m_iSelectedItem+1, profileManager.GetNumberOfProfiles());
 SET_CONTROL_LABEL(CONTROL_LABEL_SELECTED_PROFILE,strLabel);
 CGUIWindow::FrameMove();
 }
 
 void CGUIWindowLoginScreen::OnInitWindow()
 {
- m_iSelectedItem = (int)CProfilesManager::GetInstance().GetLastUsedProfileIndex();
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ m_iSelectedItem = static_cast<int>(profileManager.GetLastUsedProfileIndex());
+
 // Update list/thumb control
 m_viewControl.SetCurrentView(DEFAULT_VIEW_LIST);
 Update();
@@ -204,20 +212,27 @@
 void CGUIWindowLoginScreen::Update()
 {
 m_vecItems->Clear();
- for (unsigned int i=0;i<CProfilesManager::GetInstance().GetNumberOfProfiles(); ++i)
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ for (unsigned int i = 0; i < profileManager.GetNumberOfProfiles(); ++i)
 {
- const CProfile *profile = CProfilesManager::GetInstance().GetProfile(i);
+ const CProfile *profile = profileManager.GetProfile(i);
+
 CFileItemPtr item(new CFileItem(profile->getName()));
+
 std::string strLabel;
 if (profile->getDate().empty())
 strLabel = g_localizeStrings.Get(20113);
 else
 strLabel = StringUtils::Format(g_localizeStrings.Get(20112).c_str(), profile->getDate().c_str());
+
 item->SetLabel2(strLabel);
 item->SetArt("thumb", profile->getThumb());
 if (profile->getThumb().empty())
 item->SetArt("thumb", "DefaultUser.png");
 item->SetLabelPreformatted(true);
+
 m_vecItems->Add(item);
 }
 m_viewControl.SetItems(*m_vecItems);
@@ -226,10 +241,14 @@
 
 bool CGUIWindowLoginScreen::OnPopupMenu(int iItem)
 {
- if ( iItem < 0 || iItem >= m_vecItems->Size() ) return false;
+ if (iItem < 0 || iItem >= m_vecItems->Size())
+ return false;
+
+ const CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
 
 CFileItemPtr pItem = m_vecItems->Get(iItem);
 bool bSelect = pItem->IsSelected();
+
 // mark the item
 pItem->Select(true);
 
@@ -242,7 +261,7 @@
 int choice = CGUIDialogContextMenu::ShowAndGetChoice(choices);
 if (choice == 2)
 {
- if (g_passwordManager.CheckLock(CProfilesManager::GetInstance().GetMasterProfile().getLockMode(),CProfilesManager::GetInstance().GetMasterProfile().getLockCode(),20075))
+ if (g_passwordManager.CheckLock(profileManager.GetMasterProfile().getLockMode(), profileManager.GetMasterProfile().getLockCode(), 20075))
 g_passwordManager.iMasterLockRetriesLeft = CServiceBroker::GetSettings().GetInt(CSettings::SETTING_MASTERLOCK_MAXRETRIES);
 else // be inconvenient
 CApplicationMessenger::GetInstance().PostMsg(TMSG_SHUTDOWN);
@@ -255,7 +274,7 @@
 CGUIDialogProfileSettings::ShowForProfile(m_viewControl.GetSelectedItem());
 
 //NOTE: this can potentially (de)select the wrong item if the filelisting has changed because of an action above.
- if (iItem < (int)CProfilesManager::GetInstance().GetNumberOfProfiles())
+ if (iItem < static_cast<int>(profileManager.GetNumberOfProfiles()))
 m_vecItems->Get(iItem)->Select(bSelect);
 
 return false;
@@ -280,10 +299,12 @@
 // stop PVR related services
 CServiceBroker::GetPVRManager().Stop();
 
- if (profile != 0 || !CProfilesManager::GetInstance().IsMasterProfile())
+ CProfilesManager &profileManager = CServiceBroker::GetProfileManager();
+
+ if (profile != 0 || !profileManager.IsMasterProfile())
 {
 CServiceBroker::GetNetwork().NetworkMessage(CNetwork::SERVICES_DOWN, 1);
- CProfilesManager::GetInstance().LoadProfile(profile);
+ profileManager.LoadProfile(profile);
 }
 else
 {
@@ -293,10 +314,10 @@
 }
 CServiceBroker::GetNetwork().NetworkMessage(CNetwork::SERVICES_UP, 1);
 
- CProfilesManager::GetInstance().UpdateCurrentProfileDate();
- CProfilesManager::GetInstance().Save();
+ profileManager.UpdateCurrentProfileDate();
+ profileManager.Save();
 
- if (CProfilesManager::GetInstance().GetLastUsedProfileIndex() != profile)
+ if (profileManager.GetLastUsedProfileIndex() != profile)
 {
 CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST_VIDEO);
 CServiceBroker::GetPlaylistPlayer().ClearPlaylist(PLAYLIST_MUSIC);
@@ -311,7 +332,7 @@
 
 if (!g_application.LoadLanguage(true))
 {
- CLog::Log(LOGFATAL, "CGUIWindowLoginScreen: unable to load language for profile \"%s\"", CProfilesManager::GetInstance().GetCurrentProfile().getName().c_str());
+ CLog::Log(LOGFATAL, "CGUIWindowLoginScreen: unable to load language for profile \"%s\"", profileManager.GetCurrentProfile().getName().c_str());
 return;
 }
 
@@ -325,7 +346,7 @@
 // restart PVR services
 CServiceBroker::GetPVRManager().Init();
 
- CServiceBroker::GetFavouritesService().ReInit(CProfilesManager::GetInstance().GetProfileUserDataFolder());
+ CServiceBroker::GetFavouritesService().ReInit(profileManager.GetProfileUserDataFolder());
 
 CServiceBroker::GetServiceAddons().Start();

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowLoginScreen.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowPointer.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowPointer.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowScreensaver.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowScreensaver.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowScreensaverDim.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowScreensaverDim.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowSplash.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowSplash.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowStartup.cpp Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowStartup.h Changed

_service:download_files:master.tar.gz/xbmc/windows/GUIWindowSystemInfo.h Changed

Changes of Revision 52