Author: adrian
Date: Sun Apr 10 09:37:39 2011
New Revision: 9413
URL: http://svn.slimdevices.com/jive?rev=9413&view=rev
Log:
Bug: N/A
Description: enable playback of new network test traffic - this uses streaming
audio code and so more representation and lower cpu load than existing network
test. For the moment retain existing network test UI
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=9413&r1=9412&r2=9413&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua Sun Apr
10 09:37:39 2011
@@ -117,6 +117,8 @@
slimproto:capability("Spdirect", cap)
end
+ slimproto:capability("test")
+
-- signal we are Rtmp capable, but don't load module until used
slimproto:capability("Rtmp", 2)
@@ -470,6 +472,10 @@
Rtmp = require("jive.audio.Rtmp")
m.read = Rtmp.read
m.write = Rtmp.write
+ elseif self.mode == 'n' then
+ -- network test, use specific read method
+ m.read = m.readToNull
+ m.write = m._streamWrite
else
-- use standard stream methods
m.read = m._streamRead
@@ -675,6 +681,10 @@
self.slimproto:sendStatus('STMc')
self.slimproto:sendStatus('STMn')
end
+ elseif data.mode == 'n' then
+ -- network test stream - only stream, don't decode
+ log:info("network test stream")
+ self:_streamConnect(serverIp, data.serverPort)
else
-- standard stream - start the decoder and connect
decode:start(string.byte(data.mode),
_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
