Skip to content

Commit

Permalink
Add streams dialog (#307)
Browse files Browse the repository at this point in the history 
* Add streams dialog

Refactor video OSD

* Fix alignment

* Add audio object type

Split video version textbox into 2 separate labels one can scroll

* Typo

* Capitalise properties

Shorten audio codec labels

* Remove extra space

* Re-enable video type flagging
  • Loading branch information
@Hitcher
Hitcher authored Jan 31, 2025
1 parent d3ce3f6 commit 77a4eb8
Show file tree
Hide file tree
Showing 15 changed files with 836 additions and 149 deletions.
276 changes: 184 additions & 92 deletions 1080p/Custom_1102_OptionsDialog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,203 @@
<?xml version="1.0" encoding="UTF-8"?>
<window id="1102" type="dialog">
<defaultcontrol always="true">11000</defaultcontrol>
<onload condition="String.IsEqual(window(home).Property(optionsdialog_content),options)">SetFocus(11100)</onload>
<onload condition="String.IsEqual(window(home).Property(optionsdialog_content),3d)">SetFocus(11200)</onload>
<defaultcontrol always="true">11100</defaultcontrol>
<include>dialogeffect</include>
<onunload>ClearProperty(optionsdialog_header,Home)</onunload>
<onunload>ClearProperty(optionsdialog_content,Home)</onunload>
<coordinates>
<left>360</left>
<left>510</left>
<top>213</top>
</coordinates>
<controls>
<control type="group" id="11000">
<centerleft>50%</centerleft>
<centertop>50%</centertop>
<animation effect="fade" time="150">VisibleChange</animation>
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="1200" />
<param name="DialogBackgroundHeight" value="330" />
<param name="DialogHeaderWidth" value="1080" />
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]" />
<param name="DialogHeaderId" value="1" />
<param name="CloseButtonLeft" value="1065" />
<param name="CloseButtonNav" value="10" />
</include>
<control type="grouplist" id="11100">
<control type="group">
<visible>![Window.IsActive(DialogSelect.xml) | Window.IsActive(DialogSettings.xml)]</visible>
<control type="group">
<visible>String.IsEqual(window(home).Property(optionsdialog_content),options)</visible>
<centerleft>50%</centerleft>
<centertop>50%</centertop>
<animation effect="fade" time="150">VisibleChange</animation>
<left>53</left>
<top>105</top>
<width>1095</width>
<height>192</height>
<itemgap>6</itemgap>
<onleft>11100</onleft>
<onright>11100</onright>
<onup>11100</onup>
<ondown>11100</ondown>
<orientation>vertical</orientation>
<control type="button" id="11101">
<height>60</height>
<width>1095</width>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>31022</label>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(1103)</onclick>
<enable>Player.TempoEnabled</enable>
</control>
<control type="button" id="11102">
<height>60</height>
<width>1095</width>
<label>10116</label>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(playerprocessinfo)</onclick>
<onclick>SetFocus(207)</onclick>
</control>
<control type="button" id="11103">
<height>60</height>
<width>1095</width>
<label>36560</label>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>Dialog.Close(1114)</onclick>
<onclick>ActivateWindow(osdcmssettings)</onclick>
<visible>System.HasCMS</visible>
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="900"/>
<param name="DialogBackgroundHeight" value="540"/>
<param name="DialogHeaderWidth" value="780"/>
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
<param name="DialogHeaderId" value="1"/>
<param name="CloseButtonLeft" value="765"/>
<param name="CloseButtonNav" value="10"/>
</include>
<control type="grouplist" id="11100">
<animation effect="fade" time="150">VisibleChange</animation>
<left>53</left>
<top>105</top>
<width>795</width>
<height>402</height>
<itemgap>6</itemgap>
<onleft>11100</onleft>
<onright>11100</onright>
<onup>11100</onup>
<ondown>11100</ondown>
<orientation>vertical</orientation>
<control type="button" id="10">
<height>60</height>
<width>795</width>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>13396</label>
<onclick>ActivateWindow(osdaudiosettings)</onclick>
</control>
<control type="button" id="11">
<height>60</height>
<width>795</width>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>24133</label>
<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
</control>
<control type="button" id="12">
<height>60</height>
<width>795</width>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>13395</label>
<onclick>ActivateWindow(osdvideosettings)</onclick>
</control>
<control type="button" id="13">
<height>60</height>
<width>795</width>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>31022</label>
<label2>[B]$INFO[Player.PlaySpeed][/B]</label2>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(1103)</onclick>
<enable>Player.TempoEnabled</enable>
</control>
<control type="button" id="14">
<height>60</height>
<width>795</width>
<label>10116</label>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>Dialog.Close(all)</onclick>
<onclick>ActivateWindow(playerprocessinfo)</onclick>
<onclick>SetFocus(207)</onclick>
</control>
<control type="button" id="15">
<height>60</height>
<width>795</width>
<label>36560</label>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>Dialog.Close(1114)</onclick>
<onclick>ActivateWindow(osdcmssettings)</onclick>
<visible>System.HasCMS</visible>
</control>
</control>
</control>
<control type="grouplist" id="11200">
<control type="group">
<visible>String.IsEqual(window(home).Property(optionsdialog_content),3d)</visible>
<centerleft>50%</centerleft>
<centertop>50%</centertop>
<animation effect="fade" time="150">VisibleChange</animation>
<left>53</left>
<top>105</top>
<width>1095</width>
<height>192</height>
<itemgap>6</itemgap>
<onleft>11200</onleft>
<onright>11200</onright>
<onup>11200</onup>
<ondown>11200</ondown>
<orientation>vertical</orientation>
<control type="radiobutton" id="11201">
<height>60</height>
<width>1095</width>
<aligny>center</aligny>
<label>31362</label>
<radioposx>1040</radioposx>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>ToggleStereoMode</onclick>
<selected>Integer.IsGreater(System.StereoscopicMode,0)</selected>
</control>
<control type="button" id="11202">
<height>60</height>
<width>1095</width>
<aligny>center</aligny>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>31361</label>
<label2>[B]$INFO[VideoPlayer.StereoscopicMode][/B]</label2>
<onclick>StereoMode</onclick>
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="900"/>
<param name="DialogBackgroundHeight" value="330"/>
<param name="DialogHeaderWidth" value="780"/>
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
<param name="DialogHeaderId" value="1"/>
<param name="CloseButtonLeft" value="765"/>
<param name="CloseButtonNav" value="10"/>
</include>
<control type="grouplist" id="11100">
<animation effect="fade" time="150">VisibleChange</animation>
<left>53</left>
<top>105</top>
<width>795</width>
<height>192</height>
<itemgap>6</itemgap>
<onleft>11100</onleft>
<onright>11100</onright>
<onup>11100</onup>
<ondown>11100</ondown>
<orientation>vertical</orientation>
<control type="radiobutton" id="16">
<height>60</height>
<width>795</width>
<aligny>center</aligny>
<label>31362</label>
<radioposx>740</radioposx>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>ToggleStereoMode</onclick>
<selected>Integer.IsGreater(System.StereoscopicMode,0)</selected>
</control>
<control type="button" id="17">
<height>60</height>
<width>795</width>
<aligny>center</aligny>
<texturefocus border="5">button-focus2.png</texturefocus>
<label>31361</label>
<label2>[B]$INFO[VideoPlayer.StereoscopicMode][/B]</label2>
<onclick>StereoMode</onclick>
</control>
<control type="radiobutton" id="18">
<height>60</height>
<width>795</width>
<aligny>center</aligny>
<label>31360</label>
<radioposx>740</radioposx>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>StereoModeToMono</onclick>
<selected>String.IsEqual(System.StereoscopicMode,9)</selected>
</control>
</control>
<control type="radiobutton" id="11203">
<height>60</height>
<width>1095</width>
<aligny>center</aligny>
<label>31360</label>
<radioposx>1040</radioposx>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>StereoModeToMono</onclick>
<selected>String.IsEqual(System.StereoscopicMode,9)</selected>
</control>
<control type="group">
<visible>String.IsEqual(window(home).Property(optionsdialog_content),streamselection)</visible>
<centerleft>50%</centerleft>
<centertop>50%</centertop>
<animation effect="fade" time="150">VisibleChange</animation>
<include content="DialogBackgroundCommons">
<param name="DialogBackgroundWidth" value="1000"/>
<param name="DialogBackgroundHeight" value="330"/>
<param name="DialogHeaderWidth" value="880"/>
<param name="DialogHeaderLabel" value="$INFO[Window(home).Property(optionsdialog_header)]"/>
<param name="DialogHeaderId" value="1"/>
<param name="CloseButtonLeft" value="765"/>
<param name="CloseButtonNav" value="10"/>
</include>
<control type="grouplist" id="11100">
<animation effect="fade" time="150">VisibleChange</animation>
<left>53</left>
<top>105</top>
<width>895</width>
<height>192</height>
<itemgap>6</itemgap>
<onleft>11100</onleft>
<onright>11100</onright>
<onup>11100</onup>
<ondown>11100</ondown>
<orientation>vertical</orientation>
<control type="button" id="19">
<height>60</height>
<width>895</width>
<label>31052</label>
<label2>[B]$VAR[ActiveVideoPlayerSubtitleLanguage][/B]</label2>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>DialogSelectSubtitle</onclick>
<enable>VideoPlayer.HasSubtitles</enable>
</control>
<control type="button" id="20">
<height>60</height>
<width>895</width>
<label>31053</label>
<label2>[B]$VAR[ActiveVideoPlayerAudioLanguage]$VAR[AudioCodecVar, | ]$VAR[ObjectAudioTypeVar, | ]$VAR[AudioChannelsVar][/B]</label2>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>DialogSelectAudio</onclick>
<enable>Integer.IsGreater(VideoPlayer.AudioStreamCount,1)</enable>
</control>
<control type="button" id="21">
<height>60</height>
<width>895</width>
<label>31054</label>
<label2>[B]$VAR[VideoCodecVar]$VAR[VideoHDRTypeVar, | ]$VAR[VideoResolutionTypeVar, | ][/B]</label2>
<texturefocus border="5">button-focus2.png</texturefocus>
<onclick>DialogSelectVideo</onclick>
<enable>Integer.IsGreater(VideoPlayer.VideoStreamCount,1)</enable>
</control>
</control>
</control>
</control>
Expand Down
5 changes: 4 additions & 1 deletion 1080p/DialogSelect.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<include>dialogeffect</include>
<depth>DepthDialog+</depth>
<controls>
<include condition="String.IsEmpty(Window(home).Property(CheckPreviousEpisode)) + ![Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
<include condition="String.IsEmpty(Window(home).Property(CheckPreviousEpisode)) + ![Window.IsActive(dialogselectvideo) | Window.IsActive(dialogselectaudio) | Window.IsActive(dialogselectsubtitle) | Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra) | Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
<include condition="Window.IsActive(dialogselectvideo)">DialogSelectVideoLayout</include>
<include condition="Window.IsActive(dialogselectaudio)">DialogSelectAudioLayout</include>
<include condition="Window.IsActive(dialogselectsubtitle)">DialogSelectSubtitleLayout</include>
<include condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)">DialogGameSelectLayout</include>
<include condition="Window.IsActive(gamesaves)">DialogGameSelectSaveLayout</include>
<include condition="Window.IsActive(selectvideoversion) | Window.IsActive(selectvideoextra)">DialogVideoSelectLayout</include>
Expand Down
1 change: 0 additions & 1 deletion 1080p/DialogVideoInfo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<include>VideoCodecFlaggingConditions</include>
<include>AudioCodecFlaggingConditions</include>
<include>AudioChannelsFlaggingConditions</include>
<include>AudioObjectsFlaggingConditions</include>
<include>AspectCodecFlaggingConditions</include>
<include>VideoStereoscopicsFlaggingConditions</include>
</control>
Expand Down
Loading

0 comments on commit 77a4eb8

Please sign in to comment.