[Slim-Checkins] r12702 - in /trunk/server: Slim/Music/Info.pm Slim/Web/Pages.pm Slim/Web/Pages/Playlist.pm strings.txt

[andy at svn.slimdevices.com]

Author: andy
Date: Thu Aug 23 12:39:15 2007
New Revision: 12702

URL: http://svn.slimdevices.com?rev=12702&view=rev
Log:
Pass client to getCurrentTitle

Modified:
    trunk/server/Slim/Music/Info.pm
    trunk/server/Slim/Web/Pages.pm
    trunk/server/Slim/Web/Pages/Playlist.pm
    trunk/server/strings.txt

Modified: trunk/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Info.pm?rev=12702&r1=12701&r2=12702&view=diff
==============================================================================
--- trunk/server/Slim/Music/Info.pm (original)
+++ trunk/server/Slim/Music/Info.pm Thu Aug 23 12:39:15 2007
@@ -415,13 +415,15 @@
 	my $client = shift;
 	my $url    = shift || return undef;
 	
-	# Let plugins control the current title if they want
-	my $handler = Slim::Player::ProtocolHandlers->handlerForURL($url);
-	if ( $handler && $handler->can('getCurrentTitle') ) {
-	    if ( my $title = $handler->getCurrentTitle( $client, $url ) ) {
-	        return $title;
-        }
-    }
+	if ( blessed($client) ) {
+		# Let plugins control the current title if they want
+		my $handler = Slim::Player::ProtocolHandlers->handlerForURL($url);
+		if ( $handler && $handler->can('getCurrentTitle') ) {
+		    if ( my $title = $handler->getCurrentTitle( $client, $url ) ) {
+		        return $title;
+	        }
+	    }
+	}
 
 	return $currentTitles{$url} || standardTitle($client, $url);
 }

Modified: trunk/server/Slim/Web/Pages.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages.pm?rev=12702&r1=12701&r2=12702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages.pm (original)
+++ trunk/server/Slim/Web/Pages.pm Thu Aug 23 12:39:15 2007
@@ -261,7 +261,7 @@
 		$params->{'bitrate'}    = $track->prettyBitRate;
 
 		if ($getCurrentTitle) {
-			$params->{'songtitle'} = Slim::Music::Info::getCurrentTitle(undef, $track->url);
+			$params->{'songtitle'} = Slim::Music::Info::getCurrentTitle($client, $track->url);
 		} else {
 			$params->{'songtitle'} = Slim::Music::Info::standardTitle(undef, $track);
 		}

Modified: trunk/server/Slim/Web/Pages/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Pages/Playlist.pm?rev=12702&r1=12701&r2=12702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Pages/Playlist.pm (original)
+++ trunk/server/Slim/Web/Pages/Playlist.pm Thu Aug 23 12:39:15 2007
@@ -182,7 +182,7 @@
 			if (Slim::Music::Info::isRemoteURL($track)) {
 				$form{'title'} = Slim::Music::Info::standardTitle(undef, $track) || $track->url;
 			} else {
-				$form{'title'} = Slim::Music::Info::getCurrentTitle(undef, $track->url);
+				$form{'title'} = Slim::Music::Info::getCurrentTitle($client, $track->url);
 			}
 
 		} else {

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=12702&r1=12701&r2=12702&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Thu Aug 23 12:39:15 2007
@@ -10070,6 +10070,9 @@
 DEBUG_NETWORK_SQUEEZENETWORK
 	EN	SqueezeNetwork Logging
 
+DEBUG_NETWORK_COMETD
+	EN	Cometd protocol logging
+
 SETUP_GROUP_DEBUG_DESC
 	DE	SlimServer enthält eine Reihe von Debugging-Einstellungen, mit denen Sie umfangreiche Angaben über den Betrieb des Servers aufzeichnen können. Aktivieren Sie die Punkte, die protokolliert werden sollen, und klicken Sie auf 'Ändern', um das Protokollieren der entsprechenden Information zu aktivieren. <a href="/log.txt" target="log">Hier können Sie die aktuellen Protokolleinträge anzeigen</a>.
 	EN	SlimServer has a number of debugging settings that can be used to record detailed information about the server & scanner operation. Each debugging category has a severity for logging. With "Debug" being the most verbose, and "Off" being the least.