diff options
author | Uwe Klotz <uwe_klotz@web.de> | 2015-02-05 18:51:55 +0100 |
---|---|---|
committer | Uwe Klotz <uwe_klotz@web.de> | 2015-02-06 00:12:10 +0100 |
commit | 22656de6a84e8cabcc5b60d7dabb6793c7274387 (patch) | |
tree | 7af36742e5b469983a5d4d95be06ecd8f3736311 /src/sources/soundsourceoggvorbis.cpp | |
parent | 22fdcd9ecd8e0fa992507f5563051a2d32d95732 (diff) |
Universal tag reading function for all TagLib file types
Diffstat (limited to 'src/sources/soundsourceoggvorbis.cpp')
-rw-r--r-- | src/sources/soundsourceoggvorbis.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/sources/soundsourceoggvorbis.cpp b/src/sources/soundsourceoggvorbis.cpp index ba15ed9659..b62d1edd69 100644 --- a/src/sources/soundsourceoggvorbis.cpp +++ b/src/sources/soundsourceoggvorbis.cpp @@ -1,9 +1,6 @@ #include "sources/soundsourceoggvorbis.h" #include "sources/audiosourceoggvorbis.h" -#include "metadata/trackmetadatataglib.h" - -#include <taglib/vorbisfile.h> QList<QString> SoundSourceOggVorbis::supportedFileExtensions() { QList<QString> list; @@ -15,43 +12,6 @@ SoundSourceOggVorbis::SoundSourceOggVorbis(QUrl url) : SoundSource(url, "ogg") { } -/* - Parse the the file to get metadata - */ -Result SoundSourceOggVorbis::parseMetadata( - Mixxx::TrackMetadata* pMetadata) const { - TagLib::Ogg::Vorbis::File f(getLocalFileNameBytes().constData()); - - if (!readAudioProperties(pMetadata, f)) { - return ERR; - } - - TagLib::Ogg::XiphComment *xiph = f.tag(); - if (xiph) { - readXiphComment(pMetadata, *xiph); - } else { - // fallback - const TagLib::Tag *tag(f.tag()); - if (tag) { - readTag(pMetadata, *tag); - } else { - return ERR; - } - } - - return OK; -} - -QImage SoundSourceOggVorbis::parseCoverArt() const { - TagLib::Ogg::Vorbis::File f(getLocalFileNameBytes().constData()); - TagLib::Ogg::XiphComment *xiph = f.tag(); - if (xiph) { - return Mixxx::readXiphCommentCover(*xiph); - } else { - return QImage(); - } -} - Mixxx::AudioSourcePointer SoundSourceOggVorbis::open() const { return Mixxx::AudioSourceOggVorbis::create(getUrl()); } |