From 731c056e7ec4f94499fd4a35a65ef4a2a337c6d8 Mon Sep 17 00:00:00 2001 From: James Crook Date: Tue, 9 Apr 2019 14:00:57 +0100 Subject: [PATCH] Bug 2068 - Mac: misleading error message when importing M4A without FFmpeg installed --- src/import/Import.cpp | 2 +- src/import/ImportQT.cpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/import/Import.cpp b/src/import/Import.cpp index d772d32b0..cbef5566d 100644 --- a/src/import/Import.cpp +++ b/src/import/Import.cpp @@ -609,7 +609,7 @@ bool Importer::Import(const FilePath &fName, } //AAC files of various forms (probably not encrypted) if ((extension.IsSameAs(wxT("aac"), false))||(extension.IsSameAs(wxT("m4a"), false))||(extension.IsSameAs(wxT("m4r"), false))||(extension.IsSameAs(wxT("mp4"), false))) { - errorMessage.Printf(_("\"%s\" is an Advanced Audio Coding file. \nAudacity cannot open this type of file. \nYou need to convert it to a supported audio format, such as WAV or AIFF."), fName); + errorMessage.Printf(_("\"%s\" is an Advanced Audio Coding file.\nWithout the optional FFmpeg library, Audacity cannot open this type of file.\nOtherwise, you need to convert it to a supported audio format, such as WAV or AIFF."), fName); return false; } // encrypted itunes files diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index a1c9e516c..80895102e 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -41,10 +41,15 @@ static const auto exts = { void GetQTImportPlugin(ImportPluginList &importPluginList, UnusableImportPluginList &unusableImportPluginList) { - unusableImportPluginList.push_back( - std::make_unique(DESC, - FileExtensions( exts.begin(), exts.end() ) ) - ); +// Bug 2068: misleading error message about QuickTime +// In 64 bit versions we cannot compile in (obsolete) QuickTime +// So don't register the QuickTime extensions, so ensuring we never report +// "This version of Audacity was not compiled with QuickTime files support" +// When attempting to import MP4 files. +// unusableImportPluginList.push_back( +// std::make_unique(DESC, +// FileExtensions( exts.begin(), exts.end() ) ) +// ); } #else /* USE_QUICKTIME */