Author: richard
Date: Wed Mar 4 03:29:38 2009
New Revision: 4682
URL: http://svn.slimdevices.com/jive?rev=4682&view=rev
Log:
r4...@harrypotter (orig r4664): richard | 2009-03-03 17:46:54 +0000
Bug: N/A
Description:
Upgrade tremor, and use the low-mem branch.
r4...@harrypotter (orig r4679): richard | 2009-03-04 11:25:14 +0000
Bug: N/A
Description:
Make slimproto reconnect if the network connection is established.
Clean up some debug.
r4...@harrypotter (orig r4681): richard | 2009-03-04 11:28:18 +0000
r4...@harrypotter (orig r4665): mwise | 2009-03-03 17:51:48 +0000
Force FLAC to build the .a file as well.
r4...@harrypotter (orig r4666): mwise | 2009-03-03 17:55:24 +0000
Oops, reverted back to r2761. Didn't mean to check this file in as part of
change r4665.
r4...@harrypotter (orig r4667): mwise | 2009-03-03 18:08:57 +0000
Added basic WavPack recipe in for the SOX build later. Builds a static
library.
r4...@harrypotter (orig r4669): mwise | 2009-03-03 18:13:49 +0000
Added basic libsamplerate recipe in for the SOX build later. Builds a static
library.
r4...@harrypotter (orig r4672): mwise | 2009-03-03 21:24:19 +0000
Sox recipe. Seems to work on x86 for building a static library.
r4...@harrypotter (orig r4673): mwise | 2009-03-03 21:32:58 +0000
Add SOX to the squeezecenter-bins package.
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/libsamplerate_0.1.7.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/sox_14.2.0.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/tremor_15736.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/wavpack_4.50.1.bb
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezecenter-bins.bb
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Mar 4 03:29:38 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4656
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4658
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4673
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4681
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/branches/pango/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb?rev=4682&r1=4681&r2=4682&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/flac/flac_1.2.1.bb
Wed Mar 4 03:29:38 2009
@@ -11,7 +11,7 @@
inherit autotools
-EXTRA_OECONF = "--disable-ogg --disable-xmms-plugin"
+EXTRA_OECONF = "--disable-ogg --disable-xmms-plugin --enable-static"
do_stage() {
autotools_stage_all
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezecenter-bins.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezecenter-bins.bb?rev=4682&r1=4681&r2=4682&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezecenter-bins.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/images/squeezecenter-bins.bb
Wed Mar 4 03:29:38 2009
@@ -1,4 +1,4 @@
DESCRIPTION = "SqueezeCenter - Transcoders and other binaries"
-IMAGE_INSTALL = "faad2 alac"
+IMAGE_INSTALL = "faad2 alac sox"
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/libsamplerate_0.1.7.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/libsamplerate_0.1.7.bb?rev=4682&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/libsamplerate_0.1.7.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsamplerate/libsamplerate_0.1.7.bb
Wed Mar 4 03:29:38 2009
@@ -1,0 +1,18 @@
+DESCRIPTION = "WavPack Libraries"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR="r0"
+
+SRC_URI = "http://www.mega-nerd.com/SRC/${PN}-${PV}.tar.gz";
+
+S="${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-static"
+
+do_stage() {
+ autotools_stage_all
+}
+
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/sox_14.2.0.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/sox_14.2.0.bb?rev=4682&view=auto
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/sox_14.2.0.bb
(added)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/sox/sox_14.2.0.bb
Wed Mar 4 03:29:38 2009
@@ -1,0 +1,35 @@
+DESCRIPTION="SoX is the Swiss Army knife of sound processing tools. \
+It converts audio files among various standard audio file formats \
+and can apply different effects and filters to the audio data."
+HOMEPAGE = "http://sox.sourceforge.net";
+DEPENDS = "libogg libvorbis wavpack flac libmad libsamplerate"
+SECTION = "audio"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sox/sox-${PV}.tar.gz"
+
+CFLAGS_prepend = "-I${STAGING_INCDIR} "
+export LDFLAGS = "-L${STAGING_LIBDIR} -static"
+
+EXTRA_OECONF = "--with-flac \
+ --with-vorbis \
+ --with-ogg \
+ --with-mad \
+ --with-wavpack \
+ --with-samplerate \
+ --without-id3tag \
+ --without-lame \
+ --without-ffmpeg \
+ --without-png \
+ --without-ladspa \
+ --disable-oss \
+ --disable-alsa \
+ --disable-symlinks \
+ --disable-libao \
+ --disable-coreaudio \
+ --without-libltdl \
+ --disable-shared"
+
+inherit autotools
+
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/tremor_15736.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/tremor_15736.bb?rev=4682&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/tremor_15736.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/tremor/tremor_15736.bb
Wed Mar 4 03:29:38 2009
@@ -1,0 +1,18 @@
+SECTION = "libs"
+PRIORITY = "optional"
+DESCRIPTION = "tremor is a low memory fixed point implementation of the vorbis
codec."
+LICENSE = "BSD"
+SRCDATE = "${PV}"
+PR = "r1"
+
+SRC_URI =
"svn://svn.xiph.org/branches/lowmem-branch;module=Tremor;rev=${PV};proto=http"
+
+S = "${WORKDIR}/Tremor"
+
+inherit autotools
+
+EXTRA_OECONF=" --enable-shared --disable-rpath "
+
+do_stage() {
+ autotools_stage_all
+}
Added:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/wavpack_4.50.1.bb
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/wavpack_4.50.1.bb?rev=4682&view=auto
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/wavpack_4.50.1.bb
(added)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/wavpack/wavpack_4.50.1.bb
Wed Mar 4 03:29:38 2009
@@ -1,0 +1,18 @@
+DESCRIPTION = "WavPack Libraries"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR="r0"
+
+SRC_URI = "http://www.wavpack.com/${PN}-${PV}.tar.bz2";
+
+S="${WORKDIR}/${PN}-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-static"
+
+do_stage() {
+ autotools_stage_all
+}
+
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua?rev=4682&r1=4681&r2=4682&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
Wed Mar 4 03:29:38 2009
@@ -83,21 +83,20 @@
-- squeezecenter on the poll list
- log:debug("*****Polled Server List:")
+ log:debug("Polled Servers:")
local poll = appletManager:callService("getPollList")
for address,_ in pairs(poll) do
- log:debug('Found: ', address)
+ log:debug("\t", address)
if address ~= "255.255.255.255" then
- log:debug('Add to menu: ', address)
self:_addServerItem(nil, address)
end
end
-- discovered squeezecenters
- log:debug('*****Discovered Server List:')
+ log:debug("Discovered Servers:")
for _,server in appletManager:callService("iterateSqueezeCenters") do
- log:debug('discovered server: ', server)
+ log:debug("\t", server)
self:_addServerItem(server)
end
@@ -251,10 +250,8 @@
function notify_playerNew(self, player)
- log:warn("waitForConnect=", self.waitForConnect)
if self.waitForConnect then
- log:warn(" server=", self.waitForConnect.server)
- log:warn(" player=", self.waitForConnect.player)
+ log:info("waiting for ", player, " on ",
self.waitForConnect.server)
end
if self.waitForConnect and self.waitForConnect.player == player
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua?rev=4682&r1=4681&r2=4682&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/net/SlimProto.lua
Wed Mar 4 03:29:38 2009
@@ -84,6 +84,7 @@
-- connection state
local UNCONNECTED = "UNCONNECTED" -- not connected
local CONNECTED = "CONNECTED" -- connected
+local CONNECTING = "CONNECTING" -- connecting
local function packNumber(v, len)
@@ -332,6 +333,7 @@
-- network state
obj.jnt = jnt
+ jnt:subscribe(obj)
-- reconnect timer
obj.reconnectTimer = Timer(0, function() _handleTimer(obj) end, true)
@@ -455,6 +457,8 @@
-- Don't allow connections to production SN yet
assert(not string.match(self.serverip, "www.squeezenetwork.com"))
+ log:info("connect to ", self.serverip)
+
self.socket = SocketTcp(self.jnt, self.serverip, PORT, "SlimProto")
-- connect
@@ -483,6 +487,8 @@
if self.state ~= CONNECTED then
return
end
+
+ log:info("disconnect")
self.state = UNCONNECTED
self.socket:close()
@@ -598,6 +604,7 @@
log:info("connection error: ", reason, ", reconnecting in ", (interval
/ 1000), " seconds")
self:disconnect()
+ self.state = CONNECTING
self.reconnectTimer:restart(interval)
end
@@ -612,6 +619,15 @@
end
+function notify_networkConnected(self)
+ if self.state ~= UNCONNECTED then
+ -- force reconnect
+ self:disconnect()
+ self:connect()
+ end
+end
+
+
--[[
=head1 LICENSE
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
