Package: slimserver
Version: 6.2.1-2
Tags: patch
Slimserver assumes that in CUE files several tags such as TRACK or
PERFORMER are indented. This indentation is neither necessary nor is
it generated by tools such as "cueconvert". The patch below fixes the
problem by making the leading whitespace optional for the tags in
question.
Regards,
--david
--- SlimServer_v6.2.1/Slim/Formats/Parse.pm 2005-11-14 17:12:32.000000000
-0700
+++ SlimServer_v6.2.1-davidm/Slim/Formats/Parse.pm 2006-03-13
08:46:04.000000000 -0700
@@ -346,22 +349,21 @@
$filename = $1;
$filename = Slim::Utils::Misc::fixPath($filename,
$cuedir);
- } elsif ($line =~ /^\s+TRACK\s+(\d+)\s+AUDIO/i) {
+ } elsif ($line =~ /^\s*TRACK\s+(\d+)\s+AUDIO/i) {
$currtrack = int ($1);
-
- } elsif (defined $currtrack and $line =~
/^\s+PERFORMER\s+\"(.*)\"/i) {
+ } elsif (defined $currtrack and $line =~
/^\s*PERFORMER\s+\"(.*)\"/i) {
$tracks->{$currtrack}->{'ARTIST'} = $1;
} elsif (defined $currtrack and
- $line =~
/^(?:\s+REM)?\s+(TITLE|YEAR|GENRE|COMMENT|COMPOSER|CONDUCTOR|BAND|DISC|DISCC)\s+\"(.*)\"/i)
{
+ $line =~ /^(?:\s+REM
)?\s*(TITLE|YEAR|GENRE|COMMENT|COMPOSER|CONDUCTOR|BAND|DISC|DISCC)\s+\"(.*)\"/i)
{
$tracks->{$currtrack}->{uc $1} = $2;
- } elsif (defined $currtrack and $line =~
/^\s+INDEX\s+00\s+(\d+):(\d+):(\d+)/i) {
+ } elsif (defined $currtrack and $line =~
/^\s*INDEX\s+00\s+(\d+):(\d+):(\d+)/i) {
$tracks->{$currtrack}->{'PREGAP'} = ($1 * 60) + $2 +
($3 / 75);
- } elsif (defined $currtrack and $line =~
/^\s+INDEX\s+01\s+(\d+):(\d+):(\d+)/i) {
+ } elsif (defined $currtrack and $line =~
/^\s*INDEX\s+01\s+(\d+):(\d+):(\d+)/i) {
$tracks->{$currtrack}->{'START'} = ($1 * 60) + $2 + ($3
/ 75);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
