Author: bklaas
Date: Tue Aug 10 15:06:30 2010
New Revision: 9036
URL: http://svn.slimdevices.com/jive?rev=9036&view=rev
Log:
Description: add System capability for hasDigitalOut for Fab4.
send HasDigitalOut as a player capability in SlimProto when System has this
capability
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.6/trunk/squeezeplay/src/squeezeplay_fab4/share/applets/SqueezeboxFab4/SqueezeboxFab4Applet.lua
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=9036&r1=9035&r2=9036&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/System.lua Tue Aug 10
15:06:30 2010
@@ -49,6 +49,9 @@
return (class:getMachine() ~= "squeezeplay")
end
+-- NOTE: this table does not set default capabilities for all players, but
rather is a simple list of all of the possible capabilities used
+-- to add a capability, go to the platform-specific applet (e.g.
SqueezeboxFab4Applet) and add the capability there.
+-- if it is not set for the device, the assumption is that it does not have
that capability
local allCapabilities = {
["touch"] = 1,
["ir"] = 1,
@@ -65,6 +68,7 @@
["sdcard"] = 1,
["usb"] = 1,
["batteryCapable"] = 1,
+ ["hasDigitalOut"] = 1,
}
local _capabilities = {} -- of form string, 1 so
@@ -80,6 +84,10 @@
end
_capabilities = capabilities
+end
+
+function hasDigitalOut(self)
+ return _capabilities["hasDigitalOut"] ~= nil
end
function hasTouch(self)
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=9036&r1=9035&r2=9036&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Tue Aug
10 15:06:30 2010
@@ -33,6 +33,7 @@
local DNS = require("jive.net.DNS")
local SocketTcp = require("jive.net.SocketTcp")
+local System = require("jive.System")
local debug = require("jive.utils.debug")
local log = require("jive.utils.log").logger("net.slimproto")
@@ -343,6 +344,9 @@
obj:capability("Model", obj.heloPacket.model)
obj:capability("ModelName", obj.heloPacket.modelName)
obj:capability("Firmware", string.gsub(obj.heloPacket.version, '%s',
'-'))
+ if System:hasDigitalOut() then
+ obj:capability("HasDigitalOut", 1)
+ end
obj.statusCallback = _defaultStatusCallback
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=9036&r1=9035&r2=9036&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 Aug 10 15:06:30 2010
@@ -122,6 +122,7 @@
["wiredNetworking"] = 1,
["usb"] = 1,
["sdcard"] = 1,
+ ["hasDigitalOut"] = 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
