X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfile_helpers.cc;h=3bd54736df98f4ded212eafd7000c7b760536aca;hb=81bff2edee31ad64693d5be3c06558714ea92722;hp=6a3ce248bce5bf440db1ae2a5a24138251d0c238;hpb=de8a8272bc0de7bab35aab75a6ba515d0c6c722b;p=ardour.git

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 6a3ce248bc..3bd54736df 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -25,7 +25,7 @@
 #include <sndfile.h>
 #include "ardour/sndfile_helpers.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using std::map;
 using namespace std;
@@ -34,7 +34,7 @@ const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = {
 	N_("WAV"),
 	N_("AIFF"),
 	N_("CAF"),
-	N_("W64 (64 bit WAV)"),
+	N_("W64 (64-bit WAV)"),
 	N_("FLAC"),
 	N_("Ogg/Vorbis"),
 	N_("raw (no header)"),
@@ -63,11 +63,11 @@ int sndfile_header_formats[SNDFILE_HEADER_FORMATS] = {
 };
 
 const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = {
-	N_("Signed 16 bit PCM"),
-	N_("Signed 24 bit PCM"),
-	N_("Signed 32 bit PCM"),
-	N_("Signed 8 bit PCM"),
-	N_("32 bit 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
 };
 
@@ -133,26 +133,13 @@ sndfile_data_width (int format)
 	case SF_FORMAT_PCM_32:
 		return 32;
 	case SF_FORMAT_FLOAT:
-		return 32;
+		return 1; /* ridiculous but used as a magic value */
 	default:
 		// we don't handle anything else within ardour
 		return 0;
 	}
 }
 
-int
-sndfile_data_width (ARDOUR::SampleFormat format)
-{
-	switch (format) {
-	case ARDOUR::FormatInt16:
-		return sndfile_data_width (SF_FORMAT_PCM_16);
-	case ARDOUR::FormatInt24:
-		return sndfile_data_width (SF_FORMAT_PCM_24);
-	default:
-		return sndfile_data_width (SF_FORMAT_FLOAT);
-	}
-}
-
 string
 sndfile_major_format(int format)
 {