X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsndfile_helpers.h;h=02f486a975ac61e561df6dde43b9a8334888637e;hb=df59a000b79f891f17ec8a05b390982dac67e5ff;hp=b616a5470e3b113262b2249e2bed6a03caa81ce6;hpb=be60137cfb31ef1266f5132a9fd465c01ce074a9;p=ardour.git

diff --git a/libs/ardour/ardour/sndfile_helpers.h b/libs/ardour/ardour/sndfile_helpers.h
index b616a5470e..02f486a975 100644
--- a/libs/ardour/ardour/sndfile_helpers.h
+++ b/libs/ardour/ardour/sndfile_helpers.h
@@ -1,9 +1,27 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __sndfile_helpers_h__
 #define __sndfile_helpers_h__
 
 #include <string>
-
-using std::string;
+#include <stdint.h>
 
 // Use this define when initializing arrarys for use in sndfile_*_format()
 #define SNDFILE_STR_LENGTH 32
@@ -24,24 +42,14 @@ extern const char * const sndfile_endian_formats_strings[SNDFILE_ENDIAN_FORMATS+
 
 extern int sndfile_endian_formats[SNDFILE_ENDIAN_FORMATS];
 
-int sndfile_bitdepth_format_from_string(string);
-int sndfile_header_format_from_string(string);
-int sndfile_endian_format_from_string(string);
-string sndfile_file_ending_from_string(string);
+int sndfile_bitdepth_format_by_index (int);
+int sndfile_header_format_by_index (int);
+int sndfile_endian_format_by_index (int);
 
 int sndfile_data_width (int format);
 
 // It'd be nice if libsndfile did this for us
-string sndfile_major_format(int);
-string sndfile_minor_format(int);
-
-struct SoundFileInfo {
-	float    samplerate;
-	uint16_t channels;
-	int64_t length;
-	std::string format_name;
-};
-
-bool get_soundfile_info (string path, SoundFileInfo& _info);
+std::string sndfile_major_format (int);
+std::string sndfile_minor_format (int);
 
 #endif /* __sndfile_helpers_h__ */