Skip to content

Commit 474c3cd

Browse files
committed
Fix more compile problems
1 parent a2df180 commit 474c3cd

2 files changed

Lines changed: 17 additions & 15 deletions

File tree

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.jsoup.Jsoup;
1313
import org.jsoup.nodes.Element;
14-
import org.schabi.newpipe.extractor.MediaFormat;
1514
import org.schabi.newpipe.extractor.NewPipe;
1615
import org.schabi.newpipe.extractor.StreamingService;
1716
import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -21,9 +20,12 @@
2120
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
2221
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
2322
import org.schabi.newpipe.extractor.playlist.PlaylistInfoItemsCollector;
24-
import org.schabi.newpipe.extractor.stream.AudioStream;
2523
import org.schabi.newpipe.extractor.stream.Description;
2624
import org.schabi.newpipe.extractor.stream.StreamSegment;
25+
import org.schabi.newpipe.extractor.streamdata.delivery.simpleimpl.SimpleProgressiveHTTPDeliveryDataImpl;
26+
import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
27+
import org.schabi.newpipe.extractor.streamdata.stream.AudioStream;
28+
import org.schabi.newpipe.extractor.streamdata.stream.simpleimpl.SimpleAudioStreamImpl;
2729

2830
import java.io.IOException;
2931
import java.util.ArrayList;
@@ -120,24 +122,23 @@ public long getLength() {
120122

121123
@Override
122124
public List<AudioStream> getAudioStreams() {
123-
final List<AudioStream> audioStreams = new ArrayList<>();
124125
final JsonObject streams = showInfo.getObject("audio_stream");
125126

127+
final List<AudioStream> audioStreams = new ArrayList<>();
126128
if (streams.has(MP3_128)) {
127-
audioStreams.add(new AudioStream.Builder()
128-
.setId(MP3_128)
129-
.setContent(streams.getString(MP3_128), true)
130-
.setMediaFormat(MediaFormat.MP3)
131-
.setAverageBitrate(128)
132-
.build());
129+
audioStreams.add(new SimpleAudioStreamImpl(
130+
AudioFormatRegistry.MP3,
131+
new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(MP3_128)),
132+
128
133+
));
133134
}
134135

135136
if (streams.has(OPUS_LO)) {
136-
audioStreams.add(new AudioStream.Builder()
137-
.setId(OPUS_LO)
138-
.setContent(streams.getString(OPUS_LO), true)
139-
.setMediaFormat(MediaFormat.OPUS)
140-
.setAverageBitrate(100).build());
137+
audioStreams.add(new SimpleAudioStreamImpl(
138+
AudioFormatRegistry.OPUS,
139+
new SimpleProgressiveHTTPDeliveryDataImpl(streams.getString(OPUS_LO)),
140+
100
141+
));
141142
}
142143

143144
return audioStreams;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ public void setUploaderVerified(final boolean uploaderVerified) {
140140
@Override
141141
public String toString() {
142142
return "StreamInfoItem{"
143-
+ "streamType=" + streamType
143+
+ "audioOnly=" + audioOnly
144+
+ ", live='" + live + '\''
144145
+ ", uploaderName='" + uploaderName + '\''
145146
+ ", textualUploadDate='" + textualUploadDate + '\''
146147
+ ", viewCount=" + viewCount

0 commit comments

Comments
 (0)