update configure time tests and code to use libsndfile 1.0.26's version of the R64...

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index eedb563c728b103ae83b31bc396ff797ed8bd51b..35fec82145da704fa0069b9782fda62ff84405bc 100644 (file)
--- 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 9ef5ab7e36d23dacf0b683666ec1fba810e33767..ecd3d745231b216ebe5330c1844ffb9369923892 100644 (file)
--- a/wscript
+++ b/wscript
@@ -911,7 +911,7 @@ def configure(conf):
 
     have_rf64_riff_support = conf.check_cc(fragment = '''
 #include <sndfile.h>
-int main () { int x = SFC_AUTO_DOWNGRADE_RF64; return 0; }
+int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
 ''',
                                            features  = 'c',
                                            mandatory = False,