X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2FMp3Identifier.java;h=e9a550b38d0bb97bc009c110997b1b77e162085b;hb=865e9a8fce99285dfd6c1efb6a01991076e1a773;hp=b4001bb41a71afcc3dc08458a0f84756f6427b28;hpb=ee261ec959322c6d1969aff67319559ba1480859;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 b4001bb..e9a550b 100644
--- a/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java
+++ b/src/main/java/net/pterodactylus/sonitus/io/Mp3Identifier.java
@@ -20,7 +20,7 @@ package net.pterodactylus.sonitus.io;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.pterodactylus.sonitus.data.Format;
+import net.pterodactylus.sonitus.data.Metadata;
 
 import com.google.common.base.Optional;
 import javazoom.jl.decoder.Bitstream;
@@ -39,19 +39,19 @@ public class Mp3Identifier {
 	 *
 	 * @param inputStream
 	 * 		The input stream
-	 * @return The identified format, or {@link com.google.common.base.Optional#absent()}
-	 *         if the format can not be identified
+	 * @return The identified metadata, or {@link Optional#absent()} if the
+	 *         metadata can not be identified
 	 * @throws IOException
 	 * 		if an I/O error occurs
 	 */
-	public static Optional<Format> identify(InputStream inputStream) throws IOException {
+	public static Optional<Metadata> identify(InputStream inputStream) throws IOException {
 		Bitstream bitstream = new Bitstream(inputStream);
 		try {
 			Header frame = bitstream.readFrame();
 			if (frame == null) {
 				return Optional.absent();
 			}
-			return Optional.of(new Format(frame.mode() == Header.SINGLE_CHANNEL ? 1 : 2, frame.frequency(), "MP3"));
+			return Optional.of(new Metadata(frame.mode() == Header.SINGLE_CHANNEL ? 1 : 2, frame.frequency(), "MP3"));
 		} catch (BitstreamException be1) {
 			return Optional.absent();
 		}