style fixes for enum value names

diff --git a/taglib/it/itfile.cpp b/taglib/it/itfile.cpp
index 7d702edf1fca9e81ae5c230373de5a7fdb069153..9dde7e6e9f24679487804c27c348cb8f9501c60f 100644 (file)
--- a/taglib/it/itfile.cpp
+++ b/taglib/it/itfile.cpp
@@ -145,7 +145,7 @@ bool IT::File::save()
     return false;
 
   long fileSize = this->length();
-  if(special & Properties::S_MESSAGE) {
+  if(special & Properties::MessageAttached) {
     seek(54);
     if(!readU16L(messageLength) || !readU32L(messageOffset))
       return false;
@@ -215,7 +215,7 @@ void IT::File::read(bool)
   // sample/instrument names are abused as comments so
   // I just add all together.
   String message;
-  if(special & Properties::S_MESSAGE) {
+  if(special & Properties::MessageAttached) {
     READ_U16L_AS(messageLength);
     READ_U32L_AS(messageOffset);
     seek(messageOffset);

diff --git a/taglib/it/itproperties.cpp b/taglib/it/itproperties.cpp
index 416b70d12e56a10a4de3be11fdb4037627c89e6b..392ec6041e508a738c354dad525e3579cc054149 100644 (file)
--- a/taglib/it/itproperties.cpp
+++ b/taglib/it/itproperties.cpp
@@ -101,7 +101,7 @@ ushort IT::Properties::lengthInPatterns() const
 
 bool IT::Properties::stereo() const
 {
-  return d->flags & F_STEREO;
+  return d->flags & Stereo;
 }
 
 ushort IT::Properties::instrumentCount() const

diff --git a/taglib/it/itproperties.h b/taglib/it/itproperties.h
index 632b87a887ed37180bf47890b2da666e7e256187..79ebc383df9c56e21263e39ce84fabd2b63f6986 100644 (file)
--- a/taglib/it/itproperties.h
+++ b/taglib/it/itproperties.h
@@ -32,20 +32,20 @@ namespace TagLib {
     public:
       /*! Flag bits. */
       enum {
-        F_STEREO             =   1,
-        F_VOL0_MIX_OPT       =   2,
-        F_INSTRUMENTS        =   4,
-        F_LINEAR_SLIDES      =   8,
-        F_OLD_EFFECTS        =  16,
-        F_LINK_EFFECT        =  32,
-        F_MIDI_PITCH_CTRL    =  64,
-        F_EMBEDDED_MIDI_CONF = 128
+        Stereo                  =   1,
+        Vol0MixOptimizations    =   2,
+        UseInstruments          =   4,
+        LinearSlides            =   8,
+        OldEffects              =  16,
+        LinkEffects             =  32,
+        UseMidiPitchController  =  64,
+        RequestEmbeddedMidiConf = 128
       };
 
       /*! Special bits. */
       enum {
-        S_MESSAGE            = 1,
-        S_EMBEDDED_MIDI_CONF = 8
+        MessageAttached  = 1,
+        MidiConfEmbedded = 8
       };
 
       Properties(AudioProperties::ReadStyle propertiesStyle);

diff --git a/taglib/s3m/s3mproperties.h b/taglib/s3m/s3mproperties.h
index bbfc7c61335e069ce0d40e63c77c4ef04ce58ca9..4be1450835a0376b4721c5da9b1fafbcd884ae1f 100644 (file)
--- a/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@@ -32,13 +32,13 @@ namespace TagLib {
     public:
       /*! Flag bits. */
       enum {
-        F_ST2_VIBRATO   =   1,
-        F_ST2_TEMPO     =   2,
-        F_AMIGA_SLIDES  =   4,
-        F_VOL0_MIX_OPT  =   8,
-        F_AMIGA_LIMITS  =  16,
-        F_ENABLE_FILTER =  32,
-        F_CUSTOM_DATA   = 128
+        ST2Vibrato           =   1,
+        ST2Tempo             =   2,
+        AmigaSlides          =   4,
+        Vol0MixOptimizations =   8,
+        AmigaLimits          =  16,
+        EnableFilter         =  32,
+        CustomData           = 128
       };
 
       Properties(AudioProperties::ReadStyle propertiesStyle);

diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h
index f1aba4049cdfea9e6764c3a70c649177fe290f1c..97f93111801ff5c4a7fce92c81604a7a5905cc98 100644 (file)
--- a/taglib/xm/xmproperties.h
+++ b/taglib/xm/xmproperties.h
@@ -33,7 +33,7 @@ namespace TagLib {
     public:
       /*! Flag bits. */
       enum {
-        F_AMIGA_FREQ = 1
+        LinearFreqTable = 1 // otherwise its the amiga freq. table
       };
 
       Properties(AudioProperties::ReadStyle propertiesStyle);