[Slim-Checkins] r10005 - /trunk/server/lib/Audio/FLAC/Header.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Fri Sep 22 21:44:48 2006
New Revision: 10005

URL: http://svn.slimdevices.com?rev=10005&view=rev
Log:
Bug: N/A
Description: Slight regex tweak

Modified:
    trunk/server/lib/Audio/FLAC/Header.pm

Modified: trunk/server/lib/Audio/FLAC/Header.pm
URL: http://svn.slimdevices.com/trunk/server/lib/Audio/FLAC/Header.pm?rev=10005&r1=10004&r2=10005&view=diff
==============================================================================
--- trunk/server/lib/Audio/FLAC/Header.pm (original)
+++ trunk/server/lib/Audio/FLAC/Header.pm Fri Sep 22 21:44:48 2006
@@ -555,7 +555,7 @@
 
 	# First field in block is the Media Catalog Number
 	my $catalog   = substr($tmpBlock,0,128);
-	$catalog =~ s/\x00*.*$//gs; # trim nulls off of the end
+	$catalog =~ s/\x00+.*$//gs; # trim nulls off of the end
 
 	push (@$cuesheet, "CATALOG $catalog\n") if length($catalog) > 0;
 	$tmpBlock     = substr($tmpBlock,128);
@@ -640,7 +640,7 @@
 		$seenTracknumber{$tracknum} = 1;
 
 		my $isrc = substr($tmpBlock,9,12);
-		   $isrc =~ s/\x00*.*$//;
+		   $isrc =~ s/\x00+.*$//;
 
 		if ((length($isrc) != 0) && (length($isrc) != 12)) {
 			warn "Invalid ISRC code $isrc\n";