Author: titmuss
Date: Fri Nov 14 09:09:30 2008
New Revision: 3374
URL: http://svn.slimdevices.com?rev=3374&root=Jive&view=rev
Log:
Bug: N/A
Description:
Don't crash when the audio is not available.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/fifo.c
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=3374&root=Jive&r1=3373&r2=3374&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua Fri Nov
14 09:09:30 2008
@@ -6,7 +6,7 @@
local string = require("string")
-local Decode = require("squeezeplay.decode")
+local hasDecode, Decode = pcall(require, "squeezeplay.decode")
local Stream = require("squeezeplay.stream")
local SlimProto = require("jive.net.SlimProto")
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/fifo.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/fifo.c?rev=3374&root=Jive&r1=3373&r2=3374&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/fifo.c (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/fifo.c Fri Nov 14 09:09:30
2008
@@ -35,8 +35,6 @@
}
void fifo_free(struct fifo *fifo) {
- ASSERT_LOCKED();
-
SDL_DestroyCond(fifo->cond);
SDL_DestroyMutex(fifo->mutex);
fifo->rptr = 0;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
