remove aiff format

app/src/main/cpp/sox/CmakeLists.txt

@@ -1,4 +1,5 @@
-#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}config.h)
+
+set(PROJECT_NAME sox)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -13,7 +14,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
     else(${ver} LESS 403)
         add_definitions(-Wtraditional-conversion)
     endif(${ver} LESS 403)
-    #add_definitions(-Werror)
 endif(CMAKE_COMPILER_IS_GNUCC)
 
 if (NOT EXTERNAL_GSM)
@@ -87,10 +87,6 @@ set(formats_srcs
         adpcm.h
         adpcms.h
         adpcms.c
-        aifc-fmt.c
-        aiff.c
-        aiff.h
-        aiff-fmt.c
         al-fmt.c
         au.c
         avr.c
@@ -152,24 +148,24 @@ set(formats_srcs
         xa.c
         )
 
-# Uncomment for bit-rot detection on linux
-#set(formats_srcs ${formats_srcs} coreaudio sndio sunaudio waveaudio)
-#add_definitions(-Ibit-rot)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/bit-rot)
 
 add_library(${PROJECT_NAME} STATIC
-        effects.c formats_i.c libsox_i.c
+        ${effects_srcs}
-        effects_i.c ${formats_srcs}
+        effects.c
-        effects_i_dsp.c getopt.c
+        effects_i.c
-        ${effects_srcs} util.c
+        effects_i_dsp.c
-        libsox.c xmalloc.c
+        ${formats_srcs}
+        formats_i.c
+        formats.c
+        getopt.c
+        libsox_i.c
+        libsox.c
+        util.c
+        xmalloc.c
         )
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-#add_executable(${PROJECT_NAME} ${PROJECT_NAME}.c)
-
-#target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME} lpc10 ${optional_libs})
 
 find_program(LN ln)
 if (LN)

app/src/main/cpp/sox/aifc-fmt.c

@@ -1,36 +0,0 @@
-/* File format: AIFF-C (see aiff.c)           (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 "aiff.h"
-
-LSX_FORMAT_HANDLER(aifc)
-{
-  static char const * const names[] = {"aifc", "aiffc", NULL};
-  static unsigned const write_encodings[] = {
-    SOX_ENCODING_SIGN2, 32, 24, 16, 8, 0,
-    SOX_ENCODING_FLOAT, 32, 64, 0,
-    0};
-  static sox_format_handler_t const sox_aifc_format = {SOX_LIB_VERSION_CODE,
-    "AIFF-C (not compressed), defined in DAVIC 1.4 Part 9 Annex B",
-    names, SOX_FILE_BIG_END,
-    lsx_aiffstartread, lsx_rawread, lsx_aiffstopread,
-    lsx_aifcstartwrite, lsx_rawwrite, lsx_aifcstopwrite,
-    lsx_rawseek, write_encodings, NULL, 0
-  };
-  return &sox_aifc_format;
-}

app/src/main/cpp/sox/aiff-fmt.c

@@ -1,33 +0,0 @@
-/* File format: AIFF (see aiff.c)           (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 "aiff.h"
-
-LSX_FORMAT_HANDLER(aiff)
-{
-  static char const * const names[] = {"aiff", "aif", NULL};
-  static unsigned const write_encodings[] = {
-    SOX_ENCODING_SIGN2, 32, 24, 16, 8, 0, 0};
-  static sox_format_handler_t const sox_aiff_format = {SOX_LIB_VERSION_CODE,
-    "AIFF files used on Apple IIc/IIgs and SGI", names, SOX_FILE_BIG_END,
-    lsx_aiffstartread, lsx_rawread, lsx_aiffstopread,
-    lsx_aiffstartwrite, lsx_rawwrite, lsx_aiffstopwrite,
-    lsx_rawseek, write_encodings, NULL, 0
-  };
-  return &sox_aiff_format;
-}

app/src/main/cpp/sox/aiff.h

@@ -1,22 +0,0 @@
-/* libSoX SGI/Amiga AIFF format.
- * Copyright 1991-2007 Guido van Rossum And Sundry Contributors
- *
- * This source code is freely redistributable and may be used for
- * any purpose.  This copyright notice must be maintained.
- * Guido van Rossum And Sundry Contributors are not responsible for
- * the consequences of using this software.
- *
- * Used by SGI on 4D/35 and Indigo.
- * This is a subformat of the EA-IFF-85 format.
- * This is related to the IFF format used by the Amiga.
- * But, apparently, not the same.
- * Also AIFF-C format output that is defined in DAVIC 1.4 Part 9 Annex B
- * (usable for japanese-data-broadcasting, specified by ARIB STD-B24.)
- */
-
-int lsx_aiffstartread(sox_format_t * ft);
-int lsx_aiffstopread(sox_format_t * ft);
-int lsx_aiffstartwrite(sox_format_t * ft);
-int lsx_aiffstopwrite(sox_format_t * ft);
-int lsx_aifcstartwrite(sox_format_t * ft);
-int lsx_aifcstopwrite(sox_format_t * ft);

app/src/main/cpp/sox/formats.c

@@ -477,7 +477,7 @@ static void UNUSED rewind_pipe(FILE * fp)
   /* To fix this #error, either simply remove the #error line and live without
    * file-type detection with pipes, or add support for your compiler in the
    * lines above.  Test with cat monkey.wav | ./sox --info - */
-  #error FIX NEEDED HERE
+//  #error FIX NEEDED HERE //FIXME
   #define NO_REWIND_PIPE
   (void)fp;
 #endif

app/src/main/cpp/sox/formats.h

@@ -17,8 +17,8 @@
 
 /*-------------------------- Static format handlers --------------------------*/
 
-  FORMAT(aifc)
+//  FORMAT(aifc)
-  FORMAT(aiff)
+//  FORMAT(aiff)
   FORMAT(al)
   FORMAT(au)
   FORMAT(avr)