Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into v3
Browse files Browse the repository at this point in the history
# Conflicts:
#	LavalinkClient/build.gradle
#	LavalinkServer/build.gradle
#	README.md
  • Loading branch information
freyacodes committed Jun 19, 2018
2 parents 4bec1b2 + ca01e04 commit 778a007
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion IMPLEMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Make the player seek to a position of the track. Position is in millis
}
```

Set player volume. Volume may range from 0 to 150. 100 is default.
Set player volume. Volume may range from 0 to 1000. 100 is default.
```json
{
"op": "volume",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void seekTo(long position) {

@Override
public void setVolume(int volume) {
volume = Math.min(150, Math.max(0, volume)); // Lavaplayer bounds
volume = Math.min(1000, Math.max(0, volume)); // Lavaplayer bounds
this.volume = volume;

LavalinkSocket node = link.getNode(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ List<Player> getPlayingPlayers() {
void shutdown() {
log.info("Shutting down " + cores.size() + " cores and " + getPlayingPlayers().size() + " playing players.");
statsExecutor.shutdown();
audioPlayerManager.shutdown();
playerUpdateService.shutdown();
players.keySet().forEach(s -> {
Core core = cores.get(Util.getShardFromSnowflake(s, shardCount));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class GcNotificationListener implements NotificationListener {
private final Histogram gcPauses = Histogram.build()
.name("lavalink_gc_pauses_seconds")
.help("Garbage collection pauses by buckets")
.buckets(25, 50, 100, 200, 400, 800, 1600)
.buckets(0.025, 0.050, 0.100, 0.200, 0.400, 0.800, 1.600)
.register();

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public boolean canProvide() {

@Override
public byte[] provide20MsAudio() {
return lastFrame.data;
return lastFrame.getData();
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ subprojects {
ext {
//@formatter:off

lavaplayerVersion = '1.2.64'
lavaplayerVersion = '1.3.5'
jdaAudioVersion = '4d7abb48aec49f0a996ba0d87df34fdc67f71275'
jdaNasVersion = '1.0.6.2-JDA-Audio'
jappVersion = '1.2'
Expand Down

0 comments on commit 778a007

Please sign in to comment.