Author: bklaas
Date: Wed Oct 29 10:55:36 2008
New Revision: 3228
URL: http://svn.slimdevices.com?rev=3228&root=Jive&view=rev
Log:
Bug: 8878
Description: changes for playlist mode iconbar support to coincide with SC 7.3
change 23734
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3228&root=Jive&r1=3227&r2=3228&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Wed Oct 29 10:55:36 2008
@@ -295,11 +295,11 @@
-- repeat off/repeat track/repeat playlist
s.iconPlaylistModeOFF = _icon(41, screenHeight - 30,
"icon_repeat_off.png")
- s.iconPlaylistMode0 = _icon(41, screenHeight - 30,
"icon_repeat_off.png")
+ s.iconPlaylistModeDISABLED = _icon(41, screenHeight - 30,
"icon_repeat_off.png")
-- FIXME, needs official artwork
- s.iconPlaylistMode1 = _icon(41, screenHeight - 30,
"icon_playlistMode_on.png")
- s.iconPlaylistMode2 = _icon(41, screenHeight - 30, "icon_repeat.png")
+ s.iconPlaylistModeON = _icon(41, screenHeight - 30,
"icon_playlistMode_on.png")
+ s.iconPlaylistModePARTY = _icon(41, screenHeight - 30,
"icon_repeat_off.png")
-- shuffle off/shuffle album/shuffle playlist
s.iconShuffleOFF = _icon(75, screenHeight - 30, "icon_shuffle_off.png")
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua?rev=3228&root=Jive&r1=3227&r2=3228&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua Wed Oct 29
10:55:36 2008
@@ -67,7 +67,7 @@
=cut
--]]
function setPlaylistMode(self, val)
- log:debug("Iconbar:setPlaylistMode(", val, ")")
+ log:debug("Iconbar:setPlaylistMode(", string.upper(val), ")")
-- FIXME: need new styles for playlist and party mode
self.iconPlaylistMode:setStyle("iconPlaylistMode" .. string.upper((val
or "OFF")))
end
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3228&root=Jive&r1=3227&r2=3228&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Oct 29
10:55:36 2008
@@ -825,13 +825,14 @@
iconbar:setShuffle(self.state["playlist shuffle"])
-- set the playlist mode (nil, 0=off, 1=playlist, 2=party)
- if self.state['playlist mode'] and self.state['playlist mode']
> 0 then
+ if self.state['playlist mode'] and
+ ( self.state['playlist mode'] == 'disabled' or
self.state['playlist mode'] == 'off' )
+ then
+ iconbar:setPlaylistMode('off')
+ iconbar:setRepeat(self.state["playlist repeat"])
+ else
iconbar:setRepeat(0)
iconbar:setPlaylistMode(self.state["playlist mode"])
- else
- -- set the repeat (nil, 0=off, 1=track, 2=playlist)
- iconbar:setPlaylistMode(0)
- iconbar:setRepeat(self.state["playlist repeat"])
end
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
