input/curl: remove impossible "icy" checks

The IcyMetaDataParser cannot be initialized already in OnHeaders(), because it will be initialized late in that method; and there will not be another OnHeaders() call, because streams with Icy metadata are not seekable, thus there will not be another HTTP request.

input/curl: remove impossible "icy" checks
70c4b621 · Max Kellermann · a8df5e10 · 70c4b621
Commit 70c4b621 authored Jan 11, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

CurlInputPlugin.cxx src/input/plugins/CurlInputPlugin.cxx +4 -4

No files found.
--- a/src/input/plugins/CurlInputPlugin.cxx
+++ b/src/input/plugins/CurlInputPlugin.cxx
@@ -183,6 +183,7 @@ CurlInputStream::OnHeaders(unsigned status,
 {
 	assert(GetEventLoop().IsInside());
 	assert(!postponed_exception);
+	assert(!icy || !icy->IsDefined());
 	if (status < 200 || status >= 300)
 		throw FormatRuntimeError("got HTTP status %ld", status);
@@ -195,9 +196,7 @@ CurlInputStream::OnHeaders(unsigned status,
 		return;
 	}
-	if (!icy->IsDefined() &&
+	if (headers.find("accept-ranges") != headers.end())
-	    headers.find("accept-ranges") != headers.end())
-		/* a stream with icy-metadata is not seekable */
 		seekable = true;
 	auto i = headers.find("content-length");
@@ -222,7 +221,7 @@ CurlInputStream::OnHeaders(unsigned status,
 		SetTag(tag_builder.CommitNew());
 	}
-	if (!icy->IsDefined()) {
+	if (icy) {
 		i = headers.find("icy-metaint");
 		if (i != headers.end()) {
@@ -429,6 +428,7 @@ void
 CurlInputStream::DoSeek(offset_type new_offset)
 {
 	assert(IsReady());
+	assert(seekable);
 	const ScopeUnlock unlock(mutex);