[Slim-Checkins] r9603 - in /branches/6.5/server/Slim/Player: Client.pm Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Sep 11 13:40:19 2006
New Revision: 9603

URL: http://svn.slimdevices.com?rev=9603&view=rev
Log:
Bug: N/A
Description: merge -r 9601:9602 from trunk

Modified:
    branches/6.5/server/Slim/Player/Client.pm
    branches/6.5/server/Slim/Player/Player.pm

Modified: branches/6.5/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Client.pm?rev=9603&r1=9602&r2=9603&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Client.pm (original)
+++ branches/6.5/server/Slim/Player/Client.pm Mon Sep 11 13:40:19 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: branches/6.5/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Player.pm?rev=9603&r1=9602&r2=9603&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Player.pm (original)
+++ branches/6.5/server/Slim/Player/Player.pm Mon Sep 11 13:40:19 2006
@@ -303,6 +303,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;
 }