Changeset 1149

Timestamp:

09/13/09 19:09:43 (6 months ago)

Author:

astrange

Message:

MKV: Import cover.jpg as iTunes cover art.

Files:

• trunk/MatroskaImportPrivate.cpp (modified) (2 diffs)

trunk/MatroskaImportPrivate.cpp

@@ -757 +757 @@
-        while (attachedFile && attachedFile->GetSize() > 0) {
-                string fileMimeType = GetChild<KaxMimeType>(*attachedFile);
+                string fileName = UTFstring(GetChild<KaxFileName>(*attachedFile)).GetUTF8();
+                
-                /* The only attachments handled here are fonts, which currently can be truetype or opentype.
-                   application/x-* is probably not a permanent MIME type, but it is current practice... */
@@ -767 +769 @@
-                                                          kATSFontFormatUnspecified, NULL, kATSOptionFlagsDefault, &container);
-                        }
+                }
+                
+                bool isCoverArt = false, isJPEG;
+                
+                if (fileName == "cover.jpg") {
+                        isCoverArt = isJPEG = true;
+                } else if (fileName == "cover.png") {
+                        isCoverArt = true;
+                        isJPEG = false;
+                }
+                
+                if (isCoverArt) {
+                        KaxFileData & fileData = GetChild<KaxFileData>(*attachedFile);
+                        FourCharCode key = 'covr'; //iTunes cover art tag
+                        QTMetaDataRef movieMetaData;
+                        OSStatus err = QTCopyMovieMetaData(theMovie, &movieMetaData);
+
+                        err = QTMetaDataAddItem(movieMetaData, 
+                                                          kQTMetaDataStorageFormatiTunes, kQTMetaDataKeyFormatiTunesShortForm, 
+                                                          (UInt8 *)&key, sizeof(key),
+                                                          fileData.GetBuffer(), 
+                                                          fileData.GetSize(), 
+                                                          isJPEG ? kQTMetaDataTypeJPEGImage : kQTMetaDataTypePNGImage, NULL);
+                        if (err)
+                                Codecprintf(NULL, "MKV: Error adding cover art %d\n", err);
+                        
+                        QTMetaDataRelease(movieMetaData);
-                }
-