Author: bklaas
Date: Thu Mar 17 12:32:20 2011
New Revision: 9379
URL: http://svn.slimdevices.com/jive?rev=9379&view=rev
Log:
r49741@DaddyMac (orig r9370): adrian | 2011-03-16 15:53:20 -0500
Bug: N/A
Description: load rtmp.so within pcall so if it fails we can continue to play
other streams
r49742@DaddyMac (orig r9371): bklaas | 2011-03-16 21:26:36 -0500
Move notify_firmwareAvailable() from meta to applet file, because is wasn't
firing from the meta file
Should be harmless, but I will test this a little further in the coming 24h
r49764@DaddyMac (orig r9378): bklaas | 2011-03-17 14:32:08 -0500
r49747@DaddyMac (orig r9376): bklaas | 2011-03-17 14:30:02 -0500
r49609@DaddyMac (orig r9347): bklaas | 2011-03-08 10:48:41 -0500
Remake branch with correct path
r49610@DaddyMac (orig r9348): bklaas | 2011-03-08 11:11:43 -0500
Bug: 17009
Description: never drill into a _getCurrentStep() object before knowing if
_getCurrentStep() exists
r49695@DaddyMac (orig r9358): bklaas | 2011-03-13 15:04:53 -0500
Trivial checkin to trigger build
r49698@DaddyMac (orig r9361): bklaas | 2011-03-14 11:50:55 -0500
Trivial change to trigger build
r49699@DaddyMac (orig r9362): bklaas | 2011-03-14 11:59:55 -0500
Please build, parabuild. PLEASE
r49745@DaddyMac (orig r9374): blblack | 2011-03-17 10:55:57 -0500
backport of Alan's 7.6/trunk r9209 fix to 7.5.3
r49746@DaddyMac (orig r9375): blblack | 2011-03-17 10:57:20 -0500
execute _handleAdvice() on any error response that includes advice
Modified:
7.6/branches/new-setup/ (props changed)
7.6/branches/new-setup/squeezeplay/ (props changed)
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/Demo/DemoApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/audio/Rtmp.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Propchange: 7.6/branches/new-setup/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Mar 17 12:32:20 2011
@@ -14,8 +14,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/private-branches/7.5.3-rc:9282
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9302
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9365
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:9376
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.6/trunk:9378
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Propchange: 7.6/branches/new-setup/squeezeplay/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Mar 17 12:32:20 2011
@@ -4,6 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk/squeezeplay:2761
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk/squeezeplay:7681
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/branches/7.5.1-controller-fix/squeezeplay:8883
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/branches/7.5.3bugfix/squeezeplay:9375
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0/jive:1017
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/cometd-refactor:592
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/mainMenuRework:1168
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/Demo/DemoApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/Demo/DemoApplet.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/Demo/DemoApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/Demo/DemoApplet.lua
Thu Mar 17 12:32:20 2011
@@ -1,4 +1,3 @@
-
-- stuff we use
local ipairs, pairs, setmetatable, tostring, tonumber = ipairs, pairs,
setmetatable, tostring, tonumber
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Thu Mar 17 12:32:20 2011
@@ -2126,7 +2126,7 @@
-- these may work without an item
-- Note the assumption here: event handling happens for front window
only
- if _getCurrentStep().actionModifier then
+ if _getCurrentStep() and _getCurrentStep().actionModifier then
local builtInAction = actionName ..
_getCurrentStep().actionModifier
local func = _defaultActions[builtInAction]
@@ -2264,7 +2264,7 @@
-- we don't care about events not on the current window
-- assumption for event handling code: _curStep corresponds to current
window!
- if _getCurrentStep().menu != menu then
+ if _getCurrentStep() and _getCurrentStep().menu != menu then
log:debug("_getCurrentStep(): ", _getCurrentStep())
log:error("Ignoring, not visible, or step/windowStack out of
sync: current step menu: ", _getCurrentStep().menu, " window menu: ", menu)
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/audio/Rtmp.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/audio/Rtmp.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/audio/Rtmp.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/audio/Rtmp.lua
Thu Mar 17 12:32:20 2011
@@ -26,7 +26,7 @@
local Stream = require("squeezeplay.stream")
local mime = require("mime")
-local rtmpC = require("rtmp")
+local hasC, rtmpC = pcall(require, "rtmp")
local debug = require("jive.utils.debug")
local log = require("jive.utils.log").logger("audio.decode")
@@ -36,7 +36,9 @@
local FLASH_VER = "LNX 10,0,22,87"
-- C read method
-read = rtmpC.read
+if hasC then
+ read = rtmpC.read
+end
-- session params (can't be stored in the object as we reuse the streambuf
object)
rtmpMessages = {} -- not local so it can be accessed from C
@@ -47,6 +49,11 @@
-- initialise
rtmpMessages = {}
slimproto = playback.slimproto
+
+ if not hasC then
+ log:warn("no rtmp binary module loaded - stream not supported")
+ return
+ end
-- extract the pre built rtmp packets or params within the header
for k, v in string.gmatch(header, "(%w+)=([a-zA-Z0-9%/%+]+%=*)&") do
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
--- 7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
(original)
+++ 7.6/branches/new-setup/squeezeplay/src/squeezeplay/share/jive/net/Comet.lua
Thu Mar 17 12:32:20 2011
@@ -894,17 +894,20 @@
end
end
- -- Log response
- if event.error then
- log:warn(self, ": _response, ", event.channel, " id=",
event.id, " failed: ", event.error)
- else
- log:debug(self, ": _response, ", event.channel, " id=",
event.id, " OK")
- end
-
-- Update advice if any
if event.advice then
self.advice = event.advice
log:debug(self, ": _response, advice updated from
server")
+ end
+
+ -- Log response
+ if event.error then
+ log:warn(self, ": _response, ", event.channel, " id=",
event.id, " failed: ", event.error)
+ if event.advice then
+ return _handleAdvice(self)
+ end
+ else
+ log:debug(self, ": _response, ", event.channel, " id=",
event.id, " OK")
end
-- Handle response
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Thu Mar 17 12:32:20 2011
@@ -63,6 +63,28 @@
oo.class(_M, Applet)
+function init(self)
+ jnt:subscribe(self)
+
+end
+
+
+function notify_firmwareAvailable(self, server)
+ local url, force = server:getUpgradeUrl()
+
+ if force and not url then
+ log:warn("sometimes force is true but url is nil, seems like a
server bug: server:", server)
+ end
+ if force and url then
+ local player = appletManager:callService("getCurrentPlayer")
+
+ if player and player:getSlimServer() == server then
+ self:firmwareUpgrade(server)
+ end
+ end
+end
+
+
function _firmwareVersion(self, url)
local machine = System:getMachine()
Modified:
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=9379&r1=9378&r2=9379&view=diff
==============================================================================
---
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.6/branches/new-setup/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Thu Mar 17 12:32:20 2011
@@ -66,23 +66,6 @@
end
-function notify_firmwareAvailable(meta, server)
- local url, force = server:getUpgradeUrl()
-
-
- if force and not url then
- log:warn("sometimes force is true but url is nil, seems like a
server bug: server:", server)
- end
- if force and url then
- local player = appletManager:callService("getCurrentPlayer")
-
- if player and player:getSlimServer() == server then
- appletManager:callService("firmwareUpgrade",
player:getSlimServer())
- end
- end
-end
-
-
--[[
=head1 LICENSE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
