[Slim-Checkins] r9885 - /trunk/server/Slim/Buttons/Playlist.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Sep 19 12:32:28 2006
New Revision: 9885

URL: http://svn.slimdevices.com?rev=9885&view=rev
Log:
Bug: 4145
Description: for remote streams, display radio station name on screen2 if displaying
current song on screen 1

Modified:
    trunk/server/Slim/Buttons/Playlist.pm

Modified: trunk/server/Slim/Buttons/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Playlist.pm?rev=9885&r1=9884&r2=9885&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Playlist.pm (original)
+++ trunk/server/Slim/Buttons/Playlist.pm Tue Sep 19 12:32:28 2006
@@ -428,13 +428,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 ],
 		};
 
 	}