antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deleted unused code in MultiPlayer

Browse source
This commit is contained in:
CappielloAntonio 2021-07-17 19:25:07 +02:00
parent 1ab7c7f91a
commit 40bf7ae7d6
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/com/cappielloantonio/play/service/MultiPlayer.java
View file

@ -12,18 +12,15 @@ import com.cappielloantonio.play.util.DownloadUtil;
import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.util.MusicUtil;
import com.cappielloantonio.play.util.PreferenceUtil; import com.cappielloantonio.play.util.PreferenceUtil;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.database.ExoDatabaseProvider; import com.google.android.exoplayer2.database.ExoDatabaseProvider;
import com.google.android.exoplayer2.source.DefaultMediaSourceFactory; import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.FileDataSource;
import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor; import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
import com.google.android.exoplayer2.upstream.cache.SimpleCache; import com.google.android.exoplayer2.upstream.cache.SimpleCache;
@ -99,11 +96,10 @@ public class MultiPlayer implements Playback {
this.context = context; this.context = context;
// Create a read-only cache data source factory using the download cache. // Create a read-only cache data source factory using the download cache.
DataSource.Factory cacheDataSourceFactory = DataSource.Factory cacheDataSourceFactory = new CacheDataSource.Factory()
new CacheDataSource.Factory() .setCache(DownloadUtil.getDownloadCache(context))
.setCache(DownloadUtil.getDownloadCache(context)) .setUpstreamDataSourceFactory(DownloadUtil.getHttpDataSourceFactory(context))
.setUpstreamDataSourceFactory(DownloadUtil.getHttpDataSourceFactory(context)) .setCacheWriteDataSinkFactory(null); // Disable writing.
.setCacheWriteDataSinkFactory(null); // Disable writing.
AudioAttributes audioAttributes = new AudioAttributes.Builder() AudioAttributes audioAttributes = new AudioAttributes.Builder()
.setUsage(C.USAGE_MEDIA) .setUsage(C.USAGE_MEDIA)
@ -115,9 +111,6 @@ public class MultiPlayer implements Playback {
.setAudioAttributes(audioAttributes, true) .setAudioAttributes(audioAttributes, true)
.build(); .build();
// TODO: “Player is accessed on the wrong thread” suppressed
// exoPlayer.setThrowsWhenUsingWrongThread(false);
exoPlayer.addListener(eventListener); exoPlayer.addListener(eventListener);
exoPlayer.prepare(); exoPlayer.prepare();
@ -131,10 +124,9 @@ public class MultiPlayer implements Playback {
@Override @Override
public void setDataSource(Song song) { public void setDataSource(Song song) {
String uri = MusicUtil.getSongFileUri(song);
MediaItem mediaItem = exoPlayer.getCurrentMediaItem(); MediaItem mediaItem = exoPlayer.getCurrentMediaItem();
if (mediaItem != null && mediaItem.playbackProperties.uri.toString().equals(uri)) { if (mediaItem != null && mediaItem.mediaId.equals(song.getId())) {
return; return;
} }
@ -143,6 +135,7 @@ public class MultiPlayer implements Playback {
exoPlayer.seekTo(0, 0); exoPlayer.seekTo(0, 0);
} }
@Override @Override
public void queueDataSource(Song song) { public void queueDataSource(Song song) {
while (exoPlayer.getMediaItemCount() > 1) { while (exoPlayer.getMediaItemCount() > 1) {
@ -159,17 +152,6 @@ public class MultiPlayer implements Playback {
exoPlayer.addMediaItem(mediaItem); exoPlayer.addMediaItem(mediaItem);
} }
private DataSource.Factory buildDataSourceFactory() {
return () -> new CacheDataSource(
simpleCache,
new DefaultDataSourceFactory(context, context.getPackageName(), null).createDataSource(),
new FileDataSource(),
new CacheDataSink(simpleCache, 10 * 1024 * 1024),
CacheDataSource.FLAG_BLOCK_ON_CACHE,
null
);
}
@Override @Override
public void setCallbacks(Playback.PlaybackCallbacks callbacks) { public void setCallbacks(Playback.PlaybackCallbacks callbacks) {
this.callbacks = callbacks; this.callbacks = callbacks;