Author: titmuss
Date: Sun Sep 7 04:18:45 2008
New Revision: 2910
URL: http://svn.slimdevices.com?rev=2910&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fix compile error on OSX.
Fix typecast on data from SC.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2910&root=Jive&r1=2909&r2=2910&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Sun Sep 7
04:18:45 2008
@@ -272,16 +272,10 @@
-- ignore updates from a different server if the player
-- is not connected to it
if self.slimServer ~= slimServer
- and playerInfo.connected ~= 1 then
+ and tonumber(playerInfo.connected) ~= 1 then
return
end
- if log:isDebug() then
- log:debug('Serverstatus update: ')
- log:debug('--------------------')
- debug.dump(playerInfo, 8)
- log:debug('--------------------')
- end
-- Save old player info
local oldInfo = self.info
self.info = {}
@@ -825,13 +819,6 @@
-- processes the playerstatus data and calls associated functions for
notification
function _process_status(self, event)
log:debug("Player:_process_playerstatus()")
-
- if log:isDebug() then
- log:debug('Playerstatus update: ')
- log:debug('--------------------')
- debug.dump(event.data, 8)
- log:debug('--------------------')
- end
if event.data.error then
-- ignore player status sent with an error
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=2910&root=Jive&r1=2909&r2=2910&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Sun Sep 7 04:18:45 2008
@@ -96,7 +96,7 @@
if (skip_bytes) {
size_t wrap;
- DEBUG_TRACE("Skipping %d bytes", skip_bytes);
+ DEBUG_TRACE("Skipping %ld bytes", skip_bytes);
wrap = fifo_bytes_until_rptr_wrap(&decode_fifo);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
