ChomeNS/chomens-bot-java
3
1
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity

midi name (finally)

Browse source
This commit is contained in:
Chayapak 2023-09-23 14:00:23 +07:00
parent c4ea445a95
commit bf369ac3a5
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java
View file

@ -434,7 +434,7 @@ public class MusicCommand extends Command {
if (currentSong == null) throw new CommandException(Component.text("No song is currently playing"));
// ig very code yup
final String title = currentSong.originalName;
final String title = currentSong.name;
final String songAuthor = currentSong.songAuthor == null || currentSong.songAuthor.equals("") ? "N/A" : currentSong.songAuthor;
final String songOriginalAuthor = currentSong.songOriginalAuthor == null || currentSong.songOriginalAuthor.equals("") ? "N/A" : currentSong.songOriginalAuthor;
final String songDescription = currentSong.songDescription == null || currentSong.songDescription.equals("") ? "N/A" : currentSong.songDescription;

9
src/main/java/land/chipmunk/chayapak/chomens_bot/song/MidiConverter.java
View file

@ -11,6 +11,7 @@ import java.util.HashMap;
// Author: hhhzzzsss
public class MidiConverter implements Converter {
public static final int TRACK_NAME = 0x03;
public static final int SET_INSTRUMENT = 0xC0;
public static final int SET_TEMPO = 0x51;
public static final int NOTE_ON = 0x90;
@ -23,10 +24,10 @@ public class MidiConverter implements Converter {
}
public static Song getSong(Sequence sequence, String name, Bot bot) {
Song song = new Song(name, bot, null, null, null, null, false);
long tpq = sequence.getResolution();
String songName = null;
ArrayList<MidiEvent> tempoEvents = new ArrayList<>();
for (Track track : sequence.getTracks()) {
final int trackSize = track.size();
@ -37,11 +38,15 @@ public class MidiConverter implements Converter {
if (message instanceof MetaMessage mm) {
if (mm.getType() == SET_TEMPO) {
tempoEvents.add(event);
} else if (mm.getType() == TRACK_NAME) {
songName = new String(mm.getData()) + " (" + name + ")"; // i have put the ` (filename)` just in case the sequence is getting sus (like Track 2 for example)
}
}
}
}
final Song song = new Song(name, bot, songName, null, null, null, false);
tempoEvents.sort(Comparator.comparingLong(MidiEvent::getTick));
for (Track track : sequence.getTracks()) {