X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2FOggVorbisIdentifier.java;h=9d384526cec29fff6ff120798beb61695890bdd2;hb=0f20c60dd0509d91b488c2c10edf7498feeed560;hp=bbbecd2a7c4306863a54560b6124c144623c6694;hpb=4aab519eaf3e420e070de871c798cf7ae96aa755;p=sonitus.git diff --git a/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java b/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java index bbbecd2..9d38452 100644 --- a/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java +++ b/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java @@ -20,6 +20,8 @@ package net.pterodactylus.sonitus.io; import java.io.IOException; import java.io.InputStream; +import net.pterodactylus.sonitus.data.ContentMetadata; +import net.pterodactylus.sonitus.data.FormatMetadata; import net.pterodactylus.sonitus.data.Metadata; import com.google.common.base.Optional; @@ -115,21 +117,22 @@ public class OggVorbisIdentifier { buffer = syncState.data; } - Metadata metadata = new Metadata(info.channels, info.rate, "Vorbis"); + FormatMetadata formatMetadata = new FormatMetadata(info.channels, info.rate, "Vorbis"); + ContentMetadata contentMetadata = new ContentMetadata(""); for (int c = 0; c < comment.comments; ++c) { String field = comment.getComment(c); Optional extractedField = extractField(field, "ARTIST"); if (extractedField.isPresent()) { - metadata = metadata.artist(extractedField.get()); + contentMetadata = contentMetadata.artist(extractedField.get()); continue; } extractedField = extractField(field, "TITLE"); if (extractedField.isPresent()) { - metadata = metadata.name(extractedField.get()); + contentMetadata = contentMetadata.name(extractedField.get()); continue; } } - return Optional.of(metadata); + return Optional.of(new Metadata(formatMetadata, contentMetadata)); } /**