Skip to content

Fix #24 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yalishanda42 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix #24 #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c035175
Fix #24
yalishanda42 Sep 19, 2020
b3b6c41
Perform change suggested by issue commenter
yalishanda42 Sep 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/main/java/co/moosic/music/TrackScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ public class TrackScheduler extends AudioEventAdapter {
AudioPlayer player;
private AudioPlayerManager playerManager;
private List<String> AutoPlay = new ArrayList<>();
private List<String> AutoDone = new ArrayList<>();
private final Random RANDOM = new Random();
private int lastSongIngex = -1;

TrackScheduler(AudioPlayer player, AudioPlayerManager playerManager) {
try (Scanner scanner = new Scanner(new File("songs.txt"))) {
Expand Down Expand Up @@ -110,7 +112,18 @@ public void onTrackStuck(AudioPlayer player, AudioTrack track, long thresholdMs)

private String getRandomSong() {
synchronized (RANDOM) {
return AutoPlay.get(RANDOM.nextInt(AutoPlay.size()));
if (AutoPlay.isEmpty()) {
System.out.println("Copying songs back into queue for next cycle");
for (String nextTrack : AutoDone) {
AutoPlay.add(nextTrack);
}
AutoDone.clear();
}
int trackPicked = RANDOM.nextInt(AutoPlay.size());
String pickedTrack = AutoPlay.get(trackPicked);
AutoDone.add(pickedTrack);
AutoPlay.remove(trackPicked);
return pickedTrack;
}
}

Expand Down Expand Up @@ -153,4 +166,4 @@ public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason
nextTrack();
}
}
}
}