taglib-ruby 1.1.2 → 2.0.0

data/ext/taglib_base/includes.i

@@ -4,6 +4,7 @@
 #define TAGLIB_EXPORT
 #define TAGLIB_IGNORE_MISSING_DESTRUCTOR
 #define TAGLIB_DEPRECATED
+#define TAGLIB_MSVC_SUPPRESS_WARNING_NEEDS_TO_HAVE_DLL_INTERFACE
 
 // Replaces the typemap from swigtype.swg and just adds the line
 // SWIG_RubyUnlinkObjects. This is done to be safe in the case when a
@@ -36,34 +37,26 @@
 #endif
 
 VALUE taglib_bytevector_to_ruby_string(const TagLib::ByteVector &byteVector) {
-  if (byteVector.isNull()) {
-    return Qnil;
-  } else {
-    return rb_str_new(byteVector.data(), byteVector.size());
-  }
+  return rb_str_new(byteVector.data(), byteVector.size());
 }
 
 TagLib::ByteVector ruby_string_to_taglib_bytevector(VALUE s) {
   if (NIL_P(s)) {
-    return TagLib::ByteVector::null;
+    return TagLib::ByteVector();
   } else {
     return TagLib::ByteVector(RSTRING_PTR(StringValue(s)), RSTRING_LEN(s));
   }
 }
 
 VALUE taglib_string_to_ruby_string(const TagLib::String & string) {
-  if (string.isNull()) {
-    return Qnil;
-  } else {
-    VALUE result = rb_str_new2(string.toCString(true));
-    ASSOCIATE_UTF8_ENCODING(result);
-    return result;
-  }
+  VALUE result = rb_str_new2(string.toCString(true));
+  ASSOCIATE_UTF8_ENCODING(result);
+  return result;
 }
 
 TagLib::String ruby_string_to_taglib_string(VALUE s) {
   if (NIL_P(s)) {
-    return TagLib::String::null;
+    return TagLib::String();
   } else {
     return TagLib::String(RSTRING_PTR(CONVERT_TO_UTF8(StringValue(s))), TagLib::String::UTF8);
   }
@@ -152,6 +145,13 @@ TagLib::FileName ruby_string_to_taglib_filename(VALUE s) {
 #endif
 }
 
+VALUE taglib_offset_t_to_ruby_int(TagLib::offset_t off) {
+#ifdef _WIN32
+  return LL2NUM(off);
+#else
+  return OFFT2NUM(off);
+#endif
+}
 %}
 
 // vim: set filetype=cpp sw=2 ts=2 expandtab:

data/ext/taglib_base/taglib_base.i

@@ -26,6 +26,7 @@ namespace TagLib {
   typedef unsigned char uchar;
   typedef unsigned int  uint;
   typedef unsigned long ulong;
+  using offset_t = long long;
 }
 
 %constant int TAGLIB_MAJOR_VERSION = TAGLIB_MAJOR_VERSION;
@@ -34,13 +35,25 @@ namespace TagLib {
 
 // Rename setters to Ruby convention (combining SWIG rename functions
 // does not seem to be possible, thus resort to some magic)
+// We used to do this with one "command" filter, but support for that was
+// removed in SWIG 4.1.0. This is a bit uglier because we need one filter for
+// setOne, one for setOneTwo, and one for setOneTwoThree. Looks like we don't
+// need one for 4 yet.
 // setFoo -> foo=
-%rename("%(command: perl -e \"print lc(join('_', split(/(?=[A-Z])/, substr(@ARGV[0], 3)))), '='\" )s",
-        regexmatch$name="^set[A-Z]") "";
+%rename("%(regex:/set([A-Z][a-z]*)([A-Z][a-z]*)([A-Z][a-z]*)/\\L\\1_\\2_\\3=/)s",
+        regexmatch$name="^set([A-Z][a-z]*){3}$") "";
+%rename("%(regex:/set([A-Z][a-z]*)([A-Z][a-z]*)/\\L\\1_\\2=/)s",
+        regexmatch$name="^set([A-Z][a-z]*){2}$") "";
+%rename("%(regex:/set([A-Z][a-z]*)/\\L\\1=/)s",
+        regexmatch$name="^set([A-Z][a-z]*)$") "";
 
 // isFoo -> foo?
-%rename("%(command: perl -e \"print lc(join('_', split(/(?=[A-Z])/, substr(@ARGV[0], 2)))), '?'\" )s",
-        regexmatch$name="^is[A-Z]") "";
+%rename("%(regex:/is([A-Z][a-z]*)([A-Z][a-z]*)([A-Z][a-z]*)/\\L\\1_\\2_\\3?/)s",
+        regexmatch$name="^is([A-Z][a-z]*){3}$") "";
+%rename("%(regex:/is([A-Z][a-z]*)([A-Z][a-z]*)/\\L\\1_\\2?/)s",
+        regexmatch$name="^is([A-Z][a-z]*){2}$") "";
+%rename("%(regex:/is([A-Z][a-z]*)/\\L\\1?/)s",
+        regexmatch$name="^is([A-Z][a-z]*)$") "";
 
 // ByteVector
 %typemap(out) TagLib::ByteVector {
@@ -113,6 +126,10 @@ namespace TagLib {
 %typemap(typecheck) TagLib::FileName = char *;
 %feature("valuewrapper") TagLib::FileName;
 
+%typemap(out) TagLib::offset_t {
+  $result = taglib_offset_t_to_ruby_int($1);
+}
+
 %ignore TagLib::List::operator[];
 %ignore TagLib::List::operator=;
 %ignore TagLib::List::operator!=;
@@ -123,6 +140,10 @@ namespace TagLib {
 %ignore TagLib::Tag::setProperties;
 %ignore TagLib::Tag::removeUnsupportedProperties;
 
+%ignore TagLib::Tag::complexProperties;
+%ignore TagLib::Tag::setComplexProperties;
+%ignore TagLib::Tag::complexPropertyKeys;
+
 %include <taglib/tag.h>
 
 %ignore TagLib::AudioProperties::length; // Deprecated.
@@ -135,8 +156,20 @@ namespace TagLib {
 %ignore TagLib::File::setProperties;
 %ignore TagLib::File::removeUnsupportedProperties;
 
+%ignore TagLib::File::complexProperties;
+%ignore TagLib::File::setComplexProperties;
+%ignore TagLib::File::complexPropertyKeys;
+
 %include <taglib/tfile.h>
 
+%ignore TagLib::FileRef::properties;
+%ignore TagLib::FileRef::setProperties;
+%ignore TagLib::FileRef::removeUnsupportedProperties;
+
+%ignore TagLib::FileRef::complexProperties;
+%ignore TagLib::FileRef::setComplexProperties;
+%ignore TagLib::FileRef::complexPropertyKeys;
+
 // Ignore IOStream and all the constructors using it.
 %ignore IOStream;
 %ignore TagLib::FileRef::FileRef(IOStream*, bool, AudioProperties::ReadStyle);