From ad5dd726bab181776a5b554210325fe33559678c Mon Sep 17 00:00:00 2001
From: Michael Herger <mherger@logitech.com>
Date: Sat, 5 Sep 2020 18:01:38 +0200
Subject: [PATCH] Revert "fix bitrate with icy data"

---
 Slim/Player/Protocols/HTTP.pm | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Slim/Player/Protocols/HTTP.pm b/Slim/Player/Protocols/HTTP.pm
index 456a4bbfca1..336338b14e0 100644
--- 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();