From 4158fc46a0b941f13f08013a6abe17a00b553727 Mon Sep 17 00:00:00 2001 From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com> Date: Sat, 7 May 2022 19:23:21 +0200 Subject: [PATCH] [Bandcamp] Fix regression of Opus radio streams extraction When moving opus-lo into a constant, opus-lo was renamed to opus_lo and was only used if no MP3 stream was available (which was not the case before the changes in BandcampRadioStreamExtractor related to the addition of the support of all delivery methods), so these changes removed the ability to get Opus streams of Bandcamp radios. This commit reverts this unwanted change. --- .../bandcamp/extractors/BandcampRadioStreamExtractor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java index 7389d4238..9668b8035 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java @@ -33,7 +33,7 @@ import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING; public class BandcampRadioStreamExtractor extends BandcampStreamExtractor { - private static final String OPUS_LO = "opus_lo"; + private static final String OPUS_LO = "opus-lo"; private static final String MP3_128 = "mp3-128"; private JsonObject showInfo; @@ -126,7 +126,9 @@ public class BandcampRadioStreamExtractor extends BandcampStreamExtractor { .setMediaFormat(MediaFormat.MP3) .setAverageBitrate(128) .build()); - } else if (streams.has(OPUS_LO)) { + } + + if (streams.has(OPUS_LO)) { audioStreams.add(new AudioStream.Builder() .setId(OPUS_LO) .setContent(streams.getString(OPUS_LO), true)