improved TrackInfo

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7952 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 6 insertions, 13 deletions

diff --git a/src/qmmp/trackinfo.cpp b/src/qmmp/trackinfo.cpp
index bbe3ba18b..abf435a5d 100644
--- a/src/qmmp/trackinfo.cpp
+++ b/src/qmmp/trackinfo.cpp
@@ -49,7 +49,6 @@ TrackInfo &TrackInfo::operator=(const TrackInfo &info)
     setValues(info.properties());
     setValues(info.replayGainInfo());
     setPath(info.path());
-    setParts(info.parts());
     return *this;
 }
 
@@ -165,20 +164,20 @@ void TrackInfo::setValue(Qmmp::ReplayGainKey key, const QString &value)
 
 void TrackInfo::setValues(const QMap<Qmmp::MetaData, QString> &metaData)
 {
-    m_parts |= MetaData;
-    m_metaData = metaData;
+   m_metaData.clear();
+   updateValues(metaData);
 }
 
 void TrackInfo::setValues(const QMap<Qmmp::TrackProperty, QString> &properties)
 {
-    m_parts |= Properties;
-    m_properties = properties;
+    m_properties.clear();
+    updateValues(properties);
 }
 
 void TrackInfo::setValues(const QMap<Qmmp::ReplayGainKey, double> &replayGainInfo)
 {
-    m_parts |= ReplayGainInfo;
-    m_replayGainInfo = replayGainInfo;
+    m_replayGainInfo.clear();
+    updateValues(replayGainInfo);
 }
 
 void TrackInfo::updateValues(const QMap<Qmmp::MetaData, QString> &metaData)
@@ -204,11 +203,6 @@ void TrackInfo::setPath(const QString &path)
     m_path = path;
 }
 
-void TrackInfo::setParts(Parts parts)
-{
-    m_parts = parts;
-}
-
 void TrackInfo::clear(Parts parts)
 {
     if(parts & MetaData)
diff --git a/src/qmmp/trackinfo.h b/src/qmmp/trackinfo.h
index 57aa36f2b..9ec077eca 100644
--- a/src/qmmp/trackinfo.h
+++ b/src/qmmp/trackinfo.h
@@ -69,7 +69,6 @@ public:
     void updateValues(const QMap<Qmmp::TrackProperty, QString> &properties);
     void updateValues(const QMap<Qmmp::ReplayGainKey, double> &replayGainInfo);
     void setPath(const QString &path);
-    void setParts(Parts parts);
     void clear(Parts parts);
     void clear();