=== Slim/Control/Queries.pm ================================================================== --- Slim/Control/Queries.pm (revision 25901) +++ Slim/Control/Queries.pm (local) @@ -5669,7 +5669,12 @@ # get our parameters my $id = $request->getParam('_artworkid'); - $request->addResult('artworkId' => $id); + if ($id =~ /:\/\//) { + $request->addResult('artworkUrl' => $id); + } else { + $request->addResult('artworkId' => $id); + } + $request->addResult('offset', 0); $request->setStatusDone(); @@ -5772,7 +5777,6 @@ my ($Imports, $mixers) = _mixers(); - $request->addResult('count', scalar(@$mixers) ); $request->addResult('offset', 0 ); $request->addResult('window', { menuStyle => '' } ); my $chunkCount = 0; @@ -5789,30 +5793,31 @@ $obj = Slim::Schema->find('Genre', $obj_id); } + my @mixable_mixers; for my $mixer (@$mixers) { - my $token = $Imports->{$mixer}->{'contextToken'}; - my $string = $request->string($token); - $request->addResultLoop('item_loop', $chunkCount, 'text', $string); - my $actions; + if ( blessed($obj) && $mixer->mixable($obj) ) { + push @mixable_mixers, $mixer; + } + } - if ( blessed($obj) && $mixer->mixable($obj) ) { + if ( scalar(@mixable_mixers) == 0 ) { + $request->addResult('count', 1); + $request->addResultLoop('item_loop', 0, 'text', $request->string('NO_MIXERS_AVAILABLE') ); + $request->addResultLoop('item_loop', 0, 'style', 'itemNoAction'); + } else { + $request->addResult('count', scalar(@mixable_mixers) ); + for my $mixer ( @mixable_mixers ) { + my $token = $Imports->{$mixer}->{'contextToken'}; + my $string = $request->string($token); + $request->addResultLoop('item_loop', $chunkCount, 'text', $string); + my $actions; my $command = Storable::dclone( $Imports->{$mixer}->{cliBase} ); $command->{'params'}{'menu'} = 1; $command->{'params'}{$obj_param} = $obj->id; $actions->{go} = $command; - } else { - $actions = { - do => { - player => 0, - cmd => ['jiveunmixable'], - params => { - contextToken => $Imports->{$mixer}->{contextToken}, - }, - } - }; + $request->addResultLoop('item_loop', $chunkCount, 'actions', $actions); + $chunkCount++; } - $request->addResultLoop('item_loop', $chunkCount, 'actions', $actions); - $chunkCount++; } $request->setStatusDone(); === strings.txt ================================================================== --- strings.txt (revision 25901) +++ strings.txt (local) @@ -18661,6 +18661,9 @@ NO %s er ikke tilgjengelig for dette elementet SV %s är inte tillgängligt för det här objektet +NO_MIXERS_AVAILABLE + EN No mixers available + PLAYER_BRIGHTNESS DA Afspillerens lysstyrke DE Player-Helligkeit