Merge pull request #1175 from darrell-k/include-track-artists

Include track artists in combined artist list
LMS-Community · Oct 14, 2024 · e6c043d · e6c043d
2 parents c4019e1 + 7ad6065
commit e6c043d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Slim/Control/Queries.pm b/Slim/Control/Queries.pm
@@ -1043,7 +1043,7 @@ sub artistsQuery {
 			$roles = [ map { Slim::Schema::Contributor->typeToRole($_) } split(/,/, $roleID ) ];
 		}
 		elsif ($prefs->get('useUnifiedArtistsList')) {
-			$roles = Slim::Schema->artistOnlyRoles();
+			$roles = Slim::Schema->artistOnlyRoles('TRACKARTIST');
 		}
 		else {
 			$roles = [ map { Slim::Schema::Contributor->typeToRole($_) } Slim::Schema::Contributor->contributorRoles() ];

diff --git a/Slim/Schema/ResultSet/Contributor.pm b/Slim/Schema/ResultSet/Contributor.pm
@@ -45,7 +45,7 @@ sub countTotal {
 
 	my $cond  = {};
 	my @joins = ();
-	my $roles = $prefs->get('useUnifiedArtistsList') ? Slim::Schema->artistOnlyRoles : [ Slim::Schema::Contributor->contributorRoleIds ];
+	my $roles = $prefs->get('useUnifiedArtistsList') ? Slim::Schema->artistOnlyRoles('TRACKARTIST') : [ Slim::Schema::Contributor->contributorRoleIds ];
 
 	# The user may not want to include all the composers / conductors
 	if ($roles) {

diff --git a/Slim/Web/Pages/Search.pm b/Slim/Web/Pages/Search.pm
@@ -508,7 +508,7 @@ sub _initActiveRoles {
 		$params->{'search'}->{'contributor_namesearch'}->{'active' . $_} = 1 if $params->{'search.contributor_namesearch.active' . $_};
 	}
 
-	$params->{'search'}->{'contributor_namesearch'} = { map { ('active' . $_) => 1 } @{ Slim::Schema->artistOnlyRoles } } unless keys %{$params->{'search'}->{'contributor_namesearch'}};
+	$params->{'search'}->{'contributor_namesearch'} = { map { ('active' . $_) => 1 } @{ Slim::Schema->artistOnlyRoles('TRACKARTIST') } } unless keys %{$params->{'search'}->{'contributor_namesearch'}};
 }
 
 sub _getSavedSearches {