taglib-ruby 0.7.0 → 0.7.1

data/ext/taglib_id3v1/taglib_id3v1_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.7
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -142,6 +142,19 @@ template <typename T> T SwigValueInit() {
 # define _SCL_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -251,6 +264,19 @@ template <typename T> T SwigValueInit() {
 # define _SCL_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -658,14 +684,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
+	  int compare = strcmp(name, iname);
 	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
@@ -709,7 +735,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -728,10 +754,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
@@ -743,11 +769,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -1503,14 +1529,13 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  VALUE klass;
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "TYPE%s", type->name);
   if (NIL_P(_cSWIG_Pointer)) {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
     rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
   }
-  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
   free((void *) klass_name);
 }
 
@@ -1827,7 +1852,7 @@ static VALUE mID3v1;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x030007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1905,7 +1930,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
@@ -2010,7 +2035,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2066,7 +2091,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2828,7 +2853,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -2872,7 +2897,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
+  int init;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
@@ -2891,22 +2916,18 @@ SWIG_InitializeModule(void *clientdata) {
     /* This is the first module loaded for this interpreter */
     /* so set the swig module into the interpreter */
     SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
   } else {
     /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
     iter=module_head;
     do {
       if (iter==&swig_module) {
-        found=1;
-        break;
+        /* Our module is already in the list, so there's nothing more to do. */
+        return;
       }
       iter=iter->next;
     } while (iter!= module_head);
 
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
+    /* otherwise we must add our module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
   }

data/ext/taglib_id3v2/relativevolumeframe.i

@@ -1,25 +1,10 @@
-%rename("bits_representing_peak") TagLib::ID3v2::PeakVolume::bitsRepresentingPeak;
-%rename("peak_volume") TagLib::ID3v2::PeakVolume::peakVolume;
+%rename("bits_representing_peak") TagLib::ID3v2::RelativeVolumeFrame::PeakVolume::bitsRepresentingPeak;
+%rename("peak_volume") TagLib::ID3v2::RelativeVolumeFrame::PeakVolume::peakVolume;
 
 %rename("set_volume_adjustment") TagLib::ID3v2::RelativeVolumeFrame::setVolumeAdjustment;
 %rename("set_volume_adjustment_index") TagLib::ID3v2::RelativeVolumeFrame::setVolumeAdjustmentIndex;
 %rename("set_peak_volume") TagLib::ID3v2::RelativeVolumeFrame::setPeakVolume;
 
-struct TagLib::ID3v2::PeakVolume {
-  unsigned char bitsRepresentingPeak;
-  TagLib::ByteVector peakVolume;
-};
-
-%nestedworkaround TagLib::ID3v2::RelativeVolumeFrame::PeakVolume;
-
-%{
-namespace TagLib {
-  namespace ID3v2 {
-    typedef RelativeVolumeFrame::PeakVolume PeakVolume;
-  }
-}
-%}
-
 %typemap(out) TagLib::List<TagLib::ID3v2::RelativeVolumeFrame::ChannelType> {
   VALUE ary = rb_ary_new2($1.size());
   for (TagLib::List<TagLib::ID3v2::RelativeVolumeFrame::ChannelType>::ConstIterator it = $1.begin();
@@ -30,6 +15,8 @@ namespace TagLib {
   $result = ary;
 }
 
+%flatnested TagLib::ID3v2::RelativeVolumeFrame::PeakVolume;
+
 %include <taglib/relativevolumeframe.h>
 
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/ext/taglib_id3v2/taglib_id3v2_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.12
+ * Version 3.0.7
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -142,6 +142,19 @@ template <typename T> T SwigValueInit() {
 # define _SCL_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
 
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
@@ -251,6 +264,19 @@ template <typename T> T SwigValueInit() {
 # define _SCL_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
 
 /* -----------------------------------------------------------------------------
  * swigrun.swg
@@ -658,14 +684,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1;
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
+	  int compare = strcmp(name, iname);
 	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
@@ -709,7 +735,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -728,10 +754,10 @@ SWIG_TypeQueryModule(swig_module_info *start,
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
@@ -743,11 +769,11 @@ SWIG_PackData(char *c, void *ptr, size_t sz) {
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -1503,14 +1529,13 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  VALUE klass;
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "TYPE%s", type->name);
   if (NIL_P(_cSWIG_Pointer)) {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
     rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
   }
-  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
   free((void *) klass_name);
 }
 
@@ -1814,10 +1839,10 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_TagLib__ID3v2__FrameFactory swig_types[9]
 #define SWIGTYPE_p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame swig_types[10]
 #define SWIGTYPE_p_TagLib__ID3v2__Header swig_types[11]
-#define SWIGTYPE_p_TagLib__ID3v2__PeakVolume swig_types[12]
-#define SWIGTYPE_p_TagLib__ID3v2__PopularimeterFrame swig_types[13]
-#define SWIGTYPE_p_TagLib__ID3v2__PrivateFrame swig_types[14]
-#define SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame swig_types[15]
+#define SWIGTYPE_p_TagLib__ID3v2__PopularimeterFrame swig_types[12]
+#define SWIGTYPE_p_TagLib__ID3v2__PrivateFrame swig_types[13]
+#define SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame swig_types[14]
+#define SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume swig_types[15]
 #define SWIGTYPE_p_TagLib__ID3v2__Tag swig_types[16]
 #define SWIGTYPE_p_TagLib__ID3v2__TextIdentificationFrame swig_types[17]
 #define SWIGTYPE_p_TagLib__ID3v2__UniqueFileIdentifierFrame swig_types[18]
@@ -1850,7 +1875,7 @@ static VALUE mID3v2;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020012 
+#define SWIGVERSION 0x030007 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1943,7 +1968,7 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
     return result;
   }
   for (long i = 0; i < RARRAY_LEN(ary); i++) {
-    VALUE e = RARRAY_PTR(ary)[i];
+    VALUE e = rb_ary_entry(ary, i);
     TagLib::String s = ruby_string_to_taglib_string(e);
     result.append(s);
   }
@@ -2120,7 +2145,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2172,7 +2197,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2244,36 +2269,6 @@ SWIG_From_int  (int value)
 }
 
 
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_char (VALUE obj, unsigned char *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UCHAR_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned char >(v);
-    }
-  }  
-  return res;
-}
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_unsigned_SS_char  (unsigned char value)
-{    
-  return SWIG_From_unsigned_SS_long  (value);
-}
-
-
-namespace TagLib {
-  namespace ID3v2 {
-    typedef RelativeVolumeFrame::PeakVolume PeakVolume;
-  }
-}
-
-
 SWIGINTERNINLINE VALUE
 SWIG_From_short  (short value)
 {    
@@ -2334,7 +2329,7 @@ SWIG_From_float  (float value)
 #endif
 
 
-/*@SWIG:/usr/local/share/swig/2.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2378,6 +2373,29 @@ SWIG_AsVal_float (VALUE obj, float *val)
   return res;
 }
 
+
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_char (VALUE obj, unsigned char *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UCHAR_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned char >(v);
+    }
+  }  
+  return res;
+}
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_char  (unsigned char value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
 static swig_class SwigClassHeader;
 
 SWIGINTERN VALUE
@@ -4272,153 +4290,6 @@ fail:
 }
 
 
-static swig_class SwigClassPeakVolume;
-
-SWIGINTERN VALUE
-_wrap_PeakVolume_bits_representing_peak_set(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::PeakVolume *arg1 = (TagLib::ID3v2::PeakVolume *) 0 ;
-  unsigned char arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume *","bitsRepresentingPeak", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "unsigned char","bitsRepresentingPeak", 2, argv[0] ));
-  } 
-  arg2 = static_cast< unsigned char >(val2);
-  if (arg1) (arg1)->bitsRepresentingPeak = arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_PeakVolume_bits_representing_peak_get(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::PeakVolume *arg1 = (TagLib::ID3v2::PeakVolume *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  unsigned char result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume *","bitsRepresentingPeak", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp1);
-  result = (unsigned char) ((arg1)->bitsRepresentingPeak);
-  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_PeakVolume_peak_volume_set(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::PeakVolume *arg1 = (TagLib::ID3v2::PeakVolume *) 0 ;
-  TagLib::ByteVector *arg2 = (TagLib::ByteVector *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  TagLib::ByteVector tmp2 ;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume *","peakVolume", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp1);
-  {
-    tmp2 = ruby_string_to_taglib_bytevector(argv[0]);
-    arg2 = &tmp2;
-  }
-  if (arg1) (arg1)->peakVolume = *arg2;
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_PeakVolume_peak_volume_get(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::PeakVolume *arg1 = (TagLib::ID3v2::PeakVolume *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  TagLib::ByteVector *result = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume *","peakVolume", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp1);
-  result = (TagLib::ByteVector *)& ((arg1)->peakVolume);
-  {
-    vresult = taglib_bytevector_to_ruby_string(*(result));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-SWIGINTERN VALUE
-_wrap_PeakVolume_allocate(VALUE self) {
-#else
-  SWIGINTERN VALUE
-  _wrap_PeakVolume_allocate(int argc, VALUE *argv, VALUE self) {
-#endif
-    
-    
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v2__PeakVolume);
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-    rb_obj_call_init(vresult, argc, argv);
-#endif
-    return vresult;
-  }
-  
-
-SWIGINTERN VALUE
-_wrap_new_PeakVolume(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::PeakVolume *result = 0 ;
-  
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  result = (TagLib::ID3v2::PeakVolume *)new TagLib::ID3v2::PeakVolume();
-  DATA_PTR(self) = result;
-  SWIG_RubyAddTracking(result, self);
-  return self;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN void
-free_TagLib_ID3v2_PeakVolume(TagLib::ID3v2::PeakVolume *arg1) {
-    SWIG_RubyRemoveTracking(arg1);
-    delete arg1;
-}
-
 static swig_class SwigClassRelativeVolumeFrame;
 
 SWIGINTERN VALUE
@@ -5080,7 +4951,7 @@ _wrap_RelativeVolumeFrame_peak_volume__SWIG_0(int argc, VALUE *argv, VALUE self)
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  TagLib::ID3v2::PeakVolume result;
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -5097,7 +4968,7 @@ _wrap_RelativeVolumeFrame_peak_volume__SWIG_0(int argc, VALUE *argv, VALUE self)
   } 
   arg2 = static_cast< TagLib::ID3v2::RelativeVolumeFrame::ChannelType >(val2);
   result = ((TagLib::ID3v2::RelativeVolumeFrame const *)arg1)->peakVolume(arg2);
-  vresult = SWIG_NewPointerObj((new TagLib::ID3v2::PeakVolume(static_cast< const TagLib::ID3v2::PeakVolume& >(result))), SWIGTYPE_p_TagLib__ID3v2__PeakVolume, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new TagLib::ID3v2::RelativeVolumeFrame::PeakVolume(static_cast< const TagLib::ID3v2::RelativeVolumeFrame::PeakVolume& >(result))), SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -5109,7 +4980,7 @@ _wrap_RelativeVolumeFrame_peak_volume__SWIG_1(int argc, VALUE *argv, VALUE self)
   TagLib::ID3v2::RelativeVolumeFrame *arg1 = (TagLib::ID3v2::RelativeVolumeFrame *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  TagLib::ID3v2::PeakVolume result;
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -5121,7 +4992,7 @@ _wrap_RelativeVolumeFrame_peak_volume__SWIG_1(int argc, VALUE *argv, VALUE self)
   }
   arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame * >(argp1);
   result = ((TagLib::ID3v2::RelativeVolumeFrame const *)arg1)->peakVolume();
-  vresult = SWIG_NewPointerObj((new TagLib::ID3v2::PeakVolume(static_cast< const TagLib::ID3v2::PeakVolume& >(result))), SWIGTYPE_p_TagLib__ID3v2__PeakVolume, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new TagLib::ID3v2::RelativeVolumeFrame::PeakVolume(static_cast< const TagLib::ID3v2::RelativeVolumeFrame::PeakVolume& >(result))), SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -5166,8 +5037,8 @@ SWIGINTERN VALUE _wrap_RelativeVolumeFrame_peak_volume(int nargs, VALUE *args, V
   
 fail:
   Ruby_Format_OverloadedError( argc, 3, "RelativeVolumeFrame.peak_volume", 
-    "    TagLib::ID3v2::PeakVolume RelativeVolumeFrame.peak_volume(TagLib::ID3v2::RelativeVolumeFrame::ChannelType type)\n"
-    "    TagLib::ID3v2::PeakVolume RelativeVolumeFrame.peak_volume()\n");
+    "    TagLib::ID3v2::RelativeVolumeFrame::PeakVolume RelativeVolumeFrame.peak_volume(TagLib::ID3v2::RelativeVolumeFrame::ChannelType type)\n"
+    "    TagLib::ID3v2::RelativeVolumeFrame::PeakVolume RelativeVolumeFrame.peak_volume()\n");
   
   return Qnil;
 }
@@ -5176,7 +5047,7 @@ fail:
 SWIGINTERN VALUE
 _wrap_RelativeVolumeFrame_set_peak_volume__SWIG_0(int argc, VALUE *argv, VALUE self) {
   TagLib::ID3v2::RelativeVolumeFrame *arg1 = (TagLib::ID3v2::RelativeVolumeFrame *) 0 ;
-  TagLib::ID3v2::PeakVolume *arg2 = 0 ;
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg2 = 0 ;
   TagLib::ID3v2::RelativeVolumeFrame::ChannelType arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5193,20 +5064,20 @@ _wrap_RelativeVolumeFrame_set_peak_volume__SWIG_0(int argc, VALUE *argv, VALUE s
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame *","setPeakVolume", 1, self )); 
   }
   arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame * >(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_TagLib__ID3v2__PeakVolume,  0 );
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume const &","setPeakVolume", 2, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &","setPeakVolume", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "TagLib::ID3v2::PeakVolume const &","setPeakVolume", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &","setPeakVolume", 2, argv[0])); 
   }
-  arg2 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp2);
+  arg2 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp2);
   ecode3 = SWIG_AsVal_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::ChannelType","setPeakVolume", 3, argv[1] ));
   } 
   arg3 = static_cast< TagLib::ID3v2::RelativeVolumeFrame::ChannelType >(val3);
-  (arg1)->setPeakVolume((TagLib::ID3v2::PeakVolume const &)*arg2,arg3);
+  (arg1)->setPeakVolume((TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &)*arg2,arg3);
   return Qnil;
 fail:
   return Qnil;
@@ -5216,7 +5087,7 @@ fail:
 SWIGINTERN VALUE
 _wrap_RelativeVolumeFrame_set_peak_volume__SWIG_1(int argc, VALUE *argv, VALUE self) {
   TagLib::ID3v2::RelativeVolumeFrame *arg1 = (TagLib::ID3v2::RelativeVolumeFrame *) 0 ;
-  TagLib::ID3v2::PeakVolume *arg2 = 0 ;
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 ;
@@ -5230,15 +5101,15 @@ _wrap_RelativeVolumeFrame_set_peak_volume__SWIG_1(int argc, VALUE *argv, VALUE s
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame *","setPeakVolume", 1, self )); 
   }
   arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame * >(argp1);
-  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_TagLib__ID3v2__PeakVolume,  0 );
+  res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume,  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::PeakVolume const &","setPeakVolume", 2, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &","setPeakVolume", 2, argv[0] )); 
   }
   if (!argp2) {
-    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "TagLib::ID3v2::PeakVolume const &","setPeakVolume", 2, argv[0])); 
+    SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &","setPeakVolume", 2, argv[0])); 
   }
-  arg2 = reinterpret_cast< TagLib::ID3v2::PeakVolume * >(argp2);
-  (arg1)->setPeakVolume((TagLib::ID3v2::PeakVolume const &)*arg2);
+  arg2 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp2);
+  (arg1)->setPeakVolume((TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &)*arg2);
   return Qnil;
 fail:
   return Qnil;
@@ -5263,7 +5134,7 @@ SWIGINTERN VALUE _wrap_RelativeVolumeFrame_set_peak_volume(int nargs, VALUE *arg
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_RelativeVolumeFrame_set_peak_volume__SWIG_1(nargs, args, self);
@@ -5277,7 +5148,7 @@ SWIGINTERN VALUE _wrap_RelativeVolumeFrame_set_peak_volume(int nargs, VALUE *arg
     _v = SWIG_CheckState(res);
     if (_v) {
       void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ID3v2__PeakVolume, 0);
+      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -5293,8 +5164,8 @@ SWIGINTERN VALUE _wrap_RelativeVolumeFrame_set_peak_volume(int nargs, VALUE *arg
   
 fail:
   Ruby_Format_OverloadedError( argc, 4, "RelativeVolumeFrame.set_peak_volume", 
-    "    void RelativeVolumeFrame.set_peak_volume(TagLib::ID3v2::PeakVolume const &peak, TagLib::ID3v2::RelativeVolumeFrame::ChannelType type)\n"
-    "    void RelativeVolumeFrame.set_peak_volume(TagLib::ID3v2::PeakVolume const &peak)\n");
+    "    void RelativeVolumeFrame.set_peak_volume(TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &peak, TagLib::ID3v2::RelativeVolumeFrame::ChannelType type)\n"
+    "    void RelativeVolumeFrame.set_peak_volume(TagLib::ID3v2::RelativeVolumeFrame::PeakVolume const &peak)\n");
   
   return Qnil;
 }
@@ -5353,6 +5224,153 @@ fail:
 }
 
 
+static swig_class SwigClassPeakVolume;
+
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+SWIGINTERN VALUE
+_wrap_PeakVolume_allocate(VALUE self) {
+#else
+  SWIGINTERN VALUE
+  _wrap_PeakVolume_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    
+    
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+  
+
+SWIGINTERN VALUE
+_wrap_new_PeakVolume(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *result = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *)new TagLib::ID3v2::RelativeVolumeFrame::PeakVolume();
+  DATA_PTR(self) = result;
+  SWIG_RubyAddTracking(result, self);
+  return self;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_PeakVolume_bits_representing_peak_set(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg1 = (TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *) 0 ;
+  unsigned char arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned char val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *","bitsRepresentingPeak", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp1);
+  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "unsigned char","bitsRepresentingPeak", 2, argv[0] ));
+  } 
+  arg2 = static_cast< unsigned char >(val2);
+  if (arg1) (arg1)->bitsRepresentingPeak = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_PeakVolume_bits_representing_peak_get(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg1 = (TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned char result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *","bitsRepresentingPeak", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp1);
+  result = (unsigned char) ((arg1)->bitsRepresentingPeak);
+  vresult = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_PeakVolume_peak_volume_set(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg1 = (TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *) 0 ;
+  TagLib::ByteVector *arg2 = (TagLib::ByteVector *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  TagLib::ByteVector tmp2 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *","peakVolume", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp1);
+  {
+    tmp2 = ruby_string_to_taglib_bytevector(argv[0]);
+    arg2 = &tmp2;
+  }
+  if (arg1) (arg1)->peakVolume = *arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_PeakVolume_peak_volume_get(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg1 = (TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  TagLib::ByteVector *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *","peakVolume", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::RelativeVolumeFrame::PeakVolume * >(argp1);
+  result = (TagLib::ByteVector *)& ((arg1)->peakVolume);
+  {
+    vresult = taglib_bytevector_to_ruby_string(*(result));
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN void
+free_TagLib_ID3v2_RelativeVolumeFrame_PeakVolume(TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *arg1) {
+    SWIG_RubyRemoveTracking(arg1);
+    delete arg1;
+}
+
 static swig_class SwigClassAttachedPictureFrame;
 
 SWIGINTERN VALUE
@@ -8809,10 +8827,10 @@ static swig_type_info _swigt__p_TagLib__ID3v2__Frame = {"_p_TagLib__ID3v2__Frame
 static swig_type_info _swigt__p_TagLib__ID3v2__FrameFactory = {"_p_TagLib__ID3v2__FrameFactory", "TagLib::ID3v2::FrameFactory *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame = {"_p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame", "TagLib::ID3v2::GeneralEncapsulatedObjectFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__Header = {"_p_TagLib__ID3v2__Header", "TagLib::ID3v2::Header *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_TagLib__ID3v2__PeakVolume = {"_p_TagLib__ID3v2__PeakVolume", "TagLib::ID3v2::PeakVolume *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__PopularimeterFrame = {"_p_TagLib__ID3v2__PopularimeterFrame", "TagLib::ID3v2::PopularimeterFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__PrivateFrame = {"_p_TagLib__ID3v2__PrivateFrame", "TagLib::ID3v2::PrivateFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__RelativeVolumeFrame = {"_p_TagLib__ID3v2__RelativeVolumeFrame", "TagLib::ID3v2::RelativeVolumeFrame *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume = {"_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume", "TagLib::ID3v2::RelativeVolumeFrame::PeakVolume *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__Tag = {"_p_TagLib__ID3v2__Tag", "TagLib::ID3v2::Tag *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__TextIdentificationFrame = {"_p_TagLib__ID3v2__TextIdentificationFrame", "TagLib::ID3v2::TextIdentificationFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__ID3v2__UniqueFileIdentifierFrame = {"_p_TagLib__ID3v2__UniqueFileIdentifierFrame", "TagLib::ID3v2::UniqueFileIdentifierFrame *", 0, 0, (void*)0, 0};
@@ -8843,10 +8861,10 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_TagLib__ID3v2__FrameFactory,
   &_swigt__p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame,
   &_swigt__p_TagLib__ID3v2__Header,
-  &_swigt__p_TagLib__ID3v2__PeakVolume,
   &_swigt__p_TagLib__ID3v2__PopularimeterFrame,
   &_swigt__p_TagLib__ID3v2__PrivateFrame,
   &_swigt__p_TagLib__ID3v2__RelativeVolumeFrame,
+  &_swigt__p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume,
   &_swigt__p_TagLib__ID3v2__Tag,
   &_swigt__p_TagLib__ID3v2__TextIdentificationFrame,
   &_swigt__p_TagLib__ID3v2__UniqueFileIdentifierFrame,
@@ -8877,10 +8895,10 @@ static swig_cast_info _swigc__p_TagLib__ID3v2__Frame[] = {  {&_swigt__p_TagLib__
 static swig_cast_info _swigc__p_TagLib__ID3v2__FrameFactory[] = {  {&_swigt__p_TagLib__ID3v2__FrameFactory, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame[] = {  {&_swigt__p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__Header[] = {  {&_swigt__p_TagLib__ID3v2__Header, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_TagLib__ID3v2__PeakVolume[] = {  {&_swigt__p_TagLib__ID3v2__PeakVolume, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__PopularimeterFrame[] = {  {&_swigt__p_TagLib__ID3v2__PopularimeterFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__PrivateFrame[] = {  {&_swigt__p_TagLib__ID3v2__PrivateFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__RelativeVolumeFrame[] = {  {&_swigt__p_TagLib__ID3v2__RelativeVolumeFrame, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume[] = {  {&_swigt__p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__Tag[] = {  {&_swigt__p_TagLib__ID3v2__Tag, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__TextIdentificationFrame[] = {  {&_swigt__p_TagLib__ID3v2__TextIdentificationFrame, 0, 0, 0},  {&_swigt__p_TagLib__ID3v2__UserTextIdentificationFrame, _p_TagLib__ID3v2__UserTextIdentificationFrameTo_p_TagLib__ID3v2__TextIdentificationFrame, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__UniqueFileIdentifierFrame[] = {  {&_swigt__p_TagLib__ID3v2__UniqueFileIdentifierFrame, 0, 0, 0},{0, 0, 0, 0}};
@@ -8911,10 +8929,10 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_TagLib__ID3v2__FrameFactory,
   _swigc__p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame,
   _swigc__p_TagLib__ID3v2__Header,
-  _swigc__p_TagLib__ID3v2__PeakVolume,
   _swigc__p_TagLib__ID3v2__PopularimeterFrame,
   _swigc__p_TagLib__ID3v2__PrivateFrame,
   _swigc__p_TagLib__ID3v2__RelativeVolumeFrame,
+  _swigc__p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume,
   _swigc__p_TagLib__ID3v2__Tag,
   _swigc__p_TagLib__ID3v2__TextIdentificationFrame,
   _swigc__p_TagLib__ID3v2__UniqueFileIdentifierFrame,
@@ -8949,7 +8967,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -8993,7 +9011,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
+  int init;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
@@ -9012,22 +9030,18 @@ SWIG_InitializeModule(void *clientdata) {
     /* This is the first module loaded for this interpreter */
     /* so set the swig module into the interpreter */
     SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
   } else {
     /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
     iter=module_head;
     do {
       if (iter==&swig_module) {
-        found=1;
-        break;
+        /* Our module is already in the list, so there's nothing more to do. */
+        return;
       }
       iter=iter->next;
     } while (iter!= module_head);
 
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
+    /* otherwise we must add our module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
   }
@@ -9271,18 +9285,6 @@ SWIGEXPORT void Init_taglib_id3v2(void) {
   SwigClassFrameFactory.mark = 0;
   SwigClassFrameFactory.trackObjects = 1;
   
-  SwigClassPeakVolume.klass = rb_define_class_under(mID3v2, "PeakVolume", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__PeakVolume, (void *) &SwigClassPeakVolume);
-  rb_define_alloc_func(SwigClassPeakVolume.klass, _wrap_PeakVolume_allocate);
-  rb_define_method(SwigClassPeakVolume.klass, "initialize", VALUEFUNC(_wrap_new_PeakVolume), -1);
-  rb_define_method(SwigClassPeakVolume.klass, "bits_representing_peak=", VALUEFUNC(_wrap_PeakVolume_bits_representing_peak_set), -1);
-  rb_define_method(SwigClassPeakVolume.klass, "bits_representing_peak", VALUEFUNC(_wrap_PeakVolume_bits_representing_peak_get), -1);
-  rb_define_method(SwigClassPeakVolume.klass, "peak_volume=", VALUEFUNC(_wrap_PeakVolume_peak_volume_set), -1);
-  rb_define_method(SwigClassPeakVolume.klass, "peak_volume", VALUEFUNC(_wrap_PeakVolume_peak_volume_get), -1);
-  SwigClassPeakVolume.mark = 0;
-  SwigClassPeakVolume.destroy = (void (*)(void *)) free_TagLib_ID3v2_PeakVolume;
-  SwigClassPeakVolume.trackObjects = 1;
-  
   SwigClassRelativeVolumeFrame.klass = rb_define_class_under(mID3v2, "RelativeVolumeFrame", ((swig_class *) SWIGTYPE_p_TagLib__ID3v2__Frame->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame, (void *) &SwigClassRelativeVolumeFrame);
   rb_define_alloc_func(SwigClassRelativeVolumeFrame.klass, _wrap_RelativeVolumeFrame_allocate);
@@ -9312,6 +9314,18 @@ SWIGEXPORT void Init_taglib_id3v2(void) {
   SwigClassRelativeVolumeFrame.destroy = (void (*)(void *)) free_TagLib_ID3v2_RelativeVolumeFrame;
   SwigClassRelativeVolumeFrame.trackObjects = 1;
   
+  SwigClassPeakVolume.klass = rb_define_class_under(mID3v2, "PeakVolume", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__RelativeVolumeFrame__PeakVolume, (void *) &SwigClassPeakVolume);
+  rb_define_alloc_func(SwigClassPeakVolume.klass, _wrap_PeakVolume_allocate);
+  rb_define_method(SwigClassPeakVolume.klass, "initialize", VALUEFUNC(_wrap_new_PeakVolume), -1);
+  rb_define_method(SwigClassPeakVolume.klass, "bits_representing_peak=", VALUEFUNC(_wrap_PeakVolume_bits_representing_peak_set), -1);
+  rb_define_method(SwigClassPeakVolume.klass, "bits_representing_peak", VALUEFUNC(_wrap_PeakVolume_bits_representing_peak_get), -1);
+  rb_define_method(SwigClassPeakVolume.klass, "peak_volume=", VALUEFUNC(_wrap_PeakVolume_peak_volume_set), -1);
+  rb_define_method(SwigClassPeakVolume.klass, "peak_volume", VALUEFUNC(_wrap_PeakVolume_peak_volume_get), -1);
+  SwigClassPeakVolume.mark = 0;
+  SwigClassPeakVolume.destroy = (void (*)(void *)) free_TagLib_ID3v2_RelativeVolumeFrame_PeakVolume;
+  SwigClassPeakVolume.trackObjects = 1;
+  
   SwigClassAttachedPictureFrame.klass = rb_define_class_under(mID3v2, "AttachedPictureFrame", ((swig_class *) SWIGTYPE_p_TagLib__ID3v2__Frame->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame, (void *) &SwigClassAttachedPictureFrame);
   rb_define_alloc_func(SwigClassAttachedPictureFrame.klass, _wrap_AttachedPictureFrame_allocate);