[Slim-Checkins] r9977 - in /branches/6.5/server: Changelog6.html Slim/Buttons/Playlist.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Fri Sep 22 12:43:46 2006
New Revision: 9977

URL: http://svn.slimdevices.com?rev=9977&view=rev
Log:
Bug: 4145
Description: merge from trunk -r 9884:9885

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Buttons/Playlist.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9977&r1=9976&r2=9977&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Fri Sep 22 12:43:46 2006
@@ -3,6 +3,7 @@
 <ul>
 	<li>Bug Fixes:
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4142">#4142</a> - ExBrowse3 does not work with Safari</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4145">#4145</a> - Display station name instead of album name in overlay text visualizers on transporter second screen</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4156">#4156</a> - slimtray should install the service if it's not already installed when starting</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4168">#4168</a> - Live365 plugin fails in 6.5.0</li>
 	<ul>

Modified: branches/6.5/server/Slim/Buttons/Playlist.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/Playlist.pm?rev=9977&r1=9976&r2=9977&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/Playlist.pm (original)
+++ branches/6.5/server/Slim/Buttons/Playlist.pm Fri Sep 22 12:43:46 2006
@@ -402,13 +402,29 @@
 	}
 
 	if ($client->display->showExtendedText()) {
+		
+		my ($s2line1, $s2line2);
+
 		my $song = Slim::Player::Playlist::song($client, $nowPlaying ? undef : browseplaylistindex($client) );
 
+		if ($song && $song->isRemoteURL) {
+
+			my $currentTitle = Slim::Music::Info::getCurrentTitle($client, $song->url);
+			my $title = Slim::Music::Info::displayText($client, $song, 'TITLE');
+
+			if ( ($currentTitle || '') ne ($title || '') && !Slim::Music::Info::isURL($title) ) {
+				$s2line2 = $title;
+			}
+
+		} else {
+
+			$s2line1 = Slim::Music::Info::displayText($client, $song, 'ALBUM');
+			$s2line2 = Slim::Music::Info::displayText($client, $song, 'ARTIST');
+
+		}
+
 		$parts->{'screen2'} ||= {
-			'line' => [ 
-				Slim::Music::Info::displayText($client, $song, 'ALBUM'),
-				Slim::Music::Info::displayText($client, $song, 'ARTIST')
-			],
+			'line' => [ $s2line1, $s2line2 ],
 		};
 
 	}