id3lib-ruby 0.5.0 → 0.6.0

data/CHANGES

@@ -1,5 +1,15 @@
 = id3lib-ruby changes
 
+=== 0.6.0 (2010-05-16)
+
+* Added convenience method user_frame_text to Tag for finding a
+  TXXX frame given a description (e.g. "MusicBrainz Album Id")
+  (RubyForge feature request 24381)
+* Fixed compilation problem on Ruby 1.9 (GitHub issue 1)
+* Don't check for ID3Tag_New in extconf.rb (RubyForge bug 27589)
+* Updated to SWIG 1.3.40
+* Use rake-compiler for cross-compiling the extension
+
 === 0.5.0 (2006-12-16)
 
 * Warn when encountering nil field instead of raising exception (bug 6446).

data/INSTALL

@@ -16,34 +16,36 @@ For other systems, there is a RubyGems package or a compressed archive.
 Before installing id3lib-ruby, you need to install the underlying id3lib
 library and, depending on your system, set CONFIGURE_ARGS.
 
-==== Debian
+==== Ubuntu and Debian Linux
 
-Install libid3-dev and be sure to have ruby1.8-dev installed, otherwise you
+Install libid3-dev and be sure to have ruby-dev installed, otherwise you
 won't be able to build Ruby extensions.
 
-  sudo aptitude install libid3-dev
+  sudo aptitude install libid3-dev ruby-dev g++
 
-==== Gentoo
+==== Fedora Linux
 
-  sudo emerge -n id3lib
+  sudo yum install id3lib-devel ruby-devel gcc-c++
 
-==== OS X with Fink
+==== Gentoo Linux
 
-Install id3lib4-dev:
+  sudo emerge -n id3lib
 
-  sudo apt-get install id3lib4-dev
+==== Mac OS X
 
-Fink puts the library and header files in /sw. In order to enable the
-id3lib-ruby install program to find them, do:
+If you use the Ruby distribution provided by Mac OS X, you need to have Apple's
+Xcode installed in order to be able to build extensions.
 
-  export CONFIGURE_ARGS="--with-opt-dir=/sw"
+Now, either install id3lib through MacPorts or Fink, or by downloading and
+compiling manually.
 
-==== Manual compilation
+===== MacPorts
 
-Download, compile and install id3lib. When installing in /usr/local, you
-have to set CONFIGURE_ARGS:
+  sudo port install id3lib
 
-  export CONFIGURE_ARGS="--with-opt-dir=/usr/local"
+===== Fink
+
+  sudo apt-get install id3lib4-dev
 
 === Installing id3lib-ruby
 
@@ -55,3 +57,19 @@ following and select the newest version marked "ruby":
 Or if you install from the archive, unpack it and do:
 
   sudo ruby setup.rb
+
+==== Mac OS X
+
+On Mac OS X 10.5 and later, Ruby tries to compile the extension for multiple
+architectures (universal build) and fails. You have to specify the right
+architecture manually. For 64 bit Intel processors, do:
+
+  sudo env ARCHFLAGS="-arch x86_64" gem install id3lib-ruby
+
+For 32 bit Intel processors:
+
+  sudo env ARCHFLAGS="-arch i386" gem install id3lib-ruby
+
+And for PPC processors:
+
+  sudo env ARCHFLAGS="-arch ppc" gem install id3lib-ruby

data/README

@@ -1,7 +1,7 @@
 = id3lib-ruby
 
 id3lib-ruby provides a Ruby interface to the id3lib C++ library for easily
-editing ID3 tags (v1 and v2) like with pyid3lib.
+editing ID3 tags (v1 and v2) of MP3 audio files.
 
 The class documentation starts at ID3Lib::Tag.
 
@@ -16,8 +16,6 @@ The class documentation starts at ID3Lib::Tag.
 * UTF-16 support (warning: id3lib writes broken UTF-16 frames)
 * Windows binary gem available
 
-See TODO for planned features.
-
 The CHANGES file contains a list of changes between versions.
 
 

data/Rakefile

@@ -6,8 +6,15 @@ rescue Exception
   nil
 end
 
+begin
+  require 'rake/extensiontask'
+rescue LoadError
+  # Compiling of extension will have to be done manually.
+end
+
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'open-uri'
 
 
 FILES_COMMON = FileList[
@@ -24,28 +31,13 @@ FILES_DOC = FileList[
 ]
 
 FILES_EXT = FileList[
-  'ext/*.rb',
-  'ext/*.cxx',
-  'ext/*.i',
-  'ext/Rakefile'
+  'ext/id3lib_api/*.{rb,cxx,i}',
+  'ext/id3lib_api/Rakefile'
 ]
 
 
-desc "Build extension."
-task :ext do
-  sh "cd ext && rake"
-  puts "(end)"
-end
-
-desc "Build mswin32 extension."
-task :ext_mswin32 do
-  sh 'cd ext/mswin32; rake'
-  puts "(end)"
-end
-
-
 Rake::TestTask.new do |t|
-  t.libs = ['lib', 'ext']
+  t.libs = ['lib', 'ext/id3lib_api']
   t.test_files = FileList['test/test_*.rb']
   t.verbose = true
 end
@@ -65,16 +57,18 @@ task :doc => [:rdoc]
 
 
 if defined? Gem
+
   spec = Gem::Specification.new do |s|
     s.name        = 'id3lib-ruby'
     s.version     = File.read('lib/id3lib.rb')[/VERSION = '(.*)'/, 1]
     s.summary     =
       'id3lib-ruby provides a Ruby interface to the id3lib C++ library for ' +
-      'easily editing ID3 tags (v1 and v2) like with pyid3lib.'
+      'easily editing ID3 tags (v1 and v2) of MP3 audio files.'
+    s.description = File.read('README')
     s.requirements << 'id3lib C++ library'
     s.files       = FILES_COMMON + FILES_EXT
-    s.extensions  = ['ext/extconf.rb']
     s.test_files  = FileList['test/test_*.rb']
+    s.extensions  << 'ext/id3lib_api/extconf.rb'
     s.has_rdoc    = true
     s.extra_rdoc_files = FILES_DOC
     s.rdoc_options = RDOC_OPTS
@@ -89,18 +83,75 @@ if defined? Gem
     pkg.need_zip = true
   end
 
-  spec_mswin32 = spec.clone
-  spec_mswin32.files = FILES_COMMON + FileList['ext/mswin32/id3lib_api.so']
-  spec_mswin32.extensions = []
-  spec_mswin32.require_paths = ['lib', 'ext/mswin32']
-  spec_mswin32.platform = Gem::Platform::WIN32
-
-  desc "Build mswin32 gem."
-  task :gem_mswin32 => [:ext_mswin32] do
-    gemfile = Gem::Builder.new(spec_mswin32).build
-    mkpath "pkg"
-    mv gemfile, "pkg/"
-  end
+  if defined? Rake::ExtensionTask
+
+    host = 'i586-mingw32msvc'
+    plat = 'x86-mswin32-60'
+    tmp = "#{Dir.pwd}/tmp/#{plat}"
+    cflags = "'-Os -DID3LIB_LINKOPTION=1'"
+    config_options = ["--with-opt-dir=#{tmp}", "--with-cflags=#{cflags}"]
+    id3lib_version = '3.8.3'
+    id3lib = "id3lib-#{id3lib_version}"
+    id3lib_url = "http://downloads.sourceforge.net/project/" +
+                 "id3lib/id3lib/#{id3lib_version}/#{id3lib}.tar.gz"
+    patches = FileList["#{Dir.pwd}/ext/mswin32/patches/*patch"]
+
+    Rake::ExtensionTask.new('id3lib_api', spec) do |ext|
+      ext.cross_compile = true
+      ext.cross_platform = plat
+      ext.cross_config_options.concat(config_options)
+      if RUBY_PLATFORM =~ /mingw/
+        ext.config_options.concat(config_options)
+      end
+    end
+
+    task :cross => [:id3lib] do
+      # Mkmf just uses "g++" as C++ compiler, despite what's in rbconfig.rb.
+      # So, we need to hack around it by setting CXX to the cross compiler.
+      ENV["CXX"] = "#{host}-g++"
+    end
+
+    # Linking to the DLLs provided by id3lib.sf.net doesn't seem to work on
+    # Windows, so we download and compile it automatically (the same as when
+    # cross compiling).
+    if RUBY_PLATFORM =~ /mingw/
+      Rake::Task[:compile].prerequisites.unshift(:id3lib)
+    end
+
+    task :id3lib => ["#{tmp}/lib/libid3.a"]
+
+    file "#{tmp}/lib/libid3.a" => ["#{tmp}/#{id3lib}/config.log"] do
+      chdir "#{tmp}/#{id3lib}" do
+        env = "CFLAGS=#{cflags} CXXFLAGS=#{cflags}"
+        sh "sh configure --host=#{host} --prefix=#{tmp} #{env}"
+        sh "make"
+        sh "make install"
+      end
+    end
+
+    file "#{tmp}/#{id3lib}/config.log" => ["#{tmp}/#{id3lib}.tar.gz"] do
+      chdir tmp do
+        sh "tar xzf #{id3lib}.tar.gz"
+        patches.each do |patch|
+          sh "patch -p0 < #{patch}"
+        end
+      end
+    end
+
+    file "#{tmp}/#{id3lib}.tar.gz" => [tmp] do |t|
+      puts "Downloading #{id3lib_url}"
+      data = open(id3lib_url).read()
+      break if data == nil
+      chdir tmp do
+        open(File.basename(t.name), 'wb') do |f|
+          f.write(data)
+        end
+      end
+    end
+
+    directory tmp
+
+  end  # defined? Rake::ExtensionTask
 
 end  # defined? Gem
 

data/TODO

@@ -1,5 +1,9 @@
 = id3lib-ruby to-do list
 
+The underlying C++ library id3lib is no longer maintained and outdated (no
+support for ID3v2.4). Therefore id3lib-ruby is no longer actively developed.
+Here's the old to-do list anyway:
+
 * Evaluate an object-oriented way to handle frames, instead of with hashes.
 * Make the update! method intelligent, because the call of strip each time
   is very slow and stupid.

data/ext/{Rakefile → id3lib_api/Rakefile}

@@ -13,7 +13,7 @@ file 'id3lib_api.bundle' => ['id3lib_api_wrap.cxx', 'Makefile'] do
 end
 
 file 'id3lib_api_wrap.cxx' => ['id3lib_api.i'] do
-  sh "swig -c++ -ruby -feature id3lib_api id3lib_api.i"
+  sh "swig -c++ -ruby -initname id3lib_api id3lib_api.i"
 end
 
 file 'Makefile' do

data/ext/id3lib_api/extconf.rb

@@ -0,0 +1,27 @@
+# Default opt dirs to help mkmf find id3lib
+configure_args = "--with-opt-dir=/usr/local:/opt/local:/sw "
+ENV['CONFIGURE_ARGS'] = configure_args + ENV.fetch('CONFIGURE_ARGS', "")
+
+require 'mkmf'
+
+def error msg
+  message msg + "\n"
+  abort
+end
+
+unless have_library('stdc++')
+  error "You must have libstdc++ installed."
+end
+
+unless have_library('z')
+  error "You must have zlib installed."
+end
+
+# This is only necessary for linking on Windows (don't ask me why).
+have_library('iconv')
+
+unless have_header('id3.h') and have_library('id3')
+  error "You must have id3lib installed in order to use id3lib-ruby."
+end
+
+create_makefile('id3lib_api')

data/ext/{id3lib_api.i → id3lib_api/id3lib_api.i}

@@ -11,6 +11,8 @@ enum ID3_TextEnc;
 enum ID3_TagType;
 
 typedef unsigned int flags_t;
+typedef unsigned long uint32;
+typedef unsigned char uchar;
 
 
 %rename (Tag) ID3_Tag;
@@ -99,7 +101,7 @@ public:
 	ID3_TextEnc GetEncoding() const;
 
 	%rename (get_integer) Get;
-	unsigned long Get() const;
+	uint32 Get() const;
 
 	%rename (get_ascii) GetRawText;
 	const char * GetRawText() const;
@@ -115,7 +117,7 @@ public:
 		{
 			const char *str = (const char *)self->GetRawUnicodeText();
 			if (str == NULL) return rb_str_new("", 0);
-			long size = self->Size();
+			size_t size = self->Size();
 			if (size >= 2 && str[size-2] == '\0' && str[size-1] == '\0') {
 				// id3lib seems to be inconsistent: the Unicode strings
 				// don't always end in 0x0000. If they do, we don't want these
@@ -131,8 +133,8 @@ public:
 	%rename (set_encoding) SetEncoding(ID3_TextEnc);
 	bool SetEncoding(ID3_TextEnc enc);
 
-	%rename (set_integer) Set(unsigned long);
-	void Set(unsigned long i);
+	%rename (set_integer) Set(uint32);
+	void Set(uint32 i);
 
 	%rename (set_ascii) Set(const char *);
 	size_t Set(const char *string);
@@ -142,8 +144,8 @@ public:
 		size_t set_binary(VALUE data)
 		{
 			StringValue(data);
-			return self->Set((const unsigned char *)RSTRING(data)->ptr,
-			                 RSTRING(data)->len);
+			return self->Set((const uchar *)RSTRING_PTR(data),
+			                 RSTRING_LEN(data));
 		}
 
 		size_t set_unicode(VALUE data)
@@ -153,14 +155,14 @@ public:
 			long len;
 			unicode_t *unicode;
 
-			len = RSTRING(data)->len / sizeof(unicode_t);
+			len = RSTRING_LEN(data) / sizeof(unicode_t);
 			unicode = (unicode_t *)malloc(sizeof(unicode_t) * (len+1));
 
 			if (unicode == NULL) {
 				rb_raise(rb_eNoMemError, "Couldn't allocate memory for Unicode data.");
 			}
 
-			memcpy(unicode, RSTRING(data)->ptr, sizeof(unicode_t) * len);
+			memcpy(unicode, RSTRING_PTR(data), sizeof(unicode_t) * len);
 			// Unicode strings need 0x0000 at the end.
 			unicode[len] = 0;
 			size_t retval = self->Set(unicode);

data/ext/{id3lib_api_wrap.cxx → id3lib_api/id3lib_api_wrap.cxx}

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.40
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -10,20 +10,28 @@
 
 #define SWIGRUBY
 
+
 #ifdef __cplusplus
-template<class T> class SwigValueWrapper {
-    T *tt;
+/* SwigValueWrapper is described in swig.swg */
+template<typename T> class SwigValueWrapper {
+  struct SwigMovePointer {
+    T *ptr;
+    SwigMovePointer(T *p) : ptr(p) { }
+    ~SwigMovePointer() { delete ptr; }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+  } pointer;
+  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
-    SwigValueWrapper() : tt(0) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
-    ~SwigValueWrapper() { delete tt; } 
-    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
-    operator T&() const { return *tt; }
-    T *operator&() { return tt; }
-private:
-    SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+  SwigValueWrapper() : pointer(0) { }
+  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+  operator T&() const { return *pointer.ptr; }
+  T *operator&() { return pointer.ptr; }
 };
+
+template <typename T> T SwigValueInit() {
+  return T();
+}
 #endif
 
 /* -----------------------------------------------------------------------------
@@ -33,14 +41,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -68,6 +76,12 @@ private:
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -123,6 +137,12 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 /* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
@@ -130,14 +150,14 @@ private:
 
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-#   if (__SUNPRO_CC <= 0x560)
-#     define SWIGTEMPLATEDISAMBIGUATOR template
-#   else
-#     define SWIGTEMPLATEDISAMBIGUATOR 
-#   endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
-#   define SWIGTEMPLATEDISAMBIGUATOR 
+#  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 
@@ -165,6 +185,12 @@ private:
 # endif
 #endif
 
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif 
+#endif
+
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@@ -220,16 +246,22 @@ private:
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
 /* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
  * type checking.
  * ----------------------------------------------------------------------------- */
 
 /* This should only be incremented when either the layout of swig_type_info changes,
    or for whatever reason, the runtime changes incompatibly */
-#define SWIG_RUNTIME_VERSION "3"
+#define SWIG_RUNTIME_VERSION "4"
 
 /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */
 #ifdef SWIG_TYPE_TABLE
@@ -242,11 +274,11 @@ private:
 
 /*
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
-  creating a static or dynamic library from the swig runtime code.
-  In 99.9% of the cases, swig just needs to declare them as 'static'.
+  creating a static or dynamic library from the SWIG runtime code.
+  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
   
-  But only do this if is strictly necessary, ie, if you have problems
-  with your compiler or so.
+  But only do this if strictly necessary, ie, if you have problems
+  with your compiler or suchlike.
 */
 
 #ifndef SWIGRUNTIME
@@ -264,6 +296,7 @@ private:
 
 /* Flags for pointer conversions */
 #define SWIG_POINTER_DISOWN        0x1
+#define SWIG_CAST_NEW_MEMORY       0x2
 
 /* Flags for new pointer objects */
 #define SWIG_POINTER_OWN           0x1
@@ -272,14 +305,14 @@ private:
 /* 
    Flags/methods for returning states.
    
-   The swig conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return and integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
    Use the following macros/flags to set or process the returning
    states.
    
-   In old swig versions, you usually write code as:
+   In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
        // success code
@@ -287,7 +320,7 @@ private:
        //fail code
      }
 
-   Now you can be more explicit as:
+   Now you can be more explicit:
 
     int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
     if (SWIG_IsOK(res)) {
@@ -296,7 +329,7 @@ private:
       // fail code
     }
 
-   that seems to be the same, but now you can also do
+   which is the same really, but now you can also do
 
     Type *ptr;
     int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -314,7 +347,7 @@ private:
     
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
-   requires also to SWIG_ConvertPtr to return new result values, as
+   also requires SWIG_ConvertPtr to return new result values, such as
 
       int SWIG_ConvertPtr(obj, ptr,...) {         
         if (<obj is ok>) {			       
@@ -332,7 +365,7 @@ private:
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
    more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
-   swig errors code.
+   SWIG errors code.
 
    Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
    allows to return the 'cast rank', for example, if you have this
@@ -346,9 +379,8 @@ private:
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
+*/
 
-
- */
 #define SWIG_OK                    (0) 
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
@@ -373,7 +405,6 @@ private:
 #define SWIG_DelTmpMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
 #define SWIG_IsTmpObj(r)           (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
 
-
 /* Cast-Rank Mode */
 #if defined(SWIG_CASTRANK_MODE)
 #  ifndef SWIG_TypeRank
@@ -396,18 +427,16 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
 #endif
 
 
-
-
 #include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef void *(*swig_converter_func)(void *);
+typedef void *(*swig_converter_func)(void *, int *);
 typedef struct swig_type_info *(*swig_dycast_func)(void **);
 
-/* Structure to store inforomation on one type */
+/* Structure to store information on one type */
 typedef struct swig_type_info {
   const char             *name;			/* mangled name of this type */
   const char             *str;			/* human readable name of this type */
@@ -452,7 +481,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
     if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
-  return (l1 - f1) - (l2 - f2);
+  return (int)((l1 - f1) - (l2 - f2));
 }
 
 /*
@@ -494,48 +523,66 @@ SWIG_TypeCompare(const char *nb, const char *tb) {
 }
 
 
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty)         \
-  if (ty) {                                             \
-    swig_cast_info *iter = ty->cast;                    \
-    while (iter) {                                      \
-      if (comparison) {                                 \
-        if (iter == ty->cast) return iter;              \
-        /* Move iter to the top of the linked list */   \
-        iter->prev->next = iter->next;                  \
-        if (iter->next)                                 \
-          iter->next->prev = iter->prev;                \
-        iter->next = ty->cast;                          \
-        iter->prev = 0;                                 \
-        if (ty->cast) ty->cast->prev = iter;            \
-        ty->cast = iter;                                \
-        return iter;                                    \
-      }                                                 \
-      iter = iter->next;                                \
-    }                                                   \
-  }                                                     \
-  return 0
-
 /*
   Check the typename
 */
 SWIGRUNTIME swig_cast_info *
 SWIG_TypeCheck(const char *c, swig_type_info *ty) {
-  SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (strcmp(iter->type->name, c) == 0) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/* 
+  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
 SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
-  SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+  if (ty) {
+    swig_cast_info *iter = ty->cast;
+    while (iter) {
+      if (iter->type == from) {
+        if (iter == ty->cast)
+          return iter;
+        /* Move iter to the top of the linked list */
+        iter->prev->next = iter->next;
+        if (iter->next)
+          iter->next->prev = iter->prev;
+        iter->next = ty->cast;
+        iter->prev = 0;
+        if (ty->cast) ty->cast->prev = iter;
+        ty->cast = iter;
+        return iter;
+      }
+      iter = iter->next;
+    }
+  }
+  return 0;
 }
 
 /*
   Cast a pointer up an inheritance hierarchy
 */
 SWIGRUNTIMEINLINE void *
-SWIG_TypeCast(swig_cast_info *ty, void *ptr) {
-  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr);
+SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
+  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
 /* 
@@ -808,6 +855,24 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 #include <ruby.h>
 
+/* Remove global macros defined in Ruby's win32.h */
+#ifdef write
+# undef write
+#endif
+#ifdef read
+# undef read
+#endif
+#ifdef bind
+# undef bind
+#endif
+#ifdef close
+# undef close
+#endif
+#ifdef connect
+# undef connect
+#endif
+
+
 /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
 #ifndef NUM2LL
 #define NUM2LL(x) NUM2LONG((x))
@@ -836,12 +901,44 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifndef RSTRING_PTR
 # define RSTRING_PTR(x) RSTRING(x)->ptr
 #endif
+#ifndef RSTRING_END
+# define RSTRING_END(x) (RSTRING_PTR(x) + RSTRING_LEN(x))
+#endif
 #ifndef RARRAY_LEN
 # define RARRAY_LEN(x) RARRAY(x)->len
 #endif
 #ifndef RARRAY_PTR
 # define RARRAY_PTR(x) RARRAY(x)->ptr
 #endif
+#ifndef RFLOAT_VALUE
+# define RFLOAT_VALUE(x) RFLOAT(x)->value
+#endif
+#ifndef DOUBLE2NUM
+# define DOUBLE2NUM(x) rb_float_new(x)
+#endif
+#ifndef RHASH_TBL
+# define RHASH_TBL(x) (RHASH(x)->tbl)
+#endif
+#ifndef RHASH_ITER_LEV
+# define RHASH_ITER_LEV(x) (RHASH(x)->iter_lev)
+#endif
+#ifndef RHASH_IFNONE
+# define RHASH_IFNONE(x) (RHASH(x)->ifnone)
+#endif
+#ifndef RHASH_SIZE
+# define RHASH_SIZE(x) (RHASH(x)->tbl->num_entries)
+#endif
+#ifndef RHASH_EMPTY_P
+# define RHASH_EMPTY_P(x) (RHASH_SIZE(x) == 0)
+#endif
+#ifndef RSTRUCT_LEN
+# define RSTRUCT_LEN(x) RSTRUCT(x)->len
+#endif
+#ifndef RSTRUCT_PTR
+# define RSTRUCT_PTR(x) RSTRUCT(x)->ptr
+#endif
+
+
 
 /*
  * Need to be very careful about how these macros are defined, especially
@@ -903,6 +1000,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
 #endif
 
+static VALUE _mSWIG = Qnil;
 
 /* -----------------------------------------------------------------------------
  * error manipulation
@@ -993,7 +1091,71 @@ SWIG_Ruby_ErrorType(int SWIG_code) {
 }
 
 
+/* This function is called when a user inputs a wrong argument to
+   a method.
+ */
+SWIGINTERN 
+const char* Ruby_Format_TypeError( const char* msg,
+				   const char* type, 
+				   const char* name, 
+				   const int argn,
+				   VALUE input )
+{
+  char buf[128];
+  VALUE str;
+  VALUE asStr;
+  if ( msg && *msg )
+    {
+      str = rb_str_new2(msg);
+    }
+  else
+    {
+      str = rb_str_new(NULL, 0);
+    }
+
+  str = rb_str_cat2( str, "Expected argument " );
+  sprintf( buf, "%d of type ", argn-1 );
+  str = rb_str_cat2( str, buf );
+  str = rb_str_cat2( str, type );
+  str = rb_str_cat2( str, ", but got " );
+  str = rb_str_cat2( str, rb_obj_classname(input) );
+  str = rb_str_cat2( str, " " );
+  asStr = rb_inspect(input);
+  if ( RSTRING_LEN(asStr) > 30 )
+    {
+      str = rb_str_cat( str, StringValuePtr(asStr), 30 );
+      str = rb_str_cat2( str, "..." );
+    }
+  else
+    {
+      str = rb_str_append( str, asStr );
+    }
+
+  if ( name )
+    {
+      str = rb_str_cat2( str, "\n\tin SWIG method '" );
+      str = rb_str_cat2( str, name );
+      str = rb_str_cat2( str, "'" );
+    }
+
+  return StringValuePtr( str );
+}
 
+/* This function is called when an overloaded method fails */
+SWIGINTERN 
+void Ruby_Format_OverloadedError(
+				 const int argc,
+				 const int maxargs,
+				 const char* method, 
+				 const char* prototypes 
+				 )
+{
+  const char* msg = "Wrong # of arguments";
+  if ( argc <= maxargs ) msg = "Wrong arguments";
+  rb_raise(rb_eArgError,"%s for overloaded method '%s'.\n"  
+	   "Possible C/C++ prototypes are:\n%s",
+	   msg, method, prototypes);
+}
 
 /* -----------------------------------------------------------------------------
  * See the LICENSE file for information on copyright, usage and redistribution
@@ -1011,26 +1173,54 @@ SWIG_Ruby_ErrorType(int SWIG_code) {
 extern "C" {
 #endif
 
+/* Ruby 1.8 actually assumes the first case. */
+#if SIZEOF_VOIDP == SIZEOF_LONG
+#  define SWIG2NUM(v) LONG2NUM((unsigned long)v)
+#  define NUM2SWIG(x) (unsigned long)NUM2LONG(x)
+#elif SIZEOF_VOIDP == SIZEOF_LONG_LONG
+#  define SWIG2NUM(v) LL2NUM((unsigned long long)v)
+#  define NUM2SWIG(x) (unsigned long long)NUM2LL(x)
+#else
+#  error sizeof(void*) is not the same as long or long long
+#endif
+
 
 /* Global Ruby hash table to store Trackings from C/C++
-   structs to Ruby Objects. */
-static VALUE swig_ruby_trackings;
-
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete = 0;
+   structs to Ruby Objects. 
+*/
+static VALUE swig_ruby_trackings = Qnil;
+
+/* Global variable that stores a reference to the ruby
+   hash table delete function. */
+static ID swig_ruby_hash_delete;
 
 /* Setup a Ruby hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
   /* Create a ruby hash table to store Trackings from C++ 
-     objects to Ruby objects.  Also make sure to tell
-     the garabage collector about the hash table. */
-  swig_ruby_trackings = rb_hash_new();
-  rb_gc_register_address(&swig_ruby_trackings);
-  
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
+     objects to Ruby objects. */
+
+  /* Try to see if some other .so has already created a 
+     tracking hash table, which we keep hidden in an instance var
+     in the SWIG module.
+     This is done to allow multiple DSOs to share the same
+     tracking table.
+  */
+  ID trackings_id = rb_intern( "@__trackings__" );
+  VALUE verbose = rb_gv_get("VERBOSE");
+  rb_gv_set("VERBOSE", Qfalse);
+  swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
+  rb_gv_set("VERBOSE", verbose);
+
+  /* No, it hasn't.  Create one ourselves */ 
+  if ( swig_ruby_trackings == Qnil )
+    {
+      swig_ruby_trackings = rb_hash_new();
+      rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
+    }
+
+  /* Now store a reference to the hash table delete function
+     so that we only have to look it up once.*/
+  swig_ruby_hash_delete = rb_intern("delete");
 }
 
 /* Get a Ruby number to reference a pointer */
@@ -1040,8 +1230,7 @@ SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
      a Ruby number object. */
 
   /* Convert the pointer to a Ruby number */
-  unsigned long value = (unsigned long) ptr;
-  return LONG2NUM(value);
+  return SWIG2NUM(ptr);
 }
 
 /* Get a Ruby number to reference an object */
@@ -1051,8 +1240,7 @@ SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
      a Ruby number object. */
 
   /* Convert the Object to a Ruby number */
-  unsigned long value = (unsigned long) object;
-  return LONG2NUM(value);
+  return SWIG2NUM(object);
 }
 
 /* Get a Ruby object from a previously stored reference */
@@ -1060,9 +1248,8 @@ SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
   /* The provided Ruby number object is a reference
      to the Ruby object we want.*/
 
-  /* First convert the Ruby number to a C number */
-  unsigned long value = NUM2LONG(reference);
-  return (VALUE) value;
+  /* Convert the Ruby number to a Ruby object */
+  return NUM2SWIG(reference);
 }
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
@@ -1154,6 +1341,15 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
   return target;
 }
 
+/* For ruby1.8.4 and earlier. */
+#ifndef RUBY_INIT_STACK
+   RUBY_EXTERN void Init_stack(VALUE* addr);
+#  define RUBY_INIT_STACK \
+   VALUE variable_in_this_stack_frame; \
+   Init_stack(&variable_in_this_stack_frame);
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif
@@ -1218,6 +1414,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)		  
 #define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)	  
 
+#include "assert.h"
 
 /* -----------------------------------------------------------------------------
  * pointers/data manipulation
@@ -1225,9 +1422,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 #ifdef __cplusplus
 extern "C" {
-#if 0
-} /* cc-mode */
-#endif
 #endif
 
 typedef struct {
@@ -1239,10 +1433,44 @@ typedef struct {
 } swig_class;
 
 
-static VALUE _mSWIG = Qnil;
+/* Global pointer used to keep some internal SWIG stuff */
 static VALUE _cSWIG_Pointer = Qnil;
 static VALUE swig_runtime_data_type_pointer = Qnil;
 
+/* Global IDs used to keep some internal SWIG stuff */
+static ID swig_arity_id = 0;
+static ID swig_call_id  = 0;
+
+/*
+  If your swig extension is to be run within an embedded ruby and has
+  director callbacks, you should set -DRUBY_EMBEDDED during compilation.  
+  This will reset ruby's stack frame on each entry point from the main 
+  program the first time a virtual director function is invoked (in a 
+  non-recursive way).
+  If this is not done, you run the risk of Ruby trashing the stack.
+*/
+
+#ifdef RUBY_EMBEDDED
+
+#  define SWIG_INIT_STACK                            \
+      if ( !swig_virtual_calls ) { RUBY_INIT_STACK } \
+      ++swig_virtual_calls;
+#  define SWIG_RELEASE_STACK --swig_virtual_calls;
+#  define Ruby_DirectorTypeMismatchException(x) \
+          rb_raise( rb_eTypeError, x ); return c_result;
+
+      static unsigned int swig_virtual_calls = 0;
+
+#else  /* normal non-embedded extension */
+
+#  define SWIG_INIT_STACK
+#  define SWIG_RELEASE_STACK
+#  define Ruby_DirectorTypeMismatchException(x) \
+          throw Swig::DirectorTypeMismatchException( x );
+
+#endif  /* RUBY_EMBEDDED */
+
+
 SWIGRUNTIME VALUE 
 getExceptionClass(void) {
   static int init = 0;
@@ -1274,6 +1502,8 @@ SWIG_Ruby_InitRuntime(void)
 {
   if (_mSWIG == Qnil) {
     _mSWIG = rb_define_module("SWIG");
+    swig_call_id  = rb_intern("call");
+    swig_arity_id = rb_intern("arity");
   }
 }
 
@@ -1297,7 +1527,7 @@ SWIGRUNTIME VALUE
 SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
 {
   int own =  flags & SWIG_POINTER_OWN; 
-  
+  int track;
   char *klass_name;
   swig_class *sklass;
   VALUE klass;
@@ -1310,14 +1540,15 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     sklass = (swig_class *) type->clientdata;
 		
     /* Are we tracking this class and have we already returned this Ruby object? */
-    if (sklass->trackObjects) {
+    track = sklass->trackObjects;
+    if (track) {
       obj = SWIG_RubyInstanceFor(ptr);
       
       /* Check the object's type and make sure it has the correct type.
         It might not in cases where methods do things like 
         downcast methods. */
       if (obj != Qnil) {
-        VALUE value = rb_iv_get(obj, "__swigtype__");
+        VALUE value = rb_iv_get(obj, "@__swigtype__");
         char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
@@ -1327,10 +1558,13 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     }
 
     /* Create a new Ruby object */
-    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr);
+    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), 
+			   ( own ? VOIDFUNC(sklass->destroy) : 
+			     (track ? VOIDFUNC(SWIG_RubyRemoveTracking) : 0 )
+			     ), ptr);
 
     /* If tracking is on for this class then track this object. */
-    if (sklass->trackObjects) {
+    if (track) {
       SWIG_RubyAddTracking(ptr, obj);
     }
   } else {
@@ -1340,7 +1574,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
     free((void *) klass_name);
     obj = Data_Wrap_Struct(klass, 0, 0, ptr);
   }
-  rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
+  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
   
   return obj;
 }
@@ -1352,7 +1586,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
   VALUE obj;
   swig_class *sklass = (swig_class *) type->clientdata;
   obj = Data_Wrap_Struct(klass, VOIDFUNC(sklass->mark), VOIDFUNC(sklass->destroy), 0);
-  rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
+  rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name));
   return obj;
 }
 
@@ -1360,7 +1594,7 @@ SWIG_Ruby_NewClassInstance(VALUE klass, swig_type_info *type)
 SWIGRUNTIMEINLINE char *
 SWIG_Ruby_MangleStr(VALUE obj)
 {
-  VALUE stype = rb_iv_get(obj, "__swigtype__");
+  VALUE stype = rb_iv_get(obj, "@__swigtype__");
   return StringValuePtr(stype);
 }
 
@@ -1442,8 +1676,11 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) {
       return SWIG_ERROR;
+    } else {
+      int newmemory = 0;
+      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
+      assert(!newmemory); /* newmemory handling not yet implemented */
     }
-    *ptr = SWIG_TypeCast(tc, vptr);
   } else {
     *ptr = vptr;
   }
@@ -1524,10 +1761,42 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
   rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
 }
 
+/* This function can be used to check whether a proc or method or similarly
+   callable function has been passed.  Usually used in a %typecheck, like:
+
+   %typecheck(c_callback_t, precedence=SWIG_TYPECHECK_POINTER) {
+        $result = SWIG_Ruby_isCallable( $input );
+   }
+ */
+SWIGINTERN
+int SWIG_Ruby_isCallable( VALUE proc )
+{
+  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+    return 1;
+  return 0;
+}
+
+/* This function can be used to check the arity (number of arguments)
+   a proc or method can take.  Usually used in a %typecheck.
+   Valid arities will be that equal to minimal or those < 0
+   which indicate a variable number of parameters at the end.
+ */
+SWIGINTERN
+int SWIG_Ruby_arity( VALUE proc, int minimal )
+{
+  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+    {
+      VALUE num = rb_funcall( proc, swig_arity_id, 0 );
+      int arity = NUM2INT(num);
+      if ( arity < 0 && (arity+1) < -minimal ) return 1;
+      if ( arity == minimal ) return 1;
+      return 1;
+    }
+  return 0;
+}
+
+
 #ifdef __cplusplus
-#if 0
-{ /* cc-mode */
-#endif
 }
 #endif
 
@@ -1546,9 +1815,11 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 #define SWIGTYPE_p_ID3_Tag swig_types[2]
 #define SWIGTYPE_p_ID3_Tag__Iterator swig_types[3]
 #define SWIGTYPE_p_char swig_types[4]
-#define SWIGTYPE_p_unsigned_int swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+#define SWIGTYPE_p_unsigned_char swig_types[5]
+#define SWIGTYPE_p_unsigned_int swig_types[6]
+#define SWIGTYPE_p_unsigned_long swig_types[7]
+static swig_type_info *swig_types[9];
+static swig_module_info swig_module = {swig_types, 8, 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)
 
@@ -1559,7 +1830,11 @@ static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
 
 static VALUE mAPI;
 
-#define SWIGVERSION 0x010331 
+#define SWIG_RUBY_THREAD_BEGIN_BLOCK
+#define SWIG_RUBY_THREAD_END_BLOCK
+
+
+#define SWIGVERSION 0x010340 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1590,11 +1865,11 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    
-
-
+    #if defined(StringValuePtr)
+    char *cstr = StringValuePtr(obj); 
+    #else
     char *cstr = STR2CSTR(obj);
-    
+    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -1628,14 +1903,12 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 #include <limits.h>
-#ifndef LLONG_MIN
-# define LLONG_MIN	LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX	LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX	ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+#   define LLONG_MAX __LONG_LONG_MAX__
+#   define LLONG_MIN (-LLONG_MAX - 1LL)
+#   define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
 #endif
 
 
@@ -1646,7 +1919,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/1.3.40/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1698,7 +1971,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/1.3.40/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -1823,7 +2096,7 @@ SWIGINTERN VALUE ID3_Field_get_binary(ID3_Field *self){
 SWIGINTERN VALUE ID3_Field_get_unicode(ID3_Field *self){
 			const char *str = (const char *)self->GetRawUnicodeText();
 			if (str == NULL) return rb_str_new("", 0);
-			long size = self->Size();
+			size_t size = self->Size();
 			if (size >= 2 && str[size-2] == '\0' && str[size-1] == '\0') {
 				// id3lib seems to be inconsistent: the Unicode strings
 				// don't always end in 0x0000. If they do, we don't want these
@@ -1834,8 +2107,8 @@ SWIGINTERN VALUE ID3_Field_get_unicode(ID3_Field *self){
 		}
 SWIGINTERN size_t ID3_Field_set_binary(ID3_Field *self,VALUE data){
 			StringValue(data);
-			return self->Set((const unsigned char *)RSTRING(data)->ptr,
-			                 RSTRING(data)->len);
+			return self->Set((const uchar *)RSTRING_PTR(data),
+			                 RSTRING_LEN(data));
 		}
 SWIGINTERN size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
 			StringValue(data);
@@ -1843,14 +2116,14 @@ SWIGINTERN size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
 			long len;
 			unicode_t *unicode;
 
-			len = RSTRING(data)->len / sizeof(unicode_t);
+			len = RSTRING_LEN(data) / sizeof(unicode_t);
 			unicode = (unicode_t *)malloc(sizeof(unicode_t) * (len+1));
 
 			if (unicode == NULL) {
 				rb_raise(rb_eNoMemError, "Couldn't allocate memory for Unicode data.");
 			}
 
-			memcpy(unicode, RSTRING(data)->ptr, sizeof(unicode_t) * len);
+			memcpy(unicode, RSTRING_PTR(data), sizeof(unicode_t) * len);
 			// Unicode strings need 0x0000 at the end.
 			unicode[len] = 0;
 			size_t retval = self->Set(unicode);
@@ -1859,26 +2132,26 @@ SWIGINTERN size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
 			free(unicode);
 			return retval;
 		}
-swig_class cTag;
+swig_class SwigClassTag;
 
 SWIGINTERN VALUE
 _wrap_new_Tag__SWIG_0(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
-  ID3_Tag *result = 0 ;
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
+  ID3_Tag *result = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
   res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ID3_Tag" "', argument " "1"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","ID3_Tag", 1, argv[0] ));
   }
   arg1 = reinterpret_cast< char * >(buf1);
-  result = (ID3_Tag *)new ID3_Tag((char const *)arg1);DATA_PTR(self) = result;
-  
+  result = (ID3_Tag *)new ID3_Tag((char const *)arg1);
+  DATA_PTR(self) = result;
   if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
@@ -1911,8 +2184,8 @@ _wrap_new_Tag__SWIG_1(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (ID3_Tag *)new ID3_Tag();DATA_PTR(self) = result;
-  
+  result = (ID3_Tag *)new ID3_Tag();
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -1926,7 +2199,7 @@ SWIGINTERN VALUE _wrap_new_Tag(int nargs, VALUE *args, VALUE self) {
   
   argc = nargs;
   if (argc > 1) SWIG_fail;
-  for (ii = 0; (ii < argc); ii++) {
+  for (ii = 0; (ii < argc); ++ii) {
     argv[ii] = args[ii];
   }
   if (argc == 0) {
@@ -1942,7 +2215,10 @@ SWIGINTERN VALUE _wrap_new_Tag(int nargs, VALUE *args, VALUE self) {
   }
   
 fail:
-  rb_raise(rb_eArgError, "No matching function for overloaded 'new_Tag'");
+  Ruby_Format_OverloadedError( argc, 1, "Tag.new", 
+    "    Tag.new(char const *name)\n"
+    "    Tag.new()\n");
+  
   return Qnil;
 }
 
@@ -1956,11 +2232,11 @@ SWIGINTERN VALUE
 _wrap_Tag_has_tag_type(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   ID3_TagType arg2 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  bool result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -1968,12 +2244,12 @@ _wrap_Tag_has_tag_type(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HasTagType" "', argument " "1"" of type '" "ID3_Tag const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag const *","HasTagType", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HasTagType" "', argument " "2"" of type '" "ID3_TagType""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "ID3_TagType","HasTagType", 2, argv[0] ));
   } 
   arg2 = static_cast< ID3_TagType >(val2);
   result = (bool)((ID3_Tag const *)arg1)->HasTagType(arg2);
@@ -1989,7 +2265,6 @@ _wrap_Tag_link__SWIG_0(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   char *arg2 = (char *) 0 ;
   flags_t arg3 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
@@ -1997,6 +2272,7 @@ _wrap_Tag_link__SWIG_0(int argc, VALUE *argv, VALUE self) {
   int alloc2 = 0 ;
   unsigned int val3 ;
   int ecode3 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 2) || (argc > 2)) {
@@ -2004,17 +2280,17 @@ _wrap_Tag_link__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Link" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Link", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Link" "', argument " "2"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","Link", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   ecode3 = SWIG_AsVal_unsigned_SS_int(argv[1], &val3);
   if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Link" "', argument " "3"" of type '" "flags_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "flags_t","Link", 3, argv[1] ));
   } 
   arg3 = static_cast< flags_t >(val3);
   result = (arg1)->Link((char const *)arg2,arg3);
@@ -2031,12 +2307,12 @@ SWIGINTERN VALUE
 _wrap_Tag_link__SWIG_1(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   char *arg2 = (char *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2044,12 +2320,12 @@ _wrap_Tag_link__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Link" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Link", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Link" "', argument " "2"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","Link", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   result = (arg1)->Link((char const *)arg2);
@@ -2070,7 +2346,7 @@ SWIGINTERN VALUE _wrap_Tag_link(int nargs, VALUE *args, VALUE self) {
   argc = nargs + 1;
   argv[0] = self;
   if (argc > 4) SWIG_fail;
-  for (ii = 1; (ii < argc); ii++) {
+  for (ii = 1; (ii < argc); ++ii) {
     argv[ii] = args[ii-1];
   }
   if (argc == 2) {
@@ -2107,7 +2383,10 @@ SWIGINTERN VALUE _wrap_Tag_link(int nargs, VALUE *args, VALUE self) {
   }
   
 fail:
-  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_link'");
+  Ruby_Format_OverloadedError( argc, 4, "Tag.link", 
+    "    size_t Tag.link(char const *filename, flags_t flags)\n"
+    "    size_t Tag.link(char const *filename)\n");
+  
   return Qnil;
 }
 
@@ -2116,11 +2395,11 @@ SWIGINTERN VALUE
 _wrap_Tag_update__SWIG_0(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   flags_t arg2 ;
-  flags_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
+  flags_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2128,12 +2407,12 @@ _wrap_Tag_update__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Update" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Update", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Update" "', argument " "2"" of type '" "flags_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "flags_t","Update", 2, argv[0] ));
   } 
   arg2 = static_cast< flags_t >(val2);
   result = (flags_t)(arg1)->Update(arg2);
@@ -2147,9 +2426,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Tag_update__SWIG_1(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-  flags_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  flags_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2157,7 +2436,7 @@ _wrap_Tag_update__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Update" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Update", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   result = (flags_t)(arg1)->Update();
@@ -2176,7 +2455,7 @@ SWIGINTERN VALUE _wrap_Tag_update(int nargs, VALUE *args, VALUE self) {
   argc = nargs + 1;
   argv[0] = self;
   if (argc > 3) SWIG_fail;
-  for (ii = 1; (ii < argc); ii++) {
+  for (ii = 1; (ii < argc); ++ii) {
     argv[ii] = args[ii-1];
   }
   if (argc == 1) {
@@ -2205,7 +2484,10 @@ SWIGINTERN VALUE _wrap_Tag_update(int nargs, VALUE *args, VALUE self) {
   }
   
 fail:
-  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_update'");
+  Ruby_Format_OverloadedError( argc, 3, "Tag.update", 
+    "    flags_t Tag.update(flags_t flags)\n"
+    "    flags_t Tag.update()\n");
+  
   return Qnil;
 }
 
@@ -2214,11 +2496,11 @@ SWIGINTERN VALUE
 _wrap_Tag_strip__SWIG_0(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   flags_t arg2 ;
-  flags_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned int val2 ;
   int ecode2 = 0 ;
+  flags_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2226,12 +2508,12 @@ _wrap_Tag_strip__SWIG_0(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Strip" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Strip", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Strip" "', argument " "2"" of type '" "flags_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "flags_t","Strip", 2, argv[0] ));
   } 
   arg2 = static_cast< flags_t >(val2);
   result = (flags_t)(arg1)->Strip(arg2);
@@ -2245,9 +2527,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Tag_strip__SWIG_1(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-  flags_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  flags_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2255,7 +2537,7 @@ _wrap_Tag_strip__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Strip" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Strip", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   result = (flags_t)(arg1)->Strip();
@@ -2274,7 +2556,7 @@ SWIGINTERN VALUE _wrap_Tag_strip(int nargs, VALUE *args, VALUE self) {
   argc = nargs + 1;
   argv[0] = self;
   if (argc > 3) SWIG_fail;
-  for (ii = 1; (ii < argc); ii++) {
+  for (ii = 1; (ii < argc); ++ii) {
     argv[ii] = args[ii-1];
   }
   if (argc == 1) {
@@ -2303,7 +2585,10 @@ SWIGINTERN VALUE _wrap_Tag_strip(int nargs, VALUE *args, VALUE self) {
   }
   
 fail:
-  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_strip'");
+  Ruby_Format_OverloadedError( argc, 3, "Tag.strip", 
+    "    flags_t Tag.strip(flags_t flags)\n"
+    "    flags_t Tag.strip()\n");
+  
   return Qnil;
 }
 
@@ -2319,7 +2604,7 @@ _wrap_Tag_clear(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Clear" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","Clear", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   (arg1)->Clear();
@@ -2333,11 +2618,11 @@ SWIGINTERN VALUE
 _wrap_Tag_remove_frame(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   ID3_Frame *arg2 = (ID3_Frame *) 0 ;
-  ID3_Frame *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
+  ID3_Frame *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2345,12 +2630,12 @@ _wrap_Tag_remove_frame(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RemoveFrame" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","RemoveFrame", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_ID3_Frame, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "RemoveFrame" "', argument " "2"" of type '" "ID3_Frame const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "ID3_Frame const *","RemoveFrame", 2, argv[0] )); 
   }
   arg2 = reinterpret_cast< ID3_Frame * >(argp2);
   result = (ID3_Frame *)(arg1)->RemoveFrame((ID3_Frame const *)arg2);
@@ -2375,12 +2660,12 @@ _wrap_Tag_add_frame(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AddFrame" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","AddFrame", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_ID3_Frame, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AddFrame" "', argument " "2"" of type '" "ID3_Frame const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "ID3_Frame const *","AddFrame", 2, argv[0] )); 
   }
   arg2 = reinterpret_cast< ID3_Frame * >(argp2);
   (arg1)->AddFrame((ID3_Frame const *)arg2);
@@ -2393,9 +2678,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Tag_get_filename(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2403,7 +2688,7 @@ _wrap_Tag_get_filename(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFileName" "', argument " "1"" of type '" "ID3_Tag const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag const *","GetFileName", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   result = (char *)((ID3_Tag const *)arg1)->GetFileName();
@@ -2418,11 +2703,11 @@ SWIGINTERN VALUE
 _wrap_Tag_set_padding(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   bool arg2 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
+  bool result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2430,12 +2715,12 @@ _wrap_Tag_set_padding(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetPadding" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","SetPadding", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   ecode2 = SWIG_AsVal_bool(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SetPadding" "', argument " "2"" of type '" "bool""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","SetPadding", 2, argv[0] ));
   } 
   arg2 = static_cast< bool >(val2);
   result = (bool)(arg1)->SetPadding(arg2);
@@ -2449,9 +2734,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Tag_size(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2459,7 +2744,7 @@ _wrap_Tag_size(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size" "', argument " "1"" of type '" "ID3_Tag const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag const *","Size", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   result = ((ID3_Tag const *)arg1)->Size();
@@ -2474,11 +2759,11 @@ SWIGINTERN VALUE
 _wrap_Tag_find(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
   ID3_FrameID arg2 ;
-  ID3_Frame *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  ID3_Frame *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2486,12 +2771,12 @@ _wrap_Tag_find(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Find" "', argument " "1"" of type '" "ID3_Tag const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag const *","Find", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Find" "', argument " "2"" of type '" "ID3_FrameID""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "ID3_FrameID","Find", 2, argv[0] ));
   } 
   arg2 = static_cast< ID3_FrameID >(val2);
   result = (ID3_Frame *)((ID3_Tag const *)arg1)->Find(arg2);
@@ -2505,9 +2790,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Tag_create_iterator(int argc, VALUE *argv, VALUE self) {
   ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-  ID3_Tag::Iterator *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  ID3_Tag::Iterator *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2515,7 +2800,7 @@ _wrap_Tag_create_iterator(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CreateIterator" "', argument " "1"" of type '" "ID3_Tag *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag *","CreateIterator", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag * >(argp1);
   result = (ID3_Tag::Iterator *)(arg1)->CreateIterator();
@@ -2526,14 +2811,14 @@ fail:
 }
 
 
-swig_class cTag_Iterator;
+swig_class SwigClassTag_Iterator;
 
 SWIGINTERN VALUE
 _wrap_Tag_Iterator_get_next(int argc, VALUE *argv, VALUE self) {
   ID3_Tag::Iterator *arg1 = (ID3_Tag::Iterator *) 0 ;
-  ID3_Frame *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  ID3_Frame *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2541,7 +2826,7 @@ _wrap_Tag_Iterator_get_next(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Tag__Iterator, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetNext" "', argument " "1"" of type '" "ID3_Tag::Iterator *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Tag::Iterator *","GetNext", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Tag::Iterator * >(argp1);
   result = (ID3_Frame *)(arg1)->GetNext();
@@ -2557,25 +2842,25 @@ free_ID3_Tag_Iterator(ID3_Tag::Iterator *arg1) {
     delete arg1;
 }
 
-swig_class cFrame;
+swig_class SwigClassFrame;
 
 SWIGINTERN VALUE
 _wrap_new_Frame__SWIG_0(int argc, VALUE *argv, VALUE self) {
   ID3_FrameID arg1 ;
-  ID3_Frame *result = 0 ;
   int val1 ;
   int ecode1 = 0 ;
+  ID3_Frame *result = 0 ;
   
   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), "in method '" "ID3_Frame" "', argument " "1"" of type '" "ID3_FrameID""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "ID3_FrameID","ID3_Frame", 1, argv[0] ));
   } 
   arg1 = static_cast< ID3_FrameID >(val1);
-  result = (ID3_Frame *)new ID3_Frame(arg1);DATA_PTR(self) = result;
-  
+  result = (ID3_Frame *)new ID3_Frame(arg1);
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -2606,8 +2891,8 @@ _wrap_new_Frame__SWIG_1(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  result = (ID3_Frame *)new ID3_Frame();DATA_PTR(self) = result;
-  
+  result = (ID3_Frame *)new ID3_Frame();
+  DATA_PTR(self) = result;
   return self;
 fail:
   return Qnil;
@@ -2621,7 +2906,7 @@ SWIGINTERN VALUE _wrap_new_Frame(int nargs, VALUE *args, VALUE self) {
   
   argc = nargs;
   if (argc > 1) SWIG_fail;
-  for (ii = 0; (ii < argc); ii++) {
+  for (ii = 0; (ii < argc); ++ii) {
     argv[ii] = args[ii];
   }
   if (argc == 0) {
@@ -2639,7 +2924,10 @@ SWIGINTERN VALUE _wrap_new_Frame(int nargs, VALUE *args, VALUE self) {
   }
   
 fail:
-  rb_raise(rb_eArgError, "No matching function for overloaded 'new_Frame'");
+  Ruby_Format_OverloadedError( argc, 1, "Frame.new", 
+    "    Frame.new(ID3_FrameID id)\n"
+    "    Frame.new()\n");
+  
   return Qnil;
 }
 
@@ -2653,11 +2941,11 @@ SWIGINTERN VALUE
 _wrap_Frame_get_field(int argc, VALUE *argv, VALUE self) {
   ID3_Frame *arg1 = (ID3_Frame *) 0 ;
   ID3_FieldID arg2 ;
-  ID3_Field *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  ID3_Field *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2665,12 +2953,12 @@ _wrap_Frame_get_field(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Frame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetField" "', argument " "1"" of type '" "ID3_Frame const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Frame const *","GetField", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Frame * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GetField" "', argument " "2"" of type '" "ID3_FieldID""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "ID3_FieldID","GetField", 2, argv[0] ));
   } 
   arg2 = static_cast< ID3_FieldID >(val2);
   result = (ID3_Field *)((ID3_Frame const *)arg1)->GetField(arg2);
@@ -2684,9 +2972,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Frame_get_id(int argc, VALUE *argv, VALUE self) {
   ID3_Frame *arg1 = (ID3_Frame *) 0 ;
-  ID3_FrameID result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  ID3_FrameID result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2694,7 +2982,7 @@ _wrap_Frame_get_id(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Frame, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetID" "', argument " "1"" of type '" "ID3_Frame const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Frame const *","GetID", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Frame * >(argp1);
   result = (ID3_FrameID)((ID3_Frame const *)arg1)->GetID();
@@ -2705,14 +2993,14 @@ fail:
 }
 
 
-swig_class cField;
+swig_class SwigClassField;
 
 SWIGINTERN VALUE
 _wrap_Field_get_type(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  ID3_FieldType result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  ID3_FieldType result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2720,7 +3008,7 @@ _wrap_Field_get_type(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetType" "', argument " "1"" of type '" "ID3_Field const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field const *","GetType", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   result = (ID3_FieldType)((ID3_Field const *)arg1)->GetType();
@@ -2734,9 +3022,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_get_encoding(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  ID3_TextEnc result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  ID3_TextEnc result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2744,7 +3032,7 @@ _wrap_Field_get_encoding(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetEncoding" "', argument " "1"" of type '" "ID3_Field const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field const *","GetEncoding", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   result = (ID3_TextEnc)((ID3_Field const *)arg1)->GetEncoding();
@@ -2758,9 +3046,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_get_integer(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  unsigned long result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  uint32 result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2768,10 +3056,10 @@ _wrap_Field_get_integer(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Get" "', argument " "1"" of type '" "ID3_Field const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field const *","Get", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
-  result = (unsigned long)((ID3_Field const *)arg1)->Get();
+  result = (uint32)((ID3_Field const *)arg1)->Get();
   vresult = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
   return vresult;
 fail:
@@ -2782,9 +3070,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_get_ascii(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  char *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  char *result = 0 ;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2792,7 +3080,7 @@ _wrap_Field_get_ascii(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetRawText" "', argument " "1"" of type '" "ID3_Field const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field const *","GetRawText", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   result = (char *)((ID3_Field const *)arg1)->GetRawText();
@@ -2806,9 +3094,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_get_binary(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  VALUE result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  VALUE result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2816,7 +3104,7 @@ _wrap_Field_get_binary(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_binary" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","get_binary", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   result = (VALUE)ID3_Field_get_binary(arg1);
@@ -2830,9 +3118,9 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_get_unicode(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  VALUE result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  VALUE result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2840,7 +3128,7 @@ _wrap_Field_get_unicode(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "get_unicode" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","get_unicode", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   result = (VALUE)ID3_Field_get_unicode(arg1);
@@ -2855,11 +3143,11 @@ SWIGINTERN VALUE
 _wrap_Field_set_encoding(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
   ID3_TextEnc arg2 ;
-  bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
+  bool result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2867,12 +3155,12 @@ _wrap_Field_set_encoding(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetEncoding" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","SetEncoding", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SetEncoding" "', argument " "2"" of type '" "ID3_TextEnc""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "ID3_TextEnc","SetEncoding", 2, argv[0] ));
   } 
   arg2 = static_cast< ID3_TextEnc >(val2);
   result = (bool)(arg1)->SetEncoding(arg2);
@@ -2886,7 +3174,7 @@ fail:
 SWIGINTERN VALUE
 _wrap_Field_set_integer(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
-  unsigned long arg2 ;
+  uint32 arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   unsigned long val2 ;
@@ -2897,14 +3185,14 @@ _wrap_Field_set_integer(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Set" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","Set", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_long(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Set" "', argument " "2"" of type '" "unsigned long""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "uint32","Set", 2, argv[0] ));
   } 
-  arg2 = static_cast< unsigned long >(val2);
+  arg2 = static_cast< uint32 >(val2);
   (arg1)->Set(arg2);
   return Qnil;
 fail:
@@ -2916,12 +3204,12 @@ SWIGINTERN VALUE
 _wrap_Field_set_ascii(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
   char *arg2 = (char *) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2929,12 +3217,12 @@ _wrap_Field_set_ascii(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Set" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","Set", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Set" "', argument " "2"" of type '" "char const *""'");
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","Set", 2, argv[0] ));
   }
   arg2 = reinterpret_cast< char * >(buf2);
   result = (arg1)->Set((char const *)arg2);
@@ -2951,9 +3239,9 @@ SWIGINTERN VALUE
 _wrap_Field_set_binary(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
   VALUE arg2 = (VALUE) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2961,7 +3249,7 @@ _wrap_Field_set_binary(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_binary" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","set_binary", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   arg2 = argv[0];
@@ -2977,9 +3265,9 @@ SWIGINTERN VALUE
 _wrap_Field_set_unicode(int argc, VALUE *argv, VALUE self) {
   ID3_Field *arg1 = (ID3_Field *) 0 ;
   VALUE arg2 = (VALUE) 0 ;
-  size_t result;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  size_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2987,7 +3275,7 @@ _wrap_Field_set_unicode(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_ID3_Field, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_unicode" "', argument " "1"" of type '" "ID3_Field *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "ID3_Field *","set_unicode", 1, self )); 
   }
   arg1 = reinterpret_cast< ID3_Field * >(argp1);
   arg2 = argv[0];
@@ -3007,7 +3295,9 @@ static swig_type_info _swigt__p_ID3_Frame = {"_p_ID3_Frame", "ID3_Frame *", 0, 0
 static swig_type_info _swigt__p_ID3_Tag = {"_p_ID3_Tag", "ID3_Tag *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_ID3_Tag__Iterator = {"_p_ID3_Tag__Iterator", "ID3_Tag::Iterator *", 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_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 *|flags_t *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "uint32 *|unsigned long *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ID3_Field,
@@ -3015,7 +3305,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ID3_Tag,
   &_swigt__p_ID3_Tag__Iterator,
   &_swigt__p_char,
+  &_swigt__p_unsigned_char,
   &_swigt__p_unsigned_int,
+  &_swigt__p_unsigned_long,
 };
 
 static swig_cast_info _swigc__p_ID3_Field[] = {  {&_swigt__p_ID3_Field, 0, 0, 0},{0, 0, 0, 0}};
@@ -3023,7 +3315,9 @@ static swig_cast_info _swigc__p_ID3_Frame[] = {  {&_swigt__p_ID3_Frame, 0, 0, 0}
 static swig_cast_info _swigc__p_ID3_Tag[] = {  {&_swigt__p_ID3_Tag, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_ID3_Tag__Iterator[] = {  {&_swigt__p_ID3_Tag__Iterator, 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_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}};
+static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ID3_Field,
@@ -3031,7 +3325,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_ID3_Tag,
   _swigc__p_ID3_Tag__Iterator,
   _swigc__p_char,
+  _swigc__p_unsigned_char,
   _swigc__p_unsigned_int,
+  _swigc__p_unsigned_long,
 };
 
 
@@ -3094,7 +3390,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found;
+  int found, init;
 
   clientdata = clientdata;
 
@@ -3104,6 +3400,9 @@ SWIG_InitializeModule(void *clientdata) {
     swig_module.type_initial = swig_type_initial;
     swig_module.cast_initial = swig_cast_initial;
     swig_module.next = &swig_module;
+    init = 1;
+  } else {
+    init = 0;
   }
 
   /* Try and load any already created modules */
@@ -3132,6 +3431,12 @@ SWIG_InitializeModule(void *clientdata) {
     module_head->next = &swig_module;
   }
 
+  /* When multiple interpeters are used, a module could have already been initialized in
+     a different interpreter, but not yet have a pointer in this interpreter.
+     In this case, we do not want to continue adding types... everything should be
+     set up already */
+  if (init == 0) return;
+
   /* Now work on filling in swig_module.types */
 #ifdef SWIGRUNTIME_DEBUG
   printf("SWIG_InitializeModule: size %d\n", swig_module.size);
@@ -3265,7 +3570,9 @@ SWIG_PropagateClientData(void) {
 }
 #endif
 
+/*
 
+*/
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -3283,59 +3590,59 @@ SWIGEXPORT void Init_id3lib_api(void) {
   
   SWIG_RubyInitializeTrackings();
   
-  cTag.klass = rb_define_class_under(mAPI, "Tag", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_ID3_Tag, (void *) &cTag);
-  rb_define_alloc_func(cTag.klass, _wrap_Tag_allocate);
-  rb_define_method(cTag.klass, "initialize", VALUEFUNC(_wrap_new_Tag), -1);
-  rb_define_method(cTag.klass, "has_tag_type", VALUEFUNC(_wrap_Tag_has_tag_type), -1);
-  rb_define_method(cTag.klass, "link", VALUEFUNC(_wrap_Tag_link), -1);
-  rb_define_method(cTag.klass, "update", VALUEFUNC(_wrap_Tag_update), -1);
-  rb_define_method(cTag.klass, "strip", VALUEFUNC(_wrap_Tag_strip), -1);
-  rb_define_method(cTag.klass, "clear", VALUEFUNC(_wrap_Tag_clear), -1);
-  rb_define_method(cTag.klass, "remove_frame", VALUEFUNC(_wrap_Tag_remove_frame), -1);
-  rb_define_method(cTag.klass, "add_frame", VALUEFUNC(_wrap_Tag_add_frame), -1);
-  rb_define_method(cTag.klass, "get_filename", VALUEFUNC(_wrap_Tag_get_filename), -1);
-  rb_define_method(cTag.klass, "set_padding", VALUEFUNC(_wrap_Tag_set_padding), -1);
-  rb_define_method(cTag.klass, "size", VALUEFUNC(_wrap_Tag_size), -1);
-  rb_define_method(cTag.klass, "find", VALUEFUNC(_wrap_Tag_find), -1);
-  rb_define_method(cTag.klass, "create_iterator", VALUEFUNC(_wrap_Tag_create_iterator), -1);
-  cTag.mark = 0;
-  cTag.destroy = (void (*)(void *)) free_ID3_Tag;
-  cTag.trackObjects = 0;
-  
-  cTag_Iterator.klass = rb_define_class_under(mAPI, "Tag_Iterator", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_ID3_Tag__Iterator, (void *) &cTag_Iterator);
-  rb_undef_alloc_func(cTag_Iterator.klass);
-  rb_define_method(cTag_Iterator.klass, "get_next", VALUEFUNC(_wrap_Tag_Iterator_get_next), -1);
-  cTag_Iterator.mark = 0;
-  cTag_Iterator.destroy = (void (*)(void *)) free_ID3_Tag_Iterator;
-  cTag_Iterator.trackObjects = 0;
-  
-  cFrame.klass = rb_define_class_under(mAPI, "Frame", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_ID3_Frame, (void *) &cFrame);
-  rb_define_alloc_func(cFrame.klass, _wrap_Frame_allocate);
-  rb_define_method(cFrame.klass, "initialize", VALUEFUNC(_wrap_new_Frame), -1);
-  rb_define_method(cFrame.klass, "get_field", VALUEFUNC(_wrap_Frame_get_field), -1);
-  rb_define_method(cFrame.klass, "get_id", VALUEFUNC(_wrap_Frame_get_id), -1);
-  cFrame.mark = 0;
-  cFrame.destroy = (void (*)(void *)) free_ID3_Frame;
-  cFrame.trackObjects = 0;
-  
-  cField.klass = rb_define_class_under(mAPI, "Field", rb_cObject);
-  SWIG_TypeClientData(SWIGTYPE_p_ID3_Field, (void *) &cField);
-  rb_undef_alloc_func(cField.klass);
-  rb_define_method(cField.klass, "get_type", VALUEFUNC(_wrap_Field_get_type), -1);
-  rb_define_method(cField.klass, "get_encoding", VALUEFUNC(_wrap_Field_get_encoding), -1);
-  rb_define_method(cField.klass, "get_integer", VALUEFUNC(_wrap_Field_get_integer), -1);
-  rb_define_method(cField.klass, "get_ascii", VALUEFUNC(_wrap_Field_get_ascii), -1);
-  rb_define_method(cField.klass, "get_binary", VALUEFUNC(_wrap_Field_get_binary), -1);
-  rb_define_method(cField.klass, "get_unicode", VALUEFUNC(_wrap_Field_get_unicode), -1);
-  rb_define_method(cField.klass, "set_encoding", VALUEFUNC(_wrap_Field_set_encoding), -1);
-  rb_define_method(cField.klass, "set_integer", VALUEFUNC(_wrap_Field_set_integer), -1);
-  rb_define_method(cField.klass, "set_ascii", VALUEFUNC(_wrap_Field_set_ascii), -1);
-  rb_define_method(cField.klass, "set_binary", VALUEFUNC(_wrap_Field_set_binary), -1);
-  rb_define_method(cField.klass, "set_unicode", VALUEFUNC(_wrap_Field_set_unicode), -1);
-  cField.mark = 0;
-  cField.trackObjects = 0;
+  SwigClassTag.klass = rb_define_class_under(mAPI, "Tag", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_ID3_Tag, (void *) &SwigClassTag);
+  rb_define_alloc_func(SwigClassTag.klass, _wrap_Tag_allocate);
+  rb_define_method(SwigClassTag.klass, "initialize", VALUEFUNC(_wrap_new_Tag), -1);
+  rb_define_method(SwigClassTag.klass, "has_tag_type", VALUEFUNC(_wrap_Tag_has_tag_type), -1);
+  rb_define_method(SwigClassTag.klass, "link", VALUEFUNC(_wrap_Tag_link), -1);
+  rb_define_method(SwigClassTag.klass, "update", VALUEFUNC(_wrap_Tag_update), -1);
+  rb_define_method(SwigClassTag.klass, "strip", VALUEFUNC(_wrap_Tag_strip), -1);
+  rb_define_method(SwigClassTag.klass, "clear", VALUEFUNC(_wrap_Tag_clear), -1);
+  rb_define_method(SwigClassTag.klass, "remove_frame", VALUEFUNC(_wrap_Tag_remove_frame), -1);
+  rb_define_method(SwigClassTag.klass, "add_frame", VALUEFUNC(_wrap_Tag_add_frame), -1);
+  rb_define_method(SwigClassTag.klass, "get_filename", VALUEFUNC(_wrap_Tag_get_filename), -1);
+  rb_define_method(SwigClassTag.klass, "set_padding", VALUEFUNC(_wrap_Tag_set_padding), -1);
+  rb_define_method(SwigClassTag.klass, "size", VALUEFUNC(_wrap_Tag_size), -1);
+  rb_define_method(SwigClassTag.klass, "find", VALUEFUNC(_wrap_Tag_find), -1);
+  rb_define_method(SwigClassTag.klass, "create_iterator", VALUEFUNC(_wrap_Tag_create_iterator), -1);
+  SwigClassTag.mark = 0;
+  SwigClassTag.destroy = (void (*)(void *)) free_ID3_Tag;
+  SwigClassTag.trackObjects = 0;
+  
+  SwigClassTag_Iterator.klass = rb_define_class_under(mAPI, "Tag_Iterator", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_ID3_Tag__Iterator, (void *) &SwigClassTag_Iterator);
+  rb_undef_alloc_func(SwigClassTag_Iterator.klass);
+  rb_define_method(SwigClassTag_Iterator.klass, "get_next", VALUEFUNC(_wrap_Tag_Iterator_get_next), -1);
+  SwigClassTag_Iterator.mark = 0;
+  SwigClassTag_Iterator.destroy = (void (*)(void *)) free_ID3_Tag_Iterator;
+  SwigClassTag_Iterator.trackObjects = 0;
+  
+  SwigClassFrame.klass = rb_define_class_under(mAPI, "Frame", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_ID3_Frame, (void *) &SwigClassFrame);
+  rb_define_alloc_func(SwigClassFrame.klass, _wrap_Frame_allocate);
+  rb_define_method(SwigClassFrame.klass, "initialize", VALUEFUNC(_wrap_new_Frame), -1);
+  rb_define_method(SwigClassFrame.klass, "get_field", VALUEFUNC(_wrap_Frame_get_field), -1);
+  rb_define_method(SwigClassFrame.klass, "get_id", VALUEFUNC(_wrap_Frame_get_id), -1);
+  SwigClassFrame.mark = 0;
+  SwigClassFrame.destroy = (void (*)(void *)) free_ID3_Frame;
+  SwigClassFrame.trackObjects = 0;
+  
+  SwigClassField.klass = rb_define_class_under(mAPI, "Field", rb_cObject);
+  SWIG_TypeClientData(SWIGTYPE_p_ID3_Field, (void *) &SwigClassField);
+  rb_undef_alloc_func(SwigClassField.klass);
+  rb_define_method(SwigClassField.klass, "get_type", VALUEFUNC(_wrap_Field_get_type), -1);
+  rb_define_method(SwigClassField.klass, "get_encoding", VALUEFUNC(_wrap_Field_get_encoding), -1);
+  rb_define_method(SwigClassField.klass, "get_integer", VALUEFUNC(_wrap_Field_get_integer), -1);
+  rb_define_method(SwigClassField.klass, "get_ascii", VALUEFUNC(_wrap_Field_get_ascii), -1);
+  rb_define_method(SwigClassField.klass, "get_binary", VALUEFUNC(_wrap_Field_get_binary), -1);
+  rb_define_method(SwigClassField.klass, "get_unicode", VALUEFUNC(_wrap_Field_get_unicode), -1);
+  rb_define_method(SwigClassField.klass, "set_encoding", VALUEFUNC(_wrap_Field_set_encoding), -1);
+  rb_define_method(SwigClassField.klass, "set_integer", VALUEFUNC(_wrap_Field_set_integer), -1);
+  rb_define_method(SwigClassField.klass, "set_ascii", VALUEFUNC(_wrap_Field_set_ascii), -1);
+  rb_define_method(SwigClassField.klass, "set_binary", VALUEFUNC(_wrap_Field_set_binary), -1);
+  rb_define_method(SwigClassField.klass, "set_unicode", VALUEFUNC(_wrap_Field_set_unicode), -1);
+  SwigClassField.mark = 0;
+  SwigClassField.trackObjects = 0;
 }