diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-13 00:26:28 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-13 00:26:28 +0000 |
commit | 88beef2e93d26d28467fe151f5ef2972d0ca9169 (patch) | |
tree | ca2460f7e8fa7dd87d2ba79301d8aa8fc7314479 /libs/ardour/audiofilesource.cc | |
parent | 402cc384ced6cb152c8abe4294009fe0de0a6dea (diff) |
merge pre- and post-fader processor boxes; start removing Placement (not finished) ; add -DWAF_BUILD and use per-directory foobar-config.h to correctly pick up configure-time settings like HAVE_OGG ; check for libgiomm (part of upgrade to newer gtk stack); 32 bit marker reload fix from 2.X; audiounit IO config cache fix from 2.X; multi-add route template fix from 2.X; plugin GUI delete fix from 2.X; solo button labels are A or P for listen mode
git-svn-id: svn://localhost/ardour2/branches/3.0@5344 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audiofilesource.cc')
-rw-r--r-- | libs/ardour/audiofilesource.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index 3f5665ee99..f1a65edc63 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include <vector> #include <sys/time.h> @@ -345,8 +349,12 @@ AudioFileSource::safe_audio_file_extension(const ustring& file) ".vwe", ".VWE", ".paf", ".PAF", ".voc", ".VOC", +#ifdef HAVE_OGG + ".ogg", ".OGG", +#endif /* HAVE_OGG */ #ifdef HAVE_FLAC ".flac", ".FLAC", +#else #endif // HAVE_FLAC #ifdef HAVE_COREAUDIO ".mp3", ".MP3", |