From a4d9d09af5853f769e1143c2353806bfb7d89f58 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 16 Aug 2010 19:58:34 +0000
Subject: forward port 2.X changes up to and including rev 6714

git-svn-id: svn://localhost/ardour2/branches/3.0@7635 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/audiofilesource.cc | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'libs/ardour/audiofilesource.cc')

diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index c783b47b9b..0ccbaf3154 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -339,27 +339,42 @@ bool
 AudioFileSource::safe_audio_file_extension(const ustring& file)
 {
 	const char* suffixes[] = {
-		".wav", ".WAV",
-		".aiff", ".AIFF",
-		".caf", ".CAF",
 		".aif", ".AIF",
+		".aifc", ".AIFC",
+		".aiff", ".AIFF",
 		".amb", ".AMB",
-		".snd", ".SND",
 		".au", ".AU",
-		".raw", ".RAW",
-		".sf", ".SF",
+		".caf", ".CAF",
 		".cdr", ".CDR",
+		".flac", ".FLAC",
+		".htk", ".HTK",
+		".iff", ".IFF",
+		".mat", ".MAT",
+		".oga", ".OGA",
+		".ogg", ".OGG",
+		".paf", ".PAF",
+		".pvf", ".PVF",
+		".sf", ".SF",
 		".smp", ".SMP",
+		".snd", ".SND",
 		".maud", ".MAUD",
+		".voc", ".VOC"
 		".vwe", ".VWE",
-		".paf", ".PAF",
-		".voc", ".VOC",
-		".ogg", ".OGG",
-		".flac", ".FLAC",
+		".w64", ".W64",
+		".wav", ".WAV",
 #ifdef HAVE_COREAUDIO
-		".mp3", ".MP3",
 		".aac", ".AAC",
+		".adts", ".ADTS",
+		".ac3", ".AC3",
+		".amr", ".AMR",
+		".mpa", ".MPA",
+		".mpeg", ".MPEG",
+		".mp1", ".MP1",
+		".mp2", ".MP2",
+		".mp3", ".MP3",
 		".mp4", ".MP4",
+		".m4a", ".M4A",
+		".sd2", ".SD2", 	// libsndfile supports sd2 also, but the resource fork is required to open.
 #endif // HAVE_COREAUDIO
 	};
 
-- 
cgit v1.2.3