[Slim-Checkins] r9921 - in /branches/6.5/server/Slim: Display/Display.pm Display/NoDisplay.pm Display/Text.pm Player/HTTP.pm Player/Player.pm Player/SLIMP3.pm Player/Squeezebox.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Wed Sep 20 15:15:44 2006
New Revision: 9921

URL: http://svn.slimdevices.com?rev=9921&view=rev
Log:
Bug: N/A
Description: merge -r 9790:9791 from trunk

Modified:
    branches/6.5/server/Slim/Display/Display.pm
    branches/6.5/server/Slim/Display/NoDisplay.pm
    branches/6.5/server/Slim/Display/Text.pm
    branches/6.5/server/Slim/Player/HTTP.pm
    branches/6.5/server/Slim/Player/Player.pm
    branches/6.5/server/Slim/Player/SLIMP3.pm
    branches/6.5/server/Slim/Player/Squeezebox.pm

Modified: branches/6.5/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/Display.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Display.pm (original)
+++ branches/6.5/server/Slim/Display/Display.pm Wed Sep 20 15:15:44 2006
@@ -706,6 +706,7 @@
 sub modes() { [] }
 sub nmodes() { 0 }
 sub hasScreen2 { 0 }
+sub vfdmodel {}
 
 sub forgetDisplay {
 	my $display = shift;

Modified: branches/6.5/server/Slim/Display/NoDisplay.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/NoDisplay.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/NoDisplay.pm (original)
+++ branches/6.5/server/Slim/Display/NoDisplay.pm Wed Sep 20 15:15:44 2006
@@ -43,6 +43,7 @@
 sub killAnimation {}
 sub resetDisplay {}
 sub endAnimation {}
+sub vfdmodel { 'http' }
 
 =head1 SEE ALSO
 

Modified: branches/6.5/server/Slim/Display/Text.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Display/Text.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Display/Text.pm (original)
+++ branches/6.5/server/Slim/Display/Text.pm Wed Sep 20 15:15:44 2006
@@ -90,7 +90,30 @@
 }
 
 sub vfdmodel {
-	return 'text';
+	my $display = shift;
+	my $client = $display->client;
+
+	if ($client->isa('Slim::Player::SLIMP3')) {
+
+		if ($client->revision >= 2.2) {
+			my $mac = $client->macaddress();
+			if ($mac eq '00:04:20:03:04:e0') {
+				return 'futaba-latin1';
+			} elsif ($mac eq '00:04:20:02:07:6e' ||
+					 $mac =~ /^00:04:20:04:1/ ||
+					 $mac =~ /^00:04:20:00:/	) {
+				return 'noritake-european';
+			} else {
+				return 'noritake-katakana';
+			}
+		} else {
+			return 'noritake-katakana';
+		}
+
+	} else {
+		# Squeezebox 1
+		return 'noritake-european';
+	}
 }
 
 # Render function for character displays

Modified: branches/6.5/server/Slim/Player/HTTP.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/HTTP.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/HTTP.pm (original)
+++ branches/6.5/server/Slim/Player/HTTP.pm Wed Sep 20 15:15:44 2006
@@ -64,7 +64,6 @@
 sub formats		{ 'mp3' }
 sub model		{ 'http' }
 sub decoder		{ 'http' }
-sub vfdmodel		{ 'http' }
 sub vfd			{ undef }
 
 sub power {

Modified: branches/6.5/server/Slim/Player/Player.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Player.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Player.pm (original)
+++ branches/6.5/server/Slim/Player/Player.pm Wed Sep 20 15:15:44 2006
@@ -295,6 +295,7 @@
 sub fonts         { shift->display->fonts(@_); }
 sub displayHeight { shift->display->displayHeight(@_); }
 sub currBrightness { shift->display->currBrightness(@_); }
+sub vfdmodel    { shift->display->vfdmodel(@_); }
 
 sub updateMode  { shift->display->updateMode(@_); }
 sub animateState{ shift->display->animateState(@_); }

Modified: branches/6.5/server/Slim/Player/SLIMP3.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/SLIMP3.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/SLIMP3.pm (original)
+++ branches/6.5/server/Slim/Player/SLIMP3.pm Wed Sep 20 15:15:44 2006
@@ -88,24 +88,6 @@
 
 sub decoder {
 	return 'mas3507d';
-}
-
-sub vfdmodel {
-	my $client = shift;
-	if ($client->revision >= 2.2) {
-		my $mac = $client->macaddress();
-		if ($mac eq '00:04:20:03:04:e0') {
-			return 'futaba-latin1';
-		} elsif ($mac eq '00:04:20:02:07:6e' ||
-				$mac =~ /^00:04:20:04:1/ ||
-				$mac =~ /^00:04:20:00:/	) {
-			return 'noritake-european';
-		} else {
-			return 'noritake-katakana';
-		}
-	} else {
-		return 'noritake-katakana';
-	}		
 }
 
 sub play {

Modified: branches/6.5/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Squeezebox.pm?rev=9921&r1=9920&r2=9921&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Squeezebox.pm (original)
+++ branches/6.5/server/Slim/Player/Squeezebox.pm Wed Sep 20 15:15:44 2006
@@ -142,10 +142,6 @@
 
 sub ticspersec {
 	return 1000;
-}
-
-sub vfdmodel {
-	return 'noritake-european';
 }
 
 sub decoder {