[Slim-Checkins] r8760 - in /trunk/server/Slim/Formats: FLAC.pm Playlists/CUE.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Tue Aug  1 15:05:36 2006
New Revision: 8760

URL: http://svn.slimdevices.com?rev=8760&view=rev
Log:
Bug: N/A
Description: Use contributorRoles() to get list of roles instead of hardcoding them.

Modified:
    trunk/server/Slim/Formats/FLAC.pm
    trunk/server/Slim/Formats/Playlists/CUE.pm

Modified: trunk/server/Slim/Formats/FLAC.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Formats/FLAC.pm?rev=8760&r1=8759&r2=8760&view=diff
==============================================================================
--- trunk/server/Slim/Formats/FLAC.pm (original)
+++ trunk/server/Slim/Formats/FLAC.pm Tue Aug  1 15:05:36 2006
@@ -46,7 +46,7 @@
 	'DISC #'			=> 'DISC',
 );
 
-my @tagNames = qw(ALBUM ARTIST BAND COMPOSER CONDUCTOR DISCNUMBER TITLE TRACKNUMBER DATE);
+my @tagNames = (Slim::Schema::Contributor->contributorRoles, qw(ALBUM DISCNUMBER TITLE TRACKNUMBER DATE));
 my $tagCache = [];
 
 # peem id (http://flac.sf.net/id.html http://peem.iconoclast.net/)

Modified: trunk/server/Slim/Formats/Playlists/CUE.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Formats/Playlists/CUE.pm?rev=8760&r1=8759&r2=8760&view=diff
==============================================================================
--- trunk/server/Slim/Formats/Playlists/CUE.pm (original)
+++ trunk/server/Slim/Formats/Playlists/CUE.pm Tue Aug  1 15:05:36 2006
@@ -104,6 +104,7 @@
 			$tracks->{$currtrack}->{'REPLAYGAIN_TRACK_PEAK'} = $1;
 			
 		} elsif (defined $currtrack and
+
 			$line =~ /^(?:\s+REM )?\s*(TITLE|YEAR|GENRE|COMMENT|COMPOSER|CONDUCTOR|BAND|DISC|DISCC)\s+\"(.*)\"/i) {
 
 			$tracks->{$currtrack}->{uc $1} = $2;
@@ -227,8 +228,8 @@
 		$track->{'TRACKNUM'} = $key;
 		$::d_parse && msg("    TRACKNUM: " . $track->{'TRACKNUM'} . "\n");
 
-		for my $attribute (qw(TITLE ARTIST ALBUM CONDUCTOR COMPOSER BAND YEAR 
-			GENRE REPLAYGAIN_TRACK_PEAK REPLAYGAIN_TRACK_GAIN)) {
+		for my $attribute (Slim::Schema::Contributor->contributorRoles,
+			qw(TITLE ALBUM YEAR GENRE REPLAYGAIN_TRACK_PEAK REPLAYGAIN_TRACK_GAIN)) {
 
 			if (exists $track->{$attribute}) {
 				$::d_parse && msg("    $attribute: " . $track->{$attribute} . "\n");