[Slim-Checkins] r11074 - in /trunk/server/Slim: Display/Display.pm Display/Lib/Fonts.pm Display/Lib/TextVFD.pm Utils/Log.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Mon Jan  1 12:24:20 2007
New Revision: 11074

URL: http://svn.slimdevices.com?rev=11074&view=rev
Log:
Bug: N/A
Description: simple logging for display code - logs callers of update
and showBriefly + hash sent

Modified:
    trunk/server/Slim/Display/Display.pm
    trunk/server/Slim/Display/Lib/Fonts.pm
    trunk/server/Slim/Display/Lib/TextVFD.pm
    trunk/server/Slim/Utils/Log.pm

Modified: trunk/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Display.pm?rev=11074&r1=11073&r2=11074&view=diff
==============================================================================
--- trunk/server/Slim/Display/Display.pm (original)
+++ trunk/server/Slim/Display/Display.pm Mon Jan  1 12:24:20 2007
@@ -51,6 +51,8 @@
 #   2 = server side ticker mode
 #  3+ = <reserved for client side scrolling>
 
+my $log = logger('player.display');
+
 our $defaultPrefs = {
 	'autobrightness'       => 1,
 	'idleBrightness'       => 1,
@@ -163,11 +165,31 @@
 	my $client  = $display->client;
 
 	my $parts;
+	my $linefunc;
+
 	if (defined($lines)) {
 		$parts = $display->parseLines($lines);
 	} else {
-		my $linefunc = $client->lines();
+		$linefunc = $client->lines();
 		$parts = $display->parseLines(&$linefunc($client));
+	}
+
+	if ($log->is_info) {
+
+		my ($line, $subr) = (caller(1))[2,3];
+		($line, $subr) = (caller(2))[2,3] if $subr eq 'Slim::Player::Player::update';
+
+		my $source = $linefunc ? Slim::Utils::PerlRunTime::realNameForCodeRef($linefunc) : '';
+
+		my $logstr = "caller $subr ($line) ($source) ";
+
+		if ($log->is_debug) {
+			$logstr .= "\$scrollMode: $scrollMode " if $scrollMode;
+			$logstr .= "s2periodic " if $s2periodic;
+			$logstr .= "display hash:" . ($parts == $display->renderCache ? 'Cache' : "\n" . Data::Dump::dump $parts);
+		}
+
+		$log->info($logstr);
 	}
 
 	unless ($s2periodic && $display->screen2updateOK) {
@@ -241,6 +263,12 @@
 
 	my $client = $display->client;
 
+	if ($log->is_info) {
+		my ($line, $subr) = (caller(1))[2,3];
+		($line, $subr) = (caller(2))[2,3] if $subr eq 'Slim::Player::Player::showBriefly';
+		$log->info(sprintf "caller %s (%d) %s ", $subr, $line, $display->updateMode() == 2 ? '[Blocked]' : '');
+	}
+
 	# return if update blocked
 	return if ($display->updateMode() == 2);
 
@@ -250,7 +278,7 @@
 	if (ref($parts) eq 'HASH') {
 		$parsed = $parts;
 	} else {
-		$parsed = $display->parseLines([$parts,shift]);
+		$parsed = { 'lines' => [ $parts, shift ] };
 	}
 
 	my $args = shift;
@@ -448,10 +476,12 @@
 	my $display = shift;
 	my $lines = shift;
 	my ($line1, $line2, $line3, $line4, $overlay1, $overlay2, $center1, $center2, $bits);
-	
-	if (ref($lines) eq 'HASH') { 
-		return $lines;
-	} elsif (ref($lines) eq 'SCALAR') {
+
+	return $lines if (ref($lines) eq 'HASH');
+
+	logBacktrace("lines function not using display hash, please update to display hash as this will be depreciated");
+
+	if (ref($lines) eq 'SCALAR') {
 		$line1 = $$lines;
 	} else {
 		if (ref($lines) eq 'ARRAY') {

Modified: trunk/server/Slim/Display/Lib/Fonts.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Lib/Fonts.pm?rev=11074&r1=11073&r2=11074&view=diff
==============================================================================
--- trunk/server/Slim/Display/Lib/Fonts.pm (original)
+++ trunk/server/Slim/Display/Lib/Fonts.pm Mon Jan  1 12:24:20 2007
@@ -124,7 +124,7 @@
 	'standard.1' => 1,
 );
 
-my $log = logger('player.graphics');
+my $log = logger('player.fonts');
 
 sub init {
 	loadFonts();

Modified: trunk/server/Slim/Display/Lib/TextVFD.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Lib/TextVFD.pm?rev=11074&r1=11073&r2=11074&view=diff
==============================================================================
--- trunk/server/Slim/Display/Lib/TextVFD.pm (original)
+++ trunk/server/Slim/Display/Lib/TextVFD.pm Mon Jan  1 12:24:20 2007
@@ -24,7 +24,7 @@
 use Slim::Utils::Log;
 use Slim::Utils::Unicode;
 
-my $log = logger('player.ui');
+my $log = logger('player.text');
 
 our $MAXBRIGHTNESS = 4;
 

Modified: trunk/server/Slim/Utils/Log.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Utils/Log.pm?rev=11074&r1=11073&r2=11074&view=diff
==============================================================================
--- trunk/server/Slim/Utils/Log.pm (original)
+++ trunk/server/Slim/Utils/Log.pm Mon Jan  1 12:24:20 2007
@@ -731,8 +731,9 @@
 		'control.queries'            => 'WARN',
 		'control.stdio'              => 'WARN',
 
+		'player.display'             => 'WARN',
+		'player.fonts'               => 'WARN',
 		'player.firmware'            => 'WARN',
-		'player.graphics'            => 'WARN',
 		'player.ir'                  => 'WARN',
 		'player.menu'                => 'WARN',
 		'player.playlist'            => 'WARN',
@@ -741,6 +742,7 @@
 		'player.streaming.direct'    => 'WARN',
 		'player.streaming.remote'    => 'WARN',
 		'player.sync'                => 'WARN',
+		'player.text'                => 'WARN',
 		'player.ui'                  => 'WARN',
 
 		'scan'                       => 'INFO',