asgardius/s3music
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

play queue

Browse source
This commit is contained in:
Page Asgardius 2023-01-02 12:07:30 -07:00
parent c3cf489510
commit 48fa899a97
2 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
View file

@ -458,7 +458,6 @@ public class ObjectSelect extends AppCompatActivity {
} }
private void videoPlayer(String url, String title) { private void videoPlayer(String url, String title) {
if (isplaylist) { if (isplaylist) {
Thread mediaread = new Thread(new Runnable() { Thread mediaread = new Thread(new Runnable() {
@ -473,10 +472,6 @@ public class ObjectSelect extends AppCompatActivity {
} }
} }
ArrayList<String> links = getLinks(medialist); ArrayList<String> links = getLinks(medialist);
for (int i = 0; i < links.size(); i++) {
System.out.println(links.get(i));
}
System.out.println("Position of selected file: "+medialist.indexOf(title));
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@ -484,6 +479,15 @@ public class ObjectSelect extends AppCompatActivity {
public void run() { public void run() {
// Sending reference and data to Adapter // Sending reference and data to Adapter
//videoPlayer(objectURL.toString(), Name.get(position).toString()); //videoPlayer(objectURL.toString(), Name.get(position).toString());
Intent intent = new Intent(getApplicationContext(), VideoPlayer.class);
intent.putExtra("video_url", url);
intent.putExtra("title", title);
intent.putExtra("videocache", videocache);
intent.putExtra("buffersize", buffersize);
intent.putExtra("isplaylist", isplaylist);
intent.putExtra("queue", links);
intent.putExtra("names", medialist);
startActivity(intent);
} }
}); });
//System.out.println("tree "+treelevel); //System.out.println("tree "+treelevel);

34
app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
View file

@ -127,13 +127,6 @@ public class VideoPlayer extends AppCompatActivity {
new File(this.getCacheDir(), "media"), new File(this.getCacheDir(), "media"),
evictor, evictor,
standaloneDatabaseProvider); standaloneDatabaseProvider);
mediaSource = new ProgressiveMediaSource.Factory(
new CacheDataSource.Factory()
.setCache(simpleCache)
.setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
.setUserAgent("S3 Manager"))
.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL)));
playerView.setPlayer(player); playerView.setPlayer(player);
control = new StyledPlayerView.ControllerVisibilityListener() { control = new StyledPlayerView.ControllerVisibilityListener() {
@Override @Override
@ -155,13 +148,40 @@ public class VideoPlayer extends AppCompatActivity {
playerNotificationManager = new PlayerNotificationManager.Builder(this, notificationId, "playback").build(); playerNotificationManager = new PlayerNotificationManager.Builder(this, notificationId, "playback").build();
playerNotificationManager.setMediaSessionToken(mediaSession.getSessionToken()); playerNotificationManager.setMediaSessionToken(mediaSession.getSessionToken());
playerNotificationManager.setPlayer(player); playerNotificationManager.setPlayer(player);
if (isplaylist) {
for (int i = 0; i < queue.size(); i++) {
if (names.get(i).endsWith(".m3u8")) {
MediaItem mediaItem = MediaItem.fromUri(queue.get(i));
player.addMediaItem(mediaItem);
} else {
mediaSource = new ProgressiveMediaSource.Factory(
new CacheDataSource.Factory()
.setCache(simpleCache)
.setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
.setUserAgent("S3 Manager"))
.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
).createMediaSource(MediaItem.fromUri(Uri.parse(queue.get(i))));
player.addMediaSource(mediaSource);
}
}
player.prepare();
player.seekTo(names.indexOf(title), 0);
} else {
if (title.endsWith(".m3u8")) { if (title.endsWith(".m3u8")) {
MediaItem mediaItem = MediaItem.fromUri(videoURL); MediaItem mediaItem = MediaItem.fromUri(videoURL);
player.setMediaItem(mediaItem); player.setMediaItem(mediaItem);
} else { } else {
mediaSource = new ProgressiveMediaSource.Factory(
new CacheDataSource.Factory()
.setCache(simpleCache)
.setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
.setUserAgent("S3 Manager"))
.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL)));
player.setMediaSource(mediaSource); player.setMediaSource(mediaSource);
} }
player.prepare(); player.prepare();
}
// Start the playback. // Start the playback.
player.play(); player.play();