From 2e97a51cdd7d16686bc6a1b9e833e2400bb5331f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sat, 5 Apr 2008 20:13:47 +1100 Subject: [PATCH] Clean out cruft. --- Octave/sndfile_load.m | 7 - Octave/sndfile_play.m | 7 - Octave/sndfile_save.m | 7 - Win32/Makefile.am | 6 - Win32/Makefile.mingw.in | 5 - Win32/Makefile.msvc | 6 - Win32/config.h | 9 -- Win32/libtool.mingw | 5 - Win32/sndfile.h | 9 -- Win32/testprog.c | 8 - binheader_readf_check.py | 9 +- doc/Makefile.am | 6 - doc/api.html | 8 - doc/bugs.html | 8 - doc/command.html | 8 - doc/dither.html | 8 - doc/embedded_files.html | 8 - doc/index.html | 8 - doc/linux_games_programming.txt | 6 - doc/lists.html | 8 - doc/octave.html | 8 - doc/pkgconfig.html | 8 - doc/sndfile_info.html | 8 - doc/win32.html | 8 - examples/generate.c | 8 - examples/generate.cs | 5 - examples/list_formats.c | 7 - examples/make_sine.c | 7 - examples/sfprocess.c | 8 - examples/sndfile-convert.c | 7 - examples/sndfile-info.c | 7 - examples/sndfile-play-beos.cpp | 9 -- examples/sndfile-play.c | 8 +- make_lite.py | 8 - man/Makefile.am | 6 - man/sndfile-convert.1 | 6 - man/sndfile-info.1 | 6 - man/sndfile-play.1 | 5 - regtest/Makefile.am | 6 - regtest/Readme.txt | 6 - regtest/checksum.c | 12 +- regtest/database.c | 9 -- regtest/regtest.h | 7 - regtest/sndfile-regtest.c | 7 - src/G72x/Makefile.am | 6 - src/G72x/g721.c | 7 - src/G72x/g723_16.c | 7 - src/G72x/g723_24.c | 7 - src/G72x/g723_40.c | 7 - src/G72x/g72x.c | 8 - src/G72x/g72x.h | 8 - src/G72x/g72x_priv.h | 9 -- src/G72x/g72x_test.c | 8 - src/Makefile.am | 2 +- src/alaw.c | 12 +- src/au.c | 8 +- src/avr.c | 7 - src/binheader_writef_check.py | 5 - src/caf.c | 9 +- src/command.c | 7 - src/create_symbols_file.py | 6 - src/dither.c | 8 +- src/double64.c | 9 +- src/dwd.c | 8 +- src/dwvw.c | 9 +- src/file_io.c | 7 - src/flac.c | 2 +- src/float32.c | 2 +- src/float_cast.h | 262 -------------------------------- src/g72x.c | 9 +- src/gsm610.c | 9 +- src/htk.c | 8 +- src/ima_adpcm.c | 10 +- src/interleave.c | 8 +- src/ircam.c | 7 - src/macbinary3.c | 7 - src/macos.c | 7 - src/mat4.c | 10 +- src/mat5.c | 9 +- src/ms_adpcm.c | 10 +- src/new.c | 7 - src/nist.c | 8 - src/ogg.c | 2 +- src/paf.c | 10 +- src/pcm.c | 10 +- src/pvf.c | 7 - src/raw.c | 7 - src/rx2.c | 7 - src/sds.c | 9 +- src/sf_unistd.h | 8 +- src/sfconfig.h | 7 - src/sfendian.h | 7 - src/strings.c | 7 - src/svx.c | 8 - src/txw.c | 7 - src/ulaw.c | 12 +- src/vox_adpcm.c | 2 +- src/w64.c | 8 - src/wav_w64.c | 7 - src/wav_w64.h | 8 +- src/xi.c | 9 +- tests/alaw_test.c | 15 -- tests/cpp_crack_test.cc | 7 - tests/dither_test.c | 7 - tests/dwvw_test.c | 11 +- tests/fix_this.c | 7 - tests/headerless_test.c | 7 - tests/largefile_test.c | 7 - tests/locale_test.c | 8 - tests/misc_test.c | 7 - tests/pcm_test.tpl | 2 +- tests/raw_test.c | 7 - tests/sftest.c | 8 - tests/sfversion.c | 7 - tests/stdin_test.c | 8 +- tests/stdio_test.c | 7 - tests/stdout_test.c | 8 +- tests/ulaw_test.c | 7 - tests/virtual_io_test.c | 7 - 119 files changed, 45 insertions(+), 1095 deletions(-) delete mode 100644 src/float_cast.h diff --git a/Octave/sndfile_load.m b/Octave/sndfile_load.m index a2371cc8..d13c21a2 100644 --- a/Octave/sndfile_load.m +++ b/Octave/sndfile_load.m @@ -50,10 +50,3 @@ else endif endfunction - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 9d7ed7ce-41fe-4efe-8bde-f5fc6f46bb03 - diff --git a/Octave/sndfile_play.m b/Octave/sndfile_play.m index b1cccab4..c0631d94 100644 --- a/Octave/sndfile_play.m +++ b/Octave/sndfile_play.m @@ -57,10 +57,3 @@ if (status), endif endfunction - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 96fb14c8-2b5a-4b93-a576-ab83a6d9026b - diff --git a/Octave/sndfile_save.m b/Octave/sndfile_save.m index 1b888420..cddbc648 100644 --- a/Octave/sndfile_save.m +++ b/Octave/sndfile_save.m @@ -51,10 +51,3 @@ str = sprintf ("save -mat-binary %s samplerate wavedata", filename) ; eval (str) ; endfunction - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 5e44602b-940b-4927-af7c-47639769a40b - diff --git a/Win32/Makefile.am b/Win32/Makefile.am index 9ab93fa6..4fe8efa7 100644 --- a/Win32/Makefile.am +++ b/Win32/Makefile.am @@ -2,9 +2,3 @@ EXTRA_DIST = README-precompiled-dll.txt testprog.c -## Do not edit or modify anything in this comment block. -## The arch-tag line is a file identity tag for the GNU Arch -## revision control system. -## -## arch-tag: c28c7540-67f6-47e7-8035-0abbc6a174bc - diff --git a/Win32/Makefile.mingw.in b/Win32/Makefile.mingw.in index 5081cd2b..ec0e17e2 100644 --- a/Win32/Makefile.mingw.in +++ b/Win32/Makefile.mingw.in @@ -394,8 +394,3 @@ tests/benchmark.exe : tests/benchmark.o libsndfile.lib # End of Makefile #==================================================================== -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: a588878f-6796-4a47-bbef-83a3aaac0983 diff --git a/Win32/Makefile.msvc b/Win32/Makefile.msvc index 53e55afd..e0baaf57 100644 --- a/Win32/Makefile.msvc +++ b/Win32/Makefile.msvc @@ -569,9 +569,3 @@ CHECK: $(TEST_PROGS) # End of Makefile #==================================================================== -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 9a46d08e-921f-49f7-961e-3f21ea67851e - diff --git a/Win32/config.h b/Win32/config.h index b6ed4b78..29561437 100644 --- a/Win32/config.h +++ b/Win32/config.h @@ -279,12 +279,3 @@ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 78a733c0-a430-46bd-81ab-4e479fbcffac -*/ - diff --git a/Win32/libtool.mingw b/Win32/libtool.mingw index aee89bae..e0f5046e 100644 --- a/Win32/libtool.mingw +++ b/Win32/libtool.mingw @@ -7266,8 +7266,3 @@ include_expsyms="" # ### END LIBTOOL TAG CONFIG: F77 -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: f284401a-dcf1-41ea-97ea-c51edee14a27 diff --git a/Win32/sndfile.h b/Win32/sndfile.h index 23d2d128..482f35f7 100644 --- a/Win32/sndfile.h +++ b/Win32/sndfile.h @@ -528,12 +528,3 @@ void sf_write_sync (SNDFILE *sndfile) ; #endif /* __cplusplus */ #endif /* SNDFILE_H */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 906bb197-18f2-4f66-a395-b4722bab5114 -*/ - diff --git a/Win32/testprog.c b/Win32/testprog.c index add30349..d26d844a 100644 --- a/Win32/testprog.c +++ b/Win32/testprog.c @@ -14,11 +14,3 @@ main (void) return 0 ; } - -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 31165fd8-9d91-4e5d-8b31-8efd42ef7645 -*/ diff --git a/binheader_readf_check.py b/binheader_readf_check.py index abbc7cc5..774abcd9 100644 --- a/binheader_readf_check.py +++ b/binheader_readf_check.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +g#!/usr/bin/python import re, string, sys @@ -60,10 +60,3 @@ if len (sys.argv) < 2: for file in sys.argv [1:]: search_for_problems (file) - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 64d2d700-a787-4843-a342-2bafd0761645 - diff --git a/doc/Makefile.am b/doc/Makefile.am index 71ae9d5d..fe930825 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,9 +8,3 @@ html_DATA = index.html libsndfile.jpg libsndfile.css api.html command.html \ EXTRA_DIST = $(html_DATA) -## Do not edit or modify anything in this comment block. -## The arch-tag line is a file identity tag for the GNU Arch -## revision control system. -## -## arch-tag: 2f7e97fe-5ef8-49a1-ae12-14ebab69c048 - diff --git a/doc/api.html b/doc/api.html index 340989fe..e6a4f6b1 100644 --- a/doc/api.html +++ b/doc/api.html @@ -693,11 +693,3 @@ Version : 1.0.17 - - diff --git a/doc/bugs.html b/doc/bugs.html index 7a7575ce..94caffec 100644 --- a/doc/bugs.html +++ b/doc/bugs.html @@ -74,11 +74,3 @@

- - diff --git a/doc/command.html b/doc/command.html index 50e696bb..45dce0ea 100644 --- a/doc/command.html +++ b/doc/command.html @@ -1335,11 +1335,3 @@ Version : 1.0.17 - - diff --git a/doc/dither.html b/doc/dither.html index 16ca2dee..bec34d42 100644 --- a/doc/dither.html +++ b/doc/dither.html @@ -1014,11 +1014,3 @@ Version : 1.0.17 - - diff --git a/doc/embedded_files.html b/doc/embedded_files.html index e9a84e82..455614d2 100644 --- a/doc/embedded_files.html +++ b/doc/embedded_files.html @@ -44,11 +44,3 @@ embedded files. - - diff --git a/doc/index.html b/doc/index.html index b28d2c40..0e4c80ff 100644 --- a/doc/index.html +++ b/doc/index.html @@ -477,11 +477,3 @@ times.

- - diff --git a/doc/linux_games_programming.txt b/doc/linux_games_programming.txt index 576f86ba..747f59db 100644 --- a/doc/linux_games_programming.txt +++ b/doc/linux_games_programming.txt @@ -432,9 +432,3 @@ under one roof. It will combine all of the features of CE, stability and support of ME and the speed of NT. It will be called Windows CEMENT... - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 78d64eac-20f0-4d71-a4e2-3e1b8821596f diff --git a/doc/lists.html b/doc/lists.html index 73e318fa..349e494c 100644 --- a/doc/lists.html +++ b/doc/lists.html @@ -49,11 +49,3 @@ copy of all emails to the libsndfile-announce list. - - diff --git a/doc/octave.html b/doc/octave.html index afe013fa..33ef1b6c 100644 --- a/doc/octave.html +++ b/doc/octave.html @@ -115,11 +115,3 @@ - - diff --git a/doc/pkgconfig.html b/doc/pkgconfig.html index 40d15c3b..1711de9f 100644 --- a/doc/pkgconfig.html +++ b/doc/pkgconfig.html @@ -68,11 +68,3 @@

- - diff --git a/doc/sndfile_info.html b/doc/sndfile_info.html index 2ac0e5fe..51e2dd35 100644 --- a/doc/sndfile_info.html +++ b/doc/sndfile_info.html @@ -50,11 +50,3 @@ - - diff --git a/doc/win32.html b/doc/win32.html index 4222d1f6..1d604e76 100644 --- a/doc/win32.html +++ b/doc/win32.html @@ -131,11 +131,3 @@ If you are using some other method to compile the libsndfile DLL you are on your - - diff --git a/examples/generate.c b/examples/generate.c index d0433130..d8317c55 100644 --- a/examples/generate.c +++ b/examples/generate.c @@ -129,11 +129,3 @@ encode_file (const char *infilename, const char *outfilename, int filetype) return ; } /* encode_file */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: fe28ef37-ae89-4f61-966b-0b1f68e37425 -*/ diff --git a/examples/generate.cs b/examples/generate.cs index 9262e5b5..1817856f 100644 --- a/examples/generate.cs +++ b/examples/generate.cs @@ -248,8 +248,3 @@ class lsndf_example { } //class lsndf_example {} -// Do not edit or modify anything in this comment block. -// The arch-tag line is a file identity tag for the GNU Arch -// revision control system. -// -// arch-tag: 61a46c48-431c-4a16-97a3-b5485ca0e157 diff --git a/examples/list_formats.c b/examples/list_formats.c index 24b6b7c8..370f28b0 100644 --- a/examples/list_formats.c +++ b/examples/list_formats.c @@ -81,10 +81,3 @@ main (void) return 0 ; } /* main */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 58127a0c-93a2-46cf-b615-fcb9adacf3f1 -*/ diff --git a/examples/make_sine.c b/examples/make_sine.c index e7b9e0f4..b786fffe 100644 --- a/examples/make_sine.c +++ b/examples/make_sine.c @@ -94,10 +94,3 @@ main (void) return 0 ; } /* main */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: fd945a2c-a306-49ef-a262-6336ced15246 -*/ diff --git a/examples/sfprocess.c b/examples/sfprocess.c index 43144750..7ade8b4e 100644 --- a/examples/sfprocess.c +++ b/examples/sfprocess.c @@ -135,11 +135,3 @@ process_data (double *data, int count, int channels) return ; } /* process_data */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: de9fdd1e-b807-41ef-9d51-075ba383e536 -*/ diff --git a/examples/sndfile-convert.c b/examples/sndfile-convert.c index 196c1bb5..3a839e31 100644 --- a/examples/sndfile-convert.c +++ b/examples/sndfile-convert.c @@ -406,10 +406,3 @@ copy_data_int (SNDFILE *outfile, SNDFILE *infile, int channels) return ; } /* copy_data_int */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 259682b3-2887-48a6-b5bb-3cde00521ba3 -*/ diff --git a/examples/sndfile-info.c b/examples/sndfile-info.c index d6f3945a..f7b868c7 100644 --- a/examples/sndfile-info.c +++ b/examples/sndfile-info.c @@ -359,10 +359,3 @@ broadcast_dump (const char *filename) } /* broadcast_dump */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f59a05db-a182-41de-aedd-d717ce2bb099 -*/ diff --git a/examples/sndfile-play-beos.cpp b/examples/sndfile-play-beos.cpp index 56f74151..fb3fde4c 100644 --- a/examples/sndfile-play-beos.cpp +++ b/examples/sndfile-play-beos.cpp @@ -142,12 +142,3 @@ main (int argc, char *argv []) return 0 ; } /* main */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 5407a79d-88de-41c7-8d8e-9acf2cf13cc1 -*/ - diff --git a/examples/sndfile-play.c b/examples/sndfile-play.c index 1a9d5c7c..1b8123bb 100644 --- a/examples/sndfile-play.c +++ b/examples/sndfile-play.c @@ -968,10 +968,4 @@ main (int argc, char *argv []) return 0 ; } /* main */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 8fc4110d-6cec-4e03-91df-0f384cabedac -*/ + diff --git a/make_lite.py b/make_lite.py index 56e79e39..eee69fc8 100644 --- a/make_lite.py +++ b/make_lite.py @@ -489,11 +489,3 @@ os.chdir (source_dir) os.system ("rm -rf /tmp/%s" % lite_version) print "Done." - - -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 4aa63c4d-930b-4ef8-a0f2-d1c63992b60b - diff --git a/man/Makefile.am b/man/Makefile.am index 6ad00bfb..574f9248 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -4,9 +4,3 @@ man_MANS = sndfile-info.1 sndfile-play.1 sndfile-convert.1 EXTRA_DIST = sndfile-info.1 sndfile-play.1 sndfile-convert.1 -## Do not edit or modify anything in this comment block. -## The arch-tag line is a file identity tag for the GNU Arch -## revision control system. -## -## arch-tag: a7e49b1a-d2f1-414d-aa5a-3a91ef566d9f - diff --git a/man/sndfile-convert.1 b/man/sndfile-convert.1 index 105c9e0f..78471736 100644 --- a/man/sndfile-convert.1 +++ b/man/sndfile-convert.1 @@ -20,9 +20,3 @@ the output file. Run "sndfile-convert --help" for more information. .SH AUTHOR This manual page was written by Erik de Castro Lopo . -.\" Do not edit or modify anything in this comment block. -.\" The following line is a file identity tag for the GNU Arch -.\" revision control system. - -.\" arch-tag: 23aa443e-f38d-488b-b7e3-290fc5c77d20 - diff --git a/man/sndfile-info.1 b/man/sndfile-info.1 index 744a7015..b6687585 100644 --- a/man/sndfile-info.1 +++ b/man/sndfile-info.1 @@ -14,9 +14,3 @@ This manual page was originally written by Joshua Haberman others). Further additions have been made by Erik de Castro Lopo . -.\" Do not edit or modify anything in this comment block. -.\" The following line is a file identity tag for the GNU Arch -.\" revision control system. - -.\" arch-tag: f9eca35e-5519-434d-bc55-fe845df977cd - diff --git a/man/sndfile-play.1 b/man/sndfile-play.1 index 1e50e65e..0196461c 100644 --- a/man/sndfile-play.1 +++ b/man/sndfile-play.1 @@ -34,8 +34,3 @@ This manual page was originally written by Joshua Haberman others). Further additions have been made by Erik de Castro Lopo . -.\" Do not edit or modify anything in this comment block. -.\" The arch-tag line is a file identity tag for the GNU Arch -.\" revision control system. - -.\" arch-tag: 5a0120d9-040c-464e-b01e-89dc2c2428c9 diff --git a/regtest/Makefile.am b/regtest/Makefile.am index ad539867..2347eb43 100644 --- a/regtest/Makefile.am +++ b/regtest/Makefile.am @@ -10,9 +10,3 @@ INCLUDES = -I$(srcdir)/$(SNDFILEDIR) $(OS_SPECIFIC_CFLAGS) sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c sndfile_regtest_LDADD = $(SNDFILEDIR)/libsndfile.la $(SQLITE3_LIBS) - -## Do not edit or modify anything in this comment block. -## The arch-tag line is a file identity tag for the GNU Arch -## revision control system. -## -## arch-tag: ac4a9626-49ce-4bb4-9fb6-e43de0a23432 diff --git a/regtest/Readme.txt b/regtest/Readme.txt index 5102cb88..bc038d64 100644 --- a/regtest/Readme.txt +++ b/regtest/Readme.txt @@ -106,9 +106,3 @@ dot com). If possible place the file on a web server and email the author a link to it. --------------------------------------------------------------------------- -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 174661f1-9874-424e-8d8b-301d0322dfdb diff --git a/regtest/checksum.c b/regtest/checksum.c index 033a1564..f4c45da0 100644 --- a/regtest/checksum.c +++ b/regtest/checksum.c @@ -20,16 +20,15 @@ ** A simple checksum for short, int and float data. */ -#include "config.h" +#include "sfconfig.h" #include #include #include +#include #include -#include "float_cast.h" - #include "regtest.h" #define BIG_PRIME 999983 @@ -116,10 +115,3 @@ float_checksum (SNDFILE * file, int start) return start ; } /* float_checksum */ -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 6ae999d1-dd5a-4306-9e11-d4cfc9e8ae27 -*/ diff --git a/regtest/database.c b/regtest/database.c index 7830d68a..1d03b4e0 100644 --- a/regtest/database.c +++ b/regtest/database.c @@ -491,12 +491,3 @@ dummy (void) } /* dummy */ #endif - - -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: c6bcb7cb-0d9e-47b6-a89a-66304df4d462 -*/ diff --git a/regtest/regtest.h b/regtest/regtest.h index cc8ecaa7..589f386d 100644 --- a/regtest/regtest.h +++ b/regtest/regtest.h @@ -36,10 +36,3 @@ int db_del_entry (REG_DB * db_handle, const char * entry) ; /* In checksum.c */ int calc_checksum (SNDFILE * file, const SF_INFO * info) ; -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 80138e38-f373-48d3-8152-7f7882a62cd7 -*/ diff --git a/regtest/sndfile-regtest.c b/regtest/sndfile-regtest.c index ee7eaa9c..8ef98084 100644 --- a/regtest/sndfile-regtest.c +++ b/regtest/sndfile-regtest.c @@ -119,10 +119,3 @@ main (void) #endif -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 7f318f08-9bfa-4249-856d-fe994819bdce -*/ diff --git a/src/G72x/Makefile.am b/src/G72x/Makefile.am index 8fb2909c..6c45e965 100644 --- a/src/G72x/Makefile.am +++ b/src/G72x/Makefile.am @@ -20,9 +20,3 @@ check: g72x_test # Disable autoheader. AUTOHEADER=echo -## Do not edit or modify anything in this comment block. -## The arch-tag line is a file identity tag for the GNU Arch -## revision control system. -## -## arch-tag: d417a8e8-da7f-423d-884d-f03c93379348 - diff --git a/src/G72x/g721.c b/src/G72x/g721.c index 4f51bb19..d305ba8f 100644 --- a/src/G72x/g721.c +++ b/src/G72x/g721.c @@ -152,11 +152,4 @@ g721_decoder( /* sr was 14-bit dynamic range */ return (sr << 2); } -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 101b6e25-457d-490a-99ae-e2e74a26ea24 -*/ diff --git a/src/G72x/g723_16.c b/src/G72x/g723_16.c index 0c317450..ae90b6c4 100644 --- a/src/G72x/g723_16.c +++ b/src/G72x/g723_16.c @@ -159,11 +159,4 @@ g723_16_decoder( /* sr was of 14-bit dynamic range */ return (sr << 2); } -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: ae265466-c3fc-4f83-bb32-edae488a5ca5 -*/ diff --git a/src/G72x/g723_24.c b/src/G72x/g723_24.c index 8748459a..02b6c24a 100644 --- a/src/G72x/g723_24.c +++ b/src/G72x/g723_24.c @@ -136,11 +136,4 @@ g723_24_decoder( return (sr << 2); /* sr was of 14-bit dynamic range */ } -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 75389236-650b-4427-98f3-0df6e8fb24bc -*/ diff --git a/src/G72x/g723_40.c b/src/G72x/g723_40.c index 6ddb577d..d5203953 100644 --- a/src/G72x/g723_40.c +++ b/src/G72x/g723_40.c @@ -150,11 +150,4 @@ int g723_40_decoder (int i, G72x_STATE *state_ptr) return (sr << 2); /* sr was of 14-bit dynamic range */ } -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: eb8d9a00-32bf-4dd2-b287-01b0336d72bf -*/ diff --git a/src/G72x/g72x.c b/src/G72x/g72x.c index fe366f4b..3fae81aa 100644 --- a/src/G72x/g72x.c +++ b/src/G72x/g72x.c @@ -642,11 +642,3 @@ pack_bytes (int bits, const short * samples, unsigned char * block) return bindex ; } /* pack_bytes */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 6298dc75-fd0f-4062-9b90-f73ed69f22d4 -*/ - diff --git a/src/G72x/g72x.h b/src/G72x/g72x.h index e6319e62..a36582cf 100644 --- a/src/G72x/g72x.h +++ b/src/G72x/g72x.h @@ -89,11 +89,3 @@ int g72x_encode_block (struct g72x_state *pstate, short *samples, unsigned char #endif /* !G72X_HEADER_FILE */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 6ca84e5f-f932-4ba1-87ee-37056d921621 -*/ - diff --git a/src/G72x/g72x_priv.h b/src/G72x/g72x_priv.h index a88e96d0..867c64b3 100644 --- a/src/G72x/g72x_priv.h +++ b/src/G72x/g72x_priv.h @@ -107,12 +107,3 @@ int g723_40_decoder (int code, G72x_STATE *state_ptr); void private_init_state (G72x_STATE *state_ptr) ; #endif /* G72X_PRIVATE_H */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: d9ad4da7-0fa3-471d-8020-720b5cfb5e5b -*/ - diff --git a/src/G72x/g72x_test.c b/src/G72x/g72x_test.c index caf58467..4a62109e 100644 --- a/src/G72x/g72x_test.c +++ b/src/G72x/g72x_test.c @@ -212,11 +212,3 @@ oct_save_short (short *a, short *b, int len) return 0 ; } /* oct_save_short */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 0597b442-a5b0-4abf-92a4-92f6c24e85a6 -*/ - diff --git a/src/Makefile.am b/src/Makefile.am index 628ff380..dab2b346 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = sndfile.h.in config.h.in test_endswap.tpl test_endswap.def \ Symbols.linux Symbols.darwin libsndfile.def cygsndfile.def \ create_symbols_file.py binheader_writef_check.py -noinst_HEADERS = common.h sfconfig.h sfendian.h float_cast.h wav_w64.h sf_unistd.h +noinst_HEADERS = common.h sfconfig.h sfendian.h wav_w64.h sf_unistd.h noinst_PROGRAMS = test_main diff --git a/src/alaw.c b/src/alaw.c index a2d27cb5..1fcd05f4 100644 --- a/src/alaw.c +++ b/src/alaw.c @@ -16,8 +16,11 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + +#include + #include "sndfile.h" -#include "float_cast.h" #include "common.h" static sf_count_t alaw_read_alaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; @@ -535,10 +538,3 @@ alaw_write_d2alaw (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* alaw_write_d2alaw */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 289ccfc2-42a6-4f1f-a29f-4dcc9bfa8752 -*/ diff --git a/src/au.c b/src/au.c index e5dac5fe..045003c1 100644 --- a/src/au.c +++ b/src/au.c @@ -449,10 +449,4 @@ au_read_header (SF_PRIVATE *psf) return 0 ; } /* au_read_header */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 31f691b1-cde9-4ed2-9469-6bca60fb9cd0 -*/ + diff --git a/src/avr.c b/src/avr.c index ad02c048..ef14e90c 100644 --- a/src/avr.c +++ b/src/avr.c @@ -245,10 +245,3 @@ avr_close (SF_PRIVATE *psf) return 0 ; } /* avr_close */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 0823d454-f39a-4a28-a776-607f1ef33b52 -*/ diff --git a/src/binheader_writef_check.py b/src/binheader_writef_check.py index 422d2854..3bc5db53 100755 --- a/src/binheader_writef_check.py +++ b/src/binheader_writef_check.py @@ -107,8 +107,3 @@ if len (sys.argv) > 1: print "ok" -# Do not edit or modify anything in this comment block. -# The following line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 4ed34789-925a-4135-af90-2e51523ca1ce diff --git a/src/caf.c b/src/caf.c index 7a1e5c97..c36ec5f9 100644 --- a/src/caf.c +++ b/src/caf.c @@ -22,10 +22,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" /*------------------------------------------------------------------------------ @@ -529,10 +529,3 @@ caf_write_header (SF_PRIVATE *psf, int calc_length) return psf->error ; } /* caf_write_header */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 65883e65-bd3c-4618-9241-d3c02fd630bd -*/ diff --git a/src/command.c b/src/command.c index b737a021..420b5329 100644 --- a/src/command.c +++ b/src/command.c @@ -362,10 +362,3 @@ psf_get_max_all_channels (SF_PRIVATE *psf, double *peaks) } /* psf_get_max_all_channels */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 0aae0d9d-ab2b-4d70-ade3-47a534666f8e -*/ diff --git a/src/create_symbols_file.py b/src/create_symbols_file.py index 12a63f41..a91e89ed 100755 --- a/src/create_symbols_file.py +++ b/src/create_symbols_file.py @@ -159,9 +159,3 @@ else: sys.exit (0) -# Do not edit or modify anything in this comment block. -# The arch-tag line is a file identity tag for the GNU Arch -# revision control system. -# -# arch-tag: 5814f35c-318f-4023-a0c3-d9cf7c9e5f6c - diff --git a/src/dither.c b/src/dither.c index 50b5ba29..332a0a0b 100644 --- a/src/dither.c +++ b/src/dither.c @@ -524,10 +524,4 @@ DO_NOT_USE_sf_dither_double (const SF_DITHER_INFO *dither, const double *in, dou } /* DO_NOT_USE_sf_dither_double */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 673fad58-5314-421c-9144-9d54bfdf104c -*/ + diff --git a/src/double64.c b/src/double64.c index a84196dd..9e5aeef1 100644 --- a/src/double64.c +++ b/src/double64.c @@ -22,11 +22,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" #if CPU_IS_LITTLE_ENDIAN #define DOUBLE64_READ double64_le_read @@ -1041,10 +1041,3 @@ bd2d_write (double *buffer, int count) } ; } /* bd2d_write */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 4ee243b7-8c7a-469b-869c-e9aa0ee3b77f -*/ diff --git a/src/dwd.c b/src/dwd.c index 5db7fbbd..d5221968 100644 --- a/src/dwd.c +++ b/src/dwd.c @@ -199,10 +199,4 @@ dwd_read_header (SF_PRIVATE *psf) */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: a5e1d2a6-a840-4039-a0e7-e1a43eb05a4f -*/ + diff --git a/src/dwvw.c b/src/dwvw.c index 6076276d..afe4dae8 100644 --- a/src/dwvw.c +++ b/src/dwvw.c @@ -31,10 +31,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" typedef struct @@ -660,10 +660,3 @@ dwvw_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* dwvw_write_d */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 1ca09552-b01f-4d7f-9bcf-612f834fe41d -*/ diff --git a/src/file_io.c b/src/file_io.c index f461f598..bb170d45 100644 --- a/src/file_io.c +++ b/src/file_io.c @@ -1532,10 +1532,3 @@ psf_log_syserr (SF_PRIVATE *psf, int error) #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 749740d7-ecc7-47bd-8cf7-600f31d32e6d -*/ diff --git a/src/flac.c b/src/flac.c index 45310b8c..12d5db18 100644 --- a/src/flac.c +++ b/src/flac.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "sndfile.h" #include "common.h" @@ -34,7 +35,6 @@ #include "FLAC/include/FLAC/metadata.h" #include "sfendian.h" -#include "float_cast.h" /*------------------------------------------------------------------------------ ** Private static functions. diff --git a/src/float32.c b/src/float32.c index 194b4d00..e4a9d9f2 100644 --- a/src/float32.c +++ b/src/float32.c @@ -22,11 +22,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" #if CPU_IS_LITTLE_ENDIAN #define FLOAT32_READ float32_le_read diff --git a/src/float_cast.h b/src/float_cast.h deleted file mode 100644 index 099670a3..00000000 --- a/src/float_cast.h +++ /dev/null @@ -1,262 +0,0 @@ -/* -** Copyright (C) 2001-2004 Erik de Castro Lopo -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU Lesser General Public License as published by -** the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details. -** -** You should have received a copy of the GNU Lesser General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -/* Version 1.4 */ - -#ifndef FLOAT_CAST_HEADER -#define FLOAT_CAST_HEADER - -/*============================================================================ -** On Intel Pentium processors (especially PIII and probably P4), converting -** from float to int is very slow. To meet the C specs, the code produced by -** most C compilers targeting Pentium needs to change the FPU rounding mode -** before the float to int conversion is performed. -** -** Changing the FPU rounding mode causes the FPU pipeline to be flushed. It -** is this flushing of the pipeline which is so slow. -** -** Fortunately the ISO C99 specifications define the functions lrint, lrintf, -** llrint and llrintf which fix this problem as a side effect. -** -** On Unix-like systems, the configure process should have detected the -** presence of these functions. If they weren't found we have to replace them -** here with a standard C cast. -*/ - -/* -** The C99 prototypes for lrint and lrintf are as follows: -** -** long int lrintf (float x) ; -** long int lrint (double x) ; -*/ - -#include "sfconfig.h" - -/* -** The presence of the required functions are detected during the configure -** process and the values HAVE_LRINT and HAVE_LRINTF are set accordingly in -** the sfconfig.h file. -*/ - -#define HAVE_LRINT_REPLACEMENT 0 - -#if (HAVE_LRINT && HAVE_LRINTF) - - /* - ** These defines enable functionality introduced with the 1999 ISO C - ** standard. They must be defined before the inclusion of math.h to - ** engage them. If optimisation is enabled, these functions will be - ** inlined. With optimisation switched off, you have to link in the - ** maths library using -lm. - */ - - #define _ISOC9X_SOURCE 1 - #define _ISOC99_SOURCE 1 - - #define __USE_ISOC9X 1 - #define __USE_ISOC99 1 - - #include - -#elif (defined (__CYGWIN__)) - - #include - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - - #undef lrint - #undef lrintf - - #define lrint double2int - #define lrintf float2int - - /* - ** The native CYGWIN lrint and lrintf functions are buggy: - ** http://sourceware.org/ml/cygwin/2005-06/msg00153.html - ** http://sourceware.org/ml/cygwin/2005-09/msg00047.html - ** and slow. - ** These functions (pulled from the Public Domain MinGW math.h header) - ** replace the native versions. - */ - - static inline long double2int (double in) - { long retval ; - - __asm__ __volatile__ - ( "fistpl %0" - : "=m" (retval) - : "t" (in) - : "st" - ) ; - - return retval ; - } /* double2int */ - - static inline long float2int (float in) - { long retval ; - - __asm__ __volatile__ - ( "fistpl %0" - : "=m" (retval) - : "t" (in) - : "st" - ) ; - - return retval ; - } /* float2int */ - -#elif (defined (WIN32) || defined (_WIN32)) - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - - #include - - /* - ** Win32 doesn't seem to have these functions. - ** Therefore implement inline versions of these functions here. - */ - - __inline long int - lrint (double flt) - { int intgr ; - - _asm - { fld flt - fistp intgr - } ; - - return intgr ; - } - - __inline long int - lrintf (float flt) - { int intgr ; - - _asm - { fld flt - fistp intgr - } ; - - return intgr ; - } - -#elif (defined (__MWERKS__) && defined (macintosh)) - - /* This MacOS 9 solution was provided by Stephane Letz */ - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - #include - - #undef lrint - #undef lrintf - - #define lrint double2int - #define lrintf float2int - - inline int - float2int (register float in) - { long res [2] ; - - asm - { fctiw in, in - stfd in, res - } - return res [1] ; - } /* float2int */ - - inline int - double2int (register double in) - { long res [2] ; - - asm - { fctiw in, in - stfd in, res - } - return res [1] ; - } /* double2int */ - -#elif (defined (__MACH__) && defined (__APPLE__)) - - /* For Apple MacOSX. */ - - #undef HAVE_LRINT_REPLACEMENT - #define HAVE_LRINT_REPLACEMENT 1 - #include - - #undef lrint - #undef lrintf - - #define lrint double2int - #define lrintf float2int - - inline static long - float2int (register float in) - { int res [2] ; - - __asm__ __volatile__ - ( "fctiw %1, %1\n\t" - "stfd %1, %0" - : "=m" (res) /* Output */ - : "f" (in) /* Input */ - : "memory" - ) ; - - return res [1] ; - } /* lrintf */ - - inline static long - double2int (register double in) - { int res [2] ; - - __asm__ __volatile__ - ( "fctiw %1, %1\n\t" - "stfd %1, %0" - : "=m" (res) /* Output */ - : "f" (in) /* Input */ - : "memory" - ) ; - - return res [1] ; - } /* lrint */ - -#else - #ifndef __sgi - #warning "Don't have the functions lrint() and lrintf()." - #warning "Replacing these functions with a standard C cast." - #endif - - #include - - #define lrint(dbl) ((long) (dbl)) - #define lrintf(flt) ((long) (flt)) - -#endif - - -#endif /* FLOAT_CAST_HEADER */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 42db1693-ff61-4051-bac1-e4d24c4e30b7 -*/ diff --git a/src/g72x.c b/src/g72x.c index a33a926f..96e5b50f 100644 --- a/src/g72x.c +++ b/src/g72x.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" #include "G72x/g72x.h" @@ -602,10 +602,3 @@ g72x_close (SF_PRIVATE *psf) return 0 ; } /* g72x_close */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 3cc5439e-7247-486b-b2e6-11a4affa5744 -*/ diff --git a/src/gsm610.c b/src/gsm610.c index 575f78cb..d5e8fec2 100644 --- a/src/gsm610.c +++ b/src/gsm610.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" #include "wav_w64.h" #include "GSM610/gsm.h" @@ -617,10 +617,3 @@ gsm610_close (SF_PRIVATE *psf) return 0 ; } /* gsm610_close */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 8575187d-af4f-4acf-b9dd-6ff705628345 -*/ diff --git a/src/htk.c b/src/htk.c index 716868b5..9210feb9 100644 --- a/src/htk.c +++ b/src/htk.c @@ -216,10 +216,4 @@ htk_read_header (SF_PRIVATE *psf) return 0 ; } /* htk_read_header */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: c350e972-082e-4c20-8934-03391a723560 -*/ + diff --git a/src/ima_adpcm.c b/src/ima_adpcm.c index 49ffabe3..3daa3503 100644 --- a/src/ima_adpcm.c +++ b/src/ima_adpcm.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" typedef struct IMA_ADPCM_PRIVATE_tag @@ -966,11 +966,3 @@ ima_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* ima_write_d */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 75a54b82-ad18-4758-9933-64e00a7f24e0 -*/ diff --git a/src/interleave.c b/src/interleave.c index 7c18bd46..043e9c47 100644 --- a/src/interleave.c +++ b/src/interleave.c @@ -297,10 +297,4 @@ interleave_seek (SF_PRIVATE *psf, int mode, sf_count_t samples_from_start) return samples_from_start ; } /* interleave_seek */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 82314e13-0225-4408-a2f2-e6dab3f38904 -*/ + diff --git a/src/ircam.c b/src/ircam.c index 7df38484..c87e83d5 100644 --- a/src/ircam.c +++ b/src/ircam.c @@ -320,10 +320,3 @@ get_encoding_str (int encoding) return "Unknown encoding" ; } /* get_encoding_str */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f2714ab8-f286-4c94-9740-edaf673a1c71 -*/ diff --git a/src/macbinary3.c b/src/macbinary3.c index 66fe64d1..a173b7ad 100644 --- a/src/macbinary3.c +++ b/src/macbinary3.c @@ -43,10 +43,3 @@ macbinary3_open (SF_PRIVATE * UNUSED (psf)) #endif /* OS_IS_MACOSX */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: c397a7d7-1a31-4349-9684-bd29ef06211e -*/ diff --git a/src/macos.c b/src/macos.c index c2ca5932..b891027f 100644 --- a/src/macos.c +++ b/src/macos.c @@ -49,10 +49,3 @@ macos_guess_file_type (SF_PRIVATE * psf, const char *filename) return 0 ; } /* macos_guess_file_type */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 5fbf66d7-9547-442a-9c73-92fd164f3a95 -*/ diff --git a/src/mat4.c b/src/mat4.c index f85f96de..834aff53 100644 --- a/src/mat4.c +++ b/src/mat4.c @@ -22,11 +22,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" /*------------------------------------------------------------------------------ ** Information on how to decode and encode this file was obtained in a PDF @@ -386,10 +386,4 @@ mat4_marker_to_str (int marker) LSF_SNPRINTF (str, sizeof (str) - 1, "%08X", marker) ; return str ; } /* mat4_marker_to_str */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f7e5f5d6-fc39-452e-bc4a-59627116ff59 -*/ + diff --git a/src/mat5.c b/src/mat5.c index b4de610e..ce111a17 100644 --- a/src/mat5.c +++ b/src/mat5.c @@ -22,11 +22,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" /*------------------------------------------------------------------------------ ** Information on how to decode and encode this file was obtained in a PDF @@ -498,10 +498,3 @@ mat5_read_header (SF_PRIVATE *psf) return 0 ; } /* mat5_read_header */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: dfdb6742-b2be-4be8-b390-d0c674e8bc8e -*/ diff --git a/src/ms_adpcm.c b/src/ms_adpcm.c index 0fc3403a..10b97351 100644 --- a/src/ms_adpcm.c +++ b/src/ms_adpcm.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" #include "wav_w64.h" @@ -825,10 +825,4 @@ choose_predictor (unsigned int channels, short *data, int *block_pred, int *idel return ; } /* choose_predictor */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: a98908a3-5305-4935-872b-77d6a86c330f -*/ + diff --git a/src/new.c b/src/new.c index 475e92b3..189c460e 100644 --- a/src/new.c +++ b/src/new.c @@ -114,10 +114,3 @@ new_read_header (SF_PRIVATE *psf) */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 98c77ff6-81a6-440d-bad1-4597f51df956 -*/ diff --git a/src/nist.c b/src/nist.c index 2ab20dbf..07f45d8d 100644 --- a/src/nist.c +++ b/src/nist.c @@ -357,11 +357,3 @@ nist_write_header (SF_PRIVATE *psf, int calc_length) return psf->error ; } /* nist_write_header */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: b45ed85d-9e22-4ad9-b78c-4b58b67152a8 -*/ diff --git a/src/ogg.c b/src/ogg.c index 06691ee1..7eefcc56 100644 --- a/src/ogg.c +++ b/src/ogg.c @@ -57,6 +57,7 @@ #include #include #include +#include #if HAVE_UNISTD_H #include @@ -65,7 +66,6 @@ #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" #include "VORBIS/include/vorbis/codec.h" #include "VORBIS/include/vorbis/vorbisenc.h" diff --git a/src/paf.c b/src/paf.c index 8d52e1c3..cbe9164e 100644 --- a/src/paf.c +++ b/src/paf.c @@ -23,10 +23,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" /*------------------------------------------------------------------------------ @@ -828,11 +828,3 @@ paf24_write_d (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* paf24_write_d */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 477a5308-451e-4bbd-bab4-fab6caa4e884 -*/ diff --git a/src/pcm.c b/src/pcm.c index a56f182a..3231a737 100644 --- a/src/pcm.c +++ b/src/pcm.c @@ -18,9 +18,10 @@ #include "sfconfig.h" +#include + #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" /* Need to be able to handle 3 byte (24 bit) integers. So defined a @@ -2898,10 +2899,3 @@ pcm_write_d2lei (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* pcm_write_d2lei */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: d8bc7c0e-1e2f-4ff3-a28f-10ce1fbade3b -*/ diff --git a/src/pvf.c b/src/pvf.c index b759dbb2..026bdaa7 100644 --- a/src/pvf.c +++ b/src/pvf.c @@ -186,10 +186,3 @@ pvf_read_header (SF_PRIVATE *psf) return 0 ; } /* pvf_read_header */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 20a26761-8bc1-41d7-b1f3-9793bf3d9864 -*/ diff --git a/src/raw.c b/src/raw.c index 65be491f..ae0da105 100644 --- a/src/raw.c +++ b/src/raw.c @@ -102,10 +102,3 @@ raw_open (SF_PRIVATE *psf) return error ; } /* raw_open */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f0066de7-d6ce-4f36-a1e0-e475c07d4e1a -*/ diff --git a/src/rx2.c b/src/rx2.c index b3a3090c..dc1d89d9 100644 --- a/src/rx2.c +++ b/src/rx2.c @@ -317,10 +317,3 @@ rx2_close (SF_PRIVATE *psf) } /* rx2_close */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 7366e813-9fee-4d1f-881e-e4a691469370 -*/ diff --git a/src/sds.c b/src/sds.c index 710d2117..780a0569 100644 --- a/src/sds.c +++ b/src/sds.c @@ -23,11 +23,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" /*------------------------------------------------------------------------------ */ @@ -984,10 +984,3 @@ sds_write (SF_PRIVATE *psf, SDS_PRIVATE *psds, const int *ptr, int len) return total ; } /* sds_write */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: d5d26aa3-368c-4ca6-bb85-377e5a2578cc -*/ diff --git a/src/sf_unistd.h b/src/sf_unistd.h index f24ae67e..f069ced7 100644 --- a/src/sf_unistd.h +++ b/src/sf_unistd.h @@ -58,10 +58,4 @@ ** #define _IFMT _S_IFMT ** #define _IFREG _S_IFREG */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 253aea6d-6299-46fd-8d06-bc5f6224c8fe -*/ + diff --git a/src/sfconfig.h b/src/sfconfig.h index f12df6d7..5a466d16 100644 --- a/src/sfconfig.h +++ b/src/sfconfig.h @@ -99,10 +99,3 @@ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 2df2316e-8f9d-4860-bba7-f3c16c63eed3 -*/ diff --git a/src/sfendian.h b/src/sfendian.h index 651616b8..4adeab0d 100644 --- a/src/sfendian.h +++ b/src/sfendian.h @@ -252,10 +252,3 @@ endswap_double_copy (double *dest, const double *src, int len) #endif /* SFENDIAN_INCLUDED */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f0c5cd54-42d3-4237-90ec-11fe24995de7 -*/ diff --git a/src/strings.c b/src/strings.c index 55d9e608..5e3b2d6b 100644 --- a/src/strings.c +++ b/src/strings.c @@ -198,10 +198,3 @@ hexdump (void *data, int len) } /* hexdump */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 04393aa1-9389-46fe-baf2-58a7bd544fd6 -*/ diff --git a/src/svx.c b/src/svx.c index bc44fe5d..3c542b62 100644 --- a/src/svx.c +++ b/src/svx.c @@ -403,11 +403,3 @@ svx_write_header (SF_PRIVATE *psf, int calc_length) return psf->error ; } /* svx_write_header */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: a80ab6fb-7d75-4d32-a6b0-0061a3f05d95 -*/ diff --git a/src/txw.c b/src/txw.c index b2f9ef67..7b8f443a 100644 --- a/src/txw.c +++ b/src/txw.c @@ -370,10 +370,3 @@ txw_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) } /* txw_seek */ #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 4d0ba7af-b1c5-46b4-a900-7c6f59fd9a89 -*/ diff --git a/src/ulaw.c b/src/ulaw.c index e476c0a7..f80a9036 100644 --- a/src/ulaw.c +++ b/src/ulaw.c @@ -16,8 +16,11 @@ ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "sfconfig.h" + +#include + #include "sndfile.h" -#include "float_cast.h" #include "common.h" static sf_count_t ulaw_read_ulaw2s (SF_PRIVATE *psf, short *ptr, sf_count_t len) ; @@ -1038,10 +1041,3 @@ ulaw_write_d2ulaw (SF_PRIVATE *psf, const double *ptr, sf_count_t len) return total ; } /* ulaw_write_d2ulaw */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 655cc790-f058-45e8-89c9-86967cccc37e -*/ diff --git a/src/vox_adpcm.c b/src/vox_adpcm.c index 671abdbd..81ca7ede 100644 --- a/src/vox_adpcm.c +++ b/src/vox_adpcm.c @@ -34,10 +34,10 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" -#include "float_cast.h" #include "common.h" #include "ima_oki_adpcm.h" diff --git a/src/w64.c b/src/w64.c index 73ab00d3..a2b83fa0 100644 --- a/src/w64.c +++ b/src/w64.c @@ -577,11 +577,3 @@ w64_close (SF_PRIVATE *psf) return 0 ; } /* w64_close */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 9aa4e141-538a-4dd9-99c9-b3f0f2dd4f4a -*/ diff --git a/src/wav_w64.c b/src/wav_w64.c index cec6a9b7..735f7376 100644 --- a/src/wav_w64.c +++ b/src/wav_w64.c @@ -569,10 +569,3 @@ wav_w64_srate2blocksize (int srate_chan_product) return 1024 ; return 2048 ; } /* srate2blocksize */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 43c1b1dd-8abd-43da-a8cd-44da914b64a5 -*/ diff --git a/src/wav_w64.h b/src/wav_w64.h index bb738fda..55ec6f11 100644 --- a/src/wav_w64.h +++ b/src/wav_w64.h @@ -284,10 +284,4 @@ void wavex_write_guid (SF_PRIVATE *psf, const EXT_SUBFORMAT * subformat) ; void wav_w64_analyze (SF_PRIVATE *psf) ; #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 877fde12-9be3-4a31-8a5a-fdae39958613 -*/ + diff --git a/src/xi.c b/src/xi.c index a4b27157..5880657a 100644 --- a/src/xi.c +++ b/src/xi.c @@ -23,11 +23,11 @@ #include #include #include +#include #include "sndfile.h" #include "sfendian.h" #include "common.h" -#include "float_cast.h" #define MAX_XI_SAMPLES 16 @@ -1191,10 +1191,3 @@ d2dles_array (XI_PRIVATE *pxi, const double *src, short *dest, int count, double pxi->last_16 = last_val ; } /* d2dles_array */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 1ab2dbe0-29af-4d80-9c6f-cb21b67521bc -*/ diff --git a/tests/alaw_test.c b/tests/alaw_test.c index 2c0788b6..037fc8c9 100644 --- a/tests/alaw_test.c +++ b/tests/alaw_test.c @@ -233,18 +233,3 @@ int alaw_decode (unsigned int Alawbyte) return sample ; } /* alaw_decode */ - - - - - - - - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: d3fb5eae-b3a4-4c5b-90ab-e3daa64c4a57 -*/ diff --git a/tests/cpp_crack_test.cc b/tests/cpp_crack_test.cc index 0115ebb3..bd1ac21e 100644 --- a/tests/cpp_crack_test.cc +++ b/tests/cpp_crack_test.cc @@ -135,10 +135,3 @@ main (void) return 0 ; } /* main */ -/* -** Do not edit or modify anything in this comment block. -** The following line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 9600906c-fd77-4fdd-a25e-c21a1776ef1f -*/ diff --git a/tests/dither_test.c b/tests/dither_test.c index 5aae3722..6a8555dc 100644 --- a/tests/dither_test.c +++ b/tests/dither_test.c @@ -183,10 +183,3 @@ dither_test (const char *filename, int filetype) puts ("ok") ; } /* dither_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: ad688dd9-5211-48ef-b82d-089eafb1e7ad -*/ diff --git a/tests/dwvw_test.c b/tests/dwvw_test.c index a4d9d15b..1a640097 100644 --- a/tests/dwvw_test.c +++ b/tests/dwvw_test.c @@ -20,13 +20,12 @@ #include #include +#include #if HAVE_UNISTD_H #include #endif -#include - #include #include "utils.h" @@ -110,10 +109,4 @@ dwvw_test (const char *filename, int format, int bit_width) return ; } /* dwvw_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 9e7731c3-43cd-4de5-b539-1ce6fa11d937 -*/ + diff --git a/tests/fix_this.c b/tests/fix_this.c index c0575a5a..e1c12004 100644 --- a/tests/fix_this.c +++ b/tests/fix_this.c @@ -322,10 +322,3 @@ error_function (double data, double orig, double margin) return 0 ; } /* error_function */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 368e2777-2848-4e16-a77f-4db841377c73 -*/ diff --git a/tests/headerless_test.c b/tests/headerless_test.c index 55957308..21e056b1 100644 --- a/tests/headerless_test.c +++ b/tests/headerless_test.c @@ -178,10 +178,3 @@ old_test (void) unlink (filename) ; } /* old_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 0820bc1a-c396-4e66-9997-096999b0bc40 -*/ diff --git a/tests/largefile_test.c b/tests/largefile_test.c index 8fb005ac..2ed29fce 100644 --- a/tests/largefile_test.c +++ b/tests/largefile_test.c @@ -81,10 +81,3 @@ largefile_test (int filetype, const char * filename) return ; } /* largefile_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 4ef10b9a-3356-4b92-8b7b-c60c0c4123fe -*/ diff --git a/tests/locale_test.c b/tests/locale_test.c index 4c76f568..a432b7ba 100644 --- a/tests/locale_test.c +++ b/tests/locale_test.c @@ -104,11 +104,3 @@ locale_test (const char * locname, const char * filename, int width) #endif } /* locale_test */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 087b25a3-03a2-4195-acd2-23fbbc489021 -*/ diff --git a/tests/misc_test.c b/tests/misc_test.c index 71aa186c..3253c1e5 100644 --- a/tests/misc_test.c +++ b/tests/misc_test.c @@ -356,10 +356,3 @@ permission_test (const char *filename, int typemajor) #endif } /* permission_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: efc6c227-8881-4a1d-8680-0d1255975267 -*/ diff --git a/tests/pcm_test.tpl b/tests/pcm_test.tpl index d744c0ff..7533367c 100644 --- a/tests/pcm_test.tpl +++ b/tests/pcm_test.tpl @@ -22,6 +22,7 @@ #include #include #include +#include #if HAVE_UNISTD_H #include @@ -29,7 +30,6 @@ #include -#include "float_cast.h" #include "utils.h" #define BUFFER_SIZE (1<<12) diff --git a/tests/raw_test.c b/tests/raw_test.c index 0741f798..ee37307b 100644 --- a/tests/raw_test.c +++ b/tests/raw_test.c @@ -186,10 +186,3 @@ bad_raw_test (void) puts ("ok") ; } /* bad_raw_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 3dccee22-b0bc-4a1f-966c-8ae96f0921ae -*/ diff --git a/tests/sftest.c b/tests/sftest.c index ab68f135..c825a90f 100644 --- a/tests/sftest.c +++ b/tests/sftest.c @@ -63,11 +63,3 @@ main (int argc, char *argv []) return 0 ; } /* main */ - -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 43654fba-c130-4870-992b-9d4a390a6964 -*/ diff --git a/tests/sfversion.c b/tests/sfversion.c index 80e98163..49cd3232 100644 --- a/tests/sfversion.c +++ b/tests/sfversion.c @@ -40,10 +40,3 @@ main (void) return 0 ; } /* main */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 53b0b14d-a52b-4094-b510-df91e4947574 -*/ diff --git a/tests/stdin_test.c b/tests/stdin_test.c index 8f4db30c..9294d33d 100644 --- a/tests/stdin_test.c +++ b/tests/stdin_test.c @@ -195,10 +195,4 @@ stdin_test (int typemajor, int count) return ; } /* stdin_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 5e470e3e-743e-4bbc-a588-ec883843c938 -*/ + diff --git a/tests/stdio_test.c b/tests/stdio_test.c index 1d177fc3..ce76e20f 100644 --- a/tests/stdio_test.c +++ b/tests/stdio_test.c @@ -150,10 +150,3 @@ file_exists (const char *filename) #endif -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: f46d84fd-d37b-4d08-b1ba-80f2f1e0cfb9 -*/ diff --git a/tests/stdout_test.c b/tests/stdout_test.c index 65343dd7..a8aa1bd5 100644 --- a/tests/stdout_test.c +++ b/tests/stdout_test.c @@ -158,10 +158,4 @@ stdout_test (int typemajor, int count) return ; } /* stdout_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 660c3f79-a459-4c7c-899b-b360b7403403 -*/ + diff --git a/tests/ulaw_test.c b/tests/ulaw_test.c index 1b73a130..4fbcd876 100644 --- a/tests/ulaw_test.c +++ b/tests/ulaw_test.c @@ -253,10 +253,3 @@ int ulaw_decode (unsigned int ulawbyte) return sample ; } /* ulaw_decode */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: e764cee1-5a9a-480b-a4ca-34d9b57dea6f -*/ diff --git a/tests/virtual_io_test.c b/tests/virtual_io_test.c index 90fb6db2..dcd3371e 100644 --- a/tests/virtual_io_test.c +++ b/tests/virtual_io_test.c @@ -229,10 +229,3 @@ vio_test (const char *fname, int format) puts ("ok") ; } /* vio_test */ -/* -** Do not edit or modify anything in this comment block. -** The arch-tag line is a file identity tag for the GNU Arch -** revision control system. -** -** arch-tag: 5569fa52-15dd-496f-ab47-1fd42d76195d -*/