taglib-ruby 1.0.1 → 1.1.2

data/ext/taglib_base/extconf.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 require 'extconf_common'
 

data/ext/taglib_base/includes.i

@@ -3,6 +3,7 @@
 // Undefine macros we don't need for wrapping
 #define TAGLIB_EXPORT
 #define TAGLIB_IGNORE_MISSING_DESTRUCTOR
+#define TAGLIB_DEPRECATED
 
 // Replaces the typemap from swigtype.swg and just adds the line
 // SWIG_RubyUnlinkObjects. This is done to be safe in the case when a
@@ -19,6 +20,8 @@
 %{
 #include <taglib/tstring.h>
 #include <taglib/tstringlist.h>
+#include <taglib/tbytevector.h>
+#include <taglib/tbytevectorlist.h>
 #include <taglib/tfile.h>
 
 #if defined(HAVE_RUBY_ENCODING_H) && HAVE_RUBY_ENCODING_H
@@ -88,6 +91,28 @@ TagLib::StringList ruby_array_to_taglib_string_list(VALUE ary) {
   return result;
 }
 
+VALUE taglib_bytevectorlist_to_ruby_array(const TagLib::ByteVectorList & list) {
+  VALUE ary = rb_ary_new2(list.size());
+  for (TagLib::ByteVectorList::ConstIterator it = list.begin(); it != list.end(); it++) {
+    VALUE s = taglib_bytevector_to_ruby_string(*it);
+    rb_ary_push(ary, s);
+  }
+  return ary;
+}
+
+TagLib::ByteVectorList ruby_array_to_taglib_bytevectorlist(VALUE ary) {
+  TagLib::ByteVectorList result = TagLib::ByteVectorList();
+  if (NIL_P(ary)) {
+    return result;
+  }
+  for (long i = 0; i < RARRAY_LEN(ary); i++) {
+    VALUE e = rb_ary_entry(ary, i);
+    TagLib::ByteVector s = ruby_string_to_taglib_bytevector(e);
+    result.append(s);
+  }
+  return result;
+}
+
 VALUE taglib_filename_to_ruby_string(TagLib::FileName filename) {
   VALUE result;
 #ifdef _WIN32

data/ext/taglib_base/taglib_base.i

@@ -2,6 +2,7 @@
 %{
 #include <taglib/taglib.h>
 #include <taglib/tbytevector.h>
+#include <taglib/tbytevectorlist.h>
 #include <taglib/tlist.h>
 #include <taglib/fileref.h>
 #include <taglib/tag.h>
@@ -12,6 +13,7 @@
 namespace TagLib {
   class StringList;
   class ByteVector;
+  class ByteVectorList;
 
   class String {
     public:
@@ -57,6 +59,22 @@ namespace TagLib {
 }
 %typemap(typecheck) const TagLib::ByteVector & = char *;
 
+// ByteVectorList
+%typemap(out) TagLib::ByteVectorList {
+  $result = taglib_bytevectorlist_to_ruby_array($1);
+}
+%typemap(out) TagLib::ByteVectorList * {
+  $result = taglib_bytevectorlist_to_ruby_array(*($1));
+}
+%typemap(in) TagLib::ByteVectorList & (TagLib::ByteVectorList tmp) {
+  tmp = ruby_array_to_taglib_bytevectorlist($input);
+  $1 = &tmp;
+}
+%typemap(in) TagLib::ByteVectorList * (TagLib::ByteVectorList tmp) {
+  tmp = ruby_array_to_taglib_bytevectorlist($input);
+  $1 = &tmp;
+}
+
 // String
 %typemap(out) TagLib::String {
   $result = taglib_string_to_ruby_string($1);
@@ -78,6 +96,9 @@ namespace TagLib {
   tmp = ruby_array_to_taglib_string_list($input);
   $1 = &tmp;
 }
+%typemap(typecheck, precedence=SWIG_TYPECHECK_LIST) TagLib::StringList {
+  $1 = TYPE($input) == T_ARRAY ? 1 : 0;
+}
 %apply TagLib::StringList { TagLib::StringList &, const TagLib::StringList & };
 
 %typemap(out) TagLib::FileName {