taglib-ruby 1.1.3 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +16 -0
  3. data/README.md +15 -11
  4. data/docs/taglib/mpeg.rb +1 -9
  5. data/ext/extconf_common.rb +21 -12
  6. data/ext/taglib_aiff/taglib_aiff.i +4 -0
  7. data/ext/taglib_aiff/taglib_aiff_wrap.cxx +222 -59
  8. data/ext/taglib_base/includes.i +14 -14
  9. data/ext/taglib_base/taglib_base.i +21 -0
  10. data/ext/taglib_base/taglib_base_wrap.cxx +289 -350
  11. data/ext/taglib_flac/taglib_flac.i +7 -3
  12. data/ext/taglib_flac/taglib_flac_wrap.cxx +233 -336
  13. data/ext/taglib_flac_picture/taglib_flac_picture.i +4 -0
  14. data/ext/taglib_flac_picture/taglib_flac_picture_wrap.cxx +125 -71
  15. data/ext/taglib_id3v1/taglib_id3v1_wrap.cxx +92 -51
  16. data/ext/taglib_id3v2/taglib_id3v2.i +5 -0
  17. data/ext/taglib_id3v2/taglib_id3v2_wrap.cxx +524 -414
  18. data/ext/taglib_mp4/taglib_mp4.i +21 -18
  19. data/ext/taglib_mp4/taglib_mp4_wrap.cxx +2062 -1467
  20. data/ext/taglib_mpeg/taglib_mpeg.i +5 -0
  21. data/ext/taglib_mpeg/taglib_mpeg_wrap.cxx +414 -300
  22. data/ext/taglib_ogg/taglib_ogg.i +0 -2
  23. data/ext/taglib_ogg/taglib_ogg_wrap.cxx +44 -42
  24. data/ext/taglib_vorbis/taglib_vorbis_wrap.cxx +27 -48
  25. data/ext/taglib_wav/taglib_wav.i +5 -2
  26. data/ext/taglib_wav/taglib_wav_wrap.cxx +179 -89
  27. data/lib/taglib/version.rb +3 -3
  28. data/tasks/ext.rake +23 -39
  29. data/tasks/swig.rake +14 -4
  30. data/test/id3v2_write_test.rb +1 -1
  31. data/test/wav_examples_test.rb +1 -1
  32. data/test/wav_file_test.rb +1 -1
  33. data/test/wav_file_write_test.rb +6 -6
  34. metadata +3 -3
data/ext/taglib_mp4/taglib_mp4.i CHANGED
@@ -5,8 +5,6 @@
5
5
  #include <taglib/mp4properties.h>
6
6
  #include <taglib/mp4tag.h>
7
7
  #include <taglib/mp4atom.h>
8
- // To resolve some symbols, like AtomDataType in Item.
9
- using namespace TagLib::MP4;
10
8
  %}
11
9
 
12
10
  %include "../taglib_base/includes.i"
@@ -77,6 +75,8 @@ namespace TagLib {
77
75
 
78
76
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::begin;
79
77
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::end;
78
+ %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::cbegin;
79
+ %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::cend;
80
80
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::insert;
81
81
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::find;
82
82
  // We will create a safe version of these below in an %extend
@@ -84,16 +84,6 @@ namespace TagLib {
84
84
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::erase(Iterator);
85
85
  %ignore TagLib::Map<TagLib::String, TagLib::MP4::Item>::erase(const TagLib::String &);
86
86
 
87
- %ignore TagLib::MP4::Tag::itemListMap; // Deprecated.
88
-
89
- %rename("__getitem__") TagLib::MP4::Tag::item;
90
-
91
- // We will create a safe version of these below in an %extend
92
- // TagLib::MP4::Tag::item does not need to be reimplemented as it return an Item by value.
93
- %ignore TagLib::MP4::Tag::setItem;
94
- %ignore TagLib::MP4::Tag::removeItem;
95
-
96
- %include <taglib/mp4tag.h>
97
87
 
98
88
  %typemap(out) TagLib::MP4::CoverArtList {
99
89
  $result = taglib_cover_art_list_to_ruby_array($1);
@@ -117,13 +107,32 @@ namespace TagLib {
117
107
  %ignore TagLib::MP4::Item::setAtomDataType;
118
108
 
119
109
  %warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) IntPair;
110
+ %ignore ItemMap;
120
111
  %include <taglib/mp4item.h>
121
112
 
113
+ namespace TagLib {
114
+ namespace MP4 {
115
+ %template(ItemMap) ::TagLib::Map<String, Item>;
116
+ }
117
+ }
118
+
119
+ %ignore TagLib::MP4::Tag::itemListMap; // Deprecated.
120
+
121
+ %rename("__getitem__") TagLib::MP4::Tag::item;
122
+
123
+ // We will create a safe version of these below in an %extend
124
+ // TagLib::MP4::Tag::item does not need to be reimplemented as it return an Item by value.
125
+ %ignore TagLib::MP4::Tag::setItem;
126
+ %ignore TagLib::MP4::Tag::removeItem;
127
+
128
+ %include <taglib/mp4tag.h>
129
+
122
130
  %freefunc TagLib::MP4::File "free_taglib_mp4_file";
123
131
 
124
132
  // Ignore IOStream and all the constructors using it.
125
133
  %ignore IOStream;
126
134
  %ignore TagLib::MP4::File::File(IOStream *, bool, Properties::ReadStyle);
135
+ %ignore TagLib::MP4::File::File(IOStream *, bool, Properties::ReadStyle, ItemFactory *);
127
136
  %ignore TagLib::MP4::File::File(IOStream *, bool);
128
137
  %ignore TagLib::MP4::File::File(IOStream *);
129
138
  %ignore TagLib::MP4::File::isSupported(IOStream *);
@@ -136,12 +145,6 @@ namespace TagLib {
136
145
  %rename("mp4_tag?") TagLib::MP4::File::hasMP4Tag;
137
146
  %include <taglib/mp4file.h>
138
147
 
139
- namespace TagLib {
140
- namespace MP4 {
141
- %template(ItemMap) ::TagLib::Map<String, Item>;
142
- }
143
- }
144
-
145
148
  // Unlink Ruby objects from the deleted C++ objects. Otherwise Ruby code
146
149
  // that calls a method on a tag after the file is deleted segfaults.
147
150
  %begin %{