From 6d48d2aec9e903cf271186b871dc8e28f9b8518c Mon Sep 17 00:00:00 2001 From: xufulong Date: Tue, 5 Oct 2021 19:35:58 +0800 Subject: [PATCH] remove u1-fmt.c --- app/src/main/cpp/sox/CmakeLists.txt | 5 ----- app/src/main/cpp/sox/formats.h | 10 +++++----- app/src/main/cpp/sox/u1-fmt.c | 21 --------------------- app/src/main/cpp/sox/u2-fmt.c | 21 --------------------- app/src/main/cpp/sox/u3-fmt.c | 21 --------------------- app/src/main/cpp/sox/u4-fmt.c | 21 --------------------- app/src/main/cpp/sox/ul-fmt.c | 21 --------------------- 7 files changed, 5 insertions(+), 115 deletions(-) delete mode 100644 app/src/main/cpp/sox/u1-fmt.c delete mode 100644 app/src/main/cpp/sox/u2-fmt.c delete mode 100644 app/src/main/cpp/sox/u3-fmt.c delete mode 100644 app/src/main/cpp/sox/u4-fmt.c delete mode 100644 app/src/main/cpp/sox/ul-fmt.c diff --git a/app/src/main/cpp/sox/CmakeLists.txt b/app/src/main/cpp/sox/CmakeLists.txt index d094c0e..3458af2 100644 --- a/app/src/main/cpp/sox/CmakeLists.txt +++ b/app/src/main/cpp/sox/CmakeLists.txt @@ -112,11 +112,6 @@ set(formats_srcs sounder.c soundtool.c sox-fmt.c - u1-fmt.c - u2-fmt.c - u3-fmt.c - u4-fmt.c - ul-fmt.c voc.c vox.c vox.h diff --git a/app/src/main/cpp/sox/formats.h b/app/src/main/cpp/sox/formats.h index 0a1aa04..d322a1b 100644 --- a/app/src/main/cpp/sox/formats.h +++ b/app/src/main/cpp/sox/formats.h @@ -52,11 +52,11 @@ // FORMAT(sphere) // FORMAT(svx) // FORMAT(txw) - FORMAT(u1) - FORMAT(u2) - FORMAT(u3) - FORMAT(u4) - FORMAT(ul) +// FORMAT(u1) +// FORMAT(u2) +// FORMAT(u3) +// FORMAT(u4) +// FORMAT(ul) FORMAT(voc) FORMAT(vox) FORMAT(wav) diff --git a/app/src/main/cpp/sox/u1-fmt.c b/app/src/main/cpp/sox/u1-fmt.c deleted file mode 100644 index f25f39d..0000000 --- a/app/src/main/cpp/sox/u1-fmt.c +++ /dev/null @@ -1,21 +0,0 @@ -/* libSoX file formats: raw (c) 2007-8 SoX contributors - * - * This library 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 library 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 library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sox_i.h" -#include "raw.h" - -RAW_FORMAT4(u1, "u8", "ub", "sou", "fssd", 8, 0, UNSIGNED) diff --git a/app/src/main/cpp/sox/u2-fmt.c b/app/src/main/cpp/sox/u2-fmt.c deleted file mode 100644 index 27019d6..0000000 --- a/app/src/main/cpp/sox/u2-fmt.c +++ /dev/null @@ -1,21 +0,0 @@ -/* libSoX file formats: raw (c) 2007-8 SoX contributors - * - * This library 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 library 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 library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sox_i.h" -#include "raw.h" - -RAW_FORMAT2(u2, "u16", "uw", 16, 0, UNSIGNED) diff --git a/app/src/main/cpp/sox/u3-fmt.c b/app/src/main/cpp/sox/u3-fmt.c deleted file mode 100644 index 66b7587..0000000 --- a/app/src/main/cpp/sox/u3-fmt.c +++ /dev/null @@ -1,21 +0,0 @@ -/* libSoX file formats: raw (c) 2007-8 SoX contributors - * - * This library 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 library 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 library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sox_i.h" -#include "raw.h" - -RAW_FORMAT1(u3, "u24", 24, 0, UNSIGNED) diff --git a/app/src/main/cpp/sox/u4-fmt.c b/app/src/main/cpp/sox/u4-fmt.c deleted file mode 100644 index 28f99fa..0000000 --- a/app/src/main/cpp/sox/u4-fmt.c +++ /dev/null @@ -1,21 +0,0 @@ -/* libSoX file formats: raw (c) 2007-8 SoX contributors - * - * This library 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 library 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 library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sox_i.h" -#include "raw.h" - -RAW_FORMAT1(u4, "u32", 32, 0, UNSIGNED) diff --git a/app/src/main/cpp/sox/ul-fmt.c b/app/src/main/cpp/sox/ul-fmt.c deleted file mode 100644 index b876f3e..0000000 --- a/app/src/main/cpp/sox/ul-fmt.c +++ /dev/null @@ -1,21 +0,0 @@ -/* libSoX file formats: raw (c) 2007-8 SoX contributors - * - * This library 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 library 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 library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "sox_i.h" -#include "raw.h" - -RAW_FORMAT(ul, 8, 0, ULAW)