Fix more compile problems

Author: litetex

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java

@@ -1,12 +1,17 @@
 package org.schabi.newpipe.extractor.services.bandcamp.extractors;
 
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_API_URL;
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
+import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
+import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+
 import com.grack.nanojson.JsonArray;
 import com.grack.nanojson.JsonObject;
 import com.grack.nanojson.JsonParser;
 import com.grack.nanojson.JsonParserException;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Element;
-import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -16,21 +21,20 @@
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItemsCollector;
-import org.schabi.newpipe.extractor.stream.AudioStream;
 import org.schabi.newpipe.extractor.stream.Description;
 import org.schabi.newpipe.extractor.stream.StreamSegment;
+import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
+import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
+import org.schabi.newpipe.extractor.streamdata.stream.AudioStream;
+import org.schabi.newpipe.extractor.streamdata.stream.simpleimpl.SimpleAudioStreamImpl;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_API_URL;
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.BASE_URL;
-import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampExtractorHelper.getImageUrl;
-import static org.schabi.newpipe.extractor.utils.Utils.EMPTY_STRING;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class BandcampRadioStreamExtractor extends BandcampStreamExtractor {
 
@@ -119,24 +123,23 @@ public long getLength() {
 
     @Override
     public List<AudioStream> getAudioStreams() {
-        final List<AudioStream> audioStreams = new ArrayList<>();
         final JsonObject streams = showInfo.getObject("audio_stream");
 
+        final List<AudioStream> audioStreams = new ArrayList<>();
         if (streams.has(MP3_128)) {
-            audioStreams.add(new AudioStream.Builder()
-                    .setId(MP3_128)
-                    .setContent(streams.getString(MP3_128), true)
-                    .setMediaFormat(MediaFormat.MP3)
-                    .setAverageBitrate(128)
-                    .build());
+            audioStreams.add(new SimpleAudioStreamImpl(
+                    AudioFormatRegistry.MP3,
+                    new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(MP3_128)),
+                    128
+            ));
         }
 
         if (streams.has(OPUS_LO)) {
-            audioStreams.add(new AudioStream.Builder()
-                    .setId(OPUS_LO)
-                    .setContent(streams.getString(OPUS_LO), true)
-                    .setMediaFormat(MediaFormat.OPUS)
-                    .setAverageBitrate(100).build());
+            audioStreams.add(new SimpleAudioStreamImpl(
+                    AudioFormatRegistry.OPUS,
+                    new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(OPUS_LO)),
+                    100
+            ));
         }
 
         return audioStreams;

extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java

@@ -140,7 +140,8 @@ public void setUploaderVerified(final boolean uploaderVerified) {
     @Override
     public String toString() {
         return "StreamInfoItem{"
-                + "streamType=" + streamType
+                + "audioOnly=" + audioOnly
+                + ", live='" + live + '\''
                 + ", uploaderName='" + uploaderName + '\''
                 + ", textualUploadDate='" + textualUploadDate + '\''
                 + ", viewCount=" + viewCount