[Slim-Checkins] r8793 - in /trunk/server/Slim: Buttons/TrackInfo.pm Music/Info.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Fri Aug  4 10:33:45 2006
New Revision: 8793

URL: http://svn.slimdevices.com?rev=8793&view=rev
Log:
Fixed bitrate and favorites in TrackInfo

Modified:
    trunk/server/Slim/Buttons/TrackInfo.pm
    trunk/server/Slim/Music/Info.pm

Modified: trunk/server/Slim/Buttons/TrackInfo.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/TrackInfo.pm?rev=8793&r1=8792&r2=8793&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/TrackInfo.pm (original)
+++ trunk/server/Slim/Buttons/TrackInfo.pm Fri Aug  4 10:33:45 2006
@@ -262,10 +262,10 @@
 		}
 	}
 
-	if ( my $bitrate = ( Slim::Music::Info::getCurrentBitrate($url) || $track->prettyBitRate ) ) {
+	if ( my $bitrate = ( Slim::Music::Info::getCurrentBitrate($track->url) || $track->prettyBitRate ) ) {
 		
 		if ( $bitrate > 0 ) {
-			my $undermax = Slim::Player::TranscodingHelper::underMax($client, $url);
+			my $undermax = Slim::Player::TranscodingHelper::underMax($client, $track->url);
 
 			my $rate = (defined $undermax && $undermax) ? $bitrate : Slim::Utils::Prefs::maxRate($client).$client->string('KBPS')." ABR";
 
@@ -308,8 +308,8 @@
 		push (@{$client->trackInfoContent}, undef);
 	}
 
-	if (Slim::Music::Info::isURL($url)) {
-		my $fav = Slim::Utils::Favorites->findByClientAndURL($client, $url);
+	if (Slim::Music::Info::isURL($track->url)) {
+		my $fav = Slim::Utils::Favorites->findByClientAndURL($client, $track->url);
 
 		if ($fav) {
 			$client->param('favorite', $fav->{'num'});

Modified: trunk/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Info.pm?rev=8793&r1=8792&r2=8793&view=diff
==============================================================================
--- trunk/server/Slim/Music/Info.pm (original)
+++ trunk/server/Slim/Music/Info.pm Fri Aug  4 10:33:45 2006
@@ -281,7 +281,7 @@
 		$url = $url->url;
 	}
 
-	return $currentBitrates{$url} || getBitrate($url) || undef;
+	return $currentBitrates{$url} || undef;
 }
 
 sub getBitrate {