Diff of /plugins/codec_mp3/MP3Decoder.cpp [14ffd7] .. [f65bc5] Maximize Restore

  Switch to side-by-side view

--- a/plugins/codec_mp3/MP3Decoder.cpp
+++ b/plugins/codec_mp3/MP3Decoder.cpp
@@ -231,6 +231,9 @@
 		if (tracks > 0) info.set(INF_TRACKS, QVariant(tracks));
 		break;
 	    }
+	    case ID3_PropertyMap::ENC_TERMS_OF_USE:
+		// the same as ENC_COMMENT, but without "Description"
+		/* FALLTHROUGH */
 	    case ID3_PropertyMap::ENC_COMMENT:
 	    {
 		QString s = parseId3Frame2String(frame);
@@ -246,6 +249,13 @@
 		if (info.contains(property))
 		    s = info.get(property).toString() + QString(" / ") + s;
 		info.set(property, QVariant(s));
+		break;
+	    }
+	    case ID3_PropertyMap::ENC_GENRE_TYPE:
+	    {
+		QString s = parseId3Frame2String(frame);
+		int id = GenreType::fromID3(s);
+		info.set(property, QVariant(GenreType::name(id, false)));
 		break;
 	    }
 	    case ID3_PropertyMap::ENC_TEXT_SLASH:
@@ -274,16 +284,6 @@
     }
     metaData().replace(info);
 
-#if 0
-	    case ID3FID_CONTENTTYPE: { // Content type (Genre)
-		parseId3Frame(frame, INF_GENRE);
-
-		FileInfo info(metaData());
-		QString genre = QVariant(info.get(INF_GENRE)).toString();
-		int id = GenreType::fromID3(genre);
-		info.set(INF_GENRE, GenreType::name(id));
-		metaData().replace(info);
-#endif
     return true;
 }