This file is part of polypaudio.
polypaudio is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
+ it under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation; either version 2 of the License,
or (at your option) any later version.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with polypaudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA.
#include "polyplib.h"
#include "mainloop.h"
#include "native-common.h"
-/*#include "polyp-error.h"*/
+#include "xmalloc.h"
+#include "log.h"
struct pa_simple {
struct pa_mainloop *mainloop;
struct pa_stream *stream;
enum pa_stream_direction direction;
- int dead, drained;
+ int dead;
void *read_data;
size_t read_index, read_length;
+ pa_usec_t latency;
};
static void read_callback(struct pa_stream *s, const void*data, size_t length, void *userdata);
static int check_error(struct pa_simple *p, int *perror) {
+ enum pa_context_state cst;
+ enum pa_stream_state sst;
assert(p);
- if (pa_context_is_dead(p->context) || (p->stream && pa_stream_is_dead(p->stream))) {
- if (perror)
- *perror = pa_context_errno(p->context);
- return -1;
- }
+ if ((cst = pa_context_get_state(p->context)) == PA_CONTEXT_FAILED)
+ goto fail;
+
+ assert(cst != PA_CONTEXT_TERMINATED);
+ if (p->stream) {
+ if ((sst = pa_stream_get_state(p->stream)) == PA_STREAM_FAILED)
+ goto fail;
+
+ assert(sst != PA_STREAM_TERMINATED);
+ }
+
return 0;
+
+fail:
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ p->dead = 1;
+
+ return -1;
}
static int iterate(struct pa_simple *p, int block, int *perror) {
} while (pa_context_is_pending(p->context));
+
+ while (pa_mainloop_deferred_pending(p->mainloop)) {
+
+ if (pa_mainloop_iterate(p->mainloop, 0, NULL) < 0) {
+ if (perror)
+ *perror = PA_ERROR_INTERNAL;
+ return -1;
+ }
+
+ if (check_error(p, perror) < 0)
+ return -1;
+ }
+
return 0;
}
const char *stream_name,
const struct pa_sample_spec *ss,
const struct pa_buffer_attr *attr,
+ pa_volume_t volume,
int *perror) {
struct pa_simple *p;
int error = PA_ERROR_INTERNAL;
- assert(ss);
+ assert(ss && (dir == PA_STREAM_PLAYBACK || dir == PA_STREAM_RECORD));
- p = malloc(sizeof(struct pa_simple));
- assert(p);
+ p = pa_xmalloc(sizeof(struct pa_simple));
p->context = NULL;
p->stream = NULL;
p->mainloop = pa_mainloop_new();
p->direction = dir;
p->read_data = NULL;
p->read_index = p->read_length = 0;
+ p->latency = 0;
if (!(p->context = pa_context_new(pa_mainloop_get_api(p->mainloop), name)))
goto fail;
-
- if (pa_context_connect(p->context, server, NULL, NULL) < 0) {
- error = pa_context_errno(p->context);
- goto fail;
- }
+
+ pa_context_connect(p->context, server, 1, NULL);
/* Wait until the context is ready */
- while (!pa_context_is_ready(p->context)) {
+ while (pa_context_get_state(p->context) != PA_CONTEXT_READY) {
if (iterate(p, 1, &error) < 0)
goto fail;
}
- if (!(p->stream = pa_stream_new(p->context, dir, dev, stream_name, ss, attr, NULL, NULL)))
+ if (!(p->stream = pa_stream_new(p->context, stream_name, ss)))
goto fail;
+ if (dir == PA_STREAM_PLAYBACK)
+ pa_stream_connect_playback(p->stream, dev, attr, 0, volume);
+ else
+ pa_stream_connect_record(p->stream, dev, attr, 0);
+
/* Wait until the stream is ready */
- while (!pa_stream_is_ready(p->stream)) {
+ while (pa_stream_get_state(p->stream) != PA_STREAM_READY) {
if (iterate(p, 1, &error) < 0)
goto fail;
}
void pa_simple_free(struct pa_simple *s) {
assert(s);
- free(s->read_data);
+ pa_xfree(s->read_data);
if (s->stream)
- pa_stream_free(s->stream);
+ pa_stream_unref(s->stream);
if (s->context)
- pa_context_free(s->context);
+ pa_context_unref(s->context);
if (s->mainloop)
pa_mainloop_free(s->mainloop);
- free(s);
+ pa_xfree(s);
}
int pa_simple_write(struct pa_simple *p, const void*data, size_t length, int *perror) {
assert(p && data && p->direction == PA_STREAM_PLAYBACK);
+ if (p->dead) {
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ return -1;
+ }
+
while (length > 0) {
size_t l;
if (l > length)
l = length;
- pa_stream_write(p->stream, data, l);
- data += l;
+ pa_stream_write(p->stream, data, l, NULL, 0);
+ data = (uint8_t*) data + l;
length -= l;
}
assert(s && data && length && p);
if (p->read_data) {
- fprintf(stderr, __FILE__": Buffer overflow, dropping incoming memory blocks.\n");
- free(p->read_data);
+ pa_log(__FILE__": Buffer overflow, dropping incoming memory blocks.\n");
+ pa_xfree(p->read_data);
}
- p->read_data = malloc(p->read_length = length);
- assert(p->read_data);
- memcpy(p->read_data, data, length);
+ p->read_data = pa_xmemdup(data, p->read_length = length);
p->read_index = 0;
}
int pa_simple_read(struct pa_simple *p, void*data, size_t length, int *perror) {
assert(p && data && p->direction == PA_STREAM_RECORD);
+ if (p->dead) {
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ return -1;
+ }
+
while (length > 0) {
if (p->read_data) {
size_t l = length;
if (p->read_length <= l)
l = p->read_length;
- memcpy(data, p->read_data+p->read_index, l);
+ memcpy(data, (uint8_t*) p->read_data+p->read_index, l);
- data += l;
+ data = (uint8_t*) data + l;
length -= l;
p->read_index += l;
p->read_length -= l;
if (!p->read_length) {
- free(p->read_data);
+ pa_xfree(p->read_data);
p->read_data = NULL;
p->read_index = 0;
}
return 0;
}
-static void drain_complete(struct pa_stream *s, void *userdata) {
+static void drain_or_flush_complete(struct pa_stream *s, int success, void *userdata) {
struct pa_simple *p = userdata;
assert(s && p);
- p->drained = 1;
+ if (!success)
+ p->dead = 1;
}
int pa_simple_drain(struct pa_simple *p, int *perror) {
+ struct pa_operation *o;
+ assert(p && p->direction == PA_STREAM_PLAYBACK);
+
+ if (p->dead) {
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ return -1;
+ }
+
+ o = pa_stream_drain(p->stream, drain_or_flush_complete, p);
+
+ while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) {
+ if (iterate(p, 1, perror) < 0) {
+ pa_operation_cancel(o);
+ pa_operation_unref(o);
+ return -1;
+ }
+ }
+
+ pa_operation_unref(o);
+
+ if (p->dead && perror)
+ *perror = pa_context_errno(p->context);
+
+ return p->dead ? -1 : 0;
+}
+
+static void latency_complete(struct pa_stream *s, const struct pa_latency_info *l, void *userdata) {
+ struct pa_simple *p = userdata;
+ assert(s && p);
+
+ if (!l)
+ p->dead = 1;
+ else {
+ int negative = 0;
+ p->latency = pa_stream_get_latency(s, l, &negative);
+ if (negative)
+ p->latency = 0;
+ }
+}
+
+pa_usec_t pa_simple_get_playback_latency(struct pa_simple *p, int *perror) {
+ struct pa_operation *o;
+ assert(p && p->direction == PA_STREAM_PLAYBACK);
+
+ if (p->dead) {
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ return (pa_usec_t) -1;
+ }
+
+ p->latency = 0;
+ o = pa_stream_get_latency_info(p->stream, latency_complete, p);
+
+ while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) {
+
+ if (iterate(p, 1, perror) < 0) {
+ pa_operation_cancel(o);
+ pa_operation_unref(o);
+ return -1;
+ }
+ }
+
+ pa_operation_unref(o);
+
+ if (p->dead && perror)
+ *perror = pa_context_errno(p->context);
+
+ return p->dead ? (pa_usec_t) -1 : p->latency;
+}
+
+int pa_simple_flush(struct pa_simple *p, int *perror) {
+ struct pa_operation *o;
assert(p && p->direction == PA_STREAM_PLAYBACK);
- p->drained = 0;
- pa_stream_drain(p->stream, drain_complete, p);
- while (!p->drained) {
+ if (p->dead) {
+ if (perror)
+ *perror = pa_context_errno(p->context);
+
+ return -1;
+ }
+
+ o = pa_stream_flush(p->stream, drain_or_flush_complete, p);
+
+ while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) {
if (iterate(p, 1, perror) < 0) {
- pa_stream_drain(p->stream, NULL, NULL);
+ pa_operation_cancel(o);
+ pa_operation_unref(o);
return -1;
}
}
- return 0;
+ pa_operation_unref(o);
+
+ if (p->dead && perror)
+ *perror = pa_context_errno(p->context);
+
+ return p->dead ? -1 : 0;
}