[pulseaudio-commits] r2255 - /branches/glitch-free/src/pulsecore/protocol-native.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Apr 11 18:53:29 2008
New Revision: 2255

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2255&root=pulseaudio&view=rev
Log:
fix packet formatting for a few commands

Modified:
    branches/glitch-free/src/pulsecore/protocol-native.c

Modified: branches/glitch-free/src/pulsecore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/pulsecore/protocol-native.c?rev=2255&root=pulseaudio&r1=2254&r2=2255&view=diff
==============================================================================
--- branches/glitch-free/src/pulsecore/protocol-native.c (original)
+++ branches/glitch-free/src/pulsecore/protocol-native.c Fri Apr 11 18:53:29 2008
@@ -2186,8 +2186,10 @@
         PA_TAG_U32, sink->flags,
         PA_TAG_INVALID);
 
-    if (c->version >= 13)
+    if (c->version >= 13) {
         pa_tagstruct_put_proplist(t, sink->proplist);
+        pa_tagstruct_put_usec(t, pa_sink_get_requested_latency(sink));
+    }
 }
 
 static void source_fill_tagstruct(connection *c, pa_tagstruct *t, pa_source *source) {
@@ -2215,9 +2217,12 @@
         PA_TAG_U32, source->flags,
         PA_TAG_INVALID);
 
-    if (c->version >= 13)
+    if (c->version >= 13) {
         pa_tagstruct_put_proplist(t, source->proplist);
-}
+        pa_tagstruct_put_usec(t, pa_source_get_requested_latency(source));
+    }
+}
+
 
 static void client_fill_tagstruct(connection *c, pa_tagstruct *t, pa_client *client) {
     pa_assert(t);
@@ -2266,10 +2271,8 @@
     pa_tagstruct_puts(t, s->driver);
     if (c->version >= 11)
         pa_tagstruct_put_boolean(t, pa_sink_input_get_mute(s));
-    if (c->version >= 13) {
+    if (c->version >= 13)
         pa_tagstruct_put_proplist(t, s->proplist);
-        pa_tagstruct_put_usec(t, pa_sink_get_requested_latency(s->sink));
-    }
 }
 
 static void source_output_fill_tagstruct(connection *c, pa_tagstruct *t, pa_source_output *s) {
@@ -2292,10 +2295,8 @@
     pa_tagstruct_puts(t, pa_resample_method_to_string(pa_source_output_get_resample_method(s)));
     pa_tagstruct_puts(t, s->driver);
 
-    if (c->version >= 13) {
+    if (c->version >= 13)
         pa_tagstruct_put_proplist(t, s->proplist);
-        pa_tagstruct_put_usec(t, pa_source_get_requested_latency(s->source));
-    }
 }
 
 static void scache_fill_tagstruct(connection *c, pa_tagstruct *t, pa_scache_entry *e) {
@@ -2480,7 +2481,7 @@
     pa_tagstruct_puts(reply, PACKAGE_NAME);
     pa_tagstruct_puts(reply, PACKAGE_VERSION);
     pa_tagstruct_puts(reply, pa_get_user_name(txt, sizeof(txt)));
-    pa_tagstruct_puts(reply, pa_get_fqdn(txt, sizeof(txt)));
+    pa_tagstruct_puts(reply, pa_get_host_name(txt, sizeof(txt)));
 
     fixup_sample_spec(c, &fixed_ss, &c->protocol->core->default_sample_spec);
     pa_tagstruct_put_sample_spec(reply, &fixed_ss);