mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -25,9 +25,8 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
#include <pulsecore/native-common.h>
|
||||
#include <pulsecore/macro.h>
|
||||
|
||||
#include "pstream-util.h"
|
||||
|
||||
|
|
@ -35,20 +34,20 @@ void pa_pstream_send_tagstruct_with_creds(pa_pstream *p, pa_tagstruct *t, const
|
|||
size_t length;
|
||||
uint8_t *data;
|
||||
pa_packet *packet;
|
||||
assert(p);
|
||||
assert(t);
|
||||
|
||||
data = pa_tagstruct_free_data(t, &length);
|
||||
assert(data && length);
|
||||
packet = pa_packet_new_dynamic(data, length);
|
||||
assert(packet);
|
||||
pa_assert(p);
|
||||
pa_assert(t);
|
||||
|
||||
pa_assert_se(data = pa_tagstruct_free_data(t, &length));
|
||||
pa_assert_se(packet = pa_packet_new_dynamic(data, length));
|
||||
pa_pstream_send_packet(p, packet, creds);
|
||||
pa_packet_unref(packet);
|
||||
}
|
||||
|
||||
void pa_pstream_send_error(pa_pstream *p, uint32_t tag, uint32_t error) {
|
||||
pa_tagstruct *t = pa_tagstruct_new(NULL, 0);
|
||||
assert(t);
|
||||
pa_tagstruct *t;
|
||||
|
||||
pa_assert_se(t = pa_tagstruct_new(NULL, 0));
|
||||
pa_tagstruct_putu32(t, PA_COMMAND_ERROR);
|
||||
pa_tagstruct_putu32(t, tag);
|
||||
pa_tagstruct_putu32(t, error);
|
||||
|
|
@ -56,8 +55,9 @@ void pa_pstream_send_error(pa_pstream *p, uint32_t tag, uint32_t error) {
|
|||
}
|
||||
|
||||
void pa_pstream_send_simple_ack(pa_pstream *p, uint32_t tag) {
|
||||
pa_tagstruct *t = pa_tagstruct_new(NULL, 0);
|
||||
assert(t);
|
||||
pa_tagstruct *t;
|
||||
|
||||
pa_assert_se(t = pa_tagstruct_new(NULL, 0));
|
||||
pa_tagstruct_putu32(t, PA_COMMAND_REPLY);
|
||||
pa_tagstruct_putu32(t, tag);
|
||||
pa_pstream_send_tagstruct(p, t);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue