X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2FMp3Identifier.java;h=5d4f2ffa5a354bdc6ccbe0fc595956501bef7233;hb=dfaceff35b847c9f2f9fe6fef22eb29c14be94c7;hp=51aa1a6934e55740725f6d8461b79a81273a07bc;hpb=db89e5f0aa2506b3e0fe23d0045f86b2c36adca1;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java b/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java
index 51aa1a6..5d4f2ff 100644
--- a/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java
+++ b/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java
@@ -25,6 +25,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 
+import net.pterodactylus.sonitus.data.ContentMetadata;
+import net.pterodactylus.sonitus.data.FormatMetadata;
 import net.pterodactylus.sonitus.data.Metadata;
 import net.pterodactylus.sonitus.io.mp3.Frame;
 import net.pterodactylus.sonitus.io.mp3.Parser;
@@ -53,7 +55,8 @@ public class Mp3Identifier {
 	public static Optional<Metadata> identify(InputStream inputStream) throws IOException {
 		Parser mp3Parser = new Parser(inputStream);
 		Frame frame = mp3Parser.nextFrame();
-		Metadata metadata = new Metadata((frame.channelMode() == SINGLE_CHANNEL) ? 1 : 2, frame.samplingRate(), "MP3");
+		FormatMetadata formatMetadata = new FormatMetadata((frame.channelMode() == SINGLE_CHANNEL) ? 1 : 2, frame.samplingRate(), "MP3");
+		ContentMetadata contentMetadata = new ContentMetadata("");
 		/* check for ID3v2 tag. */
 		Optional<byte[]> id3v2TagBuffer = mp3Parser.getId3Tag();
 		if (id3v2TagBuffer.isPresent()) {
@@ -63,7 +66,7 @@ public class Mp3Identifier {
 				/* skip “ID3” header tag. */
 				ID3V2Tag id3v2Tag = ID3V2Tag.read(tagInputStream);
 				if (id3v2Tag != null) {
-					metadata = metadata.artist(id3v2Tag.getArtist()).name(id3v2Tag.getTitle());
+					contentMetadata = contentMetadata.artist(id3v2Tag.getArtist()).name(id3v2Tag.getTitle());
 				}
 			} catch (ID3Exception id3e1) {
 				id3e1.printStackTrace();
@@ -71,7 +74,7 @@ public class Mp3Identifier {
 				close(tagInputStream, true);
 			}
 		}
-		return Optional.of(metadata);
+		return Optional.of(new Metadata(formatMetadata, contentMetadata));
 	}
 
 }