taglib-ruby 0.2.1 → 0.3.0

data/ext/taglib_base/taglib_base.i

@@ -1,10 +1,8 @@
 %module "TagLib"
 %{
 #include <taglib/taglib.h>
-#include <taglib/tstring.h>
 #include <taglib/tbytevector.h>
 #include <taglib/tlist.h>
-#include <taglib/tfile.h>
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
 %}
@@ -20,6 +18,8 @@ namespace TagLib {
     enum Type { Latin1 = 0, UTF16 = 1, UTF16BE = 2, UTF8 = 3, UTF16LE = 4 };
   };
 
+  class FileName;
+
   typedef wchar_t wchar;
   typedef unsigned char uchar;
   typedef unsigned int  uint;
@@ -51,6 +51,7 @@ namespace TagLib {
   tmp = ruby_string_to_taglib_bytevector($input);
   $1 = &tmp;
 }
+%typemap(typecheck) const TagLib::ByteVector & = char *;
 
 // String
 %typemap(out) TagLib::String {
@@ -62,6 +63,7 @@ namespace TagLib {
   tmp = ruby_string_to_taglib_string($input);
   $1 = &tmp;
 }
+%typemap(typecheck) TagLib::String = char *;
 %apply TagLib::String { TagLib::String &, const TagLib::String & };
 
 // StringList
@@ -74,6 +76,15 @@ namespace TagLib {
 }
 %apply TagLib::StringList { TagLib::StringList &, const TagLib::StringList & };
 
+%typemap(out) TagLib::FileName {
+  $result = taglib_filename_to_ruby_string($1);
+}
+%typemap(in) TagLib::FileName {
+  $1 = ruby_string_to_taglib_filename($input);
+}
+%typemap(typecheck) TagLib::FileName = char *;
+%feature("valuewrapper") TagLib::FileName;
+
 %ignore TagLib::List::operator[];
 %ignore TagLib::List::operator=;
 %include <taglib/tlist.h>
@@ -82,6 +93,7 @@ namespace TagLib {
 
 %include <taglib/audioproperties.h>
 
+%ignore TagLib::FileName;
 %include <taglib/tfile.h>
 
 %ignore TagLib::FileRef::operator=;
@@ -89,4 +101,36 @@ namespace TagLib {
 %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) TagLib::FileRef::FileTypeResolver;
 %include <taglib/fileref.h>
 
+%begin %{
+  static void free_taglib_fileref(void *ptr);
+%}
+%header %{
+  static void free_taglib_fileref(void *ptr) {
+    TagLib::FileRef *fileref = (TagLib::FileRef *) ptr;
+
+    TagLib::Tag *tag = fileref->tag();
+    if (tag) {
+      SWIG_RubyUnlinkObjects(tag);
+      SWIG_RubyRemoveTracking(tag);
+    }
+
+    TagLib::AudioProperties *properties = fileref->audioProperties();
+    if (properties) {
+      SWIG_RubyUnlinkObjects(properties);
+      SWIG_RubyRemoveTracking(properties);
+    }
+
+    SWIG_RubyUnlinkObjects(ptr);
+    SWIG_RubyRemoveTracking(ptr);
+
+    delete fileref;
+  }
+%}
+
+%extend TagLib::FileRef {
+  void close() {
+    free_taglib_fileref($self);
+  }
+}
+
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/ext/taglib_base/taglib_base_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
+ * Version 2.0.5
  * 
  * 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,9 @@
  * interface file instead. 
  * ----------------------------------------------------------------------------- */
 
+  static void free_taglib_fileref(void *ptr);
+
+
 #define SWIGRUBY
 
 
@@ -1814,19 +1817,18 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 /* -------- TYPES TABLE (BEGIN) -------- */
 
 #define SWIGTYPE_p_TagLib__AudioProperties swig_types[0]
-#define SWIGTYPE_p_TagLib__ByteVector swig_types[1]
-#define SWIGTYPE_p_TagLib__File swig_types[2]
-#define SWIGTYPE_p_TagLib__FileRef swig_types[3]
-#define SWIGTYPE_p_TagLib__FileRef__FileTypeResolver swig_types[4]
-#define SWIGTYPE_p_TagLib__String swig_types[5]
-#define SWIGTYPE_p_TagLib__Tag swig_types[6]
-#define SWIGTYPE_p_char swig_types[7]
-#define SWIGTYPE_p_unsigned_char swig_types[8]
-#define SWIGTYPE_p_unsigned_int swig_types[9]
-#define SWIGTYPE_p_unsigned_long swig_types[10]
-#define SWIGTYPE_p_wchar_t swig_types[11]
-static swig_type_info *swig_types[13];
-static swig_module_info swig_module = {swig_types, 12, 0, 0, 0, 0};
+#define SWIGTYPE_p_TagLib__File swig_types[1]
+#define SWIGTYPE_p_TagLib__FileRef swig_types[2]
+#define SWIGTYPE_p_TagLib__FileRef__FileTypeResolver swig_types[3]
+#define SWIGTYPE_p_TagLib__String swig_types[4]
+#define SWIGTYPE_p_TagLib__Tag swig_types[5]
+#define SWIGTYPE_p_char swig_types[6]
+#define SWIGTYPE_p_unsigned_char swig_types[7]
+#define SWIGTYPE_p_unsigned_int swig_types[8]
+#define SWIGTYPE_p_unsigned_long swig_types[9]
+#define SWIGTYPE_p_wchar_t swig_types[10]
+static swig_type_info *swig_types[12];
+static swig_module_info swig_module = {swig_types, 11, 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)
 
@@ -1841,7 +1843,7 @@ static VALUE mTagLib;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x020005 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1853,14 +1855,16 @@ static VALUE mTagLib;
 
 
 #include <taglib/taglib.h>
-#include <taglib/tstring.h>
 #include <taglib/tbytevector.h>
 #include <taglib/tlist.h>
-#include <taglib/tfile.h>
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
 
 
+#include <taglib/tstring.h>
+#include <taglib/tstringlist.h>
+#include <taglib/tfile.h>
+
 #if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
 # include <ruby/encoding.h>
 # define ASSOCIATE_UTF8_ENCODING(value) rb_enc_associate(value, rb_utf8_encoding());
@@ -1915,6 +1919,25 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   return result;
 }
 
+VALUE taglib_filename_to_ruby_string(TagLib::FileName filename) {
+#ifdef _WIN32
+  const char *s = (const char *) filename;
+  return rb_tainted_str_new2(s);
+#else
+  return rb_tainted_str_new2(filename);
+#endif
+}
+
+TagLib::FileName ruby_string_to_taglib_filename(VALUE s) {
+#ifdef _WIN32
+  const char *filename = StringValuePtr(s);
+  return TagLib::FileName(filename);
+#else
+  return StringValuePtr(s);
+#endif
+}
+
+
 
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
@@ -1950,6 +1973,60 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 }
 
 
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static int init = 0;
+  static swig_type_info* info = 0;
+  if (!init) {
+    info = SWIG_TypeQuery("_p_char");
+    init = 1;
+  }
+  return info;
+}
+
+
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
+{
+  if (TYPE(obj) == T_STRING) {
+    #if defined(StringValuePtr)
+    char *cstr = StringValuePtr(obj); 
+    #else
+    char *cstr = STR2CSTR(obj);
+    #endif
+    size_t size = RSTRING_LEN(obj) + 1;
+    if (cptr)  {
+      if (alloc) {
+	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;
+}
+
+
+
+
+
 SWIGINTERN VALUE
 SWIG_ruby_failed(void)
 {
@@ -1957,7 +2034,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2009,7 +2086,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/share/swig2.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2073,85 +2150,32 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
   return SWIG_TypeError;
 }
 
-
-SWIGINTERN swig_type_info*
-SWIG_pchar_descriptor(void)
-{
-  static int init = 0;
-  static swig_type_info* info = 0;
-  if (!init) {
-    info = SWIG_TypeQuery("_p_char");
-    init = 1;
+SWIGINTERN void TagLib_FileRef_close(TagLib::FileRef *self){
+    free_taglib_fileref(self);
   }
-  return info;
-}
 
+  static void free_taglib_fileref(void *ptr) {
+    TagLib::FileRef *fileref = (TagLib::FileRef *) ptr;
 
-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));
+    TagLib::Tag *tag = fileref->tag();
+    if (tag) {
+      SWIG_RubyUnlinkObjects(tag);
+      SWIG_RubyRemoveTracking(tag);
     }
-  } else {
-    return Qnil;
-  }
-}
-
-
-SWIGINTERNINLINE VALUE 
-SWIG_FromCharPtr(const char *cptr)
-{ 
-  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
-}
-
 
-SWIGINTERN int
-SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
-{
-  if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
-    char *cstr = StringValuePtr(obj); 
-    #else
-    char *cstr = STR2CSTR(obj);
-    #endif
-    size_t size = RSTRING_LEN(obj) + 1;
-    if (cptr)  {
-      if (alloc) {
-	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;
-      }
+    TagLib::AudioProperties *properties = fileref->audioProperties();
+    if (properties) {
+      SWIG_RubyUnlinkObjects(properties);
+      SWIG_RubyRemoveTracking(properties);
     }
-  }  
-  return SWIG_TypeError;
-}
-
 
+    SWIG_RubyUnlinkObjects(ptr);
+    SWIG_RubyRemoveTracking(ptr);
 
+    delete fileref;
+  }
 
-swig_class SwigClassString;
+static swig_class SwigClassString;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
@@ -2192,7 +2216,7 @@ free_TagLib_String(TagLib::String *arg1) {
     delete arg1;
 }
 
-swig_class SwigClassTag;
+static swig_class SwigClassTag;
 
 SWIGINTERN void
 free_TagLib_Tag(TagLib::Tag *arg1) {
@@ -2715,7 +2739,7 @@ fail:
 }
 
 
-swig_class SwigClassAudioProperties;
+static swig_class SwigClassAudioProperties;
 
 SWIGINTERN void
 free_TagLib_AudioProperties(TagLib::AudioProperties *arg1) {
@@ -2819,7 +2843,7 @@ fail:
 }
 
 
-swig_class SwigClassFile;
+static swig_class SwigClassFile;
 
 SWIGINTERN void
 free_TagLib_File(TagLib::File *arg1) {
@@ -2832,7 +2856,7 @@ _wrap_File_name(int argc, VALUE *argv, VALUE self) {
   TagLib::File *arg1 = (TagLib::File *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  TagLib::FileName result;
+  SwigValueWrapper< TagLib::FileName > result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -2843,8 +2867,10 @@ _wrap_File_name(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::File const *","name", 1, self )); 
   }
   arg1 = reinterpret_cast< TagLib::File * >(argp1);
-  result = (TagLib::FileName)((TagLib::File const *)arg1)->name();
-  vresult = SWIG_FromCharPtr((const char *)result);
+  result = ((TagLib::File const *)arg1)->name();
+  {
+    vresult = taglib_filename_to_ruby_string(result);
+  }
   return vresult;
 fail:
   return Qnil;
@@ -3124,8 +3150,7 @@ SWIGINTERN VALUE _wrap_File_find(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_File_find__SWIG_2(nargs, args, self);
@@ -3138,8 +3163,7 @@ SWIGINTERN VALUE _wrap_File_find(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -3158,8 +3182,7 @@ SWIGINTERN VALUE _wrap_File_find(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -3167,8 +3190,7 @@ SWIGINTERN VALUE _wrap_File_find(int nargs, VALUE *args, VALUE self) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+          int res = SWIG_AsCharPtrAndSize(argv[3], 0, NULL, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_File_find__SWIG_0(nargs, args, self);
@@ -3317,8 +3339,7 @@ SWIGINTERN VALUE _wrap_File_rfind(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_File_rfind__SWIG_2(nargs, args, self);
@@ -3331,8 +3352,7 @@ SWIGINTERN VALUE _wrap_File_rfind(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -3351,8 +3371,7 @@ SWIGINTERN VALUE _wrap_File_rfind(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -3360,8 +3379,7 @@ SWIGINTERN VALUE _wrap_File_rfind(int nargs, VALUE *args, VALUE self) {
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          void *vptr = 0;
-          int res = SWIG_ConvertPtr(argv[3], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+          int res = SWIG_AsCharPtrAndSize(argv[3], 0, NULL, 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_File_rfind__SWIG_0(nargs, args, self);
@@ -3514,8 +3532,7 @@ SWIGINTERN VALUE _wrap_File_insert(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_File_insert__SWIG_2(nargs, args, self);
@@ -3528,8 +3545,7 @@ SWIGINTERN VALUE _wrap_File_insert(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -3548,8 +3564,7 @@ SWIGINTERN VALUE _wrap_File_insert(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_TagLib__File, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      void *vptr = 0;
-      int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_TagLib__ByteVector, 0);
+      int res = SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         {
@@ -4051,7 +4066,7 @@ fail:
 }
 
 
-swig_class SwigClassFileRef;
+static swig_class SwigClassFileRef;
 
 SWIGINTERN VALUE
 _wrap_new_FileRef__SWIG_0(int argc, VALUE *argv, VALUE self) {
@@ -4071,12 +4086,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_new_FileRef__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   bool arg2 ;
   TagLib::AudioProperties::ReadStyle arg3 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   int val3 ;
@@ -4086,11 +4098,9 @@ _wrap_new_FileRef__SWIG_1(int argc, VALUE *argv, VALUE self) {
   if ((argc < 3) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::FileRef", 2, argv[1] ));
@@ -4104,21 +4114,16 @@ _wrap_new_FileRef__SWIG_1(int argc, VALUE *argv, VALUE self) {
   result = (TagLib::FileRef *)new TagLib::FileRef(arg1,arg2,arg3);
   DATA_PTR(self) = result;
   SWIG_RubyAddTracking(result, self);
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
 _wrap_new_FileRef__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   bool arg2 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   TagLib::FileRef *result = 0 ;
@@ -4126,11 +4131,9 @@ _wrap_new_FileRef__SWIG_2(int argc, VALUE *argv, VALUE self) {
   if ((argc < 2) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::FileRef", 2, argv[1] ));
@@ -4139,37 +4142,28 @@ _wrap_new_FileRef__SWIG_2(int argc, VALUE *argv, VALUE self) {
   result = (TagLib::FileRef *)new TagLib::FileRef(arg1,arg2);
   DATA_PTR(self) = result;
   SWIG_RubyAddTracking(result, self);
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
 _wrap_new_FileRef__SWIG_3(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   TagLib::FileRef *result = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
   result = (TagLib::FileRef *)new TagLib::FileRef(arg1);
   DATA_PTR(self) = result;
   SWIG_RubyAddTracking(result, self);
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return self;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
@@ -4543,12 +4537,9 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_FileRef_create__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   bool arg2 ;
   TagLib::AudioProperties::ReadStyle arg3 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   int val3 ;
@@ -4559,11 +4550,9 @@ _wrap_FileRef_create__SWIG_0(int argc, VALUE *argv, VALUE self) {
   if ((argc < 3) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef::create", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::FileRef::create", 2, argv[1] ));
@@ -4574,23 +4563,18 @@ _wrap_FileRef_create__SWIG_0(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "TagLib::AudioProperties::ReadStyle","TagLib::FileRef::create", 3, argv[2] ));
   } 
   arg3 = static_cast< TagLib::AudioProperties::ReadStyle >(val3);
-  result = (TagLib::File *)TagLib::FileRef::create((char const *)arg1,arg2,arg3);
+  result = (TagLib::File *)TagLib::FileRef::create(arg1,arg2,arg3);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__File, 0 |  0 );
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return vresult;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
 _wrap_FileRef_create__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   bool arg2 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
   bool val2 ;
   int ecode2 = 0 ;
   TagLib::File *result = 0 ;
@@ -4599,49 +4583,38 @@ _wrap_FileRef_create__SWIG_1(int argc, VALUE *argv, VALUE self) {
   if ((argc < 2) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef::create", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
   ecode2 = SWIG_AsVal_bool(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TagLib::FileRef::create", 2, argv[1] ));
   } 
   arg2 = static_cast< bool >(val2);
-  result = (TagLib::File *)TagLib::FileRef::create((char const *)arg1,arg2);
+  result = (TagLib::File *)TagLib::FileRef::create(arg1,arg2);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__File, 0 |  0 );
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return vresult;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
 
 SWIGINTERN VALUE
 _wrap_FileRef_create__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  TagLib::FileName arg1 = (TagLib::FileName) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
+  SwigValueWrapper< TagLib::FileName > arg1 ;
   TagLib::File *result = 0 ;
   VALUE vresult = Qnil;
   
   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), Ruby_Format_TypeError( "", "TagLib::FileName","TagLib::FileRef::create", 1, argv[0] ));
+  {
+    arg1 = ruby_string_to_taglib_filename(argv[0]);
   }
-  arg1 = reinterpret_cast< TagLib::FileName >(buf1);
-  result = (TagLib::File *)TagLib::FileRef::create((char const *)arg1);
+  result = (TagLib::File *)TagLib::FileRef::create(arg1);
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_TagLib__File, 0 |  0 );
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return vresult;
 fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
   return Qnil;
 }
 
@@ -4709,11 +4682,31 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_FileRef_close(int argc, VALUE *argv, VALUE self) {
+  TagLib::FileRef *arg1 = (TagLib::FileRef *) 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_TagLib__FileRef, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::FileRef *","close", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::FileRef * >(argp1);
+  TagLib_FileRef_close(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
 static swig_type_info _swigt__p_TagLib__AudioProperties = {"_p_TagLib__AudioProperties", "TagLib::AudioProperties *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_TagLib__ByteVector = {"_p_TagLib__ByteVector", "TagLib::ByteVector *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__File = {"_p_TagLib__File", "TagLib::File *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__FileRef = {"_p_TagLib__FileRef", "TagLib::FileRef *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_TagLib__FileRef__FileTypeResolver = {"_p_TagLib__FileRef__FileTypeResolver", "TagLib::FileRef::FileTypeResolver *", 0, 0, (void*)0, 0};
@@ -4727,7 +4720,6 @@ static swig_type_info _swigt__p_wchar_t = {"_p_wchar_t", "TagLib::wchar *|wchar_
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_TagLib__AudioProperties,
-  &_swigt__p_TagLib__ByteVector,
   &_swigt__p_TagLib__File,
   &_swigt__p_TagLib__FileRef,
   &_swigt__p_TagLib__FileRef__FileTypeResolver,
@@ -4741,7 +4733,6 @@ static swig_type_info *swig_type_initial[] = {
 };
 
 static swig_cast_info _swigc__p_TagLib__AudioProperties[] = {  {&_swigt__p_TagLib__AudioProperties, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_TagLib__ByteVector[] = {  {&_swigt__p_TagLib__ByteVector, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__File[] = {  {&_swigt__p_TagLib__File, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__FileRef[] = {  {&_swigt__p_TagLib__FileRef, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_TagLib__FileRef__FileTypeResolver[] = {  {&_swigt__p_TagLib__FileRef__FileTypeResolver, 0, 0, 0},{0, 0, 0, 0}};
@@ -4755,7 +4746,6 @@ static swig_cast_info _swigc__p_wchar_t[] = {  {&_swigt__p_wchar_t, 0, 0, 0},{0,
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_TagLib__AudioProperties,
-  _swigc__p_TagLib__ByteVector,
   _swigc__p_TagLib__File,
   _swigc__p_TagLib__FileRef,
   _swigc__p_TagLib__FileRef__FileTypeResolver,
@@ -5119,6 +5109,7 @@ SWIGEXPORT void Init_taglib_base(void) {
   rb_define_method(SwigClassFileRef.klass, "null?", VALUEFUNC(_wrap_FileRef_nullq___), -1);
   rb_define_method(SwigClassFileRef.klass, "==", VALUEFUNC(_wrap_FileRef___eq__), -1);
   rb_define_singleton_method(SwigClassFileRef.klass, "create", VALUEFUNC(_wrap_FileRef_create), -1);
+  rb_define_method(SwigClassFileRef.klass, "close", VALUEFUNC(_wrap_FileRef_close), -1);
   SwigClassFileRef.mark = 0;
   SwigClassFileRef.destroy = (void (*)(void *)) free_TagLib_FileRef;
   SwigClassFileRef.trackObjects = 1;