From 6d08797297f355e32830bf2fdae9bd597d00c1ec Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 24 Nov 2015 08:45:04 -0500 Subject: [PATCH] update configure time tests and code to use libsndfile 1.0.26's version of the R64 auto-downgrade-to-WAV code --- libs/ardour/sndfilesource.cc | 2 +- wscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index eedb563c72..35fec82145 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -316,7 +316,7 @@ SndFileSource::open () #ifdef HAVE_RF64_RIFF if (_file_is_new && _length == 0 && writable()) { if (_flags & RF64_RIFF) { - if (sf_command (_sndfile, SFC_AUTO_DOWNGRADE_RF64, 0, 0) != SF_TRUE) { + if (sf_command (_sndfile, SFC_RF64_AUTO_DOWNGRADE, 0, 0) != SF_TRUE) { char errbuf[256]; sf_error_str (_sndfile, errbuf, sizeof (errbuf) - 1); error << string_compose (_("Cannot mark RF64 audio file for automatic downgrade to WAV: %1"), errbuf) diff --git a/wscript b/wscript index 9ef5ab7e36..ecd3d74523 100644 --- a/wscript +++ b/wscript @@ -911,7 +911,7 @@ def configure(conf): have_rf64_riff_support = conf.check_cc(fragment = ''' #include -int main () { int x = SFC_AUTO_DOWNGRADE_RF64; return 0; } +int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; } ''', features = 'c', mandatory = False,