cleanup a couple of audio file format names as reported by libsndfile

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5926 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 20 insertions, 4 deletions

diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 4a85b712f1..998e9a36c2 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <strings.h>
 #include <map>
 #include <vector>
 
@@ -176,7 +177,16 @@ sndfile_major_format(int format)
 			format_info.format = i;
 			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;
+			}
 		}
 	}
 	
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index b907b9739a..7ea3758859 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -877,9 +877,15 @@ SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, str
 	info.samplerate  = sf_info.samplerate;
 	info.channels    = sf_info.channels;
 	info.length      = sf_info.frames;
-	info.format_name = string_compose("%1\n%2",
-					   sndfile_major_format(sf_info.format),
-					   sndfile_minor_format(sf_info.format));
+
+	string major = sndfile_major_format(sf_info.format);
+	string minor = sndfile_minor_format(sf_info.format);
+
+	if (major.length() + minor.length() < 16) { /* arbitrary */
+		info.format_name = string_compose("%1/%2", major, minor);
+	} else {
+		info.format_name = string_compose("%1\n%2", major, minor);
+	}
 
 	memset (&binfo, 0, sizeof (binfo));
 	info.timecode  = get_timecode_info (sf, &binfo, timecode_exists);