From 6d8c86d7683e18cdc62370c479a9db24cc8b100c Mon Sep 17 00:00:00 2001 From: Brandon Date: Sat, 7 Apr 2018 19:18:18 -0400 Subject: Add list queued support --- src/main/java/soundchan/Main.java | 18 +++++++++++++++++- src/main/java/soundchan/TrackScheduler.java | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/soundchan/Main.java b/src/main/java/soundchan/Main.java index 326285f..8b1ccfc 100644 --- a/src/main/java/soundchan/Main.java +++ b/src/main/java/soundchan/Main.java @@ -131,7 +131,11 @@ public class Main extends ListenerAdapter { pauseTrack(channel); } else if ("~unpause".equals(command[0])) { unpauseTrack(channel); - }} + } else if ("~list".equals(command[0])) { + listTracks(channel); + } + + } super.onMessageReceived(event); } @@ -142,6 +146,17 @@ public class Main extends ListenerAdapter { channel.sendMessage("Volume now set to " + volume + "%").queue(); } + private void listTracks(final MessageChannel channel) { + GuildMusicManager musicManager = getGuildAudioPlayer(); + List queueContents = musicManager.scheduler.getQueueContents(); + String printMessage = "Tracks in the queue:\n"; + for (String track: + queueContents) { + printMessage = printMessage + track + "\n"; + } + channel.sendMessage(printMessage).queue(); + } + private void pauseTrack(final MessageChannel channel){ GuildMusicManager musicManager = getGuildAudioPlayer(); musicManager.player.setPaused(true); @@ -163,6 +178,7 @@ public class Main extends ListenerAdapter { int timeStart = trackUrl.lastIndexOf('='); if(timeStart != -1){ String timeString = trackUrl.substring(timeStart); + //The format will be 1h2m53s, need to parse that into seconds and then call //track.setPosition(long position) diff --git a/src/main/java/soundchan/TrackScheduler.java b/src/main/java/soundchan/TrackScheduler.java index 7f1c258..21bb6d4 100644 --- a/src/main/java/soundchan/TrackScheduler.java +++ b/src/main/java/soundchan/TrackScheduler.java @@ -2,9 +2,14 @@ package soundchan; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter; +import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason; +import com.sedmelluq.discord.lavaplayer.track.DelegatedAudioTrack; +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -37,6 +42,17 @@ public class TrackScheduler extends AudioEventAdapter { } } + public List getQueueContents() { + // Returns a list of the tracks in the queue + Object[] queueInfo = queue.toArray(); + List tracks = new ArrayList<>(); + for (Object item: + queueInfo) { + tracks.add(((DelegatedAudioTrack) item).getInfo().title); + } + return tracks; + } + /** * Start the next track, stopping the current one if it is playing. */ -- cgit v1.2.3 From 05395d976b90ec672a6edc7b81180fff3a679140 Mon Sep 17 00:00:00 2001 From: Brandon Date: Sat, 7 Apr 2018 19:44:58 -0400 Subject: Add local file support (hardcoded mp3s) --- src/main/java/soundchan/Main.java | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/soundchan/Main.java b/src/main/java/soundchan/Main.java index 8b1ccfc..651d16b 100644 --- a/src/main/java/soundchan/Main.java +++ b/src/main/java/soundchan/Main.java @@ -33,6 +33,8 @@ public class Main extends ListenerAdapter { .setToken(properties.getProperty("botToken")) .buildBlocking(); + localFilePath = properties.getProperty("localFilePath"); + jda.addEventListener(new Main()); } @@ -57,6 +59,7 @@ public class Main extends ListenerAdapter { private long monitoredGuildId = -1; private Guild monitoredGuild; + private static String localFilePath; private final AudioPlayerManager playerManager; private final Map musicManagers; @@ -121,19 +124,28 @@ public class Main extends ListenerAdapter { } if(monitoredGuild != null){ - if ("~play".equals(command[0]) && command.length == 2) { - loadAndPlay(channel, command[1]); - } else if ("~skip".equals(command[0])) { - skipTrack(channel); - } else if ("~volume".equals(command[0]) && command.length == 2) { - changeVolume(channel, command[1]); - } else if ("~pause".equals(command[0])) { - pauseTrack(channel); - } else if ("~unpause".equals(command[0])) { - unpauseTrack(channel); - } else if ("~list".equals(command[0])) { - listTracks(channel); - } + + // "!" Signifies that you're looking to play a sound effect + if(command[0].startsWith("!") && command[0].length() > 1){ + loadAndPlay(channel, localFilePath + "\\" + command[0].substring(1) + ".mp3"); + } + + // "~" Signifies that you're looking to play a song/sound from a url + if(command[0].startsWith("~") && command[0].length() > 1){ + if ("~play".equals(command[0]) && command.length == 2) { + loadAndPlay(channel, command[1]); + } else if ("~skip".equals(command[0])) { + skipTrack(channel); + } else if ("~volume".equals(command[0]) && command.length == 2) { + changeVolume(channel, command[1]); + } else if ("~pause".equals(command[0])) { + pauseTrack(channel); + } else if ("~unpause".equals(command[0])) { + unpauseTrack(channel); + } else if ("~list".equals(command[0])) { + listTracks(channel); + } + } } -- cgit v1.2.3