RubyGems - id3lib-ruby - Versions diffs - 0.3.0 → 0.3.1 - Mend

id3lib-ruby 0.3.0 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

data/CHANGES CHANGED

@@ -1,5 +1,10 @@
 = id3lib-ruby changes
+=== 0.3.1 (r32)
+* Added check and messages for -lstdc++ and -lz to extconf.rb.
+* Updated to SWIG 1.3.29.
 === 0.3.0 (r29)
 * Added generation of mswin32 binary gem. This means that

data/Rakefile CHANGED

@@ -10,7 +10,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.3.1'
 PKG_COMMON = FileList[
   'lib/**/*.rb',

data/ext/extconf.rb CHANGED

@@ -1,7 +1,20 @@
 require 'mkmf'
-if have_header('id3.h') and have_library('id3', 'ID3Tag_New')
-  create_makefile('id3lib_api')
-else
-  message "You must have id3lib installed in order to use id3lib-ruby!\n"
+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
+unless have_header('id3.h') and have_library('id3', 'ID3Tag_New')
+  error "You must have id3lib installed in order to use id3lib-ruby."
+end
+create_makefile('id3lib_api')

data/ext/id3lib_api_wrap.cxx CHANGED

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.25
+ * Version 1.3.29
  *
  * 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
@@ -8,6 +8,7 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
+#define SWIGRUBY
 #ifdef __cplusplus
 template<class T> class SwigValueWrapper {
@@ -25,20 +26,22 @@ private:
 };
 #endif
-/***********************************************************************
- *
+/* -----------------------------------------------------------------------------
  *  This section contains generic SWIG labels for method/variable
  *  declarations/attributes, and other compiler dependent labels.
- *
- ************************************************************************/
+ * ----------------------------------------------------------------------------- */
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
-#  if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
-#    define SWIGTEMPLATEDISAMBIGUATOR template
-#  else
-#    define SWIGTEMPLATEDISAMBIGUATOR
-#  endif
+# if defined(__SUNPRO_CC)
+#   if (__SUNPRO_CC <= 0x560)
+#     define SWIGTEMPLATEDISAMBIGUATOR template
+#   else
+#     define SWIGTEMPLATEDISAMBIGUATOR
+#   endif
+# else
+#   define SWIGTEMPLATEDISAMBIGUATOR
+# endif
 #endif
 /* inline attribute */
@@ -52,13 +55,27 @@ private:
 /* attribute recognised by some compilers to avoid 'unused' warnings */
 #ifndef SWIGUNUSED
-# if defined(__GNUC__) || defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((unused))
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
 #   define SWIGUNUSED
 # endif
 #endif
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
 /* internal SWIG method */
 #ifndef SWIGINTERN
 # define SWIGINTERN static SWIGUNUSED
@@ -69,7 +86,13 @@ private:
 # define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 #endif
-/* exporting methods for Windows DLLs */
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
+#  endif
+#endif
 #ifndef SWIGEXPORT
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(STATIC_LINKED)
@@ -78,7 +101,11 @@ private:
 #     define SWIGEXPORT __declspec(dllexport)
 #   endif
 # else
-#   define SWIGEXPORT
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
 # endif
 #endif
@@ -91,130 +118,114 @@ private:
 # endif
 #endif
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
-/* ruby.swg */
-/* Implementation : RUBY */
-#define SWIGRUBY 1
-#include "ruby.h"
-/* Flags for pointer conversion */
-#define SWIG_POINTER_EXCEPTION     0x1
-#define SWIG_POINTER_DISOWN        0x2
-#define NUM2USHRT(n) (\
-    (0 <= NUM2UINT(n) && NUM2UINT(n) <= USHRT_MAX)\
-    ? (unsigned short) NUM2UINT(n) \
-    : (rb_raise(rb_eArgError, "integer %d out of range of `unsigned short'",\
-               NUM2UINT(n)), (short)0)\
-)
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
-#define NUM2SHRT(n) (\
-    (SHRT_MIN <= NUM2INT(n) && NUM2INT(n) <= SHRT_MAX)\
-    ? (short)NUM2INT(n)\
-    : (rb_raise(rb_eArgError, "integer %d out of range of `short'",\
-               NUM2INT(n)), (short)0)\
-)
+/* 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
+# else
+#   define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
-/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
-#ifndef NUM2LL
-#define NUM2LL(x) NUM2LONG((x))
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
 #endif
-#ifndef LL2NUM
-#define LL2NUM(x) INT2NUM((long) (x))
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
 #endif
-#ifndef ULL2NUM
-#define ULL2NUM(x) UINT2NUM((unsigned long) (x))
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
 #endif
-/* Ruby 1.7 doesn't (yet) define NUM2ULL() */
-#ifndef NUM2ULL
-#ifdef HAVE_LONG_LONG
-#define NUM2ULL(x) rb_num2ull((x))
-#else
-#define NUM2ULL(x) NUM2ULONG(x)
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
 #endif
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 #endif
-/*
- * Need to be very careful about how these macros are defined, especially
- * when compiling C++ code or C code with an ANSI C compiler.
- *
- * VALUEFUNC(f) is a macro used to typecast a C function that implements
- * a Ruby method so that it can be passed as an argument to API functions
- * like rb_define_method() and rb_define_singleton_method().
- *
- * VOIDFUNC(f) is a macro used to typecast a C function that implements
- * either the "mark" or "free" stuff for a Ruby Data object, so that it
- * can be passed as an argument to API functions like Data_Wrap_Struct()
- * and Data_Make_Struct().
- */
-#ifdef __cplusplus
-#  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
-#    define PROTECTFUNC(f) ((VALUE (*)()) f)
-#    define VALUEFUNC(f) ((VALUE (*)()) f)
-#    define VOIDFUNC(f)  ((void (*)()) f)
-#  else
-#    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
-#      define PROTECTFUNC(f) ((VALUE (*)()) f)
-#      define VALUEFUNC(f) ((VALUE (*)()) f)
-#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    else /* These definitions should work for Ruby 1.7+ */
-#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
-#      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
-#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
-#    endif
+/* exporting methods */
+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#  ifndef GCC_HASCLASSVISIBILITY
+#    define GCC_HASCLASSVISIBILITY
 #  endif
-#else
-#  define VALUEFUNC(f) (f)
-#  define VOIDFUNC(f) (f)
 #endif
-typedef struct {
-  VALUE klass;
-  VALUE mImpl;
-  void  (*mark)(void *);
-  void  (*destroy)(void *);
-} swig_class;
-/* Don't use for expressions have side effect */
-#ifndef RB_STRING_VALUE
-#define RB_STRING_VALUE(s) (TYPE(s) == T_STRING ? (s) : (*(volatile VALUE *)&(s) = rb_str_to_str(s)))
-#endif
-#ifndef StringValue
-#define StringValue(s) RB_STRING_VALUE(s)
-#endif
-#ifndef StringValuePtr
-#define StringValuePtr(s) RSTRING(RB_STRING_VALUE(s))->ptr
-#endif
-#ifndef StringValueLen
-#define StringValueLen(s) RSTRING(RB_STRING_VALUE(s))->len
-#endif
-#ifndef SafeStringValue
-#define SafeStringValue(v) do {\
-    StringValue(v);\
-    rb_check_safe_str(v);\
-} while (0)
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
 #endif
-#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-#define rb_define_alloc_func(klass, func) rb_define_singleton_method((klass), "new", VALUEFUNC((func)), -1)
-#define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
 #endif
-/* Contract support */
-#define SWIG_contract_assert(expr, msg) if (!(expr)) { rb_raise(rb_eRuntimeError, (char *) msg ); } else
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
-/***********************************************************************
+/* -----------------------------------------------------------------------------
  * swigrun.swg
  *
- *     This file contains generic CAPI SWIG runtime support for pointer
- *     type checking.
- *
- ************************************************************************/
+ * This file contains generic CAPI 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 */
@@ -246,6 +257,147 @@ typedef struct {
 # define SWIGRUNTIMEINLINE SWIGRUNTIME SWIGINLINE
 #endif
+/*  Generic buffer size */
+#ifndef SWIG_BUFFER_SIZE
+# define SWIG_BUFFER_SIZE 1024
+#endif
+/* Flags for pointer conversions */
+#define SWIG_POINTER_DISOWN        0x1
+/* Flags for new pointer objects */
+#define SWIG_POINTER_OWN           0x1
+/*
+   Flags/methods for returning states.
+   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:
+     if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
+       // success code
+     } else {
+       //fail code
+     }
+   Now you can be more explicit as:
+    int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+    } else {
+      // fail code
+    }
+   that seems to be the same, but now you can also do
+    Type *ptr;
+    int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
+    if (SWIG_IsOK(res)) {
+      // success code
+      if (SWIG_IsNewObj(res) {
+        ...
+	delete *ptr;
+      } else {
+        ...
+      }
+    } else {
+      // fail code
+    }
+   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
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
+      }
+   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.
+   Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
+   allows to return the 'cast rank', for example, if you have this
+       int food(double)
+       int fooi(int);
+   and you call
+      food(1)   // cast rank '1'  (1 -> 1.0)
+      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)
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
+/* The CastRankLimit says how many bits are used for the cast rank */
+#define SWIG_CASTRANKLIMIT         (1 << 8)
+/* The NewMask denotes the object was created (using new/malloc) */
+#define SWIG_NEWOBJMASK            (SWIG_CASTRANKLIMIT  << 1)
+/* The TmpMask is for in/out typemaps that use temporal objects */
+#define SWIG_TMPOBJMASK            (SWIG_NEWOBJMASK << 1)
+/* Simple returning values */
+#define SWIG_BADOBJ                (SWIG_ERROR)
+#define SWIG_OLDOBJ                (SWIG_OK)
+#define SWIG_NEWOBJ                (SWIG_OK | SWIG_NEWOBJMASK)
+#define SWIG_TMPOBJ                (SWIG_OK | SWIG_TMPOBJMASK)
+/* Check, add and del mask methods */
+#define SWIG_AddNewMask(r)         (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r)
+#define SWIG_DelNewMask(r)         (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r)
+#define SWIG_IsNewObj(r)           (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK))
+#define SWIG_AddTmpMask(r)         (SWIG_IsOK(r) ? (r | SWIG_TMPOBJMASK) : r)
+#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
+#    define SWIG_TypeRank             unsigned long
+#  endif
+#  ifndef SWIG_MAXCASTRANK            /* Default cast allowed */
+#    define SWIG_MAXCASTRANK          (2)
+#  endif
+#  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
+#  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
+  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
+}
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
+}
+#else /* no cast-rank mode */
+#  define SWIG_AddCast
+#  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
+#endif
 #include <string.h>
 #ifdef __cplusplus
@@ -262,6 +414,7 @@ typedef struct swig_type_info {
   swig_dycast_func        dcast;		/* dynamic cast function down a hierarchy */
   struct swig_cast_info  *cast;			/* linked list of types that can cast into this type */
   void                   *clientdata;		/* language specific type data */
+  int                    owndata;		/* flag if the structure owns the clientdata */
 } swig_type_info;
 /* Structure to store a type and conversion function used for casting */
@@ -284,7 +437,6 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 /*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
@@ -298,7 +450,7 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
   for (;(f1 != l1) && (f2 != l2); ++f1, ++f2) {
     while ((*f1 == ' ') && (f1 != l1)) ++f1;
     while ((*f2 == ' ') && (f2 != l2)) ++f2;
-    if (*f1 != *f2) return (int)(*f1 - *f2);
+    if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
   }
   return (l1 - f1) - (l2 - f2);
 }
@@ -418,6 +570,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
      type, separated by vertical-bar characters.  We choose
      to print the last name, as it is often (?) the most
      specific. */
+  if (!type) return NULL;
   if (type->str != NULL) {
     const char *last_name = type->str;
     const char *s;
@@ -434,19 +587,26 @@ SWIG_TypePrettyName(const swig_type_info *type) {
 */
 SWIGRUNTIME void
 SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
-  if (!ti->clientdata) {
-    swig_cast_info *cast = ti->cast;
-    /* if (ti->clientdata == clientdata) return; */
-    ti->clientdata = clientdata;
-    while (cast) {
-      if (!cast->converter)
-	SWIG_TypeClientData(cast->type, clientdata);
-      cast = cast->next;
-    }
+  swig_cast_info *cast = ti->cast;
+  /* if (ti->clientdata == clientdata) return; */
+  ti->clientdata = clientdata;
+  while (cast) {
+    if (!cast->converter) {
+      swig_type_info *tc = cast->type;
+      if (!tc->clientdata) {
+	SWIG_TypeClientData(tc, clientdata);
+      }
+    }
+    cast = cast->next;
   }
 }
+SWIGRUNTIME void
+SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
+  SWIG_TypeClientData(ti, clientdata);
+  ti->owndata = 1;
+}
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
@@ -526,7 +686,6 @@ SWIG_TypeQueryModule(swig_module_info *start,
   return 0;
 }
 /*
    Pack binary data into a string
 */
@@ -552,7 +711,7 @@ SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
   register const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
     register char d = *(c++);
-    register unsigned char uu = 0;
+    register unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
@@ -630,175 +789,663 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 }
 #endif
-/* Common SWIG API */
-#define SWIG_ConvertPtr(obj, pp, type, flags) \
-  SWIG_Ruby_ConvertPtr(obj, pp, type, flags)
-#define SWIG_NewPointerObj(p, type, flags) \
-  SWIG_Ruby_NewPointerObj(p, type, flags)
-#define SWIG_MustGetPtr(p, type, argnum, flags) \
-  SWIG_Ruby_MustGetPtr(p, type, argnum, flags)
-#define SWIG_GetModule(clientdata) \
-  SWIG_Ruby_GetModule()
-#define SWIG_SetModule(clientdata, pointer) \
-  SWIG_Ruby_SetModule(pointer)
-/* Ruby-specific SWIG API */
-#define SWIG_InitRuntime() \
-  SWIG_Ruby_InitRuntime()
-#define SWIG_define_class(ty) \
-  SWIG_Ruby_define_class(ty)
-#define SWIG_NewClassInstance(value, ty) \
-  SWIG_Ruby_NewClassInstance(value, ty)
-#define SWIG_MangleStr(value) \
-  SWIG_Ruby_MangleStr(value)
-#define SWIG_CheckConvert(value, ty) \
-  SWIG_Ruby_CheckConvert(value, ty)
-#define SWIG_NewPackedObj(ptr, sz, ty) \
-  SWIG_Ruby_NewPackedObj(ptr, sz, ty)
-#define SWIG_ConvertPacked(obj, ptr, sz, ty, flags) \
-  SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags)
-/* rubydef.swg */
-#ifdef __cplusplus
-extern "C" {
-#endif
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
-static VALUE _mSWIG = Qnil;
-static VALUE _cSWIG_Pointer = Qnil;
-static VALUE swig_runtime_data_type_pointer = Qnil;
-/* Initialize Ruby runtime support */
-static void
-SWIG_Ruby_InitRuntime(void)
-{
-    if (_mSWIG == Qnil) {
-        _mSWIG = rb_define_module("SWIG");
-    }
-}
-/* Define Ruby class for C type */
-static void
-SWIG_Ruby_define_class(swig_type_info *type)
-{
-    VALUE klass;
-    char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-    sprintf(klass_name, "TYPE%s", type->name);
-    if (NIL_P(_cSWIG_Pointer)) {
-	_cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
-	rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
-    }
-    klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
-    free((void *) klass_name);
-}
+#include <ruby.h>
-/* Create a new pointer object */
-static VALUE
-SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int own)
-{
-    char *klass_name;
-    swig_class *sklass;
-    VALUE klass;
-    VALUE obj;
-    if (!ptr)
-	return Qnil;
-    if (type->clientdata) {
-      sklass = (swig_class *) type->clientdata;
-      obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr);
-    } else {
-      klass_name = (char *) malloc(4 + strlen(type->name) + 1);
-      sprintf(klass_name, "TYPE%s", type->name);
-      klass = rb_const_get(_mSWIG, rb_intern(klass_name));
-      free((void *) klass_name);
-      obj = Data_Wrap_Struct(klass, 0, 0, ptr);
-    }
-    rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
-    return obj;
-}
+/* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
+#ifndef NUM2LL
+#define NUM2LL(x) NUM2LONG((x))
+#endif
+#ifndef LL2NUM
+#define LL2NUM(x) INT2NUM((long) (x))
+#endif
+#ifndef ULL2NUM
+#define ULL2NUM(x) UINT2NUM((unsigned long) (x))
+#endif
-/* Create a new class instance (always owned) */
-static VALUE
-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));
-    return obj;
-}
+/* Ruby 1.7 doesn't (yet) define NUM2ULL() */
+#ifndef NUM2ULL
+#ifdef HAVE_LONG_LONG
+#define NUM2ULL(x) rb_num2ull((x))
+#else
+#define NUM2ULL(x) NUM2ULONG(x)
+#endif
+#endif
-/* Get type mangle from class name */
-static SWIGINLINE char *
-SWIG_Ruby_MangleStr(VALUE obj)
-{
-  VALUE stype = rb_iv_get(obj, "__swigtype__");
-  return StringValuePtr(stype);
+/*
+ * Need to be very careful about how these macros are defined, especially
+ * when compiling C++ code or C code with an ANSI C compiler.
+ *
+ * VALUEFUNC(f) is a macro used to typecast a C function that implements
+ * a Ruby method so that it can be passed as an argument to API functions
+ * like rb_define_method() and rb_define_singleton_method().
+ *
+ * VOIDFUNC(f) is a macro used to typecast a C function that implements
+ * either the "mark" or "free" stuff for a Ruby Data object, so that it
+ * can be passed as an argument to API functions like Data_Wrap_Struct()
+ * and Data_Make_Struct().
+ */
+#ifdef __cplusplus
+#  ifndef RUBY_METHOD_FUNC /* These definitions should work for Ruby 1.4.6 */
+#    define PROTECTFUNC(f) ((VALUE (*)()) f)
+#    define VALUEFUNC(f) ((VALUE (*)()) f)
+#    define VOIDFUNC(f)  ((void (*)()) f)
+#  else
+#    ifndef ANYARGS /* These definitions should work for Ruby 1.6 */
+#      define PROTECTFUNC(f) ((VALUE (*)()) f)
+#      define VALUEFUNC(f) ((VALUE (*)()) f)
+#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
+#    else /* These definitions should work for Ruby 1.7+ */
+#      define PROTECTFUNC(f) ((VALUE (*)(VALUE)) f)
+#      define VALUEFUNC(f) ((VALUE (*)(ANYARGS)) f)
+#      define VOIDFUNC(f)  ((RUBY_DATA_FUNC) f)
+#    endif
+#  endif
+#else
+#  define VALUEFUNC(f) (f)
+#  define VOIDFUNC(f) (f)
+#endif
+/* Don't use for expressions have side effect */
+#ifndef RB_STRING_VALUE
+#define RB_STRING_VALUE(s) (TYPE(s) == T_STRING ? (s) : (*(volatile VALUE *)&(s) = rb_str_to_str(s)))
+#endif
+#ifndef StringValue
+#define StringValue(s) RB_STRING_VALUE(s)
+#endif
+#ifndef StringValuePtr
+#define StringValuePtr(s) RSTRING(RB_STRING_VALUE(s))->ptr
+#endif
+#ifndef StringValueLen
+#define StringValueLen(s) RSTRING(RB_STRING_VALUE(s))->len
+#endif
+#ifndef SafeStringValue
+#define SafeStringValue(v) do {\
+    StringValue(v);\
+    rb_check_safe_str(v);\
+} while (0)
+#endif
+#ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+#define rb_define_alloc_func(klass, func) rb_define_singleton_method((klass), "new", VALUEFUNC((func)), -1)
+#define rb_undef_alloc_func(klass) rb_undef_method(CLASS_OF((klass)), "new")
+#endif
+/* -----------------------------------------------------------------------------
+ * error manipulation
+ * ----------------------------------------------------------------------------- */
+/* Define some additional error types */
+#define SWIG_ObjectPreviouslyDeletedError  -100
+/* Define custom exceptions for errors that do not map to existing Ruby
+   exceptions.  Note this only works for C++ since a global cannot be
+   initialized by a funtion in C.  For C, fallback to rb_eRuntimeError.*/
+SWIGINTERN VALUE
+getNullReferenceError(void) {
+  static int init = 0;
+  static VALUE rb_eNullReferenceError ;
+  if (!init) {
+    init = 1;
+    rb_eNullReferenceError = rb_define_class("NullReferenceError", rb_eRuntimeError);
+  }
+  return rb_eNullReferenceError;
+}
+SWIGINTERN VALUE
+getObjectPreviouslyDeletedError(void) {
+  static int init = 0;
+  static VALUE rb_eObjectPreviouslyDeleted ;
+  if (!init) {
+    init = 1;
+    rb_eObjectPreviouslyDeleted = rb_define_class("ObjectPreviouslyDeleted", rb_eRuntimeError);
+  }
+  return rb_eObjectPreviouslyDeleted;
+}
+SWIGINTERN VALUE
+SWIG_Ruby_ErrorType(int SWIG_code) {
+  VALUE type;
+  switch (SWIG_code) {
+  case SWIG_MemoryError:
+    type = rb_eNoMemError;
+    break;
+  case SWIG_IOError:
+    type = rb_eIOError;
+    break;
+  case SWIG_RuntimeError:
+    type = rb_eRuntimeError;
+    break;
+  case SWIG_IndexError:
+    type = rb_eIndexError;
+    break;
+  case SWIG_TypeError:
+    type = rb_eTypeError;
+    break;
+  case SWIG_DivisionByZero:
+    type = rb_eZeroDivError;
+    break;
+  case SWIG_OverflowError:
+    type = rb_eRangeError;
+    break;
+  case SWIG_SyntaxError:
+    type = rb_eSyntaxError;
+    break;
+  case SWIG_ValueError:
+    type = rb_eArgError;
+    break;
+  case SWIG_SystemError:
+    type = rb_eFatal;
+    break;
+  case SWIG_AttributeError:
+    type = rb_eRuntimeError;
+    break;
+  case SWIG_NullReferenceError:
+    type = getNullReferenceError();
+    break;
+  case SWIG_ObjectPreviouslyDeletedError:
+    type = getObjectPreviouslyDeletedError();
+    break;
+  case SWIG_UnknownError:
+    type = rb_eRuntimeError;
+    break;
+  default:
+    type = rb_eRuntimeError;
+  }
+  return type;
+}
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * rubytracking.swg
+ *
+ * This file contains support for tracking mappings from
+ * Ruby objects to C++ objects.  This functionality is needed
+ * to implement mark functions for Ruby's mark and sweep
+ * garbage collector.
+ * ----------------------------------------------------------------------------- */
+#ifdef __cplusplus
+extern "C" {
+#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;
+/* 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");
+}
+/* Get a Ruby number to reference a pointer */
+SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
+  /* We cast the pointer to an unsigned long
+     and then store a reference to it using
+     a Ruby number object. */
+  /* Convert the pointer to a Ruby number */
+  unsigned long value = (unsigned long) ptr;
+  return LONG2NUM(value);
+}
+/* Get a Ruby number to reference an object */
+SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
+  /* We cast the object to an unsigned long
+     and then store a reference to it using
+     a Ruby number object. */
+  /* Convert the Object to a Ruby number */
+  unsigned long value = (unsigned long) object;
+  return LONG2NUM(value);
+}
+/* Get a Ruby object from a previously stored reference */
+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;
+}
+/* Add a Tracking from a C/C++ struct to a Ruby object */
+SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
+  /* In a Ruby hash table we store the pointer and
+     the associated Ruby object.  The trick here is
+     that we cannot store the Ruby object directly - if
+     we do then it cannot be garbage collected.  So
+     instead we typecast it as a unsigned long and
+     convert it to a Ruby number object.*/
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+  /* Get a reference to the Ruby object as a Ruby number */
+  VALUE value = SWIG_RubyObjectToReference(object);
+  /* Store the mapping to the global hash table. */
+  rb_hash_aset(swig_ruby_trackings, key, value);
+}
+/* Get the Ruby object that owns the specified C/C++ struct */
+SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+  /* Now lookup the value stored in the global hash table */
+  VALUE value = rb_hash_aref(swig_ruby_trackings, key);
+  if (value == Qnil) {
+    /* No object exists - return nil. */
+    return Qnil;
+  }
+  else {
+    /* Convert this value to Ruby object */
+    return SWIG_RubyReferenceToObject(value);
+  }
+}
+/* Remove a Tracking from a C/C++ struct to a Ruby object.  It
+   is very important to remove objects once they are destroyed
+   since the same memory address may be reused later to create
+   a new object. */
+SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
+  /* Get a reference to the pointer as a Ruby number */
+  VALUE key = SWIG_RubyPtrToReference(ptr);
+  /* Delete the object from the hash table by calling Ruby's
+     do this we need to call the Hash.delete method.*/
+  rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
+}
+/* This is a helper method that unlinks a Ruby object from its
+   underlying C++ object.  This is needed if the lifetime of the
+   Ruby object is longer than the C++ object */
+SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
+  VALUE object = SWIG_RubyInstanceFor(ptr);
+  if (object != Qnil) {
+    DATA_PTR(object) = 0;
+  }
+}
+#ifdef __cplusplus
+}
+#endif
+/* -----------------------------------------------------------------------------
+ * Ruby API portion that goes into the runtime
+ * ----------------------------------------------------------------------------- */
+#ifdef __cplusplus
+extern "C" {
+#endif
+SWIGINTERN VALUE
+SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
+  if (NIL_P(target)) {
+    target = o;
+  } else {
+    if (TYPE(target) != T_ARRAY) {
+      VALUE o2 = target;
+      target = rb_ary_new();
+      rb_ary_push(target, o2);
+    }
+    rb_ary_push(target, o);
+  }
+  return target;
+}
+#ifdef __cplusplus
+}
+#endif
+/* -----------------------------------------------------------------------------
+ * See the LICENSE file for information on copyright, usage and redistribution
+ * of SWIG, and the README file for authors - http://www.swig.org/release.html.
+ *
+ * rubyrun.swg
+ *
+ * This file contains the runtime support for Ruby modules
+ * and includes code for managing global variables and pointer
+ * type checking.
+ * ----------------------------------------------------------------------------- */
+/* For backward compatibility only */
+#define SWIG_POINTER_EXCEPTION  0
+/* for raw pointers */
+#define SWIG_ConvertPtr(obj, pptr, type, flags)         SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, 0)
+#define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own)
+#define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Ruby_NewPointerObj(ptr, type, flags)
+#define SWIG_AcquirePtr(ptr, own)                       SWIG_Ruby_AcquirePtr(ptr, own)
+#define swig_owntype                                    ruby_owntype
+/* for raw packed data */
+#define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags)
+#define SWIG_NewPackedObj(ptr, sz, type)                SWIG_Ruby_NewPackedObj(ptr, sz, type)
+/* for class or struct pointers */
+#define SWIG_ConvertInstance(obj, pptr, type, flags)    SWIG_ConvertPtr(obj, pptr, type, flags)
+#define SWIG_NewInstanceObj(ptr, type, flags)           SWIG_NewPointerObj(ptr, type, flags)
+/* for C or C++ function pointers */
+#define SWIG_ConvertFunctionPtr(obj, pptr, type)        SWIG_ConvertPtr(obj, pptr, type, 0)
+#define SWIG_NewFunctionPtrObj(ptr, type)               SWIG_NewPointerObj(ptr, type, 0)
+/* for C++ member pointers, ie, member methods */
+#define SWIG_ConvertMember(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty)
+#define SWIG_NewMemberObj(ptr, sz, type)                SWIG_Ruby_NewPackedObj(ptr, sz, type)
+/* Runtime API */
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()
+#define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
+/* Error manipulation */
+#define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)
+#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), msg)
+#define SWIG_fail                        		goto fail
+/* Ruby-specific SWIG API */
+#define SWIG_InitRuntime()                              SWIG_Ruby_InitRuntime()
+#define SWIG_define_class(ty)                        	SWIG_Ruby_define_class(ty)
+#define SWIG_NewClassInstance(value, ty)             	SWIG_Ruby_NewClassInstance(value, ty)
+#define SWIG_MangleStr(value)                        	SWIG_Ruby_MangleStr(value)
+#define SWIG_CheckConvert(value, ty)                 	SWIG_Ruby_CheckConvert(value, ty)
+/* -----------------------------------------------------------------------------
+ * pointers/data manipulation
+ * ----------------------------------------------------------------------------- */
+#ifdef __cplusplus
+extern "C" {
+#if 0
+} /* cc-mode */
+#endif
+#endif
+typedef struct {
+  VALUE klass;
+  VALUE mImpl;
+  void  (*mark)(void *);
+  void  (*destroy)(void *);
+  int trackObjects;
+} swig_class;
+static VALUE _mSWIG = Qnil;
+static VALUE _cSWIG_Pointer = Qnil;
+static VALUE swig_runtime_data_type_pointer = Qnil;
+SWIGRUNTIME VALUE
+getExceptionClass(void) {
+  static int init = 0;
+  static VALUE rubyExceptionClass ;
+  if (!init) {
+    init = 1;
+    rubyExceptionClass = rb_const_get(_mSWIG, rb_intern("Exception"));
+  }
+  return rubyExceptionClass;
+}
+/* This code checks to see if the Ruby object being raised as part
+   of an exception inherits from the Ruby class Exception.  If so,
+   the object is simply returned.  If not, then a new Ruby exception
+   object is created and that will be returned to Ruby.*/
+SWIGRUNTIME VALUE
+SWIG_Ruby_ExceptionType(swig_type_info *desc, VALUE obj) {
+  VALUE exceptionClass = getExceptionClass();
+  if (rb_obj_is_kind_of(obj, exceptionClass)) {
+    return obj;
+  }  else {
+    return rb_exc_new3(rb_eRuntimeError, rb_obj_as_string(obj));
+  }
+}
+/* Initialize Ruby runtime support */
+SWIGRUNTIME void
+SWIG_Ruby_InitRuntime(void)
+{
+  if (_mSWIG == Qnil) {
+    _mSWIG = rb_define_module("SWIG");
+  }
+}
+/* Define Ruby class for C type */
+SWIGRUNTIME void
+SWIG_Ruby_define_class(swig_type_info *type)
+{
+  VALUE klass;
+  char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
+  sprintf(klass_name, "TYPE%s", type->name);
+  if (NIL_P(_cSWIG_Pointer)) {
+    _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
+    rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
+  }
+  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  free((void *) klass_name);
+}
+/* Create a new pointer object */
+SWIGRUNTIME VALUE
+SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
+{
+  int own =  flags & SWIG_POINTER_OWN;
+  char *klass_name;
+  swig_class *sklass;
+  VALUE klass;
+  VALUE obj;
+  if (!ptr)
+    return Qnil;
+  if (type->clientdata) {
+    sklass = (swig_class *) type->clientdata;
+    /* Are we tracking this class and have we already returned this Ruby object? */
+    if (sklass->trackObjects) {
+      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__");
+        char* type_name = RSTRING(value)->ptr;
+        if (strcmp(type->name, type_name) == 0) {
+          return obj;
+        }
+      }
+    }
+    /* Create a new Ruby object */
+    obj = Data_Wrap_Struct(sklass->klass, VOIDFUNC(sklass->mark), (own ? VOIDFUNC(sklass->destroy) : 0), ptr);
+    /* If tracking is on for this class then track this object. */
+    if (sklass->trackObjects) {
+      SWIG_RubyAddTracking(ptr, obj);
+    }
+  } else {
+    klass_name = (char *) malloc(4 + strlen(type->name) + 1);
+    sprintf(klass_name, "TYPE%s", type->name);
+    klass = rb_const_get(_mSWIG, rb_intern(klass_name));
+    free((void *) klass_name);
+    obj = Data_Wrap_Struct(klass, 0, 0, ptr);
+  }
+  rb_iv_set(obj, "__swigtype__", rb_str_new2(type->name));
+  return obj;
+}
+/* Create a new class instance (always owned) */
+SWIGRUNTIME VALUE
+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));
+  return obj;
+}
+/* Get type mangle from class name */
+SWIGRUNTIMEINLINE char *
+SWIG_Ruby_MangleStr(VALUE obj)
+{
+  VALUE stype = rb_iv_get(obj, "__swigtype__");
+  return StringValuePtr(stype);
+}
+/* Acquire a pointer value */
+typedef void (*ruby_owntype)(void*);
+SWIGRUNTIME ruby_owntype
+SWIG_Ruby_AcquirePtr(VALUE obj, ruby_owntype own) {
+  if (obj) {
+    ruby_owntype oldown = RDATA(obj)->dfree;
+    RDATA(obj)->dfree = own;
+    return oldown;
+  } else {
+    return 0;
+  }
 }
 /* Convert a pointer value */
-static int
-SWIG_Ruby_ConvertPtr(VALUE obj, void **ptr, swig_type_info *ty, int flags)
+SWIGRUNTIME int
+SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own)
 {
   char *c;
   swig_cast_info *tc;
+  void *vptr = 0;
   /* Grab the pointer */
   if (NIL_P(obj)) {
     *ptr = 0;
-    return 0;
+    return SWIG_OK;
   } else {
-    Data_Get_Struct(obj, void, *ptr);
+    if (TYPE(obj) != T_DATA) {
+      return SWIG_ERROR;
+    }
+    Data_Get_Struct(obj, void, vptr);
   }
+  if (own) *own = RDATA(obj)->dfree;
+  /* Check to see if the input object is giving up ownership
+     of the underlying C struct or C++ object.  If so then we
+     need to reset the destructor since the Ruby object no
+     longer owns the underlying C++ object.*/
+  if (flags & SWIG_POINTER_DISOWN) {
+    /* Is tracking on for this class? */
+    int track = 0;
+    if (ty && ty->clientdata) {
+      swig_class *sklass = (swig_class *) ty->clientdata;
+      track = sklass->trackObjects;
+    }
+    if (track) {
+      /* We are tracking objects for this class.  Thus we change the destructor
+       * to SWIG_RubyRemoveTracking.  This allows us to
+       * remove the mapping from the C++ to Ruby object
+       * when the Ruby object is garbage collected.  If we don't
+       * do this, then it is possible we will return a reference
+       * to a Ruby object that no longer exists thereby crashing Ruby. */
+      RDATA(obj)->dfree = SWIG_RubyRemoveTracking;
+    } else {
+      RDATA(obj)->dfree = 0;
+    }
+  }
   /* Do type-checking if type info was provided */
   if (ty) {
     if (ty->clientdata) {
-        if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
-          if (*ptr == 0)
-            rb_raise(rb_eRuntimeError, "This %s already released", ty->str);
-          return 0;
+      if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
+        if (vptr == 0) {
+          /* The object has already been deleted */
+          return SWIG_ObjectPreviouslyDeletedError;
         }
+        *ptr = vptr;
+        return SWIG_OK;
+      }
     }
     if ((c = SWIG_MangleStr(obj)) == NULL) {
-      if (flags & SWIG_POINTER_EXCEPTION)
-        rb_raise(rb_eTypeError, "Expected %s", ty->str);
-      else
-        return -1;
+      return SWIG_ERROR;
     }
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) {
-      if (flags & SWIG_POINTER_EXCEPTION)
-        rb_raise(rb_eTypeError, "Expected %s", ty->str);
-      else
-        return -1;
+      return SWIG_ERROR;
     }
-    *ptr = SWIG_TypeCast(tc, *ptr);
+    *ptr = SWIG_TypeCast(tc, vptr);
+  } else {
+    *ptr = vptr;
   }
-  return 0;
-}
-/* Convert a pointer value, signal an exception on a type mismatch */
-static SWIGINLINE void *
-SWIG_Ruby_MustGetPtr(VALUE obj, swig_type_info *ty, int argnum, int flags)
-{
-  void *result;
-  SWIG_ConvertPtr(obj, &result, ty, flags | SWIG_POINTER_EXCEPTION);
-  return result;
+  return SWIG_OK;
 }
 /* Check convert */
-static SWIGINLINE int
+SWIGRUNTIMEINLINE int
 SWIG_Ruby_CheckConvert(VALUE obj, swig_type_info *ty)
 {
   char *c = SWIG_MangleStr(obj);
-  if (!c)
-    return 0;
+  if (!c) return 0;
   return SWIG_TypeCheck(c,ty) != 0;
 }
-static VALUE
+SWIGRUNTIME VALUE
 SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
   char result[1024];
   char *r = result;
@@ -810,8 +1457,8 @@ SWIG_Ruby_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
 }
 /* Convert a packed value value */
-static void
-SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int flags) {
+SWIGRUNTIME int
+SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
   swig_cast_info *tc;
   const char  *c;
@@ -825,54 +1472,67 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty, int fl
     tc = SWIG_TypeCheck(c, ty);
     if (!tc) goto type_error;
   }
-  return;
-type_error:
+  return SWIG_OK;
-  if (flags) {
-    if (ty) {
-      rb_raise(rb_eTypeError, "Type error. Expected %s", ty->name);
-    } else {
-      rb_raise(rb_eTypeError, "Expected a pointer");
-    }
-  }
+ type_error:
+  return SWIG_ERROR;
 }
-static swig_module_info *SWIG_Ruby_GetModule() {
-    VALUE pointer;
-    swig_module_info *ret = 0;
+SWIGRUNTIME swig_module_info *
+SWIG_Ruby_GetModule(void)
+{
+  VALUE pointer;
+  swig_module_info *ret = 0;
+  VALUE verbose = rb_gv_get("VERBOSE");
-   /* first check if pointer already created */
-    pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
-    if (pointer != Qnil) {
-      Data_Get_Struct(pointer, swig_module_info, ret);
-    }
-    return ret;
+ /* temporarily disable warnings, since the pointer check causes warnings with 'ruby -w' */
+  rb_gv_set("VERBOSE", Qfalse);
+  /* first check if pointer already created */
+  pointer = rb_gv_get("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME);
+  if (pointer != Qnil) {
+    Data_Get_Struct(pointer, swig_module_info, ret);
+  }
+  /* reinstate warnings */
+  rb_gv_set("VERBOSE", verbose);
+  return ret;
 }
-static void SWIG_Ruby_SetModule(swig_module_info *pointer) {
-      /* register a new class */
-      VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
-      /* create and store the structure pointer to a global variable */
-      swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
-      rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
+SWIGRUNTIME void
+SWIG_Ruby_SetModule(swig_module_info *pointer)
+{
+  /* register a new class */
+  VALUE cl = rb_define_class("swig_runtime_data", rb_cObject);
+  /* create and store the structure pointer to a global variable */
+  swig_runtime_data_type_pointer = Data_Wrap_Struct(cl, 0, 0, pointer);
+  rb_define_readonly_variable("$swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, &swig_runtime_data_type_pointer);
 }
 #ifdef __cplusplus
+#if 0
+{ /* cc-mode */
+#endif
 }
 #endif
+#define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0)
+#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else
 /* -------- TYPES TABLE (BEGIN) -------- */
 #define SWIGTYPE_p_ID3_Field swig_types[0]
 #define SWIGTYPE_p_ID3_Frame swig_types[1]
 #define SWIGTYPE_p_ID3_Tag swig_types[2]
 #define SWIGTYPE_p_ID3_Tag__Iterator swig_types[3]
-#define SWIGTYPE_p_unsigned_int swig_types[4]
-#define SWIGTYPE_p_unsigned_long swig_types[5]
-static swig_type_info *swig_types[6];
+#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 SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -884,21 +1544,270 @@ static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
 static VALUE mAPI;
-static void SWIG_AsVal(VALUE obj, int *val)
+#define SWIGVERSION 0x010329
+#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a))
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),reinterpret_cast< void** >(a))
+#include <stdexcept>
+#include <id3/tag.h>
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor()
 {
-    *val = (int) NUM2INT(obj);
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
 }
-#include <id3/tag.h>
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
+{
+  if (TYPE(obj) == T_STRING) {
+    char *cstr = STR2CSTR(obj);
+    size_t size = RSTRING(obj)->len + 1;
+    if (cptr)  {
+      if (alloc) {
+	if (*alloc == SWIG_NEWOBJ) {
+	  *cptr = reinterpret_cast< char* >(memcpy((new char[size]), cstr, sizeof(char)*(size)));
+	} else {
+	  *cptr = cstr;
+	  *alloc = SWIG_OLDOBJ;
+	}
+      }
+    }
+    if (psize) *psize = size;
+    return SWIG_OK;
+  } else {
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *)vptr;
+	if (psize) *psize = vptr ? (strlen((char*)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+#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
+#endif
+SWIGINTERN VALUE
+SWIG_ruby_failed(void)
+{
+  return Qnil;
+}
+/*@SWIG:%ruby_aux_method@*/
+SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  long *res = (long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj);
+  return obj;
+}
+/*@SWIG@*/
+SWIGINTERN int
+SWIG_AsVal_long (VALUE obj, long* val)
+{
+  VALUE type = TYPE(obj);
+  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
+    long v;
+    VALUE a[2];
+    a[0] = obj;
+    a[1] = (VALUE)(&v);
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+SWIGINTERN int
+SWIG_AsVal_int (VALUE obj, int *val)
+{
+  long v;
+  int res = SWIG_AsVal_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v < INT_MIN || v > INT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< int >(v);
+    }
+  }
+  return res;
+}
+SWIGINTERNINLINE VALUE
+SWIG_From_bool  (bool value)
+{
+  return value ? Qtrue : Qfalse;
+}
+/*@SWIG:%ruby_aux_method@*/
+SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
+{
+  VALUE obj = args[0];
+  VALUE type = TYPE(obj);
+  unsigned long *res = (unsigned long *)(args[1]);
+  *res = type == T_FIXNUM ? NUM2ULONG(obj) : rb_big2ulong(obj);
+  return obj;
+}
+/*@SWIG@*/
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
+{
+  VALUE type = TYPE(obj);
+  if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
+    unsigned long v;
+    VALUE a[2];
+    a[0] = obj;
+    a[1] = (VALUE)(&v);
+    if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+      if (val) *val = v;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UINT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned int >(v);
+    }
+  }
+  return res;
+}
+  #define SWIG_From_long   LONG2NUM
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_long  (unsigned long value)
+{
+  return ULONG2NUM(value);
+}
+SWIGINTERNINLINE VALUE
+SWIG_From_size_t  (size_t value)
+{
+  return SWIG_From_unsigned_SS_long  (static_cast< unsigned long >(value));
+}
-static ID3_Frame *ID3_Tag_iterator_next_frame(ID3_Tag *self,ID3_Tag::Iterator *iterator){
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_int  (unsigned int value)
+{
+  return SWIG_From_unsigned_SS_long  (value);
+}
+SWIGINTERNINLINE VALUE
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > LONG_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ?
+	SWIG_NewPointerObj(const_cast< char * >(carray), pchar_descriptor, 0) : Qnil;
+    } else {
+      return rb_str_new(carray, static_cast< long >(size));
+    }
+  } else {
+    return Qnil;
+  }
+}
+SWIGINTERNINLINE VALUE
+SWIG_FromCharPtr(const char *cptr)
+{
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+SWIGINTERN int
+SWIG_AsVal_bool (VALUE obj, bool *val)
+{
+  if (obj == Qtrue) {
+    if (val) *val = true;
+    return SWIG_OK;
+  } else if (obj == Qfalse) {
+    if (val) *val = false;
+    return SWIG_OK;
+  } else {
+    int res = 0;
+    if (SWIG_AsVal_int (obj, &res) == SWIG_OK) {
+      if (val) *val = res ? true : false;
+      return SWIG_OK;
+    }
+  }
+  return SWIG_TypeError;
+}
+SWIGINTERN ID3_Frame *ID3_Tag_iterator_next_frame(ID3_Tag *self,ID3_Tag::Iterator *iterator){
       return iterator->GetNext();
     }
-static VALUE ID3_Field_binary(ID3_Field *self){
+SWIGINTERNINLINE VALUE
+SWIG_From_int  (int value)
+{
+  return SWIG_From_long  (value);
+}
+SWIGINTERN VALUE ID3_Field_binary(ID3_Field *self){
       return rb_str_new((const char *)self->GetRawBinary(), self->Size());
     }
-static VALUE ID3_Field_unicode(ID3_Field *self){
+SWIGINTERN VALUE ID3_Field_unicode(ID3_Field *self){
       const char *string = (const char *)self->GetRawUnicodeText();
       long size = self->Size();
       if (size < 2) {
@@ -911,12 +1820,12 @@ static VALUE ID3_Field_unicode(ID3_Field *self){
       }
       return rb_str_new(string, size);
     }
-static size_t ID3_Field_set_binary(ID3_Field *self,VALUE data){
+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 );
     }
-static size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
+SWIGINTERN size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
       StringValue(data);
       long len;
@@ -940,803 +1849,1160 @@ static size_t ID3_Field_set_unicode(ID3_Field *self,VALUE data){
     }
 swig_class cTag;
-static VALUE
+SWIGINTERN VALUE
 _wrap_new_Tag__SWIG_0(int argc, VALUE *argv, VALUE self) {
-    char *arg1 = (char *) 0 ;
-    ID3_Tag *result;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    arg1 = StringValuePtr(argv[0]);
-    result = (ID3_Tag *)new ID3_Tag((char const *)arg1);
-    DATA_PTR(self) = result;
-    return self;
+  char *arg1 = (char *) 0 ;
+  ID3_Tag *result = 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 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 *""'");
+  }
+  arg1 = buf1;
+  result = (ID3_Tag *)new ID3_Tag((char const *)arg1);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
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_allocate(VALUE self) {
 #else
-    static VALUE
-    _wrap_Tag_allocate(int argc, VALUE *argv, VALUE self) {
+  SWIGINTERN VALUE
+  _wrap_Tag_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
-        VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_ID3_Tag);
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_ID3_Tag);
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-        rb_obj_call_init(vresult, argc, argv);
+    rb_obj_call_init(vresult, argc, argv);
 #endif
-        return vresult;
-    }
+    return vresult;
+  }
-static VALUE
+SWIGINTERN VALUE
 _wrap_new_Tag__SWIG_1(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *result;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    result = (ID3_Tag *)new ID3_Tag();
-    DATA_PTR(self) = result;
-    return self;
+  ID3_Tag *result = 0 ;
+  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;
+  return self;
+fail:
+  return Qnil;
 }
-static VALUE _wrap_new_Tag(int nargs, VALUE *args, VALUE self) {
-    int argc;
-    VALUE argv[1];
-    int ii;
-    argc = nargs;
-    for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-        argv[ii] = args[ii];
-    }
-    if (argc == 0) {
-        return _wrap_new_Tag__SWIG_1(nargs, args, self);
-    }
-    if (argc == 1) {
-        int _v;
-        {
-            _v = (TYPE(argv[0]) == T_STRING) ? 1 : 0;
-        }
-        if (_v) {
-            return _wrap_new_Tag__SWIG_0(nargs, args, self);
-        }
+SWIGINTERN VALUE _wrap_new_Tag(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[1];
+  int ii;
+  argc = nargs;
+  if (argc > 1) SWIG_fail;
+  for (ii = 0; (ii < argc); ii++) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_new_Tag__SWIG_1(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_Tag__SWIG_0(nargs, args, self);
     }
-    rb_raise(rb_eArgError, "No matching function for overloaded 'new_Tag'");
-    return Qnil;
+  }
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'new_Tag'");
+  return Qnil;
 }
-static void
+SWIGINTERN void
 free_ID3_Tag(ID3_Tag *arg1) {
     delete arg1;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_has_tag_type(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    ID3_TagType arg2 ;
-    bool result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = (ID3_TagType) NUM2INT(argv[0]);
-    result = (bool)((ID3_Tag const *)arg1)->HasTagType(arg2);
-    vresult = result ? Qtrue : Qfalse;
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  ID3_TagType arg2 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HasTagType" "', argument " "1"" of type '" "ID3_Tag const *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< ID3_TagType >(val2);
+  result = (bool)((ID3_Tag const *)arg1)->HasTagType(arg2);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _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;
-    VALUE vresult = Qnil;
-    if ((argc < 2) || (argc > 2))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = StringValuePtr(argv[0]);
-    arg3 = NUM2UINT(argv[1]);
-    result = (arg1)->Link((char const *)arg2,arg3);
-    vresult = UINT2NUM(result);
-    return vresult;
-}
-static VALUE
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  char *arg2 = (char *) 0 ;
+  flags_t arg3 ;
+  size_t result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  unsigned int val3 ;
+  int ecode3 = 0 ;
+  VALUE vresult = Qnil;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  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 *""'");
+  }
+  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 *""'");
+  }
+  arg2 = 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""'");
+  }
+  arg3 = static_cast< flags_t >(val3);
+  result = (arg1)->Link((char const *)arg2,arg3);
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
+}
+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;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = StringValuePtr(argv[0]);
-    result = (arg1)->Link((char const *)arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  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 ;
+  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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Link" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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 *""'");
+  }
+  arg2 = buf2;
+  result = (arg1)->Link((char const *)arg2);
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
 }
-static VALUE _wrap_Tag_link(int nargs, VALUE *args, VALUE self) {
-    int argc;
-    VALUE argv[4];
-    int ii;
-    argc = nargs + 1;
-    argv[0] = self;
-    for (ii = 1; (ii < argc) && (ii < 3); ii++) {
-        argv[ii] = args[ii-1];
-    }
-    if (argc == 2) {
-        int _v;
-        {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
-        }
-        if (_v) {
-            {
-                _v = (TYPE(argv[1]) == T_STRING) ? 1 : 0;
-            }
-            if (_v) {
-                return _wrap_Tag_link__SWIG_1(nargs, args, self);
-            }
-        }
+SWIGINTERN VALUE _wrap_Tag_link(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[4];
+  int ii;
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 4) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
+        return _wrap_Tag_link__SWIG_1(nargs, args, self);
+      }
     }
-    if (argc == 3) {
-        int _v;
+  }
+  if (argc == 3) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
+      _v = SWIG_CheckState(res);
+      if (_v) {
         {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
+          int res = SWIG_AsVal_unsigned_SS_int(argv[2], NULL);
+          _v = SWIG_CheckState(res);
         }
         if (_v) {
-            {
-                _v = (TYPE(argv[1]) == T_STRING) ? 1 : 0;
-            }
-            if (_v) {
-                {
-                    _v = ((TYPE(argv[2]) == T_FIXNUM) || (TYPE(argv[2]) == T_BIGNUM)) ? 1 : 0;
-                }
-                if (_v) {
-                    return _wrap_Tag_link__SWIG_0(nargs, args, self);
-                }
-            }
+          return _wrap_Tag_link__SWIG_0(nargs, args, self);
         }
+      }
     }
-    rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_link'");
-    return Qnil;
+  }
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_link'");
+  return Qnil;
 }
-static VALUE
+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;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = NUM2UINT(argv[0]);
-    result = (flags_t)(arg1)->Update(arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  flags_t arg2 ;
+  flags_t result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Update" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< flags_t >(val2);
+  result = (flags_t)(arg1)->Update(arg2);
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_update__SWIG_1(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    flags_t result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    result = (flags_t)(arg1)->Update();
-    vresult = UINT2NUM(result);
-    return vresult;
-}
-static VALUE _wrap_Tag_update(int nargs, VALUE *args, VALUE self) {
-    int argc;
-    VALUE argv[3];
-    int ii;
-    argc = nargs + 1;
-    argv[0] = self;
-    for (ii = 1; (ii < argc) && (ii < 2); ii++) {
-        argv[ii] = args[ii-1];
-    }
-    if (argc == 1) {
-        int _v;
-        {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
-        }
-        if (_v) {
-            return _wrap_Tag_update__SWIG_1(nargs, args, self);
-        }
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  flags_t 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Update" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  result = (flags_t)(arg1)->Update();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+SWIGINTERN VALUE _wrap_Tag_update(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[3];
+  int ii;
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 3) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Tag_update__SWIG_1(nargs, args, self);
     }
-    if (argc == 2) {
-        int _v;
-        {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
-        }
-        if (_v) {
-            {
-                _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
-            }
-            if (_v) {
-                return _wrap_Tag_update__SWIG_0(nargs, args, self);
-            }
-        }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Tag_update__SWIG_0(nargs, args, self);
+      }
     }
-    rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_update'");
-    return Qnil;
+  }
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_update'");
+  return Qnil;
 }
-static VALUE
+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;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = NUM2UINT(argv[0]);
-    result = (flags_t)(arg1)->Strip(arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  flags_t arg2 ;
+  flags_t result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int val2 ;
+  int ecode2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Strip" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< flags_t >(val2);
+  result = (flags_t)(arg1)->Strip(arg2);
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_strip__SWIG_1(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    flags_t result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    result = (flags_t)(arg1)->Strip();
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  flags_t 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Strip" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  result = (flags_t)(arg1)->Strip();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE _wrap_Tag_strip(int nargs, VALUE *args, VALUE self) {
-    int argc;
-    VALUE argv[3];
-    int ii;
-    argc = nargs + 1;
-    argv[0] = self;
-    for (ii = 1; (ii < argc) && (ii < 2); ii++) {
-        argv[ii] = args[ii-1];
-    }
-    if (argc == 1) {
-        int _v;
-        {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
-        }
-        if (_v) {
-            return _wrap_Tag_strip__SWIG_1(nargs, args, self);
-        }
+SWIGINTERN VALUE _wrap_Tag_strip(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[3];
+  int ii;
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 3) SWIG_fail;
+  for (ii = 1; (ii < argc); ii++) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_Tag_strip__SWIG_1(nargs, args, self);
     }
-    if (argc == 2) {
-        int _v;
-        {
-            void *ptr;
-            _v = (NIL_P(argv[0]) || (TYPE(argv[0]) == T_DATA && SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_ID3_Tag, 0) != -1)) ? 1 : 0;
-        }
-        if (_v) {
-            {
-                _v = ((TYPE(argv[1]) == T_FIXNUM) || (TYPE(argv[1]) == T_BIGNUM)) ? 1 : 0;
-            }
-            if (_v) {
-                return _wrap_Tag_strip__SWIG_0(nargs, args, self);
-            }
-        }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_ID3_Tag, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_unsigned_SS_int(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_Tag_strip__SWIG_0(nargs, args, self);
+      }
     }
-    rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_strip'");
-    return Qnil;
+  }
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'Tag_strip'");
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_clear(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    (arg1)->Clear();
-    return Qnil;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Clear" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  (arg1)->Clear();
+  return Qnil;
+fail:
+  return Qnil;
 }
-static VALUE
+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;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_ID3_Frame, 1);
-    result = (ID3_Frame *)(arg1)->RemoveFrame((ID3_Frame const *)arg2);
-    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ID3_Frame,0);
-    return vresult;
+  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 ;
+  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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RemoveFrame" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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 *""'");
+  }
+  arg2 = reinterpret_cast< ID3_Frame * >(argp2);
+  result = (ID3_Frame *)(arg1)->RemoveFrame((ID3_Frame const *)arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ID3_Frame, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_add_frame(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    ID3_Frame *arg2 = (ID3_Frame *) 0 ;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_ID3_Frame, 1);
-    (arg1)->AddFrame((ID3_Frame const *)arg2);
-    return Qnil;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  ID3_Frame *arg2 = (ID3_Frame *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AddFrame" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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 *""'");
+  }
+  arg2 = reinterpret_cast< ID3_Frame * >(argp2);
+  (arg1)->AddFrame((ID3_Frame const *)arg2);
+  return Qnil;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_filename(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    char *result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    result = (char *)((ID3_Tag const *)arg1)->GetFileName();
-    vresult = rb_str_new2(result);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  char *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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetFileName" "', argument " "1"" of type '" "ID3_Tag const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  result = (char *)((ID3_Tag const *)arg1)->GetFileName();
+  vresult = SWIG_FromCharPtr(result);
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_set_padding(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    bool arg2 ;
-    bool result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = RTEST(argv[0]);
-    result = (bool)(arg1)->SetPadding(arg2);
-    vresult = result ? Qtrue : Qfalse;
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  bool arg2 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetPadding" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< bool >(val2);
+  result = (bool)(arg1)->SetPadding(arg2);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_size(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    size_t result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    result = ((ID3_Tag const *)arg1)->Size();
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  size_t 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size" "', argument " "1"" of type '" "ID3_Tag const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  result = ((ID3_Tag const *)arg1)->Size();
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_find(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    ID3_FrameID arg2 ;
-    ID3_Frame *result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    arg2 = (ID3_FrameID) NUM2INT(argv[0]);
-    result = (ID3_Frame *)((ID3_Tag const *)arg1)->Find(arg2);
-    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ID3_Frame,0);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  ID3_FrameID arg2 ;
+  ID3_Frame *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Find" "', argument " "1"" of type '" "ID3_Tag const *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< ID3_FrameID >(val2);
+  result = (ID3_Frame *)((ID3_Tag const *)arg1)->Find(arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ID3_Frame, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_iterator_new(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    ID3_Tag::Iterator *result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    result = (ID3_Tag::Iterator *)(arg1)->CreateIterator();
-    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ID3_Tag__Iterator,0);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  ID3_Tag::Iterator *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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CreateIterator" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  result = (ID3_Tag::Iterator *)(arg1)->CreateIterator();
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ID3_Tag__Iterator, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Tag_iterator_next_frame(int argc, VALUE *argv, VALUE self) {
-    ID3_Tag *arg1 = (ID3_Tag *) 0 ;
-    ID3_Tag::Iterator *arg2 = (ID3_Tag::Iterator *) 0 ;
-    ID3_Frame *result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Tag, 1);
-    SWIG_ConvertPtr(argv[0], (void **) &arg2, SWIGTYPE_p_ID3_Tag__Iterator, 1);
-    result = (ID3_Frame *)ID3_Tag_iterator_next_frame(arg1,arg2);
-    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ID3_Frame,0);
-    return vresult;
+  ID3_Tag *arg1 = (ID3_Tag *) 0 ;
+  ID3_Tag::Iterator *arg2 = (ID3_Tag::Iterator *) 0 ;
+  ID3_Frame *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 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_ID3_Tag, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iterator_next_frame" "', argument " "1"" of type '" "ID3_Tag *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Tag * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_ID3_Tag__Iterator, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "iterator_next_frame" "', argument " "2"" of type '" "ID3_Tag::Iterator *""'");
+  }
+  arg2 = reinterpret_cast< ID3_Tag::Iterator * >(argp2);
+  result = (ID3_Frame *)ID3_Tag_iterator_next_frame(arg1,arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ID3_Frame, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
 }
 swig_class cFrame;
-static VALUE
+SWIGINTERN VALUE
 _wrap_new_Frame__SWIG_0(int argc, VALUE *argv, VALUE self) {
-    ID3_FrameID arg1 ;
-    ID3_Frame *result;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    arg1 = (ID3_FrameID) NUM2INT(argv[0]);
-    result = (ID3_Frame *)new ID3_Frame(arg1);
-    DATA_PTR(self) = result;
-    return self;
+  ID3_FrameID arg1 ;
+  ID3_Frame *result = 0 ;
+  int val1 ;
+  int ecode1 = 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""'");
+  }
+  arg1 = static_cast< ID3_FrameID >(val1);
+  result = (ID3_Frame *)new ID3_Frame(arg1);DATA_PTR(self) = result;
+  return self;
+fail:
+  return Qnil;
 }
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
-static VALUE
+SWIGINTERN VALUE
 _wrap_Frame_allocate(VALUE self) {
 #else
-    static VALUE
-    _wrap_Frame_allocate(int argc, VALUE *argv, VALUE self) {
+  SWIGINTERN VALUE
+  _wrap_Frame_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
-        VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_ID3_Frame);
+    VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_ID3_Frame);
 #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
-        rb_obj_call_init(vresult, argc, argv);
+    rb_obj_call_init(vresult, argc, argv);
 #endif
-        return vresult;
-    }
+    return vresult;
+  }
-static VALUE
+SWIGINTERN VALUE
 _wrap_new_Frame__SWIG_1(int argc, VALUE *argv, VALUE self) {
-    ID3_Frame *result;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    result = (ID3_Frame *)new ID3_Frame();
-    DATA_PTR(self) = result;
-    return self;
+  ID3_Frame *result = 0 ;
+  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;
+  return self;
+fail:
+  return Qnil;
 }
-static VALUE _wrap_new_Frame(int nargs, VALUE *args, VALUE self) {
-    int argc;
-    VALUE argv[1];
-    int ii;
-    argc = nargs;
-    for (ii = 0; (ii < argc) && (ii < 1); ii++) {
-        argv[ii] = args[ii];
-    }
-    if (argc == 0) {
-        return _wrap_new_Frame__SWIG_1(nargs, args, self);
+SWIGINTERN VALUE _wrap_new_Frame(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[1];
+  int ii;
+  argc = nargs;
+  if (argc > 1) SWIG_fail;
+  for (ii = 0; (ii < argc); ii++) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_new_Frame__SWIG_1(nargs, args, self);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_int(argv[0], NULL);
+      _v = SWIG_CheckState(res);
     }
-    if (argc == 1) {
-        int _v;
-        {
-            _v = ((TYPE(argv[0]) == T_FIXNUM) || (TYPE(argv[0]) == T_BIGNUM)) ? 1 : 0;
-        }
-        if (_v) {
-            return _wrap_new_Frame__SWIG_0(nargs, args, self);
-        }
+    if (_v) {
+      return _wrap_new_Frame__SWIG_0(nargs, args, self);
     }
-    rb_raise(rb_eArgError, "No matching function for overloaded 'new_Frame'");
-    return Qnil;
+  }
+fail:
+  rb_raise(rb_eArgError, "No matching function for overloaded 'new_Frame'");
+  return Qnil;
 }
-static void
+SWIGINTERN void
 free_ID3_Frame(ID3_Frame *arg1) {
     delete arg1;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Frame_field(int argc, VALUE *argv, VALUE self) {
-    ID3_Frame *arg1 = (ID3_Frame *) 0 ;
-    ID3_FieldID arg2 ;
-    ID3_Field *result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Frame, 1);
-    arg2 = (ID3_FieldID) NUM2INT(argv[0]);
-    result = (ID3_Field *)((ID3_Frame const *)arg1)->GetField(arg2);
-    vresult = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_ID3_Field,0);
-    return vresult;
+  ID3_Frame *arg1 = (ID3_Frame *) 0 ;
+  ID3_FieldID arg2 ;
+  ID3_Field *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 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_ID3_Frame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetField" "', argument " "1"" of type '" "ID3_Frame const *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< ID3_FieldID >(val2);
+  result = (ID3_Field *)((ID3_Frame const *)arg1)->GetField(arg2);
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ID3_Field, 0 |  0 );
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Frame_num(int argc, VALUE *argv, VALUE self) {
-    ID3_Frame *arg1 = (ID3_Frame *) 0 ;
-    ID3_FrameID result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Frame, 1);
-    result = (ID3_FrameID)((ID3_Frame const *)arg1)->GetID();
-    vresult = INT2NUM(result);
-    return vresult;
+  ID3_Frame *arg1 = (ID3_Frame *) 0 ;
+  ID3_FrameID 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_ID3_Frame, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetID" "', argument " "1"" of type '" "ID3_Frame const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Frame * >(argp1);
+  result = (ID3_FrameID)((ID3_Frame const *)arg1)->GetID();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
 swig_class cField;
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_type(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    ID3_FieldType result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    result = (ID3_FieldType)((ID3_Field const *)arg1)->GetType();
-    vresult = INT2NUM(result);
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  ID3_FieldType 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetType" "', argument " "1"" of type '" "ID3_Field const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  result = (ID3_FieldType)((ID3_Field const *)arg1)->GetType();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_integer(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    unsigned long result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    result = (unsigned long)((ID3_Field const *)arg1)->Get();
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  unsigned long 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Get" "', argument " "1"" of type '" "ID3_Field const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  result = (unsigned long)((ID3_Field const *)arg1)->Get();
+  vresult = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_binary(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    VALUE result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    result = (VALUE)ID3_Field_binary(arg1);
-    vresult = result;
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "binary" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  result = (VALUE)ID3_Field_binary(arg1);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_ascii(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    char *result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    result = (char *)((ID3_Field const *)arg1)->GetRawText();
-    vresult = rb_str_new2(result);
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  char *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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GetRawText" "', argument " "1"" of type '" "ID3_Field const *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  result = (char *)((ID3_Field const *)arg1)->GetRawText();
+  vresult = SWIG_FromCharPtr(result);
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_unicode(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    VALUE result;
-    VALUE vresult = Qnil;
-    if ((argc < 0) || (argc > 0))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    result = (VALUE)ID3_Field_unicode(arg1);
-    vresult = result;
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "unicode" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  result = (VALUE)ID3_Field_unicode(arg1);
+  vresult = result;
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_set_integer(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    unsigned long arg2 ;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    arg2 = NUM2ULONG(argv[0]);
-    (arg1)->Set(arg2);
-    return Qnil;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  unsigned long arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned long 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Set" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< unsigned long >(val2);
+  (arg1)->Set(arg2);
+  return Qnil;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_set_binary(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    VALUE arg2 ;
-    size_t result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    arg2 = argv[0];
-    result = ID3_Field_set_binary(arg1,arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  VALUE arg2 = (VALUE) 0 ;
+  size_t 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_binary" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  arg2 = argv[0];
+  result = ID3_Field_set_binary(arg1,arg2);
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+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;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    arg2 = StringValuePtr(argv[0]);
-    result = (arg1)->Set((char const *)arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  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 ;
+  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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Set" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  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 *""'");
+  }
+  arg2 = buf2;
+  result = (arg1)->Set((char const *)arg2);
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_set_encoding(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    ID3_TextEnc arg2 ;
-    bool result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    arg2 = (ID3_TextEnc) NUM2INT(argv[0]);
-    result = (bool)(arg1)->SetEncoding(arg2);
-    vresult = result ? Qtrue : Qfalse;
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  ID3_TextEnc arg2 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SetEncoding" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  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""'");
+  }
+  arg2 = static_cast< ID3_TextEnc >(val2);
+  result = (bool)(arg1)->SetEncoding(arg2);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
-static VALUE
+SWIGINTERN VALUE
 _wrap_Field_set_unicode(int argc, VALUE *argv, VALUE self) {
-    ID3_Field *arg1 = (ID3_Field *) 0 ;
-    VALUE arg2 ;
-    size_t result;
-    VALUE vresult = Qnil;
-    if ((argc < 1) || (argc > 1))
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc);
-    SWIG_ConvertPtr(self, (void **) &arg1, SWIGTYPE_p_ID3_Field, 1);
-    arg2 = argv[0];
-    result = ID3_Field_set_unicode(arg1,arg2);
-    vresult = UINT2NUM(result);
-    return vresult;
+  ID3_Field *arg1 = (ID3_Field *) 0 ;
+  VALUE arg2 = (VALUE) 0 ;
+  size_t 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_ID3_Field, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "set_unicode" "', argument " "1"" of type '" "ID3_Field *""'");
+  }
+  arg1 = reinterpret_cast< ID3_Field * >(argp1);
+  arg2 = argv[0];
+  result = ID3_Field_set_unicode(arg1,arg2);
+  vresult = SWIG_From_size_t(static_cast< size_t >(result));
+  return vresult;
+fail:
+  return Qnil;
 }
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
-static swig_type_info _swigt__p_ID3_Field = {"_p_ID3_Field", "ID3_Field *", 0, 0, 0};
-static swig_type_info _swigt__p_ID3_Frame = {"_p_ID3_Frame", "ID3_Frame *", 0, 0, 0};
-static swig_type_info _swigt__p_ID3_Tag = {"_p_ID3_Tag", "ID3_Tag *", 0, 0, 0};
-static swig_type_info _swigt__p_ID3_Tag__Iterator = {"_p_ID3_Tag__Iterator", "ID3_Tag::Iterator *", 0, 0, 0};
-static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|flags_t *", 0, 0, 0};
-static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|VALUE *", 0, 0, 0};
+static swig_type_info _swigt__p_ID3_Field = {"_p_ID3_Field", "ID3_Field *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_ID3_Frame = {"_p_ID3_Frame", "ID3_Frame *", 0, 0, (void*)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_int = {"_p_unsigned_int", "unsigned int *|flags_t *", 0, 0, (void*)0, 0};
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_ID3_Field,
   &_swigt__p_ID3_Frame,
   &_swigt__p_ID3_Tag,
   &_swigt__p_ID3_Tag__Iterator,
+  &_swigt__p_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}};
 static swig_cast_info _swigc__p_ID3_Frame[] = {  {&_swigt__p_ID3_Frame, 0, 0, 0},{0, 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_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,
   _swigc__p_ID3_Frame,
   _swigc__p_ID3_Tag,
   _swigc__p_ID3_Tag__Iterator,
+  _swigc__p_char,
   _swigc__p_unsigned_int,
-  _swigc__p_unsigned_long,
 };
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */
-/*************************************************************************
+/* -----------------------------------------------------------------------------
  * Type initialization:
  * This problem is tough by the requirement that no dynamic
  * memory is used. Also, since swig_type_info structures store pointers to
@@ -1748,7 +3014,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
+ *
  * The generated swig_type_info structures are assigned staticly to an initial
  * array. We just loop though that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
@@ -1762,7 +3028,7 @@ static swig_cast_info *swig_cast_initial[] = {
  * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
+ *
  * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
@@ -1775,16 +3041,21 @@ static swig_cast_info *swig_cast_initial[] = {
  *  3) Finally, if cast->type has not already been loaded, then we add that
  *     swig_cast_info to the linked list (because the cast->type) pointer will
  *     be correct.
-**/
+ * ----------------------------------------------------------------------------- */
 #ifdef __cplusplus
 extern "C" {
+#if 0
+} /* c-mode */
+#endif
+#endif
+#if 0
+#define SWIGRUNTIME_DEBUG
 #endif
 SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
-  swig_type_info *type, *ret;
-  swig_cast_info *cast;
   size_t i;
   swig_module_info *module_head;
   static int init_run = 0;
@@ -1810,8 +3081,17 @@ SWIG_InitializeModule(void *clientdata) {
   }
   /* Now work on filling in swig_module.types */
+#ifdef SWIGRUNTIME_DEBUG
+  printf("SWIG_InitializeModule: size %d\n", swig_module.size);
+#endif
   for (i = 0; i < swig_module.size; ++i) {
-    type = 0;
+    swig_type_info *type = 0;
+    swig_type_info *ret;
+    swig_cast_info *cast;
+#ifdef SWIGRUNTIME_DEBUG
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+#endif
     /* if there is another module already loaded */
     if (swig_module.next != &swig_module) {
@@ -1819,7 +3099,15 @@ SWIG_InitializeModule(void *clientdata) {
     }
     if (type) {
       /* Overwrite clientdata field */
-      if (swig_module.type_initial[i]->clientdata) type->clientdata = swig_module.type_initial[i]->clientdata;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: found type %s\n", type->name);
+#endif
+      if (swig_module.type_initial[i]->clientdata) {
+	type->clientdata = swig_module.type_initial[i]->clientdata;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: found and overwrite type %s \n", type->name);
+#endif
+      }
     } else {
       type = swig_module.type_initial[i];
     }
@@ -1830,28 +3118,64 @@ SWIG_InitializeModule(void *clientdata) {
       /* Don't need to add information already in the list */
       ret = 0;
+#ifdef SWIGRUNTIME_DEBUG
+      printf("SWIG_InitializeModule: look cast %s\n", cast->type->name);
+#endif
       if (swig_module.next != &swig_module) {
         ret = SWIG_MangledTypeQueryModule(swig_module.next, &swig_module, cast->type->name);
+#ifdef SWIGRUNTIME_DEBUG
+	if (ret) printf("SWIG_InitializeModule: found cast %s\n", ret->name);
+#endif
       }
-      if (ret && type == swig_module.type_initial[i]) {
-        cast->type = ret;
-        ret = 0;
+      if (ret) {
+	if (type == swig_module.type_initial[i]) {
+#ifdef SWIGRUNTIME_DEBUG
+	  printf("SWIG_InitializeModule: skip old type %s\n", ret->name);
+#endif
+	  cast->type = ret;
+	  ret = 0;
+	} else {
+	  /* Check for casting already in the list */
+	  swig_cast_info *ocast = SWIG_TypeCheck(ret->name, type);
+#ifdef SWIGRUNTIME_DEBUG
+	  if (ocast) printf("SWIG_InitializeModule: skip old cast %s\n", ret->name);
+#endif
+	  if (!ocast) ret = 0;
+	}
       }
       if (!ret) {
+#ifdef SWIGRUNTIME_DEBUG
+	printf("SWIG_InitializeModule: adding cast %s\n", cast->type->name);
+#endif
         if (type->cast) {
           type->cast->prev = cast;
           cast->next = type->cast;
         }
         type->cast = cast;
       }
       cast++;
     }
     /* Set entry in modules->types array equal to the type */
     swig_module.types[i] = type;
   }
+  swig_module.types[i] = 0;
+#ifdef SWIGRUNTIME_DEBUG
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+  for (i = 0; i < swig_module.size; ++i) {
+    int j = 0;
+    swig_cast_info *cast = swig_module.cast_initial[i];
+    printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
+    while (cast->type) {
+      printf("SWIG_InitializeModule: cast type %s\n", cast->type->name);
+      cast++;
+      ++j;
+    }
+  printf("---- Total casts: %d\n",j);
+  }
+  printf("**** SWIG_InitializeModule: Cast List ******\n");
+#endif
 }
 /* This function will propagate the clientdata field of type to
@@ -1883,6 +3207,9 @@ SWIG_PropagateClientData(void) {
 }
 #ifdef __cplusplus
+#if 0
+{ /* c-mode */
+#endif
 }
 #endif
@@ -1891,60 +3218,64 @@ SWIG_PropagateClientData(void) {
 extern "C"
 #endif
 SWIGEXPORT void Init_id3lib_api(void) {
-    int i;
-    SWIG_InitRuntime();
-    mAPI = rb_define_module("ID3Lib");
-    mAPI = rb_define_module_under(mAPI, "API");
-    SWIG_InitializeModule(0);
-    for (i = 0; i < swig_module.size; i++) {
-        SWIG_define_class(swig_module.types[i]);
-    }
-    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, "filename", VALUEFUNC(_wrap_Tag_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, "iterator_new", VALUEFUNC(_wrap_Tag_iterator_new), -1);
-    rb_define_method(cTag.klass, "iterator_next_frame", VALUEFUNC(_wrap_Tag_iterator_next_frame), -1);
-    cTag.mark = 0;
-    cTag.destroy = (void (*)(void *)) free_ID3_Tag;
-    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, "field", VALUEFUNC(_wrap_Frame_field), -1);
-    rb_define_method(cFrame.klass, "num", VALUEFUNC(_wrap_Frame_num), -1);
-    cFrame.mark = 0;
-    cFrame.destroy = (void (*)(void *)) free_ID3_Frame;
-    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, "type", VALUEFUNC(_wrap_Field_type), -1);
-    rb_define_method(cField.klass, "integer", VALUEFUNC(_wrap_Field_integer), -1);
-    rb_define_method(cField.klass, "binary", VALUEFUNC(_wrap_Field_binary), -1);
-    rb_define_method(cField.klass, "ascii", VALUEFUNC(_wrap_Field_ascii), -1);
-    rb_define_method(cField.klass, "unicode", VALUEFUNC(_wrap_Field_unicode), -1);
-    rb_define_method(cField.klass, "set_integer", VALUEFUNC(_wrap_Field_set_integer), -1);
-    rb_define_method(cField.klass, "set_binary", VALUEFUNC(_wrap_Field_set_binary), -1);
-    rb_define_method(cField.klass, "set_ascii", VALUEFUNC(_wrap_Field_set_ascii), -1);
-    rb_define_method(cField.klass, "set_encoding", VALUEFUNC(_wrap_Field_set_encoding), -1);
-    rb_define_method(cField.klass, "set_unicode", VALUEFUNC(_wrap_Field_set_unicode), -1);
-    cField.mark = 0;
+  size_t i;
+  SWIG_InitRuntime();
+  mAPI = rb_define_module("ID3Lib");
+  mAPI = rb_define_module_under(mAPI, "API");
+  SWIG_InitializeModule(0);
+  for (i = 0; i < swig_module.size; i++) {
+    SWIG_define_class(swig_module.types[i]);
+  }
+  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, "filename", VALUEFUNC(_wrap_Tag_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, "iterator_new", VALUEFUNC(_wrap_Tag_iterator_new), -1);
+  rb_define_method(cTag.klass, "iterator_next_frame", VALUEFUNC(_wrap_Tag_iterator_next_frame), -1);
+  cTag.mark = 0;
+  cTag.destroy = (void (*)(void *)) free_ID3_Tag;
+  cTag.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, "field", VALUEFUNC(_wrap_Frame_field), -1);
+  rb_define_method(cFrame.klass, "num", VALUEFUNC(_wrap_Frame_num), -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, "type", VALUEFUNC(_wrap_Field_type), -1);
+  rb_define_method(cField.klass, "integer", VALUEFUNC(_wrap_Field_integer), -1);
+  rb_define_method(cField.klass, "binary", VALUEFUNC(_wrap_Field_binary), -1);
+  rb_define_method(cField.klass, "ascii", VALUEFUNC(_wrap_Field_ascii), -1);
+  rb_define_method(cField.klass, "unicode", VALUEFUNC(_wrap_Field_unicode), -1);
+  rb_define_method(cField.klass, "set_integer", VALUEFUNC(_wrap_Field_set_integer), -1);
+  rb_define_method(cField.klass, "set_binary", VALUEFUNC(_wrap_Field_set_binary), -1);
+  rb_define_method(cField.klass, "set_ascii", VALUEFUNC(_wrap_Field_set_ascii), -1);
+  rb_define_method(cField.klass, "set_encoding", VALUEFUNC(_wrap_Field_set_encoding), -1);
+  rb_define_method(cField.klass, "set_unicode", VALUEFUNC(_wrap_Field_set_unicode), -1);
+  cField.mark = 0;
+  cField.trackObjects = 0;
 }