mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "format: Make pa_format_info_valid() stricter for PCM"

Browse source 
This reverts commit 12a202c510.

This is needed for now to avoid a clash in clients using json-glib. The
commit added a call to json_object_get_type() in client code that didn't
exist before, and this breaks some apps like Rhythmbox and Totem. This
will be fixed in the future by possibly dropping json-c as a dep.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=95135
This commit is contained in:
Arun Raghavan 2016-04-29 17:35:28 +05:30
parent d2a6afcab3
commit d1730ab65a
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulse/format.c
View file

@ -101,12 +101,6 @@ void pa_format_info_free(pa_format_info *f) {
} }
int pa_format_info_valid(const pa_format_info *f) { int pa_format_info_valid(const pa_format_info *f) {
pa_sample_spec ss;
if (pa_format_info_is_pcm(f)) {
pa_format_info_to_sample_spec(f, &ss, NULL);
return pa_sample_spec_valid(&ss);
} else
return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL);
} }