Author: titmuss
Date: Thu Aug 21 14:43:42 2008
New Revision: 2881
URL: http://svn.slimdevices.com?rev=2881&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2880): titmuss | 2008-08-21 22:42:42 +0100
[EMAIL PROTECTED] (orig r2859): titmuss | 2008-08-18 10:09:28 +0100
Bug: 8984
Description:
Don't send hostname in dhcp request, it looks like this may break with
Microsoft MN-700 routers.
[EMAIL PROTECTED] (orig r2869): bklaas | 2008-08-19 05:12:09 +0100
Bug: 9177
Description: change tonumber(device_id) in Player class to base 16,
tonumber(device_id, 16)
Make hideConnectingToPlayer() a non-local function and register it for
outside calls
ChooseMusicSource now calls hideConnectingToPlayer() when Choose Music Source
menu is loaded
[EMAIL PROTECTED] (orig r2873): bklaas | 2008-08-20 20:31:58 +0100
Bug: 8169
Description: Allow single item SlimBrowse return data to render a TextArea
and not a menu if textArea parameter is sent with item.
Modified:
7.3/trunk/ (props changed)
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.3/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Aug 21 14:43:42 2008
@@ -1,7 +1,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2847
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2855
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2873
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2880
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
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2881&root=Jive&r1=2880&r2=2881&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Thu Aug 21 14:43:42 2008
@@ -114,6 +114,7 @@
)
self:tieAndShowWindow(window)
+ appletManager:callService("hideConnectingToPlayer")
end
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2881&root=Jive&r1=2880&r2=2881&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Thu Aug 21 14:43:42 2008
@@ -495,16 +495,6 @@
popup:show()
end
--- _hideConnectingToPlayer
--- hide the full screen popup that appears until menus are loaded
-local function _hideConnectingToPlayer()
- if _connectingPopup then
- log:info("_connectingToPlayer popup hide")
- _connectingPopup:hide()
- _connectingPopup = nil
- end
-end
-
-- _hideUserUpdatePopup
-- hide the full screen popup that appears until player is updated
local function _hideUserUpdatePopup()
@@ -649,6 +639,22 @@
_updatingPlayerPopup = popup
end
+
+-- _renderTextArea
+-- special case when single SlimBrowse item is a textarea
+local function _renderTextArea(step, item)
+
+ if not step and step.window then
+ return
+ end
+ _assert(item)
+ _assert(item.textArea)
+
+ local textArea = Textarea("textarea", item.textArea)
+ step.window:addWidget(textArea)
+
+end
+
-- _renderSlider
-- special case when SlimBrowse item is configured for a slider widget
@@ -898,12 +904,18 @@
end
local textArea = Textarea("textarea",
data.window.textArea)
step.window:addWidget(textArea)
- elseif step.menu and data and data.count and data.count == 1
and data.item_loop and data.item_loop[1].slider then
+ elseif step.menu and data and data.count and data.count == 1
and data.item_loop and (data.item_loop[1].slider or data.item_loop[1].textArea)
then
-- no menus here, thankyouverymuch
if step.menu then
step.window:removeWidget(step.menu)
end
- _renderSlider(step, data.item_loop[1])
+
+ if data.item_loop[1].slider then
+ _renderSlider(step, data.item_loop[1])
+ else
+ _renderTextArea(step, data.item_loop[1])
+ end
+
-- avoid infinite request loop on count == 0
elseif step.menu and data and data.count and data.count == 0
then
-- this will render a blank menu, which is typically
undesirable
@@ -1112,7 +1124,7 @@
end
end
if _menuReceived then
- _hideConnectingToPlayer()
+ hideConnectingToPlayer()
end
end
end
@@ -2483,7 +2495,15 @@
window:show()
end
-
+-- hideConnectingToPlayer
+-- hide the full screen popup that appears until menus are loaded
+function hideConnectingToPlayer()
+ if _connectingPopup then
+ log:info("_connectingToPlayer popup hide")
+ _connectingPopup:hide()
+ _connectingPopup = nil
+ end
+end
--[[
@@ -2516,7 +2536,7 @@
_playerMenus = {}
-- remove connecting popup
- _hideConnectingToPlayer()
+ hideConnectingToPlayer()
_hidePlayerUpdating()
_hideUserUpdatePopup()
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua?rev=2881&root=Jive&r1=2880&r2=2881&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
Thu Aug 21 14:43:42 2008
@@ -45,6 +45,7 @@
self:registerService('goHome')
self:registerService('showTrackOne')
self:registerService('showPlaylist')
+ self:registerService('hideConnectingToPlayer')
appletManager:loadApplet("SlimBrowser")
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2881&root=Jive&r1=2880&r2=2881&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Thu Aug 21
14:43:42 2008
@@ -366,7 +366,7 @@
else
self.info.name = tostring(udap.ucp.name)
end
- self.info.model = DEVICE_IDS[tonumber(udap.ucp.device_id)]
+ self.info.model = DEVICE_IDS[tonumber(udap.ucp.device_id, 16)]
self.info.connected = false
self.lastSeen = Framework:getTicks()
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
