Author: titmuss
Date: Wed May 21 03:31:01 2008
New Revision: 2500
URL: http://svn.slimdevices.com?rev=2500&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix stream looping, this was wrongly enabled causing radio streams to crash.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=2500&root=Jive&r1=2499&r2=2500&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua Wed May
21 03:31:01 2008
@@ -361,12 +361,13 @@
function _cont(self, data)
log:info("cont loop=", data.loop)
- if data.loop then
+ if data.loop == 1 then
+ log:warn("LOOP")
self.stream:markLoop()
end
-- icy metainterval
- if data.icyMetaInterval then
+ if data.icyMetaInterval > 0 then
self.stream:icyMetaInterval(data.icyMetaInterval)
end
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c?rev=2500&root=Jive&r1=2499&r2=2500&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/streambuf.c Wed May 21
03:31:01 2008
@@ -305,8 +305,8 @@
assert(r == icy_len);
// XXXX queue metadata
+ assert( strstr( (char *)icy_buf, "StreamTitle" ) !=
NULL );
DEBUG_TRACE("got icy metadata: %s", icy_buf);
- assert( strstr( (char *)icy_buf, "StreamTitle" ) !=
NULL );
free(icy_buf);
icy_meta_remaining = icy_meta_interval;
@@ -400,6 +400,7 @@
luaL_getmetatable(L, "squeezeplay.stream");
lua_setmetatable(L, -2);
+ streambuf_clear_loop();
streambuf_bytes_received = 0;
streambuf_filter = NULL;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
