Showing the changes to src (3 of 3 files). Show all
Unified · Split
| @@ -8,6 +8,7 @@ HFILES=\ · 7 unmodified lines | ||
| 8 | 8 | sox_i.h xmalloc.h util.h soxomp.h band.h biquad.h compandt.h \ |
| 9 | 9 | dft_filter.h dither.h effects.h fft4g.h fifo.h mcompand_xover.h \ |
| 10 | 10 | noisered.h rate_filters.h rate_half_fir.h rate_poly_fir0.h rate_poly_fir.h \ |
| 11 | + id3.h \ | |
| 11 | 12 | |
| 12 | 13 | OFILES=\ |
| 13 | 14 | adpcms.$O aiff.$O cvsd.$O \ |
| @@ -24,6 +25,13 @@ OFILES=\ · 10 unmodified lines | ||
| 24 | 25 | remix.$O repeat.$O reverb.$O reverse.$O silence.$O sinc.$O skeleff.$O \ |
| 25 | 26 | speed.$O splice.$O stat.$O stats.$O stretch.$O swap.$O \ |
| 26 | 27 | synth.$O tempo.$O tremolo.$O trim.$O upsample.$O vad.$O vol.$O \ |
| 28 | + raw-fmt.$O s1-fmt.$O s2-fmt.$O s3-fmt.$O \ | |
| 29 | + s4-fmt.$O u1-fmt.$O u2-fmt.$O u3-fmt.$O u4-fmt.$O al-fmt.$O la-fmt.$O ul-fmt.$O \ | |
| 30 | + lu-fmt.$O 8svx.$O aiff-fmt.$O aifc-fmt.$O au.$O avr.$O cdr.$O cvsd-fmt.$O \ | |
| 31 | + dvms-fmt.$O dat.$O hcom.$O htk.$O maud.$O prc.$O sf.$O smp.$O \ | |
| 32 | + sounder.$O soundtool.$O sphere.$O tx16w.$O voc.$O vox-fmt.$O ima-fmt.$O adpcm.$O \ | |
| 33 | + ima_rw.$O wav.$O wve.$O xa.$O nulfile.$O f4-fmt.$O f8-fmt.$O gsrt.$O \ | |
| 34 | + id3.$O \ | |
| 27 | 35 | |
| 28 | 36 | UPDATE=\ |
| 29 | 37 | mkfile\ |
| @@ -68,7 +68,7 @@ typedef struct { · 67 unmodified lines | ||
| 68 | 68 | |
| 69 | 69 | static void prcwriteheader(sox_format_t * ft); |
| 70 | 70 | |
| 71 | −static int seek(sox_format_t * ft, uint64_t offset) | |
| 71 | +static int soxseek(sox_format_t * ft, uint64_t offset) | |
| 72 | 72 | { |
| 73 | 73 | priv_t * p = (priv_t *)ft->priv; |
| 74 | 74 | if (ft->encoding.encoding == SOX_ENCODING_ALAW) |
| @@ -443,7 +443,7 @@ LSX_FORMAT_HANDLER(prc) · 368 unmodified lines | ||
| 443 | 443 | names, SOX_FILE_LIT_END | SOX_FILE_MONO, |
| 444 | 444 | startread, read_samples, stopread, |
| 445 | 445 | startwrite, write_samples, stopwrite, |
| 446 | − seek, write_encodings, write_rates, sizeof(priv_t) | |
| 446 | + soxseek, write_encodings, write_rates, sizeof(priv_t) | |
| 447 | 447 | }; |
| 448 | 448 | return &handler; |
| 449 | 449 | } |
| @@ -603,7 +603,7 @@ static const struct wave_format wave_formats[] = { · 602 unmodified lines | ||
| 603 | 603 | { WAVE_FORMAT_OLIADPCM, "Olivetti ADPCM" }, |
| 604 | 604 | { WAVE_FORMAT_OLISBC, "Olivetti CELP" }, |
| 605 | 605 | { WAVE_FORMAT_OLIOPR, "Olivetti OPR" }, |
| 606 | − { } | |
| 606 | + { NULL } | |
| 607 | 607 | }; |
| 608 | 608 | |
| 609 | 609 | static const struct wave_format *wav_find_format(unsigned tag) |
| @@ -1588,7 +1588,7 @@ static const char *wav_format_str(unsigned tag) · 978 unmodified lines | ||
| 1588 | 1588 | return f ? f->name : "unknown"; |
| 1589 | 1589 | } |
| 1590 | 1590 | |
| 1591 | −static int seek(sox_format_t * ft, uint64_t offset) | |
| 1591 | +static int soxseek(sox_format_t * ft, uint64_t offset) | |
| 1592 | 1592 | { |
| 1593 | 1593 | priv_t * wav = (priv_t *) ft->priv; |
| 1594 | 1594 | |
| @@ -1644,7 +1644,7 @@ LSX_FORMAT_HANDLER(wav) · 49 unmodified lines | ||
| 1644 | 1644 | "Microsoft audio format", names, SOX_FILE_LIT_END, |
| 1645 | 1645 | startread, read_samples, stopread, |
| 1646 | 1646 | startwrite, write_samples, stopwrite, |
| 1647 | − seek, write_encodings, NULL, sizeof(priv_t) | |
| 1647 | + soxseek, write_encodings, NULL, sizeof(priv_t) | |
| 1648 | 1648 | }; |
| 1649 | 1649 | return &handler; |
| 1650 | 1650 | } |