X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfile_helpers.cc;h=2e618e043bb3b5cba8f52a297ff9ab5a1f00373c;hb=aa0effb4cb38f4c3a06564bd9e6a0ee516d4f958;hp=aa54f648a56c2a98c1647b9f009991dc718ac16c;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index aa54f648a5..2e618e043b 100644
--- 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"
@@ -92,55 +91,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)
 {