Author: agrundman
Date: Wed Sep 28 08:20:53 2011
New Revision: 9547
URL: http://svn.slimdevices.com/jive?rev=9547&view=rev
Log:
r79853@andy-imac (orig r9545): fmueller | 2011-09-28 09:20:10 -0400
Bug: 17587
Description: Applied patch (thanks Martin) to restore repeat icon mode on
iconbar.
Modified:
7.6/branches/usb-audio/ (props changed)
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.6/branches/usb-audio/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Sep 28 08:20:53 2011
@@ -15,7 +15,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9408
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9538
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9545
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua?rev=9547&r1=9546&r2=9547&view=diff
==============================================================================
--- 7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
(original)
+++ 7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/Iconbar.lua
Wed Sep 28 08:20:53 2011
@@ -75,10 +75,7 @@
--]]
function setRepeat(self, val)
log:debug("Iconbar:setRepeat(", val, ")")
- self.repeatMode = string.upper((val or "OFF"))
- if not self.preferPlaylistModeIcon then
- self.iconRepeat:setStyle("button_repeat_" .. self.repeatMode)
- end
+ self.iconRepeat:setStyle("button_repeat_" .. string.upper((val or
"OFF")))
end
Modified:
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=9547&r1=9546&r2=9547&view=diff
==============================================================================
---
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
(original)
+++
7.6/branches/usb-audio/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Wed Sep 28 08:20:53 2011
@@ -1153,7 +1153,8 @@
-- alarm icon in iconbar is set directly via AlarmSnoozeApplet
- iconbar:setRepeat(0)
+ -- set the repeat (nil, 0=off, 1=single track, 2=all playlist
tracks)
+ iconbar:setRepeat(self.state['playlist repeat'])
--[[ useful for layout skinning debug, set all modes to show
icons
iconbar:setPlaymode('play')
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
