diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2008-01-21 10:42:48 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-21 10:42:48 +0100 |
| commit | 62a27ec90b7095a7d8362027daf0c5a787a58ae9 (patch) | |
| tree | d1fe46c71a1a06600793972e0ae9623a2bc176b1 | |
| parent | 9abeb5843aa877e81d6cb46a84f30922a7985bf0 (diff) | |
release 1.0.16rc1v1.0.16rc1
Patch-level: Merged
| -rw-r--r-- | aplay/aplay.c | 28 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 27 insertions, 3 deletions
diff --git a/aplay/aplay.c b/aplay/aplay.c index effd385..88d1ef2 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -174,7 +174,11 @@ _("Usage: %s [OPTION]... [FILE]...\n" " (relative to buffer size if <= 0)\n" "-T, --stop-delay=# delay for automatic PCM stop is # microseconds from xrun\n" "-v, --verbose show PCM structure and setup (accumulative)\n" -"-I, --separate-channels one file for each channel\n") +"-I, --separate-channels one file for each channel\n" +" --disable-resample disable automatic rate resample\n" +" --disable-channels disable automatic channel conversions\n" +" --disable-format disable automatic format conversions\n" +" --disable-softvol disable software volume control (softvol)\n") , command); printf(_("Recognized sample formats are:")); for (k = 0; k < SND_PCM_FORMAT_LAST; ++k) { @@ -331,7 +335,11 @@ static void signal_handler(int sig) enum { OPT_VERSION = 1, OPT_PERIOD_SIZE, - OPT_BUFFER_SIZE + OPT_BUFFER_SIZE, + OPT_DISABLE_RESAMPLE, + OPT_DISABLE_CHANNELS, + OPT_DISABLE_FORMAT, + OPT_DISABLE_SOFTVOL }; int main(int argc, char *argv[]) @@ -364,6 +372,10 @@ int main(int argc, char *argv[]) {"separate-channels", 0, 0, 'I'}, {"playback", 0, 0, 'P'}, {"capture", 0, 0, 'C'}, + {"disable-resample", 0, 0, OPT_DISABLE_RESAMPLE}, + {"disable-channels", 0, 0, OPT_DISABLE_CHANNELS}, + {"disable-format", 0, 0, OPT_DISABLE_FORMAT}, + {"disable-softvol", 0, 0, OPT_DISABLE_SOFTVOL}, {0, 0, 0, 0} }; char *pcm_name = "default"; @@ -520,6 +532,18 @@ int main(int argc, char *argv[]) if (file_type == FORMAT_DEFAULT) file_type = FORMAT_WAVE; break; + case OPT_DISABLE_RESAMPLE: + open_mode |= SND_PCM_NO_AUTO_RESAMPLE; + break; + case OPT_DISABLE_CHANNELS: + open_mode |= SND_PCM_NO_AUTO_CHANNELS; + break; + case OPT_DISABLE_FORMAT: + open_mode |= SND_PCM_NO_AUTO_FORMAT; + break; + case OPT_DISABLE_SOFTVOL: + open_mode |= SND_PCM_NO_SOFTVOL; + break; default: fprintf(stderr, _("Try `%s --help' for more information.\n"), command); return 1; diff --git a/configure.in b/configure.in index a160f20..4358d94 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) AC_INIT(alsamixer/alsamixer.c) AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(alsa-utils, 1.0.15) +AM_INIT_AUTOMAKE(alsa-utils, 1.0.16rc1) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.15]) |