forked from jagrosh/MusicBot
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
183 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,15 +19,15 @@ | |
| import com.jagrosh.jmusicbot.queue.AbstractQueue; | ||
| import com.jagrosh.jmusicbot.settings.QueueType; | ||
| import com.jagrosh.jmusicbot.settings.RepeatMode; | ||
| import com.jagrosh.jmusicbot.utils.OtherUtil; | ||
| import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; | ||
| import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter; | ||
| import com.sedmelluq.discord.lavaplayer.track.AudioTrack; | ||
| import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason; | ||
| import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame; | ||
| import java.util.HashSet; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import com.jagrosh.jmusicbot.settings.Settings; | ||
| import com.jagrosh.jmusicbot.utils.FormatUtil; | ||
| import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack; | ||
|
|
@@ -36,15 +36,20 @@ | |
| import net.dv8tion.jda.api.JDA; | ||
| import net.dv8tion.jda.api.MessageBuilder; | ||
| import net.dv8tion.jda.api.audio.AudioSendHandler; | ||
| import net.dv8tion.jda.api.audio.SpeakingMode; | ||
| import net.dv8tion.jda.api.audio.hooks.ConnectionListener; | ||
| import net.dv8tion.jda.api.audio.hooks.ConnectionStatus; | ||
| import net.dv8tion.jda.api.entities.Guild; | ||
| import net.dv8tion.jda.api.entities.Message; | ||
| import net.dv8tion.jda.api.entities.User; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh <[email protected]> | ||
| */ | ||
| public class AudioHandler extends AudioEventAdapter implements AudioSendHandler | ||
| public class AudioHandler extends AudioEventAdapter implements AudioSendHandler, ConnectionListener | ||
| { | ||
| public final static String PLAY_EMOJI = "\u25B6"; // ▶ | ||
| public final static String PAUSE_EMOJI = "\u23F8"; // ⏸ | ||
|
|
@@ -59,12 +64,17 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler | |
|
|
||
| private AudioFrame lastFrame; | ||
| private AbstractQueue<QueuedTrack> queue; | ||
| private final List<Long> speakingUsers = new ArrayList<>(); | ||
| private int volume; | ||
| private int attenuation; | ||
|
|
||
| protected AudioHandler(PlayerManager manager, Guild guild, AudioPlayer player) | ||
| protected AudioHandler(PlayerManager manager, Guild guild, AudioPlayer player, int volume, int attenuation) | ||
| { | ||
| this.manager = manager; | ||
| this.audioPlayer = player; | ||
| this.guildId = guild.getIdLong(); | ||
| this.volume = volume; | ||
| this.attenuation = attenuation; | ||
|
|
||
| this.setQueueType(manager.getBot().getSettingsManager().getSettings(guildId).getQueueType()); | ||
| } | ||
|
|
@@ -163,6 +173,40 @@ public boolean playFromDefault() | |
| return true; | ||
| } | ||
|
|
||
| public void setVolume(int volume) | ||
| { | ||
| this.volume = volume; | ||
| determineVolume(); | ||
| } | ||
|
|
||
| public int getVolume() | ||
| { | ||
| return volume; | ||
| } | ||
|
|
||
| public void setAttenuation(int attenuation) | ||
| { | ||
| this.attenuation = attenuation; | ||
| determineVolume(); | ||
| } | ||
|
|
||
| public int getAttenuation() | ||
| { | ||
| return attenuation; | ||
| } | ||
|
|
||
| private void determineVolume() | ||
| { | ||
| if (attenuation == 0) { | ||
| audioPlayer.setVolume(volume); | ||
| return; | ||
| } | ||
| if (speakingUsers.isEmpty()) | ||
| audioPlayer.setVolume(volume); | ||
| else | ||
| audioPlayer.setVolume((int) (volume * ((float) attenuation / 100))); | ||
| } | ||
|
|
||
| // Audio Events | ||
| @Override | ||
| public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) | ||
|
|
@@ -270,7 +314,39 @@ public String getStatusEmoji() | |
| { | ||
| return audioPlayer.isPaused() ? PAUSE_EMOJI : PLAY_EMOJI; | ||
| } | ||
|
|
||
|
|
||
| // Connection Listener methods | ||
| @Override | ||
| public void onPing(long l) { | ||
| LoggerFactory.getLogger("AudioHandler").info("Ping for audio connection in "+guildId+" is "+l+"ms"); | ||
| } | ||
|
|
||
| @Override | ||
| public void onStatusChange(@NotNull ConnectionStatus connectionStatus) { | ||
| // unused | ||
| } | ||
|
|
||
| @Override | ||
| public void onUserSpeaking(@NotNull User user, boolean b) { | ||
| // ignored | ||
| } | ||
|
|
||
| @Override | ||
| public void onUserSpeaking(@NotNull User user, @NotNull EnumSet<SpeakingMode> modes) { | ||
| LoggerFactory.getLogger("AudioHandler").info("User "+user.getName()+" speak state changed with modes "+modes); | ||
| if (modes.contains(SpeakingMode.VOICE)) | ||
| { | ||
| if (!speakingUsers.contains(user.getIdLong())) | ||
| speakingUsers.add(user.getIdLong()); | ||
| } | ||
| else | ||
| { | ||
| speakingUsers.remove(user.getIdLong()); | ||
| } | ||
|
|
||
| determineVolume(); | ||
| } | ||
|
|
||
| // Audio Send Handler methods | ||
| /*@Override | ||
| public boolean canProvide() | ||
|
|
@@ -292,7 +368,7 @@ public byte[] provide20MsAudio() | |
| return data; | ||
| }*/ | ||
|
|
||
| @Override | ||
| public boolean canProvide() | ||
| { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
src/main/java/com/jagrosh/jmusicbot/commands/dj/AttenuationCmd.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright 2016 John Grosh <[email protected]>. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.jagrosh.jmusicbot.commands.dj; | ||
|
|
||
| import com.jagrosh.jdautilities.command.CommandEvent; | ||
| import com.jagrosh.jmusicbot.Bot; | ||
| import com.jagrosh.jmusicbot.audio.AudioHandler; | ||
| import com.jagrosh.jmusicbot.commands.DJCommand; | ||
| import com.jagrosh.jmusicbot.settings.Settings; | ||
| import com.jagrosh.jmusicbot.utils.FormatUtil; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh <[email protected]> | ||
| */ | ||
| public class AttenuationCmd extends DJCommand | ||
| { | ||
| public AttenuationCmd(Bot bot) | ||
| { | ||
| super(bot); | ||
| this.name = "attenuation"; | ||
| this.aliases = bot.getConfig().getAliases(this.name); | ||
| this.help = "sets or shows attenuation"; | ||
| this.arguments = "[0-100]"; | ||
| } | ||
|
|
||
| @Override | ||
| public void doCommand(CommandEvent event) | ||
| { | ||
| AudioHandler handler = (AudioHandler)event.getGuild().getAudioManager().getSendingHandler(); | ||
| Settings settings = event.getClient().getSettingsFor(event.getGuild()); | ||
| int attenuation = handler.getAttenuation(); | ||
| if(event.getArgs().isEmpty()) | ||
| { | ||
| event.reply(FormatUtil.volumeIcon(attenuation)+" Current attenuation is `"+attenuation+"`"); | ||
| } | ||
| else | ||
| { | ||
| int nattenuation; | ||
| try{ | ||
| nattenuation = Integer.parseInt(event.getArgs()); | ||
| }catch(NumberFormatException e){ | ||
| nattenuation = -1; | ||
| } | ||
| if(nattenuation<0 || nattenuation>150) | ||
| event.reply(event.getClient().getError()+" Attenuation must be a valid integer between 0 and 100!"); | ||
| else | ||
| { | ||
| handler.setAttenuation(nattenuation); | ||
| settings.setAttenuation(nattenuation); | ||
| event.getGuild().getAudioManager().setSelfDeafened(nattenuation == 0); | ||
| event.reply(FormatUtil.volumeIcon(nattenuation)+" Attenuation changed from `"+attenuation+"` to `"+nattenuation+"`"); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters