X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfile_helpers.cc;h=3bd54736df98f4ded212eafd7000c7b760536aca;hb=4e5423b3487771220cdca4c2b1a79c4d74b6afa5;hp=e3e80b48e5ab73e21ce5b000b4e4874c9aa4b55d;hpb=5ff6402dad5b9aa8de0ce2ac44e8f3189ef9439e;p=ardour.git

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index e3e80b48e5..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
 };
 
@@ -123,33 +123,20 @@ sndfile_data_width (int format)
 	int tval = format & 0xf;
 
 	switch (tval) {
-	  case SF_FORMAT_PCM_S8:
-	  case SF_FORMAT_PCM_U8:
+	case SF_FORMAT_PCM_S8:
+	case SF_FORMAT_PCM_U8:
 		return 8;
-	  case SF_FORMAT_PCM_16:
+	case SF_FORMAT_PCM_16:
 		return 16;
-	  case SF_FORMAT_PCM_24:
+	case SF_FORMAT_PCM_24:
 		return 24;
-	  case SF_FORMAT_PCM_32:
+	case SF_FORMAT_PCM_32:
 		return 32;
-	  case SF_FORMAT_FLOAT:
-		return 1; // heh, heh
-	  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);
+	case SF_FORMAT_FLOAT:
+		return 1; /* ridiculous but used as a magic value */
 	default:
-		return sndfile_data_width (SF_FORMAT_FLOAT);
+		// we don't handle anything else within ardour
+		return 0;
 	}
 }