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

[dsully at svn.slimdevices.com]

Author: dsully
Date: Sun Sep  3 15:36:04 2006
New Revision: 9391

URL: http://svn.slimdevices.com?rev=9391&view=rev
Log:
Bug: 3998
Description: Merge from trunk -r 9389:9390

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

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=9391&r1=9390&r2=9391&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Sun Sep  3 15:36:04 2006
@@ -544,6 +544,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3980">#3980</a> - Initial WMA stream request sometimes gets truncated</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3981">#3981</a> - Firmware won't play alternate WMA streams</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3988">#3988</a> - bumpUp/Down to scroll bottom of screen only</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3998">#3998</a> - Multiple genre tags cause duplicate genre entries</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4000">#4000</a> - slave (spdif) clock settings are incorrect</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4003">#4003</a> - DAC mode should be called &quot;Audio Source&quot;</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4007">#4007</a> - Crash on Windows XP with -d_sql and running as a service</li>

Modified: branches/6.5/server/Slim/Formats.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Formats.pm?rev=9391&r1=9390&r2=9391&view=diff
==============================================================================
--- branches/6.5/server/Slim/Formats.pm (original)
+++ branches/6.5/server/Slim/Formats.pm Sun Sep  3 15:36:04 2006
@@ -243,12 +243,26 @@
 
 	# Bug: 2381 - FooBar2k seems to add UTF8 boms to their values.
 	# Bug: 3769 - Strip trailing nulls
+	# Bug: 3998 - Strip UTF-16 BOMs from multiple genres (or other values).
 	while (my ($tag, $value) = each %{$tags}) {
 
 		if (defined $tags->{$tag}) {
 
-			$tags->{$tag} =~ s/$Slim::Utils::Unicode::bomRE//;
-			$tags->{$tag} =~ s/\000$//;
+			use bytes;
+
+			if (ref($tags->{$tag}) eq 'ARRAY') {
+
+				for (my $i = 0; $i < scalar @{$tags->{$tag}}; $i++) {
+
+					$tags->{$tag}->[$i] =~ s/$Slim::Utils::Unicode::bomRE//;
+					$tags->{$tag}->[$i] =~ s/\000$//;
+				}
+
+			} else {
+
+				$tags->{$tag} =~ s/$Slim::Utils::Unicode::bomRE//;
+				$tags->{$tag} =~ s/\000$//;
+			}
 		}
 		
 		$::d_info && $_dump_tags && $value && msg(". $tag : $value\n");