Jonas_Jones/ZtereoMUSIC
1
0
Fork 0
mirror of https://github.com/JonasunderscoreJones/ZtereoMUSIC.git synced 2025-10-28 05:34:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change: refactor to use the new stuff

Browse source
This commit is contained in:
ZtereoHYPE 2021-11-08 03:02:06 +01:00
parent e76d236278
commit 6f4c00d4dc
4 changed files with 53 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/main/java/codes/ztereohype/ztereomusic/audio/TrackManager.java
View file

@ -13,7 +13,7 @@ import java.util.List;
public class TrackManager extends AudioEventAdapter {
private final @Getter AudioPlayer player;
private final List<AudioTrack> trackQueue = new ArrayList<>();
public final List<AudioTrack> trackQueue = new ArrayList<>();
private final MessageChannel infoChannel;
public TrackManager(AudioPlayer player, MessageChannel infoChannel) {
@ -22,20 +22,10 @@ public class TrackManager extends AudioEventAdapter {
}
public void queue(AudioTrack track) {
// change this to add to queue and call onTrackEnd!
if (player.getPlayingTrack() == null) {
play(track);
} else {
trackQueue.add(track);
infoChannel.sendMessage("Queued " + track.getInfo().title);
}
trackQueue.add(track);
}
private void play(AudioTrack track) {
player.playTrack(track);
}
private void playNext() {
public void playNext() {
// if the player was playing a track (probably means it's a skip), stop it
if (player.getPlayingTrack() != null) {
player.stopTrack();
@ -48,36 +38,18 @@ public class TrackManager extends AudioEventAdapter {
AudioTrack nextTrack = trackQueue.get(0);
trackQueue.remove(nextTrack);
play(nextTrack);
player.playTrack(nextTrack);
infoChannel.sendMessage("Playing next track: " + nextTrack.getInfo().title).queue();
}
public void pause() {
player.setPaused(true);
}
public void resume() {
player.setPaused(false);
}
public void skip() {
playNext();
}
@Override
public void onPlayerPause(AudioPlayer player) {}
@Override
public void onPlayerPause(AudioPlayer player) {
// infoChannel.sendMessage("Pausing...").queue();
}
public void onPlayerResume(AudioPlayer player) {}
@Override
public void onPlayerResume(AudioPlayer player) {
// infoChannel.sendMessage("Resuming...").queue();
}
@Override
public void onTrackStart(AudioPlayer player, AudioTrack track) {
// infoChannel.sendMessage("Starting track: " + track.getInfo().title).queue();
}
public void onTrackStart(AudioPlayer player, AudioTrack track) {}
@Override
public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
@ -85,6 +57,10 @@ public class TrackManager extends AudioEventAdapter {
playNext();
}
if (endReason.equals(AudioTrackEndReason.CLEANUP)) {
// todo: leave the vc?
}
// endReason == FINISHED: A track finished or died by an exception (mayStartNext = true).
// endReason == LOAD_FAILED: Loading of a track failed (mayStartNext = true).
// endReason == STOPPED: The player was stopped.