kdesupport/taglib/mpeg/id3v2

[Scott Wheeler]

SVN commit 579369 by wheeler:

Patches from Aaron VonderHaar for a GEOB frame implementation.

Nice patches Aaron!

CCMAIL:taglib-devel at kde.org
CCMAIL:gruen0aermel at gmail.com



 M  +2 -0      frames/Makefile.am  
 A             frames/generalencapsulatedobjectframe.cpp   [License: LGPL (v2.1) (wrong address)]
 A             frames/generalencapsulatedobjectframe.h   [License: LGPL (v2.1) (wrong address)]
 M  +1 -1      frames/textidentificationframe.cpp  
 M  +6 -0      id3v2framefactory.cpp  


--- trunk/kdesupport/taglib/mpeg/id3v2/frames/Makefile.am #579368:579369
@@ -9,6 +9,7 @@
 libframes_la_SOURCES = \
 	attachedpictureframe.cpp \
 	commentsframe.cpp \
+	generalencapsulatedobjectframe.cpp \
 	relativevolumeframe.cpp \
 	textidentificationframe.cpp \
 	uniquefileidentifierframe.cpp \
@@ -17,6 +18,7 @@
 taglib_include_HEADERS = \
 	attachedpictureframe.h \
 	commentsframe.h \
+	generalencapsulatedobjectframe.h \
 	relativevolumeframe.h \
 	textidentificationframe.h \
 	uniquefileidentifierframe.h \
--- trunk/kdesupport/taglib/mpeg/id3v2/frames/textidentificationframe.cpp #579368:579369
@@ -122,7 +122,7 @@
 
   v.append(char(d->textEncoding));
 
-  for(StringList::Iterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
+  for(StringList::ConstIterator it = d->fieldList.begin(); it != d->fieldList.end(); it++) {
 
     // Since the field list is null delimited, if this is not the first
     // element in the list, append the appropriate delimiter for this
--- trunk/kdesupport/taglib/mpeg/id3v2/id3v2framefactory.cpp #579368:579369
@@ -31,6 +31,7 @@
 #include "frames/textidentificationframe.h"
 #include "frames/uniquefileidentifierframe.h"
 #include "frames/unknownframe.h"
+#include "frames/generalencapsulatedobjectframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -156,6 +157,11 @@
   if(frameID == "UFID")
     return new UniqueFileIdentifierFrame(data, header);
 
+  // General Encapsulated Object (frames 4.15)
+
+  if(frameID == "GEOB")
+      return new GeneralEncapsulatedObjectFrame(data, header);
+
   return new UnknownFrame(data, header);
 }