rtaglib 0.2.2 → 0.2.3

data/History.txt

@@ -1,11 +1,23 @@
+=== 0.2.3 / 2009-05-20
+
+* Better configuration for compilation on *nix archs.
+* Better handling of temporary files on test suite
+* Working FrameListMap, AttachedPictureFrame, CommentsFrame on TagLib::ID3v2 module
+* Bug fix: Segfault on clearing TagLib::MPEG::File  after adding a frame
+* Bug fix: Assing UTF8 strings to tags return garbage (Jason Newton)
+
+=== 0.2.2 / 2009-04-25
+* Compiles on MinGW
+
 === 0.2.1 / 2009-04-10
 
-+ New documentation system. Complete API documentation, based on Reflection and doxygen xml output of taglib header files
-+ Added /lib/TagLib.rb for easy inclusion. 
+* New documentation system. Complete API documentation, based on Reflection and doxygen xml output of taglib header files
+* Added /lib/TagLib.rb for easy inclusion on TagLib module. 
+
 === 0.2.0 / 2009-04-07
 
 * Renamed rtaglib to tagfile. Use require 'tagfile/tagfile'
-+ Implementation of complete API, based on swig. Use require 'tagfile/tagfile' and review test/test_taglib.rb for examples of use
+* Implementation of complete API, based on swig. Use require 'taglib/taglib' and see test/test_taglib.rb for examples of usecd 
 
 === 0.1.2 / 2008-06-23
 

data/README.txt

@@ -4,7 +4,11 @@ http://rtaglib.rubyforge.org
 
 == DESCRIPTION:
 
-A pure C binding for taglib (http://developer.kde.org/~wheeler/taglib.html), a library for reading and editing the meta-data of several popular audio formats. This extension uses the same interface of http://www.hakubi.us/ruby-taglib/.
+Bindings for taglib (http://developer.kde.org/~wheeler/taglib.html), a library for reading and editing the meta-data of several popular audio formats. 
+
+* TagFile: This class uses the same interface of http://www.hakubi.us/ruby-taglib/.
+* TagLib: Recreates the original C++ API using swig.
+
 
 == FEATURES/PROBLEMS:
 
@@ -12,6 +16,8 @@ Reports problem to clbustos _AT_ gmail.com
 
 == SYNOPSIS:
 
+*TagFile*
+
 	irb(main):001:0> require 'tagfile/tagfile'
 	=> true
 	irb(main):002:0> tag=TagFile::File.new('saw.mp3')
@@ -32,9 +38,22 @@ Reports problem to clbustos _AT_ gmail.com
 	=> "Test for catori"
 	irb(main):010:0> 
 
+*TagLib*
+	irb(main):001:0> require 'TagLib'
+	=> true
+	irb(main):002:0> fr=TagLib::FileRef.new('440Hz-5sec.mp3')
+	=> #<TagLib::FileRef:0x7f3d044e73c8>
+	irb(main):003:0> fr.tag
+	=> #<TagLib::Tag:0x7f3d044e4768>
+	irb(main):004:0> fr.audioProperties
+	=> #<TagLib::AudioProperties:0x7f3d044e14a0>
+	irb(main):005:0> fr.tag.title
+	=> "440Hz Sine Wave"
+
+
 == REQUIREMENTS:
 
-* taglib >= 1.4
+* taglib >= 1.5
 
 URL: http://developer.kde.org/~wheeler/taglib.html
 

data/Rakefile

@@ -6,36 +6,32 @@ require 'rake/rdoctask'
 desc "compile and test"
 task :default => [:compile, :test]
 
+
 BASE_TAGFILE=File.dirname(__FILE__)+"/ext/tagfile"
 BASE_TAGLIB=File.dirname(__FILE__)+"/ext/taglib"
 
 
 
 file "#{BASE_TAGFILE}/tagfile.so" => ["#{BASE_TAGFILE}/tagfile.c", "#{BASE_TAGFILE}/Makefile"] do |t|
-	cd "#{BASE_TAGFILE}"
-	system %(make)
+	system %(cd "#{BASE_TAGFILE}" && make)
 end
 
 file "#{BASE_TAGLIB}/taglib.so" => ["#{BASE_TAGLIB}/taglib.cxx", "#{BASE_TAGLIB}/Makefile"] do |t|
-	cd "#{BASE_TAGLIB}"
-	system %(make)
+	system %(cd "#{BASE_TAGLIB}" && make)
 end
 if system %(which swig)
     file "#{BASE_TAGLIB}/taglib.cxx" => ["swig/taglib.i","swig/extconf.rb"] do |t|
-    cd "swig"
-    system %{rake}
+    system %{cd swig && rake}
     end
 end
 
 file "lib/TagLib_doc.rb" => "swig/TagLib_doc.rb" do |t|
-    cd %(swig)
-    system %(rake copy)
+    system %(cd swig && rake copy)
 end
 exts=[BASE_TAGFILE,BASE_TAGLIB]
 exts.each {|base|
     file "#{base}/Makefile" => ["#{base}/extconf.rb"] do |t|
-    cd "#{base}"
-	system %(ruby "extconf.rb")
+    system %(cd "#{base}" && ruby "extconf.rb")
 end
 }
 
@@ -56,8 +52,17 @@ end
 
 require 'rubygems'
 require 'hoe'
+$LOAD_PATH << "./ext"
 require "./lib/TagLib.rb"
 
+task :svn => [:default] do |t|
+    system %(cd #{File.dirname(__FILE__)})
+    system %(svn commit)
+    system %(svn cp svn+ssh://clbustos@rubyforge.org/var/svn/rtaglib/trunk/ svn+ssh://clbustos@rubyforge.org/var/svn/rtaglib/tags/rtaglib-#{TagLib::VERSION} -m "Tag for rtaglib-#{TagLib::VERSION}")    
+end
+
+
+
 Hoe.new('rtaglib', TagLib::VERSION) do |p|
   p.developer('cdx', 'clbustos@surnet.cl')
   p.author="Claudio Bustos"

data/ext/tagfile/extconf.rb

@@ -1,5 +1,11 @@
 require "mkmf"
 $CFLAGS+=" -Wall "
+taglib_config = find_executable("taglib-config")
+if taglib_config
+  prefix = `#{taglib_config} --prefix`.strip
+  $CFLAGS += " -I#{prefix}/include"
+  $LDFLAGS += " -L#{prefix}/lib"
+end
 dir_config("tag_c")
 if have_library("tag_c") and have_header("taglib/tag_c.h")
     create_makefile("tagfile")

data/ext/taglib/extconf.rb

@@ -5,11 +5,18 @@ if(PLATFORM=~/mingw/)
 	$CFLAGS= " -I/mingw/include/taglib"
 
 else
-	puts "Building for other architecture"
-	$CFLAGS= " -I/usr/include/taglib"
-
+    puts "Building for other architecture"
+    taglib_config = find_executable("taglib-config")
+    if taglib_config
+        prefix = `#{taglib_config} --prefix`.strip
+        $CFLAGS += " -I#{prefix}/include"
+        $LDFLAGS += " -L#{prefix}/lib"
+    else
+        prefix = "/usr"
+    end
+    $CFLAGS += " -I#{prefix}/include/taglib"
 end
-	$libs = append_library($libs, "supc++")
+$libs = append_library($libs, "supc++")
 if have_header("taglib/taglib_export.h") and have_library("tag")
     create_makefile("TagLib")
 end

data/ext/taglib/taglib.cxx

@@ -1819,14 +1819,16 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #define SWIGTYPE_p_TagLib__WavPack__File swig_types[45]
 #define SWIGTYPE_p_TagLib__WavPack__Properties swig_types[46]
 #define SWIGTYPE_p_char swig_types[47]
-#define SWIGTYPE_p_p_TagLib__ID3v2__Frame swig_types[48]
-#define SWIGTYPE_p_std__basic_stringT_wchar_t_t swig_types[49]
-#define SWIGTYPE_p_unsigned_char swig_types[50]
-#define SWIGTYPE_p_unsigned_int swig_types[51]
-#define SWIGTYPE_p_unsigned_long swig_types[52]
-#define SWIGTYPE_p_wchar_t swig_types[53]
-static swig_type_info *swig_types[55];
-static swig_module_info swig_module = {swig_types, 54, 0, 0, 0, 0};
+#define SWIGTYPE_p_p_TagLib__ID3v2__AttachedPictureFrame swig_types[48]
+#define SWIGTYPE_p_p_TagLib__ID3v2__CommentsFrame swig_types[49]
+#define SWIGTYPE_p_p_TagLib__ID3v2__Frame swig_types[50]
+#define SWIGTYPE_p_std__basic_stringT_wchar_t_t swig_types[51]
+#define SWIGTYPE_p_unsigned_char swig_types[52]
+#define SWIGTYPE_p_unsigned_int swig_types[53]
+#define SWIGTYPE_p_unsigned_long swig_types[54]
+#define SWIGTYPE_p_wchar_t swig_types[55]
+static swig_type_info *swig_types[57];
+static swig_module_info swig_module = {swig_types, 56, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1907,18 +1909,35 @@ typedef std::basic_string< wchar > 	wstring;
 typedef const char * 	FileName;
 
 
-    VALUE StringList2Ruby(TagLib::StringList st) {
+    VALUE ByteVector2Ruby(const TagLib::ByteVector *bv) {
+        return rb_tainted_str_new(bv->data(),bv->size());;
+    }
+    VALUE String2Ruby(const TagLib::String *st) {
+        return rb_tainted_str_new2(st->toCString(!st->isLatin1()));
+    }
+    
+    VALUE StringList2Ruby(const TagLib::StringList *st) {
+        VALUE ary=Qnil;
+        if(st->size()>0) {
+            ary=rb_ary_new2(st->size());
+            for(uint i=0;i<(st->size());i++) {
+                const TagLib::String *val=&(st->operator[](i));
+                rb_ary_push(ary, String2Ruby(val));
+            }
+        }
+        return ary;
+    }
+    VALUE FrameList2Ruby(const TagLib::ID3v2::FrameList *st) {
         VALUE ary=Qnil;
-        if(st.size()>0) {
-            ary=rb_ary_new2(st.size());
-            for(uint i=0;i<(st.size());i++) {
-            TagLib::String &rst=st.operator[](i);
-            const char* ch=rst.toCString(true);
-            rb_ary_push(ary, rb_tainted_str_new2(ch));
+        if(st->size()>0) {
+            ary=rb_ary_new2(st->size());
+            for(uint i=0;i<(st->size());i++) {
+            rb_ary_push(ary, SWIG_NewPointerObj(st->operator[](i), SWIGTYPE_p_TagLib__ID3v2__Frame, 0));
             }
         }
         return ary;
     }
+    
 
 
 #include <limits.h>
@@ -2147,7 +2166,8 @@ SWIGINTERN uint TagLib_Map_Sl_TagLib_String_Sc_TagLib_StringList_Sg____len__(Tag
              }
 VALUE TagLib_Map_Sl_TagLib_String_Sc_TagLib_StringList_Sg____getitem__(TagLib::Map< TagLib::String,TagLib::StringList > *self,TagLib::String &item){
         if(self->contains(item)) {
-            return StringList2Ruby(self->operator[](item));
+            TagLib::StringList val=self->operator[](item);
+            return StringList2Ruby(&val);
         } else {
             return Qnil;
         }
@@ -2156,8 +2176,8 @@ VALUE TagLib_Map_Sl_TagLib_String_Sc_TagLib_StringList_Sg____hash__(TagLib::Map<
         uint i;
         VALUE hash=rb_hash_new();
         for(std::map<TagLib::String,TagLib::StringList>::const_iterator it=self->begin(); it!=self->end();it++) {
-            VALUE key=rb_tainted_str_new2(it->first.toCString(true));
-            VALUE ary=StringList2Ruby(it->second);
+            VALUE key=String2Ruby(&it->first);
+            VALUE ary=StringList2Ruby(&it->second);
             rb_hash_aset(hash,key,ary);
         }
         return hash;
@@ -2170,7 +2190,8 @@ SWIGINTERN uint TagLib_Map_Sl_TagLib_String_Sc_int_Sg____len__(TagLib::Map< TagL
              }
 VALUE TagLib_Map_Sl_TagLib_String_Sc_int_Sg____getitem__(TagLib::Map< TagLib::String,int > *self,TagLib::String &item){
         if(self->contains(item)) {
-            return INT2FIX(self->operator[](item));
+            int val=self->operator[](item);
+            return INT2FIX(&val);
         } else {
             return Qnil;
         }
@@ -2179,8 +2200,8 @@ VALUE TagLib_Map_Sl_TagLib_String_Sc_int_Sg____hash__(TagLib::Map< TagLib::Strin
         uint i;
         VALUE hash=rb_hash_new();
         for(std::map<TagLib::String,int>::const_iterator it=self->begin(); it!=self->end();it++) {
-            VALUE key=rb_tainted_str_new2(it->first.toCString(true));
-            VALUE ary=INT2FIX(it->second);
+            VALUE key=String2Ruby(&it->first);
+            VALUE ary=INT2FIX(&it->second);
             rb_hash_aset(hash,key,ary);
         }
         return hash;
@@ -2188,6 +2209,24 @@ VALUE TagLib_Map_Sl_TagLib_String_Sc_int_Sg____hash__(TagLib::Map< TagLib::Strin
 SWIGINTERN uint TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg____len__(TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *self){
                  return self->size();
              }
+VALUE TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg____getitem__(TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *self,TagLib::ByteVector &item){
+        if(self->contains(item)) {
+            TagLib::ID3v2::FrameList val=self->operator[](item);
+            return FrameList2Ruby(&val);
+        } else {
+            return Qnil;
+        }
+    }
+VALUE TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg____hash__(TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *self){
+        uint i;
+        VALUE hash=rb_hash_new();
+        for(std::map<TagLib::ByteVector,TagLib::ID3v2::FrameList>::const_iterator it=self->begin(); it!=self->end();it++) {
+            VALUE key=ByteVector2Ruby(&it->first);
+            VALUE ary=FrameList2Ruby(&it->second);
+            rb_hash_aset(hash,key,ary);
+        }
+        return hash;
+    }
 
 SWIGINTERN int
 SWIG_AsVal_bool (VALUE obj, bool *val)
@@ -2244,6 +2283,12 @@ SWIG_AsVal_long_SS_long (VALUE obj, long long *val)
   return SWIG_TypeError;
 }
 
+VALUE TagLib_ID3v2_Frame___str__(TagLib::ID3v2::Frame *self){
+                    return rb_tainted_str_new2(self->toString().toCString(false));
+                }
+SWIGINTERN TagLib::ID3v2::AttachedPictureFrame *TagLib_ID3v2_AttachedPictureFrame_new2(TagLib::ByteVector const &data){
+                 return new TagLib::ID3v2::AttachedPictureFrame(data);
+                }
 
 /*
   Document-class: TagLib::AudioProperties
@@ -2662,7 +2707,7 @@ _wrap_Tag_title(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Tag * >(argp1);
   result = ((TagLib::Tag const *)arg1)->title();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -2698,7 +2743,7 @@ _wrap_Tag_artist(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Tag * >(argp1);
   result = ((TagLib::Tag const *)arg1)->artist();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -2734,7 +2779,7 @@ _wrap_Tag_album(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Tag * >(argp1);
   result = ((TagLib::Tag const *)arg1)->album();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -2770,7 +2815,7 @@ _wrap_Tag_comment(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Tag * >(argp1);
   result = ((TagLib::Tag const *)arg1)->comment();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -2806,7 +2851,7 @@ _wrap_Tag_genre(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Tag * >(argp1);
   result = ((TagLib::Tag const *)arg1)->genre();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -3666,6 +3711,7 @@ _wrap_File_writeBlock(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   (arg1)->writeBlock((TagLib::ByteVector const &)*arg2);
@@ -3702,6 +3748,7 @@ _wrap_File_find1(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (long)(arg1)->find((TagLib::ByteVector const &)*arg2);
@@ -3742,6 +3789,7 @@ _wrap_File_find2(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_long(argv[1], &val3);
@@ -3788,6 +3836,7 @@ _wrap_File_find3(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_long(argv[1], &val3);
@@ -3796,6 +3845,7 @@ _wrap_File_find3(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< long >(val3);
   {
+    Check_Type(argv[2], T_STRING);
     arg4=new TagLib::ByteVector(StringValuePtr(argv[2]), RSTRING_LEN(argv[2]));
   }
   result = (long)(arg1)->find((TagLib::ByteVector const &)*arg2,arg3,(TagLib::ByteVector const &)*arg4);
@@ -3840,6 +3890,7 @@ _wrap_File_rfind__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_long(argv[1], &val3);
@@ -3848,6 +3899,7 @@ _wrap_File_rfind__SWIG_0(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< long >(val3);
   {
+    Check_Type(argv[2], T_STRING);
     arg4=new TagLib::ByteVector(StringValuePtr(argv[2]), RSTRING_LEN(argv[2]));
   }
   result = (long)(arg1)->rfind((TagLib::ByteVector const &)*arg2,arg3,(TagLib::ByteVector const &)*arg4);
@@ -3879,6 +3931,7 @@ _wrap_File_rfind__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_long(argv[1], &val3);
@@ -3912,6 +3965,7 @@ _wrap_File_rfind__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (long)(arg1)->rfind((TagLib::ByteVector const &)*arg2);
@@ -4036,6 +4090,7 @@ _wrap_File_insert__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_unsigned_SS_long(argv[1], &val3);
@@ -4074,6 +4129,7 @@ _wrap_File_insert__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode3 = SWIG_AsVal_unsigned_SS_long(argv[1], &val3);
@@ -4104,6 +4160,7 @@ _wrap_File_insert__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   (arg1)->insert((TagLib::ByteVector const &)*arg2);
@@ -5809,6 +5866,7 @@ _wrap_FrameListMap_insert(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_TagLib__ListT_Frame_p_t,  0 );
@@ -5962,6 +6020,7 @@ _wrap_FrameListMap_contains(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (bool)(arg1)->contains((TagLib::ByteVector const &)*arg2);
@@ -6007,6 +6066,78 @@ fail:
 
 
 
+/*
+  Document-method: TagLib::FrameListMap.[]
+
+  call-seq:
+    [](item) -> VALUE
+
+Element accessor/slicing.
+*/
+VALUE
+_wrap_FrameListMap___getitem__(int argc, VALUE *argv, VALUE self) {
+  TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *arg1 = (TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *) 0 ;
+  TagLib::ByteVector *arg2 = 0 ;
+  VALUE result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  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__MapT_TagLib__ByteVector_TagLib__ID3v2__FrameList_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *","__getitem__", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > * >(argp1);
+  {
+    Check_Type(argv[0], T_STRING);
+    arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+  }
+  result = (VALUE)TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg____getitem__(arg1,*arg2);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::FrameListMap.hash
+
+  call-seq:
+    hash -> VALUE
+
+An instance method.
+
+*/
+VALUE
+_wrap_FrameListMap___hash__(int argc, VALUE *argv, VALUE self) {
+  TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *arg1 = (TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *) 0 ;
+  VALUE result;
+  void *argp1 = 0 ;
+  int res1 = 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__MapT_TagLib__ByteVector_TagLib__ID3v2__FrameList_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > *","__hash__", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::Map< TagLib::ByteVector,TagLib::ID3v2::FrameList > * >(argp1);
+  result = (VALUE)TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg____hash__(arg1);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
 /*
   Document-class: TagLib::StringList
 
@@ -6438,6 +6569,7 @@ _wrap_ByteVectorList_contains(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::List< TagLib::ByteVector > * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (bool)((TagLib::List< TagLib::ByteVector > const *)arg1)->contains((TagLib::ByteVector const &)*arg2);
@@ -6636,7 +6768,7 @@ fail:
   Document-method: TagLib::FrameList.contains
 
   call-seq:
-    contains(TagLib::ID3v2::Frame value) -> bool
+    contains(ID3v2_Frame value) -> bool
 
 An instance method.
 
@@ -6705,7 +6837,7 @@ _wrap_FileRef_defaultFileExtensions(int argc, VALUE *argv, VALUE self) {
   }
   result = TagLib::FileRef::defaultFileExtensions();
   {
-    vresult=StringList2Ruby(result);
+    vresult=StringList2Ruby(&result);
   }
   return vresult;
 fail:
@@ -7155,6 +7287,7 @@ _wrap_new_APE_Footer__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (TagLib::APE::Footer *)new TagLib::APE::Footer((TagLib::ByteVector const &)*arg1);DATA_PTR(self) = result;
@@ -7583,6 +7716,7 @@ _wrap_APE_Footer_setData(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::APE::Footer * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   (arg1)->setData((TagLib::ByteVector const &)*arg2);
@@ -7935,7 +8069,7 @@ _wrap_APE_Item_key(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::APE::Item * >(argp1);
   result = ((TagLib::APE::Item const *)arg1)->key();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -8227,7 +8361,7 @@ _wrap_APE_Item_toString(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::APE::Item * >(argp1);
   result = ((TagLib::APE::Item const *)arg1)->toString();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -8263,7 +8397,7 @@ _wrap_APE_Item_toStringList(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::APE::Item * >(argp1);
   result = ((TagLib::APE::Item const *)arg1)->toStringList();
   {
-    vresult=StringList2Ruby(result);
+    vresult=StringList2Ruby(&result);
   }
   return vresult;
 fail:
@@ -8298,7 +8432,7 @@ _wrap_APE_Item_values(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::APE::Item * >(argp1);
   result = ((TagLib::APE::Item const *)arg1)->values();
   {
-    vresult=StringList2Ruby(result);
+    vresult=StringList2Ruby(&result);
   }
   return vresult;
 fail:
@@ -8368,6 +8502,7 @@ _wrap_APE_Item_parse(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< TagLib::APE::Item * >(argp1);
   {
+    Check_Type(argv[0], T_STRING);
     arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   (arg1)->parse((TagLib::ByteVector const &)*arg2);
@@ -10468,6 +10603,7 @@ _wrap_Ogg_File_setPacket(int argc, VALUE *argv, VALUE self) {
   } 
   arg2 = static_cast< uint >(val2);
   {
+    Check_Type(argv[1], T_STRING);
     arg3=new TagLib::ByteVector(StringValuePtr(argv[1]), RSTRING_LEN(argv[1]));
   }
   (arg1)->setPacket(arg2,(TagLib::ByteVector const &)*arg3);
@@ -10618,6 +10754,7 @@ _wrap_new_Ogg_XiphComment__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (TagLib::Ogg::XiphComment *)new TagLib::Ogg::XiphComment((TagLib::ByteVector const &)*arg1);DATA_PTR(self) = result;
@@ -10764,7 +10901,7 @@ _wrap_Ogg_XiphComment_vendorID(int argc, VALUE *argv, VALUE self) {
   arg1 = reinterpret_cast< TagLib::Ogg::XiphComment * >(argp1);
   result = (arg1)->vendorID();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = String2Ruby(&result);
   }
   return vresult;
 fail:
@@ -12096,170 +12233,114 @@ swig_class cVorbis_File;
 
 
 /*
-  Document-method: TagLib::ID3v1.ID3v1_genre
-
-  call-seq:
-    ID3v1_genre(int index) -> String
-
-A module function.
-
-*/
-VALUE
-_wrap_ID3v1_genre(int argc, VALUE *argv, VALUE self) {
-  int arg1 ;
-  TagLib::String result;
-  int val1 ;
-  int ecode1 = 0 ;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_int(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","TagLib::ID3v1::genre", 1, argv[0] ));
-  } 
-  arg1 = static_cast< int >(val1);
-  result = TagLib::ID3v1::genre(arg1);
-  {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
-/*
-  Document-method: TagLib::ID3v1.ID3v1_genreIndex
-
-  call-seq:
-    ID3v1_genreIndex(String name) -> int
-
-A module function.
-
-*/
-VALUE
-_wrap_ID3v1_genreIndex(int argc, VALUE *argv, VALUE self) {
-  TagLib::String *arg1 = 0 ;
-  int result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  {
-    arg1=new TagLib::String(StringValuePtr(argv[0]));
-  }
-  result = (int)TagLib::ID3v1::genreIndex((TagLib::String const &)*arg1);
-  vresult = SWIG_From_int(static_cast< int >(result));
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
-/*
-  Document-method: TagLib::ID3v1.ID3v1_genreList
+  Document-method: TagLib::Vorbis_File.new
 
   call-seq:
-    ID3v1_genreList
+    Vorbis_File.new(FileName file, bool readProperties=true, ReadStyle propertiesStyle=Average)
+    Vorbis_File.new(FileName file, bool readProperties=true)
+    Vorbis_File.new(FileName file)
 
-A module function.
+Class constructor.
 
 */
 VALUE
-_wrap_ID3v1_genreList(int argc, VALUE *argv, VALUE self) {
-  TagLib::StringList result;
-  VALUE vresult = Qnil;
+_wrap_new_Vorbis_File__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  FileName arg1 = (FileName) 0 ;
+  bool arg2 ;
+  TagLib::Vorbis::Properties::ReadStyle arg3 ;
+  TagLib::Vorbis::File *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  result = TagLib::ID3v1::genreList();
-  {
-    vresult=StringList2Ruby(result);
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "FileName","TagLib::Vorbis::File", 1, argv[0] ));
   }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
-/*
-  Document-method: TagLib::ID3v1.ID3v1_genreMap
-
-  call-seq:
-    ID3v1_genreMap -> GenreMap
-
-A module function.
-
-*/
-VALUE
-_wrap_ID3v1_genreMap(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v1::GenreMap result;
-  VALUE vresult = Qnil;
+  arg1 = reinterpret_cast< FileName >(buf1);
+  ecode2 = SWIG_AsVal_bool(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::Vorbis::File", 2, argv[1] ));
+  } 
+  arg2 = static_cast< bool >(val2);
+  ecode3 = SWIG_AsVal_int(argv[2], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "TagLib::Vorbis::Properties::ReadStyle","TagLib::Vorbis::File", 3, argv[2] ));
+  } 
+  arg3 = static_cast< TagLib::Vorbis::Properties::ReadStyle >(val3);
+  result = (TagLib::Vorbis::File *)new TagLib::Vorbis::File(arg1,arg2,arg3);DATA_PTR(self) = result;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
-  }
-  result = TagLib::ID3v1::genreMap();
-  vresult = SWIG_NewPointerObj((new TagLib::ID3v1::GenreMap(static_cast< const TagLib::ID3v1::GenreMap& >(result))), SWIGTYPE_p_TagLib__MapT_TagLib__String_int_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return self;
 fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 
 /*
-  Document-class: TagLib::ID3v1_Tag < TagLib::TagLib::Tag
-
-  Proxy of C++ TagLib::ID3v1_Tag class
-
-
-*/
-swig_class cID3v1_Tag;
-
-
-/*
-  Document-method: TagLib::ID3v1_Tag.new
+  Document-method: TagLib::Vorbis_File.new
 
   call-seq:
-    ID3v1_Tag.new
-    ID3v1_Tag.new(File file, long tagOffset)
+    Vorbis_File.new(FileName file, bool readProperties=true, ReadStyle propertiesStyle=Average)
+    Vorbis_File.new(FileName file, bool readProperties=true)
+    Vorbis_File.new(FileName file)
 
 Class constructor.
 
 */
 VALUE
-_wrap_new_ID3v1_Tag__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v1::Tag *result = 0 ;
+_wrap_new_Vorbis_File__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  FileName arg1 = (FileName) 0 ;
+  bool arg2 ;
+  TagLib::Vorbis::File *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  result = (TagLib::ID3v1::Tag *)new TagLib::ID3v1::Tag();DATA_PTR(self) = result;
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "FileName","TagLib::Vorbis::File", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< FileName >(buf1);
+  ecode2 = SWIG_AsVal_bool(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::Vorbis::File", 2, argv[1] ));
+  } 
+  arg2 = static_cast< bool >(val2);
+  result = (TagLib::Vorbis::File *)new TagLib::Vorbis::File(arg1,arg2);DATA_PTR(self) = result;
   
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 VALUE
-_wrap_ID3v1_Tag_allocate(VALUE self) {
+_wrap_Vorbis_File_allocate(VALUE self) {
 #else
   VALUE
-  _wrap_ID3v1_Tag_allocate(int argc, VALUE *argv, VALUE self) {
+  _wrap_Vorbis_File_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v1__Tag);
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__Vorbis__File);
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
     rb_obj_call_init(vresult, argc, argv);
 #endif
@@ -12267,105 +12348,114 @@ _wrap_ID3v1_Tag_allocate(VALUE self) {
   }
   
 
-
-/*
-  Document-method: TagLib::ID3v1_Tag.new
-
-  call-seq:
-    ID3v1_Tag.new()
-    ID3v1_Tag.new(File file, long tagOffset)
-
-Class constructor.
-
-*/
 VALUE
-_wrap_new_ID3v1_Tag__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  TagLib::File *arg1 = (TagLib::File *) 0 ;
-  long arg2 ;
-  TagLib::ID3v1::Tag *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  long val2 ;
-  int ecode2 = 0 ;
+_wrap_new_Vorbis_File__SWIG_2(int argc, VALUE *argv, VALUE self) {
+  FileName arg1 = (FileName) 0 ;
+  TagLib::Vorbis::File *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
   
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_TagLib__File, 0 |  0 );
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::File *","TagLib::ID3v1::Tag", 1, argv[0] )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "FileName","TagLib::Vorbis::File", 1, argv[0] ));
   }
-  arg1 = reinterpret_cast< TagLib::File * >(argp1);
-  ecode2 = SWIG_AsVal_long(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "long","TagLib::ID3v1::Tag", 2, argv[1] ));
-  } 
-  arg2 = static_cast< long >(val2);
-  result = (TagLib::ID3v1::Tag *)new TagLib::ID3v1::Tag(arg1,arg2);DATA_PTR(self) = result;
+  arg1 = reinterpret_cast< FileName >(buf1);
+  result = (TagLib::Vorbis::File *)new TagLib::Vorbis::File(arg1);DATA_PTR(self) = result;
   
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
-VALUE _wrap_new_ID3v1_Tag(int nargs, VALUE *args, VALUE self) {
+VALUE _wrap_new_Vorbis_File(int nargs, VALUE *args, VALUE self) {
   int argc;
-  VALUE argv[2];
+  VALUE argv[3];
   int ii;
   
   argc = nargs;
-  if (argc > 2) SWIG_fail;
+  if (argc > 3) SWIG_fail;
   for (ii = 0; (ii < argc); ++ii) {
     argv[ii] = args[ii];
   }
-  if (argc == 0) {
-    return _wrap_new_ID3v1_Tag__SWIG_0(nargs, args, self);
+  if (argc == 1) {
+    int _v;
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_Vorbis_File__SWIG_2(nargs, args, self);
+    }
   }
   if (argc == 2) {
     int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
       {
-        int res = SWIG_AsVal_long(argv[1], NULL);
+        int res = SWIG_AsVal_bool(argv[1], NULL);
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        return _wrap_new_ID3v1_Tag__SWIG_1(nargs, args, self);
+        return _wrap_new_Vorbis_File__SWIG_1(nargs, args, self);
+      }
+    }
+  }
+  if (argc == 3) {
+    int _v;
+    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          return _wrap_new_Vorbis_File__SWIG_0(nargs, args, self);
+        }
       }
     }
   }
   
 fail:
-  Ruby_Format_OverloadedError( argc, 2, "Tag.new", 
-    "    Tag.new()\n"
-    "    Tag.new(TagLib::File *file, long tagOffset)\n");
+  Ruby_Format_OverloadedError( argc, 3, "File.new", 
+    "    File.new(FileName file, bool readProperties, TagLib::Vorbis::Properties::ReadStyle propertiesStyle)\n"
+    "    File.new(FileName file, bool readProperties)\n"
+    "    File.new(FileName file)\n");
   
   return Qnil;
 }
 
 
 SWIGINTERN void
-free_TagLib_ID3v1_Tag(TagLib::ID3v1::Tag *arg1) {
+free_TagLib_Vorbis_File(TagLib::Vorbis::File *arg1) {
     delete arg1;
 }
 
 
 /*
-  Document-method: TagLib::ID3v1_Tag.render
+  Document-method: TagLib::Vorbis_File.tag
 
   call-seq:
-    render -> ByteVector
+    tag -> Ogg_XiphComment
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v1_Tag_render(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v1::Tag *arg1 = (TagLib::ID3v1::Tag *) 0 ;
-  SwigValueWrapper< TagLib::ByteVector > result;
+_wrap_Vorbis_File_tag(int argc, VALUE *argv, VALUE self) {
+  TagLib::Vorbis::File *arg1 = (TagLib::Vorbis::File *) 0 ;
+  TagLib::Ogg::XiphComment *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE vresult = Qnil;
@@ -12373,15 +12463,13 @@ _wrap_ID3v1_Tag_render(int argc, VALUE *argv, VALUE self) {
   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__ID3v1__Tag, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__Vorbis__File, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v1::Tag const *","render", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v1::Tag * >(argp1);
-  result = ((TagLib::ID3v1::Tag const *)arg1)->render();
-  {
-    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File const *","tag", 1, self )); 
   }
+  arg1 = reinterpret_cast< TagLib::Vorbis::File * >(argp1);
+  result = (TagLib::Ogg::XiphComment *)((TagLib::Vorbis::File const *)arg1)->tag();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__Ogg__XiphComment, 0 |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -12390,243 +12478,1196 @@ fail:
 
 
 /*
-  Document-class: TagLib::ID3v2_AttachedPictureFrame
+  Document-method: TagLib::Vorbis_File.audioProperties
 
-  Proxy of C++ TagLib::ID3v2_AttachedPictureFrame class
+  call-seq:
+    audioProperties -> Vorbis_Properties
 
+An instance method.
 
 */
-swig_class cID3v2_AttachedPictureFrame;
+VALUE
+_wrap_Vorbis_File_audioProperties(int argc, VALUE *argv, VALUE self) {
+  TagLib::Vorbis::File *arg1 = (TagLib::Vorbis::File *) 0 ;
+  TagLib::Vorbis::Properties *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__Vorbis__File, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::Vorbis::File const *","audioProperties", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::Vorbis::File * >(argp1);
+  result = (TagLib::Vorbis::Properties *)((TagLib::Vorbis::File const *)arg1)->audioProperties();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__Vorbis__Properties, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
 
 
 /*
-  Document-method: TagLib::Type.Other
+  Document-method: TagLib::ID3v1.ID3v1_genre
 
   call-seq:
-    Other -> int
+    ID3v1_genre(int index) -> String
 
-A class method.
+A module function.
 
 */
+VALUE
+_wrap_ID3v1_genre(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  TagLib::String result;
+  int val1 ;
+  int ecode1 = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","TagLib::ID3v1::genre", 1, argv[0] ));
+  } 
+  arg1 = static_cast< int >(val1);
+  result = TagLib::ID3v1::genre(arg1);
+  {
+    vresult = String2Ruby(&result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
 
-/*
-  Document-method: TagLib::Type.FileIcon
-
-  call-seq:
-    FileIcon -> int
-
-A class method.
 
-*/
 
 /*
-  Document-method: TagLib::Type.OtherFileIcon
+  Document-method: TagLib::ID3v1.ID3v1_genreIndex
 
   call-seq:
-    OtherFileIcon -> int
+    ID3v1_genreIndex(String name) -> int
 
-A class method.
+A module function.
 
 */
+VALUE
+_wrap_ID3v1_genreIndex(int argc, VALUE *argv, VALUE self) {
+  TagLib::String *arg1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    arg1=new TagLib::String(StringValuePtr(argv[0]));
+  }
+  result = (int)TagLib::ID3v1::genreIndex((TagLib::String const &)*arg1);
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
 
-/*
-  Document-method: TagLib::Type.FrontCover
-
-  call-seq:
-    FrontCover -> int
-
-A class method.
 
-*/
 
 /*
-  Document-method: TagLib::Type.BackCover
+  Document-method: TagLib::ID3v1.ID3v1_genreList
 
   call-seq:
-    BackCover -> int
+    ID3v1_genreList
 
-A class method.
+A module function.
 
 */
+VALUE
+_wrap_ID3v1_genreList(int argc, VALUE *argv, VALUE self) {
+  TagLib::StringList result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = TagLib::ID3v1::genreList();
+  {
+    vresult=StringList2Ruby(&result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
 
-/*
-  Document-method: TagLib::Type.LeafletPage
-
-  call-seq:
-    LeafletPage -> int
-
-A class method.
 
-*/
 
 /*
-  Document-method: TagLib::Type.Media
+  Document-method: TagLib::ID3v1.ID3v1_genreMap
 
   call-seq:
-    Media -> int
+    ID3v1_genreMap -> GenreMap
 
-A class method.
+A module function.
 
 */
+VALUE
+_wrap_ID3v1_genreMap(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v1::GenreMap result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = TagLib::ID3v1::genreMap();
+  vresult = SWIG_NewPointerObj((new TagLib::ID3v1::GenreMap(static_cast< const TagLib::ID3v1::GenreMap& >(result))), SWIGTYPE_p_TagLib__MapT_TagLib__String_int_t, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
 
-/*
-  Document-method: TagLib::Type.LeadArtist
-
-  call-seq:
-    LeadArtist -> int
-
-A class method.
 
-*/
 
 /*
-  Document-method: TagLib::Type.Artist
+  Document-class: TagLib::ID3v1_Tag < TagLib::TagLib::Tag
 
-  call-seq:
-    Artist -> int
+  Proxy of C++ TagLib::ID3v1_Tag class
 
-A class method.
 
 */
+swig_class cID3v1_Tag;
+
 
 /*
-  Document-method: TagLib::Type.Conductor
+  Document-method: TagLib::ID3v1_Tag.new
 
   call-seq:
-    Conductor -> int
+    ID3v1_Tag.new
+    ID3v1_Tag.new(File file, long tagOffset)
+
+Class constructor.
+
+*/
+VALUE
+_wrap_new_ID3v1_Tag__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v1::Tag *result = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (TagLib::ID3v1::Tag *)new TagLib::ID3v1::Tag();DATA_PTR(self) = result;
+  
+  return self;
+fail:
+  return Qnil;
+}
+
+
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+VALUE
+_wrap_ID3v1_Tag_allocate(VALUE self) {
+#else
+  VALUE
+  _wrap_ID3v1_Tag_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    
+    
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v1__Tag);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+  
+
+
+/*
+  Document-method: TagLib::ID3v1_Tag.new
+
+  call-seq:
+    ID3v1_Tag.new()
+    ID3v1_Tag.new(File file, long tagOffset)
+
+Class constructor.
+
+*/
+VALUE
+_wrap_new_ID3v1_Tag__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  TagLib::File *arg1 = (TagLib::File *) 0 ;
+  long arg2 ;
+  TagLib::ID3v1::Tag *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_TagLib__File, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::File *","TagLib::ID3v1::Tag", 1, argv[0] )); 
+  }
+  arg1 = reinterpret_cast< TagLib::File * >(argp1);
+  ecode2 = SWIG_AsVal_long(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "long","TagLib::ID3v1::Tag", 2, argv[1] ));
+  } 
+  arg2 = static_cast< long >(val2);
+  result = (TagLib::ID3v1::Tag *)new TagLib::ID3v1::Tag(arg1,arg2);DATA_PTR(self) = result;
+  
+  return self;
+fail:
+  return Qnil;
+}
+
+
+VALUE _wrap_new_ID3v1_Tag(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[2];
+  int ii;
+  
+  argc = nargs;
+  if (argc > 2) SWIG_fail;
+  for (ii = 0; (ii < argc); ++ii) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_new_ID3v1_Tag__SWIG_0(nargs, args, self);
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_long(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_ID3v1_Tag__SWIG_1(nargs, args, self);
+      }
+    }
+  }
+  
+fail:
+  Ruby_Format_OverloadedError( argc, 2, "Tag.new", 
+    "    Tag.new()\n"
+    "    Tag.new(TagLib::File *file, long tagOffset)\n");
+  
+  return Qnil;
+}
+
+
+SWIGINTERN void
+free_TagLib_ID3v1_Tag(TagLib::ID3v1::Tag *arg1) {
+    delete arg1;
+}
+
+
+/*
+  Document-method: TagLib::ID3v1_Tag.render
+
+  call-seq:
+    render -> ByteVector
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v1_Tag_render(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v1::Tag *arg1 = (TagLib::ID3v1::Tag *) 0 ;
+  SwigValueWrapper< TagLib::ByteVector > result;
+  void *argp1 = 0 ;
+  int res1 = 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__ID3v1__Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v1::Tag const *","render", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v1::Tag * >(argp1);
+  result = ((TagLib::ID3v1::Tag const *)arg1)->render();
+  {
+    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-class: TagLib::ID3v2_Header
+
+  Proxy of C++ TagLib::ID3v2_Header class
+
+
+*/
+swig_class cID3v2_Header;
+
+SWIGINTERN void
+free_TagLib_ID3v2_Header(TagLib::ID3v2::Header *arg1) {
+    delete arg1;
+}
+
+
+/*
+  Document-class: TagLib::ID3v2_Frame < TagLib::TagLib::ID3v2::ID3v2_Header
+
+  Proxy of C++ TagLib::ID3v2_Frame class
+
+
+*/
+swig_class cID3v2_Frame;
+
+SWIGINTERN void
+free_TagLib_ID3v2_Frame(TagLib::ID3v2::Frame *arg1) {
+    delete arg1;
+}
+
+
+/*
+  Document-method: TagLib::ID3v2_Frame.frameID
+
+  call-seq:
+    frameID -> ByteVector
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_Frame_frameID(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Frame *arg1 = (TagLib::ID3v2::Frame *) 0 ;
+  SwigValueWrapper< TagLib::ByteVector > result;
+  void *argp1 = 0 ;
+  int res1 = 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__Frame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame const *","frameID", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Frame * >(argp1);
+  result = ((TagLib::ID3v2::Frame const *)arg1)->frameID();
+  {
+    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_Frame.size
+
+  call-seq:
+    size -> uint
+
+Size or Length of the ID3v2_Frame.
+*/
+VALUE
+_wrap_ID3v2_Frame_size(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Frame *arg1 = (TagLib::ID3v2::Frame *) 0 ;
+  uint result;
+  void *argp1 = 0 ;
+  int res1 = 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__Frame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame const *","size", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Frame * >(argp1);
+  result = (uint)((TagLib::ID3v2::Frame const *)arg1)->size();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_Frame.to_s
+
+  call-seq:
+    to_s -> VALUE
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_Frame___str__(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Frame *arg1 = (TagLib::ID3v2::Frame *) 0 ;
+  VALUE result;
+  void *argp1 = 0 ;
+  int res1 = 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__Frame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame *","__str__", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Frame * >(argp1);
+  result = (VALUE)TagLib_ID3v2_Frame___str__(arg1);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-class: TagLib::ID3v2_AttachedPictureFrame < TagLib::TagLib::ID3v2::ID3v2_Frame
+
+  Proxy of C++ TagLib::ID3v2_AttachedPictureFrame class
+
+
+*/
+swig_class cID3v2_AttachedPictureFrame;
+
+
+/*
+  Document-method: TagLib::Type.Other
+
+  call-seq:
+    Other -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.FileIcon
+
+  call-seq:
+    FileIcon -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.OtherFileIcon
+
+  call-seq:
+    OtherFileIcon -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.FrontCover
+
+  call-seq:
+    FrontCover -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.BackCover
+
+  call-seq:
+    BackCover -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.LeafletPage
+
+  call-seq:
+    LeafletPage -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Media
+
+  call-seq:
+    Media -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.LeadArtist
+
+  call-seq:
+    LeadArtist -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Artist
+
+  call-seq:
+    Artist -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Conductor
+
+  call-seq:
+    Conductor -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Band
+
+  call-seq:
+    Band -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Composer
+
+  call-seq:
+    Composer -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Lyricist
+
+  call-seq:
+    Lyricist -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.RecordingLocation
+
+  call-seq:
+    RecordingLocation -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.DuringRecording
+
+  call-seq:
+    DuringRecording -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.DuringPerformance
+
+  call-seq:
+    DuringPerformance -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.MovieScreenCapture
+
+  call-seq:
+    MovieScreenCapture -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.ColouredFish
+
+  call-seq:
+    ColouredFish -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.Illustration
+
+  call-seq:
+    Illustration -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.BandLogo
+
+  call-seq:
+    BandLogo -> int
+
+A class method.
+
+*/
+
+/*
+  Document-method: TagLib::Type.PublisherLogo
+
+  call-seq:
+    PublisherLogo -> int
+
+A class method.
+
+*/
+#ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_allocate(VALUE self) {
+#else
+  VALUE
+  _wrap_ID3v2_AttachedPictureFrame_allocate(int argc, VALUE *argv, VALUE self) {
+#endif
+    
+    
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame);
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+    rb_obj_call_init(vresult, argc, argv);
+#endif
+    return vresult;
+  }
+  
+
+
+/*
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.new
+
+  call-seq:
+    ID3v2_AttachedPictureFrame.new
+
+Class constructor.
+
+*/
+VALUE
+_wrap_new_ID3v2_AttachedPictureFrame(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *result = 0 ;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (TagLib::ID3v2::AttachedPictureFrame *)new TagLib::ID3v2::AttachedPictureFrame();DATA_PTR(self) = result;
+  
+  return self;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.new2
+
+  call-seq:
+    new2(ByteVector data) -> ID3v2_AttachedPictureFrame
 
 A class method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_new2(int argc, VALUE *argv, VALUE self) {
+  TagLib::ByteVector *arg1 = 0 ;
+  TagLib::ID3v2::AttachedPictureFrame *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  {
+    Check_Type(argv[0], T_STRING);
+    arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+  }
+  result = (TagLib::ID3v2::AttachedPictureFrame *)TagLib_ID3v2_AttachedPictureFrame_new2((TagLib::ByteVector const &)*arg1);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN void
+free_TagLib_ID3v2_AttachedPictureFrame(TagLib::ID3v2::AttachedPictureFrame *arg1) {
+    delete arg1;
+}
+
 
 /*
-  Document-method: TagLib::Type.Band
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.toString
 
   call-seq:
-    Band -> int
+    toString -> String
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_toString(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","toString", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->toString();
+  {
+    vresult = String2Ruby(&result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.Composer
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.textEncoding
 
   call-seq:
-    Composer -> int
+    textEncoding -> int
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_textEncoding(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String::Type result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","textEncoding", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = (TagLib::String::Type)((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->textEncoding();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.Lyricist
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.setTextEncoding
 
   call-seq:
-    Lyricist -> int
+    setTextEncoding( t)
 
-A class method.
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_setTextEncoding(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String::Type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setTextEncoding", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::String::Type","setTextEncoding", 2, argv[0] ));
+  } 
+  arg2 = static_cast< TagLib::String::Type >(val2);
+  (arg1)->setTextEncoding(arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.mimeType
+
+  call-seq:
+    mimeType -> String
+
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_mimeType(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","mimeType", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->mimeType();
+  {
+    vresult = String2Ruby(&result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.RecordingLocation
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.setMimeType
 
   call-seq:
-    RecordingLocation -> int
+    setMimeType(String m)
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_setMimeType(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setMimeType", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  {
+    arg2=new TagLib::String(StringValuePtr(argv[0]));
+  }
+  (arg1)->setMimeType((TagLib::String const &)*arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.DuringRecording
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.type
 
   call-seq:
-    DuringRecording -> int
+    type -> int
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_type(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::ID3v2::AttachedPictureFrame::Type result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","type", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = (TagLib::ID3v2::AttachedPictureFrame::Type)((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->type();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.DuringPerformance
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.setType
 
   call-seq:
-    DuringPerformance -> int
+    setType(Type t)
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_setType(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::ID3v2::AttachedPictureFrame::Type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setType", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame::Type","setType", 2, argv[0] ));
+  } 
+  arg2 = static_cast< TagLib::ID3v2::AttachedPictureFrame::Type >(val2);
+  (arg1)->setType(arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
 
-A class method.
 
-*/
 
 /*
-  Document-method: TagLib::Type.MovieScreenCapture
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.description
 
   call-seq:
-    MovieScreenCapture -> int
+    description -> String
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_description(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","description", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->description();
+  {
+    vresult = String2Ruby(&result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.ColouredFish
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.setDescription
 
   call-seq:
-    ColouredFish -> int
+    setDescription(String desc)
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_setDescription(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::String *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setDescription", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  {
+    arg2=new TagLib::String(StringValuePtr(argv[0]));
+  }
+  (arg1)->setDescription((TagLib::String const &)*arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.Illustration
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.picture
 
   call-seq:
-    Illustration -> int
+    picture -> ByteVector
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_picture(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  SwigValueWrapper< TagLib::ByteVector > result;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","picture", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->picture();
+  {
+    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.BandLogo
+  Document-method: TagLib::ID3v2_AttachedPictureFrame.setPicture
 
   call-seq:
-    BandLogo -> int
+    setPicture(ByteVector p)
 
-A class method.
+An instance method.
 
 */
+VALUE
+_wrap_ID3v2_AttachedPictureFrame_setPicture(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+  TagLib::ByteVector *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__AttachedPictureFrame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setPicture", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  {
+    Check_Type(argv[0], T_STRING);
+    arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+  }
+  (arg1)->setPicture((TagLib::ByteVector const &)*arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /*
-  Document-method: TagLib::Type.PublisherLogo
+  Document-class: TagLib::ID3v2_CommentsFrame < TagLib::TagLib::ID3v2::ID3v2_Frame
 
-  call-seq:
-    PublisherLogo -> int
+  Proxy of C++ TagLib::ID3v2_CommentsFrame class
 
-A class method.
 
 */
+swig_class cID3v2_CommentsFrame;
+
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.new
+  Document-method: TagLib::ID3v2_CommentsFrame.new
 
   call-seq:
-    ID3v2_AttachedPictureFrame.new
-    ID3v2_AttachedPictureFrame.new(ByteVector data)
+    ID3v2_CommentsFrame.new( encoding=)
+    ID3v2_CommentsFrame.new
 
 Class constructor.
 
 */
 VALUE
-_wrap_new_ID3v2_AttachedPictureFrame__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *result = 0 ;
+_wrap_new_ID3v2_CommentsFrame__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  TagLib::String::Type arg1 ;
+  TagLib::ID3v2::CommentsFrame *result = 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  result = (TagLib::ID3v2::AttachedPictureFrame *)new TagLib::ID3v2::AttachedPictureFrame();DATA_PTR(self) = result;
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "TagLib::String::Type","TagLib::ID3v2::CommentsFrame", 1, argv[0] ));
+  } 
+  arg1 = static_cast< TagLib::String::Type >(val1);
+  result = (TagLib::ID3v2::CommentsFrame *)new TagLib::ID3v2::CommentsFrame(arg1);DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -12636,14 +13677,14 @@ fail:
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_allocate(VALUE self) {
+_wrap_ID3v2_CommentsFrame_allocate(VALUE self) {
 #else
   VALUE
-  _wrap_ID3v2_AttachedPictureFrame_allocate(int argc, VALUE *argv, VALUE self) {
+  _wrap_ID3v2_CommentsFrame_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
-    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame);
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_TagLib__ID3v2__CommentsFrame);
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
     rb_obj_call_init(vresult, argc, argv);
 #endif
@@ -12653,27 +13694,23 @@ _wrap_ID3v2_AttachedPictureFrame_allocate(VALUE self) {
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.new
+  Document-method: TagLib::ID3v2_CommentsFrame.new
 
   call-seq:
-    ID3v2_AttachedPictureFrame.new()
-    ID3v2_AttachedPictureFrame.new(ByteVector data)
+    ID3v2_CommentsFrame.new( encoding=)
+    ID3v2_CommentsFrame.new()
 
 Class constructor.
 
 */
 VALUE
-_wrap_new_ID3v2_AttachedPictureFrame__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  TagLib::ByteVector *arg1 = 0 ;
-  TagLib::ID3v2::AttachedPictureFrame *result = 0 ;
+_wrap_new_ID3v2_CommentsFrame__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *result = 0 ;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  {
-    arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (TagLib::ID3v2::AttachedPictureFrame *)new TagLib::ID3v2::AttachedPictureFrame((TagLib::ByteVector const &)*arg1);DATA_PTR(self) = result;
+  result = (TagLib::ID3v2::CommentsFrame *)new TagLib::ID3v2::CommentsFrame();DATA_PTR(self) = result;
   
   return self;
 fail:
@@ -12681,7 +13718,7 @@ fail:
 }
 
 
-VALUE _wrap_new_ID3v2_AttachedPictureFrame(int nargs, VALUE *args, VALUE self) {
+VALUE _wrap_new_ID3v2_CommentsFrame(int nargs, VALUE *args, VALUE self) {
   int argc;
   VALUE argv[1];
   int ii;
@@ -12692,35 +13729,36 @@ VALUE _wrap_new_ID3v2_AttachedPictureFrame(int nargs, VALUE *args, VALUE self) {
     argv[ii] = args[ii];
   }
   if (argc == 0) {
-    return _wrap_new_ID3v2_AttachedPictureFrame__SWIG_0(nargs, args, self);
+    return _wrap_new_ID3v2_CommentsFrame__SWIG_1(nargs, args, self);
   }
   if (argc == 1) {
     int _v;
-    void *vptr = 0;
-    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
-    _v = SWIG_CheckState(res);
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
     if (_v) {
-      return _wrap_new_ID3v2_AttachedPictureFrame__SWIG_1(nargs, args, self);
+      return _wrap_new_ID3v2_CommentsFrame__SWIG_0(nargs, args, self);
     }
   }
   
 fail:
-  Ruby_Format_OverloadedError( argc, 1, "AttachedPictureFrame.new", 
-    "    AttachedPictureFrame.new()\n"
-    "    AttachedPictureFrame.new(TagLib::ByteVector const &data)\n");
+  Ruby_Format_OverloadedError( argc, 1, "CommentsFrame.new", 
+    "    CommentsFrame.new(TagLib::String::Type encoding)\n"
+    "    CommentsFrame.new()\n");
   
   return Qnil;
 }
 
 
 SWIGINTERN void
-free_TagLib_ID3v2_AttachedPictureFrame(TagLib::ID3v2::AttachedPictureFrame *arg1) {
+free_TagLib_ID3v2_CommentsFrame(TagLib::ID3v2::CommentsFrame *arg1) {
     delete arg1;
 }
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.toString
+  Document-method: TagLib::ID3v2_CommentsFrame.toString
 
   call-seq:
     toString -> String
@@ -12729,8 +13767,8 @@ An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_toString(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+_wrap_ID3v2_CommentsFrame_toString(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
   TagLib::String result;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12739,49 +13777,15 @@ _wrap_ID3v2_AttachedPictureFrame_toString(int argc, VALUE *argv, VALUE self) {
   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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","toString", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame const *","toString", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->toString();
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  result = ((TagLib::ID3v2::CommentsFrame const *)arg1)->toString();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
-  }
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-
-/*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.textEncoding
-
-  call-seq:
-    textEncoding -> int
-
-An instance method.
-
-*/
-VALUE
-_wrap_ID3v2_AttachedPictureFrame_textEncoding(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::String::Type result;
-  void *argp1 = 0 ;
-  int res1 = 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__AttachedPictureFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","textEncoding", 1, self )); 
+    vresult = String2Ruby(&result);
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = (TagLib::String::Type)((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->textEncoding();
-  vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -12790,57 +13794,18 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.setTextEncoding
-
-  call-seq:
-    setTextEncoding( t)
-
-An instance method.
-
-*/
-VALUE
-_wrap_ID3v2_AttachedPictureFrame_setTextEncoding(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::String::Type arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int 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__AttachedPictureFrame, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setTextEncoding", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::String::Type","setTextEncoding", 2, argv[0] ));
-  } 
-  arg2 = static_cast< TagLib::String::Type >(val2);
-  (arg1)->setTextEncoding(arg2);
-  return Qnil;
-fail:
-  return Qnil;
-}
-
-
-
-/*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.mimeType
+  Document-method: TagLib::ID3v2_CommentsFrame.language
 
   call-seq:
-    mimeType -> String
+    language -> ByteVector
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_mimeType(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::String result;
+_wrap_ID3v2_CommentsFrame_language(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  SwigValueWrapper< TagLib::ByteVector > result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE vresult = Qnil;
@@ -12848,14 +13813,14 @@ _wrap_ID3v2_AttachedPictureFrame_mimeType(int argc, VALUE *argv, VALUE self) {
   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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","mimeType", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame const *","language", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->mimeType();
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  result = ((TagLib::ID3v2::CommentsFrame const *)arg1)->language();
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
   }
   return vresult;
 fail:
@@ -12865,34 +13830,35 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.setMimeType
+  Document-method: TagLib::ID3v2_CommentsFrame.description
 
   call-seq:
-    setMimeType(String m)
+    description -> String
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_setMimeType(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::String *arg2 = 0 ;
+_wrap_ID3v2_CommentsFrame_description(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::String result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setMimeType", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame const *","description", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  result = ((TagLib::ID3v2::CommentsFrame const *)arg1)->description();
   {
-    arg2=new TagLib::String(StringValuePtr(argv[0]));
+    vresult = String2Ruby(&result);
   }
-  (arg1)->setMimeType((TagLib::String const &)*arg2);
-  return Qnil;
+  return vresult;
 fail:
   return Qnil;
 }
@@ -12900,18 +13866,18 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.type
+  Document-method: TagLib::ID3v2_CommentsFrame.text
 
   call-seq:
-    type -> int
+    text -> String
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_type(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::ID3v2::AttachedPictureFrame::Type result;
+_wrap_ID3v2_CommentsFrame_text(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::String result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE vresult = Qnil;
@@ -12919,13 +13885,15 @@ _wrap_ID3v2_AttachedPictureFrame_type(int argc, VALUE *argv, VALUE self) {
   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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","type", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame const *","text", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  result = ((TagLib::ID3v2::CommentsFrame const *)arg1)->text();
+  {
+    vresult = String2Ruby(&result);
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = (TagLib::ID3v2::AttachedPictureFrame::Type)((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->type();
-  vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -12934,37 +13902,34 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.setType
+  Document-method: TagLib::ID3v2_CommentsFrame.setLanguage
 
   call-seq:
-    setType(Type t)
+    setLanguage(ByteVector languageCode)
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_setType(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::ID3v2::AttachedPictureFrame::Type arg2 ;
+_wrap_ID3v2_CommentsFrame_setLanguage(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::ByteVector *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int 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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setType", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame *","setLanguage", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  ecode2 = SWIG_AsVal_int(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame::Type","setType", 2, argv[0] ));
-  } 
-  arg2 = static_cast< TagLib::ID3v2::AttachedPictureFrame::Type >(val2);
-  (arg1)->setType(arg2);
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  {
+    Check_Type(argv[0], T_STRING);
+    arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+  }
+  (arg1)->setLanguage((TagLib::ByteVector const &)*arg2);
   return Qnil;
 fail:
   return Qnil;
@@ -12973,35 +13938,34 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.description
+  Document-method: TagLib::ID3v2_CommentsFrame.setDescription
 
   call-seq:
-    description -> String
+    setDescription(String s)
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_description(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::String result;
+_wrap_ID3v2_CommentsFrame_setDescription(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::String *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","description", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame *","setDescription", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->description();
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
   {
-    vresult = rb_tainted_str_new2((&result)->toCString(true));
+    arg2=new TagLib::String(StringValuePtr(argv[0]));
   }
-  return vresult;
+  (arg1)->setDescription((TagLib::String const &)*arg2);
+  return Qnil;
 fail:
   return Qnil;
 }
@@ -13009,17 +13973,17 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.setDescription
+  Document-method: TagLib::ID3v2_CommentsFrame.setText
 
   call-seq:
-    setDescription(String desc)
+    setText(String s)
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_setDescription(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
+_wrap_ID3v2_CommentsFrame_setText(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
   TagLib::String *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13027,15 +13991,15 @@ _wrap_ID3v2_AttachedPictureFrame_setDescription(int argc, VALUE *argv, VALUE sel
   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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setDescription", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame *","setText", 1, self )); 
   }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
   {
     arg2=new TagLib::String(StringValuePtr(argv[0]));
   }
-  (arg1)->setDescription((TagLib::String const &)*arg2);
+  (arg1)->setText((TagLib::String const &)*arg2);
   return Qnil;
 fail:
   return Qnil;
@@ -13044,18 +14008,18 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.picture
+  Document-method: TagLib::ID3v2_CommentsFrame.textEncoding
 
   call-seq:
-    picture -> ByteVector
+    textEncoding -> int
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_picture(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  SwigValueWrapper< TagLib::ByteVector > result;
+_wrap_ID3v2_CommentsFrame_textEncoding(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::String::Type result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   VALUE vresult = Qnil;
@@ -13063,15 +14027,13 @@ _wrap_ID3v2_AttachedPictureFrame_picture(int argc, VALUE *argv, VALUE self) {
   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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame const *","picture", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  result = ((TagLib::ID3v2::AttachedPictureFrame const *)arg1)->picture();
-  {
-    vresult = rb_tainted_str_new((&result)->data(),(&result)->size());
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame const *","textEncoding", 1, self )); 
   }
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  result = (TagLib::String::Type)((TagLib::ID3v2::CommentsFrame const *)arg1)->textEncoding();
+  vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
   return Qnil;
@@ -13080,33 +14042,37 @@ fail:
 
 
 /*
-  Document-method: TagLib::ID3v2_AttachedPictureFrame.setPicture
+  Document-method: TagLib::ID3v2_CommentsFrame.setTextEncoding
 
   call-seq:
-    setPicture(ByteVector p)
+    setTextEncoding( encoding)
 
 An instance method.
 
 */
 VALUE
-_wrap_ID3v2_AttachedPictureFrame_setPicture(int argc, VALUE *argv, VALUE self) {
-  TagLib::ID3v2::AttachedPictureFrame *arg1 = (TagLib::ID3v2::AttachedPictureFrame *) 0 ;
-  TagLib::ByteVector *arg2 = 0 ;
+_wrap_ID3v2_CommentsFrame_setTextEncoding(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::CommentsFrame *arg1 = (TagLib::ID3v2::CommentsFrame *) 0 ;
+  TagLib::String::Type arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int 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__AttachedPictureFrame, 0 |  0 );
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::AttachedPictureFrame *","setPicture", 1, self )); 
-  }
-  arg1 = reinterpret_cast< TagLib::ID3v2::AttachedPictureFrame * >(argp1);
-  {
-    arg2=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::CommentsFrame *","setTextEncoding", 1, self )); 
   }
-  (arg1)->setPicture((TagLib::ByteVector const &)*arg2);
+  arg1 = reinterpret_cast< TagLib::ID3v2::CommentsFrame * >(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::String::Type","setTextEncoding", 2, argv[0] ));
+  } 
+  arg2 = static_cast< TagLib::String::Type >(val2);
+  (arg1)->setTextEncoding(arg2);
   return Qnil;
 fail:
   return Qnil;
@@ -13114,16 +14080,6 @@ fail:
 
 
 
-/*
-  Document-class: TagLib::ID3v2_CommentsFrame
-
-  Proxy of C++ TagLib::ID3v2_CommentsFrame class
-
-
-*/
-swig_class cID3v2_CommentsFrame;
-
-
 /*
   Document-class: TagLib::ID3v2_GeneralEncapsulatedObjectFrame
 
@@ -13144,21 +14100,6 @@ swig_class cID3v2_GeneralEncapsulatedObjectFrame;
 swig_class cID3v2_FrameFactory;
 
 
-/*
-  Document-class: TagLib::ID3v2_Header
-
-  Proxy of C++ TagLib::ID3v2_Header class
-
-
-*/
-swig_class cID3v2_Header;
-
-SWIGINTERN void
-free_TagLib_ID3v2_Header(TagLib::ID3v2::Header *arg1) {
-    delete arg1;
-}
-
-
 /*
   Document-class: TagLib::ID3v2_Tag < TagLib::TagLib::Tag
 
@@ -13344,6 +14285,119 @@ fail:
 
 
 
+/*
+  Document-method: TagLib::ID3v2_Tag.addFrame
+
+  call-seq:
+    addFrame(ID3v2_Frame frame)
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_Tag_addFrame(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Tag *arg1 = (TagLib::ID3v2::Tag *) 0 ;
+  TagLib::ID3v2::Frame *arg2 = (TagLib::ID3v2::Frame *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = 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__Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Tag *","addFrame", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Tag * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_TagLib__ID3v2__Frame, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "TagLib::ID3v2::Frame *","addFrame", 2, argv[0] ));
+  }
+  (arg1)->addFrame(arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_Tag.frameListMap
+
+  call-seq:
+    frameListMap -> FrameListMap
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_Tag_frameListMap(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Tag *arg1 = (TagLib::ID3v2::Tag *) 0 ;
+  TagLib::ID3v2::FrameListMap *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Tag const *","frameListMap", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Tag * >(argp1);
+  {
+    TagLib::ID3v2::FrameListMap const &_result_ref = ((TagLib::ID3v2::Tag const *)arg1)->frameListMap();
+    result = (TagLib::ID3v2::FrameListMap *) &_result_ref;
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__MapT_TagLib__ByteVector_TagLib__ID3v2__FrameList_t, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: TagLib::ID3v2_Tag.frameList
+
+  call-seq:
+    frameList -> FrameList
+
+An instance method.
+
+*/
+VALUE
+_wrap_ID3v2_Tag_frameList(int argc, VALUE *argv, VALUE self) {
+  TagLib::ID3v2::Tag *arg1 = (TagLib::ID3v2::Tag *) 0 ;
+  TagLib::ID3v2::FrameList *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 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__Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::ID3v2::Tag const *","frameList", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::ID3v2::Tag * >(argp1);
+  {
+    TagLib::ID3v2::FrameList const &_result_ref = ((TagLib::ID3v2::Tag const *)arg1)->frameList();
+    result = (TagLib::ID3v2::FrameList *) &_result_ref;
+  }
+  {
+    vresult = FrameList2Ruby(result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
 /*
   Document-class: TagLib::FLAC_Properties < TagLib::TagLib::AudioProperties
 
@@ -14463,6 +15517,7 @@ _wrap_new_MPC_Properties__SWIG_0(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -14523,6 +15578,7 @@ _wrap_new_MPC_Properties__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -15405,6 +16461,7 @@ _wrap_new_TrueAudio_Properties__SWIG_0(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -15465,6 +16522,7 @@ _wrap_new_TrueAudio_Properties__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -16498,6 +17556,7 @@ _wrap_new_WavPack_Properties__SWIG_0(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -16558,6 +17617,7 @@ _wrap_new_WavPack_Properties__SWIG_1(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   ecode2 = SWIG_AsVal_long(argv[1], &val2);
@@ -17422,6 +18482,7 @@ _wrap_new_MPEG_Header__SWIG_0(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (TagLib::MPEG::Header *)new TagLib::MPEG::Header((TagLib::ByteVector const &)*arg1);DATA_PTR(self) = result;
@@ -17983,6 +19044,7 @@ _wrap_new_MPEG_XingHeader(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   {
+    Check_Type(argv[0], T_STRING);
     arg1=new TagLib::ByteVector(StringValuePtr(argv[0]), RSTRING_LEN(argv[0]));
   }
   result = (TagLib::MPEG::XingHeader *)new TagLib::MPEG::XingHeader((TagLib::ByteVector const &)*arg1);DATA_PTR(self) = result;
@@ -19885,6 +20947,18 @@ static void *_p_TagLib__WavPack__PropertiesTo_p_TagLib__AudioProperties(void *x,
 static void *_p_TagLib__MPEG__PropertiesTo_p_TagLib__AudioProperties(void *x, int *newmemory) {
     return (void *)((TagLib::AudioProperties *)  ((TagLib::MPEG::Properties *) x));
 }
+static void *_p_TagLib__ID3v2__AttachedPictureFrameTo_p_TagLib__ID3v2__Frame(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Frame *)  ((TagLib::ID3v2::AttachedPictureFrame *) x));
+}
+static void *_p_TagLib__ID3v2__CommentsFrameTo_p_TagLib__ID3v2__Frame(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Frame *)  ((TagLib::ID3v2::CommentsFrame *) x));
+}
+static void *_p_p_TagLib__ID3v2__AttachedPictureFrameTo_p_p_TagLib__ID3v2__Frame(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Frame **)  ((TagLib::ID3v2::AttachedPictureFrame **) x));
+}
+static void *_p_p_TagLib__ID3v2__CommentsFrameTo_p_p_TagLib__ID3v2__Frame(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Frame **)  ((TagLib::ID3v2::CommentsFrame **) x));
+}
 static void *_p_TagLib__APE__TagTo_p_TagLib__Tag(void *x, int *newmemory) {
     return (void *)((TagLib::Tag *)  ((TagLib::APE::Tag *) x));
 }
@@ -19933,6 +21007,15 @@ static void *_p_TagLib__MPEG__FileTo_p_TagLib__File(void *x, int *newmemory) {
 static void *_p_TagLib__Ogg__Speex__FileTo_p_TagLib__File(void *x, int *newmemory) {
     return (void *)((TagLib::File *) (TagLib::Ogg::File *) ((TagLib::Ogg::Speex::File *) x));
 }
+static void *_p_TagLib__ID3v2__FrameTo_p_TagLib__ID3v2__Header(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Header *)  ((TagLib::ID3v2::Frame *) x));
+}
+static void *_p_TagLib__ID3v2__AttachedPictureFrameTo_p_TagLib__ID3v2__Header(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Header *) (TagLib::ID3v2::Frame *) ((TagLib::ID3v2::AttachedPictureFrame *) x));
+}
+static void *_p_TagLib__ID3v2__CommentsFrameTo_p_TagLib__ID3v2__Header(void *x, int *newmemory) {
+    return (void *)((TagLib::ID3v2::Header *) (TagLib::ID3v2::Frame *) ((TagLib::ID3v2::CommentsFrame *) x));
+}
 static swig_type_info _swigt__p_TagLib__APE__Footer = {"_p_TagLib__APE__Footer", "TagLib::APE::Footer *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__APE__Item = {"_p_TagLib__APE__Item", "TagLib::APE::Item *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__APE__Tag = {"_p_TagLib__APE__Tag", "TagLib::APE::Tag *", 0, 0, (void*)0, 0};
@@ -19982,6 +21065,8 @@ static swig_type_info _swigt__p_TagLib__WavPack__File = {"_p_TagLib__WavPack__Fi
 static swig_type_info _swigt__p_TagLib__WavPack__Properties = {"_p_TagLib__WavPack__Properties", "TagLib::WavPack::Properties *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_TagLib__ID3v2__Frame = {"_p_p_TagLib__ID3v2__Frame", "TagLib::ID3v2::Frame **", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_p_TagLib__ID3v2__AttachedPictureFrame = {"_p_p_TagLib__ID3v2__AttachedPictureFrame", 0, 0, 0, 0, 0};
+static swig_type_info _swigt__p_p_TagLib__ID3v2__CommentsFrame = {"_p_p_TagLib__ID3v2__CommentsFrame", 0, 0, 0, 0, 0};
 static swig_type_info _swigt__p_std__basic_stringT_wchar_t_t = {"_p_std__basic_stringT_wchar_t_t", "std::basic_string< wchar_t > *|wstring *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "uchar *|unsigned char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|uint *", 0, 0, (void*)0, 0};
@@ -20037,6 +21122,8 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_TagLib__WavPack__File,
   &_swigt__p_TagLib__WavPack__Properties,
   &_swigt__p_char,
+  &_swigt__p_p_TagLib__ID3v2__AttachedPictureFrame,
+  &_swigt__p_p_TagLib__ID3v2__CommentsFrame,
   &_swigt__p_p_TagLib__ID3v2__Frame,
   &_swigt__p_std__basic_stringT_wchar_t_t,
   &_swigt__p_unsigned_char,
@@ -20057,10 +21144,10 @@ static swig_cast_info _swigc__p_TagLib__FileRef[] = {  {&_swigt__p_TagLib__FileR
 static swig_cast_info _swigc__p_TagLib__ID3v1__Tag[] = {  {&_swigt__p_TagLib__ID3v1__Tag, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__AttachedPictureFrame[] = {  {&_swigt__p_TagLib__ID3v2__AttachedPictureFrame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ID3v2__CommentsFrame[] = {  {&_swigt__p_TagLib__ID3v2__CommentsFrame, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_TagLib__ID3v2__Frame[] = {  {&_swigt__p_TagLib__ID3v2__Frame, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_TagLib__ID3v2__Frame[] = {  {&_swigt__p_TagLib__ID3v2__AttachedPictureFrame, _p_TagLib__ID3v2__AttachedPictureFrameTo_p_TagLib__ID3v2__Frame, 0, 0},  {&_swigt__p_TagLib__ID3v2__CommentsFrame, _p_TagLib__ID3v2__CommentsFrameTo_p_TagLib__ID3v2__Frame, 0, 0},  {&_swigt__p_TagLib__ID3v2__Frame, 0, 0, 0},{0, 0, 0, 0}};
 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__Header[] = {  {&_swigt__p_TagLib__ID3v2__AttachedPictureFrame, _p_TagLib__ID3v2__AttachedPictureFrameTo_p_TagLib__ID3v2__Header, 0, 0},  {&_swigt__p_TagLib__ID3v2__CommentsFrame, _p_TagLib__ID3v2__CommentsFrameTo_p_TagLib__ID3v2__Header, 0, 0},  {&_swigt__p_TagLib__ID3v2__Frame, _p_TagLib__ID3v2__FrameTo_p_TagLib__ID3v2__Header, 0, 0},  {&_swigt__p_TagLib__ID3v2__Header, 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__ListT_Frame_p_t[] = {  {&_swigt__p_TagLib__ListT_Frame_p_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__ListT_TagLib__ByteVector_t[] = {  {&_swigt__p_TagLib__ListT_TagLib__ByteVector_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -20093,7 +21180,9 @@ static swig_cast_info _swigc__p_TagLib__Vorbis__Properties[] = {  {&_swigt__p_Ta
 static swig_cast_info _swigc__p_TagLib__WavPack__File[] = {  {&_swigt__p_TagLib__WavPack__File, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__WavPack__Properties[] = {  {&_swigt__p_TagLib__WavPack__Properties, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_p_TagLib__ID3v2__Frame[] = {  {&_swigt__p_p_TagLib__ID3v2__Frame, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_TagLib__ID3v2__AttachedPictureFrame[] = {{&_swigt__p_p_TagLib__ID3v2__AttachedPictureFrame, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_TagLib__ID3v2__CommentsFrame[] = {{&_swigt__p_p_TagLib__ID3v2__CommentsFrame, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_p_TagLib__ID3v2__Frame[] = {  {&_swigt__p_p_TagLib__ID3v2__AttachedPictureFrame, _p_p_TagLib__ID3v2__AttachedPictureFrameTo_p_p_TagLib__ID3v2__Frame, 0, 0},  {&_swigt__p_p_TagLib__ID3v2__CommentsFrame, _p_p_TagLib__ID3v2__CommentsFrameTo_p_p_TagLib__ID3v2__Frame, 0, 0},  {&_swigt__p_p_TagLib__ID3v2__Frame, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__basic_stringT_wchar_t_t[] = {  {&_swigt__p_std__basic_stringT_wchar_t_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
@@ -20149,6 +21238,8 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_TagLib__WavPack__File,
   _swigc__p_TagLib__WavPack__Properties,
   _swigc__p_char,
+  _swigc__p_p_TagLib__ID3v2__AttachedPictureFrame,
+  _swigc__p_p_TagLib__ID3v2__CommentsFrame,
   _swigc__p_p_TagLib__ID3v2__Frame,
   _swigc__p_std__basic_stringT_wchar_t_t,
   _swigc__p_unsigned_char,
@@ -20587,6 +21678,8 @@ SWIGEXPORT void Init_TagLib(void) {
   rb_define_alias(cFrameListMap.klass, "empty?", "isEmpty");
   rb_define_method(cFrameListMap.klass, "contains", VALUEFUNC(_wrap_FrameListMap_contains), -1);
   rb_define_method(cFrameListMap.klass, "length", VALUEFUNC(_wrap_FrameListMap___len__), -1);
+  rb_define_method(cFrameListMap.klass, "[]", VALUEFUNC(_wrap_FrameListMap___getitem__), -1);
+  rb_define_method(cFrameListMap.klass, "hash", VALUEFUNC(_wrap_FrameListMap___hash__), -1);
   cFrameListMap.mark = 0;
   cFrameListMap.destroy = (void (*)(void *)) free_TagLib_Map_Sl_TagLib_ByteVector_Sc_TagLib_ID3v2_FrameList_Sg_;
   cFrameListMap.trackObjects = 0;
@@ -20822,8 +21915,12 @@ cVorbis_Properties.klass = rb_define_class_under(mTagLibVorbis, "Properties", ((
   
 cVorbis_File.klass = rb_define_class_under(mTagLibVorbis, "File", ((swig_class *) SWIGTYPE_p_TagLib__Ogg__File->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__Vorbis__File, (void *) &cVorbis_File);
-  rb_undef_alloc_func(cVorbis_File.klass);
+  rb_define_alloc_func(cVorbis_File.klass, _wrap_Vorbis_File_allocate);
+  rb_define_method(cVorbis_File.klass, "initialize", VALUEFUNC(_wrap_new_Vorbis_File), -1);
+  rb_define_method(cVorbis_File.klass, "tag", VALUEFUNC(_wrap_Vorbis_File_tag), -1);
+  rb_define_method(cVorbis_File.klass, "audioProperties", VALUEFUNC(_wrap_Vorbis_File_audioProperties), -1);
   cVorbis_File.mark = 0;
+  cVorbis_File.destroy = (void (*)(void *)) free_TagLib_Vorbis_File;
   cVorbis_File.trackObjects = 0;
 rb_define_module_function(mTagLibID3v1,"genre", VALUEFUNC(_wrap_ID3v1_genre),-1);
 rb_define_module_function(mTagLibID3v1,"genreIndex", VALUEFUNC(_wrap_ID3v1_genreIndex),-1);
@@ -20839,7 +21936,24 @@ cID3v1_Tag.klass = rb_define_class_under(mTagLibID3v1, "Tag", ((swig_class *) SW
   cID3v1_Tag.destroy = (void (*)(void *)) free_TagLib_ID3v1_Tag;
   cID3v1_Tag.trackObjects = 0;
   
-cID3v2_AttachedPictureFrame.klass = rb_define_class_under(mTagLibID3v2, "AttachedPictureFrame", rb_cObject);
+cID3v2_Header.klass = rb_define_class_under(mTagLibID3v2, "Header", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__Header, (void *) &cID3v2_Header);
+  rb_undef_alloc_func(cID3v2_Header.klass);
+  cID3v2_Header.mark = 0;
+  cID3v2_Header.destroy = (void (*)(void *)) free_TagLib_ID3v2_Header;
+  cID3v2_Header.trackObjects = 0;
+  
+cID3v2_Frame.klass = rb_define_class_under(mTagLibID3v2, "Frame", ((swig_class *) SWIGTYPE_p_TagLib__ID3v2__Header->clientdata)->klass);
+  SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__Frame, (void *) &cID3v2_Frame);
+  rb_undef_alloc_func(cID3v2_Frame.klass);
+  rb_define_method(cID3v2_Frame.klass, "frameID", VALUEFUNC(_wrap_ID3v2_Frame_frameID), -1);
+  rb_define_method(cID3v2_Frame.klass, "size", VALUEFUNC(_wrap_ID3v2_Frame_size), -1);
+  rb_define_method(cID3v2_Frame.klass, "to_s", VALUEFUNC(_wrap_ID3v2_Frame___str__), -1);
+  cID3v2_Frame.mark = 0;
+  cID3v2_Frame.destroy = (void (*)(void *)) free_TagLib_ID3v2_Frame;
+  cID3v2_Frame.trackObjects = 0;
+  
+cID3v2_AttachedPictureFrame.klass = rb_define_class_under(mTagLibID3v2, "AttachedPictureFrame", ((swig_class *) SWIGTYPE_p_TagLib__ID3v2__Frame->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame, (void *) &cID3v2_AttachedPictureFrame);
   rb_define_alloc_func(cID3v2_AttachedPictureFrame.klass, _wrap_ID3v2_AttachedPictureFrame_allocate);
   rb_define_method(cID3v2_AttachedPictureFrame.klass, "initialize", VALUEFUNC(_wrap_new_ID3v2_AttachedPictureFrame), -1);
@@ -20864,6 +21978,7 @@ cID3v2_AttachedPictureFrame.klass = rb_define_class_under(mTagLibID3v2, "Attache
   rb_define_const(cID3v2_AttachedPictureFrame.klass, "Illustration", SWIG_From_int(static_cast< int >(TagLib::ID3v2::AttachedPictureFrame::Illustration)));
   rb_define_const(cID3v2_AttachedPictureFrame.klass, "BandLogo", SWIG_From_int(static_cast< int >(TagLib::ID3v2::AttachedPictureFrame::BandLogo)));
   rb_define_const(cID3v2_AttachedPictureFrame.klass, "PublisherLogo", SWIG_From_int(static_cast< int >(TagLib::ID3v2::AttachedPictureFrame::PublisherLogo)));
+  rb_define_singleton_method(cID3v2_AttachedPictureFrame.klass, "new2", VALUEFUNC(_wrap_ID3v2_AttachedPictureFrame_new2), -1);
   rb_define_method(cID3v2_AttachedPictureFrame.klass, "toString", VALUEFUNC(_wrap_ID3v2_AttachedPictureFrame_toString), -1);
   rb_define_method(cID3v2_AttachedPictureFrame.klass, "textEncoding", VALUEFUNC(_wrap_ID3v2_AttachedPictureFrame_textEncoding), -1);
   rb_define_method(cID3v2_AttachedPictureFrame.klass, "setTextEncoding", VALUEFUNC(_wrap_ID3v2_AttachedPictureFrame_setTextEncoding), -1);
@@ -20879,10 +21994,21 @@ cID3v2_AttachedPictureFrame.klass = rb_define_class_under(mTagLibID3v2, "Attache
   cID3v2_AttachedPictureFrame.destroy = (void (*)(void *)) free_TagLib_ID3v2_AttachedPictureFrame;
   cID3v2_AttachedPictureFrame.trackObjects = 0;
   
-cID3v2_CommentsFrame.klass = rb_define_class_under(mTagLibID3v2, "CommentsFrame", rb_cObject);
+cID3v2_CommentsFrame.klass = rb_define_class_under(mTagLibID3v2, "CommentsFrame", ((swig_class *) SWIGTYPE_p_TagLib__ID3v2__Frame->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__CommentsFrame, (void *) &cID3v2_CommentsFrame);
-  rb_undef_alloc_func(cID3v2_CommentsFrame.klass);
+  rb_define_alloc_func(cID3v2_CommentsFrame.klass, _wrap_ID3v2_CommentsFrame_allocate);
+  rb_define_method(cID3v2_CommentsFrame.klass, "initialize", VALUEFUNC(_wrap_new_ID3v2_CommentsFrame), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "toString", VALUEFUNC(_wrap_ID3v2_CommentsFrame_toString), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "language", VALUEFUNC(_wrap_ID3v2_CommentsFrame_language), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "description", VALUEFUNC(_wrap_ID3v2_CommentsFrame_description), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "text", VALUEFUNC(_wrap_ID3v2_CommentsFrame_text), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "setLanguage", VALUEFUNC(_wrap_ID3v2_CommentsFrame_setLanguage), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "setDescription", VALUEFUNC(_wrap_ID3v2_CommentsFrame_setDescription), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "setText", VALUEFUNC(_wrap_ID3v2_CommentsFrame_setText), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "textEncoding", VALUEFUNC(_wrap_ID3v2_CommentsFrame_textEncoding), -1);
+  rb_define_method(cID3v2_CommentsFrame.klass, "setTextEncoding", VALUEFUNC(_wrap_ID3v2_CommentsFrame_setTextEncoding), -1);
   cID3v2_CommentsFrame.mark = 0;
+  cID3v2_CommentsFrame.destroy = (void (*)(void *)) free_TagLib_ID3v2_CommentsFrame;
   cID3v2_CommentsFrame.trackObjects = 0;
   
 cID3v2_GeneralEncapsulatedObjectFrame.klass = rb_define_class_under(mTagLibID3v2, "GeneralEncapsulatedObjectFrame", rb_cObject);
@@ -20897,18 +22023,14 @@ cID3v2_FrameFactory.klass = rb_define_class_under(mTagLibID3v2, "FrameFactory",
   cID3v2_FrameFactory.mark = 0;
   cID3v2_FrameFactory.trackObjects = 0;
   
-cID3v2_Header.klass = rb_define_class_under(mTagLibID3v2, "Header", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__Header, (void *) &cID3v2_Header);
-  rb_undef_alloc_func(cID3v2_Header.klass);
-  cID3v2_Header.mark = 0;
-  cID3v2_Header.destroy = (void (*)(void *)) free_TagLib_ID3v2_Header;
-  cID3v2_Header.trackObjects = 0;
-  
 cID3v2_Tag.klass = rb_define_class_under(mTagLibID3v2, "Tag", ((swig_class *) SWIGTYPE_p_TagLib__Tag->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__ID3v2__Tag, (void *) &cID3v2_Tag);
   rb_define_alloc_func(cID3v2_Tag.klass, _wrap_ID3v2_Tag_allocate);
   rb_define_method(cID3v2_Tag.klass, "initialize", VALUEFUNC(_wrap_new_ID3v2_Tag), -1);
   rb_define_method(cID3v2_Tag.klass, "header", VALUEFUNC(_wrap_ID3v2_Tag_header), -1);
+  rb_define_method(cID3v2_Tag.klass, "addFrame", VALUEFUNC(_wrap_ID3v2_Tag_addFrame), -1);
+  rb_define_method(cID3v2_Tag.klass, "frameListMap", VALUEFUNC(_wrap_ID3v2_Tag_frameListMap), -1);
+  rb_define_method(cID3v2_Tag.klass, "frameList", VALUEFUNC(_wrap_ID3v2_Tag_frameList), -1);
   cID3v2_Tag.mark = 0;
   cID3v2_Tag.destroy = (void (*)(void *)) free_TagLib_ID3v2_Tag;
   cID3v2_Tag.trackObjects = 0;