[Slim-Checkins] r9026 - in /trunk/server/Slim: Display/Display.pm Player/Client.pm Player/Player.pm Player/Squeezebox.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Thu Aug 17 16:05:32 2006
New Revision: 9026

URL: http://svn.slimdevices.com?rev=9026&view=rev
Log:
Bug: N/A
Description: currBrightness and scrollState handled by display object

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

Modified: trunk/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Display.pm?rev=9026&r1=9025&r2=9026&view=diff
==============================================================================
--- trunk/server/Slim/Display/Display.pm (original)
+++ trunk/server/Slim/Display/Display.pm Thu Aug 17 16:05:32 2006
@@ -62,7 +62,7 @@
 	$display->[3] = [0, 0, 0];# scrollState - element 1 = screen1
 	$display->[4] = {};       # renderCache
 	$display->[5] = [];       # scrollData - element 1 = screen1
-	$display->[6] = undef;    # currBrightness
+	$display->[6] = 1;        # currBrightness
 	$display->[7] = undef;    # lastVisMode
 	$display->[8] = undef;    # sbCallbackData
 	$display->[9] = undef;    # sbOldDisplay

Modified: trunk/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Client.pm?rev=9026&r1=9025&r2=9026&view=diff
==============================================================================
--- trunk/server/Slim/Player/Client.pm (original)
+++ trunk/server/Slim/Player/Client.pm Thu Aug 17 16:05:32 2006
@@ -195,12 +195,6 @@
 =head1 client variables for display
 
 =over
-
-=item
-
-currBrightness() - type: int
-
-	current brightness setting of the client's VFD display, range 0..4
 
 =item
 
@@ -661,7 +655,7 @@
 	$client->[22] = 0; # remoteStreamStartTime
 	$client->[23] = undef; # shoutMetaPointer
 	$client->[24] = undef; # shoutMetaInterval
-	$client->[25] = undef; # currBrightness
+	$client->[25] = undef; # unused
 	# $client->[26] = undef; # unused
 	# $client->[27] = undef; # unused
 	$client->[28] = []; # playlist
@@ -789,8 +783,6 @@
 
 	$client->searchCursor(0);
 
-	$client->currBrightness(1);
-
 	$clientHash{$id} = $client;
 
 	$client->paddr($paddr);
@@ -1189,6 +1181,9 @@
 sub symbols{}
 sub unblock{}
 sub updateKnob{}
+sub prevline1 {}
+sub prevline2 {}
+sub currBrightness {}
 
 sub pause {
 	my $client = shift;
@@ -1630,12 +1625,6 @@
 	my $r = shift;
 	@_ ? ($r->[24] = shift) : $r->[24];
 }
-sub currBrightness {
-	my $r = shift;
-	@_ ? ($r->[25] = shift) : $r->[25];
-}
-sub prevline1 {}
-sub prevline2 {}
 sub playlist {
 	my $r = shift;
 	my $i;
@@ -1991,11 +1980,6 @@
 	@_ ? ($r->[104]->[$i] = shift) : $r->[104]->[$i];
 }
 
-sub scrollState {
-	my $r = shift;
-	@_ ? ($r->[105] = shift) : $r->[105];
-}
-
 sub knobPos {
 	my $r = shift;
 	@_ ? ($r->[106] = shift) : $r->[106];

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=9026&r1=9025&r2=9026&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Thu Aug 17 16:05:32 2006
@@ -292,6 +292,7 @@
 sub balanceBar  { shift->display->balanceBar(@_); }
 sub fonts         { shift->display->fonts(@_); }
 sub displayHeight { shift->display->displayHeight(@_); }
+sub currBrightness { shift->display->currBrightness(@_); }
 
 sub updateMode  { shift->display->updateMode(@_); }
 sub animateState{ shift->display->animateState(@_); }

Modified: trunk/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox.pm?rev=9026&r1=9025&r2=9026&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox.pm (original)
+++ trunk/server/Slim/Player/Squeezebox.pm Thu Aug 17 16:05:32 2006
@@ -433,7 +433,7 @@
 	$client->modeParam('visu',[0]);
 
 	# force brightness to dim if off
-	if ($client->currBrightness() == 0) { $client->brightness(1); }
+	if ($client->display->currBrightness() == 0) { $client->display->brightness(1); }
 
 	open FS, $filename || return("Open failed for: $filename\n");