Author: richard
Date: Fri Feb 6 03:37:19 2009
New Revision: 4058
URL: http://svn.slimdevices.com?rev=4058&root=Jive&view=rev
Log:
Bug: N/A
Description:
Report firmware version to SC.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=4058&root=Jive&r1=4057&r2=4058&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua Fri Feb
6 03:37:19 2009
@@ -124,7 +124,6 @@
local opcodes = {
HELO = function(self, data)
- assert(data.revision)
assert(data.mac)
assert(data.uuid)
@@ -146,7 +145,7 @@
return {
packNumber(data.deviceID or DEVICEID, 1),
- packNumber(data.revision, 1),
+ packNumber(0, 1),
table.concat(macp),
table.concat(uuidp),
packNumber(wlanList, 2),
@@ -305,7 +304,7 @@
-- address. The heloPacket is sent on server (re)connection.
function __init(self, jnt, heloPacket)
-- validate the heloPacket
- assert(heloPacket.revision)
+ assert(heloPacket.version)
assert(heloPacket.mac)
assert(heloPacket.uuid)
assert(heloPacket.model)
@@ -324,6 +323,7 @@
obj:capability("Model", obj.heloPacket.model)
obj:capability("ModelName", obj.heloPacket.modelName)
+ obj:capability("Firmware", string.gsub(obj.heloPacket.version, '%s',
'-'))
obj.statusCallback = _defaultStatusCallback
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua?rev=4058&root=Jive&r1=4057&r2=4058&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/LocalPlayer.lua Fri
Feb 6 03:37:19 2009
@@ -17,6 +17,7 @@
local debug = require("jive.utils.debug")
local log = require("jive.utils.log").logger("player")
+local JIVE_VERSION = jive.JIVE_VERSION
-- can be overridden by hardware specific classes
local DEVICE_MODEL = "squeezeplay"
@@ -51,7 +52,7 @@
obj.slimproto = SlimProto(jnt, {
opcode = "HELO",
deviceID = deviceid,
- revision = 0,
+ version = JIVE_VERSION,
mac = obj.id,
uuid = uuid,
model = DEVICE_MODEL,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
