fix input metering:

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

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index cab34349f15e885c432f050f5e343c6cd127e5e7..459890e82926d58a83e66ea43e563c8ac1088cea 100644 (file)
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -19,9 +19,6 @@
 
 #include <strings.h>
 #include <map>
-#include <vector>
-
-#include "pbd/convert.h"
 
 #include <sndfile.h>
 #include "ardour/sndfile_helpers.h"
@@ -92,55 +89,32 @@ 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)
 {
@@ -180,7 +154,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) {