Author: richard
Date: Tue Jan 20 02:58:08 2009
New Revision: 3894
URL: http://svn.slimdevices.com?rev=3894&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3892): richard | 2009-01-20 10:46:33 +0000
Bug: N/A
Description:
Fix slimproto connection bug.
r3...@harrypotter (orig r3893): richard | 2009-01-20 10:56:48 +0000
Bug: N/A
Description:
Allow scanning using the progress bar on now playing.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 20 02:58:08 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3856
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3879
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3893
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.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=3894&root=Jive&r1=3893&r2=3894&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Tue Jan 20 02:58:08 2009
@@ -538,9 +538,24 @@
text = Label("text", "\n\n\n")
})
end
+
+ if showProgressBar then
+ if not self.gotoTimer then
+ self.gotoTimer = Timer(400,
+ function()
+ if self.gotoElapsed then
+
self.player:gototime(self.gotoElapsed)
+ self.gotoElapsed = nil
+ end
+ end,
+ true)
+ end
- if showProgressBar then
- self[windowStyle].progressSlider = Slider(components.progressB,
0, 100, 0)
+ self[windowStyle].progressSlider = Slider(components.progressB,
0, 100, 0,
+ function(slider, value, done)
+ self.gotoElapsed = value
+ self.gotoTimer:restart()
+ end)
self[windowStyle].progressSlider:addTimer(1000, function()
self:_updatePosition() end)
self[windowStyle].progressGroup = Group(components.progress, {
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=3894&root=Jive&r1=3893&r2=3894&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Tue Jan 20 02:58:08 2009
@@ -434,7 +434,7 @@
self.writePump = function(NetworkThreadErr)
if (NetworkThreadErr) then
- return _handleDisconnect(NetworkThreadErr)
+ return _handleDisconnect(self, NetworkThreadErr)
end
self.socket.t_sock:send(table.concat(self.txqueue))
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
