Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents 23bd2c9 + 4c26155 commit bd16540b69d275a1a354af898b5d5476cc806c61 @opdenkamp opdenkamp committed May 9, 2011
Showing 495 changed files with 2,813 additions and 132,227 deletions.
View
@@ -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
@@ -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 $@
@@ -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">
@@ -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>
@@ -2,108 +2,108 @@
<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>
</include>
<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>
</include>
<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>
@@ -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">
@@ -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>
@@ -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>
Oops, something went wrong.

0 comments on commit bd16540

Please sign in to comment.