From 525d822bec49c9952388b71ffd7c293528b31c24 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 25 Sep 2008 20:52:56 +0000
Subject: using QMap for metadata

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@561 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/mad/decodermadfactory.cpp | 22 +++++++++++-----------
 src/plugins/Input/mad/decodermadfactory.h   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/plugins/Input')

diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 10afdefc4..cc0ecd020 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -98,9 +98,9 @@ Decoder *DecoderMADFactory::create(QObject *parent, QIODevice *input, Output *ou
     return new DecoderMAD(parent, this, input, output);
 }
 
-FileTag *DecoderMADFactory::createTag(const QString &source)
+FileInfo *DecoderMADFactory::getFileInfo(const QString &source)
 {
-    FileTag *ftag = new FileTag();
+    FileInfo *info = new FileInfo();
     TagLib::Tag *tag = 0;
     TagLib::MPEG::File fileRef(source.toLocal8Bit ());
 
@@ -165,24 +165,24 @@ FileTag *DecoderMADFactory::createTag(const QString &source)
         TagLib::String genre = tag->genre();
         TagLib::String title = tag->title();
 
-        ftag->setValue(FileTag::ALBUM,
+        info->setMetaData(Qmmp::ALBUM,
                        codec->toUnicode(album.toCString(utf)).trimmed());
-        ftag->setValue(FileTag::ARTIST,
+        info->setMetaData(Qmmp::ARTIST,
                        codec->toUnicode(artist.toCString(utf)).trimmed());
-        ftag->setValue(FileTag::COMMENT,
+        info->setMetaData(Qmmp::COMMENT,
                        codec->toUnicode(comment.toCString(utf)).trimmed());
-        ftag->setValue(FileTag::GENRE,
+        info->setMetaData(Qmmp::GENRE,
                        codec->toUnicode(genre.toCString(utf)).trimmed());
-        ftag->setValue(FileTag::TITLE,
+        info->setMetaData(Qmmp::TITLE,
                        codec->toUnicode(title.toCString(utf)).trimmed());
-        ftag->setValue(FileTag::YEAR,
+        info->setMetaData(Qmmp::YEAR,
                        tag->year());
-        ftag->setValue(FileTag::TRACK,
+        info->setMetaData(Qmmp::TRACK,
                        tag->track());
     }
     if (fileRef.audioProperties())
-        ftag->setValue(FileTag::LENGTH,fileRef.audioProperties()->length());
-    return ftag;
+        info->setLength(fileRef.audioProperties()->length());
+    return info;
 }
 
 QObject* DecoderMADFactory::showDetails(QWidget *parent, const QString &path)
diff --git a/src/plugins/Input/mad/decodermadfactory.h b/src/plugins/Input/mad/decodermadfactory.h
index 3b1a45818..de51f2450 100644
--- a/src/plugins/Input/mad/decodermadfactory.h
+++ b/src/plugins/Input/mad/decodermadfactory.h
@@ -43,7 +43,7 @@ public:
     bool canDecode(QIODevice *input) const;
     const DecoderProperties properties() const;
     Decoder *create(QObject *, QIODevice *, Output *, const QString &);
-    FileTag *createTag(const QString &source);
+    FileInfo *getFileInfo(const QString &source);
     QObject* showDetails(QWidget *parent, const QString &path);
     void showSettings(QWidget *parent);
     void showAbout(QWidget *parent);
-- 
cgit v1.2.3-13-gbd6f