Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
commit 0bae5c63e2ef7e4958123732a49414c695f2ce21 2 parents 522042f + 6196db4
Lars Op den Kamp authored
Showing with 18,039 additions and 3,957 deletions.
  1. +27 −7 .gitignore
  2. +4 −0 .gitmodules
  3. +120 −210 Makefile.in
  4. +2 −0  README.ios
  5. +2 −2 README.linux
  6. +1 −1  README.ubuntu
  7. +500 −211 XBMC-ATV2.xcodeproj/project.pbxproj
  8. +504 −343 XBMC-IOS.xcodeproj/project.pbxproj
  9. +700 −779 XBMC.xcodeproj/project.pbxproj
  10. +5 −0 addons/metadata.albums.allmusic.com/resources/language/Slovenian/strings.xml
  11. +7 −0 addons/metadata.artists.allmusic.com/resources/language/Slovenian/strings.xml
  12. +0 −41 addons/metadata.mtv.com/addon.xml
  13. BIN  addons/metadata.mtv.com/icon.png
  14. +0 −42 addons/metadata.mtv.com/mtv.xml
  15. +7 −0 addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml
  16. +8 −0 addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml
  17. +24 −0 addons/metadata.yahoomusic.com/addon.xml
  18. BIN  addons/metadata.yahoomusic.com/icon.png
  19. +5 −0 addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml
  20. +5 −0 addons/metadata.yahoomusic.com/resources/language/English/strings.xml
  21. +5 −0 addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml
  22. +5 −0 addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml
  23. +5 −0 addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml
  24. +5 −0 addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml
  25. +5 −0 addons/metadata.yahoomusic.com/resources/language/Slovenian/strings.xml
  26. +4 −0 addons/metadata.yahoomusic.com/resources/settings.xml
  27. +42 −0 addons/metadata.yahoomusic.com/yahoomusic.xml
  28. +2 −2 addons/pvr.hts/resources/settings.xml
  29. +1 −1  addons/pvr.mythtv/resources/settings.xml
  30. +1 −1  addons/pvr.team-mediaportal.tvserver/addon.xml
  31. +22 −0 addons/pvr.team-mediaportal.tvserver/changelog.txt
  32. +128 −0 addons/pvr.team-mediaportal.tvserver/resources/genre_translation.xml
  33. +4 −0 addons/pvr.team-mediaportal.tvserver/resources/language/Dutch/strings.xml
  34. +4 −0 addons/pvr.team-mediaportal.tvserver/resources/language/English/strings.xml
  35. +10 −4 addons/pvr.team-mediaportal.tvserver/resources/settings.xml
  36. +1 −1  addons/pvr.vdr.vnsi/resources/settings.xml
  37. +4 −0 addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml
  38. +1 −1  addons/screensaver.xbmc.builtin.dim/resources/settings.xml
  39. +9 −0 addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml
  40. +1 −1  addons/screensaver.xbmc.builtin.slideshow/resources/settings.xml
  41. +233 −0 addons/skin.confluence/720p/DialogPeripheralManager.xml
  42. +194 −0 addons/skin.confluence/720p/DialogPeripheralSettings.xml
  43. +2 −2 addons/skin.confluence/720p/DialogVideoInfo.xml
  44. +5 −5 addons/skin.confluence/720p/Home.xml
  45. +26 −82 addons/skin.confluence/720p/IncludesCodecFlagging.xml
  46. +1 −1  addons/skin.confluence/720p/Pointer.xml
  47. +2 −2 addons/skin.confluence/720p/ViewsVideoLibrary.xml
  48. +3 −3 addons/skin.confluence/720p/includes.xml
  49. +1 −1  addons/skin.confluence/language/Catalan/strings.xml
  50. +3 −3 addons/skin.confluence/language/Finnish/strings.xml
  51. +17 −5 addons/skin.confluence/language/Hungarian/strings.xml
  52. +62 −17 addons/skin.confluence/language/Korean/strings.xml
  53. +22 −9 addons/skin.confluence/language/Turkish/strings.xml
  54. +1 −0  addons/skin.touched
  55. +19 −0 addons/visualization.dxspectrum/resources/language/Slovenian/strings.xml
  56. +0 −50 addons/visualization.glesspectrum/addon.xml
  57. +0 −26 addons/visualization.glesspectrum/resources/language/English/strings.xml
  58. +0 −8 addons/visualization.glesspectrum/resources/settings.xml
  59. +1 −1  addons/visualization.glspectrum/addon.xml
  60. +19 −0 addons/visualization.glspectrum/resources/language/Slovenian/strings.xml
  61. +25 −0 addons/visualization.milkdrop/resources/language/Slovenian/strings.xml
  62. +21 −0 addons/visualization.projectm/resources/language/Slovenian/strings.xml
  63. +1 −1  addons/webinterface.default/css/core.css
  64. +86 −122 addons/webinterface.default/js/MediaLibrary.js
  65. +97 −65 addons/webinterface.default/js/NowPlayingManager.js
  66. +1 −0  bootstrap
  67. +467 −65 configure.in
  68. +1 −1  language/Afrikaans/strings.xml
  69. +2 −2 language/Basque/strings.xml
  70. +1 −1  language/Bosnian/strings.xml
  71. +1 −1  language/Bulgarian/strings.xml
  72. +21 −14 language/Catalan/strings.xml
  73. +64 −6 language/Chinese (Simple)/strings.xml
  74. +2 −2 language/Croatian/strings.xml
  75. +3 −3 language/Danish/strings.xml
  76. +1 −1  language/Dutch/strings.xml
  77. +9 −1 language/English (US)/langinfo.xml
  78. +9 −1 language/English/langinfo.xml
  79. +58 −5 language/English/strings.xml
  80. +1 −1  language/Esperanto/strings.xml
  81. +67 −5 language/Finnish/strings.xml
  82. +47 −3 language/French/strings.xml
  83. +23 −5 language/German/strings.xml
  84. +2 −2 language/Greek/strings.xml
  85. +133 −7 language/Hebrew/strings.xml
  86. +2 −2 language/Hindi (Devanagiri)/strings.xml
  87. +45 −5 language/Hungarian/strings.xml
  88. +1 −1  language/Icelandic/strings.xml
  89. +1 −1  language/Indonesian/strings.xml
  90. +1 −1  language/Italian/strings.xml
  91. +1 −1  language/Japanese/strings.xml
  92. +281 −10 language/Korean/strings.xml
  93. +1 −1  language/Maltese/strings.xml
  94. +7 −2 language/Norwegian/langinfo.xml
  95. +298 −318 language/Norwegian/strings.xml
  96. +2 −2 language/Portuguese (Brazil)/strings.xml
  97. +1 −1  language/Portuguese/strings.xml
  98. +1 −1  language/Russian/strings.xml
  99. +1 −1  language/Serbian (Cyrillic)/strings.xml
  100. +1 −1  language/Serbian/strings.xml
  101. +140 −115 language/Slovak/strings.xml
  102. +67 −8 language/Slovenian/strings.xml
  103. +1 −1  language/Spanish (Mexico)/strings.xml
  104. +46 −10 language/Spanish/strings.xml
  105. +2 −2 language/Swedish/strings.xml
  106. +1 −1  language/Thai/strings.xml
  107. +92 −21 language/Turkish/strings.xml
  108. +1 −1  language/Ukrainian/strings.xml
  109. +0 −12 lib/DllAvCodec.h
  110. +3 −6 lib/DllAvFilter.h
  111. +0 −18 lib/DllAvFormat.h
  112. +171 −0 lib/DllLibbluray.h
  113. +0 −7 lib/Makefile.in
  114. +18 −8 lib/UnrarXLib/extract.cpp
  115. +13 −0 lib/addons/script.module.pil/Imaging-1.1.7-access.patch
  116. +34 −0 lib/addons/script.module.pil/Imaging-1.1.7-crosscompiling-0.1.patch
  117. +12 −0 lib/addons/script.module.pil/Imaging-1.1.7-setuptools-0.1.patch
  118. +16 −4 lib/addons/script.module.pil/Makefile.in
  119. +26 −0 lib/afpfs-ng/01-gcrypt.patch
  120. +280 −0 lib/afpfs-ng/02-pointer.patch
  121. +25 −0 lib/afpfs-ng/04-boxee1.patch
  122. +89 −0 lib/afpfs-ng/05-boxee2.patch
  123. +141 −0 lib/afpfs-ng/06-boxee3.patch
  124. +27 −0 lib/afpfs-ng/07-boxee4.patch
  125. +11 −0 lib/afpfs-ng/08-boxee5.patch
  126. +23 −0 lib/afpfs-ng/10-fix-errno.patch
  127. +66 −0 lib/afpfs-ng/Makefile
  128. +3,082 −0 lib/afpfs-ng/fix_afpfs-ng_includes.patch
  129. +308 −0 lib/cmyth/Win32/include/inttypes.h
  130. +1 −0  lib/cmyth/Win32/libcmyth.def
  131. +2 −2 lib/cmyth/Win32/libcmyth.vcproj
  132. +2 −2 lib/cmyth/Win32/libcmyth.vcxproj
  133. +8 −0 lib/cmyth/include/cmyth/cmyth.h
  134. +0 −2  lib/cmyth/libcmyth/cmyth_local.h
  135. +156 −159 lib/cmyth/libcmyth/proginfo.c
  136. +1 −1  lib/cximage-6.0/Makefile.in
  137. +1 −1  lib/ffmpeg/libavcodec/dvdsubdec.c
  138. +1 −0  lib/ffmpeg/libavfilter/avfilter.h
  139. +1 −1  lib/ffmpeg/patches/0012-dvdsub-hacks.patch
  140. +11 −339 lib/libass/COPYING
  141. +14 −0 lib/libass/Changelog
  142. +7 −8 lib/libass/configure.ac
  143. +47 −16 lib/libass/libass/ass.c
  144. +11 −13 lib/libass/libass/ass.h
  145. +11 −15 lib/libass/libass/ass_bitmap.c
  146. +10 −12 lib/libass/libass/ass_bitmap.h
  147. +10 −12 lib/libass/libass/ass_cache.c
  148. +10 −12 lib/libass/libass/ass_cache.h
  149. +7 −5 lib/libass/libass/ass_drawing.c
  150. +44 −28 lib/libass/libass/ass_font.c
  151. +10 −12 lib/libass/libass/ass_font.h
  152. +12 −13 lib/libass/libass/ass_fontconfig.c
  153. +10 −12 lib/libass/libass/ass_fontconfig.h
  154. +10 −12 lib/libass/libass/ass_library.c
  155. +10 −12 lib/libass/libass/ass_library.h
  156. +34 −9 lib/libass/libass/ass_parse.c
  157. +34 −42 lib/libass/libass/ass_render.c
  158. +14 −12 lib/libass/libass/ass_render.h
  159. +10 −12 lib/libass/libass/ass_render_api.c
  160. +10 −12 lib/libass/libass/ass_types.h
  161. +11 −13 lib/libass/libass/ass_utils.c
  162. +10 −12 lib/libass/libass/ass_utils.h
  163. +20 −1 lib/libass/test/test.c
  164. +1 −1  lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
  165. +54 −0 lib/libcec/Makefile
  166. +2 −1  lib/libdvd/Makefile.in
  167. +5 −5 lib/libdvd/build-xbmc-win32.sh
  168. +1 −1  lib/libexif/Makefile.in
  169. +2 −1  lib/libhdhomerun/Makefile.in
  170. +1 −1  lib/libid3tag/Makefile.in
  171. +6 −6 lib/libid3tag/libid3tag/Makefile.am
  172. +5 −4 lib/libnfs/Makefile
  173. +270 −0 lib/libshairport/001_add_ao.patch
  174. +12 −0 lib/libshairport/002_fix_install_header.patch
  175. +10 −0 lib/libshairport/003_fix_deadlock.patch
  176. +22 −0 lib/libshairport/004_fix_bad_access.patch
  177. +10 −0 lib/libshairport/005_fix_shutdown.patch
  178. +843 −0 lib/libshairport/006_no_printf.patch
  179. +60 −0 lib/libshairport/Makefile
  180. +2 −1  lib/libsidplay2/Makefile.in
  181. +2 −1  lib/nosefart/Makefile.in
  182. +1 −1  lib/snesapu/SNES/SNESAPU/Makefile.in
  183. +2 −1  lib/stsound/StSoundLibrary/Makefile.in
  184. +2 −1  lib/timidity/Makefile.in
  185. +2 −1  lib/vgmstream/Makefile.in
  186. +2 −1  lib/xbadpcm/Makefile.in
  187. +2 −0  project/BuildDependencies/scripts/1_copy_deps_d.bat
  188. +2 −7 project/BuildDependencies/scripts/boost_d.bat
  189. +4 −3 project/BuildDependencies/scripts/boost_d.txt
  190. +14 −0 project/BuildDependencies/scripts/dnss_d.bat
  191. +2 −0  project/BuildDependencies/scripts/dnssd_d.txt
  192. +1 −1  project/BuildDependencies/scripts/fontconfig_d.bat
  193. +1 −1  project/BuildDependencies/scripts/fontconfig_d.txt
  194. +2 −2 project/BuildDependencies/scripts/freetype_d.bat
  195. +1 −1  project/BuildDependencies/scripts/freetype_d.txt
  196. +2 −1  project/BuildDependencies/scripts/get_msys_env.txt
  197. +2 −2 project/BuildDependencies/scripts/libbluray_d.bat
  198. +1 −1  project/BuildDependencies/scripts/libbluray_d.txt
  199. +15 −0 project/BuildDependencies/scripts/libcec_d.bat
  200. +3 −0  project/BuildDependencies/scripts/libcec_d.txt
  201. +13 −0 project/BuildDependencies/scripts/libjpeg-turbo_d.bat
  202. +2 −0  project/BuildDependencies/scripts/libjpeg-turbo_d.txt
  203. +13 −0 project/BuildDependencies/scripts/libnfs_d.bat
  204. +2 −0  project/BuildDependencies/scripts/libnfs_d.txt
  205. +13 −0 project/BuildDependencies/scripts/libplist_d.bat
  206. +2 −0  project/BuildDependencies/scripts/libplist_d.txt
  207. +64 −20 project/VS2010Express/XBMC.vcxproj
  208. +179 −35 project/VS2010Express/XBMC.vcxproj.filters
  209. +0 −3  system/deviceidmappings.xml
  210. +12 −1 system/keymaps/keyboard.xml
  211. +30 −0 system/peripherals.xml
  212. +184 −0 system/shaders/convolutionsep-4x4_d3d.fx
  213. +195 −0 system/shaders/convolutionsep-6x6_d3d.fx
  214. +7 −5 tools/darwin/depends/Makefile.in
  215. +280 −0 tools/darwin/depends/afpfs-ng/02-pointer.patch
  216. +25 −0 tools/darwin/depends/afpfs-ng/04-boxee1.patch
  217. +89 −0 tools/darwin/depends/afpfs-ng/05-boxee2.patch
  218. +141 −0 tools/darwin/depends/afpfs-ng/06-boxee3.patch
  219. +27 −0 tools/darwin/depends/afpfs-ng/07-boxee4.patch
  220. +11 −0 tools/darwin/depends/afpfs-ng/08-boxee5.patch
  221. +23 −0 tools/darwin/depends/afpfs-ng/10-fix-errno.patch
  222. +11 −0 tools/darwin/depends/afpfs-ng/11-fix-stat.patch
  223. +13 −3 tools/darwin/depends/afpfs-ng/Makefile
  224. +3,082 −0 tools/darwin/depends/afpfs-ng/fix_afpfs-ng_includes.patch
  225. +17 −5 tools/darwin/depends/config.site_ios.in
  226. +4 −4 tools/darwin/depends/config.site_ios.mk.in
  227. +12 −5 tools/darwin/depends/config.site_osx.in
  228. +4 −4 tools/darwin/depends/config.site_osx.mk.in
  229. +32 −0 tools/darwin/depends/distribute/Makefile
  230. +32 −0 tools/darwin/depends/distutilscross/Makefile
  231. +41 −0 tools/darwin/depends/lib-gpgerror/Makefile
  232. +38 −0 tools/darwin/depends/libcec/Makefile
  233. +41 −0 tools/darwin/depends/libjpeg-turbo/Makefile
  234. +1 −1  tools/darwin/depends/libnfs/Makefile
  235. +270 −0 tools/darwin/depends/libshairport/001_add_ao.patch
  236. +12 −0 tools/darwin/depends/libshairport/002_fix_install_header.patch
  237. +10 −0 tools/darwin/depends/libshairport/003_fix_deadlock.patch
  238. +22 −0 tools/darwin/depends/libshairport/004_fix_bad_access.patch
  239. +10 −0 tools/darwin/depends/libshairport/005_fix_shutdown.patch
  240. +843 −0 tools/darwin/depends/libshairport/006_no_printf.patch
  241. +46 −0 tools/darwin/depends/libshairport/Makefile
  242. +36 −0 tools/darwin/depends/libusb/Makefile
  243. +38 −0 tools/darwin/depends/m4/Makefile
  244. +3 −3 tools/darwin/depends/openssl/Makefile
  245. +3 −2 tools/darwin/depends/python26/Makefile.ios
  246. +12 −1 tools/darwin/depends/python26/Makefile.osx
  247. +71 −0 tools/darwin/depends/samba/01-bugfix-8385.patch
  248. +1 −0  tools/darwin/depends/samba/Makefile
  249. +38 −0 tools/darwin/depends/sed/Makefile
  250. +15 −3 tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
  251. +14 −1 tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
  252. +121 −25 xbmc/Application.cpp
  253. +2 −0  xbmc/Application.h
  254. +22 −4 xbmc/ApplicationMessenger.cpp
  255. +2 −0  xbmc/ApplicationMessenger.h
  256. +23 −23 xbmc/Autorun.cpp
  257. +4 −4 xbmc/Autorun.h
  258. +3 −0  xbmc/DllPaths_generated.h.in
  259. +3 −0  xbmc/DllPaths_win32.h
  260. +18 −0 xbmc/DynamicDll.h
  261. +0 −2  xbmc/Favourites.cpp
  262. +79 −8 xbmc/FileItem.cpp
  263. +6 −0 xbmc/FileItem.h
  264. +212 −79 xbmc/GUIInfoManager.cpp
  265. +35 −15 xbmc/GUIInfoManager.h
  266. +0 −3  xbmc/GUIPassword.cpp
  267. +3 −0  xbmc/GUIUserMessages.h
  268. +1 −0  xbmc/MediaSource.h
  269. +1 −1  xbmc/NfoFile.cpp
  270. +2 −2 xbmc/NfoFile.h
  271. +9 −1 xbmc/PlayListPlayer.cpp
  272. +1 −0  xbmc/PlayListPlayer.h
  273. +13 −3 xbmc/ThumbLoader.cpp
  274. +12 −4 xbmc/ThumbnailCache.cpp
  275. +3 −3 xbmc/URL.cpp
  276. +20 −28 xbmc/Util.cpp
  277. +1 −2  xbmc/Util.h
  278. +10 −7 xbmc/XBDateTime.cpp
  279. +1 −0  xbmc/XBDateTime.h
  280. +34 −29 xbmc/addons/AddonCallbacksAddon.cpp
  281. +6 −6 xbmc/addons/AddonCallbacksGUI.cpp
  282. +4 −10 xbmc/addons/AddonDatabase.cpp
  283. +1 −2  xbmc/addons/AddonDatabase.h
  284. +10 −10 xbmc/addons/GUIDialogAddonInfo.cpp
  285. +87 −4 xbmc/addons/GUIDialogAddonSettings.cpp
  286. +6 −0 xbmc/addons/GUIDialogAddonSettings.h
  287. +8 −0 xbmc/addons/GUIViewStateAddonBrowser.cpp
Sorry, we could not display the entire diff because too many files (787) changed.
34 .gitignore
View
@@ -50,6 +50,7 @@ config.log
/build/
.DS_Store
*.dSYM
+._*
/tools/darwin/depends/config.site
/tools/darwin/depends/config.site.mk
/tools/darwin/depends/Makefile
@@ -58,11 +59,6 @@ config.log
/tools/darwin/depends/python26/Makefile
/tools/darwin/depends/**/.gitignore
/tools/darwin/depends/**/.installed
-/tools/osx/osx-depends/**/.gitignore
-/tools/osx/osx-depends/**/.installed
-/tools/osx/ios-depends/**/.gitignore
-/tools/osx/ios-depends/**/.installed
-/tools/osx/ios-depends/**/.compiled
.libs/
.deps/
@@ -113,7 +109,6 @@ autom4te.cache
/addons/skin.confluence/media/Textures.xbt
/addons/skin.pm3-hd/media/Textures.xbt
/addons/visualization.dxspectrum/Spectrum_win32dx.vis
-/addons/visualization.glesspectrum/gles_spectrum.vis
/addons/visualization.glspectrum/opengl_spectrum.vis
/addons/visualization.milkdrop/MilkDrop_win32dx.vis
/addons/visualization.projectm/projectM.vis
@@ -138,6 +133,10 @@ autom4te.cache
/xbmc/guilib/Profile
/xbmc/guilib/Profile_FastCap
+# /xbmc/peripherals/
+/xbmc/peripherals/bus/Makefile
+/xbmc/peripherals/devices/Makefile
+
# /lib/
/lib/Makefile
@@ -195,6 +194,9 @@ lib/cmyth/Makefile
/lib/cpluff/libcpluff/win32/Debug
/lib/cpluff/libcpluff/win32/Release
+# /lib/libcec
+/lib/libcec/libcec
+
# /lib/enca
/lib/enca/libenca_win32/Debug
/lib/enca/libenca_win32/Release
@@ -382,6 +384,10 @@ lib/cmyth/Makefile
/system/ssh.dll
/system/sqlite3.dll
/system/libsamplerate-0.dll
+/system/libnfs.dll
+/system/dnssd.dll
+/system/libcec.dll
+/system/pthreadVC2.dll
# /system/cdrip
/system/cdrip/lame_enc.dll
@@ -432,6 +438,8 @@ lib/cmyth/Makefile
# /system/webserver
/system/webserver
+/system/airplay
+
# /system
/system/zlib1.dll
@@ -1212,12 +1220,24 @@ lib/cmyth/Makefile
/xbmc/visualizations/DirectXSpectrum/Release (DirectX)
/xbmc/visualizations/Goom/Makefile
+/xbmc/visualizations/Goom/goom2k4-0/aclocal.m4
+/xbmc/visualizations/Goom/goom2k4-0/configure
+/xbmc/visualizations/Goom/goom2k4-0/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/config.guess
+/xbmc/visualizations/Goom/goom2k4-0/config.sub
+/xbmc/visualizations/Goom/goom2k4-0/depcomp
+/xbmc/visualizations/Goom/goom2k4-0/install-sh
+/xbmc/visualizations/Goom/goom2k4-0/ltmain.sh
+/xbmc/visualizations/Goom/goom2k4-0/missing
+/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.in
+/xbmc/visualizations/Goom/goom2k4-0/ylwrap
/xbmc/visualizations/Milkdrop/Debug
/xbmc/visualizations/Milkdrop/Release
/xbmc/visualizations/OpenGLSpectrum/Makefile
-/xbmc/visualizations/EGLSpectrum/Makefile
/xbmc/visualizations/WaveForm/Makefile
/xbmc/visualizations/WaveForm/Debug (DirectX)
4 .gitmodules
View
@@ -0,0 +1,4 @@
+[submodule "touched"]
+ path = addons/skin.touched
+ url = git://github.com/xbmc/skin.touched.git
+ ignore = all
330 Makefile.in 100644 → 100755
View
@@ -83,7 +83,11 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
- xbmc/windowing
+ xbmc/windowing \
+ xbmc/peripherals \
+ xbmc/peripherals/bus \
+ xbmc/peripherals/devices \
+ xbmc/peripherals/dialogs \
ifeq (@USE_OPENGL@,1)
BIN_DIRS += xbmc/rendering/gl
@@ -121,6 +125,93 @@ DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a
+DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
+ lib/SlingboxLib/SlingboxLib.a \
+ lib/UnrarXLib/UnrarXLib.a \
+ lib/libRTV/librtv.a \
+ lib/libUPnP/libupnp.a \
+ lib/libXDAAP/libxdaap.a \
+ lib/libhts/libhts.a \
+ lib/libsquish/libsquish.a \
+ lib/libTcpSocket/libTcpSocket.a \
+ lib/tinyXML/tinyxml.a \
+ lib/xbmc-dll-symbols/dll-symbols.a \
+ xbmc/addons/addons.a \
+ xbmc/cdrip/cdrip.a \
+ xbmc/cores/AudioRenderers/audiorenderers.a \
+ xbmc/cores/DllLoader/dllloader.a \
+ xbmc/cores/DllLoader/exports/exports.a \
+ xbmc/cores/DllLoader/exports/util/exports_utils.a \
+ xbmc/cores/ExternalPlayer/ExternalPlayer.a \
+ xbmc/cores/VideoRenderers/VideoRenderer.a \
+ xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
+ xbmc/cores/cores.a \
+ xbmc/cores/paplayer/paplayer.a \
+ xbmc/cores/playercorefactory/playercorefactory.a \
+ xbmc/dbwrappers/dbwrappers.a \
+ xbmc/dialogs/dialogs.a \
+ xbmc/epg/epg.a \
+ xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
+ xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
+ xbmc/filesystem/filesystem.a \
+ xbmc/guilib/guilib.a \
+ xbmc/input/input.a \
+ xbmc/input/linux/input_linux.a \
+ xbmc/interfaces/http-api/http-api.a \
+ xbmc/interfaces/info/info.a \
+ xbmc/interfaces/interfaces.a \
+ xbmc/interfaces/json-rpc/json-rpc.a \
+ xbmc/interfaces/python/python.a \
+ xbmc/interfaces/python/xbmcmodule/xbmcmodule.a \
+ xbmc/linux/linux.a \
+ xbmc/music/dialogs/musicdialogs.a \
+ xbmc/music/infoscanner/musicscanner.a \
+ xbmc/music/karaoke/karaoke.a \
+ xbmc/music/music.a \
+ xbmc/music/tags/musictags.a \
+ xbmc/music/windows/musicwindows.a \
+ xbmc/network/libscrobbler/scrobbler.a \
+ xbmc/network/linux/network_linux.a \
+ xbmc/network/network.a \
+ xbmc/osx/osx.a \
+ xbmc/peripherals/bus/peripheral-bus.a \
+ xbmc/peripherals/devices/peripheral-devices.a \
+ xbmc/peripherals/dialogs/peripheral-dialogs.a \
+ xbmc/peripherals/peripherals.a \
+ xbmc/pictures/pictures.a \
+ xbmc/playlists/playlists.a \
+ xbmc/powermanagement/linux/powermanagement_linux.a \
+ xbmc/powermanagement/osx/powermanagement.a \
+ xbmc/powermanagement/powermanagement.a \
+ xbmc/programs/programs.a \
+ xbmc/pvr/addons/pvraddons.a \
+ xbmc/pvr/channels/pvrchannels.a \
+ xbmc/pvr/dialogs/pvrdialogs.a \
+ xbmc/pvr/pvr.a \
+ xbmc/pvr/recordings/pvrrecordings.a \
+ xbmc/pvr/timers/pvrtimers.a \
+ xbmc/pvr/windows/pvrwindows.a \
+ xbmc/pvrclients/pvrclient.a \
+ xbmc/rendering/gl/rendering_gl.a \
+ xbmc/rendering/gles/rendering_gles.a \
+ xbmc/rendering/rendering.a \
+ xbmc/settings/settings.a \
+ xbmc/storage/linux/storage_linux.a \
+ xbmc/storage/osx/storage.a \
+ xbmc/storage/storage.a \
+ xbmc/threads/threads.a \
+ xbmc/utils/utils.a \
+ xbmc/video/dialogs/videodialogs.a \
+ xbmc/video/video.a \
+ xbmc/video/windows/videowindows.a \
+ xbmc/windowing/X11/windowing_X11.a \
+ xbmc/windowing/egl/windowing_egl.a \
+ xbmc/windowing/osx/windowing_osx.a \
+ xbmc/windowing/windowing.a \
+ xbmc/windows/windows.a \
+ xbmc/xbmc.a \
+
+
PAPCODECS_DIRS= \
lib/xbadpcm \
lib/nosefart \
@@ -146,16 +237,15 @@ LIB_DIRS=\
lib/xbmc-dll-symbols
SS_DIRS=
-ifeq (@USE_OPENGL@,1)
+ifneq (@DISABLE_RSXS@,1)
SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
endif
-VIS_DIRS=
-ifeq (@USE_OPENGL@,1)
-VIS_DIRS+=\
- xbmc/visualizations/OpenGLSpectrum \
- xbmc/visualizations/WaveForm \
- xbmc/visualizations/XBMCProjectM
+VIS_DIRS=xbmc/visualizations/OpenGLSpectrum \
+ xbmc/visualizations/WaveForm
+
+ifneq (@DISABLE_PROJECTM@,1)
+ VIS_DIRS+= xbmc/visualizations/XBMCProjectM
endif
ifeq (($(findstring osx,@ARCH@), osx),(@USE_OPENGL@,1))
@@ -166,14 +256,6 @@ ifneq (@DISABLE_GOOM@,1)
VIS_DIRS+=xbmc/visualizations/Goom
endif
-ifeq (@USE_OPENGLES@,1)
- ifeq ($(findstring osx,@ARCH@), osx)
- ifeq (@ARCH@, arm-osx)
- VIS_DIRS+=xbmc/visualizations/EGLSpectrum
- endif
- endif
-endif
-
PVR_DIRS=\
xbmc/pvrclients/MediaPortal \
xbmc/pvrclients/mythtv \
@@ -186,9 +268,12 @@ LIBADDON_DIRS=\
lib/addons/library.xbmc.gui \
CONFLUENCE_MEDIA=addons/skin.confluence/media
+SKIN_DIRS=$(CONFLUENCE_MEDIA)
-SKIN_DIRS=\
- $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+TOUCHED_MEDIA=addons/skin.touched/media
+SKIN_DIRS+=$(TOUCHED_MEDIA)
+endif
DIRS= $(BIN_DIRS) $(EC_DIRS) $(XBMCTEX_DIRS) $(DVDPCODECS_DIRS) $(PAPCODECS_DIRS) \
$(LIB_DIRS) $(SS_DIRS) $(VIS_DIRS) $(PVR_DIRS) $(LIBADDON_DIRS) $(SKIN_DIRS)
@@ -206,6 +291,9 @@ DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
system/libcpluff-@ARCH@.so
all : Makefile externals xbmc.bin xbmc-xrandr skins
+ @echo '-----------------------'
+ @echo 'XBMC built successfully'
+ @echo '-----------------------'
include Makefile.include
@@ -231,173 +319,20 @@ configure: configure.in
ifeq (@USE_TEXTUREPACKER@,1)
skins: tools/TexturePacker/TexturePacker force
$(MAKE) -C $(CONFLUENCE_MEDIA)
+ifeq (@USE_SKIN_TOUCHED@,1)
+ $(MAKE) -C $(TOUCHED_MEDIA)
+endif
else
skins:
endif
+# Setup some dependencies for subdir makes
+xbmc/cores/paplayer/paplayer.a: papcodecs
+$(DVDPLAYER_ARCHIVES) : dvdpcodecs
+
+$(DIRECTORY_ARCHIVES): force
+ @$(MAKE) -C $(@D)
-xbmc/guilib/guilib.a: force
- $(MAKE) -C xbmc/guilib
-lib/tinyXML/tinyxml.a: force
- $(MAKE) -C lib/tinyXML
-xbmc/xbmc.a: force
- $(MAKE) -C xbmc
-xbmc/cdrip/cdrip.a: force
- $(MAKE) -C xbmc/cdrip
-xbmc/cores/cores.a: force
- $(MAKE) -C xbmc/cores
-xbmc/cores/DllLoader/dllloader.a: force
- $(MAKE) -C xbmc/cores/DllLoader/
-xbmc/cores/DllLoader/exports/exports.a: force
- $(MAKE) -C xbmc/cores/DllLoader/exports
-xbmc/cores/DllLoader/exports/util/exports_utils.a: force
- $(MAKE) -C xbmc/cores/DllLoader/exports/util
-$(DVDPLAYER_ARCHIVES): force dvdpcodecs
- $(MAKE) -C $(@D)
-xbmc/cores/paplayer/paplayer.a: force papcodecs
- $(MAKE) -C xbmc/cores/paplayer
-xbmc/cores/AudioRenderers/audiorenderers.a: force
- $(MAKE) -C xbmc/cores/AudioRenderers
-xbmc/cores/VideoRenderers/VideoRenderer.a: force
- $(MAKE) -C xbmc/cores/VideoRenderers
-xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a: force
- $(MAKE) -C xbmc/cores/VideoRenderers/VideoShaders
-xbmc/cores/ExternalPlayer/ExternalPlayer.a: force
- $(MAKE) -C xbmc/cores/ExternalPlayer
-xbmc/cores/playercorefactory/playercorefactory.a: force
- $(MAKE) -C xbmc/cores/playercorefactory
-xbmc/filesystem/filesystem.a: force
- $(MAKE) -C xbmc/filesystem
-xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a: force
- $(MAKE) -C xbmc/filesystem/MusicDatabaseDirectory
-xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a: force
- $(MAKE) -C xbmc/filesystem/VideoDatabaseDirectory
-xbmc/input/input.a: force
- $(MAKE) -C xbmc/input
-xbmc/input/linux/input_linux.a: force
- $(MAKE) -C xbmc/input/linux
-xbmc/music/karaoke/karaoke.a: force
- $(MAKE) -C xbmc/music/karaoke
-xbmc/network/network.a: force
- $(MAKE) -C xbmc/network
-xbmc/network/osx/network.a: force
- $(MAKE) -C xbmc/network/osx
-xbmc/pictures/pictures.a: force
- $(MAKE) -C xbmc/pictures
-xbmc/programs/programs.a: force
- $(MAKE) -C xbmc/programs
-xbmc/network/linux/network_linux.a: force
- $(MAKE) -C xbmc/network/linux
-xbmc/playlists/playlists.a: force
- $(MAKE) -C xbmc/playlists
-xbmc/powermanagement/powermanagement.a: force
- $(MAKE) -C xbmc/powermanagement
-xbmc/powermanagement/linux/powermanagement_linux.a: force
- $(MAKE) -C xbmc/powermanagement/linux
-xbmc/powermanagement/osx/powermanagement.a: force
- $(MAKE) -C xbmc/powermanagement/osx
-xbmc/rendering/rendering.a: force
- $(MAKE) -C xbmc/rendering
-xbmc/rendering/gl/rendering_gl.a: force
- $(MAKE) -C xbmc/rendering/gl
-xbmc/rendering/gles/rendering_gles.a: force
- $(MAKE) -C xbmc/rendering/gles
-xbmc/windowing/windowing.a: force
- $(MAKE) -C xbmc/windowing
-xbmc/windowing/egl/windowing_egl.a: force
- $(MAKE) -C xbmc/windowing/egl
-xbmc/windowing/osx/windowing_osx.a: force
- $(MAKE) -C xbmc/windowing/osx
-xbmc/windowing/X11/windowing_X11.a: force
- $(MAKE) -C xbmc/windowing/X11
-xbmc/storage/storage.a: force
- $(MAKE) -C xbmc/storage
-xbmc/storage/linux/storage_linux.a: force
- $(MAKE) -C xbmc/storage/linux
-xbmc/storage/osx/storage.a: force
- $(MAKE) -C xbmc/storage/osx
-xbmc/threads/threads.a: force
- $(MAKE) -C xbmc/threads
-xbmc/music/music.a: force
- $(MAKE) -C xbmc/music
-xbmc/music/tags/musictags.a: force
- $(MAKE) -C xbmc/music/tags
-xbmc/music/dialogs/musicdialogs.a: force
- $(MAKE) -C xbmc/music/dialogs
-xbmc/music/windows/musicwindows.a: force
- $(MAKE) -C xbmc/music/windows
-xbmc/music/infoscanner/musicscanner.a: force
- $(MAKE) -C xbmc/music/infoscanner
-xbmc/video/video.a: force
- $(MAKE) -C xbmc/video
-xbmc/video/dialogs/videodialogs.a: force
- $(MAKE) -C xbmc/video/dialogs
-xbmc/video/windows/videowindows.a: force
- $(MAKE) -C xbmc/video/windows
-xbmc/dialogs/dialogs.a: force
- $(MAKE) -C xbmc/dialogs
-xbmc/windows/windows.a: force
- $(MAKE) -C xbmc/windows
-lib/libTcpSocket/libTcpSocket.a: force
- $(MAKE) -C lib/libTcpSocket
-lib/libhts/libhts.a: force
- $(MAKE) -C lib/libhts
-xbmc/interfaces/interfaces.a: force
- $(MAKE) -C xbmc/interfaces
-xbmc/interfaces/info/info.a: force
- $(MAKE) -C xbmc/interfaces/info
-xbmc/interfaces/python/python.a: force
- $(MAKE) -C xbmc/interfaces/python
-xbmc/interfaces/python/xbmcmodule/xbmcmodule.a: force
- $(MAKE) -C xbmc/interfaces/python/xbmcmodule
-xbmc/network/libscrobbler/scrobbler.a: force
- $(MAKE) -C xbmc/network/libscrobbler
-lib/libRTV/librtv.a: force
- $(MAKE) -C lib/libRTV
-lib/libUPnP/libupnp.a: force
- $(MAKE) -C lib/libUPnP
-lib/libXDAAP/libxdaap.a: force
- $(MAKE) -C lib/libXDAAP
-xbmc/interfaces/http-api/http-api.a: force
- $(MAKE) -C xbmc/interfaces/http-api
-xbmc/interfaces/json-rpc/json-rpc.a: force
- $(MAKE) -C xbmc/interfaces/json-rpc
-xbmc/dbwrappers/dbwrappers.a: force
- $(MAKE) -C xbmc/dbwrappers
-lib/UnrarXLib/UnrarXLib.a: force
- $(MAKE) -C lib/UnrarXLib
-lib/libsquish/libsquish.a: force
- $(MAKE) -C lib/libsquish
-lib/SlingboxLib/SlingboxLib.a: force
- $(MAKE) -C lib/SlingboxLib
-xbmc/linux/linux.a: force
- $(MAKE) -C xbmc/linux
-xbmc/addons/addons.a: force
- $(MAKE) -C xbmc/addons
-xbmc/settings/settings.a: force
- $(MAKE) -C xbmc/settings
-xbmc/utils/utils.a: force
- $(MAKE) -C xbmc/utils
-xbmc/epg/epg.a: force
- $(MAKE) -C xbmc/epg
-xbmc/pvr/pvr.a: force
- $(MAKE) -C xbmc/pvr
-xbmc/pvr/addons/pvraddons.a: force
- $(MAKE) -C xbmc/pvr/addons
-xbmc/pvr/channels/pvrchannels.a: force
- $(MAKE) -C xbmc/pvr/channels
-xbmc/pvr/dialogs/pvrdialogs.a: force
- $(MAKE) -C xbmc/pvr/dialogs
-xbmc/pvr/recordings/pvrrecordings.a: force
- $(MAKE) -C xbmc/pvr/recordings
-xbmc/pvr/timers/pvrtimers.a: force
- $(MAKE) -C xbmc/pvr/timers
-xbmc/pvr/windows/pvrwindows.a: force
- $(MAKE) -C xbmc/pvr/windows
-xbmc/pvrclients/pvrclient.a: force
- $(MAKE) -C xbmc/pvrclients
-xbmc/osx/osx.a: force
- $(MAKE) -C xbmc/osx
lib/libapetag/.libs/libapetag.a: force
$(MAKE) -C lib/libapetag
lib/cpluff/libcpluff/.libs/libcpluff.a: force
@@ -412,8 +347,6 @@ ifeq ($(findstring osx,@ARCH@), osx)
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
endif
-lib/xbmc-dll-symbols/dll-symbols.a: force
- $(MAKE) -C lib/xbmc-dll-symbols
exports: xbmc/cores/DllLoader/exports/exports.a xbmc/cores/DllLoader/exports/util/exports_utils.a
$(MAKE) -C xbmc/cores/DllLoader/exports wrapper.def
@@ -548,7 +481,11 @@ OBJSXBMC= \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
xbmc/windowing/windowing.a \
- lib/libTcpSocket/libTcpSocket.a
+ lib/libTcpSocket/libTcpSocket.a \
+ xbmc/peripherals/peripherals.a \
+ xbmc/peripherals/bus/peripheral-bus.a \
+ xbmc/peripherals/devices/peripheral-devices.a \
+ xbmc/peripherals/dialogs/peripheral-dialogs.a
ifeq (@USE_OPENGL@,1)
OBJSXBMC += xbmc/rendering/gl/rendering_gl.a
@@ -700,33 +637,6 @@ uninstall:
@rm -rf $(prefix)/include/xbmc
@echo "Done!"
-reallyclean:
- @echo " This will delete ALL unversioned files in"; \
- echo " your XBMC source tree. If you aren't sure"; \
- echo " you want to do this, answer anything but"; \
- echo " 'Y' (case sensitive) to the following."; \
- echo " DISCLAIMER: Team XBMC is NOT responsible"; \
- echo " for ANYTHING lost if you execute this command!"; \
- echo -n " Damnserious? (Y/*) "; \
- read -n1 PROMPT; \
- if [[ "$$PROMPT" = "Y" ]]; then \
- SVNV=$$(svnversion -n | cut -d':' -f1); _IFS=$$IFS; IFS=$$'\t\n'; \
- for i in `svn st --no-ignore | grep ^[I\?] | cut -d' ' -f7-`; do \
- if [[ $${i:(-4)} != "diff" && $${i:(-5)} != "patch" ]]; then \
- echo " Deleting $$i"; \
- rm -rf "$$i"; \
- fi; \
- done; \
- IFS=$$_IFS; \
- echo " Recovering any missing files."; \
- svn up -r $${SVNV/M/} | sed -e "s/.*'\(.*\)'/ \1/p" -e d; \
- echo " Done."; \
- echo " The following files may need reverted (svn revert <file>)"; \
- svn st | sed -e "s/^M */ /p" -e d; \
- else \
- echo; \
- fi
-
clean-xbmc.bin:
rm -f xbmc.bin
for d in $(BIN_DIRS); do if test -f $$d/Makefile; then $(MAKE) -C $$d clean; fi; done
2  README.ios
View
@@ -37,6 +37,8 @@ character itself should NOT be typed as part of the command.
$ cd $HOME
$ git clone git://github.com/xbmc/xbmc.git xbmc
+ $ cd xbmc
+ $ git submodule update --init addons/skin.touched
-----------------------------------------------------------------------------
3.0 Install Xcode
4 README.linux
View
@@ -43,7 +43,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libglew-dev,
libmad0-dev, libjpeg-dev, libsamplerate-dev, libogg-dev, libvorbis-dev,
libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
- libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
+ libsqlite3-dev, libmysqlclient-dev, libasound2-dev, libpng12-dev | libpng-dev,
libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
libxmu-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev,
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev
+ libplist-dev, libusb-dev, libudev-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
2  README.ubuntu
View
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev
+ # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
711 XBMC-ATV2.xcodeproj/project.pbxproj
View
500 additions, 211 deletions not shown
847 XBMC-IOS.xcodeproj/project.pbxproj
View
504 additions, 343 deletions not shown
1,479 XBMC.xcodeproj/project.pbxproj
View
700 additions, 779 deletions not shown
5 addons/metadata.albums.allmusic.com/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+ <string id="30000">Prenesi ovitke albumov z Allmusic.com</string>
+ <string id="30001">Prenesi ovitke albumov z Last.fm</string>
+</strings>
7 addons/metadata.artists.allmusic.com/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<strings>
+ <string id="30000">Prenesi ozadja s HTBackdrops.com</string>
+ <string id="30001">Prenesi sličica izvajalcev z Allmusic.com</string>
+ <string id="30002">Prenesi sličica izvajalcev z Last.fm</string>
+ <string id="30003">Prenesi sličica izvajalcev s HTBackdrops.com</string>
+</strings>
41 addons/metadata.mtv.com/addon.xml
View
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="metadata.mtv.com"
- name="MTV"
- version="1.0.5"
- provider-name="Team XBMC">
- <requires>
- <import addon="xbmc.metadata" version="1.0"/>
- </requires>
- <extension point="xbmc.metadata.scraper.musicvideos"
- language="en"
- library="mtv.xml"/>
- <extension point="xbmc.addon.metadata">
- <summary lang="en">MTV Music Video Scraper</summary>
- <summary lang="de">MTV Scraper für Musikvideos</summary>
- <summary lang="es">Scraper de videoclips de MTV</summary>
- <summary lang="fr">Scraper MTV pour vidéo-clips</summary>
- <summary lang="hu">MTV videóklip leolvasó</summary>
- <summary lang="kr">MTV 뮤직 비디오 스크래퍼</summary>
- <summary lang="nl">MTV-muziekvideoscraper</summary>
- <summary lang="pl">Scraper teledysków MTV</summary>
- <summary lang="pt">Scraper de videoclips MTV</summary>
- <summary lang="ro">Catalog MTV pentru videoclipuri</summary>
- <summary lang="ru">Обработчик музыкальных видео для MTV</summary>
- <summary lang="se">MTV Musikvideoskrapa</summary>
- <summary lang="zh">MTV音乐电视刮削器</summary>
- <description lang="en">Download Music Video information</description>
- <description lang="de">Downloade Informationen zu Musikvideos von www.mtv.com</description>
- <description lang="es">Descarga información de videoclips de www.mtv.com</description>
- <description lang="fr">Télécharge les infos des vidéo-clips</description>
- <description lang="hu">Zenei videóklip információk letöltése</description>
- <description lang="kr">MTV 에서 뮤직비디오 정보 다운로드</description>
- <description lang="nl">Muziekvideo-info ophalen van MTV</description>
- <description lang="pl">Pobieraj informacje o teledyskach</description>
- <description lang="pt">Descarregar informação de videoclips de www.mtv.com</description>
- <description lang="ro">Descărcați informații videoclipuri.</description>
- <description lang="ru">Загружать информацию о музыкальных видео с www.mtv.com</description>
- <description lang="se">Ladda ner musikvideoinformation från MTV.</description>
- <description lang="zh">下载音乐电视资料。</description>
- <platform>all</platform>
- </extension>
-</addon>
BIN  addons/metadata.mtv.com/icon.png
View
Deleted file not rendered
42 addons/metadata.mtv.com/mtv.xml
View
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.0" date="2009-05-22">
- <CreateSearchUrl dest="3">
- <RegExp input="$$1" output="&lt;url&gt;http://api.mtvnservices.com/1/video/search/?term=\1&lt;/url&gt;" dest="3">
- <expression noclean="1"/>
- </RegExp>
- </CreateSearchUrl>
- <GetSearchResults dest="8">
- <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; encoding=&quot;iso-8859-1&quot; standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" dest="8">
- <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\1 - \2&lt;/title&gt;&lt;url&gt;\4&lt;/url&gt;&lt;/entity&gt;" dest="5">
- <expression noclean="1" repeat="yes">&lt;entry&gt;.*?&lt;content&gt;(.*?) \| (.*?) \| (.*?)&lt;/content&gt;.*?media:player url=&quot;([^&quot;]*)&quot;/&gt;</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetSearchResults>
- <GetDetails dest="3">
- <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
- <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
- <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_vt&quot; content=&quot;([^&quot;]*)&quot;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
- <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_an&quot; content=&quot;([^&quot;]*)&quot;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
- <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_at&quot; content=&quot;([^&quot;]*)&quot;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
- <expression trim="1" noclean="1">&lt;strong&gt;Label&lt;/strong&gt; ([^&lt;]*)&lt;/li&gt;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
- <expression>&lt;meta name=&quot;content_create_date&quot; content=&quot;([0-9]*)-[^&quot;]*&quot;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;director&gt;\1&lt;/director&gt;" dest="5+">
- <expression trim="1" noclean="1">&lt;meta name=&quot;mtv_vd&quot; content=&quot;([^&quot;]*)&quot;</expression>
- </RegExp>
- <RegExp input="$$1" output="&lt;thumb&gt;http://www.mtv.com\2.jpg&lt;/thumb&gt;" dest="5+">
- <expression noclean="1">&quot;thumbnail&quot;([^&quot;]*)content=&quot;([^&quot;]*)\.jpg</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetDetails>
-</scraper>
7 addons/metadata.themoviedb.org/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+ <string id="30000">Vključi ozadja</string>
+ <string id="30001">Vključi napovednike s HD-Trailers.net</string>
+ <string id="30002">Jezik</string>
+ <string id="30003">Prenesi oceno z IMDb</string>
+</strings>
8 addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <string id="30000">Uporabi zaporedje DVDja</string>
+ <string id="30001">Uporabi absolutno zaporedje (ena sezona)</string>
+ <string id="30002">Vključi ozadja</string>
+ <string id="30003">Prenesi plakate</string>
+ <string id="30004">Jezik</string>
+</strings>
24 addons/metadata.yahoomusic.com/addon.xml
View
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<addon id="metadata.yahoomusic.com"
+ name="Yahoo Music Videos"
+ version="1.0.4"
+ provider-name="Team XBMC">
+ <requires>
+ <import addon="xbmc.metadata" version="1.0"/>
+ </requires>
+ <extension point="xbmc.metadata.scraper.musicvideos"
+ language="en"
+ library="yahoomusic.xml"/>
+ <extension point="xbmc.addon.metadata">
+ <summary lang="en">Yahoo! Music Video Scraper</summary>
+ <summary lang="hu">Yahoo! videóklip leolvasó</summary>
+ <summary lang="kr">야후! 뮤직 비디오 스크래퍼</summary>
+ <summary lang="pl">Scraper teledysków Yahoo!</summary>
+ <summary lang="pt">Scraper de música Yahoo!</summary>
+ <description lang="en">Download Music Video information</description>
+ <description lang="hu">Videóklip információk letöltése a Yahoo! webhelyről</description>
+ <description lang="kr">뮤직 비디오 정보 다운로드</description>
+ <description lang="pl">Pobieraj informacje o teledyskach z music.yahoo.com</description>
+ <description lang="pt">Descarregar informação de filmes de music.yahoo.com</description>
+ </extension>
+</addon>
BIN  addons/metadata.yahoomusic.com/icon.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 addons/metadata.yahoomusic.com/resources/language/Dutch/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Afmetingen van de voorbeeld afbeeldingen</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/English/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Thumb(s) Size</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/Hungarian/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Bélyegképek mérete</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/Korean/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">미리보기 크기</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/Polish/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Rozmiar miniatur</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/Portuguese/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Tamanho de miniaturas</string>
+</strings>
5 addons/metadata.yahoomusic.com/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<strings>
+ <!-- settings labels -->
+ <string id="30000">Velikost sličic(e)</string>
+</strings>
4 addons/metadata.yahoomusic.com/resources/settings.xml
View
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <setting label="30000" type="labelenum" values="192|256|384|512|1024" id="yahooscale" default="384"/>
+</settings>
42 addons/metadata.yahoomusic.com/yahoomusic.xml
View
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.0" date="2009-05-22">
+ <CreateSearchUrl dest="3">
+ <RegExp input="$$1" output="&lt;url&gt;http://us.music.yahooapis.com/video/v1/list/search/all/\1?appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--&amp;amp;response=artists,images&lt;/url&gt;" dest="3">
+ <expression noclean="1"/>
+ </RegExp>
+ </CreateSearchUrl>
+ <GetSearchResults dest="8">
+ <RegExp input="$$5" output="&lt;?xml version=&quot;1.0&quot; encoding=&quot;iso-8859-1&quot; standalone=&quot;yes&quot;?&gt;&lt;results&gt;\1&lt;/results&gt;" dest="8">
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4 - \1 (\2)&lt;/title&gt;&lt;url&gt;http://us.music.yahooapis.com/video/v1/item/\3?format=xml&amp;amp;appid=r6QWQGXV34H0Sl3Wq4vWJI2v9IO1XnZw5JkeifPbTq2p0S9H9kg0JUc3SVN0Yw--&lt;/url&gt;&lt;/entity&gt;" dest="5">
+ <expression repeat="yes">&lt;Video.*?title=&quot;([^&quot;]*)&quot;.*?copyrightYear=&quot;([^&quot;]*)&quot;.*?\/([0-9]*)\?size.*?name=&quot;([^&quot;]*)&quot;.*?&lt;/Video&gt;</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetSearchResults>
+ <GetDetails dest="3">
+ <RegExp input="$$5" output="&lt;details&gt;\1&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5">
+ <expression>&lt;Video.*?title=&quot;([^&quot;]*)&quot;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;artist&gt;\1&lt;/artist&gt;" dest="5+">
+ <expression repeat="yes">&lt;Artist.*?name=&quot;([^&quot;]*)&quot;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;album&gt;\1&lt;/album&gt;" dest="5+">
+ <expression>&lt;Release.*?title=&quot;([^&quot;]*)&quot;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;studio&gt;\1&lt;/studio&gt;" dest="5+">
+ <expression repeat="yes">label=&quot;([^&quot;]*)&quot;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;year&gt;\1&lt;/year&gt;" dest="5+">
+ <expression>copyrightYear=&quot;([0-9]*)&quot;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;genre&gt;\1&lt;/genre&gt;" dest="5+">
+ <expression repeat="yes">&lt;Category.*?name=&quot;([^&quot;]*)&quot; rating=&quot;([^&quot;]*)&quot; type=&quot;Genre&quot;&gt;</expression>
+ </RegExp>
+ <RegExp input="$$1" output="&lt;thumb&gt;http://d.yimg.com/img.music.yahoo.com/image/v1/video/\1?size=$INFO[yahooscale]&lt;/thumb&gt;" dest="5+">
+ <expression>\/([0-9]*)\?size</expression>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetDetails>
+</scraper>
4 addons/pvr.hts/resources/settings.xml
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="host" type="text" label="30000" default="127.0.0.1" />
- <setting id="http_port" type="integer" label="30001" default="9981" />
- <setting id="htsp_port" type="integer" label="30002" default="9982" />
+ <setting id="http_port" type="number" label="30001" default="9981" />
+ <setting id="htsp_port" type="number" label="30002" default="9982" />
<setting id="user" type="text" label="30003" default="" />
<setting id="pass" type="text" label="30004" option="hidden" default="" />
<setting id="connect_timeout" type="enum" label="30006" values="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60" default="29" />
2  addons/pvr.mythtv/resources/settings.xml
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="host" type="text" label="30000" option="urlencoded" default="127.0.0.1" />
- <setting id="mythXMLPort" type="integer" label="30001" default="6544" />
+ <setting id="mythXMLPort" type="number" label="30001" default="6544" />
</settings>
2  addons/pvr.team-mediaportal.tvserver/addon.xml
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.team-mediaportal.tvserver"
- version="1.1.2.102"
+ version="1.1.3.107"
name="MediaPortal PVR Client (ffmpeg)"
provider-name="Marcel Groothuis">
<requires>
22 addons/pvr.team-mediaportal.tvserver/changelog.txt
View
@@ -1,3 +1,25 @@
+v1.1.3.107:
+- Added: add additional checks for communication errors
+- Fixed: trigger also a recording list update on timer changes
+- Fixed: add a mutex to prevent mixing up backend communication on concurrent access
+- Fixed: stack overflow while closing a live stream
+- Fixed: tv/radio playback after recording playback
+- Added: EPG genre string-to-id translation table (addons/pvr.team-mediaportal.tvserver/resources/genre_translation.xml)
+- Added: EPG genre string support
+- Added: Retrieve TV/Radio card settings from the backend
+- Added: support for TVServerXBMC v1.1.x.105-107
+- Fixed: several memory leaks
+- Changed: sources adapted for PVR API changes
+
+v1.1.3.103:
+- Fixed: trigger timer and recording list update on changes from XBMC side
+- Fixed: check for empty recordings list
+- Fixed: check for empty timer list
+- Fixed: limit EPG request to the requested period
+- Fixed: use tuning details to retrieve the channel number from the backend
+- Added: support for TVServerXBMC v1.1.x.104
+- Changed: sources adapted for PVR API changes
+
v1.1.2.102:
- Added: Channel group support
- Fixed: live stream playback
128 addons/pvr.team-mediaportal.tvserver/resources/genre_translation.xml
View
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Use only lower case strings and hexadecimal id's //-->
+<!-- See below for the type/subtype number definitions //-->
+<genrestrings>
+ <!-- English strings //-->
+ <genre lang="en" type="0x10" subtype="0x00">movie/drama (general)</genre>
+ <genre lang="en" type="0x10" subtype="0x01">detective/thriller</genre>
+ <genre lang="en" type="0x10" subtype="0x04">comedy</genre>
+ <genre lang="en" type="0x10" subtype="0x05">soap/melodram/folkloric</genre>
+ <genre lang="en" type="0x10" subtype="0x08">adult movie/drama</genre>
+ <genre lang="en" type="0x20" subtype="0x00">news/current affairs (general)</genre>
+ <genre lang="en" type="0x20" subtype="0x03">documentary</genre>
+ <genre lang="en" type="0x30" subtype="0x00">show/game show (general)</genre>
+ <genre lang="en" type="0x40" subtype="0x00">sports (general)</genre>
+ <genre lang="en" type="0x50" subtype="0x00">childrens's/youth program (general)</genre>
+ <genre lang="en" type="0x50" subtype="0x05">cartoon/puppets</genre>
+ <genre lang="en" type="0x60" subtype="0x00">music/ballet/dance (general)</genre>
+ <genre lang="en" type="0x70" subtype="0x00">arts/culture (without music, general)</genre>
+ <genre lang="en" type="0x70" subtype="0x03">religion</genre>
+ <genre lang="en" type="0x80" subtype="0x01">magazines/reports/documentary</genre>
+ <genre lang="en" type="0x90" subtype="0x00">education/science/factual topics (general)</genre>
+ <genre lang="en" type="0x90" subtype="0x01">nature/animals/environment</genre>
+
+</genrestrings>
+
+<!-- TODO: Finish me... This list is probably not complete yet
+CONTENTMASK_MOVIEDRAMA 0x10
+Subtypes:
+ DETECTIVE_THRILLER 0x01
+ ADVENTURE_WESTERN_WAR 0x02
+ SF_FANTASY_HORROR 0x03
+ COMEDY 0x04
+ SOAP_MELODRAMA_FOLKLORIC 0x05
+ ROMANCE 0x06
+ SERIOUS_CLASSICAL_RELIGIOUS_HISTORICAL_DRAMA 0x07
+ ADULTMOVIE_DRAMA 0x08
+
+NEWSCURRENTAFFAIRS 0x20
+Subtypes:
+ NEWS_WEATHER_REPORT 0x01
+ NEWS_MAGAZINE 0x02
+ DOCUMENTARY 0x03
+ DISCUSSION_INTERVIEW_DEBATE 0x04
+
+CONTENTMASK_SHOW 0x30
+Subtypes:
+ GAMESHOW_QUIZ_CONTEST 0x01
+ VARIETY_SHOW 0x02
+ TALK_SHOW 0x03
+
+SPORTS 0x40
+Subtypes:
+ SPECIAL_EVENTS 0x01
+ SPORTS_MAGAZINES 0x02
+ FOOTBALL_SOCCER 0x03
+ TENNIS_SQUASH 0x04
+ TEAM_SPORTS 0x05
+ ATHLETICS 0x06
+ MOTOR_SPORT 0x07
+ WATER_SPORT 0x08
+ WINTER_SPORT 0x09
+ EQUESTRIAN 0x0A
+ MARTIAL_SPORTS 0x0B
+
+CHILDRENYOUTH 0x50
+Subtypes:
+ PRESCHOOL_CHILD_PROGRAM 0x01
+ ENTERTAINMENT_6TO14 0x02
+ ENTERTAINMENT_10TO16 0x03
+ INFO_EDUC_SCHOOL_PROGRAM 0x04
+ CARTOONS_PUPPETS 0x05
+
+MUSICBALLETDANCE 0x60
+Subtypes:
+ ROCK_POP 0x01
+ SERIOUS_CLASSICAL_MUSIC 0x02
+ FOLK_TRADITIONAL_MUSIC 0x03
+ JAZZ 0x04
+ MUSICAL_OPERA 0x05
+ BALLET 0x06
+
+ARTSCULTURE 0x70 //without music
+Subtypes:
+ PERFORMING_ARTS 0x01
+ FINE_ARTS 0x02
+ RELIGION 0x03
+ POP_CULTURE_TRAD_ARTS 0x04
+ LITERATURE 0x05
+ FILM_CINEMA 0x06
+ EXPERIMENTAL_FILM_VIDEO 0x07
+ BROADCASTING_PRESS 0x08
+ NEW_MEDIA 0x09
+ ARTS_CULTURE_MAGAZINES 0x0A
+ FASHION 0x0B
+
+SOCIALPOLITICALECONOMICS 0x80
+Subtypes:
+ MAGAZINES_REPORTS_DOCUMENTARY 0x01
+ ECONOMICS_SOCIAL_ADVISORY 0x02
+ REMARKABLE_PEOPLE 0x03
+
+EDUCATIONALSCIENCE 0x90
+Subtypes:
+ NATURE_ANIMALS_ENVIRONMENT 0x01
+ TECHNOLOGY_NATURAL_SCIENCES 0x02
+ MEDICINE_PHYSIOLOGY_PSYCHOLOGY 0x03
+ FOREIGN_COUNTRIES_EXPEDITIONS 0x04
+ SOCIAL_SPIRITUAL_SCIENCES 0x05
+ FURTHER_EDUCATION 0x06
+ LANGUAGES 0x07
+
+LEISUREHOBBIES 0xA0
+Subtypes:
+ TOURISM_TRAVEL 0x01
+ HANDICRAFT 0x02
+ MOTORING 0x03
+ FITNESS_HEALTH 0x04
+ COOKING 0x05
+ ADVERTISEMENT_SHOPPING 0x06
+ GARDENING 0x07
+
+SPECIAL 0xB0
+ BLACK_WHITE 0x01
+ UNPUBLISHED 0x02
+ LIVE_BROADCAST 0x03
+
+USERDEFINED 0xF0
+//-->
4 addons/pvr.team-mediaportal.tvserver/resources/language/Dutch/strings.xml
View
@@ -15,6 +15,10 @@
<string id="30011">Opnames direct afspelen (niet streamen)</string>
<string id="30012">Mediaportal directory met opnames</string>
+ <!-- category labels -->
+ <string id="30040">Verbinding</string>
+ <string id="30041">MediaPortal</string>
+
<!-- on-screen error messages -->
<string id="30050">Uw TVServerXBMC plugin v%s is te oud. U heeft minimaal versie v%s of nieuwer nodig!</string>
<string id="30050">Uw TVServerXBMC plugin is te oud. U heeft minimaal versie v%s of nieuwer nodig!</string>
4 addons/pvr.team-mediaportal.tvserver/resources/language/English/strings.xml
View
@@ -15,6 +15,10 @@
<string id="30011">Play recordings directly (no streaming)</string>
<string id="30012">Mediaportal recordings directory</string>
+ <!-- category labels -->
+ <string id="30040">Connection</string>
+ <string id="30041">MediaPortal</string>
+
<!-- on-screen error messages -->
<string id="30050">Your TVServerXBMC version v%s is too old. Please upgrade to v%s or higher!</string>
<string id="30051">Your TVServerXBMC version is too old. Please upgrade to v%s or higher!</string>
14 addons/pvr.team-mediaportal.tvserver/resources/settings.xml
View
@@ -1,16 +1,22 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
+ <!-- Connection -->
+ <category label="30040">
<setting id="host" type="text" label="30000" option="urlencoded" default="127.0.0.1" />
- <setting id="port" type="integer" label="30001" default="9596" />
+ <setting id="port" type="number" label="30001" default="9596" />
+ <setting id="timeout" type="enum" label="30005" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="6"/>
+ </category>
+
+ <!-- Mediaportal -->
+ <category label="30041">
<setting id="ftaonly" type="bool" label="30002" default="false" />
<setting id="useradio" type="bool" label="30003" default="true" />
-
- <setting id="timeout" type="enum" label="30005" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="6"/>
<setting id="tvgroup" type="text" label="30006" default="" />
<setting id="radiogroup" type="text" label="30007" default="" />
<setting id="resolvertsphostname" type="bool" label="30008" default="true" />
<setting id="readgenre" type="bool" label="30009" default="false" />
<setting id="sleeponrtspurl" type="enum" label="30010" values="0|100|200|300|400|500|600|700|800|900|1000|1200|1500|2000|2500" default="0"/>
<setting id="userecordingsdir" type="bool" label="30011" default="false" />
- <setting id="recordingsdir" type="folder" label="30012" default="" />
+ <setting id="recordingsdir" type="folder" option="smb" label="30012" default="" />
+ </category>
</settings>
2  addons/pvr.vdr.vnsi/resources/settings.xml
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<setting id="host" type="text" label="30000" default="127.0.0.1" />
- <setting id="port" type="integer" label="30001" default="34890" />
+ <setting id="port" type="number" label="30001" default="34890" />
<setting id="priority" type="enum" label="30002" values="-1|0|5|10|15|20|25|30|35|40|45|50|55|60|65|70|75|80|85|90|95|99|100" default="99"/>
<setting id="convertchar" type="bool" label="30003" default="true" />
<setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
4 addons/screensaver.xbmc.builtin.dim/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+ <string id="30000">Nivo zatemnitve</string>
+</strings>
2  addons/screensaver.xbmc.builtin.dim/resources/settings.xml
View
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
- <setting label="30000" type="slider" id="level" range="20,1,100" default="20"/>
+ <setting label="30000" type="slider" id="level" range="20,1,100" option="percent" default="20"/>
</settings>
9 addons/screensaver.xbmc.builtin.slideshow/resources/language/Slovenian/strings.xml
View
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<strings>
+ <string id="30000">Vir slik za projekcijo</string>
+ <string id="30001">Mapa</string>
+ <string id="30002">Ozadja videa</string>
+ <string id="30003">Ozadja glasbe</string>
+ <string id="30004">Mapa s slikami</string>
+ <string id="30005">Nivo zatemnitve</string>
+</strings>
2  addons/screensaver.xbmc.builtin.slideshow/resources/settings.xml
View
@@ -2,5 +2,5 @@
<settings>
<setting label="30000" type="enum" id="type" default="0" lvalues="30002|30003|30004"/>
<setting label="30001" type="folder" source="pictures" id="path" default="" enable="eq(-1,2)"/>
- <setting label="30005" type="slider" id="level" range="0,1,100" default="100"/>
+ <setting label="30005" type="slider" id="level" range="0,1,100" option="percent" default="100"/>
</settings>
233 addons/skin.confluence/720p/DialogPeripheralManager.xml
View
@@ -0,0 +1,233 @@
+<window id="10140">
+ <defaultcontrol always="true">20</defaultcontrol>
+ <coordinates>
+ <system>1</system>
+ <posx>335</posx>
+ <posy>30</posy>
+ </coordinates>
+ <include>dialogeffect</include>
+ <controls>
+ <control type="group">
+ <visible>!Window.IsVisible(PeripheralSettings)</visible>
+ <include>VisibleFadeEffect</include>
+ <control type="image">
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>610</width>
+ <height>650</height>
+ <texture border="40">DialogBack.png</texture>
+ <visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
+ </control>
+ <control type="image">
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>610</width>
+ <height>650</height>
+ <texture border="40">DialogBack2.png</texture>
+ <visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>530</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label" id="1">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>530</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$LOCALIZE[35000]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>520</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>10</onup>
+ <ondown>10</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
+
+ <control type="list" id="20">
+ <posx>20</posx>
+ <posy>65</posy>
+ <width>550</width>
+ <height>510</height>
+ <onup>6</onup>
+ <ondown>6</ondown>
+ <onleft>5</onleft>
+ <onright>61</onright>
+ <pagecontrol>61</pagecontrol>
+ <scrolltime>200</scrolltime>
+ <animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
+ <itemlayout height="85" width="550">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>550</width>
+ <height>80</height>
+ <texture border="5">button-nofocus.png</texture>
+ </control>
+ <control type="label">
+ <description>Name</description>
+ <posx>10</posx>
+ <posy>5</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$INFO[ListItem.Label]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ </control>
+ <control type="label">
+ <description>Product ID Vendor ID</description>
+ <posx>10</posx>
+ <posy>30</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$LOCALIZE[35504]: [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR] $LOCALIZE[35503]: [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>blue</textcolor>
+ </control>
+ <control type="label">
+ <description>class</description>
+ <posx>10</posx>
+ <posy>50</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$LOCALIZE[35501]: [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>blue</textcolor>
+ </control>
+ </itemlayout>
+ <focusedlayout height="85" width="550">
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>550</width>
+ <height>80</height>
+ <texture border="5">button-nofocus.png</texture>
+ <visible>!Control.HasFocus(20)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="image">
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>550</width>
+ <height>80</height>
+ <texture border="5">button-focus2.png</texture>
+ <visible>Control.HasFocus(20)</visible>
+ <include>VisibleFadeEffect</include>
+ </control>
+ <control type="label">
+ <description>Name</description>
+ <posx>10</posx>
+ <posy>5</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$INFO[ListItem.Label]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ </control>
+ <control type="label">
+ <description>Product ID Vendor ID</description>
+ <posx>10</posx>
+ <posy>30</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$LOCALIZE[35504]: [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR] $LOCALIZE[35503]: [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>blue</textcolor>
+ </control>
+ <control type="label">
+ <description>class</description>
+ <posx>10</posx>
+ <posy>50</posy>
+ <width>520</width>
+ <height>20</height>
+ <label>$LOCALIZE[35501]: [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+ <align>left</align>
+ <aligny>center</aligny>
+ <font>font12</font>
+ <textcolor>blue</textcolor>
+ </control>
+ </focusedlayout>
+ </control>
+
+ <control type="scrollbar" id="61">
+ <posx>570</posx>
+ <posy>65</posy>
+ <width>25</width>
+ <height>510</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <ondown>61</ondown>
+ <onup>61</onup>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ </control>
+ <control type="label">
+ <description>number of files/pages in list text label</description>
+ <posx>580</posx>
+ <posy>585</posy>
+ <width>300</width>
+ <height>35</height>
+ <font>font12</font>
+ <align>right</align>
+ <aligny>center</aligny>
+ <scroll>true</scroll>
+ <textcolor>grey</textcolor>
+ <label>([COLOR=blue]$INFO[Container(20).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages][/COLOR])</label>
+ </control>
+ <control type="button" id="10">
+ <description>Close button</description>
+ <posx>20</posx>
+ <posy>585</posy>
+ <width>200</width>
+ <height>40</height>
+ <label>186</label>
+ <font>font12_title</font>
+ <textcolor>white</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <align>center</align>
+ <onleft>61</onleft>
+ <onright>20</onright>
+ <onup>20</onup>
+ <ondown>20</ondown>
+ </control>
+ </control>
+ </controls>
+</window>
194 addons/skin.confluence/720p/DialogPeripheralSettings.xml
View
@@ -0,0 +1,194 @@
+<window id="123">
+ <defaultcontrol>5</defaultcontrol>
+ <coordinates>
+ <system>1</system>
+ <posx>290</posx>
+ <posy>75</posy>
+ </coordinates>
+ <include>dialogeffect</include>
+ <controls>
+ <control type="image">
+ <description>background image</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>700</width>
+ <height>570</height>
+ <texture border="40">DialogBack.png</texture>
+ </control>
+ <control type="image">
+ <description>Dialog Header image</description>
+ <posx>40</posx>
+ <posy>16</posy>
+ <width>620</width>
+ <height>40</height>
+ <texture>dialogheader.png</texture>
+ </control>
+ <control type="label">
+ <description>header label</description>
+ <posx>40</posx>
+ <posy>20</posy>
+ <width>620</width>
+ <height>30</height>
+ <font>font13_title</font>
+ <label>$LOCALIZE[5]</label>
+ <align>center</align>
+ <aligny>center</aligny>
+ <textcolor>selected</textcolor>
+ <shadowcolor>black</shadowcolor>
+ </control>
+ <control type="button">
+ <description>Close Window button</description>
+ <posx>610</posx>
+ <posy>15</posy>
+ <width>64</width>
+ <height>32</height>
+ <label>-</label>
+ <font>-</font>
+ <onclick>PreviousMenu</onclick>
+ <texturefocus>DialogCloseButton-focus.png</texturefocus>
+ <texturenofocus>DialogCloseButton.png</texturenofocus>
+ <onleft>5</onleft>
+ <onright>5</onright>
+ <onup>5</onup>
+ <ondown>5</ondown>
+ <visible>system.getbool(input.enablemouse)</visible>
+ </control>
+ <control type="label" id="3">
+ <description>No Settings Label</description>
+ <posx>20</posx>
+ <posy>180</posy>
+ <width>640</width>
+ <align>center</align>
+ <label>35004</label>
+ <font>font13caps</font>
+ </control>
+ <control type="grouplist" id="5">
+ <animation effect="slide" start="0,0" end="5,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
+ <description>control area</description>
+ <posx>30</posx>
+ <posy>70</posy>
+ <width>630</width>
+ <height>410</height>
+ <itemgap>5</itemgap>
+ <pagecontrol>60</pagecontrol>
+ <onleft>28</onleft>
+ <onright>60</onright>
+ <onup>28</onup>
+ <ondown>28</ondown>
+ </control>
+ <control type="scrollbar" id="60">
+ <posx>658</posx>
+ <posy>70</posy>
+ <width>25</width>
+ <height>410</height>
+ <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+ <texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+ <texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+ <textureslidernib>ScrollBarNib.png</textureslidernib>
+ <textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <ondown>60</ondown>
+ <onup>60</onup>
+ <showonepage>false</showonepage>
+ <orientation>vertical</orientation>
+ </control>
+ <control type="button" id="7">
+ <description>Default Button</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ </control>
+ <control type="radiobutton" id="8">
+ <description>Default RadioButton</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ </control>
+ <control type="spincontrolex" id="9">
+ <description>Default SpinControlex</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <height>40</height>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <aligny>center</aligny>
+ <reverse>yes</reverse>
+ </control>
+ <control type="sliderex" id="10">
+ <description>Default Slider</description>
+ <height>40</height>
+ <texturenofocus border="5">button-nofocus.png</texturenofocus>
+ <texturefocus border="5">button-focus2.png</texturefocus>
+ <font>font13</font>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
+ </control>
+ <control type="image" id="11">
+ <description>separator image</description>
+ <height>2</height>
+ <texture>separator2.png</texture>
+ </control>
+
+ <control type="group" id="9000">
+ <posx>40</posx>
+ <posy>505</posy>
+ <control type="button" id="29">
+ <description>Cancel Button</description>
+ <posy>0</posy>
+ <posx>0</posx>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <label>222</label>
+ <onleft>50</onleft>
+ <onright>28</onright>
+ <onup>5</onup>
+ <ondown>5</ondown>
+ </control>
+ <control type="button" id="28">
+ <description>OK Button</description>
+ <posy>0</posy>
+ <posx>210</posx>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <label>186</label>
+ <onleft>29</onleft>
+ <onright>50</onright>
+ <onup>5</onup>
+ <ondown>5</ondown>
+ </control>
+ <control type="button" id="50">
+ <description>Defaults Button</description>
+ <posy>0</posy>
+ <posx>420</posx>
+ <width>200</width>
+ <height>40</height>
+ <align>center</align>
+ <aligny>center</aligny>
+ <font>font12_title</font>
+ <label>409</label>
+ <onleft>28</onleft>
+ <onright>29</onright>
+ <onup>5</onup>
+ <ondown>5</ondown>
+ </control>
+ </control>
+ </controls>
+</window>
4 addons/skin.confluence/720p/DialogVideoInfo.xml
View
@@ -256,7 +256,7 @@
<item>
<label>$LOCALIZE[20339]:</label>
<label2>$INFO[ListItem.Director]</label2>
- <onclick>-</onclick>
+ <onclick>SendClick(2003,13)</onclick>
<visible>!IsEmpty(ListItem.Director)</visible>
</item>
<item>
@@ -749,7 +749,7 @@
<item>
<label>$LOCALIZE[20339]:</label>
<label2>$INFO[ListItem.Director]</label2>
- <onclick>-</onclick>
+ <onclick>SendClick(2003,13)</onclick>
<visible>!IsEmpty(ListItem.Director)</visible>
</item>
<item>
10 addons/skin.confluence/720p/Home.xml
View
@@ -1059,35 +1059,35 @@
<onclick>RunAddon($INFO[Skin.String(HomeVideosButton1)])</onclick>
<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton1))]</icon>
<thumb>-</thumb>
- <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton1))</visible>
+ <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton1))</visible>
</item>
<item>
<label>$INFO[system.addontitle(Skin.String(HomeVideosButton2))]</label>
<onclick>RunAddon($INFO[Skin.String(HomeVideosButton2)])</onclick>
<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton2))]</icon>
<thumb>-</thumb>
- <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton2))</visible>
+ <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton2))</visible>
</item>
<item>
<label>$INFO[system.addontitle(Skin.String(HomeVideosButton3))]</label>
<onclick>RunAddon($INFO[Skin.String(HomeVideosButton3)])</onclick>
<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton3))]</icon>
<thumb>-</thumb>
- <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton3))</visible>
+ <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton3))</visible>
</item>
<item>
<label>$INFO[system.addontitle(Skin.String(HomeVideosButton4))]</label>
<onclick>RunAddon($INFO[Skin.String(HomeVideosButton4)])</onclick>
<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton4))]</icon>
<thumb>-</thumb>
- <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton4))</visible>
+ <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton4))</visible>
</item>
<item>
<label>$INFO[system.addontitle(Skin.String(HomeVideosButton5))]</label>
<onclick>RunAddon($INFO[Skin.String(HomeVideosButton5)])</onclick>
<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton5))]</icon>
<thumb>-</thumb>
- <visible>Container(9000).HasFocus(2) + !IsEmpty(Skin.String(HomeVideosButton5))</visible>
+ <visible>[Container(9000).HasFocus(2) | Container(9000).HasFocus(10) | Container(9000).HasFocus(11)] + !IsEmpty(Skin.String(HomeVideosButton5))</visible>
</item>
<item>
108 addons/skin.confluence/720p/IncludesCodecFlagging.xml
View
@@ -1,4 +1,23 @@
<includes>
+ <variable name="typehackflagging">
+ <value condition="[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]">bluray</value>
+ <value condition="substring(ListItem.FilenameAndPath,hddvd)">hddvd</value>
+ <value condition="substring(ListItem.FilenameAndPath,dvd)">dvd</value>
+ <value condition="[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)]">TV</value>
+ <value condition="substring(ListItem.FilenameAndPath,vhs)">vhs</value>
+ </variable>
+ <variable name="rating">
+ <value condition="substring(listitem.mpaa,Rated G)">mpaa_general</value>
+ <value condition="substring(listitem.mpaa,Rated PG) + !substring(listitem.mpaa,Rated PG-13)">mpaa_pg</value>
+ <value condition="substring(listitem.mpaa,Rated PG-13)">mpaa_pg13</value>
+ <value condition="substring(Listitem.mpaa,Rated R)">mpaa_restricted</value>
+ <value condition="substring(Listitem.mpaa,Rated NC)">mpaa_nc17</value>
+ </variable>
+ <variable name="videocodec">
+ <value condition="[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]">divx</value>
+ <value>$INFO[ListItem.VideoCodec]</value>
+ </variable>
+
<include name="VideoCodecFlaggingConditions">
<control type="image">
<description>Video rez Image</description>
@@ -8,105 +27,30 @@
<texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
</control>
<control type="image">
- <description>Common Codec Image</description>
+ <description>Codec Image</description>
<width>80</width>
<height>35</height>
<aspectratio align="left">keep</aspectratio>
- <texture>$INFO[ListItem.VideoCodec,flagging/video/,.png]</texture>
- <!-- Don't show if its one of the 500 divx codecs -->
- <visible>![substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
- </control>
- <control type="image">
- <description>Divx Codec Image</description>
- <width>80</width>
- <height>35</height>
- <aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/divx.png</texture>
- <visible>[substring(ListItem.VideoCodec,div,left) | stringcompare(ListItem.VideoCodec,dx50)]</visible>
+ <texture>$VAR[videocodec,flagging/video/,.png]</texture>
</control>
</include>
<include name="VideoTypeHackFlaggingConditions">
<control type="image">
- <description>Bluray Image</description>
- <width>80</width>
- <height>35</height>
- <aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/bluray.png</texture>
- <visible>[substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
- </control>
- <control type="image">
- <description>HDDVD Image</description>
+ <description>Video Type Image</description>
<width>80</width>
<height>35</height>
<aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/hddvd.png</texture>
- <visible>substring(ListItem.FilenameAndPath,hddvd) + !Skin.HasSetting(HideFilenameFlagging)</visible>
- </control>
- <control type="image">
- <description>DVD Image</description>
- <width>80</width>
- <height>35</height>
- <aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/dvd.png</texture>
- <visible>[substring(ListItem.FilenameAndPath,dvd) + ![substring(ListItem.FilenameAndPath,hddvd) | substring(ListItem.FilenameAndPath,bluray) | substring(ListItem.FilenameAndPath,bdrip)]] + !Skin.HasSetting(HideFilenameFlagging)</visible>
- </control>
- <control type="image">
- <description>TV Types Image</description>
- <width>80</width>
- <height>35</height>
- <aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/TV.png</texture>
- <visible>[substring(ListItem.FilenameAndPath,pdtv) | substring(ListItem.FilenameAndPath,hdtv) | substring(ListItem.FilenameAndPath,dsr)] + !Skin.HasSetting(HideFilenameFlagging)</visible>
- </control>
- <control type="image">
- <description>VHS Image</description>
- <width>80</width>
- <height>35</height>
- <aspectratio align="left">keep</aspectratio>
- <texture>flagging/video/vhs.png</texture>
- <visible>substring(ListItem.FilenameAndPath,vhs) + !Skin.HasSetting(HideFilenameFlagging)</visible>
+ <texture>$VAR[typehackflagging,flagging/video/,.png]</texture>
+ <visible>!Skin.HasSetting(HideFilenameFlagging)</visible>
</control>
</include>
<include name="VideoMPAAFlaggingConditions">
<control type=