Author: titmuss
Date: Thu Aug 21 14:45:46 2008
New Revision: 2882
URL: http://svn.slimdevices.com?rev=2882&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2867): titmuss | 2008-08-18 12:27:07 +0100
Bug: N/A
Description:
Fix audio playback on windows (configuration file update).
[EMAIL PROTECTED] (orig r2872): titmuss | 2008-08-20 16:44:10 +0100
Bug: N/A
Description:
Fix memory corruption. Spotted by rickwookie on the forums.
[EMAIL PROTECTED] (orig r2874): titmuss | 2008-08-21 12:20:01 +0100
Bug: 9020
Description:
Fix suspend/resume following audio api changes.
[EMAIL PROTECTED] (orig r2875): titmuss | 2008-08-21 15:09:29 +0100
Bug: 9020
Description:
Fix typo.
[EMAIL PROTECTED] (orig r2876): titmuss | 2008-08-21 15:10:23 +0100
Bug: 9192
Description:
Poky changes.
[EMAIL PROTECTED] (orig r2877): titmuss | 2008-08-21 15:15:42 +0100
Bug: 9020
Description:
Fix typo.
[EMAIL PROTECTED] (orig r2881): titmuss | 2008-08-21 22:43:42 +0100
[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.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/jivetest/jivetest_1.0.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
7.4/trunk/squeezeplay/src/squeezeplay/VisualC/config.h
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Aug 21 14:45:46 2008
@@ -1,8 +1,8 @@
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.3/trunk:2864
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2873
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2880
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:2881
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.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf Thu Aug
21 14:45:46 2008
@@ -30,31 +30,31 @@
# SqueezePlay application
-SRCREV_pn-squeezeplay ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-squeezeplay-jive ?= "${SQUEEZEOS_REVISION}"
+SRCREV_pn-squeezeplay ?= "${AUTOREV}"
+SRCREV_pn-squeezeplay-jive ?= "${AUTOREV}"
# SqueezePlay dependancies
-SRCREV_pn-libsdl-image ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-libsdl ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-libsdl-ttf ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-libsdl-gfx ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-freefont ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luaprofiler ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luasocket ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-lualoop ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luajson ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luafilesystem ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luazipfilter ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-lua ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-lua-native ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luasyslog ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-lualogging ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-luatolua++ ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-portaudio ?= "${SQUEEZEOS_REVISION}"
+SRCREV_pn-libsdl-image ?= "${AUTOREV}"
+SRCREV_pn-libsdl ?= "${AUTOREV}"
+SRCREV_pn-libsdl-ttf ?= "${AUTOREV}"
+SRCREV_pn-libsdl-gfx ?= "${AUTOREV}"
+SRCREV_pn-freefont ?= "${AUTOREV}"
+SRCREV_pn-luaprofiler ?= "${AUTOREV}"
+SRCREV_pn-luasocket ?= "${AUTOREV}"
+SRCREV_pn-lualoop ?= "${AUTOREV}"
+SRCREV_pn-luajson ?= "${AUTOREV}"
+SRCREV_pn-luafilesystem ?= "${AUTOREV}"
+SRCREV_pn-luazipfilter ?= "${AUTOREV}"
+SRCREV_pn-lua ?= "${AUTOREV}"
+SRCREV_pn-lua-native ?= "${AUTOREV}"
+SRCREV_pn-luasyslog ?= "${AUTOREV}"
+SRCREV_pn-lualogging ?= "${AUTOREV}"
+SRCREV_pn-luatolua++ ?= "${AUTOREV}"
+SRCREV_pn-portaudio ?= "${AUTOREV}"
# SqueezeOS
-SRCREV_pn-linux-jive ?= "${SQUEEZEOS_REVISION}"
-SRCREV_pn-jivetest ?= "${SQUEEZEOS_REVISION}"
+SRCREV_pn-linux-jive ?= "${AUTOREV}"
+SRCREV_pn-jivetest ?= "${AUTOREV}"
# jive marvell wlan driver, use binary version
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/jivetest/jivetest_1.0.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/jivetest/jivetest_1.0.bb?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
--- 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/jivetest/jivetest_1.0.bb
(original)
+++ 7.4/trunk/squeezeos/poky/meta-squeezeos/packages/jivetest/jivetest_1.0.bb
Thu Aug 21 14:45:46 2008
@@ -1,7 +1,7 @@
DESCRIPTION = "Jive test software"
-PV = "7.2+svnr${SRCREV}"
-PR = "r1"
+PV = "${DISTRO_VERSION}+svnr${SRCREV}"
+PR = "r2"
SRC_URI="${SQUEEZEOS_SVN};module=jivetest;proto=http"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay-jive_svn.bb
Thu Aug 21 14:45:46 2008
@@ -1,8 +1,8 @@
DESCRIPTION = "SqueezePlay - Jive specific code"
LICENSE = "Logitech Public Source License"
-PV = "7.2+svnr${SRCREV}"
-PR = "r5"
+PV = "${DISTRO_VERSION}+svnr${SRCREV}"
+PR = "r6"
DEPENDS += "squeezeplay"
Modified:
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Thu Aug 21 14:45:46 2008
@@ -1,8 +1,8 @@
DESCRIPTION = "SqueezePlay"
LICENSE = "Logitech Public Source License"
-PV = "7.2+svnr${SRCREV}"
-PR = "r5"
+PV = "${DISTRO_VERSION}+svnr${SRCREV}"
+PR = "r6"
DEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image"
RDEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image"
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/VisualC/config.h
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/VisualC/config.h?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/VisualC/config.h (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/VisualC/config.h Thu Aug 21 14:45:46
2008
@@ -132,3 +132,4 @@
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
+#define HAVE_LIBPORTAUDIO
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Thu Aug 21 14:45:46 2008
@@ -114,6 +114,7 @@
)
self:tieAndShowWindow(window)
+ appletManager:callService("hideConnectingToPlayer")
end
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Thu Aug 21 14:45:46 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.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserMeta.lua
Thu Aug 21 14:45:46 2008
@@ -45,6 +45,7 @@
self:registerService('goHome')
self:registerService('showTrackOne')
self:registerService('showPlaylist')
+ self:registerService('hideConnectingToPlayer')
appletManager:loadApplet("SlimBrowser")
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Thu Aug 21
14:45:46 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()
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_sample.c Thu
Aug 21 14:45:46 2008
@@ -188,7 +188,7 @@
/* Convert to signed 32 bit stereo, SDL does not support this format */
cvt.len_cvt *= 2;
- for (i=cvt.len; i>0; i--) {
+ for (i=(cvt.len_cvt/4)-1; i>=0; i--) {
((Uint32 *)cvt.buf)[i] = ((Uint16 *)cvt.buf)[i] << 16;
}
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua?rev=2882&root=Jive&r1=2881&r2=2882&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_jive/share/applets/SqueezeboxJive/SqueezeboxJiveApplet.lua
Thu Aug 21 14:45:46 2008
@@ -13,7 +13,7 @@
local Wireless = require("jive.net.Wireless")
local Applet = require("jive.Applet")
-local Audio = require("jive.ui.Audio")
+local Sample = require("squeezeplay.sample")
local Checkbox = require("jive.ui.Checkbox")
local Choice = require("jive.ui.Choice")
local Font = require("jive.ui.Font")
@@ -595,7 +595,7 @@
if self.audioVolume ~= nil then
log:info("Restore effect volume ", self.audioVolume)
- Audio:setEffectVolume(self.audioVolume)
+ Sample:setEffectVolume(self.audioVolume)
self.audioVolume = nil
end
@@ -628,7 +628,7 @@
if self.audioVolume ~= nil then
log:info("Restore effect volume ",
self.audioVolume)
- Audio:setEffectVolume(self.audioVolume)
+ Sample:setEffectVolume(self.audioVolume)
self.audioVolume = nil
end
@@ -640,7 +640,7 @@
if self.audioVolume ~= nil then
log:info("Restore effect volume ",
self.audioVolume)
- Audio:setEffectVolume(self.audioVolume)
+ Sample:setEffectVolume(self.audioVolume)
self.audioVolume = nil
end
@@ -658,9 +658,9 @@
self:_setCPUSpeed(false)
if not self.audioVolume then
- self.audioVolume = Audio:getEffectVolume()
+ self.audioVolume = Sample:getEffectVolume()
log:info("Store effect volume ",
self.audioVolume)
- Audio:setEffectVolume(0)
+ Sample:setEffectVolume(0)
end
if state == "sleep" then
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
