ref: 29fa06d849345cef817b0c75aafa1faac1e55142
parent: 5d0b513652f7ccfcd9c9d7386dee820420945b5d
author: rrt <rrt>
date: Sun Jan 21 20:34:31 EST 2007
Add sndfile pseudo-type, and make file guessing in sndfile work for filenames as well as types, so it can be used for writing. Rename --no-show-progress to --quiet: more logical, simpler and expected!
--- a/src/sndfile.c
+++ b/src/sndfile.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <string.h>
+#include <ctype.h>
#include <sndfile.h>
/* Private data for sndfile files */
@@ -47,6 +48,8 @@
sf->sf_info = (SF_INFO *)xcalloc(1, sizeof(SF_INFO));
/* We'd like to use sf_open, but auto file typing has already
invoked stdio buffering. */
+ /* FIXME: Cope with raw files too: if format parameters are set,
+ assume file is raw. */
if ((sf->sf_file = sf_open(ft->filename, SFM_READ, sf->sf_info)) == NULL) { st_fail("sndfile cannot open file for reading: %s %x", sf_strerror(sf->sf_file), sf->sf_info->format);free(sf->sf_file);
@@ -91,49 +94,54 @@
int format;
} format_map[] =
{- { "aif", 3, SF_FORMAT_AIFF },- { "wav", 0, SF_FORMAT_WAV },- { "au", 0, SF_FORMAT_AU },- { "caf", 0, SF_FORMAT_CAF },- { "flac", 0, SF_FORMAT_FLAC },- { "snd", 0, SF_FORMAT_AU },- { "svx", 0, SF_FORMAT_SVX },- { "paf", 0, SF_ENDIAN_BIG | SF_FORMAT_PAF },- { "fap", 0, SF_ENDIAN_LITTLE | SF_FORMAT_PAF },- { "gsm", 0, SF_FORMAT_RAW },- { "nist", 0, SF_FORMAT_NIST },- { "ircam", 0, SF_FORMAT_IRCAM },- { "sf", 0, SF_FORMAT_IRCAM },- { "voc", 0, SF_FORMAT_VOC },- { "w64", 0, SF_FORMAT_W64 },- { "raw", 0, SF_FORMAT_RAW },- { "mat4", 0, SF_FORMAT_MAT4 },- { "mat5", 0, SF_FORMAT_MAT5 },- { "mat", 0, SF_FORMAT_MAT4 },- { "pvf", 0, SF_FORMAT_PVF },- { "sds", 0, SF_FORMAT_SDS },- { "sd2", 0, SF_FORMAT_SD2 },- { "vox", 0, SF_FORMAT_RAW },- { "xi", 0, SF_FORMAT_XI }+ { "aif", 3, SF_FORMAT_AIFF },+ { "wav", 0, SF_FORMAT_WAV },+ { "au", 0, SF_FORMAT_AU },+ { "snd", 0, SF_FORMAT_AU },+ { "caf", 0, SF_FORMAT_CAF },+ { "flac", 0, SF_FORMAT_FLAC },+ { "svx", 0, SF_FORMAT_SVX },+ { "8svx", 0, SF_FORMAT_SVX },+ { "paf", 0, SF_ENDIAN_BIG | SF_FORMAT_PAF },+ { "fap", 0, SF_ENDIAN_LITTLE | SF_FORMAT_PAF },+ { "gsm", 0, SF_FORMAT_RAW | SF_FORMAT_GSM610 },+ { "nist", 0, SF_FORMAT_NIST },+ { "ircam", 0, SF_FORMAT_IRCAM },+ { "sf", 0, SF_FORMAT_IRCAM },+ { "voc", 0, SF_FORMAT_VOC },+ { "w64", 0, SF_FORMAT_W64 },+ { "raw", 0, SF_FORMAT_RAW },+ { "mat4", 0, SF_FORMAT_MAT4 },+ { "mat5", 0, SF_FORMAT_MAT5 },+ { "mat", 0, SF_FORMAT_MAT4 },+ { "pvf", 0, SF_FORMAT_PVF },+ { "sds", 0, SF_FORMAT_SDS },+ { "sd2", 0, SF_FORMAT_SD2 },+ { "vox", 0, SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM },+ { "xi", 0, SF_FORMAT_XI }};
-static int guess_output_file_type(const char *type, int format)
+/* Convert file name or type to libsndfile format */
+static int name_to_format(const char *name)
{int k;
+#define FILE_TYPE_BUFLEN 15
+ char buffer[FILE_TYPE_BUFLEN + 1], *cptr;
- format &= SF_FORMAT_SUBMASK;
-
- if (strcmp(type, "gsm") == 0)
- return SF_FORMAT_RAW | SF_FORMAT_GSM610;
-
- if (strcmp(type, "vox") == 0)
- return SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM;
-
+ if ((cptr = strrchr(name, '.')) != NULL) {+ strncpy(buffer, cptr + 1, FILE_TYPE_BUFLEN);
+ buffer[FILE_TYPE_BUFLEN] = 0;
+
+ for (k = 0; buffer[k]; k++)
+ buffer[k] = tolower((buffer[k]));
+ } else
+ strncpy(buffer, name, FILE_TYPE_BUFLEN);
+
for (k = 0; k < (int)(sizeof(format_map) / sizeof(format_map [0])); k++) {- if (format_map[k].len > 0 && strncmp(type, format_map[k].ext, format_map[k].len) == 0)
- return format_map[k].format | format;
- else if (strcmp(type, format_map[k].ext) == 0)
- return format_map[k].format | format;
+ if (format_map[k].len > 0 && strncmp(name, format_map[k].ext, format_map[k].len) == 0)
+ return format_map[k].format;
+ else if (strcmp(buffer, format_map[k].ext) == 0)
+ return format_map[k].format;
}
return 0;
@@ -146,7 +154,10 @@
/* Copy format info */
/* FIXME: Need to have a table of suitable default subtypes */
- sf->sf_info->format = guess_output_file_type(ft->filetype, SF_FORMAT_PCM_16);
+ if (strcmp(ft->filetype, "sndfile") == 0)
+ sf->sf_info->format = name_to_format(ft->filename) | SF_FORMAT_PCM_16;
+ else
+ sf->sf_info->format = name_to_format(ft->filetype) | SF_FORMAT_PCM_16;
sf->sf_info->samplerate = ft->signal.rate;
sf->sf_info->channels = ft->signal.channels;
sf->sf_info->frames = ft->length / ft->signal.channels;
@@ -194,8 +205,9 @@
}
/* Format file suffixes */
-/* For now, comment out formats built-in to SoX */
+/* For now, comment out formats built in to SoX */
static const char *names[] = {+ "sndfile", /* special type to force use of sndfile */
/* "aif", */
/* "wav", */
/* "au", */
--- a/src/sox.c
+++ b/src/sox.c
@@ -4,7 +4,7 @@
* This is the main function for the command line sox program.
*
* Copyright 1991 Lance Norskog And Sundry Contributors
- * Copyright 1998-2006 Chris Bagnall and SoX contributors
+ * Copyright 1998-2007 Chris Bagnall and SoX contributors
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -446,7 +446,7 @@
{"help" , no_argument, NULL, 'h'}, {"merge" , no_argument, NULL, 'M'}, {"mix" , no_argument, NULL, 'm'},- {"no-show-progress", no_argument, NULL, 'q'},+ {"quiet" , no_argument, NULL, 'q'}, {"rate" , required_argument, NULL, 'r'}, {"reverse-bits" , no_argument, NULL, 'X'}, {"reverse-nibbles" , no_argument, NULL, 'N'},@@ -1547,9 +1547,9 @@
"-m, --mix mix multiple input files (instead of concatenating)\n"
"-M, --merge merge multiple input files (instead of concatenating)\n"
"--octave generate Octave commands to plot response of filter effect\n"
- "-q run in quiet mode; opposite of -S\n"
+ "-q, --quiet run in quiet mode; opposite of -S\n"
"-R use default random numbers (same on each run of SoX)\n"
- "-S display progress while processing audio data\n"
+ "-S, --show-progress display progress while processing audio data\n"
"--version display version number of SoX and exit\n"
"-V[level] increment or set verbosity level (default 2); levels are:\n"
" 1: failure messages\n"