[Slim-Checkins] r10885 - in /branches/6.5/server: Changelog6.html Slim/Utils/Scanner.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Dec  6 13:55:33 2006
New Revision: 10885

URL: http://svn.slimdevices.com?rev=10885&view=rev
Log:
Bug 4522, bypass scanning if in transcode mode with an MMS URL

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Utils/Scanner.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10885&r1=10884&r2=10885&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Dec  6 13:55:33 2006
@@ -124,6 +124,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4533">#4533</a> - snow screensaver overlapped by VU meter, briefly</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4549">#4549</a> - dirsFor HTML returns html wrongly for OS</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4550">#4550</a> - titles command find playlists & playlists search broken</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4522">#4522</a> - MMS-only streams don't work even with wmadec</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Slim/Utils/Scanner.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/Scanner.pm?rev=10885&r1=10884&r2=10885&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/Scanner.pm (original)
+++ branches/6.5/server/Slim/Utils/Scanner.pm Wed Dec  6 13:55:33 2006
@@ -401,6 +401,31 @@
 
 		return $cb->( $foundItems, @{$pt} );
 	}
+	
+	# Bug 4522, if user has disabled native WMA decoding to get MMS support, don't scan MMS URLs
+	if ( $url =~ /^mms/i ) {
+		
+		my ($command, $type, $format) = Slim::Player::TranscodingHelper::getConvertCommand(
+			$args->{'client'},
+			$url,
+			'wma',
+		);
+		
+		if ( defined $command && $command ne '-' ) {
+			
+			$::d_scan && msg("scanRemoteURL: Not scanning MMS URL because transcoding is enabled.\n");
+
+			my $track = Slim::Schema->rs('Track')->updateOrCreate({
+				'url' => $url,
+			});
+
+			$track->content_type( 'wma' );
+
+			push @{$foundItems}, $track;
+
+			return $cb->( $foundItems, @{$pt} );
+		}
+	}			
 	
 	my $originalURL = $url;