=== Slim/Plugin/Pandora/ProtocolHandler.pm ================================================================== --- Slim/Plugin/Pandora/ProtocolHandler.pm (revision 29818) +++ Slim/Plugin/Pandora/ProtocolHandler.pm (local) @@ -347,8 +347,16 @@ $log->info("Direct stream failed: [$response] $status_line"); + my $line1 = $client->string('PLUGIN_PANDORA_ERROR'); + my $line2 = $client->string('PLUGIN_PANDORA_STREAM_FAILED'); + $client->showBriefly( { - line => [ $client->string('PLUGIN_PANDORA_ERROR'), $client->string('PLUGIN_PANDORA_STREAM_FAILED') ] + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { block => 1, @@ -398,13 +406,21 @@ if ( $action eq 'stop' && !canSkip($client) ) { # Is skip allowed? $log->debug("Pandora: Skip limit exceeded, disallowing skip"); - + + my $line1 = $client->string('PLUGIN_PANDORA_ERROR'); + my $line2 = $client->string('PLUGIN_PANDORA_SKIPS_EXCEEDED'); + $client->showBriefly( { - line => [ $client->string('PLUGIN_PANDORA_MODULE_NAME'), $client->string('PLUGIN_PANDORA_SKIPS_EXCEEDED') ] + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { + block => 1, scroll => 1, - block => 1, } ); return 0; === Slim/Plugin/RhapsodyDirect/ProtocolHandler.pm ================================================================== --- Slim/Plugin/RhapsodyDirect/ProtocolHandler.pm (revision 29818) +++ Slim/Plugin/RhapsodyDirect/ProtocolHandler.pm (local) @@ -94,7 +94,12 @@ my $line2 = $client->string('PLUGIN_RHAPSODY_DIRECT_STREAM_FAILED'); $client->showBriefly( { - line => [ $line1, $line2 ] + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { block => 1, @@ -140,9 +145,14 @@ my $line2 = $client->string('PLUGIN_RHAPSODY_DIRECT_TOO_MANY_SYNCED'); # Show message on all players - for my $client ( @clients ) { + for my $client ( @clients ) { $client->showBriefly( { - line => [ $line1, $line2 ] + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { block => 1, @@ -743,11 +753,16 @@ } else { # User was just starting a radio station + my $line1 = $client->string('PLUGIN_RHAPSODY_DIRECT_ERROR'); + my $line2 = $client->string('PLUGIN_RHAPSODY_DIRECT_NO_TRACK'); + $client->showBriefly( { - line => [ - $client->string('PLUGIN_RHAPSODY_DIRECT_ERROR'), - $client->string('PLUGIN_RHAPSODY_DIRECT_NO_TRACK'), - ], + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { scroll => 1, === Slim/Plugin/Slacker/ProtocolHandler.pm ================================================================== --- Slim/Plugin/Slacker/ProtocolHandler.pm (revision 29818) +++ Slim/Plugin/Slacker/ProtocolHandler.pm (local) @@ -191,9 +191,16 @@ Slim::Player::Source::playmode( $client, 'stop' ); } else { + my $line1 = $client->string('PLUGIN_SLACKER_ERROR'); + my $line2 = $title; + $client->showBriefly( { - line1 => $client->string('PLUGIN_SLACKER_ERROR'), - line2 => $title, + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { scroll => 1, @@ -349,9 +356,16 @@ $log->info("Direct stream failed: [$response] $status_line"); + my $line1 = $client->string('PLUGIN_SLACKER_ERROR'); + my $line2 = $client->string('PLUGIN_SLACKER_STREAM_FAILED'); + $client->showBriefly( { - line1 => $client->string('PLUGIN_SLACKER_ERROR'), - line2 => $client->string('PLUGIN_SLACKER_STREAM_FAILED'), + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { block => 1, @@ -381,10 +395,17 @@ if ( $action eq 'stop' && !canSkip($client) ) { # Is skip allowed? $log->debug("Slacker: Skip limit exceeded, disallowing skip"); + + my $line1 = $client->string('PLUGIN_SLACKER_ERROR'); + my $line2 = $client->string('PLUGIN_SLACKER_SKIPS_EXCEEDED'); $client->showBriefly( { - line1 => $client->string('PLUGIN_SLACKER_MODULE_NAME'), - line2 => $client->string('PLUGIN_SLACKER_SKIPS_EXCEEDED'), + line1 => $line1, + line2 => $line2, + jive => { + type => 'popupplay', + text => [ $line1, $line2 ], + }, }, { block => 1,