Merge pull request #8 from umjammer/1.9.11

fix #7

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI with Maven
+name: Java CI
 
 on:
   push:

README.md

@@ -1,4 +1,6 @@
-[![Maven Package](https://github.com/umjammer/mp3spi/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer/mp3spi/actions/workflows/maven-publish.yml) [![Java CI with Maven](https://github.com/umjammer/mp3spi/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/umjammer/mp3spi/actions) [![Parent](https://img.shields.io/badge/Parent-vavi--sound--sandbox-pink)](https://github.com/umjammer/vavi-sound-sandbox)
+[![Maven Package](https://github.com/umjammer/mp3spi/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer/mp3spi/actions/workflows/maven-publish.yml)
+[![Java CI](https://github.com/umjammer/mp3spi/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/umjammer/mp3spi/actions)
+[![Parent](https://img.shields.io/badge/Parent-vavi--sound--sandbox-pink)](https://github.com/umjammer/vavi-sound-sandbox)
 
 # MP3SPI
 

pom.xml

@@ -3,11 +3,11 @@
 
   <groupId>net.javazoom</groupId>
   <artifactId>mp3spi</artifactId>
-  <version>1.9.10</version>
+  <version>1.9.11</version>
 
   <properties>
     <tritonus.groupId>org.tritonus</tritonus.groupId>
-    <tritonus.version>0.3.10</tritonus.version>
+    <tritonus.version>0.3.11</tritonus.version>
   </properties>
 
   <distributionManagement>

src/main/java/javazoom/spi/mpeg/sampled/file/MpegAudioFileReader.java

@@ -50,16 +50,14 @@
 import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.security.AccessControlException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Scanner;
 
 import javax.sound.sampled.AudioFileFormat;
 import javax.sound.sampled.AudioFormat;
@@ -93,13 +91,13 @@ public class MpegAudioFileReader extends TAudioFileReader
     private static final String[] id3v1genres;
 
     static {
-        try {
-            Path path = Paths.get(MpegAudioFileReader.class.getResource("/genres.properties").toURI());
-            List<String> genres = Files.readAllLines(path);
-            id3v1genres = genres.toArray(new String[genres.size()]);
-        } catch (IOException | URISyntaxException e) {
-            throw new IllegalStateException(e);
+        Scanner scanner = new Scanner(MpegAudioFileReader.class.getResourceAsStream("/genres.properties"));
+        List<String> genres = new ArrayList<>();
+        while (scanner.hasNextLine()) {
+            genres.add(scanner.nextLine());
         }
+        scanner.close();
+        id3v1genres = genres.toArray(new String[genres.size()]);
     }
 
     public MpegAudioFileReader()

src/test/java/Test3.java

@@ -7,12 +7,14 @@
 import java.io.BufferedInputStream;
 import java.io.EOFException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.sound.sampled.AudioFileFormat;
@@ -22,6 +24,7 @@
 import javax.sound.sampled.DataLine;
 import javax.sound.sampled.LineEvent;
 import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.spi.AudioFileReader;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -33,6 +36,7 @@
 import vavi.util.properties.annotation.PropsEntity;
 
 import static javazoom.spi.mpeg.sampled.file.PlayerTest.volume;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static vavix.util.DelayedWorker.later;
 
@@ -73,7 +77,11 @@ void setup() {
     @DisplayName("just play")
     void test2() throws Exception {
         AudioInputStream originalAudioInputStream = AudioSystem.getAudioInputStream(Paths.get(inFile).toFile());
-        AudioFormat originalAudioFormat = originalAudioInputStream.getFormat();
+        play(originalAudioInputStream);
+    }
+
+    void play(AudioInputStream originalAudioInputStream) throws Exception {
+    AudioFormat originalAudioFormat = originalAudioInputStream.getFormat();
 Debug.println(originalAudioFormat);
         AudioFormat targetAudioFormat = new AudioFormat( //PCM
             originalAudioFormat.getSampleRate(),
@@ -124,6 +132,32 @@ void test3() throws Exception {
         }
     }
 
+    @Test
+    @SuppressWarnings({ "unchecked", "rawtypes", "restriction" })
+    void test4() throws Exception {
+        List<AudioFileReader> providers = (List) com.sun.media.sound.JDK13Services.getProviders(AudioFileReader.class);
+providers.forEach(System.err::println);
+        assertTrue(providers.stream().map(o -> o.getClass().getName()).anyMatch(s -> s.contains("javazoom.spi.mpeg.sampled.file.MpegAudioFileReader")));
+    }
+
+    @Test
+    void test5() throws Exception {
+        String file = "src/test/resources/test2.mp3";
+        InputStream is = new BufferedInputStream(Files.newInputStream(Paths.get(file)));
+        AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(is);
+        play(audioInputStream);
+    }
+
+    // TODO wip
+    @Test
+    void test6() throws Exception {
+        String file = "src/test/resources/test2.mp3";
+        InputStream is = new BufferedInputStream(Files.newInputStream(Paths.get(file)));
+        AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(is);
+        String genre = (String) audioInputStream.getFormat().getProperty("mp3.id3tag.genre");
+Debug.println("genre: " + genre);
+    }
+
     @Test
     @Disabled
     @DisplayName("test all mp3s in your itumes music")