Skip to content

Commit

Permalink
Skin Settings > On Screen Display (Music Visualisation) > Show media …
Browse files Browse the repository at this point in the history 
…flags with controls - Fixes #102
  • Loading branch information
@jurialmunkey
jurialmunkey committed Oct 20, 2021
1 parent 8d8d25d commit c4b26fe
Show file tree
Hide file tree
Showing 6 changed files with 125 additions and 18 deletions.
4 changes: 4 additions & 0 deletions 16x9/Includes_Defs.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<includes>

<include name="Defs_OSDAlbumWidth_WithCodec">
<width>580</width>
</include>

<include name="Defs_Offscreen">
<top>-1000</top>
<left>-1000</left>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Includes_Furniture.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@
</control>
</control>

<!-- MPAA -->
<!-- SampleRate -->
<control type="group">
<width>64</width>
<height>64</height>
Expand Down
120 changes: 104 additions & 16 deletions 16x9/Includes_Window.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1815,25 +1815,113 @@
<label>$INFO[MusicPlayer.Artist]</label>
</control>
</control>
<control type="grouplist">
<itemgap>0</itemgap>
<orientation>horizontal</orientation>
<control type="group">
<height>80</height>
<width>100%</width>
<control type="label">
<aligny>top</aligny>
<width>80</width>
<textcolor>HomeSubLabel</textcolor>
<font>Font-MusicVis-Info</font>
<label>31201</label>
<animation effect="fade" start="100" end="50" condition="true">Conditional</animation>
<control type="grouplist">
<itemgap>0</itemgap>
<orientation>horizontal</orientation>
<height>80</height>
<control type="label">
<aligny>top</aligny>
<width>80</width>
<textcolor>HomeSubLabel</textcolor>
<font>Font-MusicVis-Info</font>
<label>31201</label>
<animation effect="fade" start="100" end="50" condition="true">Conditional</animation>
</control>
<control type="label">
<aligny>top</aligny>
<include condition="Skin.HasSetting(furniture.showmusicvisflags)">Defs_OSDAlbumWidth_WithCodec</include>
<textcolor>HomeSubLabel</textcolor>
<font>Font-MusicVis-Info</font>
<label>$INFO[MusicPlayer.Album]</label>
</control>
</control>
<control type="label">
<aligny>top</aligny>
<width>auto</width>
<textcolor>HomeSubLabel</textcolor>
<font>Font-MusicVis-Info</font>
<label>$INFO[MusicPlayer.Album]</label>


<control type="grouplist">
<visible>Skin.HasSetting(furniture.showmusicvisflags)</visible>
<include>Animation_FadeIn</include>
<include>Animation_FadeOut</include>
<bottom>20</bottom>
<align>right</align>
<height>64</height>
<orientation>horizontal</orientation>
<itemgap>bigpad</itemgap>
<usecontrolcoords>true</usecontrolcoords>

<!-- Audio Channels -->
<control type="image">
<width>64</width>
<height>64</height>
<aspectratio>keep</aspectratio>
<visible>!String.IsEmpty(MusicPlayer.Channels)</visible>
<texture colordiffuse="LineLabel" fallback="indicator/fallback.png">$INFO[MusicPlayer.Channels,indicator/channels/,.png]</texture>
</control>

<!-- Bitrate -->
<control type="group">
<width>64</width>
<height>64</height>
<visible>!String.IsEmpty(MusicPlayer.Bitrate)</visible>
<control type="label">
<width>auto</width>
<height>32</height>
<top>6</top>
<textcolor>LineLabel</textcolor>
<font>Font-LineLabel-Bitrate</font>
<aligny>center</aligny>
<align>center</align>
<label>$INFO[MusicPlayer.Bitrate]</label>
</control>
<control type="label">
<width>auto</width>
<height>32</height>
<bottom>6</bottom>
<textcolor>LineLabel</textcolor>
<font>Font-LineLabel-Kbps</font>
<aligny>center</aligny>
<align>center</align>
<label>kbps</label>
</control>
</control>

<!-- Sample Rate -->
<control type="group">
<width>64</width>
<height>64</height>
<visible>!String.IsEmpty(MusicPlayer.SampleRate)</visible>
<control type="label">
<width>auto</width>
<height>32</height>
<top>6</top>
<textcolor>LineLabel</textcolor>
<font>Font-LineLabel-Kbps</font>
<aligny>center</aligny>
<align>center</align>
<label>$INFO[MusicPlayer.SampleRate]</label>
</control>
<control type="label">
<width>auto</width>
<height>32</height>
<bottom>6</bottom>
<textcolor>LineLabel</textcolor>
<font>Font-LineLabel-Bitrate</font>
<aligny>center</aligny>
<align>center</align>
<label>kHz</label>
</control>
</control>

<!-- Audio Codec -->
<control type="image">
<width>64</width>
<height>64</height>
<aspectratio>keep</aspectratio>
<visible>!String.IsEmpty(MusicPlayer.Codec)</visible>
<texture colordiffuse="LineLabel" fallback="indicator/fallback.png">$INFO[MusicPlayer.Codec,indicator/audio/,.png]</texture>
</control>
</control>
</control>
</control>
Expand Down
10 changes: 10 additions & 0 deletions 16x9/SkinSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,16 @@
<selected>Skin.HasSetting(ShowOSDScrollingText)</selected>
<onclick>Skin.ToggleSetting(ShowOSDScrollingText)</onclick>
</control>
<control type="radiobutton" id="8323" description="Codec info with art">
<visible>ControlGroup(8000).HasFocus(8003)</visible>
<width>100%</width>
<radioposx>settingsradioposx</radioposx>
<height>72</height>
<include>Defs_OptionButton</include>
<label>$LOCALIZE[31281]</label>
<selected>Skin.HasSetting(furniture.showmusicvisflags)</selected>
<onclick>Skin.ToggleSetting(furniture.showmusicvisflags)</onclick>
</control>
<control type="radiobutton" id="8313" description="Black Screen when Controls / Info / Lyrics not shown">
<visible>ControlGroup(8000).HasFocus(8003)</visible>
<width>100%</width>
Expand Down
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<addon id="skin.eminence.2" name="Eminence" provider-name="jurialmunkey" version="4.1.18">
<addon id="skin.eminence.2" name="Eminence" provider-name="jurialmunkey" version="4.1.19">
<requires>
<import addon="xbmc.gui" version="5.15.0" />
<import addon="script.skinshortcuts" version="1.0.0" />
Expand Down
5 changes: 5 additions & 0 deletions language/resource.language.en_gb/strings.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1205,3 +1205,8 @@ msgstr ""
msgctxt "#31280"
msgid "Prefer landscape artwork over fanart"
msgstr ""

#: /16x9/SkinSettings.xml
msgctxt "#31281"
msgid "Show media flags with controls"
msgstr ""

0 comments on commit c4b26fe

Please sign in to comment.