Merge pull request #103 from iamAzeem/support-for-chap-and-ctoc-frames

Added support for CTOC and CHAP frames.

Author: robinst

ext/taglib_base/includes.i

@@ -19,6 +19,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 +90,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

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);

ext/taglib_id3v2/taglib_id3v2.i

@@ -5,12 +5,16 @@
 #include <taglib/id3v2tag.h>
 #include <taglib/id3v2header.h>
 
+#include <taglib/tbytevectorlist.h>
+
 #include <taglib/attachedpictureframe.h>
+#include <taglib/chapterframe.h>
 #include <taglib/commentsframe.h>
 #include <taglib/generalencapsulatedobjectframe.h>
 #include <taglib/popularimeterframe.h>
 #include <taglib/privateframe.h>
 #include <taglib/relativevolumeframe.h>
+#include <taglib/tableofcontentsframe.h>
 #include <taglib/textidentificationframe.h>
 #include <taglib/uniquefileidentifierframe.h>
 #include <taglib/unknownframe.h>
@@ -36,8 +40,12 @@ VALUE taglib_id3v2_frame_to_ruby_object(const TagLib::ID3v2::Frame *frame) {
     ti = SWIGTYPE_p_TagLib__ID3v2__UnknownFrame;
   else if (id == "APIC")
     ti = SWIGTYPE_p_TagLib__ID3v2__AttachedPictureFrame;
+  else if (id == "CHAP")
+    ti = SWIGTYPE_p_TagLib__ID3v2__ChapterFrame;
   else if (id == "COMM")
     ti = SWIGTYPE_p_TagLib__ID3v2__CommentsFrame;
+  else if (id == "CTOC")
+    ti = SWIGTYPE_p_TagLib__ID3v2__TableOfContentsFrame;
   else if (id == "GEOB")
     ti = SWIGTYPE_p_TagLib__ID3v2__GeneralEncapsulatedObjectFrame;
   else if (id == "POPM")
@@ -126,12 +134,21 @@ VALUE taglib_id3v2_framelist_to_ruby_array(TagLib::ID3v2::FrameList *list) {
 %include <taglib/attachedpictureframe.h>
 
 // Ignore the unified property interface.
+%ignore TagLib::ID3v2::ChapterFrame::asProperties;
 %ignore TagLib::ID3v2::CommentsFrame::asProperties;
+%ignore TagLib::ID3v2::TableOfContentsFrame::asProperties;
+
+%rename("element_id=") TagLib::ID3v2::ChapterFrame::setElementID(const ByteVector &eID);
+%include <taglib/chapterframe.h>
 
 %include <taglib/commentsframe.h>
 %include <taglib/generalencapsulatedobjectframe.h>
 %include <taglib/popularimeterframe.h>
 %include <taglib/privateframe.h>
+
+%rename("element_id=") TagLib::ID3v2::TableOfContentsFrame::setElementID(const ByteVector &eID);
+%include <taglib/tableofcontentsframe.h>
+
 %include <taglib/textidentificationframe.h>
 
 // Ignore the unified property interface.