Author: titmuss
Date: Wed May 14 06:41:22 2008
New Revision: 2453
URL: http://svn.slimdevices.com?rev=2453&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix segfault when program exits.
Don't allow local playback to use SN for now.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_audio.c
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua?rev=2453&root=Jive&r1=2452&r2=2453&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/TestPlayback/TestPlaybackApplet.lua
Wed May 14 06:41:22 2008
@@ -73,7 +73,9 @@
-- discovered slimservers
for _,server in self.sdApplet:allServers() do
- self:_addServerItem(server)
+ if not server:isSqueezeNetwork() then
+ self:_addServerItem(server)
+ end
end
-- Store the applet settings when the window is closed
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_audio.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_audio.c?rev=2453&root=Jive&r1=2452&r2=2453&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_audio.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_audio.c Wed May 14
06:41:22 2008
@@ -31,7 +31,9 @@
return;
}
- free(snd->data);
+ if (snd->data) {
+ free(snd->data);
+ }
free(snd);
}
@@ -145,6 +147,9 @@
#if 0
snd->data = cvt.buf;
snd->len = cvt.len_cvt;
+#else
+ snd->data = NULL;
+ snd->len = 0;
#endif
snd->mixer = mixer;
snd->enabled = true;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
