[Slim-Checkins] r12729 - in /trunk/server/Slim: Control/Commands.pm Player/Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Sun Aug 26 04:28:17 2007
New Revision: 12729

URL: http://svn.slimdevices.com?rev=12729&view=rev
Log:
Bug: N/A
Description: force icon-id to be sent over JSON as a number not string

Modified:
    trunk/server/Slim/Control/Commands.pm
    trunk/server/Slim/Player/Player.pm

Modified: trunk/server/Slim/Control/Commands.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Commands.pm?rev=12729&r1=12728&r2=12729&view=diff
==============================================================================
--- trunk/server/Slim/Control/Commands.pm (original)
+++ trunk/server/Slim/Control/Commands.pm Sun Aug 26 04:28:17 2007
@@ -514,7 +514,7 @@
 			'text'    => [ Slim::Utils::Strings::string('JIVE_POPUP_REMOVING'),
 						   $song->title,
 						   Slim::Utils::Strings::string('JIVE_POPUP_FROM_PLAYLIST') ],
-			'icon-id' => $song->remote ? 0 : $song->album->artwork || 0,
+			'icon-id' => $song->remote ? 0 : ($song->album->artwork || 0) + 0,
 		}
 	});
 
@@ -1491,7 +1491,7 @@
 						? [ Slim::Utils::Strings::string('JIVE_POPUP_ADDING'), $tracks[0]->title,
 							Slim::Utils::Strings::string('JIVE_POPUP_TO_PLAYLIST') ]
 						: [ Slim::Utils::Strings::string('JIVE_POPUP_NOW_PLAYING'), $tracks[0]->title ],
-					'icon-id' => $tracks[0]->album->artwork,
+					'icon-id' => $tracks[0]->album->artwork + 0,
 				}
 			});
 		}

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=12729&r1=12728&r2=12729&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Sun Aug 26 04:28:17 2007
@@ -495,7 +495,7 @@
 		$parts->{'jive'} = {
 			'type'    => 'song',
 			'text'    => [ $status, $song->title ],
-			'icon-id' => $song->remote ? 0 : $song->album->artwork || 0,
+			'icon-id' => $song->remote ? 0 : ($song->album->artwork || 0) + 0,
 		};
 	}