Author: titmuss
Date: Tue Jan 29 09:57:26 2008
New Revision: 1675
URL: http://svn.slimdevices.com?rev=1675&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1673): titmuss | 2008-01-29 16:36:07 +0000
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:
trunk/ (props changed)
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
trunk/jive/src/pkg/jive/share/jive/net/Comet.lua
trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan 29 09:57:26 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1668
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1673
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=1675&root=Jive&r1=1674&r2=1675&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++ trunk/jive/src/pkg/jive/share/applets/SlimBrowser/SlimBrowserApplet.lua Tue
Jan 29 09:57:26 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: trunk/jive/src/pkg/jive/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/net/Comet.lua?rev=1675&root=Jive&r1=1674&r2=1675&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/net/Comet.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/net/Comet.lua Tue Jan 29 09:57:26 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: trunk/jive/src/pkg/jive/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/trunk/jive/src/pkg/jive/share/jive/slim/Player.lua?rev=1675&root=Jive&r1=1674&r2=1675&view=diff
==============================================================================
--- trunk/jive/src/pkg/jive/share/jive/slim/Player.lua (original)
+++ trunk/jive/src/pkg/jive/share/jive/slim/Player.lua Tue Jan 29 09:57:26 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
