This commit is contained in:
Wim Taymans 2017-05-26 18:19:51 +02:00
parent f7de744ec9
commit ded1ea69a1
54 changed files with 301 additions and 274 deletions

View file

@ -76,7 +76,7 @@ struct spa_log {
*
* Log a message with the given log level.
*/
void (*log) (struct spa_log * log,
void (*log) (struct spa_log *log,
enum spa_log_level level,
const char *file,
int line,
@ -95,7 +95,7 @@ struct spa_log {
*
* Log a message with the given log level.
*/
void (*logv) (struct spa_log * log,
void (*logv) (struct spa_log *log,
enum spa_log_level level,
const char *file,
int line,

View file

@ -47,7 +47,7 @@ enum spa_io {
struct spa_source;
typedef void (*spa_source_func_t) (struct spa_source * source);
typedef void (*spa_source_func_t) (struct spa_source *source);
struct spa_source {
struct spa_loop *loop;
@ -58,7 +58,7 @@ struct spa_source {
enum spa_io rmask;
};
typedef int (*spa_invoke_func_t) (struct spa_loop * loop,
typedef int (*spa_invoke_func_t) (struct spa_loop *loop,
bool async,
uint32_t seq,
size_t size,
@ -81,7 +81,7 @@ struct spa_loop {
void (*remove_source) (struct spa_source *source);
int (*invoke) (struct spa_loop * loop,
int (*invoke) (struct spa_loop *loop,
spa_invoke_func_t func,
uint32_t seq,
size_t size,
@ -94,7 +94,7 @@ struct spa_loop {
#define spa_loop_remove_source(l,...) (l)->remove_source(__VA_ARGS__)
#define spa_loop_invoke(l,...) (l)->invoke((l),__VA_ARGS__)
typedef void (*spa_loop_hook_t) (struct spa_loop_control * ctrl, void *data);
typedef void (*spa_loop_hook_t) (struct spa_loop_control *ctrl, void *data);
/**
* spa_loop_control:
@ -126,17 +126,17 @@ struct spa_loop_control {
#define spa_loop_control_leave(l) (l)->leave(l)
typedef void (*spa_source_io_func_t) (struct spa_loop_utils * utils,
struct spa_source * source,
typedef void (*spa_source_io_func_t) (struct spa_loop_utils *utils,
struct spa_source *source,
int fd, enum spa_io mask, void *data);
typedef void (*spa_source_idle_func_t) (struct spa_loop_utils * utils,
struct spa_source * source, void *data);
typedef void (*spa_source_event_func_t) (struct spa_loop_utils * utils,
struct spa_source * source, void *data);
typedef void (*spa_source_timer_func_t) (struct spa_loop_utils * utils,
struct spa_source * source, void *data);
typedef void (*spa_source_signal_func_t) (struct spa_loop_utils * utils,
struct spa_source * source,
typedef void (*spa_source_idle_func_t) (struct spa_loop_utils *utils,
struct spa_source *source, void *data);
typedef void (*spa_source_event_func_t) (struct spa_loop_utils *utils,
struct spa_source *source, void *data);
typedef void (*spa_source_timer_func_t) (struct spa_loop_utils *utils,
struct spa_source *source, void *data);
typedef void (*spa_source_signal_func_t) (struct spa_loop_utils *utils,
struct spa_source *source,
int signal_number, void *data);
/**
@ -149,34 +149,34 @@ struct spa_loop_utils {
* structure in the future */
size_t size;
struct spa_source *(*add_io) (struct spa_loop_utils * utils,
struct spa_source *(*add_io) (struct spa_loop_utils *utils,
int fd,
enum spa_io mask,
bool close,
spa_source_io_func_t func, void *data);
int (*update_io) (struct spa_source * source, enum spa_io mask);
int (*update_io) (struct spa_source *source, enum spa_io mask);
struct spa_source *(*add_idle) (struct spa_loop_utils * utils,
struct spa_source *(*add_idle) (struct spa_loop_utils *utils,
bool enabled,
spa_source_idle_func_t func, void *data);
void (*enable_idle) (struct spa_source * source, bool enabled);
void (*enable_idle) (struct spa_source *source, bool enabled);
struct spa_source *(*add_event) (struct spa_loop_utils * utils,
struct spa_source *(*add_event) (struct spa_loop_utils *utils,
spa_source_event_func_t func, void *data);
void (*signal_event) (struct spa_source * source);
void (*signal_event) (struct spa_source *source);
struct spa_source *(*add_timer) (struct spa_loop_utils * utils,
struct spa_source *(*add_timer) (struct spa_loop_utils *utils,
spa_source_timer_func_t func, void *data);
int (*update_timer) (struct spa_source * source,
struct timespec * value,
struct timespec * interval,
int (*update_timer) (struct spa_source *source,
struct timespec *value,
struct timespec *interval,
bool absolute);
struct spa_source *(*add_signal) (struct spa_loop_utils * utils,
struct spa_source *(*add_signal) (struct spa_loop_utils *utils,
int signal_number,
spa_source_signal_func_t func, void *data);
void (*destroy_source) (struct spa_source * source);
void (*destroy_source) (struct spa_source *source);
};
#define spa_loop_utils_add_io(l,...) (l)->add_io(l,__VA_ARGS__)

View file

@ -108,7 +108,7 @@ enum spa_monitor_item_state {
* spa_monitor_callbacks:
*/
struct spa_monitor_callbacks {
void (*event) (struct spa_monitor * monitor, struct spa_event * event, void *user_data);
void (*event) (struct spa_monitor *monitor, struct spa_event *event, void *user_data);
};
/**
@ -139,12 +139,12 @@ struct spa_monitor {
*
* Returns: #SPA_RESULT_OK on success
*/
int (*set_callbacks) (struct spa_monitor * monitor,
const struct spa_monitor_callbacks * callbacks,
int (*set_callbacks) (struct spa_monitor *monitor,
const struct spa_monitor_callbacks *callbacks,
size_t callbacks_size, void *user_data);
int (*enum_items) (struct spa_monitor * monitor,
struct spa_monitor_item ** item, uint32_t index);
int (*enum_items) (struct spa_monitor *monitor,
struct spa_monitor_item **item, uint32_t index);
};

View file

@ -91,7 +91,7 @@ struct spa_node_callbacks {
* This will be called when an out-of-bound event is notified
* on @node. the callback can be called from any thread.
*/
void (*event) (struct spa_node * node, struct spa_event * event, void *user_data);
void (*event) (struct spa_node *node, struct spa_event *event, void *user_data);
/**
* struct spa_node_callbacks::need_input:
* @node: a #struct spa_node
@ -103,7 +103,7 @@ struct spa_node_callbacks {
* When this function is NULL, synchronous operation is requested
* on the input ports.
*/
void (*need_input) (struct spa_node * node, void *user_data);
void (*need_input) (struct spa_node *node, void *user_data);
/**
* struct spa_node_callbacks::have_output:
* @node: a #struct spa_node
@ -115,7 +115,7 @@ struct spa_node_callbacks {
* When this function is NULL, synchronous operation is requested
* on the output ports.
*/
void (*have_output) (struct spa_node * node, void *user_data);
void (*have_output) (struct spa_node *node, void *user_data);
/**
* struct spa_node_callbacks::reuse_buffer:
* @node: a #struct spa_node
@ -129,7 +129,7 @@ struct spa_node_callbacks {
* When this function is NULL, the buffers to reuse will be set in
* the io area or the input ports.
*/
void (*reuse_buffer) (struct spa_node * node,
void (*reuse_buffer) (struct spa_node *node,
uint32_t port_id,
uint32_t buffer_id, void *user_data);
};
@ -170,7 +170,7 @@ struct spa_node {
* #SPA_RESULT_NOT_IMPLEMENTED when there are no properties
* implemented on @node
*/
int (*get_props) (struct spa_node * node, struct spa_props ** props);
int (*get_props) (struct spa_node *node, struct spa_props **props);
/**
* struct spa_node::set_props:
* @node: a #struct spa_node
@ -195,7 +195,7 @@ struct spa_node {
* #SPA_RESULT_WRONG_PROPERTY_TYPE when a property has the wrong
* type.
*/
int (*set_props) (struct spa_node * node, const struct spa_props * props);
int (*set_props) (struct spa_node *node, const struct spa_props *props);
/**
* struct spa_node::send_command:
* @node: a #struct spa_node
@ -213,7 +213,7 @@ struct spa_node {
* #SPA_RESULT_INVALID_COMMAND @command is an invalid command
* #SPA_RESULT_ASYNC @command is executed asynchronously
*/
int (*send_command) (struct spa_node * node, struct spa_command * command);
int (*send_command) (struct spa_node *node, struct spa_command *command);
/**
* struct spa_node::set_event_callback:
* @node: a #struct spa_node
@ -229,8 +229,8 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_INVALID_ARGUMENTS when node is %NULL
*/
int (*set_callbacks) (struct spa_node * node,
const struct spa_node_callbacks * callbacks,
int (*set_callbacks) (struct spa_node *node,
const struct spa_node_callbacks *callbacks,
size_t callbacks_size,
void *user_data);
/**
@ -249,11 +249,11 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_INVALID_ARGUMENTS when node is %NULL
*/
int (*get_n_ports) (struct spa_node * node,
uint32_t * n_input_ports,
uint32_t * max_input_ports,
uint32_t * n_output_ports,
uint32_t * max_output_ports);
int (*get_n_ports) (struct spa_node *node,
uint32_t *n_input_ports,
uint32_t *max_input_ports,
uint32_t *n_output_ports,
uint32_t *max_output_ports);
/**
* struct spa_node::get_port_ids:
* @node: a #struct spa_node
@ -269,11 +269,11 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_INVALID_ARGUMENTS when node is %NULL
*/
int (*get_port_ids) (struct spa_node * node,
int (*get_port_ids) (struct spa_node *node,
uint32_t n_input_ports,
uint32_t * input_ids,
uint32_t *input_ids,
uint32_t n_output_ports,
uint32_t * output_ids);
uint32_t *output_ids);
/**
* struct spa_node::add_port:
@ -291,8 +291,8 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_INVALID_ARGUMENTS when node is %NULL
*/
int (*add_port) (struct spa_node * node, enum spa_direction direction, uint32_t port_id);
int (*remove_port) (struct spa_node * node, enum spa_direction direction, uint32_t port_id);
int (*add_port) (struct spa_node *node, enum spa_direction direction, uint32_t port_id);
int (*remove_port) (struct spa_node *node, enum spa_direction direction, uint32_t port_id);
/**
* struct spa_node::port_enum_formats:
@ -321,11 +321,11 @@ struct spa_node {
* #SPA_RESULT_INVALID_PORT when port_id is not valid
* #SPA_RESULT_ENUM_END when no format exists
*/
int (*port_enum_formats) (struct spa_node * node,
int (*port_enum_formats) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_format ** format,
const struct spa_format * filter,
struct spa_format **format,
const struct spa_format *filter,
uint32_t index);
/**
* struct spa_node::port_set_format:
@ -364,11 +364,11 @@ struct spa_node {
#define SPA_PORT_FORMAT_FLAG_FIXATE (1 << 1) /* fixate the non-optional unset fields */
#define SPA_PORT_FORMAT_FLAG_NEAREST (1 << 2) /* allow set fields to be rounded to the
* nearest allowed field value. */
int (*port_set_format) (struct spa_node * node,
int (*port_set_format) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t flags,
const struct spa_format * format);
const struct spa_format *format);
/**
* struct spa_node::port_get_format:
* @node: a #struct spa_node
@ -386,25 +386,25 @@ struct spa_node {
* #SPA_RESULT_INVALID_PORT when @port_id is not valid
* #SPA_RESULT_INVALID_NO_FORMAT when no format was set
*/
int (*port_get_format) (struct spa_node * node,
int (*port_get_format) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
const struct spa_format ** format);
const struct spa_format **format);
int (*port_get_info) (struct spa_node * node,
int (*port_get_info) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
const struct spa_port_info ** info);
const struct spa_port_info **info);
int (*port_enum_params) (struct spa_node * node,
int (*port_enum_params) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
uint32_t index,
struct spa_param ** param);
int (*port_set_param) (struct spa_node * node,
struct spa_param **param);
int (*port_set_param) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
const struct spa_param * param);
const struct spa_param *param);
/**
* struct spa_node::port_use_buffers:
@ -436,10 +436,10 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_ASYNC the function is executed asynchronously
*/
int (*port_use_buffers) (struct spa_node * node,
int (*port_use_buffers) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_buffer ** buffers,
struct spa_buffer **buffers,
uint32_t n_buffers);
/**
* struct spa_node::port_alloc_buffers:
@ -476,13 +476,13 @@ struct spa_node {
* #SPA_RESULT_ERROR when the node already has allocated buffers.
* #SPA_RESULT_ASYNC the function is executed asynchronously
*/
int (*port_alloc_buffers) (struct spa_node * node,
int (*port_alloc_buffers) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_param ** params,
struct spa_param **params,
uint32_t n_params,
struct spa_buffer ** buffers,
uint32_t * n_buffers);
struct spa_buffer **buffers,
uint32_t *n_buffers);
/**
* struct spa_node::port_set_io:
@ -498,10 +498,10 @@ struct spa_node {
*
* Returns: #SPA_RESULT_OK on success
*/
int (*port_set_io) (struct spa_node * node,
int (*port_set_io) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_port_io * io);
struct spa_port_io *io);
/**
* struct spa_node::port_reuse_buffer:
@ -516,12 +516,12 @@ struct spa_node {
* Returns: #SPA_RESULT_OK on success
* #SPA_RESULT_INVALID_ARGUMENTS when node is %NULL
*/
int (*port_reuse_buffer) (struct spa_node * node, uint32_t port_id, uint32_t buffer_id);
int (*port_reuse_buffer) (struct spa_node *node, uint32_t port_id, uint32_t buffer_id);
int (*port_send_command) (struct spa_node * node,
int (*port_send_command) (struct spa_node *node,
enum spa_direction direction,
uint32_t port_id,
struct spa_command * command);
struct spa_command *command);
/**
* struct spa_node::process_input:
* @node: a #struct spa_node
@ -560,7 +560,7 @@ struct spa_node {
* can be consumed.
* #SPA_RESULT_ERROR when one of the inputs is in error
*/
int (*process_input) (struct spa_node * node);
int (*process_input) (struct spa_node *node);
/**
* struct spa_node::process_output:
@ -594,7 +594,7 @@ struct spa_node {
* is needed.
* #SPA_RESULT_ERROR when one of the outputs is in error
*/
int (*process_output) (struct spa_node * node);
int (*process_output) (struct spa_node *node);
};
#define spa_node_get_props(n,...) (n)->get_props((n),__VA_ARGS__)

View file

@ -45,7 +45,7 @@ struct spa_handle {
* #SPA_RESULT_NOT_IMPLEMENTED when there are no extensions
* #SPA_RESULT_INVALID_ARGUMENTS when handle or info is %NULL
*/
int (*get_interface) (struct spa_handle * handle, uint32_t interface_id, void **interface);
int (*get_interface) (struct spa_handle *handle, uint32_t interface_id, void **interface);
/**
* spa_handle::clear
* @handle: a pointer to memory
@ -55,7 +55,7 @@ struct spa_handle {
*
* Returns: #SPA_RESULT_OK on success
*/
int (*clear) (struct spa_handle * handle);
int (*clear) (struct spa_handle *handle);
};
#define spa_handle_get_interface(h,...) (h)->get_interface((h),__VA_ARGS__)
@ -124,10 +124,10 @@ struct spa_handle_factory {
* #SPA_RESULT_NOT_IMPLEMENTED when an instance can't be made
* #SPA_RESULT_INVALID_ARGUMENTS when factory or handle are %NULL
*/
int (*init) (const struct spa_handle_factory * factory,
struct spa_handle * handle,
const struct spa_dict * info,
const struct spa_support * support,
int (*init) (const struct spa_handle_factory *factory,
struct spa_handle *handle,
const struct spa_dict *info,
const struct spa_support *support,
uint32_t n_support);
/**
@ -143,8 +143,8 @@ struct spa_handle_factory {
* #SPA_RESULT_INVALID_ARGUMENTS when handle or info is %NULL
* #SPA_RESULT_ENUM_END when there are no more infos
*/
int (*enum_interface_info) (const struct spa_handle_factory * factory,
const struct spa_interface_info ** info,
int (*enum_interface_info) (const struct spa_handle_factory *factory,
const struct spa_interface_info **info,
uint32_t index);
};
@ -162,7 +162,7 @@ struct spa_handle_factory {
* #SPA_RESULT_INVALID_ARGUMENTS when factory is %NULL
* #SPA_RESULT_ENUM_END when there are no more factories
*/
typedef int (*spa_handle_factory_enum_func_t) (const struct spa_handle_factory ** factory,
typedef int (*spa_handle_factory_enum_func_t) (const struct spa_handle_factory **factory,
uint32_t index);
#define SPA_HANDLE_FACTORY_ENUM_FUNC_NAME "spa_handle_factory_enum"

View file

@ -39,7 +39,7 @@ struct spa_pod_builder {
uint32_t size;
uint32_t offset;
struct spa_pod_frame *stack;
uint32_t (*write) (struct spa_pod_builder * builder, uint32_t ref, const void *data,
uint32_t (*write) (struct spa_pod_builder *builder, uint32_t ref, const void *data,
uint32_t size);
bool in_array;
bool first;

View file

@ -92,7 +92,7 @@ static inline void spa_ringbuffer_clear(struct spa_ringbuffer *rbuf)
* there was an underrun. values > rbuf->size means there
* was an overrun.
*/
static inline int32_t spa_ringbuffer_get_read_index(struct spa_ringbuffer *rbuf, uint32_t * index)
static inline int32_t spa_ringbuffer_get_read_index(struct spa_ringbuffer *rbuf, uint32_t *index)
{
int32_t avail;
@ -147,7 +147,7 @@ static inline void spa_ringbuffer_read_update(struct spa_ringbuffer *rbuf, int32
* was an overrun. Subtract from the buffer size to get
* the number of bytes available for writing.
*/
static inline int32_t spa_ringbuffer_get_write_index(struct spa_ringbuffer *rbuf, uint32_t * index)
static inline int32_t spa_ringbuffer_get_write_index(struct spa_ringbuffer *rbuf, uint32_t *index)
{
int32_t filled;

View file

@ -46,11 +46,11 @@ struct spa_type_map {
*/
const struct spa_dict *info;
uint32_t (*get_id) (struct spa_type_map * map, const char *type);
uint32_t (*get_id) (struct spa_type_map *map, const char *type);
const char *(*get_type) (const struct spa_type_map * map, uint32_t id);
const char *(*get_type) (const struct spa_type_map *map, uint32_t id);
size_t (*get_size) (const struct spa_type_map * map);
size_t (*get_size) (const struct spa_type_map *map);
};
#define spa_type_map_get_id(n,...) (n)->get_id((n),__VA_ARGS__)