taglib-ruby 0.7.1 → 1.0.0

data/docs/taglib/mpeg.rb

@@ -14,7 +14,7 @@ module TagLib::MPEG
     APE     = 0x0004
     AllTags = 0xffff
 
-    # {include:TagLib::FileRef.open}
+    # {include:::TagLib::FileRef.open}
     #
     # @param (see #initialize)
     # @yield [file] the {File} object, as obtained by {#initialize}
@@ -103,6 +103,24 @@ module TagLib::MPEG
     # @return [Boolean] whether stripping was successful
     def strip(tags=TagLib::MPEG::File::AllTags)
     end
+
+    # @return [Boolean] Whether or not the file on disk actually has an ID3v1 tag.
+    #
+    # @since 1.0.0
+    def id3v1_tag?
+    end
+
+    # @return [Boolean] Whether or not the file on disk actually has an ID3v2 tag.
+    #
+    # @since 1.0.0
+    def id3v2_tag?
+    end
+
+    # @return [Boolean] Whether or not the file on disk actually has an APE tag.
+    #
+    # @since 1.0.0
+    def ape_tag?
+    end
   end
 
   # Audio properties for MPEG files.
@@ -153,6 +171,11 @@ module TagLib::MPEG
 
   # Xing VBR header.
   class XingHeader
+
+    Invalid = 0
+    Xing    = 1
+    VBRI    = 2
+
     # @return [true] if a valid Xing header is present
     def valid?
     end
@@ -164,5 +187,11 @@ module TagLib::MPEG
     # @return [Integer] total size of stream in bytes
     def total_size
     end
+
+    # @return [Integer] the type of the VBR header.
+    #
+    # @since 1.0.0
+    def type
+    end
   end
 end

data/docs/taglib/ogg.rb

@@ -29,10 +29,9 @@ module TagLib::Ogg
     def contains?(name)
     end
 
-    # Count the number of fields.
+    # Count the number of fields (including the pictures).
     #
-    # @return [Integer] the number of fields in the comment (name-value
-    #   pairs)
+    # @return [Integer] the number of fields in the comment (name-value pairs)
     def field_count
     end
 
@@ -44,7 +43,7 @@ module TagLib::Ogg
     #       'GENRE' => ["Rock", "Pop"] }
     #
     # Note that the returned hash is read-only. Changing it will have no
-    # effect on the comment; use {#add_field} and {#remove_field} for
+    # effect on the comment; use {#add_field} and {#remove_fields} for
     # that.
     #
     # @return [Hash<String, Array<String>>] a hash from field names to
@@ -66,7 +65,50 @@ module TagLib::Ogg
     #   @param [String] value field value
     #
     # @return [void]
-    def remove_field
+    #
+    # @since 1.0.0
+    def remove_fields
+    end
+
+    # Remove all the fields.
+    #
+    # @since 1.0.0
+    def remove_all_fields
+    end
+
+    # @return [Boolean] True if the specified string is a valid Xiph comment key.
+    #
+    # @since 1.0.0
+    def self.check_key(key)
+    end
+
+    # @return [Array<TagLib::FLAC::Picture>] The list of the pictures associated to this comment.
+    #
+    # @since 1.0.0
+    def picture_list
+    end
+
+    # Add a picture.
+    # @param [TagLib::FLAC::Picture] picture
+    # @return [void]
+    #
+    # @since 1.0.0
+    def add_picture(picture)
+    end
+
+    # Remove a picture.
+    # @param [TagLib::FLAC::Picture] picture
+    # @return [void]
+    #
+    # @since 1.0.0
+    def remove_picture(picture)
+    end
+
+    # Remove all the pictures.
+    # @return [void]
+    #
+    # @since 1.0.0
+    def remove_all_pictures
     end
 
     # @return [String] vendor ID of the encoder used

data/docs/taglib/vorbis.rb

@@ -11,7 +11,7 @@ module TagLib::Ogg::Vorbis
   #   end
   #
   class File < TagLib::Ogg::File
-    # {include:TagLib::FileRef.open}
+    # {include:::TagLib::FileRef.open}
     #
     # @param (see #initialize)
     # @yield [file] the {File} object, as obtained by {#initialize}

data/docs/taglib/wav.rb

@@ -1,6 +1,9 @@
 # @since 0.7.0
 module TagLib::RIFF::WAV
 
+  FORMAT_UNKNOWN = 0x0000 # @since 1.0.0
+  FORMAT_PCM     = 0x0001 # @since 1.0.0
+
   # The file class for `.wav` files.
   #
   # @example Reading the title
@@ -24,7 +27,14 @@ module TagLib::RIFF::WAV
   # @see ID3v2::Tag ID3v2 examples.
   #
   class File < TagLib::File
-    # {include:TagLib::FileRef.open}
+
+    NoTags  = 0x0000
+    ID3v1   = 0x0001
+    ID3v2   = 0x0002
+    APE     = 0x0004
+    AllTags = 0xffff
+
+    # {include:::TagLib::FileRef.open}
     #
     # @param (see #initialize)
     # @yield [file] the {File} object, as obtained by {#initialize}
@@ -47,17 +57,60 @@ module TagLib::RIFF::WAV
     def tag
     end
 
+    # Returns the ID3v2 tag.
+    #
+    # @return [TagLib::ID3v2::Tag]
+    #
+    # @since 1.0.0
+    def id3v2_tag
+    end
+
     # Returns audio properties.
     #
     # @return [TagLib::RIFF::WAV::Properties]
     def audio_properties
     end
 
+    # Remove the tags matching the specified OR-ed types.
+    #
+    # @param [int] tags The types of tags to remove.
+    # @return [void]
+    #
+    # @since 1.0.0
+    def strip(tags=TagLib::RIFF::WAV::File::AllTags)
+    end
+
   end
 
   class Properties < TagLib::AudioProperties
-    # @return [Integer] Sample width
-    attr_reader :sample_width
+    # @return [Integer] Number of bits per audio sample.
+    #
+    # @since 1.0.0
+    attr_reader :bits_per_sample
+
+    # @return [Integer] Number of sample frames.
+    #
+    # @since 1.0.0
+    attr_reader :sample_frames
+
+    # @return [Integer] length of the file in seconds
+    #
+    # @since 1.0.0
+    attr_reader :length_in_seconds
+
+    # @return [Integer] length of the file in milliseconds
+    #
+    # @since 1.0.0
+    attr_reader :length_in_milliseconds
+
+    # @return [Integer] The format ID of the file.
+    #
+    # 0 for unknown, 1 for PCM, 2 for ADPCM, 3 for 32/64-bit IEEE754, and
+    # so forth. For further information, refer to the WAVE Form
+    # Registration Numbers in RFC 2361.
+    #
+    # @since 1.0.0
+    attr_reader :format
   end
 
 end

data/ext/extconf_common.rb

@@ -20,7 +20,14 @@ def error msg
   abort
 end
 
-dir_config('tag')
+if ENV.has_key?('TAGLIB_DIR') and !File.directory?(ENV['TAGLIB_DIR'])
+  error "When defined, the TAGLIB_DIR environment variable must point to a valid directory."
+end
+
+# If specified, use the TAGLIB_DIR environment variable as the prefix
+# for finding taglib headers and libs. See MakeMakefile#dir_config
+# for more details.
+dir_config('tag', (ENV['TAGLIB_DIR'] if ENV.has_key?('TAGLIB_DIR')))
 
 # When compiling statically, -lstdc++ would make the resulting .so to
 # have a dependency on an external libstdc++ instead of the static one.
@@ -35,7 +42,7 @@ if not have_library('tag')
 You must have taglib installed in order to use taglib-ruby.
 
 Debian/Ubuntu: sudo apt-get install libtag1-dev
-Fedora/RHEL: sudo yum install taglib-devel
+Fedora/RHEL: sudo dnf install taglib-devel
 Brew: brew install taglib
 MacPorts: sudo port install taglib
 DESC

data/ext/taglib_aiff/taglib_aiff.i

@@ -9,10 +9,26 @@
 %include "../taglib_base/includes.i"
 %import(module="taglib_base") "../taglib_base/taglib_base.i"
 
+// Deprecated
+%ignore TagLib::RIFF::AIFF::Properties::Properties(const ByteVector&, ReadStyle);
+%ignore TagLib::RIFF::AIFF::Properties::length;
+%ignore TagLib::RIFF::AIFF::Properties::sampleWidth;
+
 %include <taglib/aiffproperties.h>
 
 %freefunc TagLib::RIFF::AIFF::File "free_taglib_riff_aiff_file";
 
+// Ignore IOStream and all the constructors using it.
+%ignore IOStream;
+%ignore TagLib::RIFF::AIFF::File::File(IOStream *, bool, Properties::ReadStyle);
+%ignore TagLib::RIFF::AIFF::File::File(IOStream *, bool);
+%ignore TagLib::RIFF::AIFF::File::File(IOStream *);
+
+// Ignore the unified property interface.
+%ignore TagLib::RIFF::AIFF::File::properties;
+%ignore TagLib::RIFF::AIFF::File::setProperties;
+%ignore TagLib::RIFF::AIFF::File::removeUnsupportedProperties;
+
 %rename("id3v2_tag?") TagLib::RIFF::AIFF::File::hasID3v2Tag;
 
 namespace TagLib {

data/ext/taglib_aiff/taglib_aiff_wrap.cxx

@@ -1891,7 +1891,7 @@ VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
   if (byteVector.isNull()) {
     return Qnil;
   } else {
-    return rb_tainted_str_new(byteVector.data(), byteVector.size());
+    return rb_str_new(byteVector.data(), byteVector.size());
   }
 }
 
@@ -1907,7 +1907,7 @@ VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
   if (string.isNull()) {
     return Qnil;
   } else {
-    VALUE result = rb_tainted_str_new2(string.toCString(true));
+    VALUE result = rb_str_new2(string.toCString(true));
     ASSOCIATE_UTF8_ENCODING(result);
     return result;
   }
@@ -1947,9 +1947,9 @@ VALUE taglib_filename_to_ruby_string(TagLib::FileName filename) {
   VALUE result;
 #ifdef _WIN32
   const char *s = (const char *) filename;
-  result = rb_tainted_str_new2(s);
+  result = rb_str_new2(s);
 #else
-  result = rb_tainted_str_new2(filename);
+  result = rb_str_new2(filename);
 #endif
   ASSOCIATE_FILESYSTEM_ENCODING(result);
   return result;
@@ -2046,6 +2046,57 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
+  #define SWIG_From_long   LONG2NUM 
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_int  (int value)
+{    
+  return SWIG_From_long  (value);
+}
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_long  (unsigned long value)
+{
+  return ULONG2NUM(value); 
+}
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_unsigned_SS_int  (unsigned int value)
+{    
+  return SWIG_From_unsigned_SS_long  (value);
+}
+
+
+SWIGINTERNINLINE VALUE
+SWIG_From_bool  (bool value)
+{
+  return value ? Qtrue : Qfalse;
+}
+
+
+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 swig_type_info*
 SWIG_pchar_descriptor(void)
 {
@@ -2095,43 +2146,6 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
-
-  #define SWIG_From_long   LONG2NUM 
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_int  (int value)
-{    
-  return SWIG_From_long  (value);
-}
-
-
-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;
-}
-
-
-SWIGINTERNINLINE VALUE
-SWIG_From_bool  (bool value)
-{
-  return value ? Qtrue : Qfalse;
-}
-
 SWIGINTERN void TagLib_RIFF_AIFF_File_close(TagLib::RIFF::AIFF::File *self){
     free_taglib_riff_aiff_file(self);
   }
@@ -2185,9 +2199,10 @@ _wrap_Properties_allocate(VALUE self) {
 
 SWIGINTERN VALUE
 _wrap_new_Properties(int argc, VALUE *argv, VALUE self) {
-  TagLib::ByteVector *arg1 = 0 ;
+  TagLib::RIFF::AIFF::File *arg1 = (TagLib::RIFF::AIFF::File *) 0 ;
   TagLib::AudioProperties::ReadStyle arg2 ;
-  TagLib::ByteVector tmp1 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
   TagLib::RIFF::AIFF::Properties *result = 0 ;
@@ -2195,16 +2210,17 @@ _wrap_new_Properties(int argc, VALUE *argv, VALUE self) {
   if ((argc < 2) || (argc > 2)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
-  {
-    tmp1 = ruby_string_to_taglib_bytevector(argv[0]);
-    arg1 = &tmp1;
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__File, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::File *","Properties", 1, argv[0] )); 
   }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::File * >(argp1);
   ecode2 = SWIG_AsVal_int(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "TagLib::AudioProperties::ReadStyle","Properties", 2, argv[1] ));
   } 
   arg2 = static_cast< TagLib::AudioProperties::ReadStyle >(val2);
-  result = (TagLib::RIFF::AIFF::Properties *)new TagLib::RIFF::AIFF::Properties((TagLib::ByteVector const &)*arg1,arg2);
+  result = (TagLib::RIFF::AIFF::Properties *)new TagLib::RIFF::AIFF::Properties(arg1,arg2);
   DATA_PTR(self) = result;
   SWIG_RubyAddTracking(result, self);
   return self;
@@ -2220,7 +2236,31 @@ free_TagLib_RIFF_AIFF_Properties(TagLib::RIFF::AIFF::Properties *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_Properties_length(int argc, VALUE *argv, VALUE self) {
+_wrap_Properties_length_in_seconds(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","lengthInSeconds", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
+  result = (int)((TagLib::RIFF::AIFF::Properties const *)arg1)->lengthInSeconds();
+  vresult = SWIG_From_int(static_cast< int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Properties_length_in_milliseconds(int argc, VALUE *argv, VALUE self) {
   TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2232,10 +2272,10 @@ _wrap_Properties_length(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","length", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","lengthInMilliseconds", 1, self )); 
   }
   arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
-  result = (int)((TagLib::RIFF::AIFF::Properties const *)arg1)->length();
+  result = (int)((TagLib::RIFF::AIFF::Properties const *)arg1)->lengthInMilliseconds();
   vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
@@ -2316,7 +2356,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Properties_sample_width(int argc, VALUE *argv, VALUE self) {
+_wrap_Properties_bits_per_sample(int argc, VALUE *argv, VALUE self) {
   TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -2328,10 +2368,10 @@ _wrap_Properties_sample_width(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","sampleWidth", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","bitsPerSample", 1, self )); 
   }
   arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
-  result = (int)((TagLib::RIFF::AIFF::Properties const *)arg1)->sampleWidth();
+  result = (int)((TagLib::RIFF::AIFF::Properties const *)arg1)->bitsPerSample();
   vresult = SWIG_From_int(static_cast< int >(result));
   return vresult;
 fail:
@@ -2339,11 +2379,111 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Properties_sample_frames(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  unsigned int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","sampleFrames", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
+  result = (unsigned int)((TagLib::RIFF::AIFF::Properties const *)arg1)->sampleFrames();
+  vresult = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Properties_aiff_cq___(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","isAiffC", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
+  result = (bool)((TagLib::RIFF::AIFF::Properties const *)arg1)->isAiffC();
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Properties_compression_type(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  TagLib::ByteVector result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","compressionType", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
+  result = ((TagLib::RIFF::AIFF::Properties const *)arg1)->compressionType();
+  {
+    vresult = taglib_bytevector_to_ruby_string(result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_Properties_compression_name(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::Properties *arg1 = (TagLib::RIFF::AIFF::Properties *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  TagLib::String result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::Properties const *","compressionName", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::Properties * >(argp1);
+  result = ((TagLib::RIFF::AIFF::Properties const *)arg1)->compressionName();
+  {
+    vresult = taglib_string_to_ruby_string(result);
+  }
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 static swig_class SwigClassFile;
 
 SWIGINTERN VALUE
 _wrap_new_File__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  SwigValueWrapper< TagLib::FileName > arg1 ;
+  TagLib::FileName arg1 ;
   bool arg2 ;
   TagLib::RIFF::AIFF::Properties::ReadStyle arg3 ;
   bool val2 ;
@@ -2382,7 +2522,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_new_File__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  SwigValueWrapper< TagLib::FileName > arg1 ;
+  TagLib::FileName arg1 ;
   bool arg2 ;
   bool val2 ;
   int ecode2 = 0 ;
@@ -2430,7 +2570,7 @@ _wrap_File_allocate(VALUE self) {
 
 SWIGINTERN VALUE
 _wrap_new_File__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  SwigValueWrapper< TagLib::FileName > arg1 ;
+  TagLib::FileName arg1 ;
   TagLib::RIFF::AIFF::File *result = 0 ;
   
   if ((argc < 1) || (argc > 1)) {
@@ -2586,6 +2726,30 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_File_id3v2_tagq___(int argc, VALUE *argv, VALUE self) {
+  TagLib::RIFF::AIFF::File *arg1 = (TagLib::RIFF::AIFF::File *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_TagLib__RIFF__AIFF__File, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "TagLib::RIFF::AIFF::File const *","hasID3v2Tag", 1, self )); 
+  }
+  arg1 = reinterpret_cast< TagLib::RIFF::AIFF::File * >(argp1);
+  result = (bool)((TagLib::RIFF::AIFF::File const *)arg1)->hasID3v2Tag();
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_File_close(int argc, VALUE *argv, VALUE self) {
   TagLib::RIFF::AIFF::File *arg1 = (TagLib::RIFF::AIFF::File *) 0 ;
@@ -2917,11 +3081,16 @@ SWIGEXPORT void Init_taglib_aiff(void) {
   SWIG_TypeClientData(SWIGTYPE_p_TagLib__RIFF__AIFF__Properties, (void *) &SwigClassProperties);
   rb_define_alloc_func(SwigClassProperties.klass, _wrap_Properties_allocate);
   rb_define_method(SwigClassProperties.klass, "initialize", VALUEFUNC(_wrap_new_Properties), -1);
-  rb_define_method(SwigClassProperties.klass, "length", VALUEFUNC(_wrap_Properties_length), -1);
+  rb_define_method(SwigClassProperties.klass, "length_in_seconds", VALUEFUNC(_wrap_Properties_length_in_seconds), -1);
+  rb_define_method(SwigClassProperties.klass, "length_in_milliseconds", VALUEFUNC(_wrap_Properties_length_in_milliseconds), -1);
   rb_define_method(SwigClassProperties.klass, "bitrate", VALUEFUNC(_wrap_Properties_bitrate), -1);
   rb_define_method(SwigClassProperties.klass, "sample_rate", VALUEFUNC(_wrap_Properties_sample_rate), -1);
   rb_define_method(SwigClassProperties.klass, "channels", VALUEFUNC(_wrap_Properties_channels), -1);
-  rb_define_method(SwigClassProperties.klass, "sample_width", VALUEFUNC(_wrap_Properties_sample_width), -1);
+  rb_define_method(SwigClassProperties.klass, "bits_per_sample", VALUEFUNC(_wrap_Properties_bits_per_sample), -1);
+  rb_define_method(SwigClassProperties.klass, "sample_frames", VALUEFUNC(_wrap_Properties_sample_frames), -1);
+  rb_define_method(SwigClassProperties.klass, "aiff_c?", VALUEFUNC(_wrap_Properties_aiff_cq___), -1);
+  rb_define_method(SwigClassProperties.klass, "compression_type", VALUEFUNC(_wrap_Properties_compression_type), -1);
+  rb_define_method(SwigClassProperties.klass, "compression_name", VALUEFUNC(_wrap_Properties_compression_name), -1);
   SwigClassProperties.mark = 0;
   SwigClassProperties.destroy = (void (*)(void *)) free_TagLib_RIFF_AIFF_Properties;
   SwigClassProperties.trackObjects = 1;
@@ -2933,6 +3102,7 @@ SWIGEXPORT void Init_taglib_aiff(void) {
   rb_define_method(SwigClassFile.klass, "tag", VALUEFUNC(_wrap_File_tag), -1);
   rb_define_method(SwigClassFile.klass, "audio_properties", VALUEFUNC(_wrap_File_audio_properties), -1);
   rb_define_method(SwigClassFile.klass, "save", VALUEFUNC(_wrap_File_save), -1);
+  rb_define_method(SwigClassFile.klass, "id3v2_tag?", VALUEFUNC(_wrap_File_id3v2_tagq___), -1);
   rb_define_method(SwigClassFile.klass, "close", VALUEFUNC(_wrap_File_close), -1);
   SwigClassFile.mark = 0;
   SwigClassFile.destroy = (void (*)(void *)) free_taglib_riff_aiff_file;