diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-16 19:58:34 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-16 19:58:34 +0000 |
commit | a4d9d09af5853f769e1143c2353806bfb7d89f58 (patch) | |
tree | 05dc35268557395124f130ec8b6d8e32c6e49b7b /libs/ardour/audiofilesource.cc | |
parent | 0b2f156c5850fb1c60aae25df4b9767bd7f92b89 (diff) |
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
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
-rw-r--r-- | libs/ardour/audiofilesource.cc | 37 |
1 files changed, 26 insertions, 11 deletions
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 }; |