From: Michael Helmling <helmling@mathematik.uni-kl.de>
Date: Tue, 14 Feb 2012 20:34:43 +0000 (+0100)
Subject: Ported wavpack.
X-Git-Tag: v1.8beta~24^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d6215365a115fa42ff741737ce35a22e712a2917;p=taglib

Ported wavpack.
---

diff --git a/taglib/wavpack/wavpackfile.cpp b/taglib/wavpack/wavpackfile.cpp
index 6afa188d..bc0f607a 100644
--- a/taglib/wavpack/wavpackfile.cpp
+++ b/taglib/wavpack/wavpackfile.cpp
@@ -105,23 +105,23 @@ TagLib::Tag *WavPack::File::tag() const
   return &d->tag;
 }
 
-TagLib::TagDict WavPack::File::toDict(void) const
+PropertyMap WavPack::File::properties() const
 {
   if (d->hasAPE)
-    return d->tag.access<APE::Tag>(APEIndex, false)->toDict();
+    return d->tag.access<APE::Tag>(APEIndex, false)->properties();
   if (d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->toDict();
-  return TagLib::TagDict();
+    return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->properties();
+  return PropertyMap();
 }
 
-void WavPack::File::fromDict(const TagDict &dict)
+PropertyMap WavPack::File::setProperties(const PropertyMap &properties)
 {
   if (d->hasAPE)
-    d->tag.access<APE::Tag>(APEIndex, false)->fromDict(dict);
+    return d->tag.access<APE::Tag>(APEIndex, false)->setProperties(properties);
   else if (d->hasID3v1)
-    d->tag.access<ID3v1::Tag>(ID3v1Index, false)->fromDict(dict);
+    return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->setProperties(properties);
   else
-    d->tag.access<APE::Tag>(APE, true)->fromDict(dict);
+    return d->tag.access<APE::Tag>(APE, true)->setProperties(properties);
 }
 
 WavPack::Properties *WavPack::File::audioProperties() const
diff --git a/taglib/wavpack/wavpackfile.h b/taglib/wavpack/wavpackfile.h
index dcc57107..02bac023 100644
--- a/taglib/wavpack/wavpackfile.h
+++ b/taglib/wavpack/wavpackfile.h
@@ -107,18 +107,18 @@ namespace TagLib {
       virtual TagLib::Tag *tag() const;
 
       /*!
-       * Implements the unified tag dictionary interface -- export function.
+       * Implements the unified property interface -- export function.
        * If the file contains both an APE and an ID3v1 tag, only APE
-       * will be converted to the TagDict.
+       * will be converted to the PropertyMap.
        */
-      TagDict toDict() const;
+      PropertyMap properties() const;
 
       /*!
-       * Implements the unified tag dictionary interface -- import function.
+       * Implements the unified property interface -- import function.
        * As for the export, only one tag is taken into account. If the file
        * has no tag at all, APE will be created.
        */
-      void fromDict(const TagDict &);
+      PropertyMap setProperties(const PropertyMap&);
 
       /*!
        * Returns the MPC::Properties for this file.  If no audio properties