fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 2e618e043bb3b5cba8f52a297ff9ab5a1f00373c..3bd54736df98f4ded212eafd7000c7b760536aca 100644 (file)
--- 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,19 +123,19 @@ 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
+       case SF_FORMAT_FLOAT:
+               return 1; /* ridiculous but used as a magic value */
+       default:
+               // we don't handle anything else within ardour
                return 0;
        }
 }