mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
cleanup
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@18 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering
parent
78f386ad45
commit
b24546bede
19 changed files with 261 additions and 277 deletions
|
|
@ -5,17 +5,18 @@
|
|||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "inputstream.h"
|
||||
#include "outputstream.h"
|
||||
#include "sinkinput.h"
|
||||
#include "sourceoutput.h"
|
||||
#include "protocol-simple.h"
|
||||
#include "client.h"
|
||||
|
||||
struct connection {
|
||||
struct protocol_simple *protocol;
|
||||
struct iochannel *io;
|
||||
struct input_stream *istream;
|
||||
struct output_stream *ostream;
|
||||
struct sink_input *sink_input;
|
||||
struct source_output *source_output;
|
||||
struct client *client;
|
||||
struct memblockq *input_memblockq, *output_memblockq;
|
||||
};
|
||||
|
||||
struct protocol_simple {
|
||||
|
|
@ -31,14 +32,18 @@ static void free_connection(void *data, void *userdata) {
|
|||
struct connection *c = data;
|
||||
assert(data);
|
||||
|
||||
if (c->istream)
|
||||
input_stream_free(c->istream);
|
||||
if (c->ostream)
|
||||
output_stream_free(c->ostream);
|
||||
|
||||
client_free(c->client);
|
||||
|
||||
iochannel_free(c->io);
|
||||
if (c->sink_input)
|
||||
sink_input_free(c->sink_input);
|
||||
if (c->source_output)
|
||||
source_output_free(c->source_output);
|
||||
if (c->client)
|
||||
client_free(c->client);
|
||||
if (c->io)
|
||||
iochannel_free(c->io);
|
||||
if (c->input_memblockq)
|
||||
memblockq_free(c->input_memblockq);
|
||||
if (c->output_memblockq)
|
||||
memblockq_free(c->output_memblockq);
|
||||
free(c);
|
||||
}
|
||||
|
||||
|
|
@ -48,24 +53,6 @@ static void destroy_connection(struct connection *c) {
|
|||
free_connection(c, NULL);
|
||||
}
|
||||
|
||||
static void istream_kill_cb(struct input_stream *i, void *userdata) {
|
||||
struct connection *c = userdata;
|
||||
assert(i && c);
|
||||
destroy_connection(c);
|
||||
}
|
||||
|
||||
static void ostream_kill_cb(struct output_stream *o, void *userdata) {
|
||||
struct connection *c = userdata;
|
||||
assert(o && c);
|
||||
destroy_connection(c);
|
||||
}
|
||||
|
||||
static void client_kill_cb(struct client *client, void*userdata) {
|
||||
struct connection *c= userdata;
|
||||
assert(client && c);
|
||||
destroy_connection(c);
|
||||
}
|
||||
|
||||
static int do_read(struct connection *c) {
|
||||
struct memchunk chunk;
|
||||
ssize_t r;
|
||||
|
|
@ -73,7 +60,7 @@ static int do_read(struct connection *c) {
|
|||
if (!iochannel_is_readable(c->io))
|
||||
return 0;
|
||||
|
||||
if (!c->istream || !memblockq_is_writable(c->istream->memblockq, BUFSIZE))
|
||||
if (!c->sink_input || !memblockq_is_writable(c->input_memblockq, BUFSIZE))
|
||||
return 0;
|
||||
|
||||
chunk.memblock = memblock_new(BUFSIZE);
|
||||
|
|
@ -90,10 +77,11 @@ static int do_read(struct connection *c) {
|
|||
chunk.memblock->length = r;
|
||||
chunk.length = r;
|
||||
chunk.index = 0;
|
||||
|
||||
memblockq_push(c->istream->memblockq, &chunk, 0);
|
||||
input_stream_notify_sink(c->istream);
|
||||
|
||||
assert(c->input_memblockq);
|
||||
memblockq_push(c->input_memblockq, &chunk, 0);
|
||||
memblock_unref(chunk.memblock);
|
||||
sink_notify(c->sink_input->sink);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -104,10 +92,11 @@ static int do_write(struct connection *c) {
|
|||
if (!iochannel_is_writable(c->io))
|
||||
return 0;
|
||||
|
||||
if (!c->ostream)
|
||||
if (!c->source_output)
|
||||
return 0;
|
||||
|
||||
memblockq_peek(c->ostream->memblockq, &chunk);
|
||||
assert(c->output_memblockq);
|
||||
memblockq_peek(c->output_memblockq, &chunk);
|
||||
assert(chunk.memblock && chunk.length);
|
||||
|
||||
if ((r = iochannel_write(c->io, chunk.memblock->data+chunk.index, chunk.length)) < 0) {
|
||||
|
|
@ -116,11 +105,63 @@ static int do_write(struct connection *c) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
memblockq_drop(c->ostream->memblockq, r);
|
||||
memblockq_drop(c->output_memblockq, r);
|
||||
memblock_unref(chunk.memblock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*** sink_input callbacks ***/
|
||||
|
||||
static int sink_input_peek_cb(struct sink_input *i, struct memchunk *chunk, uint8_t *volume) {
|
||||
struct connection*c = i->userdata;
|
||||
assert(i && c && chunk && volume);
|
||||
|
||||
if (memblockq_peek(c->input_memblockq, chunk) < 0)
|
||||
return -1;
|
||||
|
||||
*volume = 0xFF;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void sink_input_drop_cb(struct sink_input *i, size_t length) {
|
||||
struct connection*c = i->userdata;
|
||||
assert(i && c && length);
|
||||
|
||||
memblockq_drop(c->input_memblockq, length);
|
||||
|
||||
if (do_read(c) < 0)
|
||||
destroy_connection(c);
|
||||
}
|
||||
|
||||
static void sink_input_kill_cb(struct sink_input *i) {
|
||||
assert(i && i->userdata);
|
||||
destroy_connection((struct connection *) i->userdata);
|
||||
}
|
||||
|
||||
/*** source_output callbacks ***/
|
||||
|
||||
static void source_output_push_cb(struct source_output *o, struct memchunk *chunk) {
|
||||
struct connection *c = o->userdata;
|
||||
assert(o && c && chunk);
|
||||
|
||||
memblockq_push(c->output_memblockq, chunk, 0);
|
||||
}
|
||||
|
||||
static void source_output_kill_cb(struct source_output *o) {
|
||||
assert(o && o->userdata);
|
||||
destroy_connection((struct connection *) o->userdata);
|
||||
}
|
||||
|
||||
|
||||
/*** client callbacks ***/
|
||||
|
||||
static void client_kill_cb(struct client *c) {
|
||||
assert(c && c->userdata);
|
||||
destroy_connection((struct connection *) c->userdata);
|
||||
}
|
||||
|
||||
/*** iochannel callbacks ***/
|
||||
|
||||
static void io_callback(struct iochannel*io, void *userdata) {
|
||||
struct connection *c = userdata;
|
||||
assert(io && c && c->io == io);
|
||||
|
|
@ -129,13 +170,7 @@ static void io_callback(struct iochannel*io, void *userdata) {
|
|||
destroy_connection(c);
|
||||
}
|
||||
|
||||
static void istream_notify_cb(struct input_stream *i, void *userdata) {
|
||||
struct connection*c = userdata;
|
||||
assert(i && c && c->istream == i);
|
||||
|
||||
if (do_read(c) < 0)
|
||||
destroy_connection(c);
|
||||
}
|
||||
/*** socket_server callbacks */
|
||||
|
||||
static void on_connection(struct socket_server*s, struct iochannel *io, void *userdata) {
|
||||
struct protocol_simple *p = userdata;
|
||||
|
|
@ -145,39 +180,53 @@ static void on_connection(struct socket_server*s, struct iochannel *io, void *us
|
|||
c = malloc(sizeof(struct connection));
|
||||
assert(c);
|
||||
c->io = io;
|
||||
c->istream = NULL;
|
||||
c->ostream = NULL;
|
||||
c->sink_input = NULL;
|
||||
c->source_output = NULL;
|
||||
c->input_memblockq = c->output_memblockq = NULL;
|
||||
c->protocol = p;
|
||||
|
||||
c->client = client_new(p->core, "SIMPLE", "Client");
|
||||
assert(c->client);
|
||||
client_set_kill_callback(c->client, client_kill_cb, c);
|
||||
c->client->kill = client_kill_cb;
|
||||
c->client->userdata = c;
|
||||
|
||||
if (p->mode & PROTOCOL_SIMPLE_RECORD) {
|
||||
struct source *source;
|
||||
size_t l;
|
||||
|
||||
if (!(source = core_get_default_source(p->core))) {
|
||||
fprintf(stderr, "Failed to get default source.\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
c->ostream = output_stream_new(source, &DEFAULT_SAMPLE_SPEC, c->client->name);
|
||||
assert(c->ostream);
|
||||
output_stream_set_kill_callback(c->ostream, ostream_kill_cb, c);
|
||||
c->source_output = source_output_new(source, &DEFAULT_SAMPLE_SPEC, c->client->name);
|
||||
assert(c->source_output);
|
||||
c->source_output->push = source_output_push_cb;
|
||||
c->source_output->kill = source_output_kill_cb;
|
||||
c->source_output->userdata = c;
|
||||
|
||||
l = 5*bytes_per_second(&DEFAULT_SAMPLE_SPEC);
|
||||
c->output_memblockq = memblockq_new(l, sample_size(&DEFAULT_SAMPLE_SPEC), l/2);
|
||||
}
|
||||
|
||||
if (p->mode & PROTOCOL_SIMPLE_PLAYBACK) {
|
||||
struct sink *sink;
|
||||
size_t l;
|
||||
|
||||
if (!(sink = core_get_default_sink(p->core))) {
|
||||
fprintf(stderr, "Failed to get default sink.\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
c->istream = input_stream_new(sink, &DEFAULT_SAMPLE_SPEC, c->client->name);
|
||||
assert(c->istream);
|
||||
input_stream_set_kill_callback(c->istream, istream_kill_cb, c);
|
||||
input_stream_set_notify_callback(c->istream, istream_notify_cb, c);
|
||||
c->sink_input = sink_input_new(sink, &DEFAULT_SAMPLE_SPEC, c->client->name);
|
||||
assert(c->sink_input);
|
||||
c->sink_input->peek = sink_input_peek_cb;
|
||||
c->sink_input->drop = sink_input_drop_cb;
|
||||
c->sink_input->kill = sink_input_kill_cb;
|
||||
c->sink_input->userdata = c;
|
||||
|
||||
l = 5*bytes_per_second(&DEFAULT_SAMPLE_SPEC);
|
||||
c->input_memblockq = memblockq_new(l, sample_size(&DEFAULT_SAMPLE_SPEC), l/2);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -187,13 +236,7 @@ static void on_connection(struct socket_server*s, struct iochannel *io, void *us
|
|||
|
||||
fail:
|
||||
if (c) {
|
||||
if (c->client)
|
||||
client_free(c->client);
|
||||
if (c->istream)
|
||||
input_stream_free(c->istream);
|
||||
if (c->ostream)
|
||||
output_stream_free(c->ostream);
|
||||
|
||||
free_connection(c, NULL);
|
||||
iochannel_free(c->io);
|
||||
free(c);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue