Author: bklaas
Date: Fri Mar 28 09:37:48 2008
New Revision: 2155
URL: http://svn.slimdevices.com?rev=2155&root=Jive&view=rev
Log:
Bug: 7642, 7651
Description: request png for placeholder music/radio artwork
clean up logic in SlimBrowser
make showBriefly request png for placeholder artwork
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2155&root=Jive&r1=2154&r2=2155&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Fri Mar 28 09:37:48 2008
@@ -153,8 +153,8 @@
end
end
elseif item and item["params"] and item["params"]["track_id"] then
- -- this is for the radio image-- remote URLs with no icon (Bug
6087)
- server:fetchArtworkThumb(item["params"]["track_id"], icon,
ARTWORK_SIZE)
+ -- this is for placeholder artwork, either for local tracks or
radio streams with no art
+ server:fetchArtworkThumb(item["params"]["track_id"], icon,
ARTWORK_SIZE, 'png')
elseif icon then
icon:setValue(nil)
end
Modified:
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2155&root=Jive&r1=2154&r2=2155&view=diff
==============================================================================
---
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Fri Mar 28 09:37:48 2008
@@ -258,15 +258,8 @@
-- Don't load artwork while accelerated
_server:cancelArtwork(icon)
else
- -- XXXX this should not be needed, all SC server content
- -- should use icon-id?
- local remoteContent = string.find(item['icon'],
'http://')
- if remoteContent then
- -- Fetch a remote image URL, sized to
THUMB_SIZExTHUMB_SIZE (artwork from a streamed source)
- _server:fetchArtworkURL(item["icon"], icon,
THUMB_SIZE)
- else
- _server:fetchArtworkThumb(item["icon"], icon,
THUMB_SIZE)
- end
+ -- Fetch a remote image URL, sized to
THUMB_SIZExTHUMB_SIZE (artwork from a streamed source)
+ _server:fetchArtworkURL(item["icon"], icon, THUMB_SIZE)
end
elseif item["trackType"] == 'radio' and item["params"] and
item["params"]["track_id"] then
if menuAccel and not
_server:artworkThumbCached(item["params"]["track_id"], THUMB_SIZE) then
@@ -274,7 +267,6 @@
_server:cancelArtwork(icon)
else
-- workaround: this needs to be png not jpg to allow
for transparencies
- -- XXXX is this workaround needed now?
_server:fetchArtworkThumb(item["params"]["track_id"],
icon, THUMB_SIZE, 'png')
end
else
Modified: trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2155&root=Jive&r1=2154&r2=2155&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Fri Mar 28
09:37:48 2008
@@ -29,7 +29,6 @@
=cut
--]]
-local debug = require("jive.utils.debug")
-- stuff we need
local _assert, assert, setmetatable, tonumber, tostring, pairs, type =
_assert, assert, setmetatable, tonumber, tostring, pairs, type
@@ -781,7 +780,7 @@
if display['icon'] then
self.slimServer:fetchArtworkURL(display['icon'], s.artIcon, 56)
else
-
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon, 56)
+
self.slimServer:fetchArtworkThumb(display["icon-id"], s.artIcon, 56, 'png')
end
else
s.text:setValue(table.concat(display["text"], "\n"))
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
