[Slim-Checkins] r10067 - in /branches/6.5/server: Changelog6.html Slim/Formats/MP3.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Sep 27 15:43:06 2006
New Revision: 10067

URL: http://svn.slimdevices.com?rev=10067&view=rev
Log:
Bug: 4071
Description: Merge from trunk -r 10065:10066

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Formats/MP3.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10067&r1=10066&r2=10067&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Sep 27 15:43:06 2006
@@ -3,6 +3,7 @@
 <ul>
 	<li>Bug Fixes:
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2985">#2985</a> - WMA transcoded to WAV truncated (not gapless)</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4071">#4071</a> - Band Names in mp3 Tags don't always work</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4077">#4077</a> - CUE files YEAR and GENRE not always working</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4140">#4140</a> - Problem with the scanner parsing cue sheets in6.5b3</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4142">#4142</a> - ExBrowse3 does not work with Safari</li>

Modified: branches/6.5/server/Slim/Formats/MP3.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Formats/MP3.pm?rev=10067&r1=10066&r2=10067&view=diff
==============================================================================
--- branches/6.5/server/Slim/Formats/MP3.pm (original)
+++ branches/6.5/server/Slim/Formats/MP3.pm Wed Sep 27 15:43:06 2006
@@ -121,6 +121,9 @@
 
 	open(my $fh, $file) or return {};
 
+	# Bug: 4071 - Windows is lame.
+	binmode($fh);
+
 	# This is somewhat messy - Use a customized version of MP3::Info's
 	# get_mp3tag, as we need custom logic.
 	my (%tags, %ape) = ();
@@ -135,7 +138,9 @@
 	# Always add on any APE tags at the end. It may have ReplayGain data.
 	if (MP3::Info::_parse_ape_tag($fh, -s $file, \%ape)) {
 
-		%tags = (%tags, %ape);
+		if (scalar keys %ape) {
+			%tags = (%tags, %ape);
+		}
 	}
 
 	# Now fetch the audio header information.