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

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 56259f0812..2e618e043b 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,10 +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"
@@ -81,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
 };
 
@@ -91,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)
 {
@@ -163,7 +140,7 @@ sndfile_data_width (int format)
 	}
 }
 
-string 
+string
 sndfile_major_format(int format)
 {
 	static map<int, string> m;
@@ -174,12 +151,22 @@ sndfile_major_format(int format)
 		sf_command(0, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof (int));
 		for (int i = 0; i < count; ++i){
 			format_info.format = i;
-			sf_command (0, SFC_GET_FORMAT_MAJOR, 
+			sf_command (0, SFC_GET_FORMAT_MAJOR,
 					&format_info, sizeof (format_info));
 			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) {
+                                m[format_info.format & SF_FORMAT_TYPEMASK] = "WAV";
+                        } else {
+                                m[format_info.format & SF_FORMAT_TYPEMASK] = format_info.name;
+                        }
 		}
 	}
-	
+
 	map<int, string>::iterator p = m.find(format & SF_FORMAT_TYPEMASK);
 	if(p != m.end()){
 		return m[format & SF_FORMAT_TYPEMASK];
@@ -199,12 +186,12 @@ sndfile_minor_format(int format)
 		sf_command(0, SFC_GET_FORMAT_SUBTYPE_COUNT, &count, sizeof (int));
 		for (int i = 0; i < count; ++i){
 			format_info.format = i;
-			sf_command (0, SFC_GET_FORMAT_SUBTYPE, 
+			sf_command (0, SFC_GET_FORMAT_SUBTYPE,
 					&format_info, sizeof (format_info));
 			m[format_info.format & SF_FORMAT_SUBMASK] = format_info.name;
 		}
 	}
-	
+
 	map<int, string>::iterator p = m.find(format & SF_FORMAT_SUBMASK);
 	if(p != m.end()){
 		return m[format & SF_FORMAT_SUBMASK];