Author: bklaas
Date: Mon Aug 18 21:12:09 2008
New Revision: 2869
URL: http://svn.slimdevices.com?rev=2869&root=Jive&view=rev
Log:
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
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2869&root=Jive&r1=2868&r2=2869&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Mon Aug 18 21:12:09 2008
@@ -114,6 +114,7 @@
)
self:tieAndShowWindow(window)
+ appletManager:callService("hideConnectingToPlayer")
end
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2869&root=Jive&r1=2868&r2=2869&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Mon Aug 18 21:12:09 2008
@@ -493,16 +493,6 @@
popup:addWidget(label)
end
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
@@ -1112,7 +1102,7 @@
end
end
if _menuReceived then
- _hideConnectingToPlayer()
+ hideConnectingToPlayer()
end
end
end
@@ -2478,7 +2468,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
--[[
@@ -2511,7 +2509,7 @@
_playerMenus = {}
-- remove connecting popup
- _hideConnectingToPlayer()
+ hideConnectingToPlayer()
_hidePlayerUpdating()
_hideUserUpdatePopup()
Modified:
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua?rev=2869&root=Jive&r1=2868&r2=2869&view=diff
==============================================================================
---
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
(original)
+++
7.1/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
Mon Aug 18 21:12:09 2008
@@ -45,6 +45,7 @@
self:registerService('goHome')
self:registerService('showTrackOne')
self:registerService('showPlaylist')
+ self:registerService('hideConnectingToPlayer')
appletManager:loadApplet("SlimBrowser")
Modified: 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2869&root=Jive&r1=2868&r2=2869&view=diff
==============================================================================
--- 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.1/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Mon Aug 18
21:12:09 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
