Merge pull request #415 from Logitech/revert-413-bitrate

Revert "fix bitrate with icy data"
LMS-Community · Sep 5, 2020 · 4e38003 · 4e38003
2 parents edbf8a2 + ad5dd72
commit 4e38003
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/Slim/Player/Protocols/HTTP.pm b/Slim/Player/Protocols/HTTP.pm
@@ -549,12 +549,6 @@ sub parseDirectHeaders {
 		($oggType) = $url->content_type =~ /(ogf|ogg|ops)/;
 		$url = $url->url;
 	}
-
-	my $song = ${*$self}{'song'} if blessed $self;
-
-	if (!$song && $client->controller()->songStreamController()) {
-		$song = $client->controller()->songStreamController()->song();
-	}
 
 	my ($title, $bitrate, $metaint, $redir, $contentType, $length, $body);
 	my ($rangeLength, $startOffset);
@@ -573,11 +567,9 @@ sub parseDirectHeaders {
 			$title = Slim::Utils::Unicode::utf8decode_guess($1);
 		}
 
-		elsif ($header =~ /^(?:icy-br|x-audiocast-bitrate):\s*(.+)/i) 
-			if ($song && !$song->bitrate) {
-				$bitrate = $1;
-				$bitrate *= 1000 if $bitrate < 8000;
-			}	
+		elsif ($header =~ /^(?:icy-br|x-audiocast-bitrate):\s*(.+)/i) {
+			$bitrate = $1;
+			$bitrate *= 1000 if $bitrate < 1000;
 		}
 
 		elsif ($header =~ /^icy-metaint:\s*(.+)/i) {
@@ -614,6 +606,12 @@ sub parseDirectHeaders {
 		$length = $rangeLength;
 	}
 
+	my $song = ${*self}{'song'} if blessed $self;
+
+	if (!$song && $client->controller()->songStreamController()) {
+		$song = $client->controller()->songStreamController()->song();
+	}
+
 	if ($song && $length) {
 		my $seekdata = $song->seekdata();