Fix crash on relayering.

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

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index d47a9b9423420541c47bfe9666ece3094896e5d8..08e1117fbb80e367ca4318a0a93ef74696cb548e 100644 (file)
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -20,10 +20,10 @@
 #include <map>
 #include <vector>
 
-#include <pbd/convert.h>
+#include "pbd/convert.h"
 
 #include <sndfile.h>
-#include <ardour/sndfile_helpers.h>
+#include "ardour/sndfile_helpers.h"
 
 #include "i18n.h"
 
@@ -33,41 +33,35 @@ using namespace std;
 const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = {
        N_("WAV"),
        N_("AIFF"),
-       N_("raw (no header)"),
-       N_("PAF (Ensoniq Paris)"),
-       N_("AU (Sun/NeXT)"),
-       N_("IRCAM"),
+       N_("CAF"),
        N_("W64 (64 bit WAV)"),
+       N_("raw (no header)"),
        0
 };
 
 const char* const sndfile_file_endings_strings[SNDFILE_HEADER_FORMATS+1] = {
        N_(".wav"),
        N_(".aiff"),
-       N_(".raw"),
-       N_(".paf"),
-       N_(".au"),
-       N_(".ircam"),
+       N_(".caf"),
        N_(".w64"),
+       N_(".raw"),
        0
 };
 
 int sndfile_header_formats[SNDFILE_HEADER_FORMATS] = {
        SF_FORMAT_WAV,
        SF_FORMAT_AIFF,
-       SF_FORMAT_RAW,
-       SF_FORMAT_PAF,
-       SF_FORMAT_AU,
-       SF_FORMAT_IRCAM,
-       SF_FORMAT_W64
+       SF_FORMAT_CAF,
+       SF_FORMAT_W64,
+       SF_FORMAT_RAW
 };
 
 const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = {
-       N_("16 bit"),
-       N_("24 bit"),
-       N_("32 bit"),
-       N_("8 bit"),
-       N_("float"),
+       N_("Signed 16 bit PCM"),
+       N_("Signed 24 bit PCM"),
+       N_("Signed 32 bit PCM"),
+       N_("Signed 8 bit PCM"),
+       N_("32 bit float"),
        0
 };