[pulseaudio-commits] src/pulse

[Arun Raghavan]

 src/pulse/format.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit d1730ab65a5f769ef135e79f2d33a0a4ec47255e
Author: Arun Raghavan <git at arunraghavan.net>
Date:   Fri Apr 29 17:35:28 2016 +0530

    Revert "format: Make pa_format_info_valid() stricter for PCM"
    
    This reverts commit 12a202c510dcacbd2b85fcc1170484eb16fef491.
    
    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

diff --git a/src/pulse/format.c b/src/pulse/format.c
index b07940a..c2a1552 100644
--- a/src/pulse/format.c
+++ b/src/pulse/format.c
@@ -101,13 +101,7 @@ void pa_format_info_free(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);
 }
 
 int pa_format_info_is_pcm(const pa_format_info *f) {