Make as much code common between AudioFileSourceHTTPStream and AudioFileSourceICYStream as possible #458
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AudioFileSourceHTTPStream doesn't enable redirects on ESP32 (I'm guessing this is some legacy things), whereas AudioFileSourceICYStream does. ESP32 supports redirects now, so let's make things consistent.
…ileSourceICYStream as possible Most of the AudioFileSourceHTTPStream was repeated in AudioFileSourceICYStream which caused some inconsistencies, e.g. redirects were enabled in ICY unconditionally and in HTTP only on devices other than ESP32. Now just the ICY-specific parts are implemented in AudioFileSourceICYStream. readInternal() is implemented only in AudioFileSourceHTTPStream and it delegates actual stream reading and parsing to a new virtual method parseInternal(). This wasy AudioFileSourceHTTPStream can merely read the data into the buffer and AudioFileSourceICYStream can parse metadata at will.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most of the AudioFileSourceHTTPStream was repeated in AudioFileSourceICYStream which caused some inconsistencies, e.g. redirects were enabled in ICY unconditionally and in HTTP only on devices other than ESP32.
Now just the ICY-specific parts are implemented in AudioFileSourceICYStream. readInternal() is implemented only in
AudioFileSourceHTTPStream and it delegates actual stream reading and parsing to a new virtual method parseInternal(). This wasy AudioFileSourceHTTPStream can merely read the data into the buffer and AudioFileSourceICYStream can parse metadata at will.
Additionally some HTTP error callback report error code (easier debugging) and reconnection failure is not reported if reconnection was not enabled at all (less confusing).