[Slim-Checkins] r9447 - in /branches/6.5/server: Slim/Utils/Scanner.pm types.conf

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Sep  6 12:22:58 2006
New Revision: 9447

URL: http://svn.slimdevices.com?rev=9447&view=rev
Log:
Add support for audio/asf content-type

Modified:
    branches/6.5/server/Slim/Utils/Scanner.pm
    branches/6.5/server/types.conf

Modified: branches/6.5/server/Slim/Utils/Scanner.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/Scanner.pm?rev=9447&r1=9446&r2=9447&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/Scanner.pm (original)
+++ branches/6.5/server/Slim/Utils/Scanner.pm Wed Sep  6 12:22:58 2006
@@ -922,6 +922,7 @@
 		&& $type ne 'application/x-mms-framed' 
 		&& $type ne 'application/vnd.ms.wms-hdr.asfv1'
 		&& $type ne 'audio/x-ms-wma'
+		&& $type ne 'audio/asf'
 	) {
 		# It's not audio, treat it as ASX redirector
 		$::d_scan && msgf("scanWMA: Stream returned non-audio content-type: $type, treating as ASX redirector\n");

Modified: branches/6.5/server/types.conf
URL: http://svn.slimdevices.com/branches/6.5/server/types.conf?rev=9447&r1=9446&r2=9447&view=diff
==============================================================================
--- branches/6.5/server/types.conf (original)
+++ branches/6.5/server/types.conf Wed Sep  6 12:22:58 2006
@@ -41,7 +41,7 @@
 swf     swf             application/x-shockwave-flash   -
 txt     txt             text/plain                      -
 wav     wav,wave        audio/x-wav                     audio
-wma     wma             audio/x-ms-wma,application/vnd.ms.wms-hdr.asfv1,application/octet-stream,application/x-mms-framed audio
+wma     wma             audio/x-ms-wma,application/vnd.ms.wms-hdr.asfv1,application/octet-stream,application/x-mms-framed,audio/asf audio
 wpl     wpl             application/vnd.ms-wpl          playlist
 xml     xml,xsl         text/xml                        -
 xpf     xspf            application/xspf+xml            playlist