[Slim-Checkins] r9602 - in /trunk/server/Slim/Player: Client.pm Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Sep 11 13:27:08 2006
New Revision: 9602

URL: http://svn.slimdevices.com?rev=9602&view=rev
Log:
Bug: N/A
Description: move redirect of string methods to display object from
Client.pm to Player.pm to protect against client with no display object

Modified:
    trunk/server/Slim/Player/Client.pm
    trunk/server/Slim/Player/Player.pm

Modified: trunk/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Client.pm?rev=9602&r1=9601&r2=9602&view=diff
==============================================================================
--- trunk/server/Slim/Player/Client.pm (original)
+++ trunk/server/Slim/Player/Client.pm Mon Sep 11 13:27:08 2006
@@ -770,9 +770,8 @@
 
 sub power {}
 
-# string processing is display object specific
-sub string       { shift->display->string(@_); }
-sub doubleString { shift->display->doubleString(@_); }
+sub string {}
+sub doubleString {}
 
 sub maxTransitionDuration {
 	return 0;

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=9602&r1=9601&r2=9602&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Mon Sep 11 13:27:08 2006
@@ -346,6 +346,9 @@
 sub block       { Slim::Buttons::Block::block(@_); }
 sub unblock     { Slim::Buttons::Block::unblock(@_); }
 
+sub string      { shift->display->string(@_); }
+sub doubleString{ shift->display->doubleString(@_); }
+
 sub isPlayer {
 	return 1;
 }