Author: titmuss
Date: Tue Jan 29 08:36:07 2008
New Revision: 1673
URL: http://svn.slimdevices.com?rev=1673&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix minor errors when switching between SC/SN.
Don't send comet requests in endBatch() if we are not connected.
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
branches/7.0/jive/src/pkg/jive/share/jive/net/Comet.lua
branches/7.0/jive/src/pkg/jive/share/jive/slim/Player.lua
Modified:
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1673&root=Jive&r1=1672&r2=1673&view=diff
==============================================================================
---
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
branches/7.0/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Jan 29 08:36:07 2008
@@ -1752,8 +1752,8 @@
end
function notify_playerTrackChange(self, player, nowplaying)
-
- log:warn('SlimBrowser.notify_playerTrackChange')
+ log:debug('SlimBrowser.notify_playerTrackChange')
+
if _player ~= player then
return
end
Modified: branches/7.0/jive/src/pkg/jive/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/net/Comet.lua?rev=1673&root=Jive&r1=1672&r2=1673&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/net/Comet.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/net/Comet.lua Tue Jan 29 08:36:07
2008
@@ -479,6 +479,10 @@
self.batch = self.batch - 1
if self.batch ~= 0 then
+ return
+ end
+
+ if self.state ~= CONNECTED then
return
end
Modified: branches/7.0/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/branches/7.0/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1673&root=Jive&r1=1672&r2=1673&view=diff
==============================================================================
--- branches/7.0/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ branches/7.0/jive/src/pkg/jive/share/jive/slim/Player.lua Tue Jan 29
08:36:07 2008
@@ -637,6 +637,11 @@
function _process_status(self, event)
log:debug("Player:_process_playerstatus()")
+ if event.data.error then
+ -- ignore player status sent with an error
+ return
+ end
+
-- update our cache in one go
self.state = event.data
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
