aboutsummaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2013-11-06 12:28:57 -0800
committerjmarshallnz <jcmarsha@gmail.com>2013-11-06 12:28:57 -0800
commitcb381b3348ead68dc295da8df36229b7f89c8f0b (patch)
treecc507560e7fc25e0ab8bc01ac81b99fb448c5f8e /addons
parent1a41036cdbcd86fe472266c6a6e46ab9514ad981 (diff)
parent481e7c92542900c52a719896d7799342527db3e4 (diff)
Merge pull request #3340 from da-anda/3d-streamdetails
[3D] Add stereomode of videos to streamdetails and expose info to skins
Diffstat (limited to 'addons')
-rw-r--r--addons/skin.confluence/720p/DialogVideoInfo.xml1
-rw-r--r--addons/skin.confluence/720p/IncludesCodecFlagging.xml10
-rw-r--r--addons/skin.confluence/720p/ViewsFileMode.xml40
-rw-r--r--addons/skin.confluence/720p/ViewsVideoLibrary.xml48
-rw-r--r--addons/skin.confluence/media/flagging/lists/3D.pngbin0 -> 2997 bytes
-rw-r--r--addons/skin.confluence/media/flagging/video/3D.pngbin0 -> 2997 bytes
6 files changed, 99 insertions, 0 deletions
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml
index 04b6486f5e..cc0bcf5a6e 100644
--- a/addons/skin.confluence/720p/DialogVideoInfo.xml
+++ b/addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -61,6 +61,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="group">
diff --git a/addons/skin.confluence/720p/IncludesCodecFlagging.xml b/addons/skin.confluence/720p/IncludesCodecFlagging.xml
index 859d5eb960..c3412987fa 100644
--- a/addons/skin.confluence/720p/IncludesCodecFlagging.xml
+++ b/addons/skin.confluence/720p/IncludesCodecFlagging.xml
@@ -34,6 +34,16 @@
<texture>$VAR[videocodec,flagging/video/,.png]</texture>
</control>
</include>
+ <include name="VideoStereoscopicsFlaggingConditions">
+ <control type="image">
+ <description>Video stereoscopics flagging image</description>
+ <width>55</width>
+ <height>35</height>
+ <aspectratio align="right">keep</aspectratio>
+ <texture>flagging/video/3D.png</texture>
+ <visible>ListItem.IsStereoscopic</visible>
+ </control>
+ </include>
<include name="VideoTypeHackFlaggingConditions">
<control type="image">
<description>Video Type Image</description>
diff --git a/addons/skin.confluence/720p/ViewsFileMode.xml b/addons/skin.confluence/720p/ViewsFileMode.xml
index 10822140dd..f58dacb9c7 100644
--- a/addons/skin.confluence/720p/ViewsFileMode.xml
+++ b/addons/skin.confluence/720p/ViewsFileMode.xml
@@ -70,6 +70,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>625</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>665</left>
@@ -161,6 +171,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>625</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>665</left>
@@ -559,6 +579,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>1010</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>1050</left>
@@ -657,6 +687,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>1010</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>1050</left>
diff --git a/addons/skin.confluence/720p/ViewsVideoLibrary.xml b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
index bed97cd310..dc95c5c000 100644
--- a/addons/skin.confluence/720p/ViewsVideoLibrary.xml
+++ b/addons/skin.confluence/720p/ViewsVideoLibrary.xml
@@ -168,6 +168,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
</control>
@@ -739,6 +740,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="grouplist">
@@ -811,6 +813,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>515</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>555</left>
@@ -889,6 +901,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>515</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>555</left>
@@ -1059,6 +1081,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="label">
@@ -1164,6 +1187,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="textbox">
@@ -1239,6 +1263,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>515</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>555</left>
@@ -1317,6 +1351,16 @@
<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>
+ <visible>!ListItem.IsStereoscopic</visible>
+ </control>
+ <control type="image">
+ <left>515</left>
+ <top>8</top>
+ <width>40</width>
+ <height>26</height>
+ <texture>flagging/lists/3D.png</texture>
+ <visible>Window.IsVisible(Videos) + [Container.Content(Movies) | Container.Content(Episodes) | Container.Content(MusicVideos)]</visible>
+ <visible>ListItem.IsStereoscopic</visible>
</control>
<control type="image">
<left>555</left>
@@ -1392,6 +1436,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="image">
@@ -1497,6 +1542,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="image">
@@ -1745,6 +1791,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="image">
@@ -1906,6 +1953,7 @@
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
+ <include>VideoStereoscopicsFlaggingConditions</include>
<include>VideoTypeHackFlaggingConditions</include>
</control>
<control type="image">
diff --git a/addons/skin.confluence/media/flagging/lists/3D.png b/addons/skin.confluence/media/flagging/lists/3D.png
new file mode 100644
index 0000000000..0f67943110
--- /dev/null
+++ b/addons/skin.confluence/media/flagging/lists/3D.png
Binary files differ
diff --git a/addons/skin.confluence/media/flagging/video/3D.png b/addons/skin.confluence/media/flagging/video/3D.png
new file mode 100644
index 0000000000..1958cae605
--- /dev/null
+++ b/addons/skin.confluence/media/flagging/video/3D.png
Binary files differ
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-30 03:56:40 +0000