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

List:       kde-commits
Subject:    kdesupport/taglib/ogg
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2005-07-21 17:30:04
Message-ID: 1121967004.970163.27156.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 437379 by wheeler:

If there is no value set for DESCRIPTION, also check COMMENT.

BUG:98714


 M  +13 -4     xiphcomment.cpp  


--- trunk/kdesupport/taglib/ogg/xiphcomment.cpp #437378:437379
@@ -31,6 +31,7 @@
 public:
   FieldListMap fieldListMap;
   String vendorID;
+  String commentField;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -76,9 +77,17 @@
 
 String Ogg::XiphComment::comment() const
 {
-  if(d->fieldListMap["DESCRIPTION"].isEmpty())
-    return String::null;
-  return d->fieldListMap["DESCRIPTION"].front();
+  if(!d->fieldListMap["DESCRIPTION"].isEmpty()) {
+    d->commentField = "DESCRIPTION";
+    return d->fieldListMap["DESCRIPTION"].front();    
+  }
+
+  if(!d->fieldListMap["COMMENT"].isEmpty()) {
+    d->commentField = "COMMENT";
+    return d->fieldListMap["COMMENT"].front();    
+  }
+
+  return String::null;
 }
 
 String Ogg::XiphComment::genre() const
@@ -119,7 +128,7 @@
 
 void Ogg::XiphComment::setComment(const String &s)
 {
-  addField("DESCRIPTION", s);
+  addField(d->commentField.isEmpty() ? "DESCRIPTION" : d->commentField, s);
 }
 
 void Ogg::XiphComment::setGenre(const String &s)
[prev in list] [next in list] [prev in thread] [next in thread]