projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more MTC debugging
[ardour.git]
/
libs
/
ardour
/
sndfile_helpers.cc
diff --git
a/libs/ardour/sndfile_helpers.cc
b/libs/ardour/sndfile_helpers.cc
index 96dc2c777908b33e9570414580e3cf4d8b164337..057efff48c4751bbc302942d93c166d37cbac831 100644
(file)
--- 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
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
@@
-20,10
+20,10
@@
#include <map>
#include <vector>
#include <map>
#include <vector>
-#include
<pbd/convert.h>
+#include
"pbd/convert.h"
#include <sndfile.h>
#include <sndfile.h>
-#include
<ardour/sndfile_helpers.h>
+#include
"ardour/sndfile_helpers.h"
#include "i18n.h"
#include "i18n.h"
@@
-33,33
+33,33
@@
using namespace std;
const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = {
N_("WAV"),
N_("AIFF"),
const char * const sndfile_header_formats_strings[SNDFILE_HEADER_FORMATS+1] = {
N_("WAV"),
N_("AIFF"),
- N_("raw (no header)"),
- N_("PAF (Ensoniq Paris)"),
- N_("AU (Sun/NeXT)"),
- N_("IRCAM"),
+ N_("CAF"),
N_("W64 (64 bit WAV)"),
N_("W64 (64 bit WAV)"),
+ N_("FLAC"),
+ N_("Ogg/Vorbis"),
+ N_("raw (no header)"),
0
};
const char* const sndfile_file_endings_strings[SNDFILE_HEADER_FORMATS+1] = {
N_(".wav"),
N_(".aiff"),
0
};
const char* const sndfile_file_endings_strings[SNDFILE_HEADER_FORMATS+1] = {
N_(".wav"),
N_(".aiff"),
- N_(".raw"),
- N_(".paf"),
- N_(".au"),
- N_(".ircam"),
+ N_(".caf"),
N_(".w64"),
N_(".w64"),
+ N_(".flac"),
+ N_(".ogg"),
+ N_(".raw"),
0
};
int sndfile_header_formats[SNDFILE_HEADER_FORMATS] = {
SF_FORMAT_WAV,
SF_FORMAT_AIFF,
0
};
int sndfile_header_formats[SNDFILE_HEADER_FORMATS] = {
SF_FORMAT_WAV,
SF_FORMAT_AIFF,
- SF_FORMAT_
RAW
,
- SF_FORMAT_
PAF
,
- SF_FORMAT_
AU
,
- SF_FORMAT_
IRCAM
,
- SF_FORMAT_
W64
+ SF_FORMAT_
CAF
,
+ SF_FORMAT_
W64
,
+ SF_FORMAT_
FLAC
,
+ SF_FORMAT_
OGG
,
+ SF_FORMAT_
RAW
};
const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = {
};
const char * const sndfile_bitdepth_formats_strings[SNDFILE_BITDEPTH_FORMATS+1] = {
@@
-125,7
+125,7
@@
sndfile_endian_format_from_string (string str)
string
sndfile_file_ending_from_string (string str)
string
sndfile_file_ending_from_string (string str)
-{
+{
static vector<string> file_endings;
if (file_endings.empty()) {
static vector<string> file_endings;
if (file_endings.empty()) {
@@
-163,7
+163,7
@@
sndfile_data_width (int format)
}
}
}
}
-string
+string
sndfile_major_format(int format)
{
static map<int, string> m;
sndfile_major_format(int format)
{
static map<int, string> m;
@@
-174,12
+174,12
@@
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_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;
}
}
&format_info, sizeof (format_info));
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];
map<int, string>::iterator p = m.find(format & SF_FORMAT_TYPEMASK);
if(p != m.end()){
return m[format & SF_FORMAT_TYPEMASK];
@@
-199,12
+199,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_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;
}
}
&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];
map<int, string>::iterator p = m.find(format & SF_FORMAT_SUBMASK);
if(p != m.end()){
return m[format & SF_FORMAT_SUBMASK];