From 9153e324e4eb2674371566689bb8532aee6282cc Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Sun, 13 Mar 2022 01:15:51 +0100 Subject: [PATCH] Fixed music player file from chain store --- .../gdxapp4d/app/tosamp/TosAmpDeskApp.java | 5 +- .../gdxapp4d/app/tosamp/music/M3UParser.java | 117 ++++++++++++++++-- .../app/tosamp/music/MusicManager.java | 28 +++-- .../gdxapp4d/app/tosamp/music/MusicSong.java | 8 +- 4 files changed, 138 insertions(+), 20 deletions(-) diff --git a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/TosAmpDeskApp.java b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/TosAmpDeskApp.java index a0ae7217..502a275c 100644 --- a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/TosAmpDeskApp.java +++ b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/TosAmpDeskApp.java @@ -83,9 +83,10 @@ public class TosAmpDeskApp extends AbstractDeskApp implements DeskAppRenderer { music.stop(); } int flags = ImGuiTableFlags.ScrollX | ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersOuter | ImGuiTableFlags.BordersV; - ImGui.beginTable("playlist", 3, flags); + ImGui.beginTable("playlist", 4, flags); ImGui.tableSetupColumn("#", ImGuiTableColumnFlags.NoHide); ImGui.tableSetupColumn("Play"); + ImGui.tableSetupColumn("List"); ImGui.tableSetupColumn("Name"); ImGui.tableHeadersRow(); int i=1; @@ -99,6 +100,8 @@ public class TosAmpDeskApp extends AbstractDeskApp implements DeskAppRenderer { music.play(song); } ImGui.tableNextColumn(); + ImGui.selectable(song.getPlaylist(), music.isPlaying(song), ImGuiSelectableFlags.None); + ImGui.tableNextColumn(); ImGui.selectable(song.getName(), music.isPlaying(song), ImGuiSelectableFlags.None); ImGui.popID(); i++; diff --git a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/M3UParser.java b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/M3UParser.java index df0bba1c..b5c6d9f0 100644 --- a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/M3UParser.java +++ b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/M3UParser.java @@ -5,23 +5,88 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class M3UParser { private static final String M3U_HEADER = "#EXTM3U"; + private static final String M3U_EXTINF = "#EXTINF:"; + private static final String M3U_PLAYLIST = "#PLAYLIST:"; + private static final String M3U_EXTALB = "#EXTALB:"; + private static final String M3U_EXTART = "#EXTART:"; + private static final String M3U_EXTGENRE = "#EXTGENRE:"; + private static final String M3U_EXTIMG = "#EXTIMG:"; - public class M3UPlaylist { - + public static class M3UPlaylist { + private String name; + private String albumTitle; + private String albumArtist; + private String albumGenre; private List tracks = new ArrayList<>(); - } - - public class M3UTrack { + private Map images = new HashMap<>(); + public M3UPlaylist() { + } + + public String getName() { + return name; + } + + public String getAlbumTitle() { + return albumTitle; + } + + public String getAlbumArtist() { + return albumArtist; + } + + public String getAlbumGenre() { + return albumGenre; + } + + public List getTracks() { + return tracks; + } + + public Map getImages() { + return images; + } } - public M3UPlaylist parse(InputStream stream) throws IOException { + public static class M3UTrack { + private int time; + private String name; + private String file; + + public M3UTrack() { + } + + public int getTime() { + return time; + } + + public String getName() { + return name; + } + + public String getFile() { + return file; + } + } + + enum M3UExtLine { + NONE, + EXTINF, + EXTIMG, + } + + public static M3UPlaylist parse(InputStream stream) throws IOException { M3UPlaylist result = new M3UPlaylist(); + M3UExtLine extLine = M3UExtLine.NONE; + M3UTrack track = null; + String imageType = null; BufferedReader buffer = new BufferedReader(new InputStreamReader(stream)); String line = buffer.readLine(); @@ -30,7 +95,45 @@ public class M3UParser { } while ((line = buffer.readLine()) != null) { - + if (line.isEmpty()) { + continue; + } + if (extLine == M3UExtLine.EXTINF) { + extLine = M3UExtLine.NONE; + track.file = line; + result.tracks.add(track); + continue; + } + if (extLine == M3UExtLine.EXTIMG) { + extLine = M3UExtLine.NONE; + result.images.put(imageType, line); + continue; + } + int arguIndex = line.indexOf(":"); + if (arguIndex == -1) { + continue; + } + String lineArgu = line.substring(arguIndex + 1); + if (line.startsWith(M3U_PLAYLIST)) { + result.name = lineArgu; + } else if (line.startsWith(M3U_EXTALB)) { + result.albumTitle = lineArgu; + } else if (line.startsWith(M3U_EXTART)) { + result.albumArtist = lineArgu; + } else if (line.startsWith(M3U_EXTGENRE)) { + result.albumGenre = lineArgu; + } else if (line.startsWith(M3U_EXTIMG)) { + imageType = lineArgu; + extLine = M3UExtLine.EXTIMG; + } else if (line.startsWith(M3U_EXTINF)) { + track = new M3UTrack(); + extLine = M3UExtLine.EXTINF; + int commaIndex = lineArgu.indexOf(","); + String timeStr = lineArgu.substring(0, commaIndex); + String trackName = lineArgu.substring(commaIndex + 1); + track.time = Integer.parseInt(timeStr); + track.name = trackName; + } } return result; diff --git a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicManager.java b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicManager.java index a56c4c28..780c8c3b 100644 --- a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicManager.java +++ b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicManager.java @@ -1,6 +1,8 @@ package love.distributedrebirth.gdxapp4d.app.tosamp.music; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -12,6 +14,8 @@ import com.badlogic.gdx.audio.Music.OnCompletionListener; import com.badlogic.gdx.files.FileHandle; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.gdxapp4d.app.tosamp.music.M3UParser.M3UPlaylist; +import love.distributedrebirth.gdxapp4d.app.tosamp.music.M3UParser.M3UTrack; import love.distributedrebirth.gdxapp4d.tos4.service.SystemWarpShip; /** @@ -31,23 +35,25 @@ public class MusicManager { } public void addBackgroundMusic(FileHandle file) { - musicSongs.add(new MusicSong(file, file.name())); + musicSongs.add(new MusicSong(file, file.name(), "")); } public void init(BundleContext context, SystemWarpShip warpShip) { - List playlists = warpShip.searchMagic(context, "audio/mpegurl"); for (File playlist:playlists) { - System.out.println("Playlist: "+playlist); + try { + M3UPlaylist play = M3UParser.parse(new FileInputStream(playlist)); + + for (M3UTrack track:play.getTracks()) { + FileHandle fileHandle = Gdx.files.absolute(playlist.getParent() + "/" + track.getFile()); + musicSongs.add(new MusicSong(fileHandle, track.getName(), play.getName())); + } + + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } - /* - addBackgroundMusic(Gdx.files.internal("music/sanctumwave-risen.mp3")); - addBackgroundMusic(Gdx.files.internal("music/sanctumwave-devine-intellect.mp3")); - addBackgroundMusic(Gdx.files.internal("music/theselfhelpgroup-temple-os.mp3")); - addBackgroundMusic(Gdx.files.internal("music/sanctumwave-nightwalk.mp3")); - addBackgroundMusic(Gdx.files.internal("music/beeble-i-used-temple-os-to-write.mp3")); - addBackgroundMusic(Gdx.files.internal("music/ryanfarran-risen-temple-os.mp3")); - */ } public void dispose() { diff --git a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicSong.java b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicSong.java index ecd51232..c431fdd3 100644 --- a/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicSong.java +++ b/gdxapp4d-app-tosamp/src/main/java/love/distributedrebirth/gdxapp4d/app/tosamp/music/MusicSong.java @@ -11,10 +11,12 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; public class MusicSong { private final FileHandle fileHandle; private final String name; + private final String playlist; - public MusicSong(FileHandle fileHandle, String name) { + public MusicSong(FileHandle fileHandle, String name, String playlist) { this.fileHandle = fileHandle; this.name = name; + this.playlist = playlist; } public FileHandle getFileHandle() { @@ -24,4 +26,8 @@ public class MusicSong { public String getName() { return name; } + + public String getPlaylist() { + return playlist; + } } \ No newline at end of file