[Slim-Checkins] r10052 - in /trunk/server: Changelog6.html Slim/Formats/MP3.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Sep 26 13:55:56 2006
New Revision: 10052

URL: http://svn.slimdevices.com?rev=10052&view=rev
Log:
Bug: 4189
Description: Data from get_mp3info wins, as it is correct for SIZE.

Modified:
    trunk/server/Changelog6.html
    trunk/server/Slim/Formats/MP3.pm

Modified: trunk/server/Changelog6.html
URL: http://svn.slimdevices.com/trunk/server/Changelog6.html?rev=10052&r1=10051&r2=10052&view=diff
==============================================================================
--- trunk/server/Changelog6.html (original)
+++ trunk/server/Changelog6.html Tue Sep 26 13:55:56 2006
@@ -12,6 +12,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4171">#4171</a> - Default2 redirect to Default.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4173</a> - press right to add to favorites option disappears once you've used it, until you restart server</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4178</a> - Live365 stations don't have a note symbol</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4189">#4189</a> - mp3 file playback gets truncated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4191">#4191</a> - Live365 Search has missing strings</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4192">#4192</a> - IE doesn't refresh status</li>
 	<ul>

Modified: trunk/server/Slim/Formats/MP3.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Formats/MP3.pm?rev=10052&r1=10051&r2=10052&view=diff
==============================================================================
--- trunk/server/Slim/Formats/MP3.pm (original)
+++ trunk/server/Slim/Formats/MP3.pm Tue Sep 26 13:55:56 2006
@@ -156,7 +156,7 @@
 
 	# we'll always have $info, as it's machine generated.
 	if (scalar keys %tags && scalar keys %{$info}) {
-		%$info = (%$info, %tags);
+		%$info = (%tags, %$info);
 	}
 
 	# Strip out any nulls.