abort if configuration fails

[ardour.git] / libs / ardour / sndfilesource.cc

diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index 18c6df4a48221afc17535c8fa1525ef8e285ecd7..73361c33da64553723ba8a4029045a52a6b86a13 100644 (file)
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 
 #include <glib.h>
-#include <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm/convert.h>
 #include <glibmm/fileutils.h>
@@ -78,7 +78,7 @@ SndFileSource::SndFileSource (Session& s, const XMLNode& node)
 }
 
 /** Constructor for existing external-to-session files.
-    Files created this way are never writable or removable 
+    Files created this way are never writable or removable
 */
 SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flags)
        : Source(s, DataType::AUDIO, path, flags)
@@ -103,8 +103,8 @@ SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flag
        }
 }
 
-/** This constructor is used to construct new internal-to-session files, 
-    not open existing ones. 
+/** This constructor is used to construct new internal-to-session files,
+    not open existing ones.
 */
 SndFileSource::SndFileSource (Session& s, const string& path, const string& origin,
                               SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags)
@@ -168,7 +168,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig
                fmt = SF_FORMAT_RF64;
                _flags = Flag (_flags & ~Broadcast);
                break;
-                              
+
        default:
                fatal << string_compose (_("programming error: %1"), X_("unsupported audio header format requested")) << endmsg;
                abort(); /*NOTREACHED*/
@@ -255,6 +255,7 @@ SndFileSource::close ()
        if (_sndfile) {
                sf_close (_sndfile);
                _sndfile = 0;
+               file_closed ();
        }
 }
 
@@ -316,7 +317,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)
@@ -325,7 +326,7 @@ SndFileSource::open ()
                }
        }
 #endif
-       
+
        if (!_broadcast_info) {
                _broadcast_info = new BroadcastInfo;
        }
@@ -348,12 +349,12 @@ SndFileSource::open ()
                delete _broadcast_info;
                _broadcast_info = 0;
                _flags = Flag (_flags & ~Broadcast);
-       } 
+       }
 
        /* Set the broadcast flag if the BWF info is already there. We need
         * this when recovering or using existing files.
         */
-       
+
        if (bwf_info_exists) {
                _flags = Flag (_flags | Broadcast);
        }
@@ -380,7 +381,7 @@ SndFileSource::open ()
                         }
                 }
         }
-       
+
        return 0;
 }
 
@@ -401,7 +402,7 @@ framecnt_t
 SndFileSource::read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const
 {
        assert (cnt >= 0);
-       
+
        framecnt_t nread;
        float *ptr;
        framecnt_t real_cnt;