--- SlimServer_v2004-09-08/Slim/Display/VFD/Animation.pm 2004-09-08 02:03:15.000000000 -0700 +++ Animation.pm 2004-09-08 14:57:06.000000000 -0700 @@ -235,7 +235,9 @@ sub doEasterEgg { ,$frame_rate,1); $easter++; } elsif ($easter == 1) { - my ($text1,$text2) = Slim::Display::Display::curLines($client); + my $lines = $client->parseLines(Slim::Display::Display::curLines($client)); + my $text1 = $lines->{line1}; + my $text2 = $lines->{line2}; $text1 = Slim::Display::Display::subString(($text1 . (' ' x (40 - Slim::Display::Display::lineLength($text1)))),0,40); $text2 = Slim::Display::Display::subString(($text2 . (' ' x (40 - Slim::Display::Display::lineLength($text2)))),0,40); my $line1 = $text1 . join('',reverse(@{Slim::Display::Display::splitString($text2)})) . $text1; @@ -672,13 +674,13 @@ sub animateScrollSingle1 { return; } - my ($line1,$line2) = Slim::Display::Display::curLines($client); + my $lines = $client->parseLines(Slim::Display::Display::curLines($client)); if ($pause_count < $hold) { - $client->update([$line1, $line2],0); + $client->update($lines,0); return ($rate,\&animateScrollSingle1, $text22, $text22_length, $pause_count + $scrollSingleLine1FrameRate); } else { - return animateScrollSingle2($client, 0, $text22, 0, $text22_length, \$line1, 0); + return animateScrollSingle2($client, 0, $text22, 0, $text22_length, \($lines->{line1}.$lines->{overlay1}), 0); } } @@ -706,8 +708,8 @@ sub animateScrollSingle2 { # often enough to have it look smooth. But calling curLines can be # kind of expensive, so we'll try to keep the old value for just a # little less than a second. - my ($nline1) = Slim::Display::Display::curLines($client); - $line1 = \$nline1; + my $lines = $client->parseLines(Slim::Display::Display::curLines($client)); + $line1 = \($lines->{line1}.$lines->{overlay1}); $line1_age = 0; } $client->update([$$line1, Slim::Display::Display::subString($$text22, $ind, 40)], 0);