Merge pull request #4088 from aw-was-here/add-m4v

Treat m4v like m4a for metadata
mixxxdj · Jul 8, 2021 · 18624f0 · 18624f0
2 parents e14b23b + 80b4134
commit 18624f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/sources/soundsourcemediafoundation.cpp b/src/sources/soundsourcemediafoundation.cpp
@@ -52,6 +52,7 @@ const QString SoundSourceProviderMediaFoundation::kDisplayName =
 const QStringList SoundSourceProviderMediaFoundation::kSupportedFileExtensions = {
         QStringLiteral("aac"),
         QStringLiteral("m4a"),
+        QStringLiteral("m4v"),
         QStringLiteral("mp4"),
 };
 

diff --git a/src/test/coverartutils_test.cpp b/src/test/coverartutils_test.cpp
@@ -59,6 +59,11 @@ TEST_F(CoverArtUtilTest, extractEmbeddedCover) {
                 kTestDir.absoluteFilePath("cover-test-itunes-12.7.0-alac.m4a"), referencePNGImage);
     }
 
+    if (isSupportedFileExtension("m4v")) {
+        extractEmbeddedCover(
+                kTestDir.absoluteFilePath("cover-test.m4v"), referencePNGImage);
+    }
+
     if (isSupportedFileExtension("mp3")) {
         // PNG
         extractEmbeddedCover(

diff --git a/src/test/id3-test-data/cover-test.m4v b/src/test/id3-test-data/cover-test.m4v
diff --git a/src/track/taglib/trackmetadata_file.cpp b/src/track/taglib/trackmetadata_file.cpp
@@ -55,7 +55,7 @@ FileType getFileTypeFromFileName(
     if (QStringLiteral("mp3") == fileExt) {
         return FileType::MP3;
     }
-    if (QStringLiteral("m4a") == fileExt) {
+    if ((QStringLiteral("m4a") == fileExt) || (QStringLiteral("m4v") == fileExt)) {
         return FileType::MP4;
     }
     if (QStringLiteral("flac") == fileExt) {