Skip to content

Commit

Permalink
[MusicVisualisation] code improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@beatmasterRS
beatmasterRS committed Mar 12, 2023
1 parent a9fa25b commit 95fbe16
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 53 deletions.
8 changes: 8 additions & 0 deletions 1080i/Custom_Overlay.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,14 @@
<label>Custom_AutoClose_Info_Helper.xml</label>
<visible>Window.IsVisible(Custom_AutoClose_Info_Helper.xml)</visible>
</control>
<control type="label">
<width>780</width>
<textcolor>FFFFFFFF</textcolor>
<font>Tiny</font>
<align>left</align>
<label>script-cu-lrclyrics-main.xml</label>
<visible>Window.IsVisible(script-cu-lrclyrics-main.xml)</visible>
</control>
<control type="label">
<width>780</width>
<textcolor>FFFFFFFF</textcolor>
Expand Down
97 changes: 44 additions & 53 deletions 1080i/Includes_Lyrics.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,58 @@

<include name="NormalLyrics">
<control type="group">
<include>Animation.FadeIn</include>
<include>Animation.FadeOut</include>
<control type="group">
<control type="group">
<animation effect="slide" end="350" start="0" time="250" condition="Window.IsActive(musicosd) + !Skin.HasSetting(HideMusicOSDOnLyrics)">Conditional</animation>
<animation effect="slide" end="0,-100" start="0,0" time="150" condition="$EXP[MusicSeekbarIsVisible] + Skin.HasSetting(osd.usethemeNewOSDMusic) + !Skin.HasSetting(hideseekbaronlyrics)">Conditional</animation>
<animation effect="slide" end="0,-70" start="0,0" time="150" condition="$EXP[MusicSeekbarIsVisible] + !Skin.HasSetting(osd.usethemeNewOSDMusic) + !Skin.HasSetting(hideseekbaronlyrics)">Conditional</animation>
<top>190</top>
<bottom>190</bottom>
<width>100%</width>
<visible>Player.HasMedia</visible>
<animation effect="slide" end="350" start="0" time="250" condition="Window.IsActive(musicosd) + !Skin.HasSetting(HideMusicOSDOnLyrics)">Conditional</animation>
<animation effect="slide" end="0,-100" start="0,0" time="150" condition="$EXP[MusicSeekbarIsVisible] + Skin.HasSetting(osd.usethemeNewOSDMusic) + !Skin.HasSetting(hideseekbaronlyrics)">Conditional</animation>
<animation effect="slide" end="0,-70" start="0,0" time="150" condition="$EXP[MusicSeekbarIsVisible] + !Skin.HasSetting(osd.usethemeNewOSDMusic) + !Skin.HasSetting(hideseekbaronlyrics)">Conditional</animation>
<top>190</top>
<bottom>190</bottom>
<width>100%</width>

<!-- ** Required ** Do not change <id> or <type> (Smooth scrolling list for lyrics) -->
<control type="list" id="110">
<left>350</left>
<right>350</right>
<top>0</top>
<bottom>0</bottom>
<onleft>101</onleft>
<onright>101</onright>
<onup>110</onup>
<ondown>110</ondown>
<pagecontrol>111</pagecontrol>
<scrolltime>200</scrolltime>
<itemlayout height="100" width="1220">
<control type="label">
<width>100%</width>
<align>center</align>
<selectedcolor>$VAR[ColorHighlight]</selectedcolor>
<info>ListItem.Label</info>
<textcolor>$VAR[OSDPanelWhite70]</textcolor>
<font>Lyrics</font>
</control>
</itemlayout>
<focusedlayout height="100" width="1220">
<control type="label">
<width>100%</width>
<align>center</align>
<textcolor>$VAR[ColorHighlight]</textcolor>
<selectedcolor>$VAR[ColorHighlight]</selectedcolor>
<info>ListItem.Label</info>
<font>Lyrics</font>
</control>
</focusedlayout>
<!-- ** Required ** Do not change <id> or <type> (Smooth scrolling list for lyrics) -->
<control type="list" id="110">
<animation effect="fade" start="0" end="100" delay="350" time="350" tween="cubic" easing="inout">WindowOpen</animation>
<include>Animation.FadeOut</include>
<left>350</left>
<right>350</right>
<top>0</top>
<bottom>0</bottom>
<onleft>101</onleft>
<onright>101</onright>
<onup>110</onup>
<ondown>110</ondown>
<pagecontrol>111</pagecontrol>
<scrolltime>200</scrolltime>
<itemlayout height="100" width="1220">
<control type="label">
<width>100%</width>
<align>center</align>
<selectedcolor>$VAR[ColorHighlight]</selectedcolor>
<info>ListItem.Label</info>
<textcolor>$VAR[OSDPanelWhite70]</textcolor>
<font>Lyrics</font>
</control>
<control type="label" id="200">
<description>Scraper label</description>
<visible>false</visible>
</itemlayout>
<focusedlayout height="100" width="1220">
<control type="label">
<width>100%</width>
<align>center</align>
<textcolor>$VAR[ColorHighlight]</textcolor>
<selectedcolor>$VAR[ColorHighlight]</selectedcolor>
<info>ListItem.Label</info>
<font>Lyrics</font>
</control>
</control>
</focusedlayout>
</control>
<control type="label" id="200">
<description>Scraper label</description>
<visible>false</visible>
</control>
</control>
</include>

<include name="VideoLyrics">
<control type="group">
<animation effect="slide" end="0,0" start="0,-540" time="200" tween="quadratic" easing="out">WindowOpen</animation>
<animation effect="slide" start="0,0" end="0,-540" time="200" tween="quadratic" easing="out">WindowClose</animation>
<!--control type="image">
<width>100%</width>
<height>540</height>
<texture border="1,1,1,40">topbar.png</texture>
</control-->

<!-- ** Required ** Do not change <id> or <type> (Text box for lyrics) -->
<control type="textbox" id="100">
Expand Down Expand Up @@ -149,6 +139,7 @@

<!-- ** Required ** Do not change <id> or <type> -->
<control type="group">
<visible>Player.HasMedia</visible>
<animation effect="slide" end="-25,200" start="0,0" time="0" condition="true">Conditional</animation>
<animation effect="slide" end="350" start="0" time="250" condition="Window.IsActive(musicosd) + !Skin.HasSetting(HideMusicOSDOnLyrics)">Conditional</animation>
<animation effect="slide" end="0,-100" start="0,0" time="150" condition="$EXP[MusicSeekbarIsVisible] + Skin.HasSetting(osd.usethemeNewOSDMusic) + !Skin.HasSetting(hideseekbaronlyrics)">Conditional</animation>
Expand Down

0 comments on commit 95fbe16

Please sign in to comment.