asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-14 03:55:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

aplay/arecord: Remove -n commad (obsolete, undocumented)

Browse source 
Also fix a small memory leak (missing snd_output_delete call).
This commit is contained in:
Jaroslav Kysela 2006-10-12 14:53:56 +02:00
parent eee0b78320
commit ff26da1a3d
1 changed files with 6 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
aplay/aplay.c
View file

@ -155,7 +155,7 @@ _("Usage: %s [OPTION]... [FILE]...\n"
"-h, --help help\n" "-h, --help help\n"
" --version print current version\n" " --version print current version\n"
"-l, --list-devices list all soundcards and digital audio devices\n" "-l, --list-devices list all soundcards and digital audio devices\n"
"-L, --list-pcms list all PCMs defined\n" "-L, --list-pcms list device names\n"
"-D, --device=NAME select PCM by name\n" "-D, --device=NAME select PCM by name\n"
"-q, --quiet quiet mode\n" "-q, --quiet quiet mode\n"
"-t, --file-type TYPE file type (voc, wav, raw or au)\n" "-t, --file-type TYPE file type (voc, wav, raw or au)\n"
@ -190,24 +190,6 @@ _("Usage: %s [OPTION]... [FILE]...\n"
printf(_("-f dat (16 bit little endian, 48000, stereo)\n")); printf(_("-f dat (16 bit little endian, 48000, stereo)\n"));
} }
static void names_list(void)
{
int err;
snd_devname_t *list, *item;
err = snd_names_list("pcm", &list);
if (err < 0) {
error(_("snd_names_list error: %s"), snd_strerror(err));
return;
}
item = list;
while (item) {
printf("%s [%s]\n", item->name, item->comment);
item = item->next;
}
snd_names_list_free(list);
}
static void device_list(void) static void device_list(void)
{ {
snd_ctl_t *handle; snd_ctl_t *handle;
@ -381,7 +363,7 @@ int main(int argc, char *argv[])
}; };
char *pcm_name = "default"; char *pcm_name = "default";
int tmp, err, c; int tmp, err, c;
int do_names_list = 0, do_device_list = 0, do_pcm_list = 0; int do_device_list = 0, do_pcm_list = 0;
snd_pcm_info_t *info; snd_pcm_info_t *info;
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
@ -422,9 +404,6 @@ int main(int argc, char *argv[])
case OPT_VERSION: case OPT_VERSION:
version(); version();
return 0; return 0;
case 'n':
do_names_list = 1;
break;
case 'l': case 'l':
do_device_list = 1; do_device_list = 1;
break; break;
@ -545,18 +524,13 @@ int main(int argc, char *argv[])
} }
} }
if (do_names_list) { if (do_device_list) {
names_list();
return 0;
} else if (do_device_list) {
if (do_pcm_list) pcm_list(); if (do_pcm_list) pcm_list();
device_list(); device_list();
snd_config_update_free_global(); goto __end;
return 0;
} else if (do_pcm_list) { } else if (do_pcm_list) {
pcm_list(); pcm_list();
snd_config_update_free_global(); goto __end;
return 0;
} }
err = snd_pcm_open(&handle, pcm_name, stream, open_mode); err = snd_pcm_open(&handle, pcm_name, stream, open_mode);
@ -627,6 +601,7 @@ int main(int argc, char *argv[])
putchar('\n'); putchar('\n');
snd_pcm_close(handle); snd_pcm_close(handle);
free(audiobuf); free(audiobuf);
__end:
snd_output_close(log); snd_output_close(log);
snd_config_update_free_global(); snd_config_update_free_global();
return EXIT_SUCCESS; return EXIT_SUCCESS;