Author: bklaas
Date: Tue Sep 21 06:43:47 2010
New Revision: 9125
URL: http://svn.slimdevices.com/jive?rev=9125&view=rev
Log:
Fixed Bug: 16552
Description: add hasTinySC to capabilities list in System.lua
add System object method hasTinySC()
do not push diags window in situations where networkError is true but player
has tinySC and it is running
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9125&r1=9124&r2=9125&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Tue Sep 21 06:43:47 2010
@@ -28,6 +28,7 @@
local json = require("json")
local Applet = require("jive.Applet")
+local System = require("jive.System")
local Player = require("jive.slim.Player")
local SlimServer = require("jive.slim.SlimServer")
local Framework = require("jive.ui.Framework")
@@ -786,7 +787,8 @@
-- debug.dump(request)
-- there's an existing network or server error, so trap this request
and push to a diags troubleshooting window
- if _networkError then
+ -- Bug 15662: don't push a diags window when tinySC is available on the
system and running
+ if _networkError and not ( System:hasTinySC() and
appletManager:callService("isBuiltInSCRunning") ) then
log:warn('_networkError is not false, therefore push on an
error window for diags')
local currentStep = _getCurrentStep()
_diagWindow =
appletManager:callService("networkTroubleshootingMenu", _networkError)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua?rev=9125&r1=9124&r2=9125&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
Tue Sep 21 06:43:47 2010
@@ -718,7 +718,8 @@
local currentPlayer =
appletManager:callService("getCurrentPlayer")
-- if we know there is a network error
condition, push on a diags window immediately
- if self.networkError then
+ -- Bug 16552: don't push to diags
window if player has tinySC and tinySC is running
+ if self.networkError and not (
System:hasTinySC() and appletManager:callService("isBuiltInSCRunning") ) then
log:warn('Network reported as
not OK')
self.diagWindow =
appletManager:callService("networkTroubleshootingMenu", self.networkError)
-- make sure we got a window
generated to confirm we can leave this method
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua?rev=9125&r1=9124&r2=9125&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua Tue Sep 21
06:43:47 2010
@@ -69,6 +69,7 @@
["usb"] = 1,
["batteryCapable"] = 1,
["hasDigitalOut"] = 1,
+ ["hasTinySC"] = 1,
}
local _capabilities = {} -- of form string, 1 so
@@ -84,6 +85,10 @@
end
_capabilities = capabilities
+end
+
+function hasTinySC(self)
+ return _capabilities["hasTinySC"] ~= nil
end
function hasDigitalOut(self)
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua?rev=9125&r1=9124&r2=9125&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
Tue Sep 21 06:43:47 2010
@@ -123,6 +123,7 @@
["usb"] = 1,
["sdcard"] = 1,
["hasDigitalOut"] = 1,
+ ["hasTinySC"] = 1,
})
--account for fab4 touchpad hardware issue: the bottom pixels aren't
reported correctly
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
