Author: bklaas
Date: Fri Mar 28 14:16:46 2008
New Revision: 2158

URL: http://svn.slimdevices.com?rev=2158&root=Jive&view=rev
Log:
Bug: 7456
Description: use current_title when available for remote track metadata to 
identify whatsPlaying

Modified:
    trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua

Modified: trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL: 
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2158&root=Jive&r1=2157&r2=2158&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Fri Mar 28 
14:16:46 2008
@@ -161,16 +161,19 @@
 -- _whatsPlaying(obj)
 -- returns the track_id from a playerstatus structure
 local function _whatsPlaying(obj)
+       local whatsPlaying = nil
        if obj.item_loop then
                if obj.item_loop[1].params then
                        if obj.item_loop[1].params.track_id and not obj.remote 
then
-                               return obj.item_loop[1].params.track_id
+                               whatsPlaying = obj.item_loop[1].params.track_id
+                       elseif obj.item_loop[1].text and obj.remote and 
type(obj.current_title) == 'string' then
+                               whatsPlaying = obj.item_loop[1].text .. "\n" .. 
obj.current_title
                        elseif obj.item_loop[1].text then
-                               return obj.item_loop[1].text
+                               whatsPlaying = obj.item_loop[1].text
                        end
                end
        end
-       return nil
+       return whatsPlaying
 end
 
 -- _setPlayerPlaylistChange()

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to