shithub: sox

Download patch

ref: 38464c2045ca581b2a5dfee895cabd683646f816
parent: 52c6d22cc296f194b6d076c2f207baea469f3155
author: rrt <rrt>
date: Thu Apr 12 15:43:02 EDT 2007 

Remove unused "usage" field from format struct.


--- a/src/8svx.c
+++ b/src/8svx.c
@@ -367,7 +367,6 @@
 
 static sox_format_t sox_svx_format = {
   svxnames,
-  NULL,
   SOX_FILE_BIG_END,
   sox_svxstartread,
   sox_svxread,
--- a/src/aiff.c
+++ b/src/aiff.c
@@ -1192,7 +1192,6 @@
 
 static sox_format_t sox_aiff_format = {
   aiffnames,
-  NULL,
   SOX_FILE_LOOPS | SOX_FILE_SEEK | SOX_FILE_BIG_END,
   sox_aiffstartread,
   sox_aiffread,
@@ -1216,7 +1215,6 @@
 
 static sox_format_t sox_aifc_format = {
   aifcnames,
-  NULL,
   SOX_FILE_LOOPS | SOX_FILE_SEEK | SOX_FILE_BIG_END,
   sox_aiffstartread,
   sox_aiffread,
--- a/src/alsa.c
+++ b/src/alsa.c
@@ -670,7 +670,6 @@
 
 static sox_format_t sox_alsa_format = {
   alsanames,
-  NULL,
   SOX_FILE_DEVICE | SOX_FILE_NOSTDIO,
   sox_alsastartread,
   sox_alsaread,
--- a/src/amr-wb.c
+++ b/src/amr-wb.c
@@ -202,7 +202,7 @@
 {
   static char const * names[] = {"amr-wb", "awb", NULL};
   static sox_format_t driver = {
-    names, NULL, 0,
+    names, 0,
     startread, read, stopread,
     startwrite, write, stopwrite,
     sox_format_nothing_seek
--- a/src/ao.c
+++ b/src/ao.c
@@ -91,7 +91,6 @@
 
 static sox_format_t sox_ao_format = {
   aonames,
-  NULL,
   SOX_FILE_DEVICE | SOX_FILE_NOSTDIO,
   startread,
   sox_format_nothing_read,
--- a/src/au.c
+++ b/src/au.c
@@ -468,7 +468,6 @@
 
 static sox_format_t sox_au_format = {
   aunames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_BIG_END,
   sox_austartread,
   sox_auread,
--- a/src/avr.c
+++ b/src/avr.c
@@ -284,7 +284,6 @@
 
 static sox_format_t sox_avr_format = {
   avrnames,
-  NULL,
   SOX_FILE_BIG_END,
   sox_avrstartread,
   sox_rawread,
--- a/src/cdr.c
+++ b/src/cdr.c
@@ -154,7 +154,6 @@
 
 static sox_format_t sox_cdr_format = {
   cdrnames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_BIG_END,
   sox_cdrstartread,
   sox_cdrread,
--- a/src/cvsd.c
+++ b/src/cvsd.c
@@ -575,7 +575,6 @@
 
 static sox_format_t sox_cvsd_format = {
   cvsdnames,
-  NULL,
   0,
   sox_cvsdstartread,
   sox_cvsdread,
@@ -599,7 +598,6 @@
 
 static sox_format_t sox_dvms_format = {
   dvmsnames,
-  NULL,
   0,
   sox_dvmsstartread,
   sox_cvsdread,
--- a/src/dat.c
+++ b/src/dat.c
@@ -159,7 +159,6 @@
 
 static sox_format_t sox_dat_format = {
   datnames,
-  NULL,
   0,
   sox_datstartread,
   sox_datread,
--- a/src/flac.c
+++ b/src/flac.c
@@ -488,7 +488,7 @@
 {
   static char const * const names[] = {"flac", NULL};
   static sox_format_t const driver = {
-    names, NULL, 0,
+    names, 0,
     start_read, read, stop_read,
     start_write, write, stop_write,
     0
--- a/src/gsm.c
+++ b/src/gsm.c
@@ -243,7 +243,6 @@
 
 static sox_format_t sox_gsm_format = {
   gsmnames,
-  NULL,
   0,
   sox_gsmstartread,
   sox_gsmread,
--- a/src/hcom.c
+++ b/src/hcom.c
@@ -470,7 +470,6 @@
 
 static sox_format_t sox_hcom_format = {
   hcomnames,
-  NULL,
   SOX_FILE_BIG_END,
   sox_hcomstartread,
   sox_hcomread,
--- a/src/maud.c
+++ b/src/maud.c
@@ -348,7 +348,6 @@
 
 static sox_format_t sox_maud_format = {
   maudnames,
-  NULL,
   SOX_FILE_BIG_END,
   sox_maudstartread,
   sox_rawread,
--- a/src/mp3.c
+++ b/src/mp3.c
@@ -554,7 +554,6 @@
 
 static sox_format_t sox_mp3_format = {
   mp3names,
-  NULL,
   0,
   sox_mp3startread,
   sox_mp3read,
--- a/src/nulfile.c
+++ b/src/nulfile.c
@@ -50,7 +50,6 @@
 
 static sox_format_t sox_nul_format = {
   nulnames,
-  NULL,
   SOX_FILE_DEVICE | SOX_FILE_PHONY | SOX_FILE_NOSTDIO,
   sox_nulstartread,
   sox_nulread,
--- a/src/oss.c
+++ b/src/oss.c
@@ -219,7 +219,6 @@
 
 static sox_format_t sox_ossdsp_format = {
   ossdspnames,
-  NULL,
   SOX_FILE_DEVICE,
   sox_ossdspstartread,
   sox_rawread,
--- a/src/prc.c
+++ b/src/prc.c
@@ -466,7 +466,6 @@
 
 static sox_format_t sox_prc_format = {
   prcnames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_LIT_END,
   startread,
   read,
--- a/src/raw.c
+++ b/src/raw.c
@@ -248,7 +248,7 @@
 sox_format_t const * sox_raw_format_fn(void) {
   static char const * names[] = {"raw", NULL};
   static sox_format_t driver = {
-    names, NULL, SOX_FILE_SEEK,
+    names, SOX_FILE_SEEK,
     raw_start, sox_rawread , sox_format_nothing,
     raw_start, sox_rawwrite, sox_format_nothing,
     sox_rawseek
@@ -263,7 +263,7 @@
 sox_format_t const * sox_##id##_format_fn(void) { \
   static char const * names[] = {#id, alt1, alt2, NULL}; \
   static sox_format_t driver = { \
-    names, NULL, 0, \
+    names, 0, \
     id##_start, sox_rawread , sox_format_nothing, \
     id##_start, sox_rawwrite, sox_format_nothing, \
     sox_format_nothing_seek \
--- a/src/sf.c
+++ b/src/sf.c
@@ -227,7 +227,6 @@
 
 static sox_format_t sox_sf_format = {
   sfnames,
-  NULL,
   SOX_FILE_SEEK,
   sox_sfstartread,
   sox_rawread,
--- a/src/skelform.c
+++ b/src/skelform.c
@@ -209,7 +209,6 @@
 /* Format descriptor */
 static sox_format_t sox_skel_format = {
   names,
-  NULL,
   SOX_FILE_SEEK,
   startread,
   read,
--- a/src/smp.c
+++ b/src/smp.c
@@ -409,7 +409,6 @@
 
 static sox_format_t sox_smp_format = {
   smpnames,
-  NULL,
   SOX_FILE_LOOPS | SOX_FILE_SEEK | SOX_FILE_LIT_END,
   sox_smpstartread,
   sox_smpread,
--- a/src/sndfile.c
+++ b/src/sndfile.c
@@ -382,7 +382,6 @@
 /* Format descriptor */
 static sox_format_t sox_sndfile_format = {
   names,
-  NULL,
   SOX_FILE_SEEK,
   sox_sndfile_startread,
   sox_sndfile_read,
--- a/src/sndrtool.c
+++ b/src/sndrtool.c
@@ -186,7 +186,6 @@
 
 const sox_format_t sox_snd_format = {
   sndtnames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_LIT_END,
   sox_sndtstartread,
   sox_rawread,
--- a/src/sox.h
+++ b/src/sox.h
@@ -281,7 +281,6 @@
 
 typedef struct sox_format {
     const char   * const *names;
-    const char   *usage;
     unsigned int flags;
     int          (*startread)(ft_t ft);
     sox_size_t    (*read)(ft_t ft, sox_ssample_t *buf, sox_size_t len);
--- a/src/sphere.c
+++ b/src/sphere.c
@@ -271,7 +271,6 @@
 
 static sox_format_t sox_sphere_format = {
   spherenames,
-  NULL,
   0,
   sox_spherestartread,
   sox_rawread,
--- a/src/sunaudio.c
+++ b/src/sunaudio.c
@@ -316,7 +316,6 @@
 
 static sox_format_t sox_sun_format = {
   sunnames,
-  NULL,
   SOX_FILE_DEVICE,
   sox_sunstartread,
   sox_rawread,
--- a/src/tx16w.c
+++ b/src/tx16w.c
@@ -375,7 +375,6 @@
 
 static sox_format_t sox_txw_format = {
    txwnames,
-   NULL,
    0,
    sox_txwstartread,
    sox_txwread,
--- a/src/voc.c
+++ b/src/voc.c
@@ -808,7 +808,6 @@
 
 static sox_format_t sox_voc_format = {
   vocnames,
-  NULL,
   SOX_FILE_LIT_END,
   sox_vocstartread,
   sox_vocread,
--- a/src/vorbis.c
+++ b/src/vorbis.c
@@ -452,7 +452,6 @@
 
 static sox_format_t sox_vorbis_format = {
   vorbisnames,
-  NULL,
   0,
   sox_vorbisstartread,
   sox_vorbisread,
--- a/src/vox.c
+++ b/src/vox.c
@@ -50,7 +50,7 @@
 {
   static char const * names[] = {"vox", NULL};
   static sox_format_t driver = {
-    names, NULL, 0,
+    names, 0,
     vox_start,
     read,
     stopread,
@@ -66,7 +66,7 @@
 {
   static char const * names[] = {"ima", NULL};
   static sox_format_t driver = {
-    names, NULL, 0,
+    names, 0,
     ima_start,
     read,
     stopread,
--- a/src/wav.c
+++ b/src/wav.c
@@ -1734,7 +1734,6 @@
 
 static sox_format_t sox_wav_format = {
   wavnames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_LIT_END,
   sox_wavstartread,
   sox_wavread,
--- a/src/wve.c
+++ b/src/wve.c
@@ -206,7 +206,6 @@
 
 static sox_format_t sox_wve_format = {
   wvenames,
-  NULL,
   SOX_FILE_SEEK | SOX_FILE_BIG_END,
   sox_wvestartread,
   sox_rawread,
--- a/src/xa.c
+++ b/src/xa.c
@@ -315,7 +315,6 @@
 
 sox_format_t sox_xa_format = {
   xanames,
-  NULL,
   SOX_FILE_LIT_END,
   sox_xastartread,
   sox_xaread,
-- 
⑨