Found and fixed more missing property interface forwarders.

Probably due to a copy-and-paste error the implementation of
File::removeUnsupportedProperties() contained cases for several type
which do not reimplement this method; for others the implementation was
missing and is now included.

In addition, the formats Speex and Opus suffered from the same bug as
OggFLAC in the commit before, which is now fixed.

taglib/ogg/opus/opusfile.cpp

@@ -31,6 +31,7 @@
 
 #include <tstring.h>
 #include <tdebug.h>
+#include <tpropertymap.h>
 
 #include "opusfile.h"
 
@@ -82,6 +83,16 @@ Ogg::XiphComment *Opus::File::tag() const
   return d->comment;
 }
 
+PropertyMap Opus::File::properties() const
+{
+  return d->comment->properties();
+}
+
+PropertyMap Opus::File::setProperties(const PropertyMap &properties)
+{
+  return d->comment->setProperties(properties);
+}
+
 Opus::Properties *Opus::File::audioProperties() const
 {
   return d->properties;

taglib/ogg/opus/opusfile.h

@@ -86,6 +86,18 @@ namespace TagLib {
          */
         virtual Ogg::XiphComment *tag() const;
 
+        /*!
+         * Implements the unified property interface -- export function.
+         * This forwards directly to XiphComment::properties().
+         */
+        PropertyMap properties() const;
+
+        /*!
+         * Implements the unified tag dictionary interface -- import function.
+         * Like properties(), this is a forwarder to the file's XiphComment.
+         */
+        PropertyMap setProperties(const PropertyMap &);
+
         /*!
          * Returns the Opus::Properties for this file.  If no audio properties
          * were read then this will return a null pointer.

taglib/ogg/speex/speexfile.cpp

@@ -31,6 +31,7 @@
 
 #include <tstring.h>
 #include <tdebug.h>
+#include <tpropertymap.h>
 
 #include "speexfile.h"
 
@@ -84,6 +85,16 @@ Ogg::XiphComment *Speex::File::tag() const
   return d->comment;
 }
 
+PropertyMap Speex::File::properties() const
+{
+  return d->comment->properties();
+}
+
+PropertyMap Speex::File::setProperties(const PropertyMap &properties)
+{
+  return d->comment->setProperties(properties);
+}
+
 Speex::Properties *Speex::File::audioProperties() const
 {
   return d->properties;

taglib/ogg/speex/speexfile.h

@@ -86,12 +86,26 @@ namespace TagLib {
          */
         virtual Ogg::XiphComment *tag() const;
 
+        /*!
+         * Implements the unified property interface -- export function.
+         * This forwards directly to XiphComment::properties().
+         */
+        PropertyMap properties() const;
+
+        /*!
+         * Implements the unified tag dictionary interface -- import function.
+         * Like properties(), this is a forwarder to the file's XiphComment.
+         */
+        PropertyMap setProperties(const PropertyMap &);
+
         /*!
          * Returns the Speex::Properties for this file.  If no audio properties
          * were read then this will return a null pointer.
          */
         virtual Properties *audioProperties() const;
 
+
+
         virtual bool save();
 
       private:

taglib/riff/aiff/aifffile.cpp

@@ -90,6 +90,11 @@ PropertyMap RIFF::AIFF::File::properties() const
   return d->tag->properties();
 }
 
+void RIFF::AIFF::File::removeUnsupportedProperties(const StringList &unsupported)
+{
+  d->tag->removeUnsupportedProperties(unsupported);
+}
+
 PropertyMap RIFF::AIFF::File::setProperties(const PropertyMap &properties)
 {
   return d->tag->setProperties(properties);

taglib/riff/aiff/aifffile.h

@@ -92,6 +92,8 @@ namespace TagLib {
          */
         PropertyMap properties() const;
 
+        void removeUnsupportedProperties(const StringList &properties);
+
         /*!
          * Implements the unified property interface -- import function.
          * This method forwards to ID3v2::Tag::setProperties().

taglib/riff/wav/wavfile.cpp

@@ -103,12 +103,17 @@ RIFF::Info::Tag *RIFF::WAV::File::InfoTag() const
 
 PropertyMap RIFF::WAV::File::properties() const
 {
-  return d->tag.properties();
+  return tag()->properties();
+}
+
+void RIFF::WAV::File::removeUnsupportedProperties(const StringList &unsupported)
+{
+  tag()->removeUnsupportedProperties(unsupported);
 }
 
 PropertyMap RIFF::WAV::File::setProperties(const PropertyMap &properties)
 {
-  return d->tag.setProperties(properties);
+  return tag()->setProperties(properties);
 }
 
 RIFF::WAV::Properties *RIFF::WAV::File::audioProperties() const

taglib/riff/wav/wavfile.h

@@ -117,6 +117,8 @@ namespace TagLib {
          */
         PropertyMap properties() const;
 
+        void removeUnsupportedProperties(const StringList &properties);
+
         /*!
          * Implements the unified property interface -- import function.
          * This method forwards to ID3v2::Tag::setProperties().

taglib/toolkit/tfile.cpp

@@ -172,26 +172,16 @@ void File::removeUnsupportedProperties(const StringList &properties)
     dynamic_cast<MPC::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<MPEG::File* >(this))
     dynamic_cast<MPEG::File* >(this)->removeUnsupportedProperties(properties);
-  else if(dynamic_cast<Ogg::FLAC::File* >(this))
-    dynamic_cast<Ogg::FLAC::File* >(this)->removeUnsupportedProperties(properties);
-  else if(dynamic_cast<Ogg::Speex::File* >(this))
-    dynamic_cast<Ogg::Speex::File* >(this)->removeUnsupportedProperties(properties);
-  else if(dynamic_cast<Ogg::Opus::File* >(this))
-    dynamic_cast<Ogg::Opus::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<Ogg::Vorbis::File* >(this))
     dynamic_cast<Ogg::Vorbis::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<RIFF::AIFF::File* >(this))
     dynamic_cast<RIFF::AIFF::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<RIFF::WAV::File* >(this))
     dynamic_cast<RIFF::WAV::File* >(this)->removeUnsupportedProperties(properties);
-  else if(dynamic_cast<S3M::File* >(this))
-    dynamic_cast<S3M::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<TrueAudio::File* >(this))
     dynamic_cast<TrueAudio::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<WavPack::File* >(this))
     dynamic_cast<WavPack::File* >(this)->removeUnsupportedProperties(properties);
-  else if(dynamic_cast<XM::File* >(this))
-    dynamic_cast<XM::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<MP4::File* >(this))
     dynamic_cast<MP4::File* >(this)->removeUnsupportedProperties(properties);
   else if(dynamic_cast<ASF::File* >(this))

taglib/trueaudio/trueaudiofile.cpp

@@ -139,6 +139,12 @@ PropertyMap TrueAudio::File::properties() const
   return PropertyMap();
 }
 
+void TrueAudio::File::removeUnsupportedProperties(const StringList &unsupported)
+{
+  if(d->hasID3v2)
+    d->tag.access<ID3v2::Tag>(TrueAudioID3v2Index, false)->removeUnsupportedProperties(unsupported);
+}
+
 PropertyMap TrueAudio::File::setProperties(const PropertyMap &properties)
 {
   if(d->hasID3v1)

taglib/trueaudio/trueaudiofile.h

@@ -144,6 +144,8 @@ namespace TagLib {
        */
       PropertyMap setProperties(const PropertyMap &);
 
+      void removeUnsupportedProperties(const StringList &properties);
+
       /*!
        * Returns the TrueAudio::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.

taglib/wavpack/wavpackfile.cpp

@@ -117,6 +117,14 @@ PropertyMap WavPack::File::properties() const
   return PropertyMap();
 }
 
+
+void WavPack::File::removeUnsupportedProperties(const StringList &unsupported)
+{
+  if(d->hasAPE)
+    d->tag.access<APE::Tag>(WavAPEIndex, false)->removeUnsupportedProperties(unsupported);
+}
+
+
 PropertyMap WavPack::File::setProperties(const PropertyMap &properties)
 {
   if(d->hasID3v1)

taglib/wavpack/wavpackfile.h

@@ -116,6 +116,8 @@ namespace TagLib {
        */
       PropertyMap properties() const;
 
+      void removeUnsupportedProperties(const StringList &properties);
+
       /*!
        * Implements the unified property interface -- import function.
        * Creates an APE tag if it does not exists and calls setProperties() on