media/nowplaying-bar.png @@ -208,6 +208,14 @@ <include>GeneralSkinOption</include> </control> + <control type="radiobutton" id="325"> + <description>Hide Now playing in viz description</description> + <label>$LOCALIZE[31998]</label> + <onclick>Skin.ToggleSetting(HideNowPlayingInViz)</onclick> + <selected>Skin.HasSetting(HideNowPlayingInViz)</selected> + <include>GeneralSkinOption</include> + </control> + <control type="togglebutton" id="281"> <description>Path to Lyrics Script</description> <label>$LOCALIZE[20141] $LOCALIZE[31046]</label> 720p/Custom1001_SkinSettings.xml @@ -731,7 +731,7 @@ <description>Quit Button</description> <label> $LOCALIZE[31007] </label> <onclick>Plex.Shutdown()</onclick> - <visible>!Skin.HasSetting(ShowSleep) & !Skin.HasSettings(ShowShutDown)</visible> + <visible>!Skin.HasSetting(ShowSleep) & !Skin.HasSetting(ShowShutDown)</visible> </item> <item id="2"> 720p/Home.xml @@ -409,5 +409,271 @@ </control> </control> + <!-- START OF JAMES NOW PLAYING --> + + <control type="group"> + <visible>!Player.ShowInfo + !Window.IsActive(120) + !Window.IsActive(PlayerControls) + !Window.IsVisible(script-XBMC_Lyrics-main.xml) + !Skin.HasSetting(HideNowPlayingInViz)</visible> + + <control type="image" id="0"> + <posx>0</posx> + <posy>150</posy> + <width>1280</width> + <height>450</height> + <texture>nowplaying-bar.png</texture> + </control> + + <!-- Normal view --> + <control type="group"> + <visible>!MusicPlayer.NowPlayingFlipped</visible> + <animation effect="rotatey" center="640" start="0" end="-90" time="500" reversible="false">Hidden</animation> + <animation effect="rotatey" center="640" start="-90" end="0" time="500" delay="500" reversible="false">Visible</animation> + + <!-- Second cover --> + <control type="group"> + <visible>MusicPlayer.HasNext</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <control type="group"> + <posx>813</posx> + <posy>244</posy> + <visible>MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" start="-80,0" time="1000" tween="cubic" easing="inout">Visible</animation> + <animation effect="slide" end="-80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <include>NowPlayingNextCover</include> + </control> + </control> + + <!-- Double cover view --> + <control type="group"> + <visible>MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + <control type="group"> + <description>Album covers</description> + <posx>587</posx> + <posy>204</posy> + <include>NowPlayingCurrentCover</include> + </control> + + <control type="group"> + <description>Info</description> + <posx>60</posx> + <posy>220</posy> + <control type="group"> + <visible>Player.HasMusicPlaylist</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <include>NowPlayingCurrentInfo</include> + </control> + + <control type="progress" id="20"> + <description>Progress control</description> + <posx>129</posx> + <posy>162</posy> + <aligny>center</aligny> + <width>372</width> + <info>Player.Progress</info> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist</visible> + </control> + + <control type="group"> + <posy>219</posy> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist + MusicPlayer.HasNext</visible> + <include>NowPlayingNextInfo</include> + </control> + </control> + </control> + + <!-- Single cover view --> + <control type="group"> + <posx>80</posx> + <visible>!MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="-80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + + <control type="group"> + <description>Album covers</description> + <posx>587</posx> + <posy>204</posy> + <include>NowPlayingCurrentCover</include> + </control> + + <control type="group"> + <description>Info</description> + <posx>60</posx> + <posy>220</posy> + <control type="group"> + <visible>Player.HasMusicPlaylist</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <include>NowPlayingCurrentInfo</include> + </control> + + <control type="progress" id="21"> + <description>Progress control</description> + <posx>129</posx> + <posy>162</posy> + <aligny>center</aligny> + <width>372</width> + <info>Player.Progress</info> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist</visible> + </control> + + <control type="group"> + <posy>219</posy> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist + MusicPlayer.HasNext</visible> + <include>NowPlayingNextInfo</include> + </control> + </control> + </control> + </control> <!-- End of normal view --> + + <!-- Flipped view --> + <control type="group"> + <visible>MusicPlayer.NowPlayingFlipped</visible> + <animation effect="rotatey" center="640" start="0" end="90" time="500" reversible="false">Hidden</animation> + <animation effect="rotatey" center="640" start="90" end="0" time="500" delay="500" reversible="false">Visible</animation> + + <!-- Second cover (flipped) --> + <control type="group"> + <visible>MusicPlayer.HasNext</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <control type="group"> + <posx>429</posx> + <posy>244</posy> + <visible>MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" start="-80,0" time="1000" tween="cubic" easing="inout">Visible</animation> + <animation effect="slide" end="-80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <include>NowPlayingNextCover</include> + </control> + </control> + + <!-- Double cover view (flipped) --> + <control type="group"> + <control type="group"> + <visible>MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + <description>Album covers</description> + <posx>203</posx> + <posy>204</posy> + <include>NowPlayingCurrentCover</include> + </control> + + <control type="group"> + <visible>MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="-80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + <description>Info</description> + <posx>720</posx> + <posy>220</posy> + <control type="group"> + <visible>Player.HasMusicPlaylist</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <include>NowPlayingCurrentInfoFlipped</include> + </control> + + <control type="progress" id="22"> + <description>Progress control</description> + <posx>0</posx> + <posy>162</posy> + <aligny>center</aligny> + <width>372</width> + <info>Player.Progress</info> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist</visible> + </control> + + <control type="group"> + <posy>219</posy> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist + MusicPlayer.HasNext</visible> + <include>NowPlayingNextInfoFlipped</include> + </control> + </control> + </control> + + + <!-- Single cover view (flipped) --> + <control type="group"> + + <posx>80</posx> + + <control type="group"> + <visible>!MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="-80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + <description>Album covers</description> + <posx>203</posx> + <posy>204</posy> + <include>NowPlayingCurrentCover</include> + </control> + + <control type="group"> + <visible>!MusicPlayer.HasNewCoverNext</visible> + <animation effect="slide" end="80,0" time="1000" tween="cubic" easing="inout">Hidden</animation> + <animation effect="fade" start="0" end="100" delay="1000" time="0">Visible</animation> + + <description>Info</description> + <posx>560</posx> + <posy>220</posy> + <control type="group"> + <visible>Player.HasMusicPlaylist</visible> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <include>NowPlayingCurrentInfoFlipped</include> + </control> + + <control type="progress" id="23"> + <description>Progress control</description> + <posx>0</posx> + <posy>162</posy> + <aligny>center</aligny> + <width>372</width> + <info>Player.Progress</info> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist</visible> + </control> + + <control type="group"> + <posy>219</posy> + <animation effect="fade" start="0" end="100" time="1000">Visible</animation> + <animation effect="fade" start="100" end="0" time="1000">Hidden</animation> + <visible>Player.HasMusicPlaylist + MusicPlayer.HasNext</visible> + <include>NowPlayingNextInfoFlipped</include> + </control> + </control> + </control> + + </control> <!-- End of flip view --> + + <control type="group"> + <visible>Player.Paused</visible> + <animation effect="fade" end="100" time="1000">Visible</animation> + <animation effect="fade" end="0" time="500">Hidden</animation> + <control type="image"> + <animation effect="fade" start="30" end="80" time="2000" condition="Player.Paused" pulse="true">Conditional</animation> + <texture>OSDPauseNF.png</texture> + <width>48</width> + <height>48</height> + <posx>616</posx> + <posy>603</posy> + </control> + </control> + </control> + </controls> </window> 720p/MusicVisualisation.xml @@ -220,4 +220,8 @@ <string id="31961">Shut Down</string> <string id="31962">Power Menu</string> <string id="31963">displays</string> + + <string id="31998">Hide Now Playing in Visualizer</string> + <string id="31999">End Time</string> + </strings> \ No newline at end of file language/English/strings.xml f1a4dc00c96bcf9b7bde1f067c2667757528258b Elan Feingold elan@bluemandrill.com http://github.com/elan/plex-mediastream/commit/3e6c10ad02975cf7d1ca15f370c667556cbe0736 3e6c10ad02975cf7d1ca15f370c667556cbe0736 2009-07-23T19:53:28-07:00 2009-07-23T19:53:28-07:00 Support for overlaying Now Playing on top of visualization, thanks to Scott 0b2b12bdf3aeb45851f46cd46aefe5dbcee24099 Elan Feingold elan@bluemandrill.com