mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

many fixes

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@37 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-06-27 17:50:02 +00:00
parent 1ad4ff1ca4
commit 57dc42709f
7 changed files with 71 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/protocol-native.c
View file

@ -29,6 +29,7 @@ struct playback_stream {
size_t qlength;
struct sink_input *sink_input;
struct memblockq *memblockq;
size_t requested_bytes;
};
struct connection {
@ -81,7 +82,7 @@ static void record_stream_free(struct record_stream* r) {
static struct playback_stream* playback_stream_new(struct connection *c, struct sink *sink, struct pa_sample_spec *ss, const char *name, size_t qlen, size_t maxlength, size_t prebuf) {
struct playback_stream *s;
assert(c && sink && s && name && qlen && maxlength && prebuf);
assert(c && sink && ss && name && qlen && maxlength && prebuf);
s = malloc(sizeof(struct playback_stream));
assert (s);
@ -99,8 +100,9 @@ static struct playback_stream* playback_stream_new(struct connection *c, struct
s->memblockq = memblockq_new(maxlength, pa_sample_size(ss), prebuf);
assert(s->memblockq);
s->requested_bytes = 0;
idxset_put(c->playback_streams, s, &s->index);
request_bytes(s);
return s;
}
@ -141,12 +143,21 @@ static void request_bytes(struct playback_stream *s) {
if (!(l = memblockq_missing_to(s->memblockq, s->qlength)))
return;
if (l <= s->requested_bytes)
return;
l -= s->requested_bytes;
s->requested_bytes += l;
t = tagstruct_new(NULL, 0);
assert(t);
tagstruct_putu32(t, PA_COMMAND_REQUEST);
tagstruct_putu32(t, (uint32_t) -1); /* tag */
tagstruct_putu32(t, s->index);
tagstruct_putu32(t, l);
pstream_send_tagstruct(s->connection->pstream, t);
fprintf(stderr, "Requesting %u bytes\n", l);
}
/*** sinkinput callbacks ***/
@ -237,6 +248,7 @@ static int command_create_playback_stream(struct pdispatch *pd, uint32_t command
assert(s->sink_input);
tagstruct_putu32(reply, s->sink_input->index);
pstream_send_tagstruct(c->pstream, reply);
request_bytes(s);
return 0;
}
@ -284,7 +296,6 @@ static int command_exit(struct pdispatch *pd, uint32_t command, uint32_t tag, st
/*** pstream callbacks ***/
static int packet_callback(struct pstream *p, struct packet *packet, void *userdata) {
struct connection *c = userdata;
assert(p && packet && packet->data && c);
@ -307,10 +318,17 @@ static int memblock_callback(struct pstream *p, uint32_t channel, int32_t delta,
return -1;
}
if (chunk->length >= stream->requested_bytes)
stream->requested_bytes = 0;
else
stream->requested_bytes -= chunk->length;
memblockq_push(stream->memblockq, chunk, delta);
assert(stream->sink_input);
sink_notify(stream->sink_input->sink);
fprintf(stderr, "Recieved %u bytes.\n", chunk->length);
return 0;
}