mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use defaults.pcm.file_format for the default file format of file plugin

Browse source 
Use "defaults.pcm.file_format" for the default file format of
file plugin.  It's set to "raw" as default for compatibility.
This commit is contained in:
Takashi Iwai 2008-03-17 16:11:57 +01:00
parent fe95bc237a
commit 87ae12214b
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/conf/alsa.conf
View file

@ -96,6 +96,7 @@ defaults.pcm.iec958.device defaults.pcm.device
defaults.pcm.modem.card defaults.pcm.card defaults.pcm.modem.card defaults.pcm.card
defaults.pcm.modem.device defaults.pcm.device defaults.pcm.modem.device defaults.pcm.device
# truncate files via file or tee PCM # truncate files via file or tee PCM
defaults.pcm.file_format "raw"
defaults.pcm.file_truncate true defaults.pcm.file_truncate true
defaults.rawmidi.card 0 defaults.rawmidi.card 0
defaults.rawmidi.device 0 defaults.rawmidi.device 0
@ -266,7 +267,10 @@ pcm.tee {
} }
@args.FORMAT { @args.FORMAT {
type string type string
default raw default {
@func refer
name defaults.pcm.file_format
}
} }
type file type file
slave.pcm $SLAVE slave.pcm $SLAVE
@ -285,7 +289,10 @@ pcm.file {
} }
@args.FORMAT { @args.FORMAT {
type string type string
default raw default {
@func refer
name defaults.pcm.file_format
}
} }
type file type file
slave.pcm null slave.pcm null

11
src/pcm/pcm_file.c
View file

@ -733,6 +733,17 @@ int _snd_pcm_file_open(snd_pcm_t **pcmp, const char *name,
SNDERR("Unknown field %s", id); SNDERR("Unknown field %s", id);
return -EINVAL; return -EINVAL;
} }
if (!format) {
snd_config_t *n;
/* read defaults */
if (snd_config_search(root, "defaults.pcm.file_format", &n) >= 0) {
err = snd_config_get_string(n, &format);
if (err < 0) {
SNDERR("Invalid file format");
return -EINVAL;
}
}
}
if (!slave) { if (!slave) {
SNDERR("slave is not defined"); SNDERR("slave is not defined");
return -EINVAL; return -EINVAL;