[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib/taglib
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2008-01-31 23:05:47
Message-ID: 1201820747.087483.32530.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 769264 by wheeler:

Add the USLT implementation from Urs Fleisch

CCBUG:94927


 M  +1 -0      CMakeLists.txt  
 M  +1 -0      mpeg/id3v2/frames/CMakeLists.txt  
 M  +2 -0      mpeg/id3v2/frames/Makefile.am  
 A             mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp   [License: LGPL (v2.1) (wrong address)]
 A             mpeg/id3v2/frames/unsynchronizedlyricsframe.h   [License: LGPL (v2.1) (wrong address)]
 M  +10 -0     mpeg/id3v2/id3v2framefactory.cpp  


--- trunk/kdesupport/taglib/taglib/CMakeLists.txt #769263:769264
@@ -67,6 +67,7 @@
 mpeg/id3v2/frames/textidentificationframe.cpp
 mpeg/id3v2/frames/uniquefileidentifierframe.cpp
 mpeg/id3v2/frames/unknownframe.cpp
+mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
 mpeg/id3v2/frames/urllinkframe.cpp
 )
 
--- trunk/kdesupport/taglib/taglib/mpeg/id3v2/frames/CMakeLists.txt #769263:769264
@@ -6,5 +6,6 @@
 	textidentificationframe.h
 	uniquefileidentifierframe.h
 	unknownframe.h
+	unsynchronizedlyricsframe.h
 	urllinkframe.h
 	DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- trunk/kdesupport/taglib/taglib/mpeg/id3v2/frames/Makefile.am #769263:769264
@@ -14,6 +14,7 @@
 	textidentificationframe.cpp \
 	uniquefileidentifierframe.cpp \
 	unknownframe.cpp \
+	unsynchronizedlyricsframe.cpp \
 	urllinkframe.cpp
 
 taglib_include_HEADERS = \
@@ -24,6 +25,7 @@
 	textidentificationframe.h \
 	uniquefileidentifierframe.h \
 	unknownframe.h \
+	unsynchronizedlyricsframe.h \
 	urllinkframe.h
 
 taglib_includedir = $(includedir)/taglib
--- trunk/kdesupport/taglib/taglib/mpeg/id3v2/id3v2framefactory.cpp #769263:769264
@@ -38,6 +38,7 @@
 #include "frames/unknownframe.h"
 #include "frames/generalencapsulatedobjectframe.h"
 #include "frames/urllinkframe.h"
+#include "frames/unsynchronizedlyricsframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -208,6 +209,15 @@
     }
   }
 
+  // Unsynchronized lyric/text transcription (frames 4.8)
+
+  if(frameID == "USLT") {
+    UnsynchronizedLyricsFrame *f = new UnsynchronizedLyricsFrame(data, header);
+    if(d->useDefaultEncoding)
+      f->setTextEncoding(d->defaultEncoding);
+    return f;
+  }
+
   return new UnknownFrame(data, header);
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]