mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

a2dp: cleanups

Browse source
This commit is contained in:
Wim Taymans 2019-05-15 10:20:28 +02:00
parent f6ace8a000
commit a78617c6a8
2 changed files with 211 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

32
spa/plugins/bluez5/a2dp-sink.c
View file

@ -57,16 +57,16 @@ struct props {
struct buffer {
uint32_t id;
unsigned int outstanding:1;
struct spa_buffer *buf;
struct spa_meta_header *h;
bool outstanding;
struct spa_list link;
};
struct port {
bool have_format;
struct spa_audio_info current_format;
int frame_size;
unsigned int have_format:1;
uint64_t info_all;
struct spa_port_info info;
@ -75,7 +75,7 @@ struct port {
struct spa_param_info params[8];
struct buffer buffers[MAX_BUFFERS];
unsigned int n_buffers;
uint32_t n_buffers;
struct spa_list free;
struct spa_list ready;
@ -87,8 +87,6 @@ struct impl {
struct spa_handle handle;
struct spa_node node;
uint32_t seq;
struct spa_log *log;
struct spa_loop *main_loop;
struct spa_loop *data_loop;
@ -107,7 +105,6 @@ struct impl {
struct port port;
unsigned int opened:1;
unsigned int started:1;
unsigned int slaved:1;
@ -239,11 +236,6 @@ static int impl_node_enum_params(struct spa_node *node, int seq,
return 0;
}
static inline bool is_slaved(struct impl *this)
{
return this->position && this->clock && this->position->clock.id != this->clock->id;
}
static int set_timers(struct impl *this)
{
struct itimerspec ts;
@ -276,6 +268,11 @@ static int do_reslave(struct spa_loop *loop,
return 0;
}
static inline bool is_slaved(struct impl *this)
{
return this->position && this->clock && this->position->clock.id != this->clock->id;
}
static int impl_node_set_io(struct spa_node *node, uint32_t id, void *data, size_t size)
{
struct impl *this;
@ -1188,6 +1185,7 @@ impl_node_port_set_param(struct spa_node *node,
{
struct impl *this;
struct port *port;
int res;
spa_return_val_if_fail(node != NULL, -EINVAL);
this = SPA_CONTAINER_OF(node, struct impl, node);
@ -1195,11 +1193,15 @@ impl_node_port_set_param(struct spa_node *node,
spa_return_val_if_fail(CHECK_PORT(node, direction, port_id), -EINVAL);
port = &this->port;
if (id == SPA_PARAM_Format) {
return port_set_format(this, port, flags, param);
switch (id) {
case SPA_PARAM_Format:
res = port_set_format(this, port, flags, param);
break;
default:
res = -ENOENT;
break;
}
else
return -ENOENT;
return res;
}
static int