diff --git a/HTML/EN/html/lbrsilence-32.mp3 b/HTML/EN/html/lbrsilence-32.mp3 new file mode 100644 index 00000000000..675b4514e75 Binary files /dev/null and b/HTML/EN/html/lbrsilence-32.mp3 differ diff --git a/HTML/EN/html/lbrsilence.mp3 b/HTML/EN/html/lbrsilence-44.mp3 similarity index 100% rename from HTML/EN/html/lbrsilence.mp3 rename to HTML/EN/html/lbrsilence-44.mp3 diff --git a/HTML/EN/html/lbrsilence-48.mp3 b/HTML/EN/html/lbrsilence-48.mp3 new file mode 100644 index 00000000000..1b066fbb23f Binary files /dev/null and b/HTML/EN/html/lbrsilence-48.mp3 differ diff --git a/Slim/Networking/Async/HTTP.pm b/Slim/Networking/Async/HTTP.pm index 55ca16d4178..86764db8b87 100644 --- a/Slim/Networking/Async/HTTP.pm +++ b/Slim/Networking/Async/HTTP.pm @@ -186,7 +186,7 @@ sub use_proxy { sub send_request { my ( $self, $args, $redirect ) = @_; - $self->maxRedirect( $args->{maxRedirect} || MAX_REDIR ); + $self->maxRedirect( $args->{maxRedirect} // MAX_REDIR ); $self->response( undef ) unless $redirect; if ( $args->{Timeout} ) { diff --git a/Slim/Player/Source.pm b/Slim/Player/Source.pm index 039f30ee8c4..6418d43d3d7 100644 --- a/Slim/Player/Source.pm +++ b/Slim/Player/Source.pm @@ -288,8 +288,9 @@ sub _readNextChunk { my $chunk = ''; my $endofsong = undef; + my $samplerate = $client->streamingSong()->currentTrack->samplerate(); - if ($client->streamBytes() == 0 && $client->streamformat() eq 'mp3') { + if ($client->streamBytes() == 0 && $client->streamformat() eq 'mp3' && $samplerate >= 32000) { my $silence = 0; # use the maximum silence prelude for the whole sync group... @@ -305,8 +306,8 @@ sub _readNextChunk { 0 && $log->debug("We need to send $silence seconds of silence..."); while ($silence > 0) { - $chunk .= ${Slim::Web::HTTP::getStaticContent("html/lbrsilence.mp3")}; - $silence -= (1152 / 44100); + $chunk .= ${Slim::Web::HTTP::getStaticContent("html/lbrsilence-". int($samplerate/1000) . ".mp3")}; + $silence -= (1152 / $samplerate); } my $len = length($chunk); diff --git a/Slim/Web/HTTP.pm b/Slim/Web/HTTP.pm index 7004ae1c0e1..ba7e6fc38bb 100644 --- a/Slim/Web/HTTP.pm +++ b/Slim/Web/HTTP.pm @@ -2216,7 +2216,7 @@ sub sendStreamingResponse { } else { - $silence = getStaticContent("html/lbrsilence.mp3"); + $silence = getStaticContent("html/lbrsilence-44.mp3"); } my %segment = (