Nekojimi
/
Chords
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

Add back support for restarting the current track.

This commit is contained in:
Nekojimi 2022-06-23 17:58:15 +01:00
parent 4e654d2d18
commit ae7fe8cc7b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/moe/nekojimi/chords/QueueManager.java
View File

@ -26,6 +26,8 @@ import java.util.function.Consumer;
*/ */
public class QueueManager implements Consumer<Song> public class QueueManager implements Consumer<Song>
{ {
private Song restartingSong = null;
private final Queue<Song> jukeboxQueue; private final Queue<Song> jukeboxQueue;
private Playlist playlist; private Playlist playlist;
private MusicHandler handler; private MusicHandler handler;
@ -52,6 +54,13 @@ public class QueueManager implements Consumer<Song>
*/ */
public Song nextSongNeeded() public Song nextSongNeeded()
{ {
// if we're restarting the current song: store, clear, and return it
if (restartingSong != null)
{
Song ret = restartingSong;
restartingSong = null;
return ret;
}
// if there's anything in the queue, play that first // if there's anything in the queue, play that first
if (!jukeboxQueue.isEmpty()) if (!jukeboxQueue.isEmpty())
{ {
@ -118,6 +127,12 @@ public class QueueManager implements Consumer<Song>
public boolean restartSong() public boolean restartSong()
{ {
throw new UnsupportedOperationException("Not supported yet."); restartingSong = handler.getCurrentSong();
if (restartingSong != null)
{
handler.playNext();
return true;
} else
return false;
} }
} }