forked from jagrosh/MusicBot
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added altprefix, songinstatus, and setstatus features
slight change to internals to reduce some bugs
- Loading branch information
Showing
19 changed files
with
394 additions
and
327 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
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
104 changes: 52 additions & 52 deletions
104
src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.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 |
|---|---|---|
| @@ -1,52 +1,52 @@ | ||
| /* | ||
| * 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.audio; | ||
|
|
||
| import com.sedmelluq.discord.lavaplayer.track.AudioTrack; | ||
| import com.jagrosh.jmusicbot.queue.Queueable; | ||
| import com.jagrosh.jmusicbot.utils.FormatUtil; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh <[email protected]> | ||
| */ | ||
| public class QueuedTrack implements Queueable { | ||
|
|
||
| private final AudioTrack track; | ||
| private final String owner; | ||
|
|
||
| public QueuedTrack(AudioTrack track, String owner) | ||
| { | ||
| this.track = track; | ||
| this.owner = owner; | ||
| } | ||
|
|
||
| @Override | ||
| public String getIdentifier() { | ||
| return owner; | ||
| } | ||
|
|
||
| public AudioTrack getTrack() | ||
| { | ||
| return track; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "`["+FormatUtil.formatTime(track.getDuration())+"]` **" + track.getInfo().title +"** - <@"+owner+">"; | ||
| } | ||
|
|
||
| } | ||
| /* | ||
| * 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.audio; | ||
|
|
||
| import com.sedmelluq.discord.lavaplayer.track.AudioTrack; | ||
| import com.jagrosh.jmusicbot.queue.Queueable; | ||
| import com.jagrosh.jmusicbot.utils.FormatUtil; | ||
|
|
||
| /** | ||
| * | ||
| * @author John Grosh <[email protected]> | ||
| */ | ||
| public class QueuedTrack implements Queueable { | ||
|
|
||
| private final AudioTrack track; | ||
| private final long owner; | ||
|
|
||
| public QueuedTrack(AudioTrack track, long owner) | ||
| { | ||
| this.track = track; | ||
| this.owner = owner; | ||
| } | ||
|
|
||
| @Override | ||
| public long getIdentifier() { | ||
| return owner; | ||
| } | ||
|
|
||
| public AudioTrack getTrack() | ||
| { | ||
| return track; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "`["+FormatUtil.formatTime(track.getDuration())+"]` **" + track.getInfo().title +"** - <@"+owner+">"; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.