Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
commit bd16540b69d275a1a354af898b5d5476cc806c61 2 parents 23bd2c9 + 4c26155
@opdenkamp authored
Showing with 2,093 additions and 81,621 deletions.
  1. +1 −0  .gitignore
  2. +2 −6 Makefile.in
  3. +4 −4 addons/repository.xbmc.org/addon.xml
  4. +3 −1 addons/skin.confluence/720p/DialogVideoInfo.xml
  5. +49 −40 addons/skin.confluence/720p/IncludesCodecFlagging.xml
  6. +21 −5 addons/skin.confluence/720p/MusicVisualisation.xml
  7. +4 −4 addons/skin.confluence/720p/VideoFullScreen.xml
  8. +1 −1  addons/skin.confluence/720p/VideoOSD.xml
  9. +146 −36 addons/skin.confluence/720p/ViewsFileMode.xml
  10. +61 −15 addons/skin.confluence/720p/ViewsVideoLibrary.xml
  11. +6 −2 addons/skin.confluence/language/Catalan/strings.xml
  12. BIN  addons/skin.confluence/media/flagging/aspectratio/1.33.png
  13. BIN  addons/skin.confluence/media/flagging/aspectratio/1.66.png
  14. BIN  addons/skin.confluence/media/flagging/aspectratio/1.78.png
  15. BIN  addons/skin.confluence/media/flagging/aspectratio/1.85.png
  16. BIN  addons/skin.confluence/media/flagging/aspectratio/2.20.png
  17. BIN  addons/skin.confluence/media/flagging/aspectratio/2.35.png
  18. BIN  addons/skin.confluence/media/flagging/audio/0.png
  19. BIN  addons/skin.confluence/media/flagging/audio/1.png
  20. BIN  addons/skin.confluence/media/flagging/audio/2.png
  21. BIN  addons/skin.confluence/media/flagging/audio/6.png
  22. BIN  addons/skin.confluence/media/flagging/audio/8.png
  23. BIN  addons/skin.confluence/media/flagging/audio/aac.png
  24. BIN  addons/skin.confluence/media/flagging/audio/ac3.png
  25. BIN  addons/skin.confluence/media/flagging/audio/aif.png
  26. BIN  addons/skin.confluence/media/flagging/audio/aifc.png
  27. BIN  addons/skin.confluence/media/flagging/audio/aiff.png
  28. BIN  addons/skin.confluence/media/flagging/audio/ape.png
  29. BIN  addons/skin.confluence/media/flagging/audio/avc.png
  30. BIN  addons/skin.confluence/media/flagging/audio/cdda.png
  31. BIN  addons/skin.confluence/media/flagging/audio/dca.png
  32. BIN  addons/skin.confluence/media/flagging/audio/dts.png
  33. BIN  addons/skin.confluence/media/flagging/audio/dtshd_hra.png
  34. BIN  addons/skin.confluence/media/flagging/audio/dtshd_ma.png
  35. BIN  addons/skin.confluence/media/flagging/audio/eac3.png
  36. BIN  addons/skin.confluence/media/flagging/audio/flac.png
  37. BIN  addons/skin.confluence/media/flagging/audio/mp1.png
  38. BIN  addons/skin.confluence/media/flagging/audio/mp2.png
  39. BIN  addons/skin.confluence/media/flagging/audio/mp3.png
  40. BIN  addons/skin.confluence/media/flagging/audio/ogg.png
  41. BIN  addons/skin.confluence/media/flagging/audio/truehd.png
  42. BIN  addons/skin.confluence/media/flagging/audio/wavpack.png
  43. BIN  addons/skin.confluence/media/flagging/audio/wma.png
  44. BIN  addons/skin.confluence/media/flagging/audio/wmapro.png
  45. BIN  addons/skin.confluence/media/flagging/audio/wmav2.png
  46. BIN  addons/skin.confluence/media/flagging/blank.png
  47. BIN  addons/skin.confluence/media/flagging/lists/1080.png
  48. BIN  addons/skin.confluence/media/flagging/lists/480.png
  49. BIN  addons/skin.confluence/media/flagging/lists/540.png
  50. BIN  addons/skin.confluence/media/flagging/lists/576.png
  51. BIN  addons/skin.confluence/media/flagging/lists/720.png
  52. BIN  addons/skin.confluence/media/flagging/video/1080.png
  53. BIN  addons/skin.confluence/media/flagging/video/480.png
  54. BIN  addons/skin.confluence/media/flagging/video/540.png
  55. BIN  addons/skin.confluence/media/flagging/video/576.png
  56. BIN  addons/skin.confluence/media/flagging/video/720.png
  57. BIN  addons/skin.confluence/media/flagging/video/avc1.png
  58. BIN  addons/skin.confluence/media/flagging/video/bluray.png
  59. BIN  addons/skin.confluence/media/flagging/video/divx.png
  60. BIN  addons/skin.confluence/media/flagging/video/dvd.png
  61. BIN  addons/skin.confluence/media/flagging/video/flv.png
  62. BIN  addons/skin.confluence/media/flagging/video/h264.png
  63. BIN  addons/skin.confluence/media/flagging/video/hddvd.png
  64. BIN  addons/skin.confluence/media/flagging/video/mpeg1video.png
  65. BIN  addons/skin.confluence/media/flagging/video/mpeg2video.png
  66. BIN  addons/skin.confluence/media/flagging/video/tv.png
  67. BIN  addons/skin.confluence/media/flagging/video/vc-1.png
  68. BIN  addons/skin.confluence/media/flagging/video/vhs.png
  69. BIN  addons/skin.confluence/media/flagging/video/wvc1.png
  70. BIN  addons/skin.confluence/media/flagging/video/xvid.png
  71. +8 −2 configure.in
  72. +1,718 −882 language/Catalan/strings.xml
  73. +4 −8 lib/addons/script.module.pil/{Makefile → Makefile.in}
  74. +1 −1  lib/cmyth/Makefile.in
  75. +1 −0  lib/cmyth/Win32/libcmyth.vcxproj
  76. +1 −0  lib/cpluff/libcpluff/win32/cpluff.vcxproj
  77. +1 −0  lib/cximage-6.0/jasper/jasper.vcxproj
  78. +1 −0  lib/cximage-6.0/jbig/jbig.vcxproj
  79. +1 −0  lib/cximage-6.0/jpeg/Jpeg.vcxproj
  80. +1 −0  lib/cximage-6.0/mng/mng.vcxproj
  81. +1 −0  lib/cximage-6.0/png/png.vcxproj
  82. +1 −0  lib/cximage-6.0/raw/libdcr.vcxproj
  83. +1 −0  lib/cximage-6.0/tiff/Tiff.vcxproj
  84. +1 −0  lib/cximage-6.0/zlib/zlib.vcxproj
  85. +1 −0  lib/enca/libenca_win32/libenca_win32.vcxproj
  86. +1 −0  lib/freetype/builds/win32/vs2010/freetype.vcxproj
  87. +7 −0 lib/libTcpSocket/linux/net_posix.c
  88. +15 −1 lib/libTcpSocket/os-dependent_socket.h
  89. +8 −1 lib/libTcpSocket/windows/net_winsock.c
  90. +1 −0  lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcxproj
  91. +1 −0  lib/libapetag/libapetag.vcxproj
  92. +1 −0  lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
  93. +2 −3 lib/libdvd/Makefile.in
  94. +1 −0  lib/libexif/libexif.vcxproj
  95. +2 −1  lib/libhdhomerun/hdhomerun/hdhomerun.vcxproj
  96. +1 −0  lib/libhts/Win32/libhts_2010.vcxproj
  97. +1 −0  lib/liblame/vc_solution/vc10_libmp3lame_dll.vcxproj
  98. +1 −0  lib/libmad/msvc++/libmad.vcxproj
  99. +1 −0  lib/libmodplug/libmodplug_2010.vcxproj
  100. +1 −2  lib/libsidplay2/Makefile.in
  101. +1 −1  lib/libsquish/Makefile.in
  102. +1 −0  lib/libsquish/vs7/squish/squish_2010.vcxproj
  103. +1 −2  lib/nosefart/Makefile.in
  104. +1 −0  lib/nosefart/NoseFartXBMC.vcxproj
  105. +1 −2  lib/stsound/StSoundLibrary/Makefile.in
  106. +1 −0  lib/stsound/StSoundLibrary/StSoundLibrary.vcxproj
  107. +1 −2  lib/timidity/Makefile.in
  108. +1 −2  lib/vgmstream/Makefile.in
  109. +1 −0  lib/vgmstream/win32/win32.vcxproj
  110. +0 −2  lib/win32/libcdio/AUTHORS
  111. +0 −340 lib/win32/libcdio/COPYING
  112. +0 −6,863 lib/win32/libcdio/ChangeLog
  113. +0 −231 lib/win32/libcdio/INSTALL
  114. +0 −117 lib/win32/libcdio/Makefile.am
  115. +0 −823 lib/win32/libcdio/Makefile.in
  116. +0 −174 lib/win32/libcdio/NEWS
  117. +0 −44 lib/win32/libcdio/README
  118. +0 −74 lib/win32/libcdio/README.libcdio
  119. +0 −39 lib/win32/libcdio/THANKS
  120. +0 −76 lib/win32/libcdio/TODO
  121. +0 −8,017 lib/win32/libcdio/aclocal.m4
  122. +0 −106 lib/win32/libcdio/cd-info.vcproj
  123. +0 −140 lib/win32/libcdio/compile
  124. +0 −1,411 lib/win32/libcdio/config.guess
  125. +0 −214 lib/win32/libcdio/config.h.in
  126. +0 −1,500 lib/win32/libcdio/config.sub
  127. +0 −25,164 lib/win32/libcdio/configure
  128. +0 −576 lib/win32/libcdio/configure.ac
  129. +0 −522 lib/win32/libcdio/depcomp
  130. +0 −48 lib/win32/libcdio/doc/Makefile.am
  131. +0 −574 lib/win32/libcdio/doc/Makefile.in
  132. +0 −1,117 lib/win32/libcdio/doc/doxygen/Doxyfile.in
  133. +0 −107 lib/win32/libcdio/doc/doxygen/run_doxygen
  134. +0 −396 lib/win32/libcdio/doc/fdl.texi
  135. +0 −326 lib/win32/libcdio/doc/glossary.texi
  136. +0 −386 lib/win32/libcdio/doc/gpl.texi
  137. +0 −3,310 lib/win32/libcdio/doc/libcdio.info
  138. +0 −2,188 lib/win32/libcdio/doc/libcdio.texi
  139. +0 −170 lib/win32/libcdio/doc/mdate-sh
  140. +0 −4 lib/win32/libcdio/doc/stamp-vti
  141. +0 −7,014 lib/win32/libcdio/doc/texinfo.tex
  142. +0 −4 lib/win32/libcdio/doc/version.texi
  143. +0 −64 lib/win32/libcdio/example/Makefile.am
  144. +0 −672 lib/win32/libcdio/example/Makefile.in
  145. +0 −63 lib/win32/libcdio/example/README
  146. +0 −94 lib/win32/libcdio/example/cdtext.c
  147. +0 −115 lib/win32/libcdio/example/drives.c
  148. +0 −83 lib/win32/libcdio/example/iso1.c
  149. +0 −87 lib/win32/libcdio/example/iso1cpp.cpp
  150. +0 −140 lib/win32/libcdio/example/iso2.c
  151. +0 −144 lib/win32/libcdio/example/iso2cpp.cpp
  152. +0 −135 lib/win32/libcdio/example/iso3.c
  153. +0 −135 lib/win32/libcdio/example/iso3cpp.cpp
  154. +0 −116 lib/win32/libcdio/example/paranoia.c
  155. +0 −98 lib/win32/libcdio/example/paranoia2.c
  156. +0 −133 lib/win32/libcdio/example/sample2.c
  157. +0 −201 lib/win32/libcdio/example/sample3.c
  158. +0 −222 lib/win32/libcdio/example/sample4.c
  159. +0 −83 lib/win32/libcdio/example/scsi-mmc1.c
  160. +0 −324 lib/win32/libcdio/example/scsi-mmc2.c
  161. +0 −60 lib/win32/libcdio/example/tracks.c
  162. +0 −2  lib/win32/libcdio/include/Makefile.am
  163. +0 −519 lib/win32/libcdio/include/Makefile.in
  164. +0 −51 lib/win32/libcdio/include/cdio/Makefile.am
  165. +0 −507 lib/win32/libcdio/include/cdio/Makefile.in
  166. +0 −205 lib/win32/libcdio/include/cdio/bytesex.h
  167. +0 −130 lib/win32/libcdio/include/cdio/bytesex_asm.h
  168. +0 −155 lib/win32/libcdio/include/cdio/cd_types.h
  169. +0 −362 lib/win32/libcdio/include/cdio/cdda.h
  170. +0 −85 lib/win32/libcdio/include/cdio/cdio.h
  171. +0 −112 lib/win32/libcdio/include/cdio/cdtext.h
  172. +0 −800 lib/win32/libcdio/include/cdio/device.h
  173. +0 −81 lib/win32/libcdio/include/cdio/disc.h
  174. +0 −99 lib/win32/libcdio/include/cdio/ds.h
  175. +0 −113 lib/win32/libcdio/include/cdio/dvd.h
  176. +0 −797 lib/win32/libcdio/include/cdio/iso9660.h
  177. +0 −137 lib/win32/libcdio/include/cdio/logging.h
  178. +0 −167 lib/win32/libcdio/include/cdio/paranoia.h
  179. +0 −145 lib/win32/libcdio/include/cdio/read.h
  180. +0 −514 lib/win32/libcdio/include/cdio/scsi_mmc.h
  181. +0 −315 lib/win32/libcdio/include/cdio/sector.h
  182. +0 −211 lib/win32/libcdio/include/cdio/track.h
  183. +0 −384 lib/win32/libcdio/include/cdio/types.h
  184. +0 −136 lib/win32/libcdio/include/cdio/util.h
  185. +0 −12 lib/win32/libcdio/include/cdio/version.h
  186. +0 −12 lib/win32/libcdio/include/cdio/version.h.in
  187. +0 −151 lib/win32/libcdio/include/cdio/xa.h
  188. +0 −322 lib/win32/libcdio/install-sh
  189. +0 −27 lib/win32/libcdio/lib/Makefile.am
  190. +0 −542 lib/win32/libcdio/lib/Makefile.in
  191. +0 −75 lib/win32/libcdio/lib/cdda_interface/Makefile.am
  192. +0 −586 lib/win32/libcdio/lib/cdda_interface/Makefile.in
  193. +0 −271 lib/win32/libcdio/lib/cdda_interface/common_interface.c
  194. +0 −46 lib/win32/libcdio/lib/cdda_interface/common_interface.h
  195. +0 −393 lib/win32/libcdio/lib/cdda_interface/cooked_interface.c
  196. +0 −102 lib/win32/libcdio/lib/cdda_interface/drive_exceptions.h
  197. +0 −213 lib/win32/libcdio/lib/cdda_interface/interface.c
  198. +0 −88 lib/win32/libcdio/lib/cdda_interface/low_interface.h
  199. +0 −337 lib/win32/libcdio/lib/cdda_interface/scan_devices.c
  200. +0 −547 lib/win32/libcdio/lib/cdda_interface/smallft.c
  201. +0 −12 lib/win32/libcdio/lib/cdda_interface/smallft.h
  202. +0 −202 lib/win32/libcdio/lib/cdda_interface/toc.c
  203. +0 −164 lib/win32/libcdio/lib/cdda_interface/utils.c
  204. +0 −80 lib/win32/libcdio/lib/cdda_interface/utils.h
  205. +0 −23 lib/win32/libcdio/lib/driver/FreeBSD/Makefile
  206. +0 −675 lib/win32/libcdio/lib/driver/FreeBSD/freebsd.c
  207. +0 −231 lib/win32/libcdio/lib/driver/FreeBSD/freebsd.h
  208. +0 −255 lib/win32/libcdio/lib/driver/FreeBSD/freebsd_cam.c
  209. +0 −267 lib/win32/libcdio/lib/driver/FreeBSD/freebsd_ioctl.c
  210. +0 −23 lib/win32/libcdio/lib/driver/MSWindows/Makefile
  211. +0 −814 lib/win32/libcdio/lib/driver/MSWindows/aspi32.c
  212. +0 −249 lib/win32/libcdio/lib/driver/MSWindows/aspi32.h
  213. +0 −866 lib/win32/libcdio/lib/driver/MSWindows/win32.c
  214. +0 −170 lib/win32/libcdio/lib/driver/MSWindows/win32.h
  215. +0 −811 lib/win32/libcdio/lib/driver/MSWindows/win32_ioctl.c
  216. +0 −176 lib/win32/libcdio/lib/driver/Makefile.am
  217. +0 −782 lib/win32/libcdio/lib/driver/Makefile.in
Sorry, we could not display the entire diff because too many files (498) changed.
View
1  .gitignore
@@ -320,6 +320,7 @@ lib/cmyth/Makefile
/project/Win32BuildSetup/dependencies/pcre.dll
/project/Win32BuildSetup/dependencies/pcrecpp.dll
/project/Win32BuildSetup/dependencies/python26.dll
+project/Win32BuildSetup/dependencies/libcdio-10.dll
# /project/Win32BuildSetup/
/project/Win32BuildSetup/BuildLog.htm
View
8 Makefile.in
@@ -404,14 +404,10 @@ lib/cpluff/libcpluff/.libs/libcpluff.a: force
$(MAKE) -C lib/cpluff/libcpluff
system/libcpluff-@ARCH@.so: lib/cpluff/libcpluff/.libs/libcpluff.a
ifeq ($(findstring osx,@ARCH@), osx)
- ifeq (@ARCH@, powerpc-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat -lbundle1.o -o $@ $<
- endif
- ifeq (@ARCH@, x86-osx)
- $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat -o $@ $<
- endif
ifeq (@ARCH@, arm-osx)
$(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
+ else
+ $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lexpat $(BUNDLE1_O) -o $@ $<
endif
else
cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
View
8 addons/repository.xbmc.org/addon.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="repository.xbmc.org"
name="XBMC.org Add-ons"
- version="2.0.0"
+ version="2.0.1"
provider-name="Team XBMC">
<extension point="xbmc.addon.repository"
name="Official XBMC.org Add-on Repository">
- <info compressed="true">http://mirrors.xbmc.org/addons/dharma/addons.xml</info>
- <checksum>http://mirrors.xbmc.org/addons/dharma/addons.xml.md5</checksum>
- <datadir zip="true">http://mirrors.xbmc.org/addons/dharma</datadir>
+ <info compressed="true">http://mirrors.xbmc.org/addons/eden-pre/addons.xml</info>
+ <checksum>http://mirrors.xbmc.org/addons/eden-pre/addons.xml.md5</checksum>
+ <datadir zip="true">http://mirrors.xbmc.org/addons/eden-pre</datadir>
<hashes>true</hashes>
</extension>
<extension point="xbmc.addon.metadata">
View
4 addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -48,7 +48,7 @@
</control>
<control type="grouplist">
<description>Media Codec Flagging Images</description>
- <posx>210</posx>
+ <posx>200</posx>
<posy>480</posy>
<width>600</width>
<align>left</align>
@@ -58,7 +58,9 @@
<visible>!Control.IsVisible(50) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="group">
<visible>Control.HasFocus(12)</visible>
View
89 addons/skin.confluence/720p/IncludesCodecFlagging.xml
@@ -2,25 +2,25 @@
<include name="VideoCodecFlaggingConditions">
<control type="image">
<description>Video rez Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <width>55</width>
+ <height>35</height>
+ <aspectratio align="right">keep</aspectratio>
<texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
</control>
<control type="image">
<description>Common Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>
</control>
@@ -28,41 +28,41 @@
<include name="VideoTypeHackFlaggingConditions">
<control type="image">
<description>Bluray Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <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>
</control>
@@ -70,40 +70,40 @@
<include name="VideoMPAAFlaggingConditions">
<control type="image">
<description>Rated G</description>
- <width>90</width>
- <height>33</height>
+ <width>80</width>
+ <height>35</height>
<aspectratio>keep</aspectratio>
<texture>flagging/ratings/mpaa_general.png</texture>
<visible>substring(listitem.mpaa,Rated G)</visible>
</control>
<control type="image">
<description>Rated PG</description>
- <width>90</width>
- <height>33</height>
+ <width>80</width>
+ <height>35</height>
<aspectratio>keep</aspectratio>
<texture>flagging/ratings/mpaa_pg.png</texture>
<visible>substring(listitem.mpaa,Rated PG) + !substring(listitem.mpaa,Rated PG-13)</visible>
</control>
<control type="image">
<description>Rated PG-13</description>
- <width>90</width>
- <height>33</height>
+ <width>80</width>
+ <height>35</height>
<aspectratio>keep</aspectratio>
<texture>flagging/ratings/mpaa_pg13.png</texture>
<visible>substring(listitem.mpaa,Rated PG-13)</visible>
</control>
<control type="image">
<description>Rated R</description>
- <width>90</width>
- <height>33</height>
+ <width>80</width>
+ <height>35</height>
<aspectratio>keep</aspectratio>
<texture>flagging/ratings/mpaa_restricted.png</texture>
<visible>substring(Listitem.mpaa,Rated R)</visible>
</control>
<control type="image">
<description>Rated NC-17</description>
- <width>90</width>
- <height>33</height>
+ <width>80</width>
+ <height>35</height>
<aspectratio>keep</aspectratio>
<texture>flagging/ratings/mpaa_nc17.png</texture>
<visible>substring(Listitem.mpaa,Rated NC)</visible>
@@ -112,18 +112,27 @@
<include name="AudioCodecFlaggingConditions">
<control type="image">
<description>Audio Codec Image</description>
- <width>90</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <width>80</width>
+ <height>35</height>
+ <aspectratio align="right">keep</aspectratio>
<texture>$INFO[ListItem.AudioCodec,flagging/audio/,.png]</texture>
</control>
</include>
+ <include name="AudioChannelsFlaggingConditions">
+ <control type="image">
+ <description>Audio Codec Image</description>
+ <width>55</width>
+ <height>35</height>
+ <aspectratio align="left">keep</aspectratio>
+ <texture>$INFO[ListItem.AudioChannels,flagging/audio/,.png]</texture>
+ </control>
+ </include>
<include name="AspectCodecFlaggingConditions">
<control type="image">
<description>Aspectratio Image</description>
- <width>60</width>
- <height>33</height>
- <aspectratio>keep</aspectratio>
+ <width>55</width>
+ <height>35</height>
+ <aspectratio align="right">keep</aspectratio>
<texture>$INFO[ListItem.VideoAspect,flagging/aspectratio/,.png]</texture>
</control>
</include>
View
26 addons/skin.confluence/720p/MusicVisualisation.xml
@@ -114,7 +114,7 @@
<itemgap>5</itemgap>
<orientation>horizontal</orientation>
<control type="label">
- <width min="10" max="710">auto</width>
+ <width min="10" max="700">auto</width>
<height>30</height>
<font>font30</font>
<align>left</align>
@@ -125,17 +125,33 @@
</control>
<control type="image">
<description>Audio Codec Image</description>
- <width>90</width>
+ <width>80</width>
<height>35</height>
<aspectratio align="right">keep</aspectratio>
<texture>$INFO[MusicPlayer.Codec,flagging/audio/,.png]</texture>
</control>
- <control type="image">
+ <control type="group">
<description>Rating</description>
<width>110</width>
<height>35</height>
- <aspectratio align="center">keep</aspectratio>
- <texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,LeftRating/]</texture>
+ <control type="image">
+ <description>rating back</description>
+ <posx>0</posx>
+ <posy>0</posy>
+ <width>110</width>
+ <height>35</height>
+ <aspectratio align="left">stretch</aspectratio>
+ <texture border="5">flagging/blank.png</texture>
+ </control>
+ <control type="image">
+ <description>Rating</description>
+ <posx>5</posx>
+ <posy>0</posy>
+ <width>100</width>
+ <height>35</height>
+ <aspectratio align="center">keep</aspectratio>
+ <texture fallback="LeftRating/rating0.png">$INFO[Player.StarRating,LeftRating/]</texture>
+ </control>
</control>
</control>
<control type="label">
View
8 addons/skin.confluence/720p/VideoFullScreen.xml
@@ -181,10 +181,10 @@
<posy>60</posy>
<width>910</width>
<height>35</height>
- <itemgap>0</itemgap>
+ <itemgap>5</itemgap>
<orientation>horizontal</orientation>
<control type="label" id="1">
- <width min="10" max="680">auto</width>
+ <width min="10" max="710">auto</width>
<height>30</height>
<font>font30</font>
<align>left</align>
@@ -195,14 +195,14 @@
</control>
<control type="image" id="1">
<description>Video Resolution Image</description>
- <width>90</width>
+ <width>50</width>
<height>35</height>
<aspectratio align="center">keep</aspectratio>
<texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
</control>
<control type="image" id="1">
<description>Audio Codec Image</description>
- <width>90</width>
+ <width>85</width>
<height>35</height>
<aspectratio align="center">keep</aspectratio>
<texture>$INFO[VideoPlayer.AudioCodec,flagging/audio/,.png]</texture>
View
2  addons/skin.confluence/720p/VideoOSD.xml
@@ -39,7 +39,7 @@
<font>-</font>
<texturefocus>OSDPrevTrackFO.png</texturefocus>
<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
- <onleft>704</onleft>
+ <onleft>705</onleft>
<onright>601</onright>
<onup>600</onup>
<ondown>600</ondown>
View
182 addons/skin.confluence/720p/ViewsFileMode.xml
@@ -37,7 +37,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>660</posx>
+ <posx>680</posx>
<posy>0</posy>
<width>400</width>
<height>40</height>
@@ -47,7 +47,29 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
- <animation effect="slide" start="0,0" end="20,0" delay="0" time="0" condition="!Window.IsVisible(Videos)">conditional</animation>
+ <visible>!Window.IsVisible(Videos)</visible>
+ </control>
+ <control type="label">
+ <posx>620</posx>
+ <posy>0</posy>
+ <width>400</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>625</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>665</posx>
@@ -79,9 +101,9 @@
</control>
<control type="image">
<posx>490</posx>
- <posy>5</posy>
+ <posy>4</posy>
<width>200</width>
- <height>31</height>
+ <height>33</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(50) + !IsEmpty(ListItem.Label2)</visible>
</control>
@@ -98,7 +120,20 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>660</posx>
+ <posx>680</posx>
+ <posy>0</posy>
+ <width>400</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ <visible>!Window.IsVisible(Videos)</visible>
+ </control>
+ <control type="label">
+ <posx>620</posx>
<posy>0</posy>
<width>400</width>
<height>40</height>
@@ -108,7 +143,16 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
- <animation effect="slide" start="0,0" end="20,0" delay="0" time="0" condition="!Window.IsVisible(Videos)">conditional</animation>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>625</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>665</posx>
@@ -171,7 +215,7 @@
<posx>90</posx>
<posy>80</posy>
<width>1080</width>
- <height>550</height>
+ <height>558</height>
<onleft>2</onleft>
<onright>60</onright>
<onup>500</onup>
@@ -180,21 +224,32 @@
<pagecontrol>60</pagecontrol>
<scrolltime>200</scrolltime>
<preloaditems>2</preloaditems>
- <itemlayout height="275" width="270">
+ <itemlayout height="186" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
- <width>268</width>
- <height>240</height>
+ <width>214</width>
+ <height>160</height>
<bordertexture border="5">button-nofocus.png</bordertexture>
<bordersize>5</bordersize>
- <fadetime>100</fadetime>
<texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>!Container.Content(Episodes)</visible>
+ </control>
+ <control type="image">
+ <posx>1</posx>
+ <posy>0</posy>
+ <width>214</width>
+ <height>160</height>
+ <aspectratio>scale</aspectratio>
+ <bordertexture border="5">button-nofocus.png</bordertexture>
+ <bordersize>5</bordersize>
+ <texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>Container.Content(Episodes)</visible>
</control>
<control type="label">
- <posx>135</posx>
- <posy>240</posy>
- <width>260</width>
+ <posx>108</posx>
+ <posy>160</posy>
+ <width>200</width>
<height>25</height>
<font>font12</font>
<textcolor>grey2</textcolor>
@@ -204,29 +259,40 @@
<info>ListItem.Label</info>
</control>
<control type="image">
- <posx>230</posx>
- <posy>200</posy>
- <width>35</width>
- <height>35</height>
+ <posx>180</posx>
+ <posy>130</posy>
+ <width>30</width>
+ <height>30</height>
<aspectratio>keep</aspectratio>
<texture>$INFO[ListItem.Overlay]</texture>
</control>
</itemlayout>
- <focusedlayout height="275" width="270">
+ <focusedlayout height="186" width="216">
<control type="image">
<posx>1</posx>
<posy>0</posy>
- <width>268</width>
- <height>240</height>
+ <width>214</width>
+ <height>160</height>
<bordertexture border="5">folder-focus.png</bordertexture>
<bordersize>5</bordersize>
- <fadetime>100</fadetime>
<texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>!Container.Content(Episodes)</visible>
+ </control>
+ <control type="image">
+ <posx>1</posx>
+ <posy>0</posy>
+ <width>214</width>
+ <height>160</height>
+ <aspectratio>scale</aspectratio>
+ <bordertexture border="5">folder-focus.png</bordertexture>
+ <bordersize>5</bordersize>
+ <texture background="true">$INFO[Listitem.Icon]</texture>
+ <visible>Container.Content(Episodes)</visible>
</control>
<control type="label">
- <posx>135</posx>
- <posy>240</posy>
- <width>260</width>
+ <posx>108</posx>
+ <posy>160</posy>
+ <width>200</width>
<height>25</height>
<font>font12</font>
<textcolor>white</textcolor>
@@ -236,10 +302,10 @@
<info>ListItem.Label</info>
</control>
<control type="image">
- <posx>230</posx>
- <posy>200</posy>
- <width>35</width>
- <height>35</height>
+ <posx>180</posx>
+ <posy>130</posy>
+ <width>30</width>
+ <height>30</height>
<aspectratio>keep</aspectratio>
<texture>$INFO[ListItem.Overlay]</texture>
</control>
@@ -382,7 +448,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>1045</posx>
+ <posx>1060</posx>
<posy>0</posy>
<width>1000</width>
<height>40</height>
@@ -392,7 +458,29 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
- <animation effect="slide" start="0,0" end="20,0" delay="0" time="0" condition="!Window.IsVisible(Videos)">conditional</animation>
+ <visible>!Window.IsVisible(Videos)</visible>
+ </control>
+ <control type="label">
+ <posx>1005</posx>
+ <posy>0</posy>
+ <width>940</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>1010</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>1050</posx>
@@ -424,9 +512,9 @@
</control>
<control type="image">
<posx>875</posx>
- <posy>5</posy>
+ <posy>4</posy>
<width>200</width>
- <height>31</height>
+ <height>33</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(51) + !IsEmpty(ListItem.Label2)</visible>
</control>
@@ -450,17 +538,39 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>1045</posx>
+ <posx>1060</posx>
<posy>0</posy>
<width>1000</width>
<height>40</height>
<font>font12</font>
- <textcolor>white</textcolor>
+ <textcolor>grey2</textcolor>
+ <selectedcolor>selected</selectedcolor>
+ <align>right</align>
+ <aligny>center</aligny>
+ <label>$INFO[ListItem.Label2]</label>
+ <visible>!Window.IsVisible(Videos)</visible>
+ </control>
+ <control type="label">
+ <posx>1005</posx>
+ <posy>0</posy>
+ <width>940</width>
+ <height>40</height>
+ <font>font12</font>
+ <textcolor>grey2</textcolor>
<selectedcolor>selected</selectedcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
- <animation effect="slide" start="0,0" end="20,0" delay="0" time="0" condition="!Window.IsVisible(Videos)">conditional</animation>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>1010</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>1050</posx>
View
76 addons/skin.confluence/720p/ViewsVideoLibrary.xml
@@ -161,10 +161,11 @@
<posy>610</posy>
<width>1280</width>
<align>center</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
@@ -688,14 +689,15 @@
</control>
<control type="grouplist">
<description>Media Codec Flagging Images</description>
- <posx>40</posx>
+ <posx>30</posx>
<posy>360</posy>
<width>800</width>
<align>left</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
@@ -749,7 +751,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>545</posx>
+ <posx>510</posx>
<posy>0</posy>
<width>500</width>
<height>40</height>
@@ -759,6 +761,16 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>515</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>555</posx>
@@ -789,9 +801,9 @@
</control>
<control type="image">
<posx>380</posx>
- <posy>5</posy>
+ <posy>4</posy>
<width>200</width>
- <height>31</height>
+ <height>33</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(503) + !IsEmpty(ListItem.Label2)</visible>
</control>
@@ -808,7 +820,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>545</posx>
+ <posx>510</posx>
<posy>0</posy>
<width>500</width>
<height>40</height>
@@ -818,6 +830,16 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>515</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>555</posx>
@@ -973,10 +995,11 @@
<posy>210</posy>
<width>530</width>
<align>center</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
@@ -1077,10 +1100,11 @@
<posy>365</posy>
<width>530</width>
<align>center</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
@@ -1137,7 +1161,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>545</posx>
+ <posx>510</posx>
<posy>0</posy>
<width>500</width>
<height>40</height>
@@ -1147,6 +1171,16 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>515</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>555</posx>
@@ -1177,9 +1211,9 @@
</control>
<control type="image">
<posx>380</posx>
- <posy>5</posy>
+ <posy>4</posy>
<width>200</width>
- <height>31</height>
+ <height>33</height>
<texture border="0,0,14,0">MediaItemDetailBG.png</texture>
<visible>Control.HasFocus(504) + !IsEmpty(ListItem.Label2)</visible>
</control>
@@ -1196,7 +1230,7 @@
<label>$INFO[ListItem.Label]</label>
</control>
<control type="label">
- <posx>545</posx>
+ <posx>510</posx>
<posy>0</posy>
<width>500</width>
<height>40</height>
@@ -1206,6 +1240,16 @@
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label2]</label>
+ <visible>Window.IsVisible(Videos)</visible>
+ <animation effect="slide" start="0,0" end="40,0" delay="0" time="0" condition="![Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]">conditional</animation>
+ </control>
+ <control type="image">
+ <posx>515</posx>
+ <posy>8</posy>
+ <width>40</width>
+ <height>26</height>
+ <texture>$INFO[ListItem.VideoResolution,flagging/lists/,.png]</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
</control>
<control type="image">
<posx>555</posx>
@@ -1266,10 +1310,11 @@
<posy>290</posy>
<width>510</width>
<align>center</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
@@ -1370,10 +1415,11 @@
<posy>290</posy>
<width>510</width>
<align>center</align>
- <itemgap>0</itemgap>
+ <itemgap>2</itemgap>
<orientation>horizontal</orientation>
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
+ <include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
View
8 addons/skin.confluence/language/Catalan/strings.xml
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<!-- Misc labels -->
- <string id="31000">Canvia el</string>
+ <string id="31000">Canvia la</string>
<string id="31001">M'agrada</string>
<string id="31002">No m'agrada</string>
<string id="31003">Opcions d'energia</string>
<string id="31004">Treballant...</string>
<string id="31005">Amaga la informació</string>
-
+ <string id="31006">Veure les opcions</string>
<string id="31007">Connectors</string>
+ <string id="31008">Pantalla completa</string>
<string id="31020">Afegits recentment</string>
<string id="31021">Fitxers - Vídeo</string>
@@ -38,6 +39,8 @@
<string id="31047">Predefinit actual</string>
<string id="31048">Visualitzacions predefinides</string>
<string id="31049">Hora de finalització</string>
+ <string id="31050">Ordena: Ascendent</string>
+ <string id="31051">Ordena: Descendent</string>
<!-- Playlist Editor labels -->
@@ -133,6 +136,7 @@
<string id="31328">Afegits recentment</string>
<string id="31329">[B]Temporitzador activat[/B] [COLOR=grey2] - El sistema s'apagarà automàticament en[/COLOR]</string>
<string id="31330">Feu clic per reproduir[CR][CR]Trailer de la pel·lícula</string>
+ <string id="31331">Detalls de l'àlbum</string>
<!-- Video and Music OSD Labels -->
<string id="31351">Pausa</string>
View
BIN  addons/skin.confluence/media/flagging/aspectratio/1.33.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/aspectratio/1.66.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/aspectratio/1.78.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/aspectratio/1.85.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/aspectratio/2.20.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/aspectratio/2.35.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/8.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/aac.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/ac3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/aif.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/aifc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/aiff.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/ape.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/avc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/cdda.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/dca.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/dts.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/dtshd_hra.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/dtshd_ma.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/eac3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/flac.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  addons/skin.confluence/media/flagging/audio/mp1.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/mp2.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/mp3.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/ogg.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/truehd.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/wavpack.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/wma.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/wmapro.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/audio/wmav2.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/blank.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/lists/1080.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/lists/480.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/lists/540.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/lists/576.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/lists/720.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/1080.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/480.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/540.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/576.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/720.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/avc1.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/bluray.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/divx.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/dvd.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/flv.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/h264.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/hddvd.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/mpeg1video.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/mpeg2video.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/tv.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/vc-1.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/vhs.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/wvc1.png
Diff not rendered
View
BIN  addons/skin.confluence/media/flagging/video/xvid.png
Diff not rendered
View
10 configure.in
@@ -376,10 +376,11 @@ case $host in
use_vtbdecoder=no
use_crystalhd=no
ARCH="powerpc-osx"
+ use_arch="ppc"
export MACOSX_DEPLOYMENT_TARGET=10.4
SYSROOT="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
# define ppc
- ARCHTYPE=`arch`
+ ARCHTYPE="ppc"
AC_SUBST([ARCHTYPE])
;;
powerpc-*-linux-gnu*)
@@ -1419,6 +1420,7 @@ OUTPUT_FILES="Makefile \
lib/libsquish/Makefile \
lib/libid3tag/Makefile \
lib/cximage-6.0/Makefile \
+ lib/addons/script.module.pil/Makefile \
xbmc/interfaces/python/Makefile \
xbmc/interfaces/python/xbmcmodule/Makefile \
lib/libUPnP/Makefile \
@@ -1543,7 +1545,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
if test "$host_vendor" = "apple" ; then
./configure \
--extra-cflags="$CFLAGS $FFMPEG_EXTRACFLAGS -w -D_DARWIN_C_SOURCE -Dattribute_deprecated=" \
- `if test "$cross_compiling" = "yes"; then echo --enable-cross-compile; fi` \
+ `if test "$use_arch" != "no"; then echo --enable-cross-compile; fi` \
`if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
`if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
--target-os=$(tolower $(uname -s)) \
@@ -1577,6 +1579,10 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
sed -i "" -e "s#YASM=yasm#YASM=${prefix}/bin/yasm#" config.mak &&
sed -i "" -e "s#YASMDEP=yasm#YASMDEP=${prefix}/bin/yasm#" config.mak &&
sed -i "" -e "s# -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 # #" config.mak
+ if test "$use_arch" = "ppc"; then
+ sed -i "" -e "s/HAVE_GNU_AS 1/HAVE_GNU_AS 0/" config.h
+ sed -i "" -e "s/^HAVE_GNU_AS=yes/!HAVE_GNU_AS=yes/" config.mak
+ fi
else
CFLAGS="" \
LDFLAGS="$(echo "$LDFLAGS" | sed "s/-Wl,-Bsymbolic-functions//g")" \
View
2,600 language/Catalan/strings.xml
1,718 additions, 882 deletions not shown
View
12 lib/addons/script.module.pil/Makefile → lib/addons/script.module.pil/Makefile.in
@@ -10,15 +10,14 @@ RETRIEVE_TOOL_FLAGS=-Ls --output $(ARCHIVE)
ARCHIVE_TOOL=tar
ARCHIVE_TOOL_FLAGS=xf
-PYTHONDIR=$(abs_top_srcdir)/lib/python
ifeq ($(OSTYPE),Darwin)
include ../../../tools/osx/osx-depends/config.mk
PYTHON=$(prefix_path)/bin/python
else
-PYTHON=$(PYTHONDIR)/python
+PYTHON=@PYTHON@
endif
-DESTDIR=$(abs_top_srcdir)/addons/script.module.pil/lib/PIL
+DESTDIR=@abs_top_srcdir@/addons/script.module.pil/lib/PIL
CLEAN_FILES=$(ARCHIVE) $(SOURCE) $(DESTDIR)
@@ -31,12 +30,9 @@ $(SOURCE): $(ARCHIVE)
-rm -rf $(SOURCE)
$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(ARCHIVE)
-$(DESTDIR): $(SOURCE) $(PYTHON)
+$(DESTDIR): $(SOURCE)
-rm -rf $(DESTDIR)
- pushd $(SOURCE) && LD_LIBRARY_PATH=$(PYTHONDIR) $(PYTHON) setup.py build --build-lib $(DESTDIR); popd
-
-$(PYTHON):
- $(MAKE) -C $(abs_top_srcdir) libpython
+ pushd $(SOURCE) && $(PYTHON) setup.py build --build-lib $(DESTDIR); popd
include ../../../Makefile.include
View
2  lib/cmyth/Makefile.in
@@ -12,7 +12,7 @@ all: $(CMYTH_LIB)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CMYTH_LIB): libcmyth/libcmyth.a librefmem/librefmem.a
- $(CC) $(SYSROOT) $(LDFLAGS) -bundle -o $@ @MYSQL_LIBS@ \
+ $(CC) $(LDFLAGS) -bundle -o $@ @MYSQL_LIBS@ \
-Wl,-all_load libcmyth/libcmyth.a librefmem/librefmem.a
else
$(CMYTH_LIB): libcmyth/libcmyth.a librefmem/librefmem.a
View
1  lib/cmyth/Win32/libcmyth.vcxproj
@@ -101,6 +101,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsC</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;mysqlclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
View
1  lib/cpluff/libcpluff/win32/cpluff.vcxproj
@@ -90,6 +90,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalDependencies>libexpat.lib;%(AdditionalDependencies)</AdditionalDependencies>
View
1  lib/cximage-6.0/jasper/jasper.vcxproj
@@ -121,6 +121,7 @@
<WarningLevel>Level2</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/cximage-6.0/jbig/jbig.vcxproj
@@ -94,6 +94,7 @@
<ProgramDataBaseFileName>$(Configuration)\vs2010\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/cximage-6.0/jpeg/Jpeg.vcxproj
@@ -161,6 +161,7 @@
<ProgramDataBaseFileName>$(Configuration)\vs2010\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0809</Culture>
View
1  lib/cximage-6.0/mng/mng.vcxproj
@@ -169,6 +169,7 @@
<ProgramDataBaseFileName>$(Configuration)\vs2010\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/cximage-6.0/png/png.vcxproj
@@ -146,6 +146,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0809</Culture>
View
1  lib/cximage-6.0/raw/libdcr.vcxproj
@@ -94,6 +94,7 @@
<ProgramDataBaseFileName>$(Configuration)\vs2010\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/cximage-6.0/tiff/Tiff.vcxproj
@@ -122,6 +122,7 @@
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/cximage-6.0/zlib/zlib.vcxproj
@@ -168,6 +168,7 @@
<ProgramDataBaseFileName>$(Configuration)\vs2010\</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<Culture>0x0809</Culture>
View
1  lib/enca/libenca_win32/libenca_win32.vcxproj
@@ -75,6 +75,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
View
1  lib/freetype/builds/win32/vs2010/freetype.vcxproj
@@ -159,6 +159,7 @@
</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4001;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
7 lib/libTcpSocket/linux/net_posix.c
@@ -233,6 +233,13 @@ void
tcp_close(socket_t fdSock)
{
if (fdSock != SOCKET_ERROR)
+ close(fdSock);
+}
+
+void
+tcp_shutdown(socket_t fdSock)
+{
+ if (fdSock != SOCKET_ERROR)
shutdown(fdSock, SHUT_RDWR);
}
View
16 lib/libTcpSocket/os-dependent_socket.h
@@ -78,4 +78,18 @@ int tcp_read_timeout(socket_t fdSock, void *buf, size_t nLen, int nTimeout);
*/
void tcp_close(socket_t fdSock);
-int tcp_send(socket_t fdSock, void *buf, int len, int flags);
+/*!
+ * @brief Shutdown a socket connection opened with tcp_connect.
+ * @param fdSock The socket to shutdown.
+ */
+void tcp_shutdown(socket_t fdSock);
+
+/*!
+ * @brief Send data over a tcp socket opened with tcp_connect.
+ * @param fdSock The socket to write to.
+ * @param buf The buffer to write to the socket.
+ * @param len The length of the buffer.
+ * @param flags The flags to provide to send().
+ * @return The number of bytes written.
+ */
+int tcp_send(socket_t fdSock, void *buf, int len, int flags);
View
9 lib/libTcpSocket/windows/net_winsock.c
@@ -284,8 +284,15 @@ tcp_close(socket_t fdSock)
closesocket(fdSock);
}
+void
+tcp_shutdown(socket_t fdSock)
+{
+ if (fdSock != SOCKET_ERROR)
+ shutdown(fdSock, SHUT_RDWR);
+}
+
int
-tcp_send(__in SOCKET fdSock, __in_bcount(len) const char FAR * buf, __in int len, __in int flags)
+tcp_send(socket_t fdSock, char *buf, int len, int flags)
{
if (fdSock != SOCKET_ERROR)
return send(fdSock, buf, len, flags);
View
1  lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcxproj
@@ -77,6 +77,7 @@
<DebugInformationFormat>
</DebugInformationFormat>
<CompileAs>CompileAsC</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
View
1  lib/libapetag/libapetag.vcxproj
@@ -76,6 +76,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
View
1  lib/libass/xbmc/libass_win32/libass_win32_vs2010.vcxproj
@@ -101,6 +101,7 @@
<DebugInformationFormat>
</DebugInformationFormat>
<DisableSpecificWarnings>4001;4996;4244;4267;4018;4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalDependencies>fontconfig.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
View
0  lib/libcrystalhd/bc_dts_defs.h
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
0  lib/libcrystalhd/bc_dts_types.h
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
0  lib/libcrystalhd/libcrystalhd_if.h
Sorry, we could not display the changes to this file because there were too many other changes to display.
View
5 lib/libdvd/Makefile.in
@@ -1,6 +1,5 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CC=@CC@
CXX=@CXX@
@@ -46,11 +45,11 @@ all: $(SLIB)
ifeq ($(findstring osx,$(ARCH)), osx)
$(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
- $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) $(SYSROOT) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
else
View
1  lib/libexif/libexif.vcxproj
@@ -123,6 +123,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
View
3  lib/libhdhomerun/hdhomerun/hdhomerun.vcxproj
@@ -106,6 +106,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>CompileAsCpp</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -158,4 +159,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
View
1  lib/libhts/Win32/libhts_2010.vcxproj
@@ -76,6 +76,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
View
1  lib/liblame/vc_solution/vc10_libmp3lame_dll.vcxproj
@@ -115,6 +115,7 @@
<AdditionalIncludeDirectories>../libmp3lame;../;../mpglib;../include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;HAVE_MPGLIB;HAVE_CONFIG_H;HAVE_NASM;MMX_choose_table;WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_VC80_UPGRADE=0x0600;_DLL=$(TargetFileName);%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/libmad/msvc++/libmad.vcxproj
@@ -108,6 +108,7 @@
<ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
<SuppressStartupBanner>true</SuppressStartupBanner>
<CompileAs>Default</CompileAs>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
View
1  lib/libmodplug/libmodplug_2010.vcxproj
@@ -84,6 +84,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
View
3  lib/libsidplay2/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS +=-D_LINUX -DHAVE_UNIX -DHAVE_STRCASECMP -DHAVE_STRNCASECMP \
-DHAVE_IOS_OPENMODE -fPIC -Ilibsidplay/win/VC \
@@ -54,7 +53,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/libsidplay2-@ARCH@.so
$(SLIB): $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CXX) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) @abs_top_srcdir@/xbmc/linux/XHandle.o $(BUNDLE1_O)
else
View
2  lib/libsquish/Makefile.in
@@ -28,7 +28,7 @@ all: $(LIB) $(NATIVE_LIB)
# TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
$(NATIVE_LIB): $(SRCS)
ifeq ($(findstring osx,$(ARCH)),osx)
- g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+ g++ -m32 -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
else
g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
endif
View
1  lib/libsquish/vs7/squish/squish_2010.vcxproj
@@ -79,6 +79,7 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
View
3  lib/nosefart/Makefile.in
@@ -1,5 +1,4 @@
ARCH=@ARCH@
-SYSROOT=@SYSROOT@
CFLAGS +=-D_LINUX -fPIC -DNSF_PLAYER
CXXFLAGS +=-D_LINUX -fPIC -DNSF_PLAYER
@@ -28,7 +27,7 @@ SLIB=@abs_top_srcdir@/system/players/paplayer/nosefart-@ARCH@.so
$(SLIB): $(OBJS)
ifeq ($(findstring osx,$(ARCH)), osx)
- $(CC) $(SYSROOT) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
+ $(CC) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \
-bundle -undefined dynamic_lookup -read_only_relocs suppress -o $@ \
@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) $(BUNDLE1_O)
else
View
1 