add signal for automation state changes per plugin

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

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 32ff48f48595e4bf83e29f8e9a963b0c379e4e35..08c57bfec2703e8f881fe805c840e5e66d90168f 100644 (file)
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -17,11 +17,10 @@
 
 */
 
+#ifndef COMPILER_MSVC
 #include <strings.h>
+#endif
 #include <map>
-#include <vector>
-
-#include "pbd/convert.h"
 
 #include <sndfile.h>
 #include "ardour/sndfile_helpers.h"
@@ -82,7 +81,7 @@ int sndfile_bitdepth_formats[SNDFILE_BITDEPTH_FORMATS] = {
 
 const char * const sndfile_endian_formats_strings[SNDFILE_ENDIAN_FORMATS+1] = {
        N_("Little-endian (Intel)"),
-       N_("Big-endian (Mac)"),
+       N_("Big-endian (PowerPC)"),
        0
 };
 
@@ -92,74 +91,51 @@ int sndfile_endian_formats[SNDFILE_ENDIAN_FORMATS] = {
 };
 
 int
-sndfile_header_format_from_string (string str)
+sndfile_header_format_by_index (int index)
 {
-       for (int n = 0; sndfile_header_formats_strings[n]; ++n) {
-               if (str == sndfile_header_formats_strings[n]) {
-                       return sndfile_header_formats[n];
-               }
+        if (index >= 0 && index < SNDFILE_HEADER_FORMATS) {
+                return sndfile_header_formats[index];
        }
        return -1;
 }
 
 int
-sndfile_bitdepth_format_from_string (string str)
+sndfile_bitdepth_format_by_index (int index)
 {
-       for (int n = 0; sndfile_bitdepth_formats_strings[n]; ++n) {
-               if (str == sndfile_bitdepth_formats_strings[n]) {
-                       return sndfile_bitdepth_formats[n];
-               }
+        if (index >= 0 && index < SNDFILE_BITDEPTH_FORMATS) {
+                return sndfile_bitdepth_formats[index];
        }
        return -1;
 }
 
 int
-sndfile_endian_format_from_string (string str)
+sndfile_endian_format_by_index (int index)
 {
-       for (int n = 0; sndfile_endian_formats_strings[n]; ++n) {
-               if (str == sndfile_endian_formats_strings[n]) {
-                       return sndfile_endian_formats[n];
-               }
+        if (index >= 0 && index < SNDFILE_ENDIAN_FORMATS) {
+                return sndfile_endian_formats[index];
        }
        return -1;
 }
 
-string
-sndfile_file_ending_from_string (string str)
-{
-       static vector<string> file_endings;
-
-       if (file_endings.empty()) {
-               file_endings = I18N((const char **) sndfile_file_endings_strings);
-       }
-
-       for (int n = 0; sndfile_header_formats_strings[n]; ++n) {
-               if (str == sndfile_header_formats_strings[n]) {
-                       return file_endings[n];
-               }
-       }
-       return 0;
-}
-
 int
 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;
        }
 }
@@ -180,7 +156,7 @@ sndfile_major_format(int format)
                        m[format_info.format & SF_FORMAT_TYPEMASK] = format_info.name;
 
                         /* normalize a couple of names rather than use what libsndfile gives us */
-                        
+
                         if (strncasecmp (format_info.name, "OGG", 3) == 0) {
                                 m[format_info.format & SF_FORMAT_TYPEMASK] = "Ogg";
                         } else if (strncasecmp (format_info.name, "WAV", 3) == 0) {