allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Enabled conditional FLAC importing.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1653 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin
2007-04-02 15:46:38 +00:00
parent 289e0b8fb8
commit d7df60bf11
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SConstruct
View File

@@ -728,7 +728,8 @@ prep_libcheck(env, libraries['flac'])
libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
conf = Configure (libraries['flac'])
conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX')
if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'):
conf.env.Append('-DHAVE_FLAC')
libraries['flac'] = conf.Finish ()
# or if that fails...

3
libs/ardour/audiofilesource.cc
View File

@@ -565,6 +565,9 @@ AudioFileSource::safe_file_extension(ustring file)
file.rfind(".maud")== ustring::npos &&
file.rfind(".vwe") == ustring::npos &&
file.rfind(".paf") == ustring::npos &&
#ifdef HAVE_FLAC
file.rfind(".flac")== ustring::npos &&
#endif // HAVE_FLAC
#ifdef HAVE_COREAUDIO
file.rfind(".mp3") == ustring::npos &&
file.rfind(".aac") == ustring::npos &&