mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove obnoxious assert from module-combine

Browse source 
tagstruct: add support for NULL strings
improve pactl
correct pa_bytes_snprint()
pa_sample_spec_snprint(): don't fail on invalid sample spec
rename PA_SAMPLE_SNPRINT_MAX_LENGTH to PA_SAMPLE_SPEC_SNPRINT_MAX


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@222 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-19 23:12:41 +00:00
parent 70a30530e0
commit b118982674
15 changed files with 580 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

20
polyp/sample.c
View file

@ -94,7 +94,11 @@ void pa_sample_spec_snprint(char *s, size_t l, const struct pa_sample_spec *spec
[PA_SAMPLE_FLOAT32BE] = "FLOAT32BE",
};
assert(pa_sample_spec_valid(spec));
if (!pa_sample_spec_valid(spec)) {
snprintf(s, l, "Invalid");
return;
}
snprintf(s, l, "%s %uch %uHz", table[spec->format], spec->channels, spec->rate);
}
@ -120,13 +124,13 @@ double pa_volume_to_dB(pa_volume_t v) {
return 20*log10((double) v/PA_VOLUME_NORM);
}
void pa_bytes_snprint(char *s, size_t l, off_t v) {
if (v >= (off_t) 1024*1024*1024)
snprintf(s, l, "%0.1f GB", (double) v/1024/1024/1024);
else if (v >= (off_t) 1024*1024)
snprintf(s, l, "%0.1f MB", (double) v/1024/1024);
else if (v >= (off_t) 1024)
snprintf(s, l, "%0.1f KB", (double) v/1024);
void pa_bytes_snprint(char *s, size_t l, unsigned v) {
if (v >= ((unsigned) 1024)*1024*1024)
snprintf(s, l, "%0.1f GB", ((double) v)/1024/1024/1024);
else if (v >= ((unsigned) 1024)*1024)
snprintf(s, l, "%0.1f MB", ((double) v)/1024/1024);
else if (v >= (unsigned) 1024)
snprintf(s, l, "%0.1f KB", ((double) v)/1024);
else
snprintf(s, l, "%u B", (unsigned) v);
}