[Slim-Checkins] r8867 - in /trunk/server/Slim: Buttons/Common.pm Display/Display.pm Display/Transporter.pm Player/Client.pm Player/Player.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Aug  8 13:15:59 2006
New Revision: 8867

URL: http://svn.slimdevices.com?rev=8867&view=rev
Log:
Bug: N/A
Description: Move lines back to client object as using display object
causes problems flipping between transporter and other skins in softsqueeze

Modified:
    trunk/server/Slim/Buttons/Common.pm
    trunk/server/Slim/Display/Display.pm
    trunk/server/Slim/Display/Transporter.pm
    trunk/server/Slim/Player/Client.pm
    trunk/server/Slim/Player/Player.pm

Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Tue Aug  8 13:15:59 2006
@@ -1328,7 +1328,7 @@
 	my $newscreen2 = $client->param('screen2');
 
 	if ($newscreen2 && $newscreen2 eq 'periodic' && $oldscreen2 ne 'periodic') {
-		my $linesfunc = $client->display->lines2periodic();
+		my $linesfunc = $client->lines2periodic();
 		$newlines->{'screen2'} = &$linesfunc($client);
 
 	} elsif ($oldscreen2 && !$newscreen2) {
@@ -1430,7 +1430,7 @@
 		$client->display->update();
 	}
 
-	if ($update2 && !$client->display->animateState() && (my $linefunc = $client->display->lines2periodic()) ) {
+	if ($update2 && !$client->display->animateState() && (my $linefunc = $client->lines2periodic()) ) {
 		$client->display->update({ 'screen2' => &$linefunc($client) });
 	}
 }

Modified: trunk/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Display.pm?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- trunk/server/Slim/Display/Display.pm (original)
+++ trunk/server/Slim/Display/Display.pm Tue Aug  8 13:15:59 2006
@@ -66,8 +66,6 @@
 	$display->[7] = undef;    # lastVisMode
 	$display->[8] = undef;    # sbCallbackData
 	$display->[9] = undef;    # sbOldDisplay
-	$display->[10]= undef;    # lines function
-	$display->[11]= undef;    # line2periodic [Transporter only]
 
 	$display->resetDisplay(); # init render cache
 
@@ -121,14 +119,6 @@
 	my $r = shift;
 	@_ ? ($r->[9] = shift) : $r->[9];
 }
-sub lines {
-	my $r = shift;
-	@_ ? ($r->[10] = shift) : $r->[10];
-}
-sub lines2periodic {
-	my $r = shift;
-	@_ ? ($r->[11] = shift) : $r->[11];
-}
 
 
 ################################################################################################
@@ -153,7 +143,7 @@
 	if (defined($lines)) {
 		$parts = $display->parseLines($lines);
 	} else {
-		my $linefunc = $display->lines();
+		my $linefunc = $client->lines();
 		$parts = $display->parseLines(&$linefunc($client));
 	}
 
@@ -395,7 +385,7 @@
 		return undef;
 	}
 
-	my $linefunc = $display->lines();
+	my $linefunc = $client->lines();
 
 	if (defined $linefunc) {
 		return $display->parseLines(&$linefunc($client));

Modified: trunk/server/Slim/Display/Transporter.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Transporter.pm?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- trunk/server/Slim/Display/Transporter.pm (original)
+++ trunk/server/Slim/Display/Transporter.pm Tue Aug  8 13:15:59 2006
@@ -140,11 +140,12 @@
 
 sub init {
 	my $display = shift;
-	Slim::Utils::Prefs::initClientPrefs($display->client, $defaultPrefs);
+	my $client = $display->client;
+	Slim::Utils::Prefs::initClientPrefs($client, $defaultPrefs);
 	$display->SUPER::init();
 
 	# register default handler for periodic screen2 updates on visual screen
-	$display->lines2periodic(\&Slim::Player::Player::currentSongLines);
+	$client->lines2periodic(\&Slim::Player::Player::currentSongLines);
 }
 
 sub resetDisplay {

Modified: trunk/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Client.pm?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- trunk/server/Slim/Player/Client.pm (original)
+++ trunk/server/Slim/Player/Client.pm Tue Aug  8 13:15:59 2006
@@ -685,7 +685,7 @@
 	$client->[54] = undef; # epochirtime
 	$client->[55] = []; # modeStack
 	$client->[56] = []; # modeParameterStack
-	$client->[57] = undef; #unused
+	$client->[57] = undef; # lines
 	$client->[58] = []; # trackInfoLines
 	$client->[59] = []; # trackInfoContent
 	$client->[60] = {}; # lastID3Selection
@@ -728,7 +728,7 @@
 	$client->[98] = undef; # directurl
 	$client->[99] = undef; # directbody
 	$client->[100] = undef; # display object
-	$client->[101] = undef; # unused
+	$client->[101] = undef; # lines2periodic
 	$client->[102] = 0; # periodicUpdateTime
 	$client->[103] = undef; # unused
 	$client->[104] = undef; # unused
@@ -1182,7 +1182,6 @@
 sub symbols{}
 sub unblock{}
 sub updateKnob{}
-sub lines {}
 
 sub pause {
 	my $client = shift;
@@ -1744,6 +1743,10 @@
 	@_ ? ($i = shift) : return $r->[56];
 	@_ ? ($r->[56]->[$i] = shift) : $r->[56]->[$i];
 }
+sub lines {
+	my $r = shift;
+	@_ ? ($r->[57] = shift) : $r->[57];
+}
 sub trackInfoLines {
 	my $r = shift;
 	my $i;
@@ -1947,6 +1950,11 @@
 	@_ ? ($r->[100] = shift) : $r->[100];
 }
 
+sub lines2periodic {
+	my $r = shift;
+	@_ ? ($r->[101] = shift) : $r->[101];
+}
+
 sub periodicUpdateTime {
 	my $r = shift;
 	@_ ? ($r->[102] = shift) : $r->[102];

Modified: trunk/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Player.pm?rev=8867&r1=8866&r2=8867&view=diff
==============================================================================
--- trunk/server/Slim/Player/Player.pm (original)
+++ trunk/server/Slim/Player/Player.pm Tue Aug  8 13:15:59 2006
@@ -292,7 +292,6 @@
 sub balanceBar  { shift->display->balanceBar(@_); }
 sub fonts         { shift->display->fonts(@_); }
 sub displayHeight { shift->display->displayHeight(@_); }
-sub lines       { shift->display->lines(@_); }
 
 sub updateMode  { shift->display->updateMode(@_); }
 sub animateState{ shift->display->animateState(@_); }