[Slim-Checkins] r33820 - in /7.7/trunk/server: Changelog7.html Slim/Plugin/UPnP/Common/Utils.pm Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm types.conf

Author: agrundman
Date: Tue Feb  7 09:38:38 2012
New Revision: 33820

URL: http://svn.slimdevices.com/slim?rev=33820&view=rev
Log:
Fixed bug 17882, use audio/mp4 instead of audio/m4a with DLNA

Modified:
    7.7/trunk/server/Changelog7.html
    7.7/trunk/server/Slim/Plugin/UPnP/Common/Utils.pm
    7.7/trunk/server/Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm
    7.7/trunk/server/types.conf

Modified: 7.7/trunk/server/Changelog7.html
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Changelog7.html?rev=33820&r1=33819&r2=33820&view=diff
==============================================================================
--- 7.7/trunk/server/Changelog7.html (original)
+++ 7.7/trunk/server/Changelog7.html Tue Feb  7 09:38:38 2012
@@ -7,6 +7,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17855">#17855</a> - Only enable single output channel mode if actively synced</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17876">#17876</a> - Unnecessary items in context menu for current-playlist tracks</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17877">#17877</a> - Resume after underrun broken for synchronized (ip3k) players</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=17882">#17882</a> - Fixed wrong MP4 MIME type for DLNA (audio/m4a was used instead of audio/mp4)</li>
 	</ul>
 	<br />
 </ul>

Modified: 7.7/trunk/server/Slim/Plugin/UPnP/Common/Utils.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Plugin/UPnP/Common/Utils.pm?rev=33820&r1=33819&r2=33820&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Plugin/UPnP/Common/Utils.pm (original)
+++ 7.7/trunk/server/Slim/Plugin/UPnP/Common/Utils.pm Tue Feb  7 09:38:38 2012
@@ -218,6 +218,9 @@
 		# We need to provide a <res> for the native file, as well as compatability formats via transcoding
 		my $content_type = $track->{type} || $track->{'tracks.content_type'};
 		my $native_type = $Slim::Music::Info::types{$content_type};
+		
+		# Bug 17882, use DLNA-required audio/mp4 instead of audio/m4a
+		$native_type = 'audio/mp4' if $native_type eq 'audio/m4a';
 		
 		# Setup transcoding formats for non-PCM/MP3 content
 		my @other_types;

Modified: 7.7/trunk/server/Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm?rev=33820&r1=33819&r2=33820&view=diff
==============================================================================
--- 7.7/trunk/server/Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm (original)
+++ 7.7/trunk/server/Slim/Plugin/UPnP/MediaServer/ConnectionManager.pm Tue Feb  7 09:38:38 2012
@@ -194,6 +194,9 @@
 		}
 		else {
 			$mime = $Slim::Music::Info::types{ $row->{content_type} };
+			
+			# Bug 17882, use DLNA-required audio/mp4 instead of audio/m4a
+			$mime = 'audio/mp4' if $mime eq 'audio/m4a';
 		}
 		
 		my $key = $mime . ($row->{dlna_profile} || '');

Modified: 7.7/trunk/server/types.conf
URL: http://svn.slimdevices.com/slim/7.7/trunk/server/types.conf?rev=33820&r1=33819&r2=33820&view=diff
==============================================================================
--- 7.7/trunk/server/types.conf (original)
+++ 7.7/trunk/server/types.conf Tue Feb  7 09:38:38 2012
@@ -32,7 +32,7 @@
 lnk     lnk             application/windowsshortcut     list
 m3u     m3u,m3u8        audio/mpegurl,audio/x-mpegurl   playlist
 aac     aac             audio/aac,audio/aacp            audio
-mp4     m4a,mp4,m4b     audio/m4a,audio/x-m4a           audio
+mp4     m4a,mp4,m4b     audio/m4a,audio/x-m4a,audio/mp4 audio
 mp3     mp2,mp3         audio/mpeg,audio/mp3,audio/mp3s,audio/x-mpeg,audio/mpeg3,audio/mpg audio
 mpc     mpc,mp+         audio/x-musepack                audio
 ogg     ogg,oga         audio/x-ogg,application/ogg,audio/ogg,application/x-ogg       audio