IT: volume is only a byte in size

3 files changed, 10 insertions, 12 deletions

diff --git a/taglib/it/itproperties.cpp b/taglib/it/itproperties.cpp
index 84d69da9..ce9cefaa 100644
--- a/taglib/it/itproperties.cpp
+++ b/taglib/it/itproperties.cpp
@@ -57,8 +57,8 @@ public:
   ushort compatibleVersion;
   ushort flags;
   ushort special;
-  ushort globalVolume;
-  ushort mixVolume;
+  uchar  globalVolume;
+  uchar  mixVolume;
   uchar  tempo;
   uchar  bpmSpeed;
   uchar  panningSeparation;
@@ -141,12 +141,12 @@ ushort IT::Properties::special() const
   return d->special;
 }
 
-ushort IT::Properties::globalVolume() const
+uchar IT::Properties::globalVolume() const
 {
   return d->globalVolume;
 }
 
-ushort IT::Properties::mixVolume() const
+uchar IT::Properties::mixVolume() const
 {
   return d->mixVolume;
 }
@@ -220,12 +220,12 @@ void IT::Properties::setVersion(ushort version)
   d->version = version;
 }
 
-void IT::Properties::setGlobalVolume(ushort globalVolume)
+void IT::Properties::setGlobalVolume(uchar globalVolume)
 {
   d->globalVolume = globalVolume;
 }
 
-void IT::Properties::setMixVolume(ushort mixVolume)
+void IT::Properties::setMixVolume(uchar mixVolume)
 {
   d->mixVolume = mixVolume;
 }
diff --git a/taglib/it/itproperties.h b/taglib/it/itproperties.h
index fcf18dfc..5e60ec58 100644
--- a/taglib/it/itproperties.h
+++ b/taglib/it/itproperties.h
@@ -47,8 +47,8 @@ namespace TagLib {
       ushort compatibleVersion() const;
       ushort flags()             const;
       ushort special()           const;
-      ushort globalVolume()      const;
-      ushort mixVolume()         const;
+      uchar  globalVolume()      const;
+      uchar  mixVolume()         const;
       uchar  tempo()             const;
       uchar  bpmSpeed()          const;
       uchar  panningSeparation() const;
@@ -66,8 +66,8 @@ namespace TagLib {
       void setCompatibleVersion(ushort compatibleVersion);
       void setFlags       (ushort flags);
       void setSpecial     (ushort special);
-      void setGlobalVolume(ushort globalVolume);
-      void setMixVolume   (ushort mixVolume);
+      void setGlobalVolume(uchar globalVolume);
+      void setMixVolume   (uchar mixVolume);
       void setTempo       (uchar tempo);
       void setBpmSpeed    (uchar bpmSpeed);
       void setPanningSeparation(uchar panningSeparation);
diff --git a/tests/test_xm.cpp b/tests/test_xm.cpp
index 5989b6e2..3e74524d 100644
--- a/tests/test_xm.cpp
+++ b/tests/test_xm.cpp
@@ -20,8 +20,6 @@
  ***************************************************************************/
 
 #include <cppunit/extensions/HelperMacros.h>
-#include <string>
-#include <sstream>
 #include <xmfile.h>
 #include "utils.h"